Version bump. Development version.

(Portage version: 2.1.4.4)

3 files changed, 95 insertions, 1 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 0ef85ae8e0b0..26d7b49b62b5 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2008/03/19 00:22:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.6 2008/03/19 01:08:30 jer Exp $
+
+*conntrack-tools-0.9.6 (19 Mar 2008)
+
+  19 Mar 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/conntrack-tools-0.9.6-Werror.patch, +conntrack-tools-0.9.6.ebuild:
+  Version bump. Development version.
 
   19 Mar 2008; Jeroen Roovers <jer@gentoo.org> conntrack-tools-0.9.5.ebuild:
   Marked ~hppa too.
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild
new file mode 100644
index 000000000000..739124d9d2b6
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild
@@ -0,0 +1,58 @@
+# 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.6.ebuild,v 1.1 2008/03/19 01:08:30 jer Exp $
+
+inherit linux-info eutils
+
+DESCRIPTION="Connection tracking userspace tools"
+HOMEPAGE="http://people.netfilter.org/pablo/conntrack-tools/"
+SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-libs/libnfnetlink-0.0.32
+	>=net-libs/libnetfilter_conntrack-0.0.81"
+RDEPEND="${DEPEND}
+	!net-firewall/conntrack"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Remove -Werror as it actually causes the build to fail:
+	epatch "${FILESDIR}"/${P}-Werror.patch
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14 ; then
+		die "${PN} requires at least 2.6.14 kernel version"
+	fi
+
+	#netfilter core team has changed some option names with kernel 2.6.20
+	if kernel_is lt 2 6 20 ; then
+		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+	else
+		CONFIG_CHECK="NF_CT_NETLINK"
+	fi
+
+	check_extra_config
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}/conntrackd.initd" conntrackd
+	newconfd "${FILESDIR}/conntrackd.confd" conntrackd
+
+	insinto /etc/conntrackd
+	doins examples/stats/conntrackd.conf
+
+	dodoc AUTHORS ChangeLog
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.6-Werror.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.6-Werror.patch
new file mode 100644
index 000000000000..470654d6f138
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.6-Werror.patch
@@ -0,0 +1,30 @@
+--- Makefile.in.	2008-03-08 12:36:10.000000000 +0100
++++ Makefile.in	2008-03-19 01:41:32.260193358 +0100
+@@ -198,7 +198,6 @@
+ top_srcdir = @top_srcdir@
+ INCLUDES = $(all_includes) -I$(top_srcdir)/include
+ AM_CFLAGS = -std=gnu99 -W -Wall \
+-	-Werror \
+ 	-Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \
+ 	-Wno-unused-parameter
+ 
+--- src/Makefile.in.	2008-03-08 12:36:09.000000000 +0100
++++ src/Makefile.in	2008-03-19 01:46:23.409069787 +0100
+@@ -219,7 +219,6 @@
+ top_srcdir = @top_srcdir@
+ INCLUDES = $(all_includes) -I$(top_srcdir)/include
+ AM_CFLAGS = -std=gnu99 -W -Wall \
+-	-Werror \
+ 	-Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \
+ 	-Wno-unused-parameter
+ 
+--- extensions/Makefile.in.	2008-03-08 12:36:09.000000000 +0100
++++ extensions/Makefile.in	2008-03-19 01:48:36.407632658 +0100
+@@ -195,7 +195,6 @@
+ top_srcdir = @top_srcdir@
+ INCLUDES = $(all_includes) -I$(top_srcdir)/include
+ AM_CFLAGS = -std=gnu99 -W -Wall \
+-	-Werror \
+ 	-Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \
+ 	-Wno-unused-parameter
+