Fix unknown symbol error when build for 2.6.21 kernel (#179425).

Package-Manager: portage-2.1.2.7

5 files changed, 165 insertions, 9 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 5e3a1f077df4..d6a723448a52 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2007/03/10 11:11:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.28 2007/05/22 17:30:56 mrness Exp $
+
+*ipp2p-0.8.2-r3 (22 May 2007)
+
+  22 May 2007; Alin Năstac <mrness@gentoo.org>
+  +files/ipp2p-0.8.2-kernel-2.6.21.patch, +ipp2p-0.8.2-r3.ebuild:
+  Fix unknown symbol error when build for 2.6.21 kernel (#179425).
 
   10 Mar 2007; Alin Năstac <mrness@gentoo.org> ipp2p-0.8.2-r2.ebuild:
   Remove $ROOT from src_compile (#168039).
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index f3dfa00244d4..9a194d0e2ae2 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ipp2p-0.8.2-kernel-2.6.21.patch 2100 RMD160 c910c1b3eff020956e86a13a200acb8ee727f607 SHA1 f598be8875e5d2765a3ff4211a736e1686ed51be SHA256 a13fe9b55b0e8b4bf5c2388a5d8321f574af515cb6e457256b4c2f65c9d0cf4c
+MD5 56438dd32a4ee7e5e09b2252c97b198d files/ipp2p-0.8.2-kernel-2.6.21.patch 2100
+RMD160 c910c1b3eff020956e86a13a200acb8ee727f607 files/ipp2p-0.8.2-kernel-2.6.21.patch 2100
+SHA256 a13fe9b55b0e8b4bf5c2388a5d8321f574af515cb6e457256b4c2f65c9d0cf4c files/ipp2p-0.8.2-kernel-2.6.21.patch 2100
 AUX ipp2p-0.8.2-matchsize.patch 881 RMD160 447ee341be70d5d1d5ba150e3b6272f47c21d1e7 SHA1 721cf163232354cfbe9357f6dbffbc7fb046100e SHA256 d8b2b087d83d1eb800365d5826628fe6a6cd7fd5c30344786abaafbba8bb5d54
 MD5 8590c3ea3711c4b31a4f3413ec9e9974 files/ipp2p-0.8.2-matchsize.patch 881
 RMD160 447ee341be70d5d1d5ba150e3b6272f47c21d1e7 files/ipp2p-0.8.2-matchsize.patch 881
@@ -10,10 +14,14 @@ EBUILD ipp2p-0.8.2-r2.ebuild 1686 RMD160 711e13b407a5a1eb4d0602aea0985b0e2135246
 MD5 1503c6c82dafd489889c37dafe704875 ipp2p-0.8.2-r2.ebuild 1686
 RMD160 711e13b407a5a1eb4d0602aea0985b0e21352468 ipp2p-0.8.2-r2.ebuild 1686
 SHA256 00a157e86c0da2f56e9860b5c322c4c2e96198fd8fa8d766b6993c1e4051a7fb ipp2p-0.8.2-r2.ebuild 1686
-MISC ChangeLog 4368 RMD160 313edf68505dfbfb47fd976fcc700fee733049cf SHA1 ac0c08e2f62d6c0ce191001dc96828a37da87d9b SHA256 8fb660a6ce36f6cc2e967d27638b6f0e3777efe630f446f1eed37d7b83663f75
-MD5 3455c6fe2d6c495e20850f441865b3c2 ChangeLog 4368
-RMD160 313edf68505dfbfb47fd976fcc700fee733049cf ChangeLog 4368
-SHA256 8fb660a6ce36f6cc2e967d27638b6f0e3777efe630f446f1eed37d7b83663f75 ChangeLog 4368
+EBUILD ipp2p-0.8.2-r3.ebuild 1690 RMD160 71c1b19dad9d389cd6977dcbc60d860bd24f4985 SHA1 19e8772546ea7c994e3517c97b495dd6331899c0 SHA256 6cf8572ef4cfcd7d14393857b573006466aee5d0a9e9921d37ee9758d3fff643
+MD5 1c06e4b56a13bc1c473245a9a8e951de ipp2p-0.8.2-r3.ebuild 1690
+RMD160 71c1b19dad9d389cd6977dcbc60d860bd24f4985 ipp2p-0.8.2-r3.ebuild 1690
+SHA256 6cf8572ef4cfcd7d14393857b573006466aee5d0a9e9921d37ee9758d3fff643 ipp2p-0.8.2-r3.ebuild 1690
+MISC ChangeLog 4581 RMD160 2f8db7bcb1405e2658e0cf80636582e52652451f SHA1 63ae109840af766be3b6d3a95c3373b64650dab3 SHA256 21abd5be02b5a8691e5d5f7fdc45b3384d01626e2ec5b9539aa3373147d99d1a
+MD5 146b7ebd8969f75cb0706fe5ec057c45 ChangeLog 4581
+RMD160 2f8db7bcb1405e2658e0cf80636582e52652451f ChangeLog 4581
+SHA256 21abd5be02b5a8691e5d5f7fdc45b3384d01626e2ec5b9539aa3373147d99d1a ChangeLog 4581
 MISC metadata.xml 839 RMD160 b60b70128145c55c72e5e8bf6aaead3859c1985c SHA1 0affaf5fd1e0e806c3f2f487406e6c6918974563 SHA256 b6788dee2536d343a9d66aad17c358fce18091ac2a710b2eae090d5e4afba9cd
 MD5 a29bcf1bb9a709d97b6c6a925154a690 metadata.xml 839
 RMD160 b60b70128145c55c72e5e8bf6aaead3859c1985c metadata.xml 839
@@ -21,10 +29,13 @@ SHA256 b6788dee2536d343a9d66aad17c358fce18091ac2a710b2eae090d5e4afba9cd metadata
 MD5 3bd136616ef13f4f269a7c48a5d518be files/digest-ipp2p-0.8.2-r2 232
 RMD160 afd815301065b20a3fd7115191ed351d5d9efac3 files/digest-ipp2p-0.8.2-r2 232
 SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/digest-ipp2p-0.8.2-r2 232
+MD5 3bd136616ef13f4f269a7c48a5d518be files/digest-ipp2p-0.8.2-r3 232
+RMD160 afd815301065b20a3fd7115191ed351d5d9efac3 files/digest-ipp2p-0.8.2-r3 232
+SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/digest-ipp2p-0.8.2-r3 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF8pJiJnxX6mF440QRAu1bAJsG/4vkF7epCdHl7SbrLdXQa1OfgQCgoOXW
-PBQ6Jm1v893WQgcvliyeMGc=
-=uZKY
+iD8DBQFGUyjcJnxX6mF440QRAhmbAKDyFPkXBQMozo3S9Adzrcm2EqxBdgCfcKOI
+jtFxjCj66M0SNITCehOtCv4=
+=MqbM
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.8.2-r3 b/net-firewall/ipp2p/files/digest-ipp2p-0.8.2-r3
new file mode 100644
index 000000000000..14106f32db3b
--- /dev/null
+++ b/net-firewall/ipp2p/files/digest-ipp2p-0.8.2-r3
@@ -0,0 +1,3 @@
+MD5 9dd745830f302d70d0b728013c1d6a0c ipp2p-0.8.2.tar.gz 18976
+RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 ipp2p-0.8.2.tar.gz 18976
+SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7 ipp2p-0.8.2.tar.gz 18976
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.21.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.21.patch
new file mode 100644
index 000000000000..87993a7bb321
--- /dev/null
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.21.patch
@@ -0,0 +1,69 @@
+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	2007-05-22 20:13:59.000000000 +0300
++++ ipp2p-0.8.2/ipt_ipp2p.c	2007-05-22 20:25:32.000000000 +0300
+@@ -2,9 +2,17 @@
+ #include <linux/modversions.h>
+ #endif
+ #include <linux/module.h>
+-#include <linux/netfilter_ipv4/ip_tables.h>
+ #include <linux/version.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++#	include <linux/netfilter/x_tables.h>
++#	define ipt_register_match xt_register_match
++#	define ipt_unregister_match xt_unregister_match
++#else 
++#	include <linux/netfilter_ipv4/ip_tables.h>
+ //#include <linux/netfilter_ipv4/ipt_ipp2p.h>
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) */
++
+ #include "ipt_ipp2p.h"
+ #include <net/tcp.h>
+ #include <net/udp.h>
+@@ -831,7 +839,9 @@
+            const struct ipt_ip *ip,
+ #endif
+ 	   void *matchinfo,
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+ 	   unsigned int matchsize,
++#endif
+ 	   unsigned int hook_mask)
+ {
+         /* Must specify -p tcp */
+@@ -843,15 +853,6 @@
+ }
+ 									    
+ 
+-// TODO: find out what this structure is for (scheme taken
+-// from kernel sources)
+-// content seems to have a length of 8 bytes 
+-// (at least on my x86 machine)
+-struct ipp2p_match_info {
+-	long int dunno_what_this_is_for;
+-	long int i_also_dunno_what_this_is_for;
+-};
+-
+ static struct ipt_match ipp2p_match = { 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 	{ NULL, NULL }, 
+@@ -860,17 +861,16 @@
+ 	&checkentry, 
+ 	NULL, 
+ 	THIS_MODULE
+-#endif
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
+ 	.name		= "ipp2p",
+ 	.match		= &match,
+ 	.checkentry	= &checkentry,
+ 	.me		= THIS_MODULE,
+-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) */
+ 	.name		= "ipp2p",
+ 	.match		= &match,
+ 	.family         = AF_INET,
+-	.matchsize      = sizeof(struct ipp2p_match_info),
++	.matchsize      = XT_ALIGN(sizeof(struct ipt_p2p_info)),
+ 	.checkentry	= &checkentry,
+ 	.me		= THIS_MODULE,
+ #endif
diff --git a/net-firewall/ipp2p/ipp2p-0.8.2-r3.ebuild b/net-firewall/ipp2p/ipp2p-0.8.2-r3.ebuild
new file mode 100644
index 000000000000..7b0de982500c
--- /dev/null
+++ b/net-firewall/ipp2p/ipp2p-0.8.2-r3.ebuild
@@ -0,0 +1,67 @@
+# 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-r3.ebuild,v 1.1 2007/05/22 17:30:56 mrness Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="Netfilter module for dealing with P2P Applications."
+HOMEPAGE="http://www.ipp2p.org/index_en.html"
+SRC_URI="http://www.ipp2p.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="virtual/modutils
+	 >=net-firewall/iptables-1.2.11"
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+pkg_setup() {
+	CONFIG_CHECK="NETFILTER"
+	NETFILTER_ERROR="Your kernel is not configured to support Netfilter."
+	MODULE_NAMES="ipt_ipp2p(${PN}:${S}:${S})"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-kernel-2.6.21.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
+	fi
+}
+
+src_compile() {
+	local IPTABLES_VERSION="$(/sbin/iptables --version | cut -f2 -dv)"
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
+	    IPTABLES_SRC="/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" libipt_ipp2p.so \
+	    || die "Failed to build iptables module"
+
+	local myARCH="${ARCH}"
+	ARCH="$(tc-arch-kernel)"
+	emake KERNEL_SRC="${KV_DIR}" \
+	    IPTABLES_SRC="/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" \
+	    || die "Failed to build kernel module."
+	ARCH="${myARCH}"
+}
+
+src_install() {
+	exeinto /$(get_libdir)/iptables
+	doexe libipt_ipp2p.so
+
+	dodoc README
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}