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

check-key-exists.patch

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

munge.spec

@@ -14,6 +14,9 @@ URL:            http://munge.googlecode.com/
 Source0:        http://munge.googlecode.com/files/munge-%{version}.tar.bz2
 Source1:        create-munge-key
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +58,7 @@ Runtime libraries for using MUNGE.
 
 %prep
 %setup -q
+%patch1 -p1
 %patch2 -p1
 
 
@@ -195,6 +199,7 @@ exit 0
 - Upstream to 0.5.10
 - Add _isa tags to all build requires.
 - 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild