commit quagga for openSUSE:Factory
Hello community, here is the log from the commit of package quagga for openSUSE:Factory checked in at Wed Nov 10 22:01:36 CET 2010. -------- --- quagga/quagga.changes 2009-12-03 14:51:19.000000000 +0100 +++ quagga/quagga.changes 2010-11-10 17:24:36.000000000 +0100 @@ -1,0 +2,81 @@ +Tue Nov 9 14:58:33 UTC 2010 - prusnak@opensuse.org + +- mark /var/run/quagga as ghost, create it in initscript + [Fate#303793] + +------------------------------------------------------------------- +Tue Nov 9 14:39:00 UTC 2010 - prusnak@opensuse.org + +- updated to 0.99.17 - fixes [bnc#634300] + bgpd: + fix handling of AS path data + tighten bounds checking in RR ORF msg reader + ospfd: + Only refresh external default route once. + Make sure ospf_distribute_list_update_timer() eventually runs. + Make sure all external routes are updated. + zebra: + fix infinite loop when deleting an interface + ospf6d: + Fix crash when '[no] ipv6 ospf6 advertise prefix-list' is in startup-config + isisd: + change ISIS_METHOD to use C preprocessor + other: + build: ignore mkinstalldirs and texinfo.tex + build: Add QuaggaId to README.NetBSD + build/extra: Enhance README.NetBSD make/gmake decision. + git: add pointers to out-of-tree work + git: add (generated) m4 files to .gitignore + Update for git and emphasize asking for good reports. + doc: fixed spelling in bgpd.texi + +------------------------------------------------------------------- +Tue Nov 9 14:38:24 UTC 2010 - prusnak@opensuse.org + +- updated to 0.99.16 + bgpd: + use monotonic clock for time of day + code cleanup + compile warnings cleanup + work around warning in assegments_parse() + ospfd: + fix debug messages that were masked by DISCARD_LSA + remove unneeded memset from a very hot function + VTY strings cleanup + comment out unused function + make local functions static + enable more OSPF cost command aliases + lib: + fix memory logging + make some structures constant + move check_bit into prefix common code + fix warning on little endian + make match functions take const args + remove unused function: route_dump_node() + log source of vty connections (bug #566) + zebra: + change router-id selection algo + deal with irdp compile warnings + cleanup RIB meta queue code + fix more warnings in rtadv + fix more compiler warnings + remove unused function to fix warning + handle RTF_CLONING removal from FreeBSD 8.0 + fix argument reference in strncpy() call for BSD + fix RIB debug message for IPv6 + make declaration const in rtm_flag_dump() + fix router advertisements for non-Ethernet link layer addresses + ospf6d: + remove dead code + fix warnings from recent prefix bit commit + review LSA sequence number comparison + fix LSA locking in ospf6_new_ls_id() + other: + ripd: fix compiler warnings + ripngd: compiler warnings cleanup + isisd: fix --enable-isis-topology for 64-bit Linux + isisd: fix BPF ioctl() calls, treat "true" and "false" as reserved + configure: fix spelling + configure: fix HAVE_CLOCK_MONOTONIC spelling + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- quagga-0.99.15.tar.bz2 New: ---- quagga-0.99.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.W7AbT6/_old 2010-11-10 21:59:59.000000000 +0100 +++ /var/tmp/diff_new_pack.W7AbT6/_new 2010-11-10 21:59:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package quagga (Version 0.99.15) +# spec file for package quagga (Version 0.99.17) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: quagga -BuildRequires: net-snmp-devel pam-devel readline-devel -Version: 0.99.15 +Version: 0.99.17 Release: 1 -PreReq: %insserv_prereq %fillup_prereq +License: LGPLv2.1+ +Summary: Free Routing Software (for BGP, OSPF and RIP, for example) +Url: http://www.quagga.net +Group: Productivity/Networking/Routing +Source: http://www.quagga.net/download/%{name}-%{version}.tar.gz +Source1: %{name}-SUSE.tar.bz2 +Source2: %{name}.pam +BuildRequires: net-snmp-devel +BuildRequires: pam-devel +BuildRequires: readline-devel +PreReq: %fillup_prereq +PreReq: %insserv_prereq PreReq: %install_info_prereq # pwdutils for useradd and groupadd PreReq: pwdutils +Recommends: logrotate Provides: zebra Obsoletes: zebra -Recommends: logrotate -License: LGPLv2.1+ -Group: Productivity/Networking/Routing -Url: http://www.quagga.net -Summary: Free Routing Software (for BGP, OSPF and RIP, for example) -Source: %{name}-%{version}.tar.bz2 -Source1: %{name}-SUSE.tar.bz2 -Source2: %{name}.pam BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,22 +48,11 @@ The Quagga tree aims to build a more involved community around Quagga than the current centralised model of GNU Zebra. - - -Authors: --------- - Kunihiro Ishiguro <kunihiro@zebra.org> - Toshiaki Takada <takada@zebra.org> - Yasuhiro Ohara <yasu@sfc.wide.ad.jp> - Alex D. Zinin <azinin@hotmail.com> - Gleb Natapov <gleb@nbase.co.il> - Akihiro Mizutani <mizutani@dml.com> - %package devel License: LGPLv2.1+ Summary: Free Routing Software (for BGP, OSPF and RIP, for example) -Requires: %{name} = %{version} Group: Productivity/Networking/Routing +Requires: %{name} = %{version} %description devel Quagga is a routing software suite, providing implementations of @@ -71,17 +62,6 @@ The Quagga tree aims to build a more involved community around Quagga than the current centralised model of GNU Zebra. - - -Authors: --------- - Kunihiro Ishiguro <kunihiro@zebra.org> - Toshiaki Takada <takada@zebra.org> - Yasuhiro Ohara <yasu@sfc.wide.ad.jp> - Alex D. Zinin <azinin@hotmail.com> - Gleb Natapov <gleb@nbase.co.il> - Akihiro Mizutani <mizutani@dml.com> - %prep %setup -q -a 1 @@ -92,7 +72,7 @@ fi rm -f m4/libtool.m4 m4/lt*.m4 autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure --disable-static --with-pic \ --enable-vtysh \ --enable-rtadv \ @@ -103,32 +83,32 @@ --sysconfdir=%{_sysconfdir}/quagga \ --localstatedir=%{_localstatedir}/run/quagga \ --enable-multipath=0 -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install rm -r doc/quagga.info -make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT%{_libdir}/lib{ospf,zebra}.la -install -d $RPM_BUILD_ROOT/etc/{init.d,quagga,pam.d,logrotate.d} -install -m 755 SUSE/* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -install -m 644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/quagga -install -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/log/quagga -install -d -m 751 $RPM_BUILD_ROOT%{_localstatedir}/run/quagga -install -m 644 redhat/quagga.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/quagga -ln -sf %{_sysconfdir}/init.d/zebra $RPM_BUILD_ROOT%{_sbindir}/rczebra -ln -sf %{_sysconfdir}/init.d/bgpd $RPM_BUILD_ROOT%{_sbindir}/rcbgpd -ln -sf %{_sysconfdir}/init.d/ospf6d $RPM_BUILD_ROOT%{_sbindir}/rcospf6d -ln -sf %{_sysconfdir}/init.d/ospfd $RPM_BUILD_ROOT%{_sbindir}/rcospfd -ln -sf %{_sysconfdir}/init.d/ripngd $RPM_BUILD_ROOT%{_sbindir}/rcripngd -ln -sf %{_sysconfdir}/init.d/ripd $RPM_BUILD_ROOT%{_sbindir}/rcripd -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/quagga/*.sample* -cat > $RPM_BUILD_ROOT%{_sysconfdir}/quagga/zebra.conf << __EOF__ +make DESTDIR=%{buildroot} install +rm -rf %{buildroot}%{_libdir}/lib{ospf,zebra}.la +install -d %{buildroot}%{_sysconfdir}/{init.d,quagga,pam.d,logrotate.d} +install -m 755 SUSE/* %{buildroot}%{_sysconfdir}/init.d/ +install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/quagga +install -d -m 750 %{buildroot}%{_localstatedir}/log/quagga +install -d -m 751 %{buildroot}%{_localstatedir}/run/quagga +install -m 644 redhat/quagga.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/quagga +ln -sf %{_sysconfdir}/init.d/zebra %{buildroot}%{_sbindir}/rczebra +ln -sf %{_sysconfdir}/init.d/bgpd %{buildroot}%{_sbindir}/rcbgpd +ln -sf %{_sysconfdir}/init.d/ospf6d %{buildroot}%{_sbindir}/rcospf6d +ln -sf %{_sysconfdir}/init.d/ospfd %{buildroot}%{_sbindir}/rcospfd +ln -sf %{_sysconfdir}/init.d/ripngd %{buildroot}%{_sbindir}/rcripngd +ln -sf %{_sysconfdir}/init.d/ripd %{buildroot}%{_sbindir}/rcripd +rm -f %{buildroot}%{_sysconfdir}/quagga/*.sample* +cat > %{buildroot}%{_sysconfdir}/quagga/zebra.conf << __EOF__ hostname quagga password quagga enable password quagga log file %{_localstatedir}/log/quagga/quagga.log __EOF__ -touch $RPM_BUILD_ROOT%{_sysconfdir}/quagga/vtysh.conf +touch %{buildroot}%{_sysconfdir}/quagga/vtysh.conf %pre %{_sbindir}/groupadd -r quagga 2> /dev/null || : @@ -151,7 +131,7 @@ /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -163,7 +143,7 @@ %config (noreplace)%{_sysconfdir}/pam.d/* %{_bindir}/* %dir %attr(-,quagga,quagga) %{_localstatedir}/log/quagga -%dir %attr(-,quagga,quagga) %{_localstatedir}/run/quagga +%dir %attr(-,quagga,quagga) %ghost %{_localstatedir}/run/quagga %{_infodir}/quagga.info* %{_mandir}/man?/* %attr(755,root,root) %{_libdir}/lib*.so.* ++++++ quagga-SUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSE/bgpd new/SUSE/bgpd --- old/SUSE/bgpd 2008-08-28 23:21:18.000000000 +0200 +++ new/SUSE/bgpd 2010-11-10 14:44:27.000000000 +0100 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: bgpd # Required-Start: $network $remote_fs zebra -# Required-Stop: $network $remote_fs zebra +# Required-Stop: $network $remote_fs zebra # Default-Start: 2 3 5 # Default-Stop: # Short-Description: BGP-Routing-Daemon @@ -43,7 +43,7 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -51,79 +51,80 @@ case "$1" in start) - echo -n "Starting bgp daemon (Zebra)" - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - # NOTE: startproc return 0, even if service is - # already running to match LSB spec. - startproc $BGPD_BIN + echo -n "Starting bgp daemon (Zebra)" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + install -d -o quagga -u quagga /var/run/quagga + startproc $BGPD_BIN # Remember status and be verbose rc_status -v ;; stop) - echo -n "Shutting down bgp daemon (Zebra)" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. + echo -n "Shutting down bgp daemon (Zebra)" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. - killproc -TERM $BGPD_BIN + killproc -TERM $BGPD_BIN - # Remember status and be verbose - rc_status -v + # Remember status and be verbose + rc_status -v ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload bgp daemon (Zebra)" - $0 stop && $0 start - rc_status - ;; + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload bgp daemon (Zebra)" + $0 stop && $0 start + rc_status + ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) - rc_failed 3 - rc_status -v - ;; + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for bgp daemon (Zebra): " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $BGPD_BIN - rc_status -v - ;; + echo -n "Checking for bgp daemon (Zebra): " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $BGPD_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSE/ospf6d new/SUSE/ospf6d --- old/SUSE/ospf6d 2008-08-28 23:21:34.000000000 +0200 +++ new/SUSE/ospf6d 2010-11-10 14:44:32.000000000 +0100 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: ospf6d # Required-Start: $network $remote_fs zebra -# Required-Stop: $network $remote_fs zebra +# Required-Stop: $network $remote_fs zebra # Default-Start: 2 3 5 # Default-Stop: # Short-Description: OSPF-IPv6-Routing-Daemon @@ -43,7 +43,7 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -51,79 +51,80 @@ case "$1" in start) - echo -n "Starting ospf daemon (Zebra)" - startproc $OSPF6D_BIN -d - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - # NOTE: startproc return 0, even if service is - # already running to match LSB spec. - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Starting ospf daemon (Zebra)" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + install -d -o quagga -u quagga /var/run/quagga + startproc $OSPF6D_BIN -d + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down ospf6 daemon (Zebra)" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. + echo -n "Shutting down ospf6 daemon (Zebra)" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. - killproc -TERM $OSPF6D_BIN + killproc -TERM $OSPF6D_BIN - # Remember status and be verbose + # Remember status and be verbose rc_status -v - ;; + ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start # Remember status and be quiet - rc_status - ;; + rc_status + ;; force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload ospf6 daemon (Zebra)" - $0 stop && $0 start - rc_status - ;; + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload ospf6 daemon (Zebra)" + $0 stop && $0 start + rc_status + ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) - rc_failed 3 - rc_status -v - ;; + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for ospf6 daemon (Zebra): " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $OSPF6D_BIN - rc_status -v - ;; + echo -n "Checking for ospf6 daemon (Zebra): " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $OSPF6D_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSE/ospfd new/SUSE/ospfd --- old/SUSE/ospfd 2008-08-28 23:21:51.000000000 +0200 +++ new/SUSE/ospfd 2010-11-10 14:44:37.000000000 +0100 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: ospfd # Required-Start: $network $remote_fs zebra -# Required-Stop: $network $remote_fs zebra +# Required-Stop: $network $remote_fs zebra # Default-Start: 2 3 5 # Default-Stop: # Short-Description: OSPF-Routing-Daemon @@ -43,7 +43,7 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -51,79 +51,80 @@ case "$1" in start) - echo -n "Starting ospf daemon (Zebra)" - startproc $OSPFD_BIN -d - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - # NOTE: startproc return 0, even if service is - # already running to match LSB spec. - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Starting ospf daemon (Zebra)" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + install -d -o quagga -u quagga /var/run/quagga + startproc $OSPFD_BIN -d + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down ospf daemon (Zebra)" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. + echo -n "Shutting down ospf daemon (Zebra)" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. - killproc -TERM $OSPFD_BIN + killproc -TERM $OSPFD_BIN - # Remember status and be verbose + # Remember status and be verbose rc_status -v - ;; + ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start # Remember status and be quiet - rc_status - ;; + rc_status + ;; force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload ospf daemon (Zebra)" - $0 stop && $0 start - rc_status - ;; + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload ospf daemon (Zebra)" + $0 stop && $0 start + rc_status + ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) - rc_failed 3 - rc_status -v - ;; + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for ospf daemon (Zebra): " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $OSPFD_BIN - rc_status -v - ;; + echo -n "Checking for ospf daemon (Zebra): " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $OSPFD_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSE/ripd new/SUSE/ripd --- old/SUSE/ripd 2008-08-28 23:22:04.000000000 +0200 +++ new/SUSE/ripd 2010-11-10 14:44:40.000000000 +0100 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: ripd # Required-Start: $network $remote_fs zebra -# Required-Stop: $network $remote_fs zebra +# Required-Stop: $network $remote_fs zebra # Default-Start: 2 3 5 # Default-Stop: # Short-Description: RIP-Routing-Daemon @@ -43,7 +43,7 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -51,80 +51,81 @@ case "$1" in start) - echo -n "Starting rip daemon (Zebra)" - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - # NOTE: startproc return 0, even if service is - # already running to match LSB spec. - startproc $RIPD_BIN -d - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Starting rip daemon (Zebra)" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + install -d -o quagga -u quagga /var/run/quagga + startproc $RIPD_BIN -d + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down rip daemon (Zebra)" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -TERM $RIPD_BIN - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Shutting down rip daemon (Zebra)" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. + + killproc -TERM $RIPD_BIN + + # Remember status and be verbose + rc_status -v + ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload rip daemon (Zebra)" - killproc -HUP $RIPD_BIN - rc_status -v - ;; + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload rip daemon (Zebra)" + killproc -HUP $RIPD_BIN + rc_status -v + ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) - echo -n "Reload rip daemon (Zebra)" - killproc -HUP $RIPD_BIN - rc_status -v - ;; + echo -n "Reload rip daemon (Zebra)" + killproc -HUP $RIPD_BIN + rc_status -v + ;; status) - echo -n "Checking for rip daemon (Zebra): " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $RIPD_BIN - rc_status -v - ;; + echo -n "Checking for rip daemon (Zebra): " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $RIPD_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSE/ripngd new/SUSE/ripngd --- old/SUSE/ripngd 2008-08-28 23:22:18.000000000 +0200 +++ new/SUSE/ripngd 2010-11-10 14:44:43.000000000 +0100 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: ripnd # Required-Start: $network $remote_fs zebra -# Required-Stop: $network $remote_fs zebra +# Required-Stop: $network $remote_fs zebra # Default-Start: 2 3 5 # Default-Stop: # Short-Description: RIPNG-Routing-Daemon @@ -43,7 +43,7 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -51,79 +51,80 @@ case "$1" in start) - echo -n "Starting ripng daemon (Zebra)" - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - # NOTE: startproc return 0, even if service is - # already running to match LSB spec. - startproc $RIPNG_BIN -d - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Starting ripng daemon (Zebra)" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + install -d -o quagga -u quagga /var/run/quagga + startproc $RIPNG_BIN -d + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down ripng daemon (Zebra)" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -TERM $RIPNG_BIN - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Shutting down ripng daemon (Zebra)" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. + + killproc -TERM $RIPNG_BIN + + # Remember status and be verbose + rc_status -v + ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload ripng daemon (Zebra)" - $0 stop && $0 start - rc_status - ;; + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload ripng daemon (Zebra)" + $0 stop && $0 start + rc_status + ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) - rc_failed 3 - rc_status -v - ;; + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for ripng daemon (Zebra): " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $RIPNG_BIN - rc_status -v - ;; + echo -n "Checking for ripng daemon (Zebra): " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $RIPNG_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSE/zebra new/SUSE/zebra --- old/SUSE/zebra 2008-08-28 23:22:38.000000000 +0200 +++ new/SUSE/zebra 2010-11-10 14:45:02.000000000 +0100 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: zebra # Required-Start: $network $remote_fs -# Required-Stop: $network $remote_fs +# Required-Stop: $network $remote_fs # Default-Start: 2 3 5 # Default-Stop: # Short-Description: Zebra-Daemon @@ -38,12 +38,12 @@ # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.ga "reload") +# 3 - unimplemented feature (e.g "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -51,79 +51,80 @@ case "$1" in start) - echo -n "Starting routing daemon (Zebra)" - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - # NOTE: startproc return 0, even if service is - # already running to match LSB spec. - startproc $ZEBRA_BIN -d - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Starting routing daemon (Zebra)" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + install -d -o quagga -u quagga /var/run/quagga + startproc $ZEBRA_BIN -d + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down routing daemon (Zebra)" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -TERM $ZEBRA_BIN - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Shutting down routing daemon (Zebra)" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. + + killproc -TERM $ZEBRA_BIN + + # Remember status and be verbose + rc_status -v + ;; try-restart) - ## Stop the service and if this succeeds (i.e. the - ## service was running before), start it again. - ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) - $0 status >/dev/null && $0 restart - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart. - - echo -n "Reload routing daemon (Zebra)" - $0 stop && $0 start - rc_status - ;; + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload routing daemon (Zebra)" + $0 stop && $0 start + rc_status + ;; reload) - ## Like force-reload, but if daemon does not support - ## signalling, do nothing (!) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) - rc_failed 3 - rc_status -v - ;; + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for routing daemon (Zebra): " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - # Status has a slightly different for the status command: - # 0 - service running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running - - # NOTE: checkproc returns LSB compliant status values. - checkproc $ZEBRA_BIN - rc_status -v - ;; + echo -n "Checking for routing daemon (Zebra): " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $ZEBRA_BIN + rc_status -v + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de