rpms/radvd/devel radvd-1.2-posix.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 radvd.init, 1.3, 1.4 radvd.spec, 1.49, 1.50 sources, 1.11, 1.12 radvd-1.1-stale_pid.patch, 1.1, NONE

Jiri Skala jskala at fedoraproject.org
Mon Apr 27 20:17:08 UTC 2009


Author: jskala

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

Modified Files:
	.cvsignore radvd.init radvd.spec sources 
Added Files:
	radvd-1.2-posix.patch 
Removed Files:
	radvd-1.1-stale_pid.patch 
Log Message:
* Mon Apr 28 2009 Jiri Skala <jskala at redhat.com> - 1.2-1
- updated to latest upstream version


radvd-1.2-posix.patch:

--- NEW FILE radvd-1.2-posix.patch ---
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
@@ -28,12 +28,6 @@
 
 [ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
 
-if [ "$1" == "status" ]; then
-	[ -f /usr/sbin/radvd ] || exit 4
-else 
-	[ -f /usr/sbin/radvd ] || exit 1
-fi
-
 RETVAL=0
 PROG="radvd"
 LOCKFILE=/var/lock/subsys/radvd
@@ -41,10 +35,14 @@ LOCKFILE=/var/lock/subsys/radvd
 # See how we were called.
 case "$1" in
   start)
-
-	# Check that networking is up.	
-	[ "${NETWORKING_IPV6}" = "yes" ] || exit 1
-
+	if [ ! -f /etc/radvd.conf ]; then
+		echo "Configuration file /etc/radvd.conf missing" 1>&2
+		exit 6
+		fi
+	if [ ! -x /usr/sbin/radvd ]; then
+		echo "Insufficient privilege" 1>&2
+		exit 4
+	fi
 	echo -n $"Starting $PROG: "
 	daemon radvd $OPTIONS
 	RETVAL=$?


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	25 Feb 2008 09:55:04 -0000	1.11
+++ .cvsignore	27 Apr 2009 20:16:37 -0000	1.12
@@ -1 +1 @@
-radvd-1.1.tar.gz
+radvd-1.2.tar.gz


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- radvd.init	2 Feb 2009 13:30:24 -0000	1.3
+++ radvd.init	27 Apr 2009 20:16:37 -0000	1.4
@@ -43,7 +43,6 @@
       echo "Insufficient privilege" 1>&2
       exit 4
     fi
-    echo -n $"Starting $prog: "
     echo -n $"Starting $PROG: "
     daemon radvd $OPTIONS
     RETVAL=$?


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- radvd.spec	27 Feb 2009 07:55:49 -0000	1.49
+++ radvd.spec	27 Apr 2009 20:16:37 -0000	1.50
@@ -4,8 +4,8 @@
 %define RADVD_UID 75
 Summary:    A Router Advertisement daemon
 Name:       radvd
-Version:    1.1
-Release:    8%{?dist}
+Version:    1.2
+Release:    1%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -18,8 +18,7 @@
 BuildRequires:      flex, byacc
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: radvd-1.1-posix.patch
-Patch1: radvd-1.1-stale_pid.patch
+Patch0: radvd-1.2-posix.patch
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -35,7 +34,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .posix
-%patch1 -p1 -b .stale_pid
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" 
@@ -97,6 +95,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Mon Apr 28 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
 - regenerated posix patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Feb 2008 09:55:04 -0000	1.11
+++ sources	27 Apr 2009 20:16:37 -0000	1.12
@@ -1 +1 @@
-9ee449e4b89171432cb9e9100e0b5648  radvd-1.1.tar.gz
+614876420d76cd2bb5bcb49760c8b9e3  radvd-1.2.tar.gz


--- radvd-1.1-stale_pid.patch DELETED ---




More information about the fedora-extras-commits mailing list