pool/keepalived
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 545873 from home:itxaka:branches:network

Browse Source 
Revert using github tarball and use original source again.

Update to 1.3.9: Too many fixes and features to list, refer to
  /usr/share/doc/packages/keepalived/ChangeLog for a detailed list.

OBS-URL: https://build.opensuse.org/request/show/545873
OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=35
This commit is contained in:
Dirk Mueller 2017-11-27 10:49:50 +00:00 committed by Git OBS Bridge
parent 0272e4868b
commit e2fdff3ae9
5 changed files with 125 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
keepalive-init.patch
View File

@ -1,8 +1,8 @@
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.in
+++ keepalived/etc/init.d/keepalived.suse.init +++ keepalived/etc/init.d/keepalived.suse.init.in
@@ -1,23 +1,24 @@ @@ -1,23 +1,23 @@
#! /bin/sh #! /bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
@ -23,32 +23,29 @@ Index: keepalived/etc/init.d/keepalived.suse.init
-DAEMON="Keepalived daemon" -DAEMON="Keepalived daemon"
-DAEMON_BIN="/usr/local/sbin/keepalived" -DAEMON_BIN="@sbindir@/keepalived"
-DAEMON_CONF="/etc/keepalived/keepalived.conf" -DAEMON_CONF="@sysconfdir@/keepalived/keepalived.conf"
-DAEMON_PIDFILE="/var/run/keepalived.pid" -DAEMON_PIDFILE="@localstatedir@/run/keepalived.pid"
-DAEMON_OPT="-d" -DAEMON_OPT="-d"
+DAEMON='Keepalived daemon' +DAEMON='Keepalived daemon'
+DAEMON_BIN='/usr/sbin/keepalived' +DAEMON_BIN='@sbindir@/keepalived'
+DAEMON_CONF='/etc/keepalived/keepalived.conf' +DAEMON_CONF='@sysconfdir@/keepalived/keepalived.conf'
+DAEMON_SYSCONF='/etc/sysconfig/keepalived' +DAEMON_PIDFILE='@localstatedir@/run/keepalived.pid'
+DAEMON_PIDFILE='/var/run/keepalived.pid' +DAEMON_OPT='-d'
+KEEPALIVED_OPTIONS='-d'
#DAEMON_USER="root" #DAEMON_USER="root"
-SUPPORTS_HUP="yes" -SUPPORTS_HUP="yes"
+SUPPORTS_HUP='yes' +SUPPORTS_HUP='yes'
# "yes" if exist next values in freshclam.conf # PidFile @localstatedir@/run/keepalived.pid
# PidFile /var/run/keepalived.pid
# DatabaseOwner root # 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"} 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"; +test -x $DAEMON_BIN || { echo "$DAEMON_BIN not installed or executable";
+ if [ "$1" = "stop" ]; then exit 0; + if [ "$1" = "stop" ]; then exit 0;
+ else exit 5; fi; } + else exit 5; fi; }
+ +
+
+test -r $DAEMON_CONF || { echo "$DAEMON_CONF not existing or readable"; +test -r $DAEMON_CONF || { echo "$DAEMON_CONF not existing or readable";
+ if [ "$1" = "stop" ]; then exit 0; + if [ "$1" = "stop" ]; then exit 0;
+ else exit 6; fi; } + else exit 6; fi; }
@ -60,10 +57,11 @@ Index: keepalived/etc/init.d/keepalived.suse.init
# Shell functions sourced from /etc/rc.status: # Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall 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 case "$1" in
start) - start)
- echo -n "Starting $DAEMON " - echo -n "Starting $DAEMON "
- if test ! -f ${DAEMON_CONF}; then - if test ! -f ${DAEMON_CONF}; then
- echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. " - echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. "
@ -110,6 +108,25 @@ Index: keepalived/etc/init.d/keepalived.suse.init
- touch ${DAEMON_PIDFILE} || \ - touch ${DAEMON_PIDFILE} || \
- echo -n >&2 " Warning: daemon not running. " - echo -n >&2 " Warning: daemon not running. "
- killproc $pid_par -HUP ${DAEMON_BIN} - killproc $pid_par -HUP ${DAEMON_BIN}
- rc_status -v
- 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
- ;;
+ start)
+ echo -n "Starting $DAEMON " + echo -n "Starting $DAEMON "
+ if test ! -f ${DAEMON_CONF}; then + if test ! -f ${DAEMON_CONF}; then
+ echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. " + echo -n >&2 "Configuration file, ${DAEMON_CONF} does not exist. "
@ -156,25 +173,10 @@ Index: keepalived/etc/init.d/keepalived.suse.init
+ touch ${DAEMON_PIDFILE} || \ + touch ${DAEMON_PIDFILE} || \
+ echo -n >&2 " Warning: daemon not running. " + echo -n >&2 " Warning: daemon not running. "
+ killproc $pid_par -HUP ${DAEMON_BIN} + killproc $pid_par -HUP ${DAEMON_BIN}
rc_status -v + rc_status -v
- else
+ else + else
$0 stop && sleep 3 && $0 start + $0 stop && sleep 3 && $0 start
rc_status + 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
- ;;
+ fi + fi
+ ;; + ;;
+ status) + status)
@ -191,4 +193,4 @@ Index: keepalived/etc/init.d/keepalived.suse.init
+ ;; + ;;
esac esac
rc_exit rc_exit
-

3
keepalived-1.3.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:314a118a35899e4fa31cbfcef8b77c90d3a6003c686a29088dba1d4c51e31436
size 661521

3
keepalived-1.3.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5bdd25530acf60989222fd92fbfd596e06ecc356a820f4c1015708b76a8d4f3
size 719886

9
keepalived.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Nov 27 09:11:55 UTC 2017 - igarcia@suse.com
- 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.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 13:38:30 UTC 2017 - rbrown@suse.com Thu Nov 23 13:38:30 UTC 2017 - rbrown@suse.com
@ -196,4 +204,3 @@ Tue Nov 19 14:01:47 UTC 2013 - speilicke@suse.com
Tue Nov 20 16:11:59 UTC 2012 - mrueckert@suse.de Tue Nov 20 16:11:59 UTC 2012 - mrueckert@suse.de
- initial package of 1.2.7 - initial package of 1.2.7

7
keepalived.spec
View File

@ -29,15 +29,13 @@
%bcond_with dbus %bcond_with dbus
Name: keepalived Name: keepalived
Version: 1.3.3 Version: 1.3.9
Release: 0 Release: 0
Summary: A strong & robust keepalive facility for linux Summary: A strong & robust keepalive facility for linux
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Routing Group: Productivity/Networking/Routing
Url: http://www.keepalived.org/ 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: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
Source: https://github.com/acassen/keepalived/files/779998/keepalived-1.3.3.tar.gz
Source1: keepalived.service Source1: keepalived.service
Source2: keepalive-rpmlintrc Source2: keepalive-rpmlintrc
Patch1: keepalive-init.patch Patch1: keepalive-init.patch
@ -161,6 +159,7 @@ rm -rv %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalive
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README COPYING ChangeLog %doc README COPYING ChangeLog
%doc %{_datadir}/doc/keepalived/
%config(noreplace) %attr(-,root,keepalived) /etc/keepalived/ %config(noreplace) %attr(-,root,keepalived) /etc/keepalived/
%{_bindir}/genhash %{_bindir}/genhash
%{_sbindir}/rckeepalived %{_sbindir}/rckeepalived