gentoo resync : 18.11.2018

3 files changed, 77 insertions, 6 deletions

diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index b33a2d0d861d..0bbe66b2b825 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,8 +1,9 @@
 AUX fixed-recursive-use-of-make-in-makefiles.patch 4543 BLAKE2B 0c161e41a2097e2749697c40e85be5d36299f64e6c99cf0f6fe5841dcef5f16178608fc97e473e68843ae7b5e8e4352de23260a413d2e42e6e2ee8f9b511d668 SHA512 40b4a1c63283be83ed8355af31478e03f1aaf5de5e1c0fc2670e42a970a4097ff33e8885edcbea0e2ddd08ebc9a4f682a2df6f60a881eb1140c362d0e024bf4e
 AUX munged.confd 410 BLAKE2B e220ad22fc0367a9ec7766e768aac8907b34edaf5bfb00593e88dc5ce6f47cddae2df0cf1c7dd8a57ec3e644f1e489a5bae538992ce3fef191750e0ef1e7ff6d SHA512 571e9d1862be1e0389e1a45685853a1819f44cd7a89188223099703268f788f3097f8ee4e8abf36f30bb5fe81e7c57a9ec7981867b3528a37e63eb11f5b2e232
-AUX munged.initd 1100 BLAKE2B 21be4c74fadf9708b1a748da1e51fa8eab8a0f649c2ee38350a586e6ebeb1f7abb5d9f44db47b9dcad19361930ee0ac2282770ff9fc2df7b07314e700fa82681 SHA512 b3d95e7ccb18f75a4b19d6f2bd11c3484a82c0dc79dd58caaa74107bc6bbaf2d950c14123d5cec32e3762d7c3be89b20d8ef915796717bee82b953169b41793f
+AUX munged.initd 1127 BLAKE2B b0d43fe3f0c0354fc0935a0e3e3e0bf28770e5cba8b900c6bed7cf08cb57b742e71cba7adc7440c8564f6db208f6ef09ab4fe50a4381fb8988b4fed815d71cf3 SHA512 fc49ba42cc2b538fdbbd93f7422359d1410b4124e11afca7db0511da980360be14cf49aee829ed1f5762ad4723c68090088638c36d76b040fcafda063394adf2
 DIST munge-0.5.10.tar.bz2 424285 BLAKE2B 07c6423ba799400e9a99e3f33a7dee61ed35b8caa8b290f7da5ffc1e7fbdc37ad985d10101b9a18ccae4ca4274c44999549f9754b0e782cda98976b5f15e3f30 SHA512 b1b780d205d6cfbadfe6096156840d559c70de5b0023cbd604acfc29e1135036c98a949981d5c022e994c77213ee3d8d70e8fe825b645b030ad1adef92ed9479
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
 EBUILD munge-0.5.10-r2.ebuild 1279 BLAKE2B f10801f9e56cee24915bde79848d1716ddfeb38e19bed65a5711beb10582a606c90d0b80d25ad9b442c71dda98093229c1684eeba4338f160139ce4129304015 SHA512 6dfbdc292b7f2d7fe5b888bc5186ce099a6c55a3e5300788ba43f3d638a995a654a6e25917200a8166f4f737bbf9bca4a0ec08930e9f06a2f2122082fe7625b6
+EBUILD munge-0.5.13-r1.ebuild 1409 BLAKE2B 21a5653844d0373cd19f35f5ad89f243024758e2274e93ccbce751b021ff3e164d63ebeada9d20d151e3286493bf17317a9bd4b774bc27485d25603c4c239756 SHA512 cad8b218d7d6679f7f76739f9a33642f467e5a6a2370364a22818b462203d18f8bfd15011272b22d1c325b950c913fa0b53944f7cdb71e735d4f0e55c6cd4e2c
 EBUILD munge-0.5.13.ebuild 1412 BLAKE2B 5addc03e48062bb73eec8b25b0d35c612e9500d57ae6cda0301942c29fd43243c52001def1ff2cab749dcd08a551d01d92d146b17112b823a4f02f980009397f SHA512 9787c7291ad91f8c9d7f29283d2f54ddb125fbc4f3ac72d09277fc9da80f5a9d5c4728a37b092e01c94969c5553bc7e57be4484f51d98cea8347c6fb81a4752a
 MISC metadata.xml 1059 BLAKE2B 5b0f3f02298161ba2c929463fce32d74fdac822376dc7f9a852df211f6e37f3d53bfe93723b773f2268b5e2ffb58179562ed0ae26194ce024e3ad59915ef901e SHA512 0018c8101643023b01f621e7d5c23cfe6a3946dcb0f6e57ca05c998dc413b8cd1725eec88c5a6bdb5ddf2d6041793879aa04de6d53802f102b12070d0114c59d
diff --git a/sys-auth/munge/files/munged.initd b/sys-auth/munge/files/munged.initd
index e028d4ffd166..0cbbe7213a93 100644
--- a/sys-auth/munge/files/munged.initd
+++ b/sys-auth/munge/files/munged.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -22,15 +22,16 @@ start() {
 		eerror "Failed to create munge key"
 		eend 1 && exit 1
 	fi
-	checkpath -d -m 755 -o munge:munge /var/run/munge
+	checkpath -d -m 755 -o munge:munge /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 640 -o root:munge "${KEYFILE}"
+	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 \
+		--pidfile /run/munge/munged.pid \
 		-- \
+		--log-file=/var/log/munge/munged.log \
 		--key-file="${KEYFILE}" \
 		--group-check-mtime="${GROUP_CHECK_MTIME}" \
 		--group-update-time="${GROUP_UPDATE_TIME}" \
@@ -41,7 +42,7 @@ start() {
 stop() {
 	ebegin "Stopping munged"
 	start-stop-daemon -K /usr/sbin/munged \
-		--pidfile /var/run/munge/munged.pid
+		--pidfile /run/munge/munged.pid
 	eend ${?}
 }
 
diff --git a/sys-auth/munge/munge-0.5.13-r1.ebuild b/sys-auth/munge/munge-0.5.13-r1.ebuild
new file mode 100644
index 000000000000..b84cd36bf18c
--- /dev/null
+++ b/sys-auth/munge/munge-0.5.13-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools user prefix
+
+DESCRIPTION="An authentication service for creating and validating credentials"
+HOMEPAGE="https://github.com/dun/munge"
+SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gcrypt static-libs"
+
+DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	!gcrypt? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup munge
+	enewuser munge -1 -1 /var/lib/munge munge
+}
+
+src_prepare() {
+	default
+
+	hprefixify config/x_ac_path_openssl.m4
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-crypto-lib=$(usex gcrypt libgcrypt openssl) \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	local d
+
+	default
+
+	# 450830
+	if [ -d "${ED}"/var/run ]; then
+		rm -rf "${ED}"/var/run || die
+	fi
+
+	dodir /etc/munge
+
+	for d in "init.d" "default" "sysconfig"; do
+		if [ -d "${ED}"/etc/${d} ]; then
+			rm -r "${ED}"/etc/${d} || die
+		fi
+	done
+
+	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
+	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}