Hello community, here is the log from the commit of package keepalived for openSUSE:Factory checked in at 2017-11-29 10:53:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keepalived (Old) and /work/SRC/openSUSE:Factory/.keepalived.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keepalived" Wed Nov 29 10:53:13 2017 rev:18 rq:546032 version:1.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/keepalived/keepalived.changes 2017-11-25 08:42:41.182197878 +0100 +++ /work/SRC/openSUSE:Factory/.keepalived.new/keepalived.changes 2017-11-29 10:53:25.498984899 +0100 @@ -1,0 +2,14 @@ +Mon Nov 27 11:26:58 UTC 2017 - [email protected] + +- Do not suppress errors from useradd. +- Ensure neutrality of description. + +------------------------------------------------------------------- +Thu Nov 27 09:11:55 UTC 2017 - [email protected] + +- update to 1.3.9: + Revert using github tarball and use original source again. + Too many fixes and features to list, refer to + /usr/share/doc/packages/keepalived/ChangeLog for a detailed list. + +------------------------------------------------------------------- @@ -199 +212,0 @@ - Old: ---- keepalived-1.3.3.tar.gz New: ---- keepalived-1.3.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keepalived.spec ++++++ --- /var/tmp/diff_new_pack.flJCMf/_old 2017-11-29 10:53:26.174960375 +0100 +++ /var/tmp/diff_new_pack.flJCMf/_new 2017-11-29 10:53:26.178960230 +0100 @@ -29,15 +29,13 @@ %bcond_with dbus Name: keepalived -Version: 1.3.3 +Version: 1.3.9 Release: 0 -Summary: A strong & robust keepalive facility for linux +Summary: A keepalive facility for Linux License: GPL-2.0+ Group: Productivity/Networking/Routing Url: http://www.keepalived.org/ -# TODO: revert to old source line with 1.3.4 update -# Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz -Source: https://github.com/acassen/keepalived/files/779998/keepalived-1.3.3.tar.gz +Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service Source2: keepalive-rpmlintrc Patch1: keepalive-init.patch @@ -78,15 +76,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The main goal of this project is to provide simple and robust facilities for -loadbalancing and high-availability to Linux system and Linux based -infrastructures. Loadbalancing framework relies on well-known and widely used -Linux Virtual Server (IPVS) kernel module providing Layer4 loadbalancing. +This project provides facilities for load balancing and high-availability to Linux system and Linux-based +infrastructures. The load-balancing framework relies on the +Linux Virtual Server (IPVS) kernel module providing Layer4 load balancing. Keepalived implements a set of checkers to dynamically and adaptively maintain -and manage loadbalanced server pool according their health. On the other hand -high-availability is achieved by VRRP protocol. VRRP is a fundamental brick for +and manage loadbalanced server pool according their health. +High-availability is achieved by the VRRP protocol, a fundamental brick for router failover. In addition, Keepalived implements a set of hooks to the VRRP -finite state machine providing low-level and high-speed protocol interactions. +finite state machine, providing low-level and high-speed protocol interactions. Keepalived frameworks can be used independently or all together to provide resilient infrastructures. @@ -117,7 +114,7 @@ make %{?_smp_mflags} %install -make install DESTDIR="%{buildroot}" +%make_install install -dD -m 0750 %{buildroot}%{_var}/lib/%{name} install -D -m 0644 %{buildroot}/etc/sysconfig/keepalived %{buildroot}%{_fillupdir}/sysconfig.%{name} @@ -133,8 +130,10 @@ rm -rv %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalived %pre -/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : -/usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" -d %{_var}/lib/%{name} %{name} >/dev/null 2>&1 || : +getent group %{name} >/dev/null || /usr/sbin/groupadd -r %{name} +getent passwd %{name} >/dev/null || \ + /usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" \ + -d %{_var}/lib/%{name} %{name} %if %{with systemd} %service_add_pre %{name}.service %{name}.socket %endif @@ -161,6 +160,7 @@ %files %defattr(-,root,root) %doc README COPYING ChangeLog +%doc %{_datadir}/doc/keepalived/ %config(noreplace) %attr(-,root,keepalived) /etc/keepalived/ %{_bindir}/genhash %{_sbindir}/rckeepalived ++++++ keepalive-init.patch ++++++ --- /var/tmp/diff_new_pack.flJCMf/_old 2017-11-29 10:53:26.202959359 +0100 +++ /var/tmp/diff_new_pack.flJCMf/_new 2017-11-29 10:53:26.206959215 +0100 @@ -1,13 +1,13 @@ -Index: keepalived/etc/init.d/keepalived.suse.init +Index: keepalived/etc/init.d/keepalived.suse.init.in =================================================================== ---- keepalived/etc/init.d/keepalived.suse.init.orig -+++ keepalived/etc/init.d/keepalived.suse.init -@@ -1,23 +1,24 @@ +--- keepalived/etc/init.d/keepalived.suse.init.in ++++ keepalived/etc/init.d/keepalived.suse.init.in +@@ -1,23 +1,23 @@ #! /bin/sh - + ### BEGIN INIT INFO -# Provides: keepalived -+# Provides: keepalived ++# Provides: keepalived # Required-Start: $remote_fs $syslog -# Required-Stop : $remote_fs $syslog -# Default-Start : 3 5 @@ -17,38 +17,35 @@ +# Required-Stop: $remote_fs $syslog +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 -+# Short-Description: Start keepalived to manage IPVS & LVS -+# Description: Start keepalived to manage IPVS & LVS ++# Short-Description: Start keepalived to manage IPVS & LVS ++# Description: Start keepalived to manage IPVS & LVS ### END INIT INFO - - + + -DAEMON="Keepalived daemon" --DAEMON_BIN="/usr/local/sbin/keepalived" --DAEMON_CONF="/etc/keepalived/keepalived.conf" --DAEMON_PIDFILE="/var/run/keepalived.pid" +-DAEMON_BIN="@sbindir@/keepalived" +-DAEMON_CONF="@sysconfdir@/keepalived/keepalived.conf" +-DAEMON_PIDFILE="@localstatedir@/run/keepalived.pid" -DAEMON_OPT="-d" +DAEMON='Keepalived daemon' -+DAEMON_BIN='/usr/sbin/keepalived' -+DAEMON_CONF='/etc/keepalived/keepalived.conf' -+DAEMON_SYSCONF='/etc/sysconfig/keepalived' -+DAEMON_PIDFILE='/var/run/keepalived.pid' -+KEEPALIVED_OPTIONS='-d' ++DAEMON_BIN='@sbindir@/keepalived' ++DAEMON_CONF='@sysconfdir@/keepalived/keepalived.conf' ++DAEMON_PIDFILE='@localstatedir@/run/keepalived.pid' ++DAEMON_OPT='-d' #DAEMON_USER="root" --SUPPORTS_HUP="yes" +-SUPPORTS_HUP="yes" +SUPPORTS_HUP='yes' - # "yes" if exist next values in freshclam.conf - # PidFile /var/run/keepalived.pid + # PidFile @localstatedir@/run/keepalived.pid # DatabaseOwner root -@@ -25,7 +26,19 @@ SUPPORTS_HUP="yes" - pid_par=${DAEMON_PIDFILE:+"-p $DAEMON_PIDFILE"} + +@@ -25,6 +25,18 @@ pid_par=${DAEMON_PIDFILE:+"-p $DAEMON_PIDFILE"} usr_par=${DAEMON_USER:+"-u $DAEMON_USER"} - --test -x $DAEMON_BIN || exit 5 + + test -x $DAEMON_BIN || exit 5 +test -x $DAEMON_BIN || { echo "$DAEMON_BIN not installed or executable"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } + -+ +test -r $DAEMON_CONF || { echo "$DAEMON_CONF not existing or readable"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } @@ -57,13 +54,14 @@ +if [ -r "$DAEMON_SYSCONF" ]; then + . "$DAEMON_SYSCONF" +fi - + # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status -@@ -62,70 +75,70 @@ test -e $DAEMON_PIDFILE && ! test -s $DA - +@@ -60,71 +72,70 @@ rc_reset + test -e $DAEMON_PIDFILE && ! test -s $DAEMON_PIDFILE && rm $DAEMON_PIDFILE + case "$1" in - start) +- start) - echo -n "Starting $DAEMON " - if test ! -f ${DAEMON_CONF}; then - echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. " @@ -93,7 +91,7 @@ - $0 status - if test $? = 0; then - $0 restart -- else +- else - rc_reset - fi - rc_status @@ -110,57 +108,10 @@ - touch ${DAEMON_PIDFILE} || \ - echo -n >&2 " Warning: daemon not running. " - killproc $pid_par -HUP ${DAEMON_BIN} -+ echo -n "Starting $DAEMON " -+ if test ! -f ${DAEMON_CONF}; then -+ echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. " -+ rc_status -s -+ exit 6 -+ fi -+ checkproc $pid_par ${DAEMON_BIN} -+ case $? in -+ 0) echo -n "- Warning: daemon already running. " ;; -+ 1) echo -n "- Warning: ${DAEMON_PIDFILE} exists. " ;; -+ esac -+# echo "startproc $usr_par $pid_par ${DAEMON_BIN} ${KEEPALIVED_OPTIONS}" -+ startproc $usr_par $pid_par ${DAEMON_BIN} ${KEEPALIVED_OPTIONS} -+ rc_status -v -+ ;; -+ stop) -+ echo -n "Shutting down $DAEMON " -+ checkproc $pid_par ${DAEMON_BIN} || \ -+ echo -n " Warning: daemon not running. " -+ killproc $pid_par -t 10 ${DAEMON_BIN} -+ rc_status -v -+ ;; -+ 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 -+ ;; -+ restart) -+ $0 stop -+ $0 start -+ rc_status -+ ;; -+ force-reload|reload) -+ if test "$SUPPORTS_HUP" = "yes"; then -+ echo -n "Reload service $DAEMON " -+ checkproc $pid_par ${DAEMON_BIN} && \ -+ touch ${DAEMON_PIDFILE} || \ -+ echo -n >&2 " Warning: daemon not running. " -+ killproc $pid_par -HUP ${DAEMON_BIN} - rc_status -v +- rc_status -v - else -+ else - $0 stop && sleep 3 && $0 start - rc_status +- $0 stop && sleep 3 && $0 start +- rc_status - fi - ;; - status) @@ -175,20 +126,71 @@ - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -+ fi -+ ;; -+ status) -+ echo -n "Checking for $DAEMON " -+ checkproc $pid_par ${DAEMON_BIN} ++ start) ++ echo -n "Starting $DAEMON " ++ if test ! -f ${DAEMON_CONF}; then ++ echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. " ++ rc_status -s ++ exit 6 ++ fi ++ checkproc $pid_par ${DAEMON_BIN} ++ case $? in ++ 0) echo -n "- Warning: daemon already running. " ;; ++ 1) echo -n "- Warning: ${DAEMON_PIDFILE} exists. " ;; ++ esac ++# echo "startproc $usr_par $pid_par ${DAEMON_BIN} ${KEEPALIVED_OPTIONS}" ++ startproc $usr_par $pid_par ${DAEMON_BIN} ${KEEPALIVED_OPTIONS} ++ rc_status -v ++ ;; ++ stop) ++ echo -n "Shutting down $DAEMON " ++ checkproc $pid_par ${DAEMON_BIN} || \ ++ echo -n " Warning: daemon not running. " ++ killproc $pid_par -t 10 ${DAEMON_BIN} ++ rc_status -v ++ ;; ++ 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 ++ ;; ++ restart) ++ $0 stop ++ $0 start ++ rc_status ++ ;; ++ force-reload|reload) ++ if test "$SUPPORTS_HUP" = "yes"; then ++ echo -n "Reload service $DAEMON " ++ checkproc $pid_par ${DAEMON_BIN} && \ ++ touch ${DAEMON_PIDFILE} || \ ++ echo -n >&2 " Warning: daemon not running. " ++ killproc $pid_par -HUP ${DAEMON_BIN} + rc_status -v -+ ;; -+ probe) -+ test ${DAEMON_CONF} -nt ${DAEMON_PIDFILE} && echo reload -+ ;; -+ *) -+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" -+ exit 1 -+ ;; ++ else ++ $0 stop && sleep 3 && $0 start ++ rc_status ++ fi ++ ;; ++ status) ++ echo -n "Checking for $DAEMON " ++ checkproc $pid_par ${DAEMON_BIN} ++ rc_status -v ++ ;; ++ probe) ++ test ${DAEMON_CONF} -nt ${DAEMON_PIDFILE} && echo reload ++ ;; ++ *) ++ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" ++ exit 1 ++ ;; esac rc_exit - +- ++++++ keepalived-1.3.3.tar.gz -> keepalived-1.3.9.tar.gz ++++++ ++++ 29832 lines of diff (skipped)
