Modified version of procfs-fix patch, previous one can cause compile failures on kernels < 3.10

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

3 files changed, 21 insertions, 15 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index bcc5d887f092..37bd344af642 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2013/08/25 15:24:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.11 2013/09/04 09:11:47 pinkbyte Exp $
+
+  04 Sep 2013; Sergey Popov <pinkbyte@gentoo.org>
+  files/ipt_netflow-1.8-procfs-fix.patch:
+  Modified version of procfs-fix patch, previous one can cause compile failures
+  on kernels < 3.10
 
   25 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> ipt_netflow-1.8-r3.ebuild:
   Stable on amd64 and x86, wrt bug #481278
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index da4b7896f770..31f827ce0608 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -3,21 +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
+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 2099 SHA256 114e04bb81d196c5dbef63e6a931149425c4aa7d2778e86e7ce5c22e2bdaff41 SHA512 62be23ec6151056f198aca85297721c72aa74c7eecf031552d9f9342dfe0e7b6bccf7da40b3a039af21a59d19d3d9b031b37104c27325ca99447be22e135ca81 WHIRLPOOL 07d7300d82b09ed3ace6c598bd3960e6655feed05e274b8b2bbf3eb004e3c80272029ecbf66d80c5bfc93eb22bf703cf9a529a1e76172547f805ea31e1e88a4b
+MISC ChangeLog 2292 SHA256 97e34438ae9903dfc9a075c96c8c317d1ded4edc51fcd14b1ce89e5c74489ec1 SHA512 f2bdf65e3bdafec4ea7b217da46ab396305f1f99bd39a6a519cd0116abe4375fb241be05be11838151f9399c6e765716bec458210616887ac68c4c8c79d8ba28 WHIRLPOOL 44ace4aa62b87889e476750e6fc3584392ff3b907661597abfd09ff2685486b6de33ff7ca9c181aa4fea9e640802ea9365e98e0cbf93be83528abdc6b4658c1a
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSGiGhAAoJECo/aRed9267pG0H/3cWNx2+JXSqkMbfkyhvCG60
-0vjPA5kt2VbisLyobQUk/B9vcTmcZHTf4N0PVLVbosWYd5i5WUgf43hDdiQ/NwtU
-P/2VqO8PhON50zsi2+n2Mo7K4QsPeVCeSs28NDfzk5YP8KsAuHRio232j1XhzoZM
-M05Vuz6H4N6Wz92GaqtYSImmzE4vpJW7Mr9qUaA76zo0q4FayoI04ZL4lC9BNPbM
-jNnpt8KahwsQqZbceYniI9/qGwOZiPCSp3LnNKUCFaWOk9GQ2M45X9TNUb4eiHHD
-fcs63FEbWquMxXOLnVc5KBg9R7oWDWYvOtIpJExtPC7CdTf4YNeo+xw/rHdYVmM=
-=n8mG
+iQEbBAEBCAAGBQJSJvj5AAoJECo/aRed9267w/gH+K24caYyecK9xe/W0O4qmoWD
+23grp2a7vDznek25TpmxEaDgZa766560llRqM1gQyTb07g7+VyNmrrob5zQ+oC+l
+7GtM521+dPd6o3HV+SLcUaEETZgqN2fIIqSkdT/DawC9F5SJN+dk0SLGTwKyWt0d
+c45MLBbBFncUL+GtVgLWpz81mcTq82h6qkgufcZo65XfcBTzo5ySTxtiJ/bIm6Xs
+SaqMG9YOTFZB5/YBOUNN54jOl1uRvaxgTc9d8xYTGae7rG2am7m46lZWKK1LBVFE
+lLOdAKYIBEfsc5JKw+b2EESLfOj43oOJItXQvuIePcBwCY2R2T0vJ6KF5hWivg==
+=iX/X
 -----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
index 3d1c44f8653c..18ab38b5aeef 100644
--- 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
@@ -2,19 +2,20 @@ 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 @@
+@@ -854,9 +854,15 @@
  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 LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
++	hlist_for_each_entry(nf, pos, &ipt_netflow_hash[hash], hlist) {
++#else
++	hlist_for_each_entry(nf, &ipt_netflow_hash[hash], hlist) {
++#endif
  		if (ipt_netflow_tuple_equal(tuple, &nf->tuple) &&
  		    nf->nr_bytes < FLOW_FULL_WATERMARK) {
  			NETFLOW_STAT_INC(found);