Fix incompatibilities with iptables-1.4.0 (#203744).

Package-Manager: portage-2.1.3.19

5 files changed, 113 insertions, 24 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 7f12e76d320c..d9dc50b096a3 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipp2p
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.35 2007/08/17 19:31:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.36 2007/12/30 18:28:16 mrness Exp $
+
+  30 Dec 2007; Alin Năstac <mrness@gentoo.org>
+  +files/ipp2p-0.8.2-iptables-1.4.0.patch,
+  files/ipp2p-0.8.2-kernel-2.6.22.patch, ipp2p-0.8.2-r4.ebuild:
+  Fix incompatibilities with iptables-1.4.0 (#203744).
 
   17 Aug 2007; Alin Năstac <mrness@gentoo.org>
   -files/ipp2p-0.8.2-kernel-2.6.21.patch, -ipp2p-0.8.2-r3.ebuild:
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index fea7f065e15e..c3254b939ad4 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ipp2p-0.8.2-kernel-2.6.22.patch 2504 RMD160 bae14085213a41d98a55967c26594b1a507bd3e2 SHA1 5971ee4d2a6047e25b81392e598dce79529d07b6 SHA256 2d9d512b288c348c6ed7d45af871420f48fcbe823b72491ec729ecbc21727d26
-MD5 f720eab2de6e0e662a16faa9620cbb07 files/ipp2p-0.8.2-kernel-2.6.22.patch 2504
-RMD160 bae14085213a41d98a55967c26594b1a507bd3e2 files/ipp2p-0.8.2-kernel-2.6.22.patch 2504
-SHA256 2d9d512b288c348c6ed7d45af871420f48fcbe823b72491ec729ecbc21727d26 files/ipp2p-0.8.2-kernel-2.6.22.patch 2504
+AUX ipp2p-0.8.2-iptables-1.4.0.patch 1202 RMD160 5b90d6217dd7acbe73f1fc91d8a530067cb5e4fc SHA1 0d474d3fef15013a7d5bcae7cdd058d2a942bdd0 SHA256 729c218d40bc4b6e68a954e4af7919c4235fe531aa9cc4ed93f851f851588671
+MD5 cec8b0e26d4354024e2e8eceb4a06d09 files/ipp2p-0.8.2-iptables-1.4.0.patch 1202
+RMD160 5b90d6217dd7acbe73f1fc91d8a530067cb5e4fc files/ipp2p-0.8.2-iptables-1.4.0.patch 1202
+SHA256 729c218d40bc4b6e68a954e4af7919c4235fe531aa9cc4ed93f851f851588671 files/ipp2p-0.8.2-iptables-1.4.0.patch 1202
+AUX ipp2p-0.8.2-kernel-2.6.22.patch 3106 RMD160 8a088c8a72695aa59626d59253a80c78deaf72ea SHA1 8449486f8341900d0e0af783008455fc84741ba1 SHA256 90272cfa66b333d31271bd918b3879e63e3dd5681e6fd9436ba5276329618719
+MD5 4bcce76d2a996de9c62a3d8a183eea0e files/ipp2p-0.8.2-kernel-2.6.22.patch 3106
+RMD160 8a088c8a72695aa59626d59253a80c78deaf72ea files/ipp2p-0.8.2-kernel-2.6.22.patch 3106
+SHA256 90272cfa66b333d31271bd918b3879e63e3dd5681e6fd9436ba5276329618719 files/ipp2p-0.8.2-kernel-2.6.22.patch 3106
 DIST ipp2p-0.8.2.tar.gz 18976 RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 SHA1 98dbcf84b23e7afde3286fd0f1c1816b437d082e SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7
-EBUILD ipp2p-0.8.2-r4.ebuild 1689 RMD160 c7e05c7cc8d485cc28f8cc4b7949a606abd57b21 SHA1 1c9e2898ed6d8258ae95706cd19a1a23b08f4814 SHA256 d0f0dd73bc13d3bd4400ba0b6adff95bd434710f5a699c6b339d93d9892be6e4
-MD5 dd89feb55c4216d5f869d0411e5c6ab5 ipp2p-0.8.2-r4.ebuild 1689
-RMD160 c7e05c7cc8d485cc28f8cc4b7949a606abd57b21 ipp2p-0.8.2-r4.ebuild 1689
-SHA256 d0f0dd73bc13d3bd4400ba0b6adff95bd434710f5a699c6b339d93d9892be6e4 ipp2p-0.8.2-r4.ebuild 1689
-MISC ChangeLog 5528 RMD160 a4dd7d7a0f52400a59042e84b3ec75a63d6340d2 SHA1 f76d253b3c05c6f9011b525c2ffb18c3f7d76e0d SHA256 c3509bc3e60adee1b1577d50c7a57f51a601c9afd01426d5e0dd837655f72f46
-MD5 eaa989727acd2a11fd50df032f3b673b ChangeLog 5528
-RMD160 a4dd7d7a0f52400a59042e84b3ec75a63d6340d2 ChangeLog 5528
-SHA256 c3509bc3e60adee1b1577d50c7a57f51a601c9afd01426d5e0dd837655f72f46 ChangeLog 5528
+EBUILD ipp2p-0.8.2-r4.ebuild 1801 RMD160 e3e6b03cd175432730ef95c7c6595f03d765fc04 SHA1 b2735cd8bb37662fb294f8f6b0a3a2185d80f048 SHA256 e1f0ba9cd674da79cb5c24e0fa0bd209b507334a10d8857dd660f5b0e46203d7
+MD5 449f5c9955aad5abcf875717e5f02b8d ipp2p-0.8.2-r4.ebuild 1801
+RMD160 e3e6b03cd175432730ef95c7c6595f03d765fc04 ipp2p-0.8.2-r4.ebuild 1801
+SHA256 e1f0ba9cd674da79cb5c24e0fa0bd209b507334a10d8857dd660f5b0e46203d7 ipp2p-0.8.2-r4.ebuild 1801
+MISC ChangeLog 5739 RMD160 29ed895c53ab70b3dfee2b0181d379444ff68eb5 SHA1 4eefc69285af1f73f247a32fb8e5a99399521ee0 SHA256 e7156070814d2f62aa8ecfc7c211bd882ceaceae5437430dcae3544435187377
+MD5 c4be8500729986ec90e3b71d0feb71b3 ChangeLog 5739
+RMD160 29ed895c53ab70b3dfee2b0181d379444ff68eb5 ChangeLog 5739
+SHA256 e7156070814d2f62aa8ecfc7c211bd882ceaceae5437430dcae3544435187377 ChangeLog 5739
 MISC metadata.xml 839 RMD160 b60b70128145c55c72e5e8bf6aaead3859c1985c SHA1 0affaf5fd1e0e806c3f2f487406e6c6918974563 SHA256 b6788dee2536d343a9d66aad17c358fce18091ac2a710b2eae090d5e4afba9cd
 MD5 a29bcf1bb9a709d97b6c6a925154a690 metadata.xml 839
 RMD160 b60b70128145c55c72e5e8bf6aaead3859c1985c metadata.xml 839
@@ -22,9 +26,9 @@ MD5 3bd136616ef13f4f269a7c48a5d518be files/digest-ipp2p-0.8.2-r4 232
 RMD160 afd815301065b20a3fd7115191ed351d5d9efac3 files/digest-ipp2p-0.8.2-r4 232
 SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/digest-ipp2p-0.8.2-r4 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGxfesVSA5X31g7/gRAv0IAKCCibggoXAMJgH3zxccUtSYkee9ggCgiCQj
-6zykaVIgb/QXQNx3N/3pw+Y=
-=H6x+
+iEYEARECAAYFAkd340oACgkQ+fWpoTWIA9HPrgCfSdmHXR5u6RWCLZawk0tiIOg/
+9+YAoIuLt5jkf3Pft2U5pGXSzIpjq97K
+=leyR
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch
new file mode 100644
index 000000000000..b55fb54f8ff6
--- /dev/null
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch
@@ -0,0 +1,45 @@
+diff -Nru ipp2p-0.8.2.orig/libipt_ipp2p.c ipp2p-0.8.2/libipt_ipp2p.c
+--- ipp2p-0.8.2.orig/libipt_ipp2p.c	2006-01-04 18:24:19.000000000 +0200
++++ ipp2p-0.8.2/libipt_ipp2p.c	2007-12-30 20:20:26.000000000 +0200
+@@ -64,12 +64,10 @@
+ 	
+ 
+ static void
+-init(struct ipt_entry_match *m, unsigned int *nfcache)
++init(struct ipt_entry_match *m)
+ {
+     struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data;
+ 
+-    *nfcache |= NFC_UNKNOWN;
+-
+     /*init the module with default values*/
+     info->cmd = 0;
+     info->debug = 0;
+@@ -79,8 +77,7 @@
+ 
+ static int
+ parse(int c, char **argv, int invert, unsigned int *flags,
+-	const struct ipt_entry *entry,
+-	unsigned int *nfcache,
++	const void *entry,
+ 	struct ipt_entry_match **match)
+ {
+     struct ipt_p2p_info *info = (struct ipt_p2p_info *)(*match)->data;
+@@ -315,7 +312,7 @@
+ 
+ 
+ static void
+-print(const struct ipt_ip *ip,
++print(const void *ip,
+         const struct ipt_entry_match *match,
+ 	int numeric)
+ {
+@@ -347,7 +344,7 @@
+ 
+ 
+ static void
+-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
++save(const void *ip, const struct ipt_entry_match *match)
+ {
+     struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data;
+     
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch
index d0695e5a7d53..8d5b0531b104 100644
--- a/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch
@@ -1,6 +1,6 @@
 diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
---- ipp2p-0.8.2.orig/ipt_ipp2p.c	2006-09-27 12:52:00.000000000 +0300
-+++ ipp2p-0.8.2/ipt_ipp2p.c	2007-07-11 08:00:26.000000000 +0300
+--- ipp2p-0.8.2.orig/ipt_ipp2p.c	2007-12-04 07:50:55.000000000 +0200
++++ ipp2p-0.8.2/ipt_ipp2p.c	2007-12-04 07:50:43.000000000 +0200
 @@ -2,9 +2,18 @@
  #include <linux/modversions.h>
  #endif
@@ -21,7 +21,27 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
  #include "ipt_ipp2p.h"
  #include <net/tcp.h>
  #include <net/udp.h>
-@@ -748,7 +757,11 @@
+@@ -725,7 +734,11 @@
+ };
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++static bool
++#else
+ static int
++#endif
+ match(const struct sk_buff *skb,
+       const struct net_device *in,
+       const struct net_device *out,
+@@ -744,11 +757,19 @@
+       u_int16_t datalen,
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++      bool *hotdrop)
++#else
+       int *hotdrop)
++#endif
  {
      const struct ipt_p2p_info *info = matchinfo;
      unsigned char  *haystack;
@@ -33,7 +53,19 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
      int p2p_result = 0, i = 0;
  //    int head_len;
      int hlen = ntohs(ip->tot_len)-(ip->ihl*4);	/*hlen = packet-data length*/
-@@ -831,7 +844,9 @@
+@@ -822,7 +843,11 @@
+ 
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++static bool
++#else
+ static int
++#endif
+ checkentry(const char *tablename,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
+            const void *ip, 
+@@ -831,7 +856,9 @@
             const struct ipt_ip *ip,
  #endif
  	   void *matchinfo,
@@ -43,7 +75,7 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
  	   unsigned int hook_mask)
  {
          /* Must specify -p tcp */
-@@ -843,15 +858,6 @@
+@@ -843,15 +870,6 @@
  }
  									    
  
@@ -59,7 +91,7 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
  static struct ipt_match ipp2p_match = { 
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
  	{ NULL, NULL }, 
-@@ -860,17 +866,16 @@
+@@ -860,17 +878,16 @@
  	&checkentry, 
  	NULL, 
  	THIS_MODULE
diff --git a/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild b/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
index 3bc570641578..6b5a74a5bf78 100644
--- a/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild,v 1.5 2007/08/13 07:07:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild,v 1.6 2007/12/30 18:28:16 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -37,6 +37,9 @@ src_unpack() {
 	sed -i -e "s/^IPTABLES_VERSION/#IPTABLES_VERSION/" Makefile
 	if has_version '>=net-firewall/iptables-1.3.6' ; then
 	    sed -i -e "s/ld -shared/\$\(CC\) -shared/" Makefile
+		if has_version '>=net-firewall/iptables-1.4.0' ; then
+			epatch "${FILESDIR}"/${P}-iptables-1.4.0.patch
+		fi
 	fi
 }