* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
@ 2018-03-28 10:33 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2018-03-28 10:33 UTC (permalink / raw
To: gentoo-commits
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 <quentin@armitage.org.uk>
-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 <quentin@armitage.org.uk>
----
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
@ 2021-05-20 9:51 Alexys Jacob
0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2021-05-20 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 39288d7004f30bdd8b9c890ad979394cbe00aefd
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri May 14 15:44:48 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu May 20 09:50:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39288d70
sys-cluster/keepalived: bump to 2.2.2
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19485
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
sys-cluster/keepalived/Manifest | 1 +
sys-cluster/keepalived/files/keepalived.service-r1 | 15 ++++
sys-cluster/keepalived/keepalived-2.2.2.ebuild | 90 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 4408c62c05a..3b9914d00d3 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,2 +1,3 @@
DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
DIST keepalived-2.1.5.tar.gz 1081559 BLAKE2B 791de7f24d012d77fbf9573713ab158cd91c08b969982b5d6bb86e5e6ed347281378dd5106a05db2f37fd9ab2eb479c131333b4b8c6983671b18652122fdbe37 SHA512 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
+DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b44b780987ed93f3dde7005f61699c1488fd92fccb75f77ef5dcc83461428bbad79cc59cd4648a824a8bfbe7fbd2c34 SHA512 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706
diff --git a/sys-cluster/keepalived/files/keepalived.service-r1 b/sys-cluster/keepalived/files/keepalived.service-r1
new file mode 100644
index 00000000000..a3624ed41f6
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.service-r1
@@ -0,0 +1,15 @@
+[Unit]
+Description=LVS and VRRP High Availability Monitor
+After=network-online.target syslog.target
+Wants=network-online.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+PIDFile=/run/keepalived.pid
+KillMode=process
+ExecStart=/usr/sbin/keepalived --dont-fork $KEEPALIVED_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-cluster/keepalived/keepalived-2.2.2.ebuild b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
new file mode 100644
index 00000000000..395a98ee08f
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus -json regex snmp systemd"
+
+RDEPEND="dev-libs/libnl:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ net-libs/libnfnetlink
+ sys-apps/iproute2
+ regex? ( >=dev-libs/libpcre2-8 )
+ dbus? ( sys-apps/dbus dev-libs/glib:2 )
+ json? ( dev-libs/json-c:= )
+ snmp? ( net-analyzer/net-snmp )
+ systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+ README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+ doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local init
+ if use systemd; then
+ init=systemd
+ else
+ init=custom
+ fi
+
+ # keepalived has support to dynamically use some libraries instead of
+ # linking them:
+ #--enable-dynamic-linking \
+ #--enable-libiptc-dynamic \
+ #--enable-libnl-dynamic \
+ #--enable-libxtables-dynamic \
+ STRIP=/bin/true \
+ econf \
+ --with-init=${init} \
+ --with-kernel-dir=/usr \
+ --enable-sha1 \
+ --enable-vrrp \
+ $(use_enable bfd) \
+ $(use_enable dbus) \
+ $(use_enable json) \
+ $(use_enable regex) \
+ $(use_enable snmp) \
+ $(use_enable snmp snmp-rfc) \
+ $(use_enable systemd)
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+ newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+ systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+ systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+ use snmp && dodoc doc/*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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
@ 2018-11-15 13:49 Mikle Kolyada
0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2018-11-15 13:49 UTC (permalink / raw
To: gentoo-commits
commit: bb99b23e3f30a44d4880944ff42731297a0c5e3e
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Nov 15 09:58:16 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Nov 15 13:49:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb99b23e
sys-cluster/keepalived: fix crash during shutdown
Bug: https://bugs.gentoo.org/670856
Bug: https://github.com/acassen/keepalived/issues/1061
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10422
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
.../files/keepalived-2.0.10-snmp-crash-fix.patch | 122 +++++++++++++++++++++
sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild | 76 +++++++++++++
2 files changed, 198 insertions(+)
diff --git a/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch b/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch
new file mode 100644
index 00000000000..c1a5ab36180
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch
@@ -0,0 +1,122 @@
+diff --git a/keepalived/check/check_snmp.c b/keepalived/check/check_snmp.c
+index 67ae0e4f9..95c6e6f83 100644
+--- a/keepalived/check/check_snmp.c
++++ b/keepalived/check/check_snmp.c
+@@ -1451,6 +1451,9 @@ static struct variable8 check_vars[] = {
+ void
+ check_snmp_agent_init(const char *snmp_socket)
+ {
++ if (snmp_running)
++ return;
++
+ /* We handle the global oid if we are running SNMP */
+ snmp_agent_init(snmp_socket, true);
+ snmp_register_mib(check_oid, OID_LENGTH(check_oid), "Healthchecker",
+@@ -1462,6 +1465,9 @@ check_snmp_agent_init(const char *snmp_socket)
+ void
+ check_snmp_agent_close()
+ {
++ if (!snmp_running)
++ return;
++
+ snmp_unregister_mib(check_oid, OID_LENGTH(check_oid));
+ snmp_agent_close(true);
+ }
+diff --git a/keepalived/core/snmp.c b/keepalived/core/snmp.c
+index a9472feae..eb5bed20a 100644
+--- a/keepalived/core/snmp.c
++++ b/keepalived/core/snmp.c
+@@ -325,6 +325,9 @@ snmp_unregister_mib(oid *myoid, size_t len)
+ void
+ snmp_agent_init(const char *snmp_socket, bool base_mib)
+ {
++ if (snmp_running)
++ return;
++
+ log_message(LOG_INFO, "Starting SNMP subagent");
+ netsnmp_enable_subagent();
+ snmp_disable_log();
+@@ -378,6 +381,9 @@ snmp_agent_init(const char *snmp_socket, bool base_mib)
+ void
+ snmp_agent_close(bool base_mib)
+ {
++ if (!snmp_running)
++ return;
++
+ if (base_mib)
+ snmp_unregister_mib(global_oid, OID_LENGTH(global_oid));
+ snmp_shutdown(global_name);
+diff --git a/keepalived/vrrp/vrrp_snmp.c b/keepalived/vrrp/vrrp_snmp.c
+index ca9d46768..db696159c 100644
+--- a/keepalived/vrrp/vrrp_snmp.c
++++ b/keepalived/vrrp/vrrp_snmp.c
+@@ -4552,6 +4552,9 @@ vrrp_handles_global_oid(void)
+ void
+ vrrp_snmp_agent_init(const char *snmp_socket)
+ {
++ if (snmp_running)
++ return;
++
+ /* We let the check process handle the global OID if it is running and with snmp */
+ snmp_agent_init(snmp_socket, vrrp_handles_global_oid());
+
+@@ -4581,6 +4584,9 @@ vrrp_snmp_agent_init(const char *snmp_socket)
+ void
+ vrrp_snmp_agent_close(void)
+ {
++ if (!snmp_running)
++ return;
++
+ #ifdef _WITH_SNMP_VRRP_
+ if (global_data->enable_snmp_vrrp)
+ snmp_unregister_mib(vrrp_oid, OID_LENGTH(vrrp_oid));
+diff --git a/lib/scheduler.c b/lib/scheduler.c
+index 0a1c334c3..9090a7f88 100644
+--- a/lib/scheduler.c
++++ b/lib/scheduler.c
+@@ -1630,7 +1630,7 @@ thread_fetch_next_queue(thread_master_t *m)
+ if (!ev->read) {
+ log_message(LOG_INFO, "scheduler: No read thread bound on fd:%d (fl:0x%.4X)"
+ , ev->fd, ep_ev->events);
+- assert(0);
++ continue;
+ }
+ thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD);
+ ev->read = NULL;
+@@ -1641,7 +1641,7 @@ thread_fetch_next_queue(thread_master_t *m)
+ if (!ev->write) {
+ log_message(LOG_INFO, "scheduler: No write thread bound on fd:%d (fl:0x%.4X)"
+ , ev->fd, ep_ev->events);
+- assert(0);
++ continue;
+ }
+ thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD);
+ ev->write = NULL;
+@@ -1710,7 +1710,12 @@ process_threads(thread_master_t *m)
+ thread = thread_trim_head(thread_list);
+ if (!shutting_down ||
+ (thread->type == THREAD_READY_FD &&
+- (thread->u.fd == m->timer_fd || thread->u.fd == m->signal_fd)) ||
++ (thread->u.fd == m->timer_fd ||
++ thread->u.fd == m->signal_fd
++#ifdef _WITH_SNMP_
++ || FD_ISSET(thread->u.fd, &m->snmp_fdset)
++#endif
++ )) ||
+ thread->type == THREAD_CHILD ||
+ thread->type == THREAD_CHILD_TIMEOUT ||
+ thread->type == THREAD_CHILD_TERMINATED ||
+diff --git a/lib/utils.c b/lib/utils.c
+index 6f9ec254d..e5b82b524 100644
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -789,7 +789,9 @@ FILE *fopen_safe(const char *path, const char *mode)
+ {
+ int fd;
+ FILE *file;
++#ifdef ENABLE_LOG_FILE_APPEND
+ int flags = O_NOFOLLOW | O_CREAT | O_CLOEXEC;
++#endif
+ int sav_errno;
+ char file_tmp_name[] = "/tmp/keepalivedXXXXXX";
+
diff --git a/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
new file mode 100644
index 00000000000..5eea98a00f6
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+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}-snmp-crash-fix.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-r1 keepalived
+ newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+ systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+ 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
@ 2018-04-19 8:12 Amy Liffey
0 siblings, 0 replies; 6+ messages in thread
From: Amy Liffey @ 2018-04-19 8:12 UTC (permalink / raw
To: gentoo-commits
commit: c62ee8ee6a3c9741e43dcac41439d5f90ce19b47
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 08:09:12 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 08:10:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c62ee8ee
Revert "sys-cluster/keepalived: fix building with linux-headers-4.15"
This reverts commit f569763b63e3d0159bfb297d295d970e4a890d3c.
- Already in upstream fails to build
Requested-by: Tomas Mozes <hydrapolic <AT> gmail.com>
| 54 ----------------------
sys-cluster/keepalived/keepalived-1.4.2.ebuild | 4 --
2 files changed, 58 deletions(-)
diff --git a/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch b/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch
deleted file mode 100644
index 542b1554ac0..00000000000
--- a/sys-cluster/keepalived/files/keepalived-fix-building-with-linux-headers-4.15.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 947248af144bcab6376ccddab8dc40f313b14281 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Fri, 9 Feb 2018 11:55:19 +0200
-Subject: [PATCH] Fix build with Linux kernel headers v4.15
-
-Linux kernel version 4.15 changed the libc/kernel headers suppression
-logic in a way that introduces collisions:
-
-In file included from ./../include/vrrp_ipaddress.h:32:0,
- from ./../include/vrrp_arp.h:31,
- from vrrp.c:29:
-/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP'
- IPPROTO_IP = 0, /* Dummy protocol for TCP */
- ^
-/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here
- IPPROTO_IP = 0, /* Dummy protocol for TCP. */
- ^~~~~~~~~~
-
-Include the libc netinet/in.h header first to suppress the kernel
-header.
-
-In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo
-definition.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- keepalived/include/vrrp_arp.h | 1 +
- keepalived/vrrp/vrrp.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h
-index c2b4e6b5..9dd68f63 100644
---- a/keepalived/include/vrrp_arp.h
-+++ b/keepalived/include/vrrp_arp.h
-@@ -24,6 +24,7 @@
- #define _VRRP_ARP_H
-
- /* system includes */
-+#include <netinet/in.h>
- #include <net/ethernet.h>
- #include <net/if_arp.h>
-
-diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
-index 56395363..eaa9c567 100644
---- a/keepalived/vrrp/vrrp.c
-+++ b/keepalived/vrrp/vrrp.c
-@@ -26,6 +26,7 @@
- #include "config.h"
-
- /* local include */
-+#define _GNU_SOURCE
- #include "vrrp_arp.h"
- #include "vrrp_ndisc.h"
- #include "vrrp_scheduler.h"
diff --git a/sys-cluster/keepalived/keepalived-1.4.2.ebuild b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
index 6b60cf23060..9ec3a8f5d74 100644
--- a/sys-cluster/keepalived/keepalived-1.4.2.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.2.ebuild
@@ -30,10 +30,6 @@ DOCS=(
doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
)
-PATCHES=(
- "${FILESDIR}/${PN}-fix-building-with-linux-headers-4.15.patch"
-)
-
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
@ 2018-01-18 10:15 Alexys Jacob
0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2018-01-18 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 478f4732bb24ab88515122638d70d2ad0478ad42
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Jan 18 08:59:42 2018 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 10:15:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478f4732
sys-cluster/keepalived: fix segfault when no sorry server is configured
Closes: https://bugs.gentoo.org/643992
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6895
.../keepalived-1.4.0-fix-no-sorry-segfault.patch | 28 ++++++++++++++++++++++
...ved-1.4.0.ebuild => keepalived-1.4.0-r1.ebuild} | 17 +++++++++----
2 files changed, 40 insertions(+), 5 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
new file mode 100644
index 00000000000..cbababb3980
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
@@ -0,0 +1,28 @@
+From 49559856e19a1a9fad590cc640da7df57c6b9a66 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+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 <quentin@armitage.org.uk>
+---
+ 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.ebuild b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
similarity index 84%
rename from sys-cluster/keepalived/keepalived-1.4.0.ebuild
rename to sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
index 66d4382c86b..1be5d090b40 100644
--- a/sys-cluster/keepalived/keepalived-1.4.0.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
@@ -25,12 +25,19 @@ RDEPEND="dev-libs/libnl:=
DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-4.4"
-DOCS=( README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
- doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
+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() {
- eautoreconf
default
+
+ eautoreconf
}
src_configure() {
@@ -60,7 +67,7 @@ src_install() {
newdoc INSTALL INSTALL+HOWTO
# Security risk to bundle SSL certs
- rm -f "${ED}"/etc/keepalived/samples/*.pem
+ rm -v "${ED}"/etc/keepalived/samples/*.pem || die
# Clean up sysvinit files
- rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
+ rm -rv "${ED}"/etc/sysconfig || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/
@ 2017-04-21 14:45 Alexys Jacob
0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2017-04-21 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 03ff70df20c3af6fd7a07d0a381c45db6b61ed18
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 14:45:39 2017 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 14:45:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ff70df
sys-cluster/keepalived: ebuild cleanup, drop old unsupported
Package-Manager: Portage-2.3.4, Repoman-2.3.2
sys-cluster/keepalived/Manifest | 6 --
sys-cluster/keepalived/files/conf-keepalived | 6 --
sys-cluster/keepalived/files/init-keepalived | 43 --------
...palived-1.1.20-do-not-need-kernel-sources.patch | 110 ---------------------
.../files/keepalived-1.2.2-bind-afunspec.patch | 13 ---
.../keepalived-1.2.2-fix-ipv4-addr-compare.patch | 23 -----
...eepalived-1.2.2-libipvs-fix-backup-daemon.patch | 51 ----------
.../files/keepalived-1.2.2-libipvs-fix-ipv6.patch | 33 -------
sys-cluster/keepalived/keepalived-1.2.15.ebuild | 63 ------------
sys-cluster/keepalived/keepalived-1.2.19.ebuild | 62 ------------
sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild | 66 -------------
sys-cluster/keepalived/keepalived-1.2.22.ebuild | 64 ------------
sys-cluster/keepalived/keepalived-1.2.23.ebuild | 64 ------------
13 files changed, 604 deletions(-)
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 6c62917142c..0a1593bc818 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,8 +1,2 @@
-DIST keepalived-1.2.15.tar.gz 345471 SHA256 47db44d78549da704e0794198bfc874be65ca570d15429a6a5c23b8d91109aa9 SHA512 f640e3f2694d359ebb24addb55c48c9ca877fa64daac5e73b4a251bf2a531705a8e02a34d7ee95cd96ad70a282c96f5102d3ce4baa2be90e6df2c8d910551b78 WHIRLPOOL 3273e2d1cdaf8c5ca468e536472c6c781ed4cf78035b559f68693b935eeae04b28204f51e983d9066f294f63dbb05b9d8d77f8c7cb647c77abbd99c6a8f65561
-DIST keepalived-1.2.19.tar.gz 330164 SHA256 32fbae732c1cd854cacd7a930d4a26f5bad6372cdecb5e3139f0c17e87493853 SHA512 d2848726aa97bbd5a3be3e667314a453d26572ef6d14f5f606395a203ceab7bce8a6c63e3b5ebb05c83d75a5491b77f1fa4e3042cd919d7d673c3595ec829974 WHIRLPOOL d99f2ec52b952d8f5d79486e01c58fe6b15e22fe8279a56384958c5597ed031d217495518388efb33ece3170c56220836bcda7c998777deb81d348d0e9fd146a
-DIST keepalived-1.2.2.tar.gz 249557 SHA256 4c05dbd149af120506b4f3a66b4016e30d9ad112e4c26a602e28c366705de8c0 SHA512 1ac581c94be846822ef0ea7f3d2084b4a64ebc2cf77f9e41248169daa3319adcdeb8bd2bef2b3ce6630ae620f4b2ab7e9e949881d7efcc3d359004f0ff316ae8 WHIRLPOOL 13ad7a3f97619951f40dd3a7e43253d218b8bb9515c4b9c551125df2d6d6fe1cbf2761e88b54733498adf782aeae10f55ee267c58c297f1765fa86939edc1a00
-DIST keepalived-1.2.22.tar.gz 472770 SHA256 0e386ec0bcad19c202330020a58a0d10b82ca9c107e4d07913664f93cd3df42a SHA512 41b13341cd516e9d6b688d8275271040e6847f62cc3cd488b6a7cf2c200fc06b0efd2f86dfa7a39af4e72157042494f00b60476d1feb6648aae0df0a1a3c5cbf WHIRLPOOL 0f4f882e12c410bc37dbf67e1b5a145e8e04b8da36c73ca3d1eccfec1e96bfaab0d533ed09599219e9bcb41132f62c8d0fe259584bc2d7944bb778cb824cb4e5
-DIST keepalived-1.2.23.tar.gz 476278 SHA256 19e432bcf10ff3e801aa87acf84113a0b57d31524c3ca8866f13ffeb0475d910 SHA512 5879965990f5ad54493d2aa85fbd11ad486d76fe00848c63d293240d7d19ced81ff4f1e4a51cea5b85632b74e800eadd1cf4b2a8fa106abec896a1739f68336a WHIRLPOOL b32c9d95209f92835d65a4f3f3b9685b0c6abb600555567284c4ebee790c647caed180f55e7b5329efba591e1d9a4c381909c222dbae37c9299494d55be1fae6
DIST keepalived-1.2.24.tar.gz 601873 SHA256 3071804478077e606197a2348b5733d7d53af2843906af5e0d544945565c36ef SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5 WHIRLPOOL 03bb40cc499139679a5ca1446334459ef92e8acabce1d7359a30330d2afedc6f425e0226c0f98cabebe05310aac538f503c49627ed46091f132f042213392c5d
DIST keepalived-1.3.5.tar.gz 683183 SHA256 c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720 WHIRLPOOL 4dfe73c20b3c7d40a1e1c4af85754df1ac494e8ada213e9b642197cfba0cd32acee7e17f7f9aec86c72fce8a8a01b36b464e649d6e4b8678a6246486d1468cb1
-DIST keepalived_1.2.2-3.diff.gz 9856 SHA256 104213b98e80c5de7c04ff0a409b88c6aad30f727516f26871fa77dcbdc74aa6 SHA512 d42dc7c591e4134e155e4e8db3cb7ccbf5098f02f09cb9ecfc5b18c43f8c497360018e4584b7f77169b15ca0b28ec84f340dd5c336fc53e3338c62bce0fe1478 WHIRLPOOL 4eefb8765fc78365472687af6d2742c1cdb3eb2ee0e3d0570e5c82e478054547797aaa823786bae73a31bc4b752c334ab6e4784f86f457b140b01ef9a72336aa
diff --git a/sys-cluster/keepalived/files/conf-keepalived b/sys-cluster/keepalived/files/conf-keepalived
deleted file mode 100644
index e739cced3db..00000000000
--- a/sys-cluster/keepalived/files/conf-keepalived
+++ /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:
-#opts="-D"
diff --git a/sys-cluster/keepalived/files/init-keepalived b/sys-cluster/keepalived/files/init-keepalived
deleted file mode 100644
index 8688c43a30b..00000000000
--- a/sys-cluster/keepalived/files/init-keepalived
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="reload"
-
-depend() {
- use logger
- # The interfaces do not actually need to exist to start, it handles them gracefully.
- use net
-}
-
-extra_commands="checkconfig"
-
-PIDFILE=/var/run/keepalived.pid
-
-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() {
- checkconfig || return 1
- ebegin "Starting Keepalived"
- start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --exec /usr/sbin/keepalived -- $opts
- eend $?
-}
-
-stop() {
- ebegin "Stopping Keepalived"
- start-stop-daemon --stop --quiet --pidfile $PIDFILE
- eend $?
-}
-
-reload() {
- ebegin "Reloading keepalived.conf"
- start-stop-daemon --pidfile $PIDFILE --signal HUP
- eend $?
-}
diff --git a/sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch
deleted file mode 100644
index e56cc635907..00000000000
--- a/sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -urN keepalived-1.1.20-orig/configure.in keepalived-1.1.20/configure.in
---- keepalived-1.1.20-orig/configure.in 2009-11-05 18:23:04.000000000 +0100
-+++ keepalived-1.1.20/configure.in 2010-05-31 11:42:05.000000000 +0200
-@@ -51,103 +51,18 @@
- AC_CHECK_LIB(popt, poptGetContext,,AC_MSG_ERROR([Popt libraries is required]))
-
- dnl ----[ Kernel version check ]----
--CPPFLAGS="$CPPFLAGS -I$kernelinc"
--AC_MSG_CHECKING([for kernel version])
--AC_TRY_RUN([
-- #include <stdlib.h>
-- #include <stdio.h>
-- #include <linux/version.h>
-- #if !defined(UTS_RELEASE) && !defined(LINUX_VERSION_CODE)
-- #include <linux/utsrelease.h>
-- #endif
-- int main (void) {
-- FILE *fp = fopen ("linuxinfo", "w");
-- if (!fp) return 1;
-- #if defined(UTS_RELEASE)
-- fprintf (fp, "%s\n", UTS_RELEASE);
-- #elif defined(LINUX_VERSION_CODE)
-- fprintf (fp, "%d.%d.%d\n", LINUX_VERSION_CODE >> 16, (LINUX_VERSION_CODE >> 8) & 0xFF, LINUX_VERSION_CODE & 0xFF);
-- #else
-- fprintf (fp, "0.0.0\n"); /* Let's fail gently */
-- #endif
-- fclose (fp);
-- return 0;
-- }
-- ], [
-- LINUX_MAJOR=`cat linuxinfo | cut -d'.' -f1`
-- LINUX_MINOR=`cat linuxinfo | cut -d'.' -f2`
-- LINUX_PATCH=`cat linuxinfo | cut -d'.' -f3`
-- ], [
-- LINUX_MAJOR="0"
-- LINUX_MINOR="0"
-- LINUX_PATCH="0"
-- ], [
-- LINUX_MAJOR="0"
-- LINUX_MINOR="0"
-- LINUX_PATCH="0"
-- ])
-- rm -f linuxinfo
--
-- if test "$kernelversion" = "2.4"; then
-- KERN="_KRNL_2_4_"
-- AC_MSG_RESULT([2.4])
-- elif test "$kernelversion" = "2.6"; then
-- KERN="_KRNL_2_6_"
-- AC_MSG_RESULT([2.6])
-- else
-- AC_MSG_RESULT([$LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH])
-- if test "$LINUX_MINOR" = "6"; then
-- KERN="_KRNL_2_6_"
-- elif test "$LINUX_MINOR" = "4"; then
-- KERN="_KRNL_2_4_"
-- else
-- KERN="_KRNL_2_6_"
-- fi
-- if test "$LINUX_MAJOR" = "0" -a "$LINUX_MINOR" = "0" -a "$LINUX_PATCH" = "0"; then
-- AC_MSG_WARN([Cannot determine Linux Kernel version.])
-- fi
-- fi
--
-+KERN="_KRNL_2_6_"
- AC_SUBST(KERN)
-
- dnl ----[ Checks for LVS and VRRP support ]----
--IPVS_SUPPORT="_WITHOUT_LVS_"
--if test "$enable_lvs" != "no"; then
-- AC_CHECK_HEADER([net/ip_vs.h],
-- [IPVS_SUPPORT="_WITH_LVS_"],
-- [
-- IPVS_SUPPORT="_WITHOUT_LVS_"
-- AC_MSG_WARN([keepalived will be built without LVS support.])
-- ])
--fi
-+IPVS_SUPPORT="_WITH_LVS_"
-
- if test "$IPVS_SUPPORT" = "_WITHOUT_LVS_" -a "$enable_vrrp" = "no"; then
- AC_MSG_ERROR([keepalived MUST be compiled at least with LVS or VRRP framework])
- fi
-
- dnl ----[ IPVS syncd support probe ]---
--IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
--if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then
-- AC_MSG_CHECKING([for IPVS syncd support])
-- if test "$KERN" = "_KRNL_2_6_"; then
-- IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
-- elif test "_KRNL_2_4_"; then
-- IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
-- else
-- IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
-- fi
--
-- if test "${IPVS_SUPPORT}" = "_WITHOUT_LVS_" -o "$enable_lvs_syncd" = "no"; then
-- IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
-- fi
--
-- if test "$IPVS_SYNCD" = "_HAVE_IPVS_SYNCD_"; then
-- AC_MSG_RESULT([yes])
-- else
-- AC_MSG_RESULT([no])
-- fi
--fi
--
-+IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
- AC_SUBST(IPVS_SYNCD)
-
- dnl ----[ Checks for kernel netlink support ]----
diff --git a/sys-cluster/keepalived/files/keepalived-1.2.2-bind-afunspec.patch b/sys-cluster/keepalived/files/keepalived-1.2.2-bind-afunspec.patch
deleted file mode 100644
index 1f365d26e51..00000000000
--- a/sys-cluster/keepalived/files/keepalived-1.2.2-bind-afunspec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c
-index 5725500..5b33417 100644
---- a/keepalived/core/layer4.c
-+++ b/keepalived/core/layer4.c
-@@ -43,7 +43,7 @@ tcp_bind_connect(int fd, struct sockaddr_storage *addr, struct sockaddr_storage
- fcntl(fd, F_SETFL, val | O_NONBLOCK);
-
- /* Bind socket */
-- if (bind_addr) {
-+ if (bind_addr && ((struct sockaddr *) bind_addr)->sa_family != AF_UNSPEC) {
- addrlen = sizeof(*bind_addr);
- if (bind(fd, (struct sockaddr *) bind_addr, addrlen) != 0)
- return connect_error;
\ No newline at end of file
diff --git a/sys-cluster/keepalived/files/keepalived-1.2.2-fix-ipv4-addr-compare.patch b/sys-cluster/keepalived/files/keepalived-1.2.2-fix-ipv4-addr-compare.patch
deleted file mode 100644
index 692f042218f..00000000000
--- a/sys-cluster/keepalived/files/keepalived-1.2.2-fix-ipv4-addr-compare.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bc49a46989c98eb6ee72a379b18b77e87ed624fa Mon Sep 17 00:00:00 2001
-From: Vincent Bernat <bernat@luffy.cx>
-Date: Wed, 07 Dec 2011 09:17:55 +0000
-Subject: Fix IPv4 address comparison routine.
-
-Two different IPv4 addresses were returned to be equal while this was
-not the case. Thanks to Ronie Gilberto Henrich for spotting this bug.
----
-diff --git a/keepalived/include/check_data.h b/keepalived/include/check_data.h
-index 50a4757..e3ff458 100644
---- a/keepalived/include/check_data.h
-+++ b/keepalived/include/check_data.h
-@@ -163,7 +163,7 @@ static inline int sockstorage_equal(const struct sockaddr_storage *s1,
- struct sockaddr_in *a1 = (struct sockaddr_in *) s1;
- struct sockaddr_in *a2 = (struct sockaddr_in *) s2;
-
-- if ((a1->sin_addr.s_addr == a1->sin_addr.s_addr) &&
-+ if ((a1->sin_addr.s_addr == a2->sin_addr.s_addr) &&
- (a1->sin_port == a2->sin_port))
- return 1;
- }
---
-cgit v0.8.3.4
diff --git a/sys-cluster/keepalived/files/keepalived-1.2.2-libipvs-fix-backup-daemon.patch b/sys-cluster/keepalived/files/keepalived-1.2.2-libipvs-fix-backup-daemon.patch
deleted file mode 100644
index 9898122e4d2..00000000000
--- a/sys-cluster/keepalived/files/keepalived-1.2.2-libipvs-fix-backup-daemon.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8c34d5a0d4c763db9b8f1e54be0c6c3ded6c54e0 Mon Sep 17 00:00:00 2001
-From: Alexander Holler <alexander.holler@1und1.de>
-Date: Mon, 9 Jan 2012 13:16:55 +0100
-Subject: [PATCH] libipvs: Fix reporting of the state of the backup-daemon.
-
-ipvsadm -l --daemon didn't report a running ipvs-backup-daemon
-(if no master-daemon was run).
-
-It seems there was some misunderstanding of
-how the daemons got reported (without using netlink). The state of
-the backup-daemon is always reported (by the kernel) in the second
-element of type ip_vs_daemon_user which is returned by the kernel
-through IP_VS_SO_GET_DAEMON or IPVS_CMD_GET_DAEMON.
----
- keepalived/libipvs-2.6/libipvs.c | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/keepalived/libipvs-2.6/libipvs.c b/keepalived/libipvs-2.6/libipvs.c
-index ea5e851..6bee837 100644
---- a/keepalived/libipvs-2.6/libipvs.c
-+++ b/keepalived/libipvs-2.6/libipvs.c
-@@ -1003,12 +1003,9 @@ static int ipvs_daemon_parse_cb(struct nl_msg *msg, void *arg)
- struct nlattr *attrs[IPVS_CMD_ATTR_MAX + 1];
- struct nlattr *daemon_attrs[IPVS_DAEMON_ATTR_MAX + 1];
- ipvs_daemon_t *u = (ipvs_daemon_t *)arg;
-+ __u32 state;
- int i = 0;
-
-- /* We may get two daemons. If we've already got one, this is the second */
-- if (u[0].state)
-- i = 1;
--
- if (genlmsg_parse(nlh, 0, attrs, IPVS_CMD_ATTR_MAX, ipvs_cmd_policy) != 0)
- return -1;
-
-@@ -1021,7 +1018,11 @@ static int ipvs_daemon_parse_cb(struct nl_msg *msg, void *arg)
- daemon_attrs[IPVS_DAEMON_ATTR_SYNC_ID]))
- return -1;
-
-- u[i].state = nla_get_u32(daemon_attrs[IPVS_DAEMON_ATTR_STATE]);
-+ state = nla_get_u32(daemon_attrs[IPVS_DAEMON_ATTR_STATE]);
-+ /* The second element is used for the state of the backup daemon. */
-+ if (state == IP_VS_STATE_BACKUP)
-+ i = 1;
-+ u[i].state = state;
- strncpy(u[i].mcast_ifn,
- nla_get_string(daemon_attrs[IPVS_DAEMON_ATTR_MCAST_IFN]),
- IP_VS_IFNAME_MAXLEN);
---
-1.7.6.5
-
diff --git a/sys-cluster/keepalived/files/keepalived-1.2.2-libipvs-fix-ipv6.patch b/sys-cluster/keepalived/files/keepalived-1.2.2-libipvs-fix-ipv6.patch
deleted file mode 100644
index f9435b02624..00000000000
--- a/sys-cluster/keepalived/files/keepalived-1.2.2-libipvs-fix-ipv6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cf8ff745812b7fe00d509fb50592348b6f60b433 Mon Sep 17 00:00:00 2001
-From: Alexander Holler <alexander.holler@1und1.de>
-Date: Mon, 9 Jan 2012 12:58:12 +0100
-Subject: [PATCH] libipvs: Fix initialization of netlink (needed for IPv6)
- when the module ip_vs wasn't loaded.
-
-The following happened when keepalived was started before the module for IPVS was loaded:
-
-ipvs_init() failed => netlink got disabled.
-modprobe_ipvs()
-ipvs_init() => netlink was not tested again => no netlink => no IPv6
-
-Fixed through testing netlink always in ipvs_init().
----
- keepalived/libipvs-2.6/libipvs.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/keepalived/libipvs-2.6/libipvs.c b/keepalived/libipvs-2.6/libipvs.c
-index 2c75118..ea5e851 100644
---- a/keepalived/libipvs-2.6/libipvs.c
-+++ b/keepalived/libipvs-2.6/libipvs.c
-@@ -114,6 +114,8 @@ int ipvs_init(void)
- ipvs_func = ipvs_init;
-
- #ifdef LIBIPVS_USE_NL
-+ try_nl = 1;
-+
- if (ipvs_nl_send_message(NULL, NULL, NULL) == 0) {
- return ipvs_getinfo();
- }
---
-1.7.6.5
-
diff --git a/sys-cluster/keepalived/keepalived-1.2.15.ebuild b/sys-cluster/keepalived/keepalived-1.2.15.ebuild
deleted file mode 100644
index ec108341d80..00000000000
--- a/sys-cluster/keepalived/keepalived-1.2.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools base
-
-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="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
- sys-apps/iproute2
- dev-libs/libnl
- dev-libs/openssl
- snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
- doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- STRIP=/bin/true \
- econf \
- --with-kernel-dir=/usr \
- --enable-vrrp \
- $(use_enable debug) \
- $(use_enable snmp)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/keepalived.init keepalived
- newconfd "${FILESDIR}"/keepalived.confd keepalived
-
- use snmp && dodoc doc/KEEPALIVED-MIB
-
- docinto genhash
- dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die
- # This was badly named by upstream, it's more HOWTO than anything else.
- newdoc INSTALL INSTALL+HOWTO
-
- # Security risk to bundle SSL certs
- rm -f "${ED}"/etc/keepalived/samples/*.pem
- # Clean up sysvinit files
- rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
diff --git a/sys-cluster/keepalived/keepalived-1.2.19.ebuild b/sys-cluster/keepalived/keepalived-1.2.19.ebuild
deleted file mode 100644
index 4e41c48678d..00000000000
--- a/sys-cluster/keepalived/keepalived-1.2.19.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
- sys-apps/iproute2
- dev-libs/libnl:=
- dev-libs/openssl:=
- snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
- doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- STRIP=/bin/true \
- econf \
- --with-kernel-dir=/usr \
- --enable-vrrp \
- $(use_enable debug) \
- $(use_enable snmp)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/keepalived.init keepalived
- newconfd "${FILESDIR}"/keepalived.confd keepalived
-
- use snmp && dodoc doc/KEEPALIVED-MIB
-
- docinto genhash
- dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
- # This was badly named by upstream, it's more HOWTO than anything else.
- newdoc INSTALL INSTALL+HOWTO
-
- # Security risk to bundle SSL certs
- rm -f "${ED}"/etc/keepalived/samples/*.pem
- # Clean up sysvinit files
- rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
diff --git a/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild
deleted file mode 100644
index 724c71fa355..00000000000
--- a/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools base
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-DEBIAN_PATCH=3
-DEBIAN_A="${P/-/_}-${DEBIAN_PATCH}.diff.gz"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${DEBIAN_A}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="debug ipv6"
-
-RDEPEND="dev-libs/popt
- sys-apps/iproute2
- dev-libs/libnl:1.1
- dev-libs/openssl"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch
- "${FILESDIR}"/${PN}-1.2.2-bind-afunspec.patch
- "${FILESDIR}"/${PN}-1.2.2-fix-ipv4-addr-compare.patch
- "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO doc/keepalived.conf.SYNOPSIS )
-
-src_prepare() {
- base_src_prepare
- EPATCH_OPTS="-p1" epatch "${DISTDIR}"/"${DEBIAN_A}"
- epatch "${S}"/debian/patches/*patch
- use ipv6 && epatch "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-ipv6.patch
- eautoreconf
-}
-
-src_configure() {
- STRIP=/bin/true \
- econf \
- --enable-vrrp \
- $(use_enable debug)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/init-keepalived keepalived
- newconfd "${FILESDIR}"/conf-keepalived keepalived
-
- docinto genhash
- dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die
- # This was badly named by upstream, it's more HOWTO than anything else.
- newdoc INSTALL INSTALL+HOWTO
-
- # Security risk to bundle SSL certs
- rm -f "${ED}"/etc/keepalived/samples/*.pem
- # Clean up sysvinit files
- rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
diff --git a/sys-cluster/keepalived/keepalived-1.2.22.ebuild b/sys-cluster/keepalived/keepalived-1.2.22.ebuild
deleted file mode 100644
index 1b9ac977126..00000000000
--- a/sys-cluster/keepalived/keepalived-1.2.22.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 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="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
- sys-apps/iproute2
- dev-libs/libnl:=
- dev-libs/openssl:=
- snmp? ( net-analyzer/net-snmp )
- net-libs/libnfnetlink"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
- doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
- eautoreconf
- default
-}
-
-src_configure() {
- STRIP=/bin/true \
- econf \
- --with-kernel-dir=/usr \
- --enable-vrrp \
- $(use_enable debug) \
- $(use_enable snmp)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/keepalived.init keepalived
- newconfd "${FILESDIR}"/keepalived.confd keepalived
-
- use snmp && dodoc doc/KEEPALIVED-MIB
-
- docinto genhash
- dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
- # This was badly named by upstream, it's more HOWTO than anything else.
- newdoc INSTALL INSTALL+HOWTO
-
- # Security risk to bundle SSL certs
- rm -f "${ED}"/etc/keepalived/samples/*.pem
- # Clean up sysvinit files
- rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
diff --git a/sys-cluster/keepalived/keepalived-1.2.23.ebuild b/sys-cluster/keepalived/keepalived-1.2.23.ebuild
deleted file mode 100644
index 1b9ac977126..00000000000
--- a/sys-cluster/keepalived/keepalived-1.2.23.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 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="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
- sys-apps/iproute2
- dev-libs/libnl:=
- dev-libs/openssl:=
- snmp? ( net-analyzer/net-snmp )
- net-libs/libnfnetlink"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
- doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
- eautoreconf
- default
-}
-
-src_configure() {
- STRIP=/bin/true \
- econf \
- --with-kernel-dir=/usr \
- --enable-vrrp \
- $(use_enable debug) \
- $(use_enable snmp)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/keepalived.init keepalived
- newconfd "${FILESDIR}"/keepalived.confd keepalived
-
- use snmp && dodoc doc/KEEPALIVED-MIB
-
- docinto genhash
- dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
- # This was badly named by upstream, it's more HOWTO than anything else.
- newdoc INSTALL INSTALL+HOWTO
-
- # Security risk to bundle SSL certs
- rm -f "${ED}"/etc/keepalived/samples/*.pem
- # Clean up sysvinit files
- rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-20 9:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-28 10:33 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2021-05-20 9:51 Alexys Jacob
2018-11-15 13:49 Mikle Kolyada
2018-04-19 8:12 Amy Liffey
2018-01-18 10:15 Alexys Jacob
2017-04-21 14:45 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox