* [gentoo-commits] repo/gentoo:master commit in: sys-auth/munge/files/
@ 2018-11-10 13:25 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2018-11-10 13:25 UTC (permalink / raw
To: gentoo-commits
commit: e96fb723bfab0c360e657b8d8bdca326cc9fa356
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 13:02:43 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 13:25:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96fb723
sys-auth/munge: Update init
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-auth/munge/files/munged.initd | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-auth/munge/files/munged.initd b/sys-auth/munge/files/munged.initd
index 6bb0a1097f2..0cbbe7213a9 100644
--- a/sys-auth/munge/files/munged.initd
+++ b/sys-auth/munge/files/munged.initd
@@ -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 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 ${?}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-auth/munge/files/
@ 2019-03-11 4:48 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2019-03-11 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 78c19d6b0415b3024d565a186cfe2996d561b498
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 5 16:57:28 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:46:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c19d6b
sys-auth/munge: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11273
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../fixed-recursive-use-of-make-in-makefiles.patch | 134 ---------------------
1 file changed, 134 deletions(-)
diff --git a/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch b/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch
deleted file mode 100644
index 1810abc91f4..00000000000
--- a/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 5634ce9890da48f9ea88feece856361ce8f1563c Mon Sep 17 00:00:00 2001
-From: Brendan Horan <brendan@horan.hk>
-Date: Tue, 23 Jun 2015 09:32:31 +0800
-Subject: [PATCH] Fixed recursive use of make in makefiles [ make -> $(MAKE) ]
-
----
- Makefile.in | 2 +-
- config/Make-inc.mk | 2 +-
- src/Makefile.in | 2 +-
- src/etc/Makefile.in | 2 +-
- src/libcommon/Makefile.in | 2 +-
- src/libmissing/Makefile.in | 2 +-
- src/libmunge/Makefile.in | 2 +-
- src/munge/Makefile.in | 2 +-
- src/munged/Makefile.in | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 8b8ca76..df53ff1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -830,7 +830,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/config/Make-inc.mk b/config/Make-inc.mk
-index 03a9622..edffea1 100644
---- a/config/Make-inc.mk
-+++ b/config/Make-inc.mk
-@@ -31,7 +31,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index c89ec9c..38c32da 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -648,7 +648,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
-index ffd41a0..d1eed84 100644
---- a/src/etc/Makefile.in
-+++ b/src/etc/Makefile.in
-@@ -451,7 +451,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/libcommon/Makefile.in b/src/libcommon/Makefile.in
-index 45419a8..8512b74 100644
---- a/src/libcommon/Makefile.in
-+++ b/src/libcommon/Makefile.in
-@@ -683,7 +683,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/libmissing/Makefile.in b/src/libmissing/Makefile.in
-index 10b1a78..187f4b3 100644
---- a/src/libmissing/Makefile.in
-+++ b/src/libmissing/Makefile.in
-@@ -572,7 +572,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/libmunge/Makefile.in b/src/libmunge/Makefile.in
-index 69dc54f..ab21fdc 100644
---- a/src/libmunge/Makefile.in
-+++ b/src/libmunge/Makefile.in
-@@ -752,7 +752,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/munge/Makefile.in b/src/munge/Makefile.in
-index f411d7e..411ec3b 100644
---- a/src/munge/Makefile.in
-+++ b/src/munge/Makefile.in
-@@ -752,7 +752,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
-diff --git a/src/munged/Makefile.in b/src/munged/Makefile.in
-index c14fd0b..5112da3 100644
---- a/src/munged/Makefile.in
-+++ b/src/munged/Makefile.in
-@@ -1243,7 +1243,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
- $(top_builddir)/src/libmissing/libmissing.la \
- $(top_builddir)/src/libmunge/libmunge.la \
- : force-dependency-check
-- @cd `dirname $@` && make `basename $@`
-+ @cd `dirname $@` && $(MAKE) `basename $@`
-
- force-dependency-check:
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-11 4:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-10 13:25 [gentoo-commits] repo/gentoo:master commit in: sys-auth/munge/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2019-03-11 4:48 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox