From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53590138334 for ; Sat, 10 Nov 2018 13:25:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 799B1E0BAB; Sat, 10 Nov 2018 13:25:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E667E0BAB for ; Sat, 10 Nov 2018 13:25:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83FCB335CF4 for ; Sat, 10 Nov 2018 13:25:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D8223DB for ; Sat, 10 Nov 2018 13:25:42 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1541856336.00465fcf6c74c73407d7247a915354fd7c0d8cf6.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/munge/, sys-auth/munge/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/munge/files/munged.initd sys-auth/munge/munge-0.5.13-r1.ebuild X-VCS-Directories: sys-auth/munge/files/ sys-auth/munge/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 00465fcf6c74c73407d7247a915354fd7c0d8cf6 X-VCS-Branch: master Date: Sat, 10 Nov 2018 13:25:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87adad3b-88a6-48aa-9ec1-38fbab7cb0d2 X-Archives-Hash: f1d5e8d7727404d72480b56442f25f4c commit: 00465fcf6c74c73407d7247a915354fd7c0d8cf6 Author: Justin Lecher gentoo org> AuthorDate: Sat Nov 10 12:04:54 2018 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Nov 10 13:25:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00465fcf sys-auth/munge: Fix munge.key permission problems Closes: https://bugs.gentoo.org/624962 Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-auth/munge/files/munged.initd | 4 +- sys-auth/munge/munge-0.5.13-r1.ebuild | 69 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/sys-auth/munge/files/munged.initd b/sys-auth/munge/files/munged.initd index e028d4ffd16..6bb0a1097f2 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() { @@ -25,7 +25,7 @@ start() { 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 640 -o root:munge "${KEYFILE}" + checkpath -f -m 600 -o munge:munge "${KEYFILE}" start-stop-daemon -S /usr/sbin/munged \ --user munge \ --group munge \ 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 00000000000..b84cd36bf18 --- /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 +}