rpms/quagga/devel quagga-0.99.15-posix.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 quagga.spec, 1.54, 1.55 sources, 1.21, 1.22
Jiri Skala
jskala at fedoraproject.org
Mon Oct 19 11:56:25 UTC 2009
- Previous message (by thread): rpms/globus-data-conversion/EL-4 globus-data-conversion.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/globus-mp/devel globus-mp.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jskala
Update of /cvs/extras/rpms/quagga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2776
Modified Files:
.cvsignore quagga.spec sources
Added Files:
quagga-0.99.15-posix.patch
Log Message:
* Mon Oct 19 2009 Jiri Skala <jskala at redhat.com> - 0.99.15-1
- bump to latest upstream
- fixed #527734 - posix compliant init scripts
quagga-0.99.15-posix.patch:
bgpd.init | 10 +++++++---
ospf6d.init | 10 +++++++---
ospfd.init | 10 +++++++---
ripd.init | 10 +++++++---
ripngd.init | 10 +++++++---
zebra.init | 10 +++++++---
6 files changed, 42 insertions(+), 18 deletions(-)
--- NEW FILE quagga-0.99.15-posix.patch ---
diff -up quagga-0.99.15/redhat/bgpd.init.posix quagga-0.99.15/redhat/bgpd.init
--- quagga-0.99.15/redhat/bgpd.init.posix 2009-10-19 08:52:03.018303218 +0200
+++ quagga-0.99.15/redhat/bgpd.init 2009-10-19 09:58:18.694292887 +0200
@@ -30,6 +30,10 @@ case "$1" in
# The process must be configured first.
[ -f $CONF_FILE ] || exit 6
+ if [ `id -u` -ne 0 ]; then
+ echo $"Insufficient privilege" 1>&2
+ exit 4
+ fi
echo -n $"Starting $PROG: "
daemon $cmd -d $BGPD_OPTS
@@ -44,12 +48,12 @@ case "$1" in
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
echo
;;
- restart|reload)
+ restart|reload|force-reload)
$0 stop
$0 start
RETVAL=$?
;;
- condrestart)
+ condrestart|try-restart)
if [ -f $LOCK_FILE ]; then
$0 stop
$0 start
@@ -61,7 +65,7 @@ case "$1" in
RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
exit 2
esac
diff -up quagga-0.99.15/redhat/ospf6d.init.posix quagga-0.99.15/redhat/ospf6d.init
--- quagga-0.99.15/redhat/ospf6d.init.posix 2009-10-19 08:54:10.135543594 +0200
+++ quagga-0.99.15/redhat/ospf6d.init 2009-10-19 09:53:29.288294085 +0200
@@ -29,6 +29,10 @@ case "$1" in
# The process must be configured first.
[ -f $CONF_FILE ] || exit 6
+ if [ `id -u` -ne 0 ]; then
+ echo $"Insufficient privilege" 1>&2
+ exit 4
+ fi
echo -n $"Starting $PROG: "
daemon $cmd -d $OSPF6D_OPTS
@@ -43,12 +47,12 @@ case "$1" in
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
echo
;;
- restart|reload)
+ restart|reload|force-reload)
$0 stop
$0 start
RETVAL=$?
;;
- condrestart)
+ condrestart|try-restart)
if [ -f $LOCK_FILE ]; then
$0 stop
$0 start
@@ -60,7 +64,7 @@ case "$1" in
RETVAL=$?
;;
*)
- echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
exit 2
esac
diff -up quagga-0.99.15/redhat/ospfd.init.posix quagga-0.99.15/redhat/ospfd.init
--- quagga-0.99.15/redhat/ospfd.init.posix 2009-10-19 08:52:03.017303137 +0200
+++ quagga-0.99.15/redhat/ospfd.init 2009-10-19 09:56:42.380294279 +0200
@@ -29,6 +29,10 @@ case "$1" in
# The process must be configured first.
[ -f $CONF_FILE ] || exit 6
+ if [ `id -u` -ne 0 ]; then
+ echo $"Insufficient privilege" 1>&2
+ exit 4
+ fi
echo -n $"Starting $PROG: "
daemon $cmd -d $OSPFD_OPTS
@@ -43,12 +47,12 @@ case "$1" in
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
echo
;;
- restart|reload)
+ restart|reload|force-reload)
$0 stop
$0 start
RETVAL=$?
;;
- condrestart)
+ condrestart|try-restart)
if [ -f $LOCK_FILE ]; then
$0 stop
$0 start
@@ -60,7 +64,7 @@ case "$1" in
RETVAL=$?
;;
*)
- echo $"Usage: $PROG {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $PROG {start|stop|restart|reload|force-reload|try-restart|status}"
exit 2
esac
diff -up quagga-0.99.15/redhat/ripd.init.posix quagga-0.99.15/redhat/ripd.init
--- quagga-0.99.15/redhat/ripd.init.posix 2009-10-19 09:57:08.605329988 +0200
+++ quagga-0.99.15/redhat/ripd.init 2009-10-19 09:59:21.872294779 +0200
@@ -29,6 +29,10 @@ case "$1" in
# The process must be configured first.
[ -f $CONF_FILE ] || exit 6
+ if [ `id -u` -ne 0 ]; then
+ echo $"Insufficient privilege" 1>&2
+ exit 4
+ fi
echo -n $"Starting $PROG: "
daemon $cmd -d $RIPD_OPTS
@@ -43,12 +47,12 @@ case "$1" in
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
echo
;;
- restart|reload)
+ restart|reload|force-reload)
$0 stop
$0 start
RETVAL=$?
;;
- condrestart)
+ condrestart|try-restart)
if [ -f $LOCK_FILE ]; then
$0 stop
$0 start
@@ -60,7 +64,7 @@ case "$1" in
RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
exit 2
esac
diff -up quagga-0.99.15/redhat/ripngd.init.posix quagga-0.99.15/redhat/ripngd.init
--- quagga-0.99.15/redhat/ripngd.init.posix 2009-10-19 09:59:42.545325446 +0200
+++ quagga-0.99.15/redhat/ripngd.init 2009-10-19 10:04:01.286294713 +0200
@@ -29,6 +29,10 @@ case "$1" in
# The process must be configured first.
[ -f $CONF_FILE ] || exit 6
+ if [ `id -u` -ne 0 ]; then
+ echo $"Insufficient privilege" 1>&2
+ exit 4
+ fi
echo -n $"Starting $PROG: "
daemon $cmd -d $RIPNGD_OPTS
@@ -43,12 +47,12 @@ case "$1" in
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
echo
;;
- restart|reload)
+ restart|reload|force-reload)
$0 stop
$0 start
RETVAL=$?
;;
- condrestart)
+ condrestart|try-restart)
if [ -f $LOCK_FILE ]; then
$0 stop
$0 start
@@ -60,7 +64,7 @@ case "$1" in
RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
exit 2
esac
diff -up quagga-0.99.15/redhat/zebra.init.posix quagga-0.99.15/redhat/zebra.init
--- quagga-0.99.15/redhat/zebra.init.posix 2009-10-19 10:00:32.754573536 +0200
+++ quagga-0.99.15/redhat/zebra.init 2009-10-19 10:06:26.378294314 +0200
@@ -26,6 +26,10 @@ case "$1" in
# The process must be configured first.
[ -f $CONF_FILE ] || exit 6
+ if [ `id -u` -ne 0 ]; then
+ echo $"Insufficient privilege" 1>&2
+ exit 4
+ fi
echo -n $"Starting $PROG: "
@@ -43,12 +47,12 @@ case "$1" in
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
echo
;;
- restart|reload)
+ restart|reload|force-reload)
$0 stop
$0 start
RETVAL=$?
;;
- condrestart)
+ condrestart|try-restart)
if [ -f $LOCK_FILE ]; then
$0 stop
$0 start
@@ -60,7 +64,7 @@ case "$1" in
RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|reload|force-reload|try-restart|status}"
exit 2
esac
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 20 May 2009 12:38:58 -0000 1.21
+++ .cvsignore 19 Oct 2009 11:56:25 -0000 1.22
@@ -1 +1 @@
-quagga-0.99.12.tar.gz
+quagga-0.99.15.tar.gz
Index: quagga.spec
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- quagga.spec 14 Sep 2009 12:05:04 -0000 1.54
+++ quagga.spec 19 Oct 2009 11:56:25 -0000 1.55
@@ -31,8 +31,8 @@
Summary: Routing daemon
Name: quagga
-Version: 0.99.12
-Release: 4%{?dist}
+Version: 0.99.15
+Release: 1%{?dist}
Epoch: 0
License: GPLv2+
Group: System Environment/Daemons
@@ -40,6 +40,7 @@ Source0: http://www.quagga.net/download/
Source1: quagga-filter-perl-requires.sh
Patch2: quagga-0.96.5-nostart.patch
Patch7: quagga-0.99.9-initscript.patch
+Patch8: quagga-0.99.15-posix.patch
URL: http://www.quagga.net
%if %with_snmp
@@ -95,6 +96,7 @@ developing OSPF-API and quagga applicati
%patch2 -p1 -b .nostart
# This creates a .diff file that we apply after configuring
%patch7 -p1 -b .initscript
+%patch8 -p1 -b .posix
%build
# FC5+ automatic -fstack-protector-all switch
@@ -346,6 +348,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Oct 19 2009 Jiri Skala <jskala at redhat.com> - 0.99.15-1
+- bump to latest upstream
+- fixed #527734 - posix compliant init scripts
+
* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 0.99.12-3
- fixed #516005 - Errors installing quagga-0.99.11-2.fc11.i586 with --excludedocs
- fixed #522787 - quagga: build future versions without PAM
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 20 May 2009 12:38:58 -0000 1.21
+++ sources 19 Oct 2009 11:56:25 -0000 1.22
@@ -1 +1 @@
-d2bb513f4ac113dbb300c15a0bd0a241 quagga-0.99.12.tar.gz
+8975414c76a295f4855a417af0b5ddce quagga-0.99.15.tar.gz
- Previous message (by thread): rpms/globus-data-conversion/EL-4 globus-data-conversion.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/globus-mp/devel globus-mp.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list