commit: 77944a786ca7827bffa806fd37b2e99f44d1b991 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Wed Mar 28 08:32:34 2018 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Mar 28 10:28:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77944a78
sys-cluster/keepalived: drop old Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-cluster/keepalived/Manifest | 2 +- .../keepalived-1.4.0-fix-no-sorry-segfault.patch | 28 --------- sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild | 73 ---------------------- 3 files changed, 1 insertion(+), 102 deletions(-) diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest index 2acaa74f29d..f766737cf7a 100644 --- a/sys-cluster/keepalived/Manifest +++ b/sys-cluster/keepalived/Manifest @@ -1,3 +1,3 @@ DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5 DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720 -DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3 +DIST keepalived-1.4.2.tar.gz 738096 BLAKE2B edfd2c20b4de80a2e15d9598558b0ccfb4d6a7a7eace278ab97358691ed38485017ecca2f2934405930818b54e60f644c575dc4a320a9900bf81b97916268c91 SHA512 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3 diff --git a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch b/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch deleted file mode 100644 index cbababb3980..00000000000 --- a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 49559856e19a1a9fad590cc640da7df57c6b9a66 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage <[email protected]> -Date: Wed, 17 Jan 2018 12:08:07 +0000 -Subject: [PATCH] Fix segfault if no sorry server configured for a virtual - server - -Issue #751 identified a segfault in vs_end_handler(), and it -transpires that the forwarding method of the sorry server was being -checked without first testing that a sorry server had been configured. - -Signed-off-by: Quentin Armitage <[email protected]> ---- - keepalived/check/check_parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keepalived/check/check_parser.c b/keepalived/check/check_parser.c -index b2518da7..170e47d4 100644 ---- a/keepalived/check/check_parser.c -+++ b/keepalived/check/check_parser.c -@@ -120,7 +120,7 @@ vs_end_handler(void) - - /* If the real (sorry) server uses tunnel forwarding, the address family - * does not have to match the address family of the virtaul server */ -- if (vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) { -+ if (vs->s_svr && vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) { - if (vs->af == AF_UNSPEC) - vs->af = vs->s_svr->addr.ss_family; - else if (vs->af != vs->s_svr->addr.ss_family) { diff --git a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild deleted file mode 100644 index 1be5d090b40..00000000000 --- a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project" -HOMEPAGE="http://www.keepalived.org/"; -SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="dbus debug ipv6 -json snmp" - -RDEPEND="dev-libs/libnl:= - dev-libs/openssl:= - dev-libs/popt - net-libs/libnfnetlink - sys-apps/iproute2 - dbus? ( sys-apps/dbus ) - json? ( dev-libs/json-c:= ) - snmp? ( net-analyzer/net-snmp )" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-4.4" - -DOCS=( - README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO - doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt -) - -PATCHES=( - "${FILESDIR}/${P}-fix-no-sorry-segfault.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - STRIP=/bin/true \ - econf \ - --with-kernel-dir=/usr \ - --enable-sha1 \ - --enable-vrrp \ - $(use_enable dbus) \ - $(use_enable dbus dbus-create-instance) \ - $(use_enable debug) \ - $(use_enable json) \ - $(use_enable snmp) -} - -src_install() { - default - - newinitd "${FILESDIR}"/keepalived.init keepalived - newconfd "${FILESDIR}"/keepalived.confd keepalived - - use snmp && dodoc doc/KEEPALIVED-MIB.txt - - docinto genhash - dodoc genhash/README genhash/AUTHOR genhash/ChangeLog - # This was badly named by upstream, it's more HOWTO than anything else. - newdoc INSTALL INSTALL+HOWTO - - # Security risk to bundle SSL certs - rm -v "${ED}"/etc/keepalived/samples/*.pem || die - # Clean up sysvinit files - rm -rv "${ED}"/etc/sysconfig || die -}
