Revision bump: add compatibility with kernel 3.10. Drop old revision

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 89 insertions, 23 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index c83b231bac85..e8ed6f0ba899 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipt_netflow
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.8 2013/06/27 03:52:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.9 2013/08/21 10:15:47 pinkbyte Exp $
+
+*ipt_netflow-1.8-r3 (21 Aug 2013)
+
+  21 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> -ipt_netflow-1.8.ebuild,
+  +ipt_netflow-1.8-r3.ebuild, +files/ipt_netflow-1.8-procfs-fix.patch:
+  Revision bump: add compatibility with kernel 3.10. Drop old revision
 
 *ipt_netflow-1.8-r2 (27 Jun 2013)
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index f471f6d12b8b..bfac5e895994 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -3,20 +3,21 @@ Hash: SHA256
 
 AUX ipt_netflow-1.8-configure.patch 352 SHA256 8ed19392b0cbfe3b286ac44cdab1e71fe6d4cab0c68c5cc6e7ee870bad76b3de SHA512 7e00aee7837a0806a39c5367451a140cd7e7e789d30cce72b1a000db0c6b8d97f5d9ff90616dad3bdf2054227628dae4dce693c3eb56d80c670ff589244cdd6c WHIRLPOOL 7f12720b71889af947ce73bdae838a70f171e801955b30c62d30b86a5abf6ceed1bbe5e29145c6c455a95c1e08757816e5eedccec2a993da0dae1525d24a9517
 AUX ipt_netflow-1.8-pax-const.patch 1620 SHA256 9d891ef8239cb467cdb0d6cdb4fd5649080c56ec58bb2a8f081bd20f1ea89c0f SHA512 c2a4c5e0c6e31cb78535c6e0a11281f742f4a5c5a6fd20cae18906add03efc65c817803c93cbf1deb91095eb77a4d9172de4920cca040a11e95f6b3932a99d74 WHIRLPOOL a18b1b524a7ac0f0f31b4c4cd267cb40721e1818e58f16671a2d9eee8e769f9b1152d4f40019a4ffe55ae5f2971f17aba6a102058df7e9cff65e8e6aa665e94e
+AUX ipt_netflow-1.8-procfs-fix.patch 1355 SHA256 063b5daf33b380ed4582b8fe3bd09f0863cbd8946a22f92fb83c4166ed4790b7 SHA512 33b49ded9c8b69fcf3bc78e37823778ab421d7ebca1c847384ee0b20700dd48df49c9afa46686e3ea0f9841bb9c5d798ac50437dffa63ccc309377d42192216f WHIRLPOOL f6cc8a814f5c2d249d39ba79b91599d4252353d1c76f26d6ef542dc81b4757423552fdd617ee7b45493d3f33b38bdb85f66078c54d956641d7ca2cf230939935
 DIST ipt_netflow-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4
 EBUILD ipt_netflow-1.8-r1.ebuild 1692 SHA256 978dda0b3a3f761a50fc94fca8b295faa7566a37f578e29a5f5cc299bdc88b77 SHA512 cf52a948286cea2f20b492bf1bddcc8fa310f7a916ec6ec9a31c0260f0bb36d9994a6aa71cb8dbc6b0565d11dad6f8da6adff78aa5db928070aaca1ac2693c2f WHIRLPOOL fd268d583f7cbfdffafe75c474ffa025dcd261458be08db39dc675087f9751329bbe572f5c39aed4f99a39c6752dae36215b01441252a7b4a357c9426300a4dc
 EBUILD ipt_netflow-1.8-r2.ebuild 1802 SHA256 b2490f1467dc610cb2a22d31728797a923b293dd59d183e63318eff44effca07 SHA512 0e7bb4723f1cdb487cbdb9ffdc5a2353e34d42ce7f62918b2a01fdeeac732947880857cdda29c9185896f2697f4121e1e236ddddd1068722b962ebd762b548a2 WHIRLPOOL 5fe9490d5a1d5dd30a2201447cad56c2fd6aecbca0e5d1c087996d45cb236f3aa99079edce8450ee8f9601d7e68ffe9ba2cc36beebf1fadd205257a6abb39d18
-EBUILD ipt_netflow-1.8.ebuild 1557 SHA256 0c12c4368e22dd8de2d14ff8fe2185f7bccc48be327727e10b2129c70480f840 SHA512 632f68120cfb79ea9b7f26aa3722d4a60522d5dcccade2e4c70e9a2493fe19cefb00a50165d7902ca34f755046de202e8d1e9e0ba96cc0f94cef9ecf21838faa WHIRLPOOL d2ab585e7dc0bfd788449f81c27035616cee59931b6d3e6e4a1cca1cb0862c3157f38f5726bab06accb57eb53c93e997662efdefd7944a18d5536fd836ef7ef9
-MISC ChangeLog 1724 SHA256 314bfa96abb31d641c6d8ed6ac9b7de18dd8824017f0440f5a53e304f683035a SHA512 cf41a1460e6192d2edbc9e10ca03e0b1674dc6bfcb8342eb46f0efb871a799acc43d1dfda1cc55f623012434b58f3aa0ca1777ed4f2d9fe453f8003ea3314471 WHIRLPOOL 0d10d250ce64934c54ce2eccae5d3af5b3c6a21a631ea8ca179993a97b203e61718c39436c76e5cf9c0b359d8fa750ce1422d5304d38181e000030656eef9b29
+EBUILD ipt_netflow-1.8-r3.ebuild 1886 SHA256 3edf8eb9a288eae294d86175e879165e802a8d605b1e7d82c2507a8598757b80 SHA512 1ea4c254b5456c2d90eab69f9dc85613cb7feac6822bc3deb5c0b798a5a79292ac788ea39bd2f884a9f85ac6297695b7969d07b76223b3e37f5d572445af27e8 WHIRLPOOL c9d04801bd84090543b1e6721fb8707df8cbf258ba147690380cd8fc1c02c08f8fac181ac5c2dadd232d8d7b170e20d57ada42231fe24139008991fbed01fd01
+MISC ChangeLog 1977 SHA256 b05d1e27bc44c33e476761e64280491093ef182139141ed62ee4771d03d878f1 SHA512 e633b2eb93bd8d09576984e0e5d823defb17c98f11df8eb908e5f824e8a2ab630eeecad611174d5889ae8df618124820bbde4fba337246300acb5a057f922aea WHIRLPOOL 59a53ca050af852bc0e079c24e0a13eed3b64a85d0f52228e9781286638786d76ac7f8e4e22e82ff790278b95928c55cd242610d5c75425aa34fc37076798d20
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRy7cJAAoJECo/aRed9267yZEH/3A0qt1VGbaJIOEFRFgntowd
-NapI63wYmM4nI12xOpcHnsc9yu3QvJhShrF11hKrO+Fe968YS5e4tb/xlQWA5D7u
-NuArBHpPFcF9g85zZ+RmHerjfyJesEM5cnge2yQVhn4JByNRu3qTGzolQPsbXT3J
-cRv+XevSa6JTv/hI3jZPtIbxw6PMw0ACZER5F+np9kyBnsU4EyxcbBFd7s0/UwAR
-aB1RDlUsshNSPfGnZxNHX6LUUiLCwBhXr/DxLJ5C/nSRM5IgRjtjjiE9dAJue4xB
-3qW9ljsvSGgzrlEbtiMy8z5wXNk6qNrx6NJyrD2e4lqTP2uQis91aYLSu1dyFRE=
-=j81d
+iQEcBAEBCAAGBQJSFJL0AAoJECo/aRed9267L9IH/3PUfG9/F086xFU5W1G6dFo+
+V8veFhCDdWz+FAhIlXyQTZimFuPWGS0rajprEweb1uO/LYgcZnSN6RxU49HCxwSX
+xst/WsN4f2m9PTG4pH9jLbjpDAzs30Q9JZFlftODh/A91vvuWHX6b7NJR/LqgvGf
+kMxhdDgzZlyQH5rCr9GZiX/IIeD0AEe4tdu/nQYeizUfTo9y1aSFSksb8kjPkBBR
+9uk+VY9iZrv4TXAFR3dZu9kkJcpTg/zV8V9jvxB5fw4udcdrckPGoPHNjmXkCJQ7
+e2bvNJ8pESBAqBfbHskB8fpbp+a18DXpvhdDHL+2jUnidK1ovrmkEk7ls4MvFQM=
+=Mpvg
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
new file mode 100644
index 000000000000..3d1c44f8653c
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
@@ -0,0 +1,41 @@
+Patch from http://sourceforge.net/p/ipt-netflow/bugs-requests-patches/71/
+
+--- ipt_NETFLOW.c.orig	2013-08-21 13:20:25.606323000 +0400
++++ ipt_NETFLOW.c	2013-08-21 13:23:04.249323000 +0400
+@@ -854,9 +854,14 @@
+ ipt_netflow_find(const struct ipt_netflow_tuple *tuple, unsigned int hash)
+ {
+ 	struct ipt_netflow *nf;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
++#define BEFORE390(x,y) x,y
+ 	struct hlist_node *pos;
++#else /* since 3.9.0 */
++#define BEFORE390(x,y)
++#endif
+ 
+-	hlist_for_each_entry(nf, pos, &ipt_netflow_hash[hash], hlist) {
++	hlist_for_each_entry(nf, BEFORE390(pos,) &ipt_netflow_hash[hash], hlist) {
+ 		if (ipt_netflow_tuple_equal(tuple, &nf->tuple) &&
+ 		    nf->nr_bytes < FLOW_FULL_WATERMARK) {
+ 			NETFLOW_STAT_INC(found);
+@@ -1434,12 +1439,20 @@
+ 	}
+ 
+ #ifdef CONFIG_PROC_FS
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ 	proc_stat = create_proc_entry("ipt_netflow", S_IRUGO, INIT_NET(proc_net_stat));
++#else
++	proc_stat = proc_create("ipt_netflow", S_IRUGO, INIT_NET(proc_net_stat), &nf_seq_fops);
++#endif
+ 	if (!proc_stat) {
+ 		printk(KERN_ERR "Unable to create /proc/net/stat/ipt_netflow entry\n");
+ 		goto err_free_netflow_slab;
+ 	}
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ 	proc_stat->proc_fops = &nf_seq_fops;
++#endif
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ 	proc_stat->owner = THIS_MODULE;
+ #endif
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild
index b3020b5c1cb6..a8d288009e9f 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-1.8.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8.ebuild,v 1.2 2013/02/07 15:31:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r3.ebuild,v 1.1 2013/08/21 10:15:47 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit linux-info linux-mod multilib toolchain-funcs
-
-MY_PN="ipt-netflow"
+inherit eutils linux-info linux-mod multilib toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
 HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
-SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tgz"
+SRC_URI="mirror://sourceforge/ipt-netflow/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+IUSE="pax_kernel"
 
 RDEPEND="net-firewall/iptables"
 DEPEND="${RDEPEND}
@@ -25,24 +25,43 @@ BUILD_TARGETS="all"
 CONFIG_CHECK="~IP_NF_IPTABLES"
 MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
 
-IPT_LIB=/usr/$(get_libdir)/xtables
+IPT_LIB="/usr/$(get_libdir)/xtables"
 
 src_prepare() {
 	sed -i -e 's:-I$(KDIR)/include::' \
 		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
 		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die 'sed on Makefile.in failed'
 	sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die 'sed on ipt_NETFLOW.c failed'
+
+	# bug #455984
+	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
+
+	# compatibility with 3.10 kernel
+	epatch "${FILESDIR}"/${PN}-1.8-procfs-fix.patch
+
+	# bug #466430
+	if use pax_kernel; then
+		epatch "${FILESDIR}"/${PN}-1.8-pax-const.patch
+	fi
+
+	epatch_user
 }
 
 src_configure() {
 	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
 	# econf can not be used, cause configure script fails when see unknown parameter
-	./configure --kver="${KV_FULL}" --kdir="${KV_DIR}" \
-		--ipt-ver="${IPT_VERSION}" --ipt-lib="${IPT_LIB}" || die 'configure failed'
+	# ipt-src need to be defined, see bug #455984
+	./configure \
+		--ipt-lib="${IPT_LIB}" \
+		--ipt-src="/usr/" \
+		--ipt-ver="${IPT_VERSION}" \
+		--kdir="${KV_DIR}" \
+		--kver="${KV_FULL}" \
+	|| die 'configure failed'
 }
 
 src_compile() {
-	local ARCH=$(tc-arch-kernel)
+	local ARCH="$(tc-arch-kernel)"
 	emake CC="$(tc-getCC)" all
 }
 
@@ -50,7 +69,6 @@ src_install() {
 	linux-mod_src_install
 	exeinto "${IPT_LIB}"
 	doexe libipt_NETFLOW.so
-	insinto /usr/include
-	doins ipt_NETFLOW.h
+	doheader ipt_NETFLOW.h
 	dodoc README*
 }