diff options
3 files changed, 56 insertions, 8 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/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 |