commit: 0dc3f021d5f7836ab7a492c6ae0540a5a829df11 Author: Kenton Groombridge <concord <AT> gentoo <DOT> org> AuthorDate: Sun May 4 17:35:25 2025 +0000 Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org> CommitDate: Sun May 4 17:35:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc3f021
net-voip/murmur: drop 1.5.634 Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org> net-voip/murmur/Manifest | 1 - ....5.634-remove-redundant-OpenSSL-locking-c.patch | 54 ------- net-voip/murmur/murmur-1.5.634.ebuild | 168 --------------------- 3 files changed, 223 deletions(-) diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest index 1a2b158b64e6..6a3cc091b49d 100644 --- a/net-voip/murmur/Manifest +++ b/net-voip/murmur/Manifest @@ -1,2 +1 @@ -DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59 DIST mumble-1.5.735.tar.gz 26010842 BLAKE2B 3eeb3e51f691f2179848341ba9e7d31a31cd1a66bd9c1edabeec90c99885a9630c74374d8c357d5fbfb9ee205d63aceeabcafd718350cc34c57c4fe1e7a5bf94 SHA512 1dba58e6f39dbef88c6e0d1501530bee62af5bd6c798dcfdbe6c9d94c1ec22ab91d157ba3ccb96d810daf31907ac2bbec876be20b8c9613664488e6bb03a5b5b diff --git a/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch b/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch deleted file mode 100644 index 1e8806bda2fe..000000000000 --- a/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 2be534747d2bd111e64fb163120caa6c78d04abe Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <[email protected]> -Date: Mon, 16 Sep 2024 18:16:49 +0200 -Subject: [PATCH] FIX(client, server): Remove redundant OpenSSL locking - callback check -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -CRYPTO_get_locking_callback() has been defined to NULL since OpenSSL -1.1.0. This check therefore doesn't do anything in any supported -version of OpenSSL: - -https://github.com/openssl/openssl/blob/abd30777cc72029e8a44e4b67201cae8ed3d19c1/include/openssl/crypto.h#L220 - -This fixes the following compiler error that I saw with GCC 14: - -/build/source/src/SSL.cpp: In static member function ‘static void MumbleSSL::initialize()’: -/build/source/src/SSL.cpp:36:14: error: converting to ‘bool’ from ‘std::nullptr_t’ requires direct-initialization [-fpermissive] - 36 | if (!CRYPTO_get_locking_callback()) { - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - -(cherry picked from commit 56945a9dfb62d29dccfe561572ebf64500deaed1) ---- - src/SSL.cpp | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/src/SSL.cpp b/src/SSL.cpp -index bb30f7e9f..72161009c 100644 ---- a/src/SSL.cpp -+++ b/src/SSL.cpp -@@ -24,18 +24,7 @@ void MumbleSSL::initialize() { - SSL_library_init(); // Safe to discard return value, per OpenSSL man pages. - SSL_load_error_strings(); - -- // Determine if a locking callback has not been set. -- // This should be the case if there are multiple copies -- // of OpensSSL in the address space. This is mostly due -- // to Qt dynamically loading OpenSSL when it is not -- // configured with -openssl-linked. -- // -- // If we detect that no locking callback is configured, we -- // have to set it up ourselves to allow multi-threaded use -- // of OpenSSL. -- if (!CRYPTO_get_locking_callback()) { -- SSLLocks::initialize(); -- } -+ SSLLocks::initialize(); - } - - void MumbleSSL::destroy() { --- -2.46.2 - diff --git a/net-voip/murmur/murmur-1.5.634.ebuild b/net-voip/murmur/murmur-1.5.634.ebuild deleted file mode 100644 index 64472a63810f..000000000000 --- a/net-voip/murmur/murmur-1.5.634.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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"; - - # 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/flag-icons - 3rdparty/minhook - 3rdparty/speexdsp - 3rdparty/tracy - ) -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"; - S="${WORKDIR}/${MY_PN}-${PV/_*}" - fi - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="+ice test zeroconf" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/murmur - acct-user/murmur - dev-cpp/ms-gsl - >=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] - dev-qt/qtsql:5[mysql] - ) - dev-qt/qtxml:5 - sys-apps/lsb-release - >=sys-libs/libcap-2.15 - 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 -" - -PATCHES=( - # fix build on musl, bug #888960 - "${FILESDIR}"/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch -) - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -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 <pw>' - -This will set the built-in 'SuperUser' password to '<pw>' when starting murmur. -" - -src_prepare() { - # Adjust default server settings to be correct for our default setup - sed \ - -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 - - # 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() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -Dbundled-gsl="OFF" - -Dclient="OFF" - -Dice="$(usex ice)" - -DMUMBLE_INSTALL_SYSCONFDIR="/etc/murmur" - -Dserver="ON" - -DMUMBLE_INSTALL_SERVICEFILEDIR=$(systemd_get_systemunitdir) - -DMUMBLE_INSTALL_SYSUSERSDIR=$(systemd_get_userunitdir) - -DMUMBLE_INSTALL_TMPFILESDIR="/usr/lib/tmpfiles.d" - -Dwarnings-as-errors="OFF" - -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 - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/murmur.logrotate murmur - - # Copy over the initd file so we can modify it incase zeroconf support is on. - cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd || die - - 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-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 - - mv "${ED}"/etc/murmur/mumble-server.ini "${ED}"/etc/murmur/murmur.ini || die - mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \ - "${D}/$(systemd_get_systemunitdir)/murmur.service" || die - sed -i 's|mumble-server\.ini|murmur.ini|' "${D}/$(systemd_get_systemunitdir)/murmur.service" || die - - readme.gentoo_create_doc -} - -pkg_postinst() { - 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 -}
