~alpine/devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
4 3

[alpine-devel] [PATCH] testing/mumble: new aport

Johannes Matheis <jomat+alpinebuild@jmt.gr>
Details
Message ID
<20141002105628.9755.64731@leto.j.dn42>
Sender timestamp
1412247175
DKIM signature
missing
Download raw message
Patch: +125 -0
http://mumble.sourceforge.net/
Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming
---
 testing/mumble/APKBUILD              | 98 ++++++++++++++++++++++++++++++++++++
 testing/mumble/murmur.initd          | 13 +++++
 testing/mumble/murmur.post-deinstall |  4 ++
 testing/mumble/murmur.post-install   |  6 +++
 testing/mumble/murmur.pre-install    |  4 ++
 5 files changed, 125 insertions(+)
 create mode 100644 testing/mumble/APKBUILD
 create mode 100644 testing/mumble/murmur.initd
 create mode 100755 testing/mumble/murmur.post-deinstall
 create mode 100755 testing/mumble/murmur.post-install
 create mode 100755 testing/mumble/murmur.pre-install

diff --git a/testing/mumble/APKBUILD b/testing/mumble/APKBUILD
new file mode 100644
index 0000000..e53283c
--- /dev/null
+++ b/testing/mumble/APKBUILD
@@ -0,0 +1,98 @@
# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
pkgname=mumble
pkgver=1.2.8
pkgrel=0
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"
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=""
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
prepare() {
   local i
   cd "$_builddir"
   for i in $source; do
       case $i in
       *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
       esac
   done
}

build() {
   cd "$_builddir"
   qmake -recursive main.pro CONFIG+="no-speechd no-g15 no-update no-ice bundled-celt no-bundled-speex"
   make release
}

package() {
   cd "$_builddir"

   install -m755 -D ./release/mumble ${pkgdir}/usr/bin/mumble
   install -m755 -D ./release/libmumble.so.${pkgver} ${pkgdir}/usr/lib/mumble/libmumble.so.${pkgver}
   ln -s libmumble.so.${pkgver} ${pkgdir}/usr/lib/mumble/libmumble.so
   ln -s libmumble.so.${pkgver} ${pkgdir}/usr/lib/mumble/libmumble.so.1
   ln -s libmumble.so.${pkgver} ${pkgdir}/usr/lib/mumble/libmumble.so.1.2
   install -m755 -D ./release/plugins/liblink.so ${pkgdir}/usr/lib/mumble/liblink.so
   install -m755 -D ./release/plugins/libmanual.so ${pkgdir}/usr/lib/mumble/libmanual.so
   install -m755 -D ./release/libcelt* ${pkgdir}/usr/lib/mumble/
   install -m755 -d "${pkgdir}/usr/share/man/man1/"
   install -m644 ./man/${pkgname}.1 "${pkgdir}/usr/share/man/man1/"
   install -Dm644 ./LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}

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 -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/;\
       s/^#uname=$/uname=murmur/;\
       s/^#logfile=murmur.log$/logfile=\/var\/log\/murmur.log/;\
       s/^#pidfile=$/pidfile=\/var\/run\/murmur\/murmur.pid/' -i ${subpkgdir}/etc/murmur.ini
   install -Dm644 ./scripts/murmur.conf ${subpkgdir}/etc/dbus-1/system.d/murmurd.conf
   sed "s/mumble-server/murmur/" -i ${subpkgdir}/etc/dbus-1/system.d/murmurd.conf
   install -D -m755 ${srcdir}/murmur.initd "${subpkgdir}"/etc/init.d/murmur
}

murmur_doc() {
   pkgdesc="Murmur is the server component of Mumble"
   arch="noarch"

   cd "$_builddir"

   install -Dm644 ./man/murmurd.1 ${subpkgdir}/usr/share/man/man1/murmurd.1
   install -Dm644 ./LICENSE ${subpkgdir}/usr/share/licenses/murmur/LICENSE
}

md5sums="1a3ef91489ff674dfc010377d7721a28  mumble-1.2.8.tar.gz
3d6020246d92fe1ffdb8355bf34b460c  murmur.initd
b7dc31564e89e46f97fdb8bd3f345694  murmur.pre-install
508d6f8fbb4050b3e05439c8f07c046a  murmur.post-install
eec7a19fad4e0baf3b9839c6d514025f  murmur.post-deinstall"
sha256sums="4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159  mumble-1.2.8.tar.gz
60049e636b33bacb881b815e0ec07fb885d904675e99f95e263df11b4987531a  murmur.initd
97b336469364bc2a55ffc34b6adbddd85c427a4ccfbbf1b501d4d71b7f062f50  murmur.pre-install
af1bd38f46756218b47bcfddefdf3c2310d9f8e4ce717946af6c503214efbbc4  murmur.post-install
c2cabbf65b7ddbc7cc5d0d17977f345bb31a6f3d57980ef0679f03e87a81cb48  murmur.post-deinstall"
sha512sums="9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b  mumble-1.2.8.tar.gz
530f2334fa459501cb8dc621d4470e5b6338e3a7af09f21b2db79309b077b31227a4b793fd8762a84aae3bcc3530ea1ea3a2b5fc0d7fcd815751dd920f678a19  murmur.initd
bd0b956ace73af638e672f504c8b755dcf272183b0b87f787903ec61261189726e80f9ed21749d1d73c6b9da286f3aff9d5305e73cd28d920de73381b8f5d7a8  murmur.pre-install
9bd88ae23b39b7ae903d073d675ba4092aea83cc31620396fcd90092a5b30f04ee575158ceff7908f80da6763525f0a11b88821f6271d11c3ae6f4d9a5de1781  murmur.post-install
e525c54802848d5b89e9721f64cc9e6d756dca442a4753a623a8846261183f3b4caf912c05a6342d369b695174c1d42604fc363244a23cb8985165680d437335  murmur.post-deinstall"
diff --git a/testing/mumble/murmur.initd b/testing/mumble/murmur.initd
new file mode 100644
index 0000000..154db89
--- /dev/null
+++ b/testing/mumble/murmur.initd
@@ -0,0 +1,13 @@
#!/sbin/runscript

depends() {
   needs localmount
}

description="Mumble VoIP Server"
command="/usr/bin/murmurd"
command_args="-ini /etc/murmur.ini"
pidfile="/var/run/murmur/murmur.pid"

# uses the openrc templates for start()/stop()

diff --git a/testing/mumble/murmur.post-deinstall b/testing/mumble/murmur.post-deinstall
new file mode 100755
index 0000000..4088787
--- /dev/null
+++ b/testing/mumble/murmur.post-deinstall
@@ -0,0 +1,4 @@
#!/bin/sh
delgroup murmur
deluser murmur
exit 0
diff --git a/testing/mumble/murmur.post-install b/testing/mumble/murmur.post-install
new file mode 100755
index 0000000..5098307
--- /dev/null
+++ b/testing/mumble/murmur.post-install
@@ -0,0 +1,6 @@
#!/bin/sh
chown murmur /var/run/murmur/
chgrp murmur /var/run/murmur/
chown murmur /var/lib/murmur/
chgrp murmur /var/lib/murmur/
exit 0
diff --git a/testing/mumble/murmur.pre-install b/testing/mumble/murmur.pre-install
new file mode 100755
index 0000000..cb0e0eb
--- /dev/null
+++ b/testing/mumble/murmur.pre-install
@@ -0,0 +1,4 @@
#!/bin/sh
addgroup -S murmur
adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur
exit 0
-- 
2.0.0



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20141002162612.42127544@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20141002105628.9755.64731@leto.j.dn42> (view parent)
Sender timestamp
1412259972
DKIM signature
missing
Download raw message
On Thu, 2 Oct 2014 10:52:55 +0000
Johannes Matheis <jomat+alpinebuild@jmt.gr> wrote:

> http://mumble.sourceforge.net/
> Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming
> ---
>  testing/mumble/APKBUILD              | 98 ++++++++++++++++++++++++++++++++++++
>  testing/mumble/murmur.initd          | 13 +++++
>  testing/mumble/murmur.post-deinstall |  4 ++
>  testing/mumble/murmur.post-install   |  6 +++
>  testing/mumble/murmur.pre-install    |  4 ++
>  5 files changed, 125 insertions(+)
>  create mode 100644 testing/mumble/APKBUILD
>  create mode 100644 testing/mumble/murmur.initd
>  create mode 100755 testing/mumble/murmur.post-deinstall
>  create mode 100755 testing/mumble/murmur.post-install
>  create mode 100755 testing/mumble/murmur.pre-install

I get checksum error:

>>> mumble: Checking sha512sums...
mumble-1.2.8.tar.gz: OK
murmur.initd: FAILED
sha512sum: WARNING: 1 of 1 computed checksums did NOT match


-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Johannes Matheis <jomat+alpinebuild@jmt.gr>
Details
Message ID
<20141008084122.512.42759@leto.j.dn42>
In-Reply-To
<20141002162612.42127544@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1412757682
DKIM signature
missing
Download raw message
Quoting Natanael Copa (2014-10-02 14:26:12)
> I get checksum error:
> 
> >>> mumble: Checking sha512sums...
> mumble-1.2.8.tar.gz: OK
> murmur.initd: FAILED
> sha512sum: WARNING: 1 of 1 computed checksums did NOT match

I can confirm this is the sha512 sum on my local system of murmur.initd:
530f2334fa459501cb8dc621d4470e5b6338e3a7af09f21b2db79309b077b31227a4b793fd8762a84aae3bcc3530ea1ea3a2b5fc0d7fcd815751dd920f678a19

Can you try this patch instead?
https://github.com/jomat/aports/commit/07182ee9ecc45e42d392091c0b09b574b8f86a3a.patch

Thank you,
Johannes


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20141008120245.53085dc7@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20141002105628.9755.64731@leto.j.dn42> (view parent)
Sender timestamp
1412762565
DKIM signature
missing
Download raw message
The updated patch you sent me built. I have some comments on the
install scripts though. see below.

On Thu, 2 Oct 2014 10:52:55 +0000
Johannes Matheis <jomat+alpinebuild@jmt.gr> wrote:

> http://mumble.sourceforge.net/
> Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming
...

> diff --git a/testing/mumble/murmur.initd b/testing/mumble/murmur.initd
> new file mode 100644
> index 0000000..154db89
> --- /dev/null
> +++ b/testing/mumble/murmur.initd
> @@ -0,0 +1,13 @@
> +#!/sbin/runscript
> +
> +depends() {
> +   needs localmount
> +}
> +
> +description="Mumble VoIP Server"
> +command="/usr/bin/murmurd"
> +command_args="-ini /etc/murmur.ini"
> +pidfile="/var/run/murmur/murmur.pid"
> +
> +# uses the openrc templates for start()/stop()
> +
> diff --git a/testing/mumble/murmur.post-deinstall b/testing/mumble/murmur.post-deinstall
> new file mode 100755
> index 0000000..4088787
> --- /dev/null
> +++ b/testing/mumble/murmur.post-deinstall
> @@ -0,0 +1,4 @@
> +#!/bin/sh
> +delgroup murmur
> +deluser murmur
> +exit 0

We normally don't delete users on apk del.
Maybe we should start do so?


> diff --git a/testing/mumble/murmur.post-install b/testing/mumble/murmur.post-install
> new file mode 100755
> index 0000000..5098307
> --- /dev/null
> +++ b/testing/mumble/murmur.post-install
> @@ -0,0 +1,6 @@
> +#!/bin/sh
> +chown murmur /var/run/murmur/
> +chgrp murmur /var/run/murmur/

this should be done with:

start_pre() {
	checkpath --owner murmur:murmur --directory /var/run/murmur
}

in init.d script. /var/run might be mounted tmpfs after bootup so
anything under there must be created run time.

> +chown murmur /var/lib/murmur/
> +chgrp murmur /var/lib/murmur/

the dir permissions should be set in the apk. To do that you add:

pkgusers="murmur"
pkggroups="murmur"

in the apk build and in package() you do:

	chown murmur "$pkgdir"/var/lib/murmur/
	chgrp murmur "$pkgdir"/var/lib/murmur/

abuild should have given you warning about setting permissions from
post-install.

> +exit 0

> diff --git a/testing/mumble/murmur.pre-install b/testing/mumble/murmur.pre-install
> new file mode 100755
> index 0000000..cb0e0eb
> --- /dev/null
> +++ b/testing/mumble/murmur.pre-install
> @@ -0,0 +1,4 @@
> +#!/bin/sh
> +addgroup -S murmur
> +adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur
> +exit 0



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Details
Message ID
<20141008134408.512.26075@leto.j.dn42>
In-Reply-To
<20141008120245.53085dc7@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1412775848
DKIM signature
missing
Download raw message
Quoting Natanael Copa (2014-10-08 10:02:45)
> The updated patch you sent me built. I have some comments on the
> install scripts though. see below.

Thanks for implementing the improvements and pointing them out.

> We normally don't delete users on apk del.
> Maybe we should start do so?

It seems a bit messy if we create the user, but don't remove it without a
notice. Unmodified config files in /etc/ are also removed upon package
deletion.

> the dir permissions should be set in the apk. To do that you add:
> 
> pkgusers="murmur"
> pkggroups="murmur"

You accidentally used "mumble" in the APKGBUILD.
See http://sprunge.us/CBKb

Bye,
Johannes


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)