Revision bump: add compatibility patch for kernel 3.11. Drop old

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

5 files changed, 46 insertions, 76 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index 37bd344af642..39ebfba141c4 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2013/09/04 09:11:47 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.12 2013/12/19 19:16:43 pinkbyte Exp $
+
+*ipt_netflow-1.8-r4 (19 Dec 2013)
+
+  19 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> -ipt_netflow-1.8-r1.ebuild,
+  -ipt_netflow-1.8-r2.ebuild, +ipt_netflow-1.8-r4.ebuild,
+  +files/ipt_netflow-1.8-numphyspages-fix.patch:
+  Revision bump: add compatibility patch for kernel 3.11. Drop old
 
   04 Sep 2013; Sergey Popov <pinkbyte@gentoo.org>
   files/ipt_netflow-1.8-procfs-fix.patch:
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 31f827ce0608..5d4995151a8e 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA256
 
 AUX ipt_netflow-1.8-configure.patch 352 SHA256 8ed19392b0cbfe3b286ac44cdab1e71fe6d4cab0c68c5cc6e7ee870bad76b3de SHA512 7e00aee7837a0806a39c5367451a140cd7e7e789d30cce72b1a000db0c6b8d97f5d9ff90616dad3bdf2054227628dae4dce693c3eb56d80c670ff589244cdd6c WHIRLPOOL 7f12720b71889af947ce73bdae838a70f171e801955b30c62d30b86a5abf6ceed1bbe5e29145c6c455a95c1e08757816e5eedccec2a993da0dae1525d24a9517
+AUX ipt_netflow-1.8-numphyspages-fix.patch 678 SHA256 1c6a7afc6fd56f9b89dea947b953220cbe2634f85a4471d445d1f9f9b2cc78bb SHA512 32c3611413b3d18e607698ad048ae47ba89d4d3262480732cc2967762bb98223848e253dd2caf475cac887c9e31e820a28bc0216d40a8a0a89117a360497149a WHIRLPOOL e9841ce6620f8c0b54734a406d19f903d86ae23d93a5058f47c7e26aab8815fbbd340a1daa308f40d9645516ff8997f4fe7bcb066bdbc053ef55b5ddc6b91d3b
 AUX ipt_netflow-1.8-pax-const.patch 1620 SHA256 9d891ef8239cb467cdb0d6cdb4fd5649080c56ec58bb2a8f081bd20f1ea89c0f SHA512 c2a4c5e0c6e31cb78535c6e0a11281f742f4a5c5a6fd20cae18906add03efc65c817803c93cbf1deb91095eb77a4d9172de4920cca040a11e95f6b3932a99d74 WHIRLPOOL a18b1b524a7ac0f0f31b4c4cd267cb40721e1818e58f16671a2d9eee8e769f9b1152d4f40019a4ffe55ae5f2971f17aba6a102058df7e9cff65e8e6aa665e94e
 AUX ipt_netflow-1.8-procfs-fix.patch 1391 SHA256 4470af7b65de7f0dbb3e3af1e0a1ab5a9df5bf35bacd81d84a00e03f7f895653 SHA512 adfd66ca34de96753311d1447d5385c146abe9378c72810ebd1967c092252146cc94f785951be1a1939d8b35a3891d145edeca28e9d757d6aa689fb54621a151 WHIRLPOOL db5696fa73db8d5240b9fe874bbe853a8738803168e1c9b09dc8f30635c20909931c95c9793624cc0a8731595637ff3e0d092a81f237349888ba48ea9d4b3c2a
 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-r3.ebuild 1884 SHA256 6acea68da4dc3d791416fbb6e45c38b117ea6ef8fba63aeda55f8c2bb9ecfb2b SHA512 832c69bfebb61b1de1e5a3a503d29f9dde688d8564016f303fc3bacf84e6ab5645aef7c534362b06dabad3af9cf5a4b67b1bcd380c7cc93b1af62659897ec8ea WHIRLPOOL e203e007e2d2026f8ae0f02af68914d0989d73b1d3bd2720b36c53dfae00f31e91f5eb939033c8e5696e2f54de7ff568c76ffd59bba599e29a558661effb0801
-MISC ChangeLog 2292 SHA256 97e34438ae9903dfc9a075c96c8c317d1ded4edc51fcd14b1ce89e5c74489ec1 SHA512 f2bdf65e3bdafec4ea7b217da46ab396305f1f99bd39a6a519cd0116abe4375fb241be05be11838151f9399c6e765716bec458210616887ac68c4c8c79d8ba28 WHIRLPOOL 44ace4aa62b87889e476750e6fc3584392ff3b907661597abfd09ff2685486b6de33ff7ca9c181aa4fea9e640802ea9365e98e0cbf93be83528abdc6b4658c1a
+EBUILD ipt_netflow-1.8-r4.ebuild 1976 SHA256 10e0fb65e4ab2946e57fdcc73e08019b1821a734ba70d5efb233efbb8a8a9fc9 SHA512 e04e5f8257b6c5428a30cc181580b3118c7d1f510fd6d17331459e6a5fe415a6ac2d5ea4f48d0dfd2470a492809168ca1f096103c203732200e369caed8d79bc WHIRLPOOL 6e6bd9d5527af0092888bdafd64fc1b7cf643fb100fb606b4a2faa9483ded417af6a1bf1854a6d84bb693d79323d2051043b5d565b5ac1b318df019bfb0af689
+MISC ChangeLog 2580 SHA256 ec678000a6f74721027b263fedbf436bf77ae42b02c21b275078d8a99f675e17 SHA512 b9575e76107daa17a84b18d86b87fb9d646271706c84d0cd999e979a0a1e7ebb834d462e0ec276cfb6a17d52c27f178730edc956bab36ec1e58d26a4e29402cd WHIRLPOOL 2a377470e7549dd9a2dabeb53d39cff493cd1690e180fa8e980106b69f86209a3da1a8ed858075a0aea0808e3eeb611a7301fa6ecafdf634ad4296fc1612fc06
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEbBAEBCAAGBQJSJvj5AAoJECo/aRed9267w/gH+K24caYyecK9xe/W0O4qmoWD
-23grp2a7vDznek25TpmxEaDgZa766560llRqM1gQyTb07g7+VyNmrrob5zQ+oC+l
-7GtM521+dPd6o3HV+SLcUaEETZgqN2fIIqSkdT/DawC9F5SJN+dk0SLGTwKyWt0d
-c45MLBbBFncUL+GtVgLWpz81mcTq82h6qkgufcZo65XfcBTzo5ySTxtiJ/bIm6Xs
-SaqMG9YOTFZB5/YBOUNN54jOl1uRvaxgTc9d8xYTGae7rG2am7m46lZWKK1LBVFE
-lLOdAKYIBEfsc5JKw+b2EESLfOj43oOJItXQvuIePcBwCY2R2T0vJ6KF5hWivg==
-=iX/X
+iQEcBAEBCAAGBQJSs0YaAAoJECo/aRed9267QZkH/iuDmo3AdW2QsoislB1Lbcgi
+JvhgoZhx1/KFh/XMvSzHjHi+XH5KJ4+9s2DMqv69MLEt5L8ui++F7b7Ruv71j4Us
+YXSe1Z1XZI9bhFjAdowHNhfNlbepAbulL/5hmHHhsaj9N2DIRrUcdWmpnDlmU8Wv
+gbvytIGsJlLgmeAZnigznSrstiVQlU8Jah3Kll3yRwrfQoXqWtW9RLT/FML3VpKB
+T+VXhHXyZSQUUN+yTU+TY+3qyOi1Z2stVFvhi26TEoc+uRMnPoloKQsHPB5MbA6j
+D742T4cZxd8gNfz6nTgSK4t25S6xC5AoqV0RHGa3CnBKEGKtoltkUTR9yJDrhCE=
+=E06k
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-numphyspages-fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-numphyspages-fix.patch
new file mode 100644
index 000000000000..b64980f02666
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-numphyspages-fix.patch
@@ -0,0 +1,20 @@
+commit 76c1610c10f863e4f8b38e88af60044b42b79422
+Author: ABC <abc@telekom.ru>
+Date:   Mon Sep 30 11:07:07 2013 +0400
+
+    num_physpages to totalram_pages rename for linux 3.11
+
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 5ec725d..71d4087 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -2025,6 +2025,9 @@ static int __init ipt_netflow_init(void)
+ 
+ 	/* determine hash size (idea from nf_conntrack_core.c) */
+ 	if (!hashsize) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
++#define num_physpages totalram_pages
++#endif
+ 		hashsize = (((num_physpages << PAGE_SHIFT) / 16384)
+ 					 / sizeof(struct hlist_head));
+ 		if (num_physpages > (1024 * 1024 * 1024 / PAGE_SIZE))
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r1.ebuild
deleted file mode 100644
index 6de3d3007650..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-1.8-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-r1.ebuild,v 1.5 2013/04/16 16:53:57 ago Exp $
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib toolchain-funcs
-
-MY_PN="ipt-netflow"
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
-SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="net-firewall/iptables"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-CONFIG_CHECK="~IP_NF_IPTABLES"
-MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-
-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'
-	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# econf can not be used, cause configure script fails when see unknown parameter
-	# 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)
-	emake CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	insinto /usr/include
-	doins ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
index ec68ef03317d..1bf35093bdec 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2013/06/27 03:52:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild,v 1.1 2013/12/19 19:16:43 pinkbyte Exp $
 
 EAPI="5"
 
@@ -36,6 +36,12 @@ src_prepare() {
 	# bug #455984
 	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
 
+	# compatibility with 3.10 kernel
+	epatch "${FILESDIR}"/${PN}-1.8-procfs-fix.patch
+
+	# compatibility with 3.11 kernel
+	epatch "${FILESDIR}"/${PN}-1.8-numphyspages-fix.patch
+
 	# bug #466430
 	if use pax_kernel; then
 		epatch "${FILESDIR}"/${PN}-1.8-pax-const.patch