rpms/radvd/devel radvd-1.3-posix.patch, NONE, 1.1 radvd.init, 1.6, 1.7 radvd.spec, 1.54, 1.55 radvd-1.1-posix.patch, 1.2, NONE

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3099

Modified Files:
	radvd.init radvd.spec 
Added Files:
	radvd-1.3-posix.patch 
Removed Files:
	radvd-1.1-posix.patch 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-3
- fixed #528178 - retval in init script to be posix compliant


radvd-1.3-posix.patch:
 radvd.init |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE radvd-1.3-posix.patch ---
diff -up radvd-1.3/redhat/radvd.init.posix radvd-1.3/redhat/radvd.init
--- radvd-1.3/redhat/radvd.init.posix	2009-10-18 22:02:19.343363622 +0200
+++ radvd-1.3/redhat/radvd.init	2009-10-18 22:04:48.794336898 +0200
@@ -47,7 +47,13 @@ case "$1" in
 	daemon radvd $OPTIONS
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch $LOCKFILE
+	if [ $RETVAL -eq 0 ]; then
+		touch $LOCKFILE
+	else
+		if [ -f $LOCKFILE ]; then
+			RETVAL=0
+		fi
+	fi
 	;;
   stop)
 	echo -n $"Stopping $PROG: "


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- radvd.init	3 Jun 2009 14:05:27 -0000	1.6
+++ radvd.init	18 Oct 2009 20:13:47 -0000	1.7
@@ -47,7 +47,13 @@ case "$1" in
     daemon radvd $OPTIONS
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && touch $LOCKFILE
+    if [ $RETVAL -eq 0 ]; then
+        touch $LOCKFILE
+    else
+        if [ -f $LOCKFILE ]; then
+            RETVAL=0
+        fi
+    fi
     ;;
   stop)
     echo -n $"Stopping $PROG: "


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- radvd.spec	27 Jul 2009 02:44:51 -0000	1.54
+++ radvd.spec	18 Oct 2009 20:13:47 -0000	1.55
@@ -5,7 +5,7 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -17,6 +17,7 @@ Requires(post):     chkconfig
 Requires(pre):      /usr/sbin/useradd
 BuildRequires:      flex, byacc
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:  radvd-1.3-posix.patch
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -32,6 +33,8 @@ services.
 %prep
 %setup -q
 
+%patch1 -p1 -b .posix
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" 
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen'
@@ -92,6 +95,9 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-3
+- fixed #528178 - retval in init script to be posix compliant
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- radvd-1.1-posix.patch DELETED ---