commit: 854acd7d9f4df2c0d817417aefb878a9fb246072 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Thu Jul 7 01:20:31 2022 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Sun Jul 10 22:49:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=854acd7d
sys-cluster/keepalived: Remove old version Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/libressl/pull/440 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> .../keepalived-1.4.0-fix-no-sorry-segfault.patch | 28 --------- sys-cluster/keepalived/files/keepalived.confd | 6 -- sys-cluster/keepalived/files/keepalived.init | 33 ---------- sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild | 73 ---------------------- 4 files changed, 140 deletions(-) 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 cbababb..0000000 --- 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/files/keepalived.confd b/sys-cluster/keepalived/files/keepalived.confd deleted file mode 100644 index 5f56cb2..0000000 --- a/sys-cluster/keepalived/files/keepalived.confd +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Keepalived options -# Increase logging: -#KEEPALIVED_OPTS="-D" diff --git a/sys-cluster/keepalived/files/keepalived.init b/sys-cluster/keepalived/files/keepalived.init deleted file mode 100644 index c290c9d..0000000 --- a/sys-cluster/keepalived/files/keepalived.init +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use logger - # The interfaces do not actually need to exist to start, it handles them gracefully. - use net -} - -command="/usr/sbin/keepalived" -command_args="${KEEPALIVED_OPTS}" -pidfile="/var/run/keepalived.pid" - -extra_commands="checkconfig reload" - -checkconfig() { - # keepalived has a config check command, but it does not work while the daemon is running! - if [ ! -e /etc/keepalived/keepalived.conf ] ; then - eerror "You need an /etc/keepalived/keepalived.conf file to run keepalived" - return 1 - fi -} - -start_pre() { - checkconfig || return 1 -} - -reload() { - ebegin "Reloading keepalived.conf" - start-stop-daemon --pidfile $pidfile --signal HUP - eend $? -} 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 e7b7082..0000000 --- a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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:0= - 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 -}
