From patchwork Mon Mar 16 12:42:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Kapfer X-Patchwork-Id: 2838 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48gwvT19Fgz3yBQ for ; Mon, 16 Mar 2020 12:43:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48gwvR6Ghxz1Sn; Mon, 16 Mar 2020 12:43:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48gwvR4ZVMz2xw0; Mon, 16 Mar 2020 12:43:15 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48gwvP458Bz2xDH for ; Mon, 16 Mar 2020 12:43:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48gwvN4pzBz1Sn; Mon, 16 Mar 2020 12:43:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1584362592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=VXYVghpJTiIQAOYDn3u8Z/Tpz5Tr+7TkXU322ih805s=; b=uKaYG306uiIPcsVfpyu3DdVQqnUNVZj5eC4txP+Qawj3fi4kPG23Kv0SaC2ISPzidMygQE BuczeLS847lLcVCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1584362592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=VXYVghpJTiIQAOYDn3u8Z/Tpz5Tr+7TkXU322ih805s=; b=mYsjOanVDMwCG//d3+GpxdDSKNd7HKZJ+w8/pnxeyMP6rrTbfdDuS7Bbywsh8z4a+Tvmyu ffmxU+644vU46SMhfpYryUqR8bOY16ToWZC4jHMj4+JKTcb4LVucQXY8rb8so68bjoAca0 LsFMuKwhT8sCIuQcuPnOjqLNMVfQzl2xtWOWcFLS+ybFw7DPea0+B0j9kPH2+2nZU4Uw2W q9FoqoB9ULeelYs0QCQQC7EzRGVzWnCFuiApIwxCVdDevPIdYBNMLYdJJ/SxrxZmAVTQ6K tmkp2sHtirGY2NNWwk9zq8CD9B/WwkwTEcgvNw7/y2Jk9uyfYWVYA/MPVNan0A== 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: References: Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=erik.kapfer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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.html . 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/keepalived 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 @@ include Config -VER = 1.2.17 +VER = 2.0.20 THISAPP = keepalived-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = keepalived -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d6400e1be43fc303175164d69125dce +$(DL_FILE)_MD5 = a5966e8433b60998709c4a922a407bac install : $(TARGET) @@ -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=/usr --sysconfdir=/etc \ - --with-kernel-dir=/usr/include + --with-kernel-dir=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install