Date: Monday, October 5, 2020 @ 17:25:49 Author: dvzrv Revision: 718765
upgpkg: mumble 1.3.3-1: Upgrade to 1.3.3. Turn into a split package for mumble and murmur. Added: mumble/trunk/murmur.dbus.conf mumble/trunk/murmur.install mumble/trunk/murmur.service mumble/trunk/murmur.sysusers mumble/trunk/murmur.tmpfiles Modified: mumble/trunk/PKGBUILD ------------------+ PKGBUILD | 94 ++++++++++++++++++++++++++++++++++++++++++----------- murmur.dbus.conf | 22 ++++++++++++ murmur.install | 6 +++ murmur.service | 15 ++++++++ murmur.sysusers | 1 murmur.tmpfiles | 2 + 6 files changed, 122 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-05 17:14:00 UTC (rev 718764) +++ PKGBUILD 2020-10-05 17:25:49 UTC (rev 718765) @@ -4,26 +4,55 @@ # Contributor: [email protected] # Contributor: Doc Angelo -pkgname=mumble -pkgver=1.3.2 -pkgrel=2 +pkgbase=mumble +pkgname=('mumble' 'murmur') +pkgver=1.3.3 +pkgrel=1 +pkgdesc="An Open Source, low-latency, high quality voice chat software" arch=('x86_64') -pkgdesc="A voice chat application similar to TeamSpeak" +url="https://www.mumble.info/"; license=('BSD') -depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libspeechd' 'libx11' 'libxi' -'lsb-release' 'openssl' 'opus' 'qt5-base' 'qt5-svg' 'speex' 'xdg-utils') -makedepends=('alsa-lib' 'avahi' 'boost' 'jack' 'libpulse' 'libsndfile' 'mesa' -'protobuf' 'python' 'qt5-tools') -optdepends=('speech-dispatcher: Text-to-speech support' - 'espeak-ng: Text-to-speech support') -url="https://www.mumble.info/"; -source=("https://github.com/mumble-voip/mumble/releases/download/${pkgver}/mumble-${pkgver}.tar.gz"{,.sig}) -sha512sums=('3f5e3b586efbe9b49c7f14119072f4842bbd885f9c5145cdaa129a87c7fc85107d0735a3107f5a2789cec9fdadda1200ab4a6d76c3caee409d3e38406a8ba27f' - 'SKIP') +# shared depends +depends=('gcc-libs' 'glibc' 'lsb-release' 'openssl' 'qt5-base') +# shared makedepends +makedepends=('avahi' 'boost' 'protobuf' 'python' 'qt5-tools') +# mumble makedepends +makedepends+=('alsa-lib' 'hicolor-icon-theme' 'jack' 'libpulse' 'libsndfile' +'libspeechd' 'libx11' 'libxi' 'mesa' 'opus' 'qt5-svg' 'speex' 'xdg-utils') +# murmur makedepends +makedepends+=('grpc' 'libcap' 'zeroc-ice') +source=("https://github.com/mumble-voip/mumble/releases/download/${pkgver}/mumble-${pkgver}.tar.gz"{,.sig} + "murmur.dbus.conf" + "murmur.service" + "murmur.sysusers" + "murmur.tmpfiles") +sha512sums=('be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3' + 'SKIP' + '97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a' + '2059eeac32cc078168a2ea56fe3034df69814516303adeffb8062c7b90a88177a536e6a6742196ee90370084d4e536f825b1744f8bed2bb704159a8a8bccb606' + '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74' + '411784e8e0dcf6c163780ae895ae1a6bdad0bb2dd2b128911c484ac3eff073d95c5791b625493a2b8296d24bd7e6ac72d3c42180817e48b29f0c6a8fd841807c') +b2sums=('e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd' + 'SKIP' + 'a416d071d9658fc3f3ea267d6ff24237317f5c05b59fe1578e5a4cb4911840896bf5e524a143f5c70a797da9f343312468720f03343b4b66bea20e94aa316cc2' + 'd3ff1099c98ccb01cb96608c9ce328b654fe8f6c1922cdb602223ba66267655b569b7113ad24820e37989448695b874872279d49f94d44ab569a228cf545498f' + '9909371a0d1c06d2aa00f161aebb19266aad0253b407dd01da5325f4f307678bba28a89596bd2ec97df5844068856c10bb4b10acad7bf170dd2853b3e11c48cd' + '999b2848c718f25a2d8257595194521e08d36d101906d76b137218f0a19f2451b7e1adc0c013e1f1c3448145b89a1e88f46cb1c9da27777737379227d3574d10') validpgpkeys=('76B50270322F0E3D78DCE8298AA328A315175AE3') # Mumble Automatic Build Infrastructure 2020 <[email protected]> +prepare() { + cd "${pkgbase}-${pkgver}" + # set default configuration for murmur + sed -e "1i; vi:ft=cfg" \ + -e "s|database=|database=/var/db/murmur/murmur.sqlite|" \ + -e "s|;logfile=murmur.log|logfile=|" \ + -e "s|;uname=|uname=murmur|" \ + -i scripts/murmur.ini +} + build() { cd "$pkgname-$pkgver" + # build mumble qmake-qt5 main.pro \ CONFIG+="no-bundled-opus no-bundled-speex no-g15 no-xevie no-server \ no-embed-qt-translations no-update packaged" \ @@ -30,12 +59,21 @@ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" \ INCLUDEPATH+="/usr/include/speech-dispatcher" make release + # build murmur + qmake-qt5 main.pro CONFIG+="no-client grpc" + make release } -package() { - depends+=('libasound.so' 'libdns_sd.so' 'libjack.so' 'libprotobuf.so' - 'libpulse.so' 'libsndfile.so') - cd "$pkgname-$pkgver" +package_mumble() { + pkgdesc+=" (client)" + # NOTE: opus is dlopen'ed + depends+=('hicolor-icon-theme' 'libasound.so' 'libdns_sd.so' 'libjack.so' + 'libprotobuf.so' 'libpulse.so' 'libsndfile.so' 'libspeechd' 'libx11' 'libxi' + 'opus' 'qt5-svg' 'speex' 'xdg-utils') + optdepends=('speech-dispatcher: Text-to-speech support' + 'espeak-ng: Text-to-speech support') + + cd "$pkgbase-$pkgver" # mumble has no install target: https://github.com/mumble-voip/mumble/issues/1029 # binaries and scripts install -vDm 755 release/mumble -t "$pkgdir/usr/bin" @@ -60,4 +98,24 @@ # license install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" } + +package_murmur() { + pkgdesc+=" (server)" + depends+=('grpc' 'libcap.so' 'libdns_sd.so' 'libprotobuf.so' 'zeroc-ice') + backup=("etc/murmur.ini") + install="murmur.install" + + cd "${pkgbase}-${pkgver}" + # murmur has no install target: https://github.com/mumble-voip/mumble/issues/1029 + install -vDm 755 release/murmurd -t "${pkgdir}"/usr/bin + install -vDm 640 scripts/murmur.ini -t "${pkgdir}"/etc + install -vDm 644 "${srcdir}"/murmur.dbus.conf "${pkgdir}"/usr/share/dbus-1/system.d/murmur.conf + install -vDm 644 README -t "${pkgdir}/usr/share/doc/${pkgname}" + install -vDm 644 man/murmur*.1 -t "${pkgdir}/usr/share/man/man1/" + install -vDm 644 "${srcdir}"/murmur.service -t "${pkgdir}/usr/lib/systemd/system/" + install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -vDm 644 "${srcdir}"/murmur.sysusers "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + install -vDm 644 "${srcdir}"/murmur.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + install -vDm 644 src/murmur/{Murmur.ice,MurmurRPC.proto} -t "${pkgdir}/usr/share/${pkgname}" +} # vim: sw=2:ts=2 et: Added: murmur.dbus.conf =================================================================== --- murmur.dbus.conf (rev 0) +++ murmur.dbus.conf 2020-10-05 17:25:49 UTC (rev 718765) @@ -0,0 +1,22 @@ +<!-- vi: set ft=xml: --> +<!-- + As described in http://mumble.sourceforge.net/DBus, + but with different username +--> +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";> +<busconfig> + + <policy user="murmur"> + <allow own="net.sourceforge.mumble.murmur"/> + </policy> + <policy user="root"> + <allow own="net.sourceforge.mumble.murmur"/> + </policy> + + <policy context="default"> + <allow send_destination="net.sourceforge.mumble.murmur"/> + <allow receive_sender="net.sourceforge.mumble.murmur"/> + </policy> +</busconfig> Added: murmur.install =================================================================== --- murmur.install (rev 0) +++ murmur.install 2020-10-05 17:25:49 UTC (rev 718765) @@ -0,0 +1,6 @@ +post_install() { + echo "You might have to reload dbus before launching murmur:" + echo " systemctl reload dbus" + echo "Don't forget to set the superuser password:" + echo " murmurd -ini /etc/murmur.ini -supw <your-password>" +} Added: murmur.service =================================================================== --- murmur.service (rev 0) +++ murmur.service 2020-10-05 17:25:49 UTC (rev 718765) @@ -0,0 +1,15 @@ +[Unit] +Description=Mumble Daemon +After=network.target + +[Service] +Type=simple +ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini -fg +Restart=always +PrivateDevices=true +PrivateTmp=true +ProtectSystem=full +ProtectHome=true + +[Install] +WantedBy=multi-user.target Added: murmur.sysusers =================================================================== --- murmur.sysusers (rev 0) +++ murmur.sysusers 2020-10-05 17:25:49 UTC (rev 718765) @@ -0,0 +1 @@ +u murmur 122 "Murmur User" /var/db/murmur Added: murmur.tmpfiles =================================================================== --- murmur.tmpfiles (rev 0) +++ murmur.tmpfiles 2020-10-05 17:25:49 UTC (rev 718765) @@ -0,0 +1,2 @@ +z /etc/murmur.ini 0640 root murmur +d /var/db/murmur 0750 murmur murmur -
