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

(Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64)

3 files changed, 56 insertions, 6 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/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