rpms/munge
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update and add check-key-exists.patch back.

Browse Source
This commit is contained in:
Steve Traylen 2011-02-27 10:40:00 +01:00
parent 4cff475952
commit 5bf7d0ae36
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
check-key-exists.patch
View File

@ -1,17 +1,20 @@
diff -uNr munge-0.5.8.ORIG/src/etc/munge.init.in munge-0.5.8/src/etc/munge.init.in diff -uNr munge-0.5.10.ORIG/src/etc/munge.init.in munge-0.5.10/src/etc/munge.init.in
--- munge-0.5.8.ORIG/src/etc/munge.init.in 2009-07-22 23:51:58.211310282 +0200 --- munge-0.5.10.ORIG/src/etc/munge.init.in 2011-02-27 10:34:34.980855448 +0100
+++ munge-0.5.8/src/etc/munge.init.in 2009-07-22 23:53:58.585303749 +0200 +++ munge-0.5.10/src/etc/munge.init.in 2011-02-27 10:36:37.645394273 +0100
@@ -116,6 +116,13 @@ @@ -115,9 +115,16 @@
# According to LSB, running "start" on a service already running should be {
# considered successful. # Start the service.
## #
+# If there is no key then exit as a configuration error. +# If there is no key then exit as a configuration error.
+if [ ! -f /etc/munge/munge.key ] ; then +if [ ! -f /etc/munge/munge.key ] ; then
+ echo "/etc/munge/munge.key does not exist, generate with create-munge-key" + echo "/etc/munge/munge.key does not exist, generate with create-munge-key"
+ exit 6 + exit 6
+fi +fi
+ +
# Required by LSB, where running "start" on a service already running should be
# considered successful.
##
+ +
printf "Starting $DESC: " log_init "Starting $DESC" "$DAEMON_NAME"
case $SYSTEM in
DEBIAN) VARRUNDIR="$localstatedir/run/munge"

5
munge.spec
View File

@ -14,6 +14,9 @@ URL: http://munge.googlecode.com/
Source0: http://munge.googlecode.com/files/munge-%{version}.tar.bz2 Source0: http://munge.googlecode.com/files/munge-%{version}.tar.bz2
Source1: create-munge-key Source1: create-munge-key
Source2: munge.logrotate Source2: munge.logrotate
# Check the key exists in the init.d script rather than failing
Patch1: check-key-exists.patch
# Run as munge rather than deamon.
Patch2: runas-munge-user.patch Patch2: runas-munge-user.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -55,6 +58,7 @@ Runtime libraries for using MUNGE.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%patch2 -p1 %patch2 -p1
@ -195,6 +199,7 @@ exit 0
- Upstream to 0.5.10 - Upstream to 0.5.10
- Add _isa tags to all build requires. - Add _isa tags to all build requires.
- Remove unused patch munge-correct-service-name.patch, upstream fixed. - Remove unused patch munge-correct-service-name.patch, upstream fixed.
- Update and add check-key-exists.patch back.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.9-5 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild