rpms/radvd/devel radvd-1.2-posix.patch, 1.1, 1.2 radvd.init, 1.4, 1.5 radvd.spec, 1.50, 1.51

[Jiri Skala]

Author: jskala

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

Modified Files:
	radvd-1.2-posix.patch radvd.init radvd.spec 
Log Message:
* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-2
- fixed ambiguous condition in init script (exit 4)


radvd-1.2-posix.patch:

Index: radvd-1.2-posix.patch
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd-1.2-posix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radvd-1.2-posix.patch	27 Apr 2009 20:16:37 -0000	1.1
+++ radvd-1.2-posix.patch	28 Apr 2009 09:07:53 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up radvd-1.2/redhat/radvd.init.posix radvd-1.2/redhat/radvd.init
---- radvd-1.2/redhat/radvd.init.posix	2009-04-27 21:56:39.000000000 +0200
-+++ radvd-1.2/redhat/radvd.init	2009-04-27 21:59:22.000000000 +0200
+--- radvd-1.2/redhat/radvd.init.posix	2008-02-27 14:02:59.000000000 +0100
++++ radvd-1.2/redhat/radvd.init	2009-04-28 11:05:07.000000000 +0200
 @@ -28,12 +28,6 @@
  
  [ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
@@ -25,8 +25,8 @@ diff -up radvd-1.2/redhat/radvd.init.pos
 +	if [ ! -f /etc/radvd.conf ]; then
 +		echo "Configuration file /etc/radvd.conf missing" 1>&2
 +		exit 6
-+		fi
-+	if [ ! -x /usr/sbin/radvd ]; then
++	fi
++	if [ `id -u` -ne 0 ]; then
 +		echo "Insufficient privilege" 1>&2
 +		exit 4
 +	fi


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- radvd.init	27 Apr 2009 20:16:37 -0000	1.4
+++ radvd.init	28 Apr 2009 09:07:53 -0000	1.5
@@ -39,7 +39,7 @@ case "$1" in
       echo "Configuration file /etc/radvd.conf missing" 1>&2
       exit 6
     fi
-    if [ ! -x /usr/sbin/radvd ]; then
+    if [ `id -u` -ne 0 ]; then
       echo "Insufficient privilege" 1>&2
       exit 4
     fi


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- radvd.spec	27 Apr 2009 20:16:37 -0000	1.50
+++ radvd.spec	28 Apr 2009 09:07:53 -0000	1.51
@@ -5,7 +5,7 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -95,7 +95,10 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
-* Mon Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-2
+- fixed ambiguous condition in init script (exit 4)
+
+* Mon Apr 27 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
 - updated to latest upstream version
 
 * Fri Feb 27 2009 Jiri Skala <jskala at redhat.com> - 1.1-8