diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-auth/munge/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-auth/munge/files')
-rw-r--r-- | sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch | 134 | ||||
-rw-r--r-- | sys-auth/munge/files/munged.confd | 13 | ||||
-rw-r--r-- | sys-auth/munge/files/munged.initd | 44 |
3 files changed, 191 insertions, 0 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 new file mode 100644 index 000000000000..1810abc91f4a --- /dev/null +++ b/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch @@ -0,0 +1,134 @@ +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: + diff --git a/sys-auth/munge/files/munged.confd b/sys-auth/munge/files/munged.confd new file mode 100644 index 000000000000..8ab2f69284a3 --- /dev/null +++ b/sys-auth/munge/files/munged.confd @@ -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 b/sys-auth/munge/files/munged.initd new file mode 100644 index 000000000000..7fee87e499ce --- /dev/null +++ b/sys-auth/munge/files/munged.initd @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + after localmount +} + +check_key() { + [ -s "${KEYFILE}" ] && return 0 + dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key 2>/dev/null || return 1 + chown munge:munge "${KEYFILE}" || return 1 + chmod 700 "${KEYFILE}" || return 1 +} + +start() { + ebegin "Starting munged" + if ! check_key; then + 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 \ + --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 ${?} +} + |