rpms/sysklogd/devel sysklogd-1.4.2rh-reload.patch, NONE, 1.1 sysklogd.spec, 1.57, 1.58

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/sysklogd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28955

Modified Files:
	sysklogd.spec 
Added Files:
	sysklogd-1.4.2rh-reload.patch 
Log Message:
fix reload option in initscript (#243507)


sysklogd-1.4.2rh-reload.patch:

--- NEW FILE sysklogd-1.4.2rh-reload.patch ---
--- sysklogd-1.4.2rh/redhat/syslog.init.reload	2007-06-11 11:56:59.000000000 +0200
+++ sysklogd-1.4.2rh/redhat/syslog.init	2007-06-11 12:05:16.000000000 +0200
@@ -70,12 +70,12 @@
     RETVAL=1
     syslog=`cat /var/run/syslogd.pid 2>/dev/null`
     echo -n "Reloading syslogd..."
-    if [ -n ${syslog} ] && [ -e /proc/${syslog} ]; then
-	kill -HUP $syslog;
+    if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
+	kill -HUP "$syslog";
 	RETVAL=$?
     fi
     if [ $RETVAL -ne 0 ]; then
-	fail
+	failure
     else
 	success
     fi
@@ -83,12 +83,12 @@
     RETVAL=1
     echo -n "Reloading klogd..."
     klog=`cat /var/run/klogd.pid 2>/dev/null`
-    if [ -n ${klog} ] && [ -e /proc/${klog} ]; then
-	kill -USR2 $klog;
+    if [ -n "${klog}" ] && [ -e /proc/"${klog}" ]; then
+	kill -USR2 "$klog";
         RETVAL=$?
     fi
     if [ $RETVAL -ne 0 ]; then
-	fail
+	failure
     else
 	success
     fi


Index: sysklogd.spec
===================================================================
RCS file: /cvs/extras/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sysklogd.spec	7 Jun 2007 08:48:17 -0000	1.57
+++ sysklogd.spec	11 Jun 2007 10:20:18 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -17,6 +17,7 @@
 Patch2: sysklogd-1.4.2rh-includeFacPri.patch
 Patch3: sysklogd-1.4.2rh-dispatcher.patch
 Patch4: sysklogd-1.4.2rh-startFailed.patch
+Patch5: sysklogd-1.4.2rh-reload.patch
 Conflicts: logrotate < 3.5.2
 Requires: logrotate
 Requires: bash >= 2.0
@@ -49,6 +50,7 @@
 %patch2 -p1 -b .includeFacPri
 %patch3 -p1 -b .dispatcher
 %patch4 -p1 -b .startFailed
+%patch5 -p1 -b .reload
 
 %build
 make %{?_smp_mflags}
@@ -121,6 +123,9 @@
 %{_includedir}/sysklogd/sysklogd-dispatch.h
 
 %changelog
+* Mon Jun 11 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-9
+- fix reload option in initscript (#243507)
+
 * Thu Jun 07 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-8
 - provide dispatcher sample program