summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-auth/munge/ChangeLog10
-rw-r--r--sys-auth/munge/files/munged.initd7
-rw-r--r--sys-auth/munge/munge-0.5.10-r1.ebuild (renamed from sys-auth/munge/munge-0.5.10.ebuild)15
3 files changed, 16 insertions, 16 deletions
diff --git a/sys-auth/munge/ChangeLog b/sys-auth/munge/ChangeLog
index 3dea28863430..b2225c2df86f 100644
--- a/sys-auth/munge/ChangeLog
+++ b/sys-auth/munge/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-auth/munge
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.10 2011/10/04 17:27:37 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.11 2012/04/18 12:14:01 alexxy Exp $
+
+*munge-0.5.10-r1 (18 Apr 2012)
+
+ 18 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> +munge-0.5.10-r1.ebuild,
+ -munge-0.5.10.ebuild, files/munged.initd:
+ [sys-auth/munge] Move dir creation to init.d and eapi bump
04 Oct 2011; Justin Lecher <jlec@gentoo.org> munge-0.5.10.ebuild,
metadata.xml:
diff --git a/sys-auth/munge/files/munged.initd b/sys-auth/munge/files/munged.initd
index 74583857ad02..8d0d9e3414df 100644
--- a/sys-auth/munge/files/munged.initd
+++ b/sys-auth/munge/files/munged.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/files/munged.initd,v 1.1 2010/11/14 23:04:40 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/files/munged.initd,v 1.2 2012/04/18 12:14:00 alexxy Exp $
depend() {
after localmount
@@ -20,6 +20,9 @@ start() {
eerror "Failed to verify/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
start-stop-daemon -S /usr/sbin/munged \
--user munge \
--group munge \
diff --git a/sys-auth/munge/munge-0.5.10.ebuild b/sys-auth/munge/munge-0.5.10-r1.ebuild
index 6e0fd7989603..1cdafdd34935 100644
--- a/sys-auth/munge/munge-0.5.10.ebuild
+++ b/sys-auth/munge/munge-0.5.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.10.ebuild,v 1.2 2011/10/04 17:27:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.10-r1.ebuild,v 1.1 2012/04/18 12:14:01 alexxy Exp $
-EAPI=3
+EAPI=4
inherit eutils
DESCRIPTION="An authentication service for creating and validating credentials"
@@ -43,15 +43,6 @@ src_install() {
diropts -o munge -g munge -m700
dodir /etc/munge || die
- diropts -o munge -g munge -m711
- dodir /var/lib/munge || die
-
- diropts -o munge -g munge -m755
- dodir /var/run/munge || die
-
- diropts -o munge -g munge -m700
- dodir /var/log/munge || die
-
[ -d "${D}"/etc/init.d ] && rm -r "${D}"/etc/init.d
[ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default
[ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig