Remove unused patch munge-correct-service-name.patch, upstream fixed.

This commit is contained in:
Steve Traylen 2011-02-27 10:32:02 +01:00
parent 64d8dce23e
commit 4cff475952
4 changed files with 1 additions and 59 deletions

View File

@ -1,22 +0,0 @@
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 2007-02-04 08:52:37.000000000 +0100
+++ munge-0.5.8/src/etc/munge.init.in 2009-06-12 11:46:40.000000000 +0200
@@ -7,7 +7,7 @@
# Written by Chris Dunlap <cdunlap@llnl.gov>.
# UCRL-CODE-155910.
###############################################################################
-# chkconfig: 345 40 60
+# chkconfig: - 40 60
###############################################################################
### BEGIN INIT INFO
# Provides: munge
@@ -15,8 +15,8 @@
# Required-Stop: $named $time
# Should-Start: $local_fs $syslog
# Should-Stop: $local_fs $syslog
-# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
+# Short-Description: Start/Stop the MUNGE authentication service.
# Description: Start/Stop the MUNGE authentication service.
### END INIT INFO
###############################################################################

View File

@ -1,12 +0,0 @@
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-09-26 11:13:03.929914545 +0200
+++ munge-0.5.8/src/etc/munge.init.in 2009-09-26 11:17:04.830846880 +0200
@@ -42,7 +42,7 @@
PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
DAEMON_NAME="`basename \"$DAEMON\"`"
-SERVICE_NAME="`basename \"$0\" .init`"
+SERVICE_NAME="munge"
SIGTERM_TIMEOUT="3"
# Read configuration defaults to override variables:

View File

@ -15,10 +15,6 @@ Source0: http://munge.googlecode.com/files/munge-%{version}.tar.bz2
Source1: create-munge-key
Source2: munge.logrotate
Patch2: runas-munge-user.patch
# Was loading /etc/sysconfig/munge wrongly on reboot.
# Fixed upstream already for next release.
# https://bugzilla.redhat.com/show_bug.cgi?id=525732
Patch5: %{name}-correct-service-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel%{?_isa} bzip2-devel%{?_isa} openssl-devel%{?_isa}
@ -198,6 +194,7 @@ exit 0
* Sun Feb 27 2011 Steve Traylen <steve.traylen@cern.ch> - 0.5.10-1
- Upstream to 0.5.10
- Add _isa tags to all build requires.
- Remove unused patch munge-correct-service-name.patch, upstream fixed.
* 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

View File

@ -1,21 +0,0 @@
diff -uNr munge-0.5.8.ORIG/src/libmunge/munge.h munge-0.5.8/src/libmunge/munge.h
--- munge-0.5.8.ORIG/src/libmunge/munge.h 2009-07-22 22:20:01.358333769 +0200
+++ munge-0.5.8/src/libmunge/munge.h 2009-07-22 22:23:55.773390795 +0200
@@ -31,17 +31,6 @@
#include <sys/types.h>
-/*****************************************************************************
- * Got GPL?
- *****************************************************************************/
-
-#if ! GPL_LICENSED
-# error By linking against libmunge, the derivative
-# error work becomes licensed under the terms of the
-# error GNU General Public License. Acknowledge by
-# error defining the GPL_LICENSED preprocessor macro.
-#endif /* !GPL_LICENSED */
-
/*****************************************************************************
* Got C++?