Fixed build issue, bug #256497, thank Joost Ruis and emerald for the fix.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 59 insertions, 10 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 00442d546b35..d80738e36921 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.28 2009/03/03 15:11:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.29 2009/03/08 13:47:44 pva Exp $
+
+  08 Mar 2009; Peter Volkov <pva@gentoo.org>
+  +files/conntrack-tools-0.9.11-INT_MAX.patch,
+  conntrack-tools-0.9.11.ebuild:
+  Fixed build issue, bug #256497, thank Joost Ruis and emerald for the fix.
 
   03 Mar 2009; Raúl Porcel <armin76@gentoo.org>
   conntrack-tools-0.9.9.ebuild:
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 26c627092b24..fac124f0f775 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,3 +1,4 @@
+AUX conntrack-tools-0.9.11-INT_MAX.patch 1224 RMD160 58744f0c562b95b16b4acf30a8ef3e359ed235dc SHA1 9b520a61f6e61ce61dba9cbc7c9647376b50b977 SHA256 9a41c1b0daa43ec81258b95a93af2893abc0efaa3beebda3762686eb4635e243
 AUX conntrackd.confd 52 RMD160 47916dc2eb970b2eec7c5c1bc9d2e733c8308b30 SHA1 2c816f7e8a5eae3dab9a08d97587803206054916 SHA256 81890c5d01142dad0f16ffd3d29019058063d77bb0233a7ed412f84519078421
 AUX conntrackd.confd-r1 498 RMD160 bf3f8cb47793be3021beaa470c1af86777c321ee SHA1 72a737edb54f073aab93eaf4fce87fd944f47981 SHA256 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7
 AUX conntrackd.initd 728 RMD160 02179d3615234779aa370759926c0d3eb9764a68 SHA1 495d0c1416f015c1caa464e6d9900a271062ee63 SHA256 314a10e560dc7af439df7710668c8a3b13e719c0b7fb8c90c7a5090f1289a415
@@ -5,8 +6,8 @@ AUX conntrackd.initd-r1 2897 RMD160 546341a39f97edcd834c1d94c54c6aecbbafba63 SHA
 DIST conntrack-tools-0.9.11.tar.bz2 413826 RMD160 b4b4dd7a5e4d96e695ef05779bb97a79f8202f68 SHA1 8dca25a339101bf324c62f7383806f09c732df99 SHA256 97bbf06e61cbbb548b33bc171db70377a23f85c219edfe967fc126c2e224b19b
 DIST conntrack-tools-0.9.6.tar.bz2 364694 RMD160 9cc9b0354dceffc1496b93b1946c3fe956aded6b SHA1 7580e5a233be54480547bef9ae76f25282ee03ee SHA256 be75ecf9b6ca9f3562552332e623e2bbfb8a2210e81df0f49ad320353c4b7bf7
 DIST conntrack-tools-0.9.9.tar.bz2 403480 RMD160 60b3384624d8142660ba1d9a3c33c7dec9b9f0f7 SHA1 1964dc43d7ceda67d3d6034be083355c02e20cc3 SHA256 54825235b697f224ea57eb86b24742252711d3fbf771076aa360123a906246dc
-EBUILD conntrack-tools-0.9.11.ebuild 1477 RMD160 baa79a7dd3c03254e960b58b5d3ff654c27f309b SHA1 e192e680cd7ea6feb5c0a74e6bdc6a3f5957d27d SHA256 8154ccdb49594391778a6e40cd2442da27c06dbf461d6780d7eb02b73aa5b446
+EBUILD conntrack-tools-0.9.11.ebuild 1534 RMD160 be70a410b82993d013199750d85757dc3a074a1b SHA1 baecd7527aa5a7b98969bc2de4b561a9966141ec SHA256 641fb3cef8153317fca067c745b7be7ca2c2e6914dac850123a7e33b93a9167f
 EBUILD conntrack-tools-0.9.6-r1.ebuild 1609 RMD160 939a4f89b3063588189f591893d42a08709cc5ad SHA1 16f6516e48ec9d2635d77b887d913fc322690f0b SHA256 eb4f4c891418448e94a6219eb70155b2e20eff0f571e8a910ec7d026d3b0c5a0
 EBUILD conntrack-tools-0.9.9.ebuild 1471 RMD160 836ee2697a121e6e12116989a08f3a4687bf53ab SHA1 21d76da6b647eea66b5c4aa0124f17ff70ea9e22 SHA256 6e2d37f9100eab7293b88503714ab627db9ad93a2eaf256ef6c7865ed84121a6
-MISC ChangeLog 4677 RMD160 476c400572b3d40b8cafdfcecf93ea03b27c74c0 SHA1 dd89079960945212a327739deed757355051b16c SHA256 966ebe72c9502c18b5baf563c1a8dcdde4998cbb7e6938e38a7565663be49864
+MISC ChangeLog 4875 RMD160 e85829f3364272631b6e320ba9b7814f4bbbad82 SHA1 a4fa852414d1d7a0a1674fce42dec0b2b87b88ee SHA256 5221d3b2e7c156629210febf79508e58fe1e002a04d1faf44e406815002058b8
 MISC metadata.xml 647 RMD160 a50c408eb92b00628a99f69dd3d7845da9d9b794 SHA1 e6a729b1528e3c2c0653bad8b50e2291ddb2dabf SHA256 b4a43fb3d145d95a50c2612d43e69894277644779e734bf2f0d4c2d6579121f0
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
index 2ebfecf2f50d..45bac509bd75 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 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.11.ebuild,v 1.1 2009/03/03 12:52:49 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild,v 1.2 2009/03/08 13:47:44 pva Exp $
 
+EAPI="2"
 inherit linux-info eutils
 
 DESCRIPTION="Connection tracking userspace tools"
@@ -39,17 +40,20 @@ pkg_setup() {
 	check_extra_config
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-INT_MAX.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd
-	newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd
+	newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd || die
+	newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd || die
 
 	insinto /etc/conntrackd
-	doins doc/stats/conntrackd.conf
-
-	dodoc AUTHORS ChangeLog
+	doins doc/stats/conntrackd.conf || die
 
+	dodoc AUTHORS ChangeLog || die
 	insinto /usr/share/doc/${PF}
-	pushd doc &>/dev/null && doins -r . && popd &>/dev/null
+	doins -r doc/* || die
 }
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.11-INT_MAX.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.11-INT_MAX.patch
new file mode 100644
index 000000000000..3cdb90219f2b
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.11-INT_MAX.patch
@@ -0,0 +1,39 @@
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Sat, 21 Feb 2009 18:13:06 +0000 (+0100)
+Subject: src: fix compilation issue in gentoo due to missing include limits.h
+X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commitdiff_plain;h=9bf002ff7935e7dff625683787fc3a06ac2ef2cb;hp=87c8c090e1b64eac27edb968845cb1e8ee65b06b
+
+src: fix compilation issue in gentoo due to missing include limits.h
+
+This patch adds include limits.h to mcast.c and sync-mode.c. Why Gentoo
+maintainers did not report me the problem? :(
+
+http://bugs.gentoo.org/show_bug.cgi?id=256497
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+
+diff --git a/src/mcast.c b/src/mcast.c
+index ba472f6..8f11762 100644
+--- a/src/mcast.c
++++ b/src/mcast.c
+@@ -28,6 +28,7 @@
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+ #include <errno.h>
++#include <limits.h>
+ #include <libnfnetlink/libnfnetlink.h>
+ 
+ struct mcast_sock *mcast_server_create(struct mcast_conf *conf)
+diff --git a/src/sync-mode.c b/src/sync-mode.c
+index d1a941b..26e1358 100644
+--- a/src/sync-mode.c
++++ b/src/sync-mode.c
+@@ -32,6 +32,7 @@
+ #include <time.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <net/if.h>
+ 
+ static void