commit: 2277ce4f8842961ae619186c7204563dd1de3f88 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Fri May 30 11:09:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 8 04:53:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2277ce4f
net-voip/umurmur: add 0.3.1 Migrate to EAPI=8, switch to cmake buildsystem, update metadata.xml, use mbedtls:3, ebuild cleanup. Closes: https://bugs.gentoo.org/956829 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42346 Closes: https://github.com/gentoo/gentoo/pull/42346 Signed-off-by: Sam James <sam <AT> gentoo.org> net-voip/umurmur/Manifest | 1 + .../umurmur/files/umurmur-0.3.1-mbedtls-3.patch | 26 ++++++ net-voip/umurmur/metadata.xml | 5 - net-voip/umurmur/umurmur-0.3.1.ebuild | 103 +++++++++++++++++++++ 4 files changed, 130 insertions(+), 5 deletions(-) diff --git a/net-voip/umurmur/Manifest b/net-voip/umurmur/Manifest index 69d09e519784..c19cd2340d69 100644 --- a/net-voip/umurmur/Manifest +++ b/net-voip/umurmur/Manifest @@ -1 +1,2 @@ DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4 +DIST umurmur-0.3.1.tar.gz 94742 BLAKE2B cd4b715d19463816e886dddbc1520d3d4c050258c249722335f726b32821e145f8883c327b9877512b68aa5b905efb792441f7eff12f872fdde99eabe4905d01 SHA512 f0f38af67442660a45692010232a56c7e9c2bd96908898fe946f70e3f531d3d135059e3a8f88180aef0cef3f4883a591ae922a833652ed221214a12c757bbb42 diff --git a/net-voip/umurmur/files/umurmur-0.3.1-mbedtls-3.patch b/net-voip/umurmur/files/umurmur-0.3.1-mbedtls-3.patch new file mode 100644 index 000000000000..a9434adeeb7d --- /dev/null +++ b/net-voip/umurmur/files/umurmur-0.3.1-mbedtls-3.patch @@ -0,0 +1,26 @@ +From https://github.com/umurmur/umurmur/pull/216 +From: "Azamat H. Hackimov" <[email protected]> +Date: Fri, 30 May 2025 12:30:48 +0300 +Subject: [PATCH] Use configuration module from MbedTLS 3.6 + +Starting from 3.6.0, MbedTLS offers cmake configuration for easy integration. +Old versions of MbedTLS reached EOL, restricting minimal version to 3.6 LTS branch. +--- a/cmake/Modules/SelectTLSBackend.cmake ++++ b/cmake/Modules/SelectTLSBackend.cmake +@@ -23,16 +23,11 @@ function(SelectTLSBackend SSL) + endif() + elseif("${SSL}" STREQUAL "mbedtls") +- find_package(mbedTLS REQUIRED) ++ find_package(MbedTLS 3.6 REQUIRED) + +- if(MBEDTLS_FOUND) +- set(USE_MBEDTLS ON PARENT_SCOPE) +- +- set(LIBRARIES ${MBEDTLS_LIBRARIES}) +- set(INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR}) +- set(LIBRARY_DIR ${MBEDTLS_LIB_DIR}) +- endif() ++ set(USE_MBEDTLS ON PARENT_SCOPE) ++ set(LIBRARIES MbedTLS::mbedtls) + elseif("${SSL}" STREQUAL "gnutls") + find_package(GnuTLS 3 REQUIRED) diff --git a/net-voip/umurmur/metadata.xml b/net-voip/umurmur/metadata.xml index f3ecd2642bfb..367ad4699fe4 100644 --- a/net-voip/umurmur/metadata.xml +++ b/net-voip/umurmur/metadata.xml @@ -16,11 +16,6 @@ <email>[email protected]</email> <name>Martin Johansson</name> </maintainer> - <bugs-to>https://code.google.com/p/umurmur/issues/list</bugs-to> - <changelog> - https://code.google.com/p/umurmur/wiki/Changelog</changelog> - <doc lang="en">https://code.google.com/p/umurmur/w/list</doc> - <remote-id type="google-code">umurmur</remote-id> <remote-id type="github">umurmur/umurmur</remote-id> </upstream> </pkgmetadata> diff --git a/net-voip/umurmur/umurmur-0.3.1.ebuild b/net-voip/umurmur/umurmur-0.3.1.ebuild new file mode 100644 index 000000000000..5e00e5ad1a3d --- /dev/null +++ b/net-voip/umurmur/umurmur-0.3.1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd readme.gentoo-r1 + +DESCRIPTION="Minimalistic Murmur (Mumble server)" +HOMEPAGE="https://github.com/umurmur/umurmur"; +SRC_URI="https://github.com/umurmur/umurmur/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gnutls mbedtls shm" + +# ssl-provider precendence: gnutls, mbedtls and openssl if none specified +DEPEND=">=dev-libs/protobuf-c-1.0.0:= + dev-libs/libconfig:= + gnutls? ( + dev-libs/nettle:= + >=net-libs/gnutls-3.0.0:= + ) + !gnutls? ( + mbedtls? ( net-libs/mbedtls:3= ) + !mbedtls? ( dev-libs/openssl:0= ) + ) +" + +RDEPEND="${DEPEND} + acct-group/murmur + acct-user/murmur +" + +DOC_CONTENTS=" + A configuration file has been installed at /etc/umurmur/umurmur.conf - you + may want to review it. See also\n + https://github.com/umurmur/umurmur/wiki/Configuration " + +PATCHES=( +# "${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154 + "${FILESDIR}/umurmur-0.3.1-mbedtls-3.patch" +) + +get_ssl_impl() { + local ssl_provider=() + + use gnutls && ssl_provider+=( gnutls ) + use mbedtls && ssl_provider+=( mbedtls ) + + if ! use gnutls && ! use mbedtls ; then + ssl_provider+=( openssl ) + fi + echo ${ssl_provider[@]} +} + +pkg_pretend() { + local ssl_provider=( $(get_ssl_impl) ) + + if [[ ${#ssl_provider[@]} -gt 1 ]] ; then + ewarn "More than one ssl provider selected (${ssl_provider[@]})" + ewarn "defaulting to ${ssl_provider[0]}." + fi +} + +#src_prepare() { +# default +# eautoreconf +#} + +src_configure() { + local ssl_provider=( $(get_ssl_impl) ) + + local mycmakeargs=( + -DSSL="${ssl_provider[0]}" + -DUSE_SHAREDMEMORY_API=$(usex shm) + ) + + cmake_src_configure +} + +src_install() { + + cmake_src_install + + newinitd "${FILESDIR}"/umurmurd.initd umurmurd + newconfd "${FILESDIR}"/umurmurd.confd umurmurd + systemd_dounit "${FILESDIR}"/umurmurd.service + + dodoc AUTHORS ChangeLog README.md + + # Some permissions are adjusted as the config may contain a server + # password, and /etc/umurmur will typically contain the cert and the + # key used to sign it, which are read after priveleges are dropped. + fperms 0750 "/etc/umurmur" + fowners -R root:murmur "/etc/umurmur" + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +}
