summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-firewall/conntrack-tools/ChangeLog9
-rw-r--r--net-firewall/conntrack-tools/conntrack-tools-0.9.7-r2.ebuild (renamed from net-firewall/conntrack-tools/conntrack-tools-0.9.7-r1.ebuild)3
-rw-r--r--net-firewall/conntrack-tools/files/conntrack-tools-0.9.7-int_max.patch11
3 files changed, 21 insertions, 2 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/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