Hello community, here is the log from the commit of package dhcpv6 for openSUSE:Factory checked in at Wed Aug 31 10:49:23 CEST 2011.
-------- --- dhcpv6/dhcpv6.changes 2011-04-05 20:56:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcpv6/dhcpv6.changes 2011-08-29 21:49:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 29 19:48:18 UTC 2011 - [email protected] + +- Cleaned up (lock/subsys) in dhcp6s and dhcp6r scripts (bnc#714617) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpv6.spec ++++++ --- /var/tmp/diff_new_pack.QjDP0C/_old 2011-08-31 10:48:08.000000000 +0200 +++ /var/tmp/diff_new_pack.QjDP0C/_new 2011-08-31 10:48:08.000000000 +0200 @@ -26,7 +26,7 @@ Group: Productivity/Networking/System Summary: DHCP Client and Server for IPv6 Version: 1.0.22 -Release: 16 +Release: 18 Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-destdir.patch Patch2: %{name}-%{version}-cmd.patch @@ -90,6 +90,10 @@ make clean make %{?_smp_mflags} +%check +bash -n etc/init.d/dhcp6s.sh +bash -n etc/init.d/dhcp6r.sh + %install mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{8,5} @@ -114,6 +118,8 @@ %{stop_on_removal dhcp6s} %postun +%{restart_on_update dhcp6r} +%{restart_on_update dhcp6s} %{insserv_cleanup dhcp6r} %{insserv_cleanup dhcp6s} ++++++ dhcpv6-1.0.22-destdir.patch ++++++ --- /var/tmp/diff_new_pack.QjDP0C/_old 2011-08-31 10:48:08.000000000 +0200 +++ /var/tmp/diff_new_pack.QjDP0C/_new 2011-08-31 10:48:08.000000000 +0200 @@ -1,7 +1,5 @@ -Index: dhcpv6-1.0.20/etc/init.d/dhcp6r.sh -=================================================================== ---- dhcpv6-1.0.20.orig/etc/init.d/dhcp6r.sh -+++ dhcpv6-1.0.20/etc/init.d/dhcp6r.sh +--- dhcpv6-1.0.22/etc/init.d/dhcp6r.sh ++++ dhcpv6-1.0.22/etc/init.d/dhcp6r.sh 2011/08/29 19:38:58 @@ -2,11 +2,10 @@ # ### BEGIN INIT INFO @@ -18,7 +16,7 @@ # Short-Description: Start and stop the DHCPv6 relay agent # Description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages # from clients to servers and vice versa. -@@ -18,9 +17,11 @@ +@@ -18,45 +17,36 @@ # description: dhcp6r acts as a DHCPv6 relay agent forwarding DHCPv6 messages \ # from clients to servers and vice versa. # processname: dhcp6r @@ -32,15 +30,16 @@ RETVAL=0 -@@ -28,34 +29,25 @@ prog=dhcp6r ++conf=/etc/sysconfig/network/dhcp6r + prog=dhcp6r dhcp6r=/usr/sbin/dhcp6r - lockfile=/var/lock/subsys/dhcp6r - +-lockfile=/var/lock/subsys/dhcp6r +- -# Check that networking is up. -# networking is not up, return 1 for generic error -. /etc/sysconfig/network -[ $NETWORKING = "no" ] && exit 1 -- + start() { # return 5 if program is not installed - [ -x $dhcp6r ] || exit 5 @@ -52,27 +51,30 @@ + [ -f /etc/sysconfig/network/dhcp6r ] || return 6 + . /etc/sysconfig/network/dhcp6r - echo -n $"Starting $prog: " +- echo -n $"Starting $prog: " - daemon $dhcp6r $DHCP6RARGS ++ echo -n $"Starting $prog " + startproc $dhcp6r $DHCP6RARGS RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile +- [ $RETVAL -eq 0 ] && touch $lockfile return $RETVAL } stop() { - echo -n $"Shutting down $prog: " +- echo -n $"Shutting down $prog: " - killproc $prog -TERM ++ echo -n $"Shutting down $prog " + killproc $dhcp6r RETVAL=$? - echo - [ $RETVAL -eq 0 ] && success || failure - echo - rm -f $lockfile +- rm -f $lockfile return $RETVAL } -@@ -64,33 +56,36 @@ stop() { + +@@ -64,33 +54,49 @@ stop() { case "$1" in start) start @@ -84,45 +86,63 @@ - RETVAL=$? + rc_status -v ;; - restart|force-reload) - [ -f $lockfile ] && stop +- restart|force-reload) +- [ -f $lockfile ] && stop ++ restart) ++ stop start - RETVAL=$? -+ rc_status -v - ;; - try-restart|reload) +- ;; +- try-restart|reload) - RETVAL=3 -+ rc_failed 3 -+ rc_status -v ++ rc_status ;; - condrestart) - if [ -f $lockfile ]; then - stop && start -+ rc_status -v -+ else -+ rc_status -s +- condrestart) +- if [ -f $lockfile ]; then +- stop && start ++ try-restart|condrestart) ++ if test "$1" = "condrestart"; then ++ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi ++ $0 status ++ if test $? = 0; then ++ $0 restart ++ else ++ rc_reset ++ fi ++ rc_status ++ ;; ++ reload) ++ echo -n "Reload service $prog " ++ rc_failed 3 ++ rc_status -v ++ ;; ++ force-reload) ++ $0 try-restart ++ rc_status ;; status) - status dhcp6r - RETVAL=$? -+ checkproc $dhcp6r -+ rc_status -v ++ echo -n "Checking for service $prog " ++ checkproc $dhcp6r ++ rc_status -v ++ ;; ++ probe) ++ test "$conf" -nt "/var/run/dhcpv6/${prog}.pid" && echo restart ;; *) - echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}" +- echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}" - RETVAL=3 -+ rc_failed 3 ++ echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|probe}" ++ exit 1 ;; esac - -exit $RETVAL +rc_exit -\ No newline at end of file -Index: dhcpv6-1.0.20/etc/init.d/dhcp6s.sh -=================================================================== ---- dhcpv6-1.0.20.orig/etc/init.d/dhcp6s.sh -+++ dhcpv6-1.0.20/etc/init.d/dhcp6s.sh +--- dhcpv6-1.0.22/etc/init.d/dhcp6s.sh ++++ dhcpv6-1.0.22/etc/init.d/dhcp6s.sh 2011/08/29 19:39:22 @@ -2,11 +2,10 @@ # ### BEGIN INIT INFO @@ -139,7 +159,7 @@ # Short-Description: Start and stop the DHCPv6 server agent # Description: dhcp6s provides IPv6 addresses and prefix assignment # administrative policy and configuration information for -@@ -25,9 +24,12 @@ +@@ -25,50 +24,42 @@ # addresses, or ntp server addresses. # processname: dhcp6s # config: /etc/dhcp6s.conf @@ -154,15 +174,16 @@ RETVAL=0 -@@ -35,39 +37,30 @@ prog=dhcp6s + prog=dhcp6s ++conf=/etc/dhcp6s.conf dhcp6s=/usr/sbin/dhcp6s - lockfile=/var/lock/subsys/dhcp6s - +-lockfile=/var/lock/subsys/dhcp6s +- -# Check that networking is up. -# networking is not up, return 1 for generic error -. /etc/sysconfig/network -[ $NETWORKING = "no" ] && exit 1 -- + start() { # return 5 if program is not installed - [ -x $dhcp6s ] || exit 5 @@ -172,7 +193,7 @@ - [ -f /etc/dhcp6s.conf ] || exit 6 - [ -f /etc/sysconfig/dhcp6s ] || exit 6 - . /etc/sysconfig/dhcp6s -+ [ -f /etc/dhcp6s.conf ] || return 6 ++ [ -f "$conf" ] || return 6 + [ -f /etc/sysconfig/network/dhcp6s ] || return 6 + . /etc/sysconfig/network/dhcp6s @@ -180,27 +201,30 @@ logger -s -t "$prog" -p "daemon.info" "Warning: $prog listening on ALL interfaces" fi - echo -n $"Starting $prog: " +- echo -n $"Starting $prog: " - daemon $dhcp6s -c /etc/dhcp6s.conf $DHCP6SARGS $DHCP6SIF -+ startproc $dhcp6s -c /etc/dhcp6s.conf $DHCP6SARGS $DHCP6SIF ++ echo -n $"Starting $prog " ++ startproc $dhcp6s -c "$conf" $DHCP6SARGS $DHCP6SIF RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile +- [ $RETVAL -eq 0 ] && touch $lockfile return $RETVAL } stop() { - echo -n $"Shutting down $prog: " +- echo -n $"Shutting down $prog: " - killproc $prog -TERM ++ echo -n $"Shutting down $prog " + killproc $dhcp6s RETVAL=$? - echo - [ $RETVAL -eq 0 ] && success || failure - echo - rm -f $lockfile +- rm -f $lockfile return $RETVAL } -@@ -76,33 +69,37 @@ stop() { + +@@ -76,33 +67,50 @@ stop() { case "$1" in start) start @@ -212,57 +236,74 @@ - RETVAL=$? + rc_status -v ;; - restart|force-reload) - [ -f $lockfile ] && stop +- restart|force-reload) +- [ -f $lockfile ] && stop ++ restart) ++ stop start - RETVAL=$? -+ rc_status -v ++ rc_status ;; - try-restart|reload) +- try-restart|reload) - RETVAL=3 -+ rc_failed 3 -+ rc_status -v - ;; - condrestart) - if [ -f $lockfile ]; then - stop && start -+ rc_status -v +- ;; +- condrestart) +- if [ -f $lockfile ]; then +- stop && start ++ try-restart|condrestart) ++ if test "$1" = "condrestart"; then ++ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" ++ fi ++ $0 status ++ if test $? = 0; then ++ $0 restart + else -+ rc_status -s ++ rc_reset fi ++ rc_status ++ ;; ++ reload) ++ echo -n "Reload service $prog " ++ rc_failed 3 ++ rc_status -v ++ ;; ++ force-reload) ++ $0 try-restart ++ rc_status ;; status) - status $prog - RETVAL=$? ++ echo -n "Checking for service $prog " + checkproc $dhcp6s + rc_status -v ++ ;; ++ probe) ++ test "$conf" -nt "/var/run/dhcpv6/${prog}.pid" && echo restart ;; *) - echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}" +- echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}" - RETVAL=3 -+ rc_failed 3 ++ echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|probe}" ++ exit 1 ;; esac -exit $RETVAL +rc_exit -Index: dhcpv6-1.0.20/Makefile.am -=================================================================== ---- dhcpv6-1.0.20.orig/Makefile.am -+++ dhcpv6-1.0.20/Makefile.am -@@ -14,7 +14,7 @@ MAINTAINERCLEANFILES = Makefile.in confi - depcomp install-sh ltmain.sh missing ABOUT-NLS \ - INSTALL aclocal.m4 configure ylwrap $(DIST_ARCHIVES) +--- dhcpv6-1.0.22/etc/init.d/Makefile.am ++++ dhcpv6-1.0.22/etc/init.d/Makefile.am 2011/08/29 19:21:22 +@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in --CLEANFILES = *~ ChangeLog libdhcp6client.pc -+CLEANFILES = *~ libdhcp6client.pc + EXTRA_DIST = dhcp6r.sh dhcp6s.sh - MOSTLYCLEANDIRS = m4 +-rc_d_dir = $(DESTDIR)$(sysconfdir)/rc.d/init.d ++rc_d_dir = $(DESTDIR)$(sysconfdir)/init.d -Index: dhcpv6-1.0.20/etc/sysconfig/Makefile.am -=================================================================== ---- dhcpv6-1.0.20.orig/etc/sysconfig/Makefile.am -+++ dhcpv6-1.0.20/etc/sysconfig/Makefile.am + install-data-local: + $(MKDIR_P) $(rc_d_dir) +--- dhcpv6-1.0.22/etc/sysconfig/Makefile.am ++++ dhcpv6-1.0.22/etc/sysconfig/Makefile.am 2011/08/29 19:21:22 @@ -8,6 +8,6 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = dhcp6s.sysconfig dhcp6r.sysconfig @@ -273,16 +314,14 @@ + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig/network + $(install_sh_DATA) dhcp6s.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/network/dhcp6s + $(install_sh_DATA) dhcp6r.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/network/dhcp6r -Index: dhcpv6-1.0.20/etc/init.d/Makefile.am -=================================================================== ---- dhcpv6-1.0.20.orig/etc/init.d/Makefile.am -+++ dhcpv6-1.0.20/etc/init.d/Makefile.am -@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in +--- dhcpv6-1.0.22/Makefile.am ++++ dhcpv6-1.0.22/Makefile.am 2011/08/29 19:21:22 +@@ -14,7 +14,7 @@ MAINTAINERCLEANFILES = Makefile.in confi + depcomp install-sh ltmain.sh missing ABOUT-NLS \ + INSTALL aclocal.m4 configure ylwrap $(DIST_ARCHIVES) - EXTRA_DIST = dhcp6r.sh dhcp6s.sh +-CLEANFILES = *~ ChangeLog libdhcp6client.pc ++CLEANFILES = *~ libdhcp6client.pc --rc_d_dir = $(DESTDIR)$(sysconfdir)/rc.d/init.d -+rc_d_dir = $(DESTDIR)$(sysconfdir)/init.d + MOSTLYCLEANDIRS = m4 - install-data-local: - $(MKDIR_P) $(rc_d_dir) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
