[patch] sys-auth/munge: restore stable initd script

0001-sys-auth-munge-restore-stable-initd-script.patch (text/plain), 5.24 KB, created by Chris Rorvick on 2019-07-21 15:37:28 UTC

From cafbce555ca8c438b955af5c3951eb9b5be12a4c Mon Sep 17 00:00:00 2001
From: Chris Rorvick <[e-mail]>
Date: Sun, 21 Jul 2019 10:35:01 -0500
Subject: [PATCH] sys-auth/munge: restore stable initd script

---
 .../{munged.confd => munged.confd-0.5.10}     |  0
 sys-auth/munge/files/munged.confd-0.5.13      | 13 +++++
 sys-auth/munge/files/munged.initd-0.5.10      | 47 +++++++++++++++++++
 .../{munged.initd => munged.initd-0.5.13}     |  0
 sys-auth/munge/munge-0.5.10-r2.ebuild         |  6 +--
 sys-auth/munge/munge-0.5.13-r1.ebuild         |  4 +-
 sys-auth/munge/munge-0.5.13.ebuild            |  4 +-
 7 files changed, 67 insertions(+), 7 deletions(-)
 rename sys-auth/munge/files/{munged.confd => munged.confd-0.5.10} (100%)
 create mode 100644 sys-auth/munge/files/munged.confd-0.5.13
 create mode 100644 sys-auth/munge/files/munged.initd-0.5.10
 rename sys-auth/munge/files/{munged.initd => munged.initd-0.5.13} (100%)

diff --git a/sys-auth/munge/files/munged.confd b/sys-auth/munge/files/munged.confd-0.5.10
similarity index 100%
rename from sys-auth/munge/files/munged.confd
rename to sys-auth/munge/files/munged.confd-0.5.10
diff --git a/sys-auth/munge/files/munged.confd-0.5.13 b/sys-auth/munge/files/munged.confd-0.5.13
new file mode 100644
index 00000000000..8ab2f69284a
--- /dev/null
+++ b/sys-auth/munge/files/munged.confd-0.5.13
@@ -0,0 +1,13 @@
+# Specify secret key file.  If the keyfile does not already exist
+# it will be created on first startup using pseudorandom data via
+# dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key
+KEYFILE="/etc/munge/munge.key"
+
+# Specify whether to check "/etc/group" mtime
+GROUP_CHECK_MTIME=1
+
+# Specify seconds between group info updates
+GROUP_UPDATE_TIME=3600
+
+# Specify number of threads to spawn
+NUM_THREADS=2
diff --git a/sys-auth/munge/files/munged.initd-0.5.10 b/sys-auth/munge/files/munged.initd-0.5.10
new file mode 100644
index 00000000000..6bb0a1097f2
--- /dev/null
+++ b/sys-auth/munge/files/munged.initd-0.5.10
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after localmount
+}
+
+check_key() {
+	[ -s "${KEYFILE}" ] && return 0
+	local old_umask=$(umask)
+	local ret
+	umask 037
+	dd if=/dev/urandom bs=1024 count=1 of="${KEYFILE}" 2>/dev/null; ret=$?
+	umask $old_umask
+	return $ret
+}
+
+start() {
+	ebegin "Starting munged"
+	if ! check_key; then
+		eerror "Failed to create munge key"
+		eend 1 && exit 1
+	fi
+	checkpath -d -m 755 -o munge:munge /var/run/munge
+	checkpath -d -m 711 -o munge:munge /var/lib/munge
+	checkpath -d -m 700 -o munge:munge /var/log/munge
+	checkpath -f -m 600 -o munge:munge "${KEYFILE}"
+	start-stop-daemon -S /usr/sbin/munged \
+		--user munge \
+		--group munge \
+		--pidfile /var/run/munge/munged.pid \
+		-- \
+		--key-file="${KEYFILE}" \
+		--group-check-mtime="${GROUP_CHECK_MTIME}" \
+		--group-update-time="${GROUP_UPDATE_TIME}" \
+		--num-threads="${NUM_THREADS}"
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping munged"
+	start-stop-daemon -K /usr/sbin/munged \
+		--pidfile /var/run/munge/munged.pid
+	eend ${?}
+}
+
diff --git a/sys-auth/munge/files/munged.initd b/sys-auth/munge/files/munged.initd-0.5.13
similarity index 100%
rename from sys-auth/munge/files/munged.initd
rename to sys-auth/munge/files/munged.initd-0.5.13
diff --git a/sys-auth/munge/munge-0.5.10-r2.ebuild b/sys-auth/munge/munge-0.5.10-r2.ebuild
index 7054e80d56d..3de5956974d 100644
--- a/sys-auth/munge/munge-0.5.10-r2.ebuild
+++ b/sys-auth/munge/munge-0.5.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -53,8 +53,8 @@ src_install() {
 	[ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default
 	[ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig
 
-	newconfd "${FILESDIR}"/${PN}d.confd ${PN}d || die
-	newinitd "${FILESDIR}"/${PN}d.initd ${PN}d || die
+	newconfd "${FILESDIR}"/${PN}d.confd-${PV} ${PN}d || die
+	newinitd "${FILESDIR}"/${PN}d.initd-${PV} ${PN}d || die
 }
 
 src_test() {
diff --git a/sys-auth/munge/munge-0.5.13-r1.ebuild b/sys-auth/munge/munge-0.5.13-r1.ebuild
index 0c918321242..9200cc67e3d 100644
--- a/sys-auth/munge/munge-0.5.13-r1.ebuild
+++ b/sys-auth/munge/munge-0.5.13-r1.ebuild
@@ -60,8 +60,8 @@ src_install() {
 		fi
 	done
 
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
+	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd-${PV})" ${PN}d
+	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd-${PV})" ${PN}d
 
 	if ! use static-libs; then
 		find "${D}" -name '*.la' -delete || die
diff --git a/sys-auth/munge/munge-0.5.13.ebuild b/sys-auth/munge/munge-0.5.13.ebuild
index 0c918321242..9200cc67e3d 100644
--- a/sys-auth/munge/munge-0.5.13.ebuild
+++ b/sys-auth/munge/munge-0.5.13.ebuild
@@ -60,8 +60,8 @@ src_install() {
 		fi
 	done
 
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
+	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd-${PV})" ${PN}d
+	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd-${PV})" ${PN}d
 
 	if ! use static-libs; then
 		find "${D}" -name '*.la' -delete || die
-- 
2.21.0