rpms/portreserve/F-10 portreserve-initscript.patch, NONE, 1.1 portreserve.spec, 1.4, 1.5

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/portreserve/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8376

Modified Files:
	portreserve.spec 
Added Files:
	portreserve-initscript.patch 
Log Message:
* Thu Feb 26 2009 Tim Waugh <twaugh at redhat.com> 0.0.3-3
- Fixed initscript so that it will not be reordered to start after
  rpcbind (bug #487250).


portreserve-initscript.patch:

--- NEW FILE portreserve-initscript.patch ---
commit 7a57d36cdebfd12c20b557b7bc098855aa17cbac
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Feb 26 10:15:34 2009 +0000

    The initscript does not depend on the $network service (bug #487250).
    
    	* portreserve.init: The initscript does not depend on the
    	$network service (bug #487250).

diff --git a/ChangeLog b/ChangeLog
index 9b759be..32593fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-26  Tim Waugh  <twaugh at redhat.com>
+
+	* portreserve.init: The initscript does not depend on the
+	$network service (bug #487250).
+
 2008-07-01  Tim Waugh  <twaugh at redhat.com>
 
 	* configure.in: Version 0.0.3.
diff --git a/portreserve.init b/portreserve.init
index 1c2ebea..ee9482c 100644
--- a/portreserve.init
+++ b/portreserve.init
@@ -9,8 +9,6 @@
 #
 ### BEGIN INIT INFO
 # Provides:          portreserve
-# Required-Start:    $network
-# Required-Stop:     $network
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 6
 # Short-Description: Port reservation utility


Index: portreserve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/portreserve/F-10/portreserve.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- portreserve.spec	15 Oct 2008 13:18:05 -0000	1.4
+++ portreserve.spec	26 Feb 2009 11:53:45 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: TCP port reservation utility
 Name: portreserve
 Version: 0.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://cyberelk.net/tim/portreserve/
@@ -18,6 +18,8 @@
 BuildRequires: checkpolicy, selinux-policy-devel
 BuildRequires: hardlink
 
+Patch1: portreserve-initscript.patch
+
 %description
 The portreserve program aims to help services with well-known ports that
 lie in the portmap range.  It prevents portmap from a real service's port
@@ -37,6 +39,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .initscript
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
 %build
@@ -71,9 +74,9 @@
 rm -rf %{buildroot}
 
 %post
-if [ "$1" = 1 ]; then
-  /sbin/chkconfig --add portreserve
-fi
+# Do this unconditionally to fix up the initscript's start priority.
+# Earlier versions had an incorrect dependency (bug #487250).
+/sbin/chkconfig --add portreserve
 
 %preun
 if [ "$1" = 0 ]; then
@@ -122,6 +125,10 @@
 fi
 
 %changelog
+* Thu Feb 26 2009 Tim Waugh <twaugh at redhat.com> 0.0.3-3
+- Fixed initscript so that it will not be reordered to start after
+  rpcbind (bug #487250).
+
 * Wed Oct 15 2008 Tim Waugh <twaugh at redhat.com> 0.0.3-2
 - New selinux sub-package for SELinux policy.  Policy contributed by
   Miroslav Grepl (thanks!).