From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] keepalived: Update to version 2.0.20 . Date: Mon, 16 Mar 2020 13:42:59 +0100 Message-ID: <20200316124259.24686-1-erik.kapfer@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7621471619705591137==" List-Id: --===============7621471619705591137== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Since this update is a mayor version update, it brings a lot of changes. The changelog can be found in here --> http://www.keepalived.com/changelog.ht= ml . Added /etc/sysconfig/keepalived in ROOTFILE and in backup/includes. Signed-off-by: Erik Kapfer --- config/backup/includes/keepalived | 1 + config/rootfiles/packages/keepalived | 9 ++++++--- lfs/keepalived | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config/backup/includes/keepalived b/config/backup/includes/keepa= lived index eab187a6f..900191241 100644 --- a/config/backup/includes/keepalived +++ b/config/backup/includes/keepalived @@ -1 +1,2 @@ /etc/keepalived/ +/etc/sysconfig/keepalived diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages= /keepalived index fbf5702cb..e8fde25de 100644 --- a/config/rootfiles/packages/keepalived +++ b/config/rootfiles/packages/keepalived @@ -7,6 +7,7 @@ etc/keepalived/samples #etc/keepalived/samples/keepalived.conf.IPv6 #etc/keepalived/samples/keepalived.conf.SMTP_CHECK #etc/keepalived/samples/keepalived.conf.SSL_GET +#etc/keepalived/samples/keepalived.conf.conditional_conf #etc/keepalived/samples/keepalived.conf.fwmark #etc/keepalived/samples/keepalived.conf.inhibit #etc/keepalived/samples/keepalived.conf.misc_check @@ -21,18 +22,20 @@ etc/keepalived/samples #etc/keepalived/samples/keepalived.conf.vrrp.localcheck #etc/keepalived/samples/keepalived.conf.vrrp.lvs_syncd #etc/keepalived/samples/keepalived.conf.vrrp.routes +#etc/keepalived/samples/keepalived.conf.vrrp.rules #etc/keepalived/samples/keepalived.conf.vrrp.scripts #etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress #etc/keepalived/samples/keepalived.conf.vrrp.sync #etc/keepalived/samples/root.pem #etc/keepalived/samples/sample.misccheck.smbcheck.sh -#etc/sysconfig/keepalived +#etc/keepalived/samples/sample_notify_fifo.sh etc/rc.d/init.d/keepalived +etc/sysconfig/keepalived usr/bin/genhash usr/sbin/keepalived +#usr/share/doc/keepalived +#usr/share/doc/keepalived/README #usr/share/man/man1/genhash.1 #usr/share/man/man5/keepalived.conf.5 #usr/share/man/man8/keepalived.8 -#usr/share/snmp/mibs/KEEPALIVED-MIB -#usr/share/snmp/mibs/VRRP-MIB var/ipfire/backup/addons/includes/keepalived diff --git a/lfs/keepalived b/lfs/keepalived index c18625f38..905f1d070 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2020 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.2.17 +VER =3D 2.0.20 =20 THISAPP =3D keepalived-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D keepalived -PAK_VER =3D 7 +PAK_VER =3D 8 =20 DEPS =3D "" =20 @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 8d6400e1be43fc303175164d69125dce +$(DL_FILE)_MD5 =3D a5966e8433b60998709c4a922a407bac =20 install : $(TARGET) =20 @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc \ - --with-kernel-dir=3D/usr/include + --with-kernel-dir=3D/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install =20 --=20 2.12.2 --===============7621471619705591137==--