* [gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/files/, net-voip/murmur/
@ 2024-02-09 14:41 Kenton Groombridge
0 siblings, 0 replies; 2+ messages in thread
From: Kenton Groombridge @ 2024-02-09 14:41 UTC (permalink / raw
To: gentoo-commits
commit: cdf97e00d9cc8120deb8ed2e00589d56ce26adc5
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Wed May 31 17:49:43 2023 +0000
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 14:40:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf97e00
net-voip/murmur: update live ebuild
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
net-voip/murmur/files/murmur.confd-r2 | 9 +++
net-voip/murmur/murmur-9999.ebuild | 113 +++++++++++++++-------------------
2 files changed, 58 insertions(+), 64 deletions(-)
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-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 <pw>\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 <pw>'
+
+This will set the built-in 'SuperUser' password to '<pw>' 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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/files/, net-voip/murmur/
@ 2024-08-30 13:11 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2024-08-30 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 1be0cc2e8574d536b08ae99484c053da8adcbef2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 10:46:20 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 13:11:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be0cc2e
net-voip/murmur: drop 1.4.287-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-voip/murmur/Manifest | 4 -
net-voip/murmur/files/murmur.confd | 9 --
net-voip/murmur/metadata.xml | 1 -
net-voip/murmur/murmur-1.4.287-r2.ebuild | 200 -------------------------------
4 files changed, 214 deletions(-)
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index a47bcf364138..90406a4c2793 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -1,5 +1 @@
-DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b
-DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
diff --git a/net-voip/murmur/files/murmur.confd b/net-voip/murmur/files/murmur.confd
deleted file mode 100644
index 36367c51136b..000000000000
--- a/net-voip/murmur/files/murmur.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# where to look for the config file
-MURMUR_CONF=/etc/murmur/murmur.ini
-
-# run as this user
-MURMUR_USER=murmur
-
-# HOME directory of MURMUR_USER
-MURMUR_HOME=/var/lib/murmur
-
diff --git a/net-voip/murmur/metadata.xml b/net-voip/murmur/metadata.xml
index 60eba5013c64..4a342d839e56 100644
--- a/net-voip/murmur/metadata.xml
+++ b/net-voip/murmur/metadata.xml
@@ -6,7 +6,6 @@
<name>Kenton Groombridge</name>
</maintainer>
<use>
- <flag name="grpc">Use <pkg>net-libs/grpc</pkg> to enable remote control capabilities.</flag>
<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
</use>
<upstream>
diff --git a/net-voip/murmur/murmur-1.4.287-r2.ebuild b/net-voip/murmur/murmur-1.4.287-r2.ebuild
deleted file mode 100644
index 61f7d8175087..000000000000
--- a/net-voip/murmur/murmur-1.4.287-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# 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 <pw>'
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-30 13:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-09 14:41 [gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/files/, net-voip/murmur/ Kenton Groombridge
-- strict thread matches above, loose matches on Subject: below --
2024-08-30 13:11 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox