From 4d643b662f77ef9cc872089cad15cf5e7e1f70f2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Feb 2024 17:33:55 +0000 Subject: gentoo auto-resync : 09:02:2024 - 17:33:55 --- net-voip/murmur/Manifest | 4 +- net-voip/murmur/files/murmur.confd-r2 | 9 ++ net-voip/murmur/murmur-1.4.287-r2.ebuild | 200 +++++++++++++++++++++++++++++++ net-voip/murmur/murmur-9999.ebuild | 113 ++++++++--------- 4 files changed, 261 insertions(+), 65 deletions(-) create mode 100644 net-voip/murmur/files/murmur.confd-r2 create mode 100644 net-voip/murmur/murmur-1.4.287-r2.ebuild (limited to 'net-voip/murmur') diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest index ed1887196d91..cce734f0e2c4 100644 --- a/net-voip/murmur/Manifest +++ b/net-voip/murmur/Manifest @@ -1,4 +1,5 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171 +AUX murmur.confd-r2 179 BLAKE2B bd4eecb479d0c12ed0ec29de964c949bfdfc17c89a0134ffe23fcbc885e1e2a82ca8fc003c49d25ba9eed5861f39be18d4b1b6784427a6728e91e901de420427 SHA512 4b293834867a6cdb909f6bd8abc952ea2d955daa2e465b370f09f6f884e13f857dee74b2c5058121f8009db3d9b6c951bafa25b3862d7b0375eee034055d2eeb AUX murmur.initd-r2 511 BLAKE2B 2ff09ffdb62c5131f97f52960ac71360eb4959bb974c8cbc7f0fb0a27da91f34826a3065840be5a5ef9c24e243185cee0106c85285aa2aefbb534934cff9621d SHA512 3153254ec2c31e1b19e4991cce65ae9df7a609ad61c13ff569bbe822fc728dcf562c63c0a0d3198de3bd1599524db3f0e122004d1491b6bceafdbb28066a56cc AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 @@ -7,5 +8,6 @@ DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82 EBUILD murmur-1.4.287-r1.ebuild 4425 BLAKE2B 5e325e3e095da8dfa8682936acb258910edd61c3a1876127a448157dfbdd88bb75b2cf4a16dd1f01faa482aff2f506d1a38808fc5216c16353c7b5f254ec640a SHA512 45d736a6b4c57f28b345b8c1be3e1e7631b8d7c88dbc970d0c4081296232c24c77ac000ed9d67daabd1baab0812e1d4b1c4912c733ed37e7d2c330d5bd812c7f -EBUILD murmur-9999.ebuild 4101 BLAKE2B d500b2276ff4887282e5fff53be08363d3ffa004cc44656d7ced384f53d2ec802e52d47696a459d65e8cfa3e9491a04a1fea6a7fa2f89ddcd0a3792777567e6b SHA512 cec0393ada5defde9f602092f03430aab9ff86235b196bda026922b7f3c5f92c423fdcf2eaf9792c89e62951824b9b5ef1282ea68276c631ce046c72666544ca +EBUILD murmur-1.4.287-r2.ebuild 5078 BLAKE2B d3f23fa86c45e8c695da793bdade5708c49ac3628c60444da18f51860025fd1ccb294ce143f24ae00ca100a08f9a05909fc5e8b8058dc75c1ef3a4b8cd4d3d42 SHA512 08479c07acd4f132f06e6dd4ab9502196ed0d41df0212307d784a46e1c4bb31ffab3b62ecaaa654eca9ce8d95d222da5df0ea00470c3baa7faaa13005d5c7987 +EBUILD murmur-9999.ebuild 4145 BLAKE2B cb92119abf53bc148042fd6ad24147b48f05eef5f7eb04fdbc176daaf7f168f94c8b7511290ea6a9c64ac68780f63f34a9008b4536e4497e3b324718526f5a47 SHA512 0f1f3e60849a463e536db6fc4939af9264be38a8dd9f73409a7c589fba6f95006b9bdc2681a3e8d571c0dfce226184768341a6dd8aad04b5561fe98b2290794b MISC metadata.xml 590 BLAKE2B c8b9be5ba465c5a9a1d2b4ed33e5d1e86a148c6052eee9d39bd70c2073ec0578c3aad1ca14ddf2396611b43eb4c88d1dcae018d7c50530b64a1d8eecf807e3f0 SHA512 fef0cb21cb11c762b5ed70c89bd07dd30c3a0672b56cfdc09940b336cb7e13b2059fbde8eb738e355d7eb1a9e94d40e88f10073ed14f42f9edaf079d51f490d1 diff --git a/net-voip/murmur/files/murmur.confd-r2 b/net-voip/murmur/files/murmur.confd-r2 new file mode 100644 index 000000000000..c8d3230b9974 --- /dev/null +++ b/net-voip/murmur/files/murmur.confd-r2 @@ -0,0 +1,9 @@ +# where to look for the config file +MURMUR_CONF=/etc/murmur/mumble-server.ini + +# run as this user +MURMUR_USER=murmur + +# HOME directory of MURMUR_USER +MURMUR_HOME=/var/lib/murmur + diff --git a/net-voip/murmur/murmur-1.4.287-r2.ebuild b/net-voip/murmur/murmur-1.4.287-r2.ebuild new file mode 100644 index 000000000000..f439f3c88309 --- /dev/null +++ b/net-voip/murmur/murmur-1.4.287-r2.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles + +DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" +HOMEPAGE="https://wiki.mumble.info" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" + EGIT_SUBMODULES=( '-*' ) +else + MY_PN="mumble" + if [[ "${PV}" == *_pre* ]] ; then + MY_P="${MY_PN}-${PV}" + SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + else + MY_PV="${PV/_/-}" + MY_P="${MY_PN}-${MY_PV}" + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz + https://dl.mumble.info/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}.src" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz" + +LICENSE="BSD" +SLOT="0" +IUSE="+dbus grpc +ice test zeroconf" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/murmur + acct-user/murmur + >=dev-libs/openssl-1.0.0b:0= + >=dev-libs/protobuf-2.2.0:= + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + || ( + dev-qt/qtsql:5[sqlite] + dev-qt/qtsql:5[mysql] + ) + dev-qt/qtxml:5 + sys-apps/lsb-release + >=sys-libs/libcap-2.15 + dbus? ( dev-qt/qtdbus:5 ) + grpc? ( net-libs/grpc ) + ice? ( dev-libs/Ice:= ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" + +DEPEND="${RDEPEND} + dev-libs/boost + dev-qt/qttest:5 +" +BDEPEND=" + acct-group/murmur + acct-user/murmur + virtual/pkgconfig +" + +if [[ "${PV}" == *9999 ]] ; then + # Required for the mkini.sh script which calls perl multiple times + BDEPEND+=" + dev-lang/perl + " +fi + +DOC_CONTENTS=" + Useful scripts are located in /usr/share/doc/${PF}/scripts. + The defualt 'SuperUser' password will be written into the log file + when starting murmur for the first time. + If you want to set it yourself, please execute: + su murmur -s /bin/bash -c 'mumble-server -ini /etc/murmur/murmur.ini -supw ' + to set the build-in 'SuperUser' password before starting murmur. + Please restart dbus before starting murmur, or else dbus + registration will fail. +" + +PATCHES=( + "${WORKDIR}/mumble-1.4-openssl3.patch" + "${WORKDIR}/mumble-1.4-crypto-threads.patch" + "${WORKDIR}/mumble-1.4-odr.patch" +) + +src_prepare() { + if [[ "${PV}" == *9999 ]] ; then + pushd scripts &>/dev/null || die + ./mkini.sh || die + popd &>/dev/null || die + fi + + # Change dbus user from mumble-server to murmur + sed \ + -e 's:mumble-server:murmur:g' \ + -i "${S}"/scripts/murmur.conf || die + + # Adjust default server settings to be correct for our default setup + sed \ + -e 's:database=:database=/var/lib/murmur/database.sqlite:' \ + -e 's:;logfile=murmur.log:logfile=/var/log/murmur/murmur.log:' \ + -e 's:;pidfile=:pidfile=/run/murmur/murmur.pid:' \ + -i "${S}"/scripts/murmur.ini || die + + # Adjust systemd service file to our config location #689208 + sed \ + -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + -e "s@murmurd@mumble-server@" \ + -i scripts/${PN}.service || die + + cmake_src_prepare +} + +src_configure() { + myuse() { + [[ -n "${1}" ]] || die "myconf: No use flag given." + use ${1} || echo "no-${1}" + } + local mycmakeargs=( + -DBUILD_TESTING="$(usex test)" + -Dclient="OFF" + -Ddbus="$(usex dbus)" + -Dg15="OFF" + -Dgrpc="$(usex grpc)" + -Dice="$(usex ice)" + -Doverlay="OFF" + -Dserver="ON" + -Dzeroconf="$(usex zeroconf)" + ) + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) + fi + + # https://bugs.gentoo.org/832978 + # fix tests (and possibly runtime issues) on arches with unsigned chars + append-cxxflags -fsigned-char + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dodoc README.md CHANGES + + docinto scripts + dodoc -r scripts/server + docompress -x /usr/share/doc/${PF}/scripts + + local etcdir="/etc/murmur" + insinto ${etcdir} + doins scripts/${PN}.ini + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/murmur.logrotate murmur + + insinto /etc/dbus-1/system.d/ + doins scripts/murmur.conf + + insinto /usr/share/murmur/ + doins src/murmur/Murmur.ice + + # Copy over the initd file so we can modify it incase zeroconf support is on. + cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd + + if use zeroconf; then + sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die + fi + + newinitd "${T}"/murmur.initd murmur + newconfd "${FILESDIR}"/murmur.confd murmur + + systemd_dounit scripts/${PN}.service + newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf + + keepdir /var/lib/murmur /var/log/murmur + fowners -R murmur /var/lib/murmur /var/log/murmur + fperms 750 /var/lib/murmur /var/log/murmur + + # Fix permissions on config file as it might contain passwords. + # (bug #559362) + fowners root:murmur ${etcdir}/murmur.ini + fperms 640 ${etcdir}/murmur.ini + + doman man/mumble-server.1 + + readme.gentoo_create_doc +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + readme.gentoo_print_elog +} diff --git a/net-voip/murmur/murmur-9999.ebuild b/net-voip/murmur/murmur-9999.ebuild index 767d7a494eb3..b5d57c5bea38 100644 --- a/net-voip/murmur/murmur-9999.ebuild +++ b/net-voip/murmur/murmur-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,20 @@ HOMEPAGE="https://wiki.mumble.info" if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" - EGIT_SUBMODULES=( '-*' 3rdparty/FindPythonInterpreter 3rdparty/gsl 3rdparty/tracy ) + + # needed for the included 3rdparty license script, + # even if these components may not be compiled in + EGIT_SUBMODULES=( + '-*' + 3rdparty/cmake-compiler-flags + 3rdparty/FindPythonInterpreter + 3rdparty/gsl + 3rdparty/minhook + 3rdparty/opus + 3rdparty/rnnoise-src + 3rdparty/speexdsp + 3rdparty/tracy + ) else MY_PN="mumble" if [[ "${PV}" == *_pre* ]] ; then @@ -29,7 +42,7 @@ fi LICENSE="BSD" SLOT="0" -IUSE="+dbus grpc +ice test zeroconf" +IUSE="+ice test zeroconf" RESTRICT="!test? ( test )" RDEPEND=" @@ -38,6 +51,7 @@ RDEPEND=" >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 + dev-qt/qtdbus:5 dev-qt/qtnetwork:5[ssl] || ( dev-qt/qtsql:5[sqlite] @@ -46,8 +60,6 @@ RDEPEND=" dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 - dbus? ( dev-qt/qtdbus:5 ) - grpc? ( net-libs/grpc ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) " @@ -62,58 +74,43 @@ BDEPEND=" virtual/pkgconfig " -if [[ "${PV}" == *9999 ]] ; then - # Required for the mkini.sh script which calls perl multiple times - BDEPEND+=" - dev-lang/perl - " -fi - +DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS=" - Useful scripts are located in /usr/share/doc/${PF}/scripts.\n - Please execute:\n - murmurd -ini /etc/murmur/murmur.ini -supw \n - chown murmur:murmur /var/lib/murmur/murmur.sqlite\n - to set the build-in 'SuperUser' password before starting murmur. - Please restart dbus before starting murmur, or else dbus - registration will fail. +The default 'SuperUser' password will be written into the log file +when starting murmur for the first time. + +If you want to manually set a password yourself, please execute: +su murmur -s /bin/bash -c 'mumble-server -ini /etc/murmur/mumble-server.ini -supw ' + +This will set the built-in 'SuperUser' password to '' when starting murmur. " src_prepare() { - if [[ "${PV}" == *9999 ]] ; then - pushd scripts &>/dev/null || die - ./mkini.sh || die - popd &>/dev/null || die - fi - + # Adjust default server settings to be correct for our default setup sed \ - -e 's:mumble-server:murmur:g' \ - -e 's:/var/run:/run:g' \ - -i "${S}"/scripts/murmur.{conf,ini} || die + -e 's:database=:database=/var/lib/murmur/database.sqlite:' \ + -e 's:;logfile=mumble-server.log:logfile=/var/log/murmur/murmur.log:' \ + -e 's:;pidfile=:pidfile=/run/murmur/murmur.pid:' \ + -i auxiliary_files/mumble-server.ini || die - # Adjust systemd service file to our config location #689208 - sed \ - -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ - -e "s@murmurd@mumble-server@" \ - -i scripts/${PN}.service || die + # Replace the default group and user _mumble-server with murmur + grep -r -l _mumble-server auxiliary_files/ | xargs sed -i 's/_mumble-server/murmur/g' || die cmake_src_prepare } src_configure() { - myuse() { - [[ -n "${1}" ]] || die "myconf: No use flag given." - use ${1} || echo "no-${1}" - } local mycmakeargs=( -DBUILD_TESTING="$(usex test)" -Dclient="OFF" - -Ddbus="$(usex dbus)" -Dg15="OFF" - -Dgrpc="$(usex grpc)" -Dice="$(usex ice)" + -DMUMBLE_INSTALL_SYSCONFDIR="/etc/murmur" -Doverlay="OFF" -Dserver="ON" + -DMUMBLE_INSTALL_SERVICEFILEDIR=$(systemd_get_systemunitdir) + -DMUMBLE_INSTALL_SYSUSERSDIR=$(systemd_get_userunitdir) + -DMUMBLE_INSTALL_TMPFILESDIR="/usr/lib/tmpfiles.d" -Dzeroconf="$(usex zeroconf)" ) if [[ "${PV}" != 9999 ]] ; then @@ -132,44 +129,32 @@ src_install() { dodoc README.md - docinto scripts - dodoc -r scripts/server - docompress -x /usr/share/doc/${PF}/scripts - - local etcdir="/etc/murmur" - insinto ${etcdir} - doins scripts/${PN}.ini - insinto /etc/logrotate.d/ newins "${FILESDIR}"/murmur.logrotate murmur - insinto /etc/dbus-1/system.d/ - doins scripts/murmur.conf + # Copy over the initd file so we can modify it incase zeroconf support is on. + cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd || die - insinto /usr/share/murmur/ - doins src/murmur/Murmur.ice - - newinitd "${FILESDIR}"/murmur.initd-r2 murmur - newconfd "${FILESDIR}"/murmur.confd murmur + if use zeroconf; then + sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die + fi - systemd_dounit scripts/${PN}.service - newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf + newinitd "${T}"/murmur.initd murmur + newconfd "${FILESDIR}"/murmur.confd-r2 murmur keepdir /var/lib/murmur /var/log/murmur fowners -R murmur /var/lib/murmur /var/log/murmur fperms 750 /var/lib/murmur /var/log/murmur - # Fix permissions on config file as it might contain passwords. - # (bug #559362) - fowners root:murmur ${etcdir}/murmur.ini - fperms 640 ${etcdir}/murmur.ini - - newman man/mumble-server.1 murmurd.1 - readme.gentoo_create_doc } pkg_postinst() { - tmpfiles_process ${PN}.conf + tmpfiles_process mumble-server.conf readme.gentoo_print_elog + + if use zeroconf; then + elog "To turn on the zeroconf functionality, you need to uncomment and" + elog "change the 'bonjour=false' setting in mumble-server.ini to 'true'" + fi } -- cgit v1.2.3