Fix incompatibility with iptables-1.4.3 (#265460).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 302 insertions, 21 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 738d595d9ec3..9f5e9a8d3b12 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/ipp2p
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.39 2009/02/16 22:38:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.40 2009/04/10 22:25:36 mrness Exp $
+
+  10 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  +files/ipp2p-0.8.2-iptables-1.4.3.patch, ipp2p-0.8.2-r4.ebuild:
+  Fix incompatibility with iptables-1.4.3 (#265460).
 
   16 Feb 2009; Alin Năstac <mrness@gentoo.org>
   +files/ipp2p-0.8.2-iptables-1.4.1.patch, ipp2p-0.8.2-r4.ebuild:
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 19122a210b03..72d1418e7ae1 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -3,15 +3,16 @@ Hash: SHA1
 
 AUX ipp2p-0.8.2-iptables-1.4.0.patch 1202 RMD160 5b90d6217dd7acbe73f1fc91d8a530067cb5e4fc SHA1 0d474d3fef15013a7d5bcae7cdd058d2a942bdd0 SHA256 729c218d40bc4b6e68a954e4af7919c4235fe531aa9cc4ed93f851f851588671
 AUX ipp2p-0.8.2-iptables-1.4.1.patch 1040 RMD160 ab9294b373432c75c667d05f4a3fdf0b136c0ff3 SHA1 e042f529a245faa0df7209178debfd29ece91b32 SHA256 4378a1d96296135e856b59b68142fd50127eb8619e490b5bd6a5baed44efff6d
+AUX ipp2p-0.8.2-iptables-1.4.3.patch 12040 RMD160 1404c68225d7108910028d7424c40170a18995ec SHA1 6c106c28f4f59ddc52d4f453846c540074e21db3 SHA256 8508cc351f396e1b649333cc97ca9283d15563aaafbd70b2f9206106f2c7c1c2
 AUX ipp2p-0.8.2-kernel-2.6.22.patch 3106 RMD160 8a088c8a72695aa59626d59253a80c78deaf72ea SHA1 8449486f8341900d0e0af783008455fc84741ba1 SHA256 90272cfa66b333d31271bd918b3879e63e3dd5681e6fd9436ba5276329618719
 DIST ipp2p-0.8.2.tar.gz 18976 RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 SHA1 98dbcf84b23e7afde3286fd0f1c1816b437d082e SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7
-EBUILD ipp2p-0.8.2-r4.ebuild 2005 RMD160 bc4019c9b3d3d11f4492b5b26ccb49fd46622562 SHA1 83a7dcaca7cc8981d42e267761a843caf5010277 SHA256 aa4c792c8c6466098549304553c15c4d4d4459fc6640155ce1976e8d6b715ac7
-MISC ChangeLog 6272 RMD160 a0b7d8fef07e9d6573fedc82193cd8e6d1cfef67 SHA1 f47bc22fd26b8e1403a2268ff91a90917aa3a09e SHA256 c2963d744f5cf29e84c272b97818a3ec1f2b6c770b220e9e488a8fa30d1158ad
+EBUILD ipp2p-0.8.2-r4.ebuild 2079 RMD160 011e0c5f9be18f0ffaf403a550e54652ab29f9e6 SHA1 065ecf77031ed8aeabc4b5279eb2269a074328d7 SHA256 24bb18187ddbe448254472982f0170e0cf0c0714db8c6ed83b11e01bd75808ea
+MISC ChangeLog 6440 RMD160 3fdd820a313932dbef62d4834ca9350f7c448f2b SHA1 731ce13521334d366000b032726089f82f46f7b2 SHA256 873292fa4c5841b51e5ba50993b8eed0bf82b39e60709f649ca216d61dc866c4
 MISC metadata.xml 773 RMD160 4e189213cb94afb5fbdcc54ddf6a8242b3721af8 SHA1 45701acbb199b7315d28fe82c8010b95f9d0f5ec SHA256 9a475f0965f36601f0a283a9d4b15f16ac28f7cc6a227ca28a980ffad548a776
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmZ6wYACgkQts85UDFmaOU94ACeK/ODnG79A2K+wE83XW4gO4Oe
-EqIAn0wEVcv8tunXYz0XY12/Qv6vbATE
-=H1xw
+iEYEARECAAYFAknfx2sACgkQts85UDFmaOUZwwCfQO+XgekTYFIfam0w05SOAl+8
+g8UAniJe6ThnIQNgC838TEBEaLWX36ET
+=d5+R
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch
new file mode 100644
index 000000000000..dd704127cc1b
--- /dev/null
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch
@@ -0,0 +1,274 @@
+--- libipt_ipp2p.c.old	2009-04-08 18:03:26.574089860 +0200
++++ libipt_ipp2p.c	2009-04-08 18:03:42.871884390 +0200
+@@ -88,39 +88,39 @@
+     switch (c) {
+ 	case '1':		/*cmd: ipp2p*/
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified once!");
+ /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p-data' may only be "
+ 				"specified alone!");*/
+ 	    if ((*flags) != 0)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+ 	    *flags += SHORT_HAND_IPP2P;
+ 	    info->cmd = *flags;
+ 	    break;
+ 	    
+ 	case '2':		/*cmd: edk*/
+ 	    if ((*flags & IPP2P_EDK) == IPP2P_EDK)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--edk' may only be "
+ 				"specified once");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+ /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p-data' may only be "
+ 				"specified alone!");*/
+             if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+ 	    *flags += IPP2P_EDK;
+ 	    info->cmd = *flags;	    
+ 	    break;
+@@ -128,21 +128,21 @@
+ 
+ 	case '7':		/*cmd: dc*/
+             if ((*flags & IPP2P_DC) == IPP2P_DC)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--dc' may only be "
+                                 "specified once!");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+ /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p-data' may only be "
+ 				"specified alone!");*/
+             if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_DC;
+ 	    info->cmd = *flags;
+ 	    break;
+@@ -150,70 +150,70 @@
+ 
+ 	case '9':		/*cmd: gnu*/
+             if ((*flags & IPP2P_GNU) == IPP2P_GNU)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--gnu' may only be "
+                                 "specified once!");
+ /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p-data' may only be "
+ 				"specified alone!");*/
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+             if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_GNU;
+ 	    info->cmd = *flags;
+ 	    break;
+ 
+ 	case 'a':		/*cmd: kazaa*/
+             if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--kazaa' may only be "
+                                 "specified once!");
+ /*	    if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p-data' may only be "
+ 				"specified alone!");*/
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+             if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_KAZAA;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 
+ 	case 'b':		/*cmd: bit*/
+             if ((*flags & IPP2P_BIT) == IPP2P_BIT)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--bit' may only be "
+                                 "specified once!");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_BIT;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 
+ 	case 'c':		/*cmd: apple*/
+             if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--apple' may only be "
+                                 "specified once!");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_APPLE;
+ 	    info->cmd = *flags;
+ 	    break;																											
+@@ -221,14 +221,14 @@
+ 
+ 	case 'd':		/*cmd: soul*/
+             if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--soul' may only be "
+                                 "specified once!");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_SOUL;
+ 	    info->cmd = *flags;
+ 	    break;																											
+@@ -236,67 +236,67 @@
+ 
+ 	case 'e':		/*cmd: winmx*/
+             if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--winmx' may only be "
+                                 "specified once!");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_WINMX;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 
+ 	case 'f':		/*cmd: ares*/
+             if ((*flags & IPP2P_ARES) == IPP2P_ARES)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--ares' may only be "
+                                 "specified once!");
+ 	    if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
+-		    exit_error(PARAMETER_PROBLEM,
++		    xtables_error(PARAMETER_PROBLEM,
+ 				"ipp2p: `--ipp2p' may only be "
+ 				"specified alone!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_ARES;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 	
+ 	case 'g':		/*cmd: mute*/
+             if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--mute' may only be "
+                                 "specified once!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_MUTE;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 	case 'h':		/*cmd: waste*/
+             if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--waste' may only be "
+                                 "specified once!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_WASTE;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 	case 'i':		/*cmd: xdcc*/
+             if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+                                 "ipp2p: `--ares' may only be "
+                                 "specified once!");
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+             *flags += IPP2P_XDCC;
+ 	    info->cmd = *flags;
+ 	    break;																											
+ 
+ 	case 'j':		/*cmd: debug*/
+-	    if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++	    if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
+ 	    info->debug = 1;
+ 	    break;																											
+ 
+ 	default:
+-//            exit_error(PARAMETER_PROBLEM,
++//            xtables_error(PARAMETER_PROBLEM,
+ //	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
+ 	    return 0;
+     }
+@@ -308,7 +308,7 @@
+ final_check(unsigned int flags)
+ {
+     if (!flags)
+-            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
+ 	    "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
+ }
+ 
diff --git a/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild b/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
index 2b348e092d1d..94540e78c95c 100644
--- a/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.8 2009/02/16 22:38:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild,v 1.9 2009/04/10 22:25:36 mrness Exp $
+
+EAPI="2"
 
 inherit linux-mod eutils
 
@@ -27,23 +29,23 @@ pkg_setup() {
 	linux-mod_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-kernel-2.6.22.patch
 	convert_to_m Makefile
 
 	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
-			if has_version '>=net-firewall/iptables-1.4.1' ; then
-				epatch "${FILESDIR}"/${P}-iptables-1.4.1.patch
-			fi
-		fi
-	fi
+
+	has_version '>=net-firewall/iptables-1.3.6' || return 0
+	sed -i -e "s/ld -shared/\$\(CC\) -shared/" Makefile
+
+	has_version '>=net-firewall/iptables-1.4.0' || return 0
+	epatch "${FILESDIR}"/${P}-iptables-1.4.0.patch
+
+	has_version '>=net-firewall/iptables-1.4.1' || return 0
+	epatch "${FILESDIR}"/${P}-iptables-1.4.1.patch
+
+	has_version '>=net-firewall/iptables-1.4.3' || return 0
+	epatch "${FILESDIR}"/${P}-iptables-1.4.3.patch
 }
 
 src_compile() {