Version bump. Development version.

Package-Manager: portage-2.1.4.4

4 files changed, 99 insertions, 2 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/Manifest b/net-firewall/conntrack-tools/Manifest
index 9749a883c76a..237693233e29 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,6 +1,9 @@
+AUX conntrack-tools-0.9.6-Werror.patch 1584 RMD160 7a624c47ab2bb41c49bf378bab408baa44a46e28 SHA1 a7575fdfddda3b514db7fc683fcfca761f29cba2 SHA256 3d565e444d5ab87a659ae18232d05d80435f5621e72783fdbde30cff355b2860
 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.5.tar.bz2 342826 RMD160 8bb9c80fcc9dea5d5d6b85310a78595aab81f597 SHA1 c632dd553f34502efa2e55d65a281f63a7160037 SHA256 e0ec7e6ea838e694b7b2fcdf9fa39f7de4404786ea91e76a5a4e5fd4f000a0cd
+DIST conntrack-tools-0.9.6.tar.bz2 364694 RMD160 9cc9b0354dceffc1496b93b1946c3fe956aded6b SHA1 7580e5a233be54480547bef9ae76f25282ee03ee SHA256 be75ecf9b6ca9f3562552332e623e2bbfb8a2210e81df0f49ad320353c4b7bf7
 EBUILD conntrack-tools-0.9.5.ebuild 1304 RMD160 571d3bc59592112599eb6f8d0090ac8848e141d6 SHA1 e0143b837c89e179c61d55c559ad53125582c8f5 SHA256 deda35362f8723ab6fa78890777559383e4c6a7862736530cf1c01bcba20a6a0
-MISC ChangeLog 912 RMD160 a73a08dbd09b3338b60b20b3c7f7c39d9037c006 SHA1 3175d2f93160b8630141833938ab4d5f56522a52 SHA256 4c4efdc78a37451f136dd2fb83f61330cd29078c344cc11e034db2096833d240
+EBUILD conntrack-tools-0.9.6.ebuild 1453 RMD160 947a5992e74f3be7276a139897a14be181045fbd SHA1 ea31bc6a2e6625f718229a480e95c082164503b1 SHA256 ae035c691981c522f9f3b7252d199df398b6dc9f59c252afedefd981a8118ef9
+MISC ChangeLog 1111 RMD160 260d9e5169017813dc75085aa029607cdd602f47 SHA1 9ed8848e8571e9a6573b0e0fe3ba3a754167eecb SHA256 525cb94b1c5e508515e2ae9252140be665187845e0a6fd140db32f1c1f06c8e7
 MISC metadata.xml 453 RMD160 c711e2b9c00f47256f72e44eb70a14ee38ebc6a8 SHA1 68cd8e4d747510d6a01865c0fa17d5df604aaf83 SHA256 6a1b60775d924781e96bc2ffd94ffb47c5c041e2b9aba10b1a3e8239cb855f91
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
+