Add int_max patch for bug #226655

Package-Manager: portage-2.1.4.4

4 files changed, 24 insertions, 4 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 262149579385..8613e2f5e893 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.17 2008/06/14 16:41:10 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.18 2008/06/14 19:20:41 cedk Exp $
+
+*conntrack-tools-0.9.7-r2 (14 Jun 2008)
+
+  14 Jun 2008; Cédric Krier <cedk@gentoo.org>
+  +files/conntrack-tools-0.9.7-int_max.patch,
+  -conntrack-tools-0.9.7-r1.ebuild, +conntrack-tools-0.9.7-r2.ebuild:
+  Add int_max patch for bug #226655
 
   14 Jun 2008; Cédric Krier <cedk@gentoo.org>
   -conntrack-tools-0.9.5.ebuild, -conntrack-tools-0.9.7.ebuild:
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 8e7f0e24a9e9..686be7babc9f 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,9 +1,10 @@
+AUX conntrack-tools-0.9.7-int_max.patch 487 RMD160 50520ca93b666047bcccd9ae8ca469f523f8b064 SHA1 5847cf04206f27098f1fc30c777cfdd3f81de198 SHA256 ac13cc57dca7891c72a51af825bdc65f6f2d4bd90052357fe4495c4ae1c86f99
 AUX conntrack-tools-0.9.7-path_max.patch 380 RMD160 eb3b471a7aa9b5af6cb6c396ebd3ae7a5bcbf665 SHA1 7bc9dde2467205e96381bdbd3dd017fa5b499025 SHA256 876515e3f5b83d1f782f0921f8e24deba349cd447b5e314c7b98a8a240b378d0
 AUX conntrackd.confd 52 RMD160 47916dc2eb970b2eec7c5c1bc9d2e733c8308b30 SHA1 2c816f7e8a5eae3dab9a08d97587803206054916 SHA256 81890c5d01142dad0f16ffd3d29019058063d77bb0233a7ed412f84519078421
 AUX conntrackd.initd 728 RMD160 02179d3615234779aa370759926c0d3eb9764a68 SHA1 495d0c1416f015c1caa464e6d9900a271062ee63 SHA256 314a10e560dc7af439df7710668c8a3b13e719c0b7fb8c90c7a5090f1289a415
 DIST conntrack-tools-0.9.6.tar.bz2 364694 RMD160 9cc9b0354dceffc1496b93b1946c3fe956aded6b SHA1 7580e5a233be54480547bef9ae76f25282ee03ee SHA256 be75ecf9b6ca9f3562552332e623e2bbfb8a2210e81df0f49ad320353c4b7bf7
 DIST conntrack-tools-0.9.7.tar.bz2 370540 RMD160 1ec78505d91a0f9671cc66f1c47909e3c49f1954 SHA1 1c6aebe151f3ca4afdce4c340625cddb9d285a05 SHA256 d7a24b950b6108196d78f9cec56873bfc2cf2169f882d287130017063a8c5398
 EBUILD conntrack-tools-0.9.6-r1.ebuild 1590 RMD160 92038b6b0fd33801bd3194240df76ff5cc043037 SHA1 779c099c1d1cde7d13a131d8f146d9bc42a10c46 SHA256 52c8f52c92c6e1b470e26ef54b70f8994b3a60d69106cc21e9da782b3fd9e7ac
-EBUILD conntrack-tools-0.9.7-r1.ebuild 1538 RMD160 8fec60c25b81c72494a4249a174c8ccff4f1b237 SHA1 67d977a806c9cda60be0a1d0d3041e20f4c3b649 SHA256 94bb1e4755eb932d4763681794a87cfd9c32503b823bfe02d83198ba8108ce33
-MISC ChangeLog 2680 RMD160 226609f12a4ae7c9fecc43fe834708ae27b78975 SHA1 bd817eb76bd953ac7b19055d4aeb0fe0ada1f7d4 SHA256 7903aaf1c8914d9dc1a0523391048dded7fbb4fbaed077e02ceee82d39ad061e
+EBUILD conntrack-tools-0.9.7-r2.ebuild 1579 RMD160 e630d387d72caedf094f7cc3922ec342806dc641 SHA1 f4712e6d07342620d310eb7bae40260a23d98afc SHA256 4f59e56f4c0497914f6f12ce1a7f0b492f25078204dec7e8db6f5a4983748872
+MISC ChangeLog 2921 RMD160 50a43417075f45c528ef517fdbd2bc9bcf4a3704 SHA1 a3326694baded5a23272349264fb3c4c8e11b561 SHA256 7fee495465b16a20c6fec4f1fc4ed0542b33147a3ab17f51ce1855508d31b7c0
 MISC metadata.xml 453 RMD160 c711e2b9c00f47256f72e44eb70a14ee38ebc6a8 SHA1 68cd8e4d747510d6a01865c0fa17d5df604aaf83 SHA256 6a1b60775d924781e96bc2ffd94ffb47c5c041e2b9aba10b1a3e8239cb855f91
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild
index 05de373ee91c..8bc39bee3107 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r1.ebuild,v 1.1 2008/06/14 16:39:38 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild,v 1.1 2008/06/14 19:20:41 cedk Exp $
 
 inherit linux-info eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-path_max.patch"
+	epatch "${FILESDIR}/${P}-int_max.patch"
 	sed -i -e '/-Werror \\/d' {.,src,extensions}/Makefile.in
 }
 
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch
new file mode 100644
index 000000000000..683d17af9436
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch
@@ -0,0 +1,11 @@
+diff -ru conntrack-tools-0.9.7~/src/ignore_pool.c conntrack-tools-0.9.7/src/ignore_pool.c
+--- conntrack-tools-0.9.7~/src/ignore_pool.c	2008-06-14 18:23:09.000000000 +0200
++++ conntrack-tools-0.9.7/src/ignore_pool.c	2008-06-14 21:17:13.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <limits.h>
+ 
+ /* XXX: These should be configurable, better use a rb-tree */
+ #define IGNORE_POOL_SIZE 128