diff --git a/extra/mumble/.SRCINFO b/extra/mumble/.SRCINFO index 108f05f8f..4fbe032b4 100644 --- a/extra/mumble/.SRCINFO +++ b/extra/mumble/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = mumble pkgdesc = An Open Source, low-latency, high quality voice chat software - pkgver = 1.5.517 - pkgrel = 6 + pkgver = 1.5.613 + pkgrel = 2 url = https://www.mumble.info/ arch = x86_64 - license = BSD + license = BSD-3-Clause checkdepends = xorg-server-xvfb makedepends = avahi makedepends = boost @@ -34,29 +34,27 @@ pkgbase = mumble makedepends = libcap makedepends = systemd makedepends = zeroc-ice + depends = abseil-cpp depends = gcc-libs depends = glibc depends = qt5-base - source = https://github.com/mumble-voip/mumble/releases/download/v1.5.517/mumble-1.5.517.tar.gz - source = https://github.com/mumble-voip/mumble/releases/download/v1.5.517/mumble-1.5.517.tar.gz.sig + source = https://github.com/mumble-voip/mumble/releases/download/v1.5.613/mumble-1.5.613.tar.gz + source = https://github.com/mumble-voip/mumble/releases/download/v1.5.613/mumble-1.5.613.tar.gz.sig source = mumble-server.tmpfiles source = mumble-1.5.517-config_defaults.patch - source = mumble-1.5.517-pkgconf.patch - validpgpkeys = 1EDEBE2A93CB97FA9903D52E25F63C66245DFC60 - validpgpkeys = DA223B9603A9C7DD4691143E69F82AFF148DC0FF - sha512sums = f64147aa392519d1a7ef538d4fa23eaba0e21474bc9155e2c9e82cff859ff93c455a9ac18aed6197513486ebfca36560bd6de51327555dc7efab884a6a601d9f + validpgpkeys = 9B9ADC09AD09F76B10F87CBFCDB285AE2332CF8D + sha512sums = 91eadb6622b816fb814236726906188d03edf617cd0105567158c3c333f4f45f2e41813349b4a49a0823c5e59c86b07f6f61a1086e4723621383cdd590854f71 sha512sums = SKIP sha512sums = 350575aaf26ac8b7dc567018defd59913da957983986017e82a92e53f2a6d21473d9c2566177abd7611d95858a723bcf7f8dad49e8ca18d18b9fa4e75fb15ca6 sha512sums = c12f6269c5745532031f09fba5b9e3118e6beaf387ae0aaba6ff8380a1452b47f9f0d1cae04472a5763b3da695e03467de152a98bf03c01ae59bd6d553ec7100 - sha512sums = 32a4ac43ba7fb2c9bee61609a6edf17d7dc26b27e13ab425ee12aaf25cf1071d99a35c3b045ea23dec1281725790c5ef0de3c9fb5e594073281877ecca70396d - b2sums = d61c8118423af6514ed98a899916516920fae790ce39bdbbc76c4b14a298cf6989e73e2a0f977634968e758ff1f77a03727671617e9c867728f57995ff0cfec2 + b2sums = faaac904173facb0cc3ee240b2eba6e183a165beff75de03ec4b5f7753855e18e035947178a5449863250bfe5c51e9ab01ec4f6a7dcb2adb1f17d0e1815ad612 b2sums = SKIP b2sums = 476353608e794c431d9c79a54e11ad0442e3c96607b6492d3b2f5b589b96b120611e2e3dc1bb4f8e17c0911c238a9ca7b409277353fa08b9f690217f80d7dc4e b2sums = c607246691e9701f54b8d133db7d424a46ab94781178d172ae8a35df8ca505da59734ddae00789b93af316de3344d7e177a1a988e1438121e1e921ff59724f24 - b2sums = b3ea596e6603e0e0dbefdd90dea1dddd5609962e26594083c69bc28f69d306405f2ad7532d3d5360af0010ee9f06c7432089d1eca77a7ffa3df2bc7e76608106 pkgname = mumble pkgdesc = An Open Source, low-latency, high quality voice chat software (client) + depends = abseil-cpp depends = gcc-libs depends = glibc depends = qt5-base @@ -85,6 +83,7 @@ pkgname = mumble depends = speexdsp depends = libspeexdsp.so depends = xdg-utils + optdepends = bash: for mumble-overlay optdepends = lib32-glibc: for mumble-overlay optdepends = espeak-ng: Text-to-speech support optdepends = speech-dispatcher: Text-to-speech support @@ -92,11 +91,13 @@ pkgname = mumble pkgname = mumble-server pkgdesc = An Open Source, low-latency, high quality voice chat software (server) install = mumble-server.install + depends = abseil-cpp depends = gcc-libs depends = glibc depends = qt5-base depends = avahi depends = libdns_sd.so + depends = bash depends = libcap depends = libcap.so depends = openssl diff --git a/extra/mumble/.nvchecker.toml b/extra/mumble/.nvchecker.toml new file mode 100644 index 000000000..967793e70 --- /dev/null +++ b/extra/mumble/.nvchecker.toml @@ -0,0 +1,4 @@ +[mumble] +source = "git" +git = "https://github.com/mumble-voip/mumble" +prefix = "v" diff --git a/extra/mumble/PKGBUILD b/extra/mumble/PKGBUILD index 75708a53e..c22864701 100644 --- a/extra/mumble/PKGBUILD +++ b/extra/mumble/PKGBUILD @@ -10,14 +10,15 @@ # NOTE: needs to be built using multilib for mumble-overlay! pkgbase=mumble pkgname=(mumble mumble-server) -pkgver=1.5.517 -pkgrel=6 +pkgver=1.5.613 +pkgrel=2 pkgdesc="An Open Source, low-latency, high quality voice chat software" arch=(x86_64) url="https://www.mumble.info/" -license=(BSD) +license=(BSD-3-Clause) # shared depends depends=( + abseil-cpp gcc-libs glibc qt5-base @@ -65,29 +66,25 @@ source=( https://github.com/mumble-voip/mumble/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz{,.sig} mumble-server.tmpfiles $pkgbase-1.5.517-config_defaults.patch - $pkgbase-1.5.517-pkgconf.patch ) -sha512sums=('f64147aa392519d1a7ef538d4fa23eaba0e21474bc9155e2c9e82cff859ff93c455a9ac18aed6197513486ebfca36560bd6de51327555dc7efab884a6a601d9f' +sha512sums=('91eadb6622b816fb814236726906188d03edf617cd0105567158c3c333f4f45f2e41813349b4a49a0823c5e59c86b07f6f61a1086e4723621383cdd590854f71' 'SKIP' '350575aaf26ac8b7dc567018defd59913da957983986017e82a92e53f2a6d21473d9c2566177abd7611d95858a723bcf7f8dad49e8ca18d18b9fa4e75fb15ca6' - 'c12f6269c5745532031f09fba5b9e3118e6beaf387ae0aaba6ff8380a1452b47f9f0d1cae04472a5763b3da695e03467de152a98bf03c01ae59bd6d553ec7100' - '32a4ac43ba7fb2c9bee61609a6edf17d7dc26b27e13ab425ee12aaf25cf1071d99a35c3b045ea23dec1281725790c5ef0de3c9fb5e594073281877ecca70396d') -b2sums=('d61c8118423af6514ed98a899916516920fae790ce39bdbbc76c4b14a298cf6989e73e2a0f977634968e758ff1f77a03727671617e9c867728f57995ff0cfec2' + 'c12f6269c5745532031f09fba5b9e3118e6beaf387ae0aaba6ff8380a1452b47f9f0d1cae04472a5763b3da695e03467de152a98bf03c01ae59bd6d553ec7100') +b2sums=('faaac904173facb0cc3ee240b2eba6e183a165beff75de03ec4b5f7753855e18e035947178a5449863250bfe5c51e9ab01ec4f6a7dcb2adb1f17d0e1815ad612' 'SKIP' '476353608e794c431d9c79a54e11ad0442e3c96607b6492d3b2f5b589b96b120611e2e3dc1bb4f8e17c0911c238a9ca7b409277353fa08b9f690217f80d7dc4e' - 'c607246691e9701f54b8d133db7d424a46ab94781178d172ae8a35df8ca505da59734ddae00789b93af316de3344d7e177a1a988e1438121e1e921ff59724f24' - 'b3ea596e6603e0e0dbefdd90dea1dddd5609962e26594083c69bc28f69d306405f2ad7532d3d5360af0010ee9f06c7432089d1eca77a7ffa3df2bc7e76608106') + 'c607246691e9701f54b8d133db7d424a46ab94781178d172ae8a35df8ca505da59734ddae00789b93af316de3344d7e177a1a988e1438121e1e921ff59724f24') # See https://github.com/mumble-voip/mumble-gpg-signatures validpgpkeys=( - '1EDEBE2A93CB97FA9903D52E25F63C66245DFC60' # Mumble Automatic Build Infrastructure 2022 - 'DA223B9603A9C7DD4691143E69F82AFF148DC0FF' # Mumble Automatic Build Infrastructure 2023 + '9B9ADC09AD09F76B10F87CBFCDB285AE2332CF8D' # Mumble Automatic Build Infrastructure 2024 ) prepare() { # add default configuration options patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.5.517-config_defaults.patch - # fix the use of pkgconf in cmake: https://github.com/mumble-voip/mumble/issues/6038 - patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.5.517-pkgconf.patch + # ensure the default server directory is created + printf "d /var/lib/mumble-server 0750 _mumble-server _mumble-server -\n" >> $pkgbase-$pkgver/auxiliary_files/config_files/mumble-server.tmpfiles.in # protobuf 23 requires C++17 sed -e 's|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|' -i $pkgname-$pkgver/CMakeLists.txt } @@ -111,10 +108,12 @@ build() { -D bundled-json=OFF -D bundled-rnnoise=OFF -D bundled-speex=OFF + -D rnnoise=ON ) local cmake_options_server=( -D MUMBLE_INSTALL_ABS_SYSCONFDIR=/etc/mumble-server -D CMAKE_INSTALL_SYSCONFDIR=/etc + -D use-pkgconf-install-paths=ON -D client=OFF -B build-server ) @@ -154,6 +153,7 @@ package_mumble() { xdg-utils ) optdepends=( + 'bash: for mumble-overlay' 'espeak-ng: Text-to-speech support' 'speech-dispatcher: Text-to-speech support' ) @@ -166,6 +166,7 @@ package_mumble-server() { pkgdesc+=" (server)" depends+=( avahi libdns_sd.so + bash libcap libcap.so openssl libcrypto.so libssl.so protobuf libprotobuf.so @@ -178,8 +179,5 @@ package_mumble-server() { DESTDIR="$pkgdir" cmake --install build-server install -vDm 644 $pkgbase-$pkgver/LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" - # fix file mode: https://github.com/mumble-voip/mumble/issues/6039 - chmod 640 "$pkgdir/etc/$pkgbase/$pkgname.ini" - install -vDm 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } # vim: sw=2:ts=2 et: diff --git a/extra/mumble/keys/pgp/9B9ADC09AD09F76B10F87CBFCDB285AE2332CF8D.asc b/extra/mumble/keys/pgp/9B9ADC09AD09F76B10F87CBFCDB285AE2332CF8D.asc new file mode 100644 index 000000000..d26515222 --- /dev/null +++ b/extra/mumble/keys/pgp/9B9ADC09AD09F76B10F87CBFCDB285AE2332CF8D.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEZZIESBYJKwYBBAHaRw8BAQdAR77F3kIVrpWNgbY5A9vZVxuG5SDJeIb0Y+MK +82q34Te0T011bWJsZSBBdXRvbWF0aWMgQnVpbGQgSW5mcmFzdHJ1Y3R1cmUgMjAy +NCA8bXVtYmxlLWF1dG8tYnVpbGQtMjAyNEBtdW1ibGUuaW5mbz6IlgQTFggAPhYh +BJua3AmtCfdrEPh8v82yha4jMs+NBQJlkgRIAhsDBQkB49aABQsJCAcCBhUKCQgL +AgQWAgMBAh4BAheAAAoJEM2yha4jMs+No70BANkaEEnA6sLOnQ1REwz8t+HJS/Uu +4JrzaTfc9U8NTNsrAQD4rw9okTuZywzFc+NtGyMvUkmC3px6CktpS/kjaLwzDrg4 +BGWSBEgSCisGAQQBl1UBBQEBB0De/5Wgtd5j35eO98xf5Ct3yCKs5KVwZUfjeJ+p +UT3+SQMBCAeIfgQYFggAJhYhBJua3AmtCfdrEPh8v82yha4jMs+NBQJlkgRIAhsM +BQkB49aAAAoJEM2yha4jMs+NirgBAMAuRHOpRztcK9RrSXZKK9zzh4vLiMmxQx5U +YY5hsqh8APoCHZ9Oy6uQ2OyIvpwGQyNOPKS1CCMO9DzY8oK08tOyBA== +=csHG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/extra/mumble/mumble-1.5.517-pkgconf.patch b/extra/mumble/mumble-1.5.517-pkgconf.patch deleted file mode 100644 index edb17a867..000000000 --- a/extra/mumble/mumble-1.5.517-pkgconf.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ruN a/auxiliary_files/CMakeLists.txt b/auxiliary_files/CMakeLists.txt ---- a/auxiliary_files/CMakeLists.txt 2023-01-18 07:54:18.355957000 +0100 -+++ b/auxiliary_files/CMakeLists.txt 2023-01-22 00:35:54.387905181 +0100 -@@ -64,22 +64,12 @@ - file(COPY "config_files/mumble-server.conf" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - - if(UNIX AND NOT APPLE) -- get_pkgconf_variable( -- OUTPUT_VARIABLE SYSUSERS_DIR -- MODULE systemd -- VARIABLE_NAME sysusersdir -- QUIET -- ) -+ pkg_get_variable(SYSUSERS_DIR systemd sysusersdir) - if(NOT SYSUSERS_DIR) - # Fallback value, in case it could not be fetched via pkg-config - set(SYSUSERS_DIR "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig.d") - endif() -- get_pkgconf_variable( -- OUTPUT_VARIABLE SYSTEMD_SERVICE_DIR -- MODULE systemd -- VARIABLE_NAME systemd_system_unit_dir -- QUIET -- ) -+ pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemd_system_unit_dir) - if(NOT SYSTEMD_SERVICE_DIR) - # Default to /etc/systemd/system - This is not where packages ought to install their service files (rather - # it's where an admin is supposed to add their system files), but this seems to be the most consistent