Adapt ipp2p code to changes occured in the latest iptables, thanks to Bruno Redondi <bruno dot redondi at altarisoluzione dot com>.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 69 insertions, 8 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 5d741017470d..738d595d9ec3 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipp2p
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.38 2008/11/02 05:23:23 jmbsvicetto Exp $
+# 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 $
+
+  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:
+  Adapt ipp2p code to changes occured in the latest iptables, thanks to Bruno
+  Redondi <bruno dot redondi at altarisoluzione dot com>.
 
   02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 83f0e1d1003b..19122a210b03 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-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 1801 RMD160 e0258e92eb1b556e17c2091923d341a0ea6aaf0d SHA1 59b66bc8bd6a2a907c3099bca5e991210fcccd5e SHA256 ed6653bcb93b58481565abcc54949fc9b7c5d5676444eac6d1b2551d3e1e35ef
-MISC ChangeLog 6026 RMD160 7bd8f23152f84d63c4392dc51b6b4bf9ab6706bb SHA1 80b1f7a4b9e2daaa535c31d8eb74d6bf6337bff0 SHA256 f5b9705dcb9afa279cd26e711dca46a8b67aa52b2a32b5de62cce02a82c86d73
+EBUILD ipp2p-0.8.2-r4.ebuild 2005 RMD160 bc4019c9b3d3d11f4492b5b26ccb49fd46622562 SHA1 83a7dcaca7cc8981d42e267761a843caf5010277 SHA256 aa4c792c8c6466098549304553c15c4d4d4459fc6640155ce1976e8d6b715ac7
+MISC ChangeLog 6272 RMD160 a0b7d8fef07e9d6573fedc82193cd8e6d1cfef67 SHA1 f47bc22fd26b8e1403a2268ff91a90917aa3a09e SHA256 c2963d744f5cf29e84c272b97818a3ec1f2b6c770b220e9e488a8fa30d1158ad
 MISC metadata.xml 773 RMD160 4e189213cb94afb5fbdcc54ddf6a8242b3721af8 SHA1 45701acbb199b7315d28fe82c8010b95f9d0f5ec SHA256 9a475f0965f36601f0a283a9d4b15f16ac28f7cc6a227ca28a980ffad548a776
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmZ6wYACgkQts85UDFmaOU94ACeK/ODnG79A2K+wE83XW4gO4Oe
+EqIAn0wEVcv8tunXYz0XY12/Qv6vbATE
+=H1xw
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.1.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.1.patch
new file mode 100644
index 000000000000..e4def9fdc619
--- /dev/null
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.1.patch
@@ -0,0 +1,38 @@
+diff -ruN ipp2p-0.8.2.orig/libipt_ipp2p.c ipp2p-0.8.2/libipt_ipp2p.c
+--- ipp2p-0.8.2.orig/libipt_ipp2p.c	2009-02-06 15:24:09.000000000 +0100
++++ ipp2p-0.8.2/libipt_ipp2p.c	2009-02-06 15:39:25.000000000 +0100
+@@ -58,7 +58,7 @@
+ 	{ "waste", 0, 0, 'h' },
+ 	{ "xdcc", 0, 0, 'i' },
+ 	{ "debug", 0, 0, 'j' },
+-        {0}
++        { .name = NULL }
+ };
+ 
+ 	
+@@ -373,13 +373,14 @@
+ 
+ 
+ static 
+-struct iptables_match ipp2p= 
++struct xtables_match ipp2p= 
+ { 
+     .next           = NULL,
+     .name           = "ipp2p",
++    .family         = PF_INET,
+     .version        = IPTABLES_VERSION,
+-    .size           = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
+-    .userspacesize  = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
++    .size           = XT_ALIGN(sizeof(struct ipt_p2p_info)),
++    .userspacesize  = XT_ALIGN(sizeof(struct ipt_p2p_info)),
+     .help           = &help,
+     .init           = &init,
+     .parse          = &parse,
+@@ -393,6 +394,6 @@
+ 
+ void _init(void)
+ {
+-    register_match(&ipp2p);
++    xtables_register_match(&ipp2p);
+ }
+ 
diff --git a/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild b/net-firewall/ipp2p/ipp2p-0.8.2-r4.ebuild
index 97934993eb1e..2b348e092d1d 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-2008 Gentoo Foundation
+# 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.7 2008/07/04 20:14:01 mrness Exp $
+# $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 $
 
 inherit linux-mod eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/modutils
-	 <net-firewall/iptables-1.4.1.1"
+	 net-firewall/iptables"
 
 DEPEND="${RDEPEND}
 	virtual/linux-sources"
@@ -39,6 +39,9 @@ src_unpack() {
 	    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
 }
@@ -58,7 +61,11 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /$(get_libdir)/iptables
+	if has_version '>=net-firewall/iptables-1.4.1' ; then
+		exeinto /$(get_libdir)/xtables
+	else
+		exeinto /$(get_libdir)/iptables
+	fi
 	doexe libipt_ipp2p.so
 
 	dodoc README