Revision bump, fixes stack smashing due to a silly typo, bug 371903.

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 53 insertions, 11 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 9d9ae6d4923c..da03a0f13188 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ipvsadm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.54 2011/10/07 20:33:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.55 2011/10/08 00:17:14 idl0r Exp $
+
+*ipvsadm-1.26-r2 (08 Oct 2011)
+
+  08 Oct 2011; Christian Ruppert <idl0r@gentoo.org> -ipvsadm-1.26-r1.ebuild,
+  +ipvsadm-1.26-r2.ebuild, +files/ipvsadm-1.26-stack_smashing.patch:
+  Revision bump, fixes stack smashing due to a silly typo, bug 371903.
 
 *ipvsadm-1.24 (07 Oct 2011)
 
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index e0c647f054bc..dbea80c1c41a 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ipvsadm-1.26-buildsystem.patch 2989 RMD160 669c160e624995c8ac85787ec3b3435422a01b7f SHA1 58f72bcf13ed839e6b748c27a2176ac81ce29026 SHA256 88391e5122dbb7d8c92385647b2e8856bf7ad7231cfb2e73eda4e422addce198
+AUX ipvsadm-1.26-stack_smashing.patch 912 RMD160 b30256a31e77bc96a0ce37a9bc8d7a2a5f52ff0c SHA1 ca858b08f9acfa47aaa4920ee1c9274e7523a1e1 SHA256 78cf4f4d79fb2a39afdb532e46793c4e700fa08ecacd9fa2577d53b5ced389bd
 AUX ipvsadm-init 764 RMD160 447562aeb699ab12d97d088e97678c2ac98d7e5c SHA1 ce953d9013b3a5b0e35cc5901376d9bf54fd51f4 SHA256 296c44030f502882c361ff9ceff14fe1377150e9aae8dc6a9ddaa4bd94275868
 DIST ipvsadm-1.21-11.tar.gz 34030 RMD160 2476f127bfd76313a7e32d0f6d2d4225164ef872 SHA1 368630ac25a772221deb101ee86b87a5341a5bab SHA256 7b85020f84d4648166bce480d747d82ac5c9113f9a222e3de7eb92b7af0598fa
 DIST ipvsadm-1.24.tar.gz 32007 RMD160 6647adb3914e69bd2a6924b5a0f675b670cd57ed SHA1 6bb6ce422745d0fe6409d91df7820fd5e7d2eeeb SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a
 DIST ipvsadm-1.26.tar.gz 41700 RMD160 7be7dcd00bdd640bbe9ab498180bb632d9c0d02d SHA1 fd23f6d81d4ac2a353db1fed694eaa5f2ff3ac6b SHA256 6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d
 EBUILD ipvsadm-1.21-r1.ebuild 1296 RMD160 6ddbc4b56efa78ee974b90cc5dc8add52ea41e51 SHA1 107c72988256a0bac31be8d7ac9e45e1d19190f6 SHA256 c6ebaf3186b461fd6e1a3d4c982d0505d64af7eb533ec03e579fafd55e145865
 EBUILD ipvsadm-1.24.ebuild 1390 RMD160 e3cd293f63b919ac691937a73e4bdb3044f71f6e SHA1 57dbd26d94bdd2fb623873dfc87e04ee9d545a83 SHA256 4af7355f2aa495346c3941bbbd3240bf10085a8188b7ff47c2d728f0c3365d12
-EBUILD ipvsadm-1.26-r1.ebuild 1524 RMD160 b9baec08e1b9b2ec3d879233ca031661dbe2f524 SHA1 61262b7fdb1819c5b4d8fe25ea4390f6ba7d5ded SHA256 c6d69a0f0a0ea934ca254b71579f7ba07f7662a6bf2a1dc52ee1240be31a6610
-MISC ChangeLog 7475 RMD160 84a5345a6a2aa2483df6fa202a0e87e67a3624e7 SHA1 a597915932aca3e3b4770a6cefb2f023675ed006 SHA256 d0b4e78b9be1187cb35d5e6bb3702352476b3f3c481d46cb83ea7d3a2a0ab738
+EBUILD ipvsadm-1.26-r2.ebuild 1581 RMD160 a76f0026d218f32dd4ead34cab92b5fd666becc7 SHA1 6a5fc08b8cd5b91ce0f201a92c4b3884f0da6d03 SHA256 7667d285a27c6257583bf893b80665264200ed08995f622133a8cdc4e3f0137f
+MISC ChangeLog 7720 RMD160 836c1e9d3522a1d9388a23a81e3d505cd29661c7 SHA1 edfe88706549255a6c9d19a779a17e2aa6ee9f01 SHA256 dc71bdb094a406ff3b95392a79cf1df81004056029d8752fae9070c70da17683
 MISC metadata.xml 265 RMD160 d5a540823bf95c48407b6404d973473db9cab6d9 SHA1 b0e94d9558b9b83e49f5af440d81e26516f0c00c SHA256 e6d5d2ea1a07e2e00194e0a485c66904b09fefb05427e9373d184ab3161fcdda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk6PYgoACgkQIiMqcbOVdxRedAP/fvl0HraLux7tl2fBmW4Dt2xg
-a4/mF3N80OQBXkRZuod8W6ANO6kqUdq6K12710EmmW89/xuRW3DJ+dsx89vLLnDb
-L42q4U8pazNNAdf/3Bx/ay5PRYRviTFrHtjjldK2dw3l5LB+Y9W3s7DCNQxH9pcN
-wgxtWEOlBSplM2b8lqs=
-=tEJp
+iQEcBAEBCAAGBQJOj5aPAAoJEMOx0zmdw4Z1lfgH/2c0GAxr/c3bNSUMcg2S0V8v
+lvf8Y11HmC7HNI852Z/pY450Yv33I8J0VKHxTyzItNQD8/5yNBNCrE9TtvksYX4v
+bGX1i5HXqy7WO7cMKJJgyKQWjF9FRiN7NVCNOUcqsJDuWIswiEBhT2AD7rCQCbZd
+8l+z3SJGvCTxXO12diCOdIFkEdPaLReL1ZPxn1WJbQkHNltr/0gyYcRu7eViTv6U
+pUK0v984WJIpBYNA8+tddhVd+fjminrCGVwvNjlEO2FEHLX+grr0L0ZQTaNIkt2m
+mjJOVV26lYJOp7fwQ7pOyxWuQeCaMhUjje3eMqBuHO37WRfQju/EppAJCWBMAT0=
+=kJjI
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch
new file mode 100644
index 000000000000..d36b0bf8abe4
--- /dev/null
+++ b/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch
@@ -0,0 +1,32 @@
+From 81529af388c0f0f4e4b169b7bcb285ef5e798f41 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sat, 8 Oct 2011 02:05:37 +0200
+Subject: [PATCH] Fix stack smashing because of a typo
+
+IPVS_CMD_ATTR_MAX was the size of __IPVS_SVC_ATTR_MAX before, which has a
+different size and thus it caused trouble. The right enum to use is
+__IPVS_CMD_ATTR_MAX.
+
+Reported-by: Deniss Gaplevsky <slim@inbox.lv>
+X-Gentoo-Bug: 371903
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/371903
+---
+ libipvs/ip_vs.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h
+index 9726a17..5e1d544 100644
+--- a/libipvs/ip_vs.h
++++ b/libipvs/ip_vs.h
+@@ -413,7 +413,7 @@ enum {
+ 	__IPVS_CMD_ATTR_MAX,
+ };
+ 
+-#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
++#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
+ 
+ /*
+  * Attributes used to describe a service
+-- 
+1.7.3.4
+
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
index 8507ace5fd97..f51fbb1c4a66 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild,v 1.6 2011/09/10 09:02:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild,v 1.1 2011/10/08 00:17:14 idl0r Exp $
 
 EAPI=4
 
@@ -30,6 +30,7 @@ pkg_pretend() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	epatch "${FILESDIR}/${P}-stack_smashing.patch" # bug 371903
 	use static-libs && export STATIC=1
 }