gentoo resync : 19.01.2018

3 files changed, 42 insertions, 6 deletions

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 892a2bc8cc49..808858cdd0cf 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,3 +1,4 @@
+AUX keepalived-1.4.0-fix-no-sorry-segfault.patch 1223 BLAKE2B 409ca766c9300301724134b316cf2f0d9fae0c9c95ab9eda518c0b2c14ae5cd13d3c123bcf0fd353186bccd99f499d0c61c34f0a9e92e42ce1da2ceb96c2981a SHA512 7f7a69ec8f77a8614c6d060b87b36c7cae173721df33febbb740b19a6dc56568b95f8ff41c5018755bd18dd40d6e70b9ade067e22ed91c3219851e262fb0fe82
 AUX keepalived.confd 171 BLAKE2B ad9baf96333182a2acdb10a4be7220de1dc0827c4932af07ae8aae17d72233c3cb9bac637acc4c918503da664c8612a8815f4e2eec0aa18d10715fb2e8e3a71f SHA512 468d176d22f1ce308871829f24624b33e6ba3b234a413395599a67a865f3cf815cc24a10c244dffd1421a0acf5352fe51027a2d3b282cd3822dfeadc8a1d4df0
 AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7815c4db0062691dc2ea905c704d7d123588355a8cfbde124e2a5732d621eb5c664169a83ec81f6ed SHA512 240201b81bcca7b213bd3ec45fc286f0305d72a6952a3baf485d717df413df3a2da0f4b018eaa050b0b12cda78767f5c4ae60ec75e5802cfe57cb29951e86ba0
 DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
@@ -5,5 +6,5 @@ DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3
 DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
 EBUILD keepalived-1.3.5.ebuild 1534 BLAKE2B e2097ffe452503cfa4e3644b686dc29a8855a2a85fb5a9fa98fe889ecb50dab6c2640e00cd32e29cbd18cb9e734bbdb504243f42b518c25b27850ae200a07345 SHA512 cf2d0ebc28fe7ba59b5ac2f7c701971ade5518d972124a97a4777e30204188f78e192ca1c8c396c4b430050c763aeed59c8fb9686a6ba074ae4b9119a9701309
-EBUILD keepalived-1.4.0.ebuild 1597 BLAKE2B 603fcdc04cc9906fd72a6075fbf1646569aa85cc6194a04db9b16cdbadd976bdfdb466e231cd0252a6ca45b20b807eace3c532fd0d6044c06247a67088e8876d SHA512 a88d95101d4a108b791d64050097fa6db3885e7f7f59b6c97d0068fd6823781b504e8291cbc114e5c1ea9c90641c6b011f37ff74751019b164dd15ab2c13a54a
+EBUILD keepalived-1.4.0-r1.ebuild 1656 BLAKE2B a50e03ce06a857e7fadd2b94be9ddf00d3a0e7fa0dcaa246be10545ca2bfbee430befae961415a12096ba26f4769851492215c4af8351f134ecacb56459e9087 SHA512 cf1237fced58729c7a1c325437f6de65ddb2bc69d78425dd8e765aca373273b5fae39c9e73b1503d4db354e65e41e181e4048fd653bc638a0a47742747583475
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
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 000000000000..cbababb39802
--- /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
index 66d4382c86b0..1be5d090b408 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
 }