diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-08 11:11:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-08 11:17:29 +0000 |
| commit | 5f40964641a56938d86361d87d9b427aef00ed59 (patch) | |
| tree | d95b7e2490d0ae5650a5fe137a6ea5cd79763442 | |
| parent | 31d047b78008a5494b364f6ea8cdd3acba88c0fa (diff) | |
| download | aports-5f40964641a56938d86361d87d9b427aef00ed59.tar.bz2 aports-5f40964641a56938d86361d87d9b427aef00ed59.tar.xz | |
testing/mumble: create pid dir from init.d script
the /var/run directory does not exist after a reboot so we need create
it before starting the service instead of at package install time.
| -rw-r--r-- | testing/mumble/APKBUILD | 28 | ||||
| -rw-r--r-- | testing/mumble/murmur.initd | 5 | ||||
| -rwxr-xr-x | testing/mumble/murmur.post-deinstall | 4 | ||||
| -rwxr-xr-x | testing/mumble/murmur.post-install | 6 |
4 files changed, 13 insertions, 30 deletions
diff --git a/testing/mumble/APKBUILD b/testing/mumble/APKBUILD index e53283cc3c..dc2ef12414 100644 --- a/testing/mumble/APKBUILD +++ b/testing/mumble/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr> pkgname=mumble pkgver=1.2.8 -pkgrel=0 +pkgrel=1 pkgdesc="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming" url="http://mumble.sourceforge.net/" arch="all" @@ -10,13 +10,12 @@ license="BSD" depends="qt-sqlite" depends_dev="qt-dev libsndfile-dev protobuf boost-dev avahi-dev protobuf-dev libxi-dev speex-dev libcap-dev" makedepends="$depends_dev" -install="" +install="murmur.pre-install" +pkgusers="mumble" +pkggroups="mumble" subpackages="$pkgname-doc murmur murmur-doc:murmur_doc" source="http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz murmur.initd - murmur.pre-install - murmur.post-install - murmur.post-deinstall " _builddir=$srcdir/$pkgname-$pkgver @@ -54,12 +53,10 @@ package() { murmur() { pkgdesc="Murmur is the server component of Mumble" - install="murmur.pre-install murmur.post-install murmur.post-deinstall" cd "$_builddir" - install -dm755 ${subpkgdir}/var/run/murmur - install -dm755 ${subpkgdir}/var/lib/murmur + install -o murmur -g murmur -dm755 ${subpkgdir}/var/lib/murmur install -Dm755 ./release/murmurd ${subpkgdir}/usr/bin/murmurd install -Dm644 ./scripts/murmur.ini ${subpkgdir}/etc/murmur.ini sed 's/^database=$/database=\/var\/lib\/murmur\/murmur.sqlite/;\ @@ -82,17 +79,8 @@ murmur_doc() { } md5sums="1a3ef91489ff674dfc010377d7721a28 mumble-1.2.8.tar.gz -3d6020246d92fe1ffdb8355bf34b460c murmur.initd -b7dc31564e89e46f97fdb8bd3f345694 murmur.pre-install -508d6f8fbb4050b3e05439c8f07c046a murmur.post-install -eec7a19fad4e0baf3b9839c6d514025f murmur.post-deinstall" +b62d8e976d4f82ae850720ff70ead4b3 murmur.initd" sha256sums="4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 mumble-1.2.8.tar.gz -60049e636b33bacb881b815e0ec07fb885d904675e99f95e263df11b4987531a murmur.initd -97b336469364bc2a55ffc34b6adbddd85c427a4ccfbbf1b501d4d71b7f062f50 murmur.pre-install -af1bd38f46756218b47bcfddefdf3c2310d9f8e4ce717946af6c503214efbbc4 murmur.post-install -c2cabbf65b7ddbc7cc5d0d17977f345bb31a6f3d57980ef0679f03e87a81cb48 murmur.post-deinstall" +3f977e2b01f9e354ddf93111c0bee6b82e4f8a4530c7b1e11a004d45ec838937 murmur.initd" sha512sums="9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b mumble-1.2.8.tar.gz -530f2334fa459501cb8dc621d4470e5b6338e3a7af09f21b2db79309b077b31227a4b793fd8762a84aae3bcc3530ea1ea3a2b5fc0d7fcd815751dd920f678a19 murmur.initd -bd0b956ace73af638e672f504c8b755dcf272183b0b87f787903ec61261189726e80f9ed21749d1d73c6b9da286f3aff9d5305e73cd28d920de73381b8f5d7a8 murmur.pre-install -9bd88ae23b39b7ae903d073d675ba4092aea83cc31620396fcd90092a5b30f04ee575158ceff7908f80da6763525f0a11b88821f6271d11c3ae6f4d9a5de1781 murmur.post-install -e525c54802848d5b89e9721f64cc9e6d756dca442a4753a623a8846261183f3b4caf912c05a6342d369b695174c1d42604fc363244a23cb8985165680d437335 murmur.post-deinstall" +26ec430c90dd934b921a69db56e1d394ffbcac10de3242734e182a7436d634261ed1aedd2e489c834bc42b12567ff4231280e8f8df66ab55df90e0ddd0cd7ea1 murmur.initd" diff --git a/testing/mumble/murmur.initd b/testing/mumble/murmur.initd index 154db89ef1..ba3cbe4dd1 100644 --- a/testing/mumble/murmur.initd +++ b/testing/mumble/murmur.initd @@ -9,5 +9,10 @@ command="/usr/bin/murmurd" command_args="-ini /etc/murmur.ini" pidfile="/var/run/murmur/murmur.pid" +start_pre() { + checkpath --owner murmur:murmur --directory ${pidfile%/*} +} + # uses the openrc templates for start()/stop() + diff --git a/testing/mumble/murmur.post-deinstall b/testing/mumble/murmur.post-deinstall deleted file mode 100755 index 4088787b19..0000000000 --- a/testing/mumble/murmur.post-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -delgroup murmur -deluser murmur -exit 0 diff --git a/testing/mumble/murmur.post-install b/testing/mumble/murmur.post-install deleted file mode 100755 index 50983071a1..0000000000 --- a/testing/mumble/murmur.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -chown murmur /var/run/murmur/ -chgrp murmur /var/run/murmur/ -chown murmur /var/lib/murmur/ -chgrp murmur /var/lib/murmur/ -exit 0 |