1 |
commit: 77944a786ca7827bffa806fd37b2e99f44d1b991 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Mar 28 08:32:34 2018 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 28 10:28:44 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77944a78 |
7 |
|
8 |
sys-cluster/keepalived: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-cluster/keepalived/Manifest | 2 +- |
13 |
.../keepalived-1.4.0-fix-no-sorry-segfault.patch | 28 --------- |
14 |
sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild | 73 ---------------------- |
15 |
3 files changed, 1 insertion(+), 102 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest |
18 |
index 2acaa74f29d..f766737cf7a 100644 |
19 |
--- a/sys-cluster/keepalived/Manifest |
20 |
+++ b/sys-cluster/keepalived/Manifest |
21 |
@@ -1,3 +1,3 @@ |
22 |
DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5 |
23 |
DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720 |
24 |
-DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3 |
25 |
+DIST keepalived-1.4.2.tar.gz 738096 BLAKE2B edfd2c20b4de80a2e15d9598558b0ccfb4d6a7a7eace278ab97358691ed38485017ecca2f2934405930818b54e60f644c575dc4a320a9900bf81b97916268c91 SHA512 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index cbababb3980..00000000000 |
30 |
--- a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch |
31 |
+++ /dev/null |
32 |
@@ -1,28 +0,0 @@ |
33 |
-From 49559856e19a1a9fad590cc640da7df57c6b9a66 Mon Sep 17 00:00:00 2001 |
34 |
-From: Quentin Armitage <quentin@××××××××××××.uk> |
35 |
-Date: Wed, 17 Jan 2018 12:08:07 +0000 |
36 |
-Subject: [PATCH] Fix segfault if no sorry server configured for a virtual |
37 |
- server |
38 |
- |
39 |
-Issue #751 identified a segfault in vs_end_handler(), and it |
40 |
-transpires that the forwarding method of the sorry server was being |
41 |
-checked without first testing that a sorry server had been configured. |
42 |
- |
43 |
-Signed-off-by: Quentin Armitage <quentin@××××××××××××.uk> |
44 |
---- |
45 |
- keepalived/check/check_parser.c | 2 +- |
46 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
47 |
- |
48 |
-diff --git a/keepalived/check/check_parser.c b/keepalived/check/check_parser.c |
49 |
-index b2518da7..170e47d4 100644 |
50 |
---- a/keepalived/check/check_parser.c |
51 |
-+++ b/keepalived/check/check_parser.c |
52 |
-@@ -120,7 +120,7 @@ vs_end_handler(void) |
53 |
- |
54 |
- /* If the real (sorry) server uses tunnel forwarding, the address family |
55 |
- * does not have to match the address family of the virtaul server */ |
56 |
-- if (vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) { |
57 |
-+ if (vs->s_svr && vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) { |
58 |
- if (vs->af == AF_UNSPEC) |
59 |
- vs->af = vs->s_svr->addr.ss_family; |
60 |
- else if (vs->af != vs->s_svr->addr.ss_family) { |
61 |
|
62 |
diff --git a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild |
63 |
deleted file mode 100644 |
64 |
index 1be5d090b40..00000000000 |
65 |
--- a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild |
66 |
+++ /dev/null |
67 |
@@ -1,73 +0,0 @@ |
68 |
-# Copyright 1999-2018 Gentoo Foundation |
69 |
-# Distributed under the terms of the GNU General Public License v2 |
70 |
- |
71 |
-EAPI=6 |
72 |
- |
73 |
-inherit autotools |
74 |
- |
75 |
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project" |
76 |
-HOMEPAGE="http://www.keepalived.org/" |
77 |
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz" |
78 |
- |
79 |
-LICENSE="GPL-2" |
80 |
-SLOT="0" |
81 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
82 |
-IUSE="dbus debug ipv6 -json snmp" |
83 |
- |
84 |
-RDEPEND="dev-libs/libnl:= |
85 |
- dev-libs/openssl:= |
86 |
- dev-libs/popt |
87 |
- net-libs/libnfnetlink |
88 |
- sys-apps/iproute2 |
89 |
- dbus? ( sys-apps/dbus ) |
90 |
- json? ( dev-libs/json-c:= ) |
91 |
- snmp? ( net-analyzer/net-snmp )" |
92 |
-DEPEND="${RDEPEND} |
93 |
- >=sys-kernel/linux-headers-4.4" |
94 |
- |
95 |
-DOCS=( |
96 |
- README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO |
97 |
- doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt |
98 |
-) |
99 |
- |
100 |
-PATCHES=( |
101 |
- "${FILESDIR}/${P}-fix-no-sorry-segfault.patch" |
102 |
-) |
103 |
- |
104 |
-src_prepare() { |
105 |
- default |
106 |
- |
107 |
- eautoreconf |
108 |
-} |
109 |
- |
110 |
-src_configure() { |
111 |
- STRIP=/bin/true \ |
112 |
- econf \ |
113 |
- --with-kernel-dir=/usr \ |
114 |
- --enable-sha1 \ |
115 |
- --enable-vrrp \ |
116 |
- $(use_enable dbus) \ |
117 |
- $(use_enable dbus dbus-create-instance) \ |
118 |
- $(use_enable debug) \ |
119 |
- $(use_enable json) \ |
120 |
- $(use_enable snmp) |
121 |
-} |
122 |
- |
123 |
-src_install() { |
124 |
- default |
125 |
- |
126 |
- newinitd "${FILESDIR}"/keepalived.init keepalived |
127 |
- newconfd "${FILESDIR}"/keepalived.confd keepalived |
128 |
- |
129 |
- use snmp && dodoc doc/KEEPALIVED-MIB.txt |
130 |
- |
131 |
- docinto genhash |
132 |
- dodoc genhash/README genhash/AUTHOR genhash/ChangeLog |
133 |
- # This was badly named by upstream, it's more HOWTO than anything else. |
134 |
- newdoc INSTALL INSTALL+HOWTO |
135 |
- |
136 |
- # Security risk to bundle SSL certs |
137 |
- rm -v "${ED}"/etc/keepalived/samples/*.pem || die |
138 |
- # Clean up sysvinit files |
139 |
- rm -rv "${ED}"/etc/sysconfig || die |
140 |
-} |