diff options
| -rw-r--r-- | net-firewall/ipp2p/ChangeLog | 194 | ||||
| -rw-r--r-- | net-firewall/ipp2p/Manifest | 18 | ||||
| -rw-r--r-- | net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch | 45 | ||||
| -rw-r--r-- | net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.1.patch | 38 | ||||
| -rw-r--r-- | net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch | 284 | ||||
| -rw-r--r-- | net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.30.patch | 149 | ||||
| -rw-r--r-- | net-firewall/ipp2p/ipp2p-0.8.2-r5.ebuild | 79 | ||||
| -rw-r--r-- | net-firewall/ipp2p/metadata.xml | 15 |
8 files changed, 0 insertions, 822 deletions
diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog deleted file mode 100644 index a852c43903c4..000000000000 --- a/net-firewall/ipp2p/ChangeLog +++ /dev/null @@ -1,194 +0,0 @@ -# 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.42 2009/09/20 12:58:23 mrness Exp $ - -*ipp2p-0.8.2-r5 (20 Sep 2009) - - 20 Sep 2009; Alin Năstac <mrness@gentoo.org> -ipp2p-0.8.2-r4.ebuild, - +ipp2p-0.8.2-r5.ebuild, -files/ipp2p-0.8.2-kernel-2.6.22.patch, - +files/ipp2p-0.8.2-kernel-2.6.30.patch: - Fix crash on 2.6.30 kernel (#278858). - - 25 Apr 2009; Alin Năstac <mrness@gentoo.org> - files/ipp2p-0.8.2-iptables-1.4.3.patch: - Improve iptables-1.4.3 patch (#265460). - - 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: - 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: - Removing eradicator as a maintainer since he was retired. - - 04 Jul 2008; Alin Năstac <mrness@gentoo.org> ipp2p-0.8.2-r4.ebuild: - Update iptables dependency atom to <iptables-1.4.1.1 (#229185). - - 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: - Remove old revision. - - 13 Aug 2007; Christian Faulhammer <opfer@gentoo.org> - ipp2p-0.8.2-r4.ebuild: - stable x86, bug 186953 - - 10 Aug 2007; Steve Dibb <beandog@gentoo.org> ipp2p-0.8.2-r4.ebuild: - amd64 stable, bug 186953 - - 30 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> ipp2p-0.8.2-r4.ebuild: - Stable on sparc wrt #186953 - - 30 Jul 2007; Markus Rothe <corsair@gentoo.org> ipp2p-0.8.2-r4.ebuild: - Stable on ppc64; bug #186953 - -*ipp2p-0.8.2-r4 (11 Jul 2007) - - 11 Jul 2007; Alin Năstac <mrness@gentoo.org> - +files/ipp2p-0.8.2-kernel-2.6.22.patch, +ipp2p-0.8.2-r4.ebuild: - Fix broken compilation against kernel 2.6.22, thanks to Yakov Suraev - <j2melinux at gmail dot com> (#184808). - - 19 Jun 2007; Alin Năstac <mrness@gentoo.org> - -files/ipp2p-0.8.2-matchsize.patch, -ipp2p-0.8.2-r2.ebuild: - Remove old revision. - -*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). - - 16 Jan 2007; Alin Năstac <mrness@gentoo.org> -ipp2p-0.8.0.ebuild, - -ipp2p-0.8.2.ebuild, -ipp2p-0.8.2-r1.ebuild, ipp2p-0.8.2-r2.ebuild: - Stable on amd64. Remove obsolete versions. - - 16 Jan 2007; Raúl Porcel <armin76@gentoo.org> ipp2p-0.8.2-r2.ebuild: - stable x86 wrt bug 157175 - - 15 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> ipp2p-0.8.2-r2.ebuild: - Stable on sparc wrt #157175 - - 14 Jan 2007; Markus Rothe <corsair@gentoo.org> ipp2p-0.8.2-r2.ebuild: - Stable on ppc64; bug #157175 - -*ipp2p-0.8.2-r2 (14 Jan 2007) - - 14 Jan 2007; Alin Năstac <mrness@gentoo.org> - +files/ipp2p-0.8.2-matchsize.patch, +ipp2p-0.8.2-r2.ebuild: - Fix invalid size error on amd64 (bug #157175 comment #5). - -*ipp2p-0.8.2-r1 (04 Jan 2007) - - 04 Jan 2007; Alin Nastac <mrness@gentoo.org> +ipp2p-0.8.2-r1.ebuild: - Link libipt_ipp2p.o dynamically when iptables 1.3.6 or better is installed - (#157238). - - 06 Dec 2006; Markus Rothe <corsair@gentoo.org> ipp2p-0.8.2.ebuild: - Stable on ppc64; bug #157175 - - 05 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> ipp2p-0.8.2.ebuild: - Stable on sparc wrt #157175 - -*ipp2p-0.8.2 (05 Dec 2006) - - 05 Dec 2006; Alin Năstac <mrness@gentoo.org> metadata.xml, - +ipp2p-0.8.2.ebuild: - Version bumped as stable on x86 (#141700). - - 23 May 2006; Markus Rothe <corsair@gentoo.org> ipp2p-0.8.0.ebuild: - Stable on ppc64 - - 01 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org> - -ipp2p-0.7.4-r2.ebuild, -ipp2p-0.8.0_rc3.ebuild, ipp2p-0.8.0.ebuild: - Removing old versions. Stabilizing on amd64, sparc, x86. - - 26 Feb 2006; Jeremy Huddleston <eradicator@gentoo.org> - ipp2p-0.7.4-r2.ebuild, ipp2p-0.8.0_rc3.ebuild, ipp2p-0.8.0.ebuild: - Fixed SLOT to 0. - -*ipp2p-0.8.0 (28 Oct 2005) - - 28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> - +ipp2p-0.8.0.ebuild: - Version bump. - - 07 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> - ipp2p-0.7.4-r2.ebuild, ipp2p-0.8.0_rc3.ebuild: - Fix bug #101635. - - 06 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> - -files/ipp2p-0.7-Makefile.patch, -ipp2p-0.7.1-r1.ebuild, - ipp2p-0.7.4-r2.ebuild: - Stable amd64, sparc, x86 as the older version doesn't build with current - kernels. Removing older version. - -*ipp2p-0.8.0_rc3 (25 Jul 2005) -*ipp2p-0.7.4-r2 (25 Jul 2005) - - 25 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> - -ipp2p-0.7.4-r1.ebuild, +ipp2p-0.7.4-r2.ebuild, +ipp2p-0.8.0_rc3.ebuild: - Don't use CFLAGS when building the kernel module. Version bump. - - 25 Jun 2005; David Holm <dholm@gentoo.org> ipp2p-0.7.4-r1.ebuild: - Added to ~ppc. - -*ipp2p-0.7.4-r1 (25 Jun 2005) - - 25 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org> - -ipp2p-0.7.4.ebuild, +ipp2p-0.7.4-r1.ebuild: - Fixed version detection of iptables. Moved iptables to RDEPEND. - -*ipp2p-0.7.4 (24 Jun 2005) - - 24 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org> - -files/ipp2p-0.6-Makefile.patch, +ipp2p-0.7.4.ebuild: - Version bump. Closes bug #95965. - -*ipp2p-0.7.1-r1 (02 Mar 2005) - - 02 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> - -ipp2p-0.6-r1.ebuild, +ipp2p-0.7.1-r1.ebuild, -ipp2p-0.7.1.ebuild, - -ipp2p-0.7.ebuild: - Revbump since it was incompatible with a change in linux-mod. See bug - #80499. Stable amd64, x86. - -*ipp2p-0.7.1 (11 Jan 2005) - - 11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> - ipp2p-0.6-r1.ebuild, -ipp2p-0.6.ebuild, +ipp2p-0.7.1.ebuild: - Version bump closes bug #77457. Moving 0.6-r1 to stable. - -*ipp2p-0.7 (26 Dec 2004) - - 26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> - +files/ipp2p-0.7-Makefile.patch, +ipp2p-0.7.ebuild: - Version bump closes bug #75652. - -*ipp2p-0.6-r1 (07 Dec 2004) - - 07 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> - +ipp2p-0.6-r1.ebuild: - Converted to linux-mod eclass. - - 06 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> ipp2p-0.6.ebuild: - Updated HOMEPAGE per request of upstream author. Stable amd64, x86. - -*ipp2p-0.6 (26 Oct 2004) - - 26 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml, - +files/ipp2p-0.6-Makefile.patch, +ipp2p-0.6.ebuild: - Ebuild provided by me. - diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest deleted file mode 100644 index b899848fe0d0..000000000000 --- a/net-firewall/ipp2p/Manifest +++ /dev/null @@ -1,18 +0,0 @@ ------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-iptables-1.4.3.patch 12482 RMD160 efe7b2ffe4a81b1f69ecd6726ed22deda71039f9 SHA1 64d0e0bb7f97f305b76f7590c2fa416d91b981aa SHA256 996b32c02f8ee0029f0482b473a90899491778012f8836096ba90214bf54c73c -AUX ipp2p-0.8.2-kernel-2.6.30.patch 4644 RMD160 4a30d1b6814c51674417c35cba0e73d01a36070f SHA1 4f46fc1b256b30fce03fbbd2c8d66ab233f22a99 SHA256 dd1b006b3bc86e994acb8c010701afab1aea201cfd60c9325accd5484b792877 -DIST ipp2p-0.8.2.tar.gz 18976 RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 SHA1 98dbcf84b23e7afde3286fd0f1c1816b437d082e SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7 -EBUILD ipp2p-0.8.2-r5.ebuild 2079 RMD160 1f968bae3916a63af4d3b5cd115c58de08f1683f SHA1 0430fdea9315aee890192a8d55681fb54c614372 SHA256 775e1f87a642549dcd076546a619bbe3cf280dd8386d344d4e280b85be34df5e -MISC ChangeLog 6825 RMD160 7f356beaf40dd0e13acaa6ca6438f5d9c0cbe004 SHA1 379a6aa9b895b1b815d162a989e274c1bb14fd2b SHA256 0e67fc2f52fe89a52ef6cb9f2e143e5ec4838c5975abc845315866b68e4a941d -MISC metadata.xml 773 RMD160 4e189213cb94afb5fbdcc54ddf6a8242b3721af8 SHA1 45701acbb199b7315d28fe82c8010b95f9d0f5ec SHA256 9a475f0965f36601f0a283a9d4b15f16ac28f7cc6a227ca28a980ffad548a776 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkq2JvoACgkQ9A5kJBGSrssooQCfTCfB/dImFvZZLzNresdnNSxn -zbUAnjGJtATgzJcVedo4/+e8Z1Zt+b5W -=BsSZ ------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 deleted file mode 100644 index b55fb54f8ff6..000000000000 --- a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -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-iptables-1.4.1.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.1.patch deleted file mode 100644 index e4def9fdc619..000000000000 --- a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.1.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/files/ipp2p-0.8.2-iptables-1.4.3.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch deleted file mode 100644 index fbead164ded0..000000000000 --- a/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch +++ /dev/null @@ -1,284 +0,0 @@ -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 2009-04-25 11:05:43.000000000 +0000 -+++ ipp2p-0.8.2/libipt_ipp2p.c 2009-04-25 11:06:54.000000000 +0000 -@@ -85,39 +85,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; -@@ -125,21 +125,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; -@@ -147,70 +147,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; -@@ -218,14 +218,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; -@@ -233,67 +233,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; - } -@@ -305,7 +305,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"); - } - -@@ -378,7 +378,7 @@ - .next = NULL, - .name = "ipp2p", - .family = PF_INET, -- .version = IPTABLES_VERSION, -+ .version = XTABLES_VERSION, - .size = XT_ALIGN(sizeof(struct ipt_p2p_info)), - .userspacesize = XT_ALIGN(sizeof(struct ipt_p2p_info)), - .help = &help, diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.30.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.30.patch deleted file mode 100644 index 93cbf21d2d2a..000000000000 --- a/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.30.patch +++ /dev/null @@ -1,149 +0,0 @@ -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 11:52:00.000000000 +0200 -+++ ipp2p-0.8.2/ipt_ipp2p.c 2009-09-20 14:37:00.000000000 +0200 -@@ -2,9 +2,18 @@ - #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 -+# define ipt_match xt_match -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) */ -+# 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> -@@ -725,8 +734,15 @@ - }; - - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+static bool -+#else - static int -+#endif - match(const struct sk_buff *skb, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) -+ const struct xt_match_param *params -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ - const struct net_device *in, - const struct net_device *out, - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) -@@ -734,21 +750,36 @@ - const void *matchinfo, - int offset, - unsigned int myprotoff, --#else -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) */ - const void *matchinfo, - int offset, --#endif -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) */ - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - const void *hdr, - u_int16_t datalen, - #endif - -- int *hotdrop) --{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ bool *hotdrop -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ -+ int *hotdrop -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ -+) -+{ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) -+ const struct ipt_p2p_info *info = params->matchinfo; -+ const int offset = params->fragoff; -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ - const struct ipt_p2p_info *info = matchinfo; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ - unsigned char *haystack; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ struct iphdr *ip = ip_hdr(skb); -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ - struct iphdr *ip = skb->nh.iph; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ - int p2p_result = 0, i = 0; - // int head_len; - int hlen = ntohs(ip->tot_len)-(ip->ihl*4); /*hlen = packet-data length*/ -@@ -822,8 +853,16 @@ - - - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+static bool -+#else - static int --checkentry(const char *tablename, -+#endif -+checkentry( -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) -+ const struct xt_mtchk_param *params -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ -+ const char *tablename, - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) - const void *ip, - const struct xt_match *mymatch, -@@ -831,8 +870,12 @@ - const struct ipt_ip *ip, - #endif - void *matchinfo, -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) - unsigned int matchsize, -- unsigned int hook_mask) -+#endif -+ unsigned int hook_mask -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ -+) - { - /* Must specify -p tcp */ - /* if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) { -@@ -843,15 +886,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 +894,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-r5.ebuild b/net-firewall/ipp2p/ipp2p-0.8.2-r5.ebuild deleted file mode 100644 index d7e9204e2715..000000000000 --- a/net-firewall/ipp2p/ipp2p-0.8.2-r5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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-r5.ebuild,v 1.1 2009/09/20 12:58:23 mrness Exp $ - -EAPI="2" - -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" - -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_prepare() { - epatch "${FILESDIR}"/${P}-kernel-2.6.30.patch - convert_to_m Makefile - - sed -i -e "s/^IPTABLES_VERSION/#IPTABLES_VERSION/" Makefile - - 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() { - 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() { - 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 - linux-mod_src_install -} - -pkg_postinst() { - linux-mod_pkg_postinst -} diff --git a/net-firewall/ipp2p/metadata.xml b/net-firewall/ipp2p/metadata.xml deleted file mode 100644 index 405f54dc5092..000000000000 --- a/net-firewall/ipp2p/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>mrness@gentoo.org</email> - <name>Alin Năstac</name> - <description>Secondary maintainer</description> -</maintainer> -<longdescription>IPP2P uses suitable search patterns to identify P2P traffic thus allowing -the reliable identification of traffic belonging to many P2P networks. Once identified one -may handle P2P traffic in different ways - dropping such traffic, putting into low priority -classes or shaping to a given bandwidth limit is possible. Reducing costs, freeing network -resources and therefore improving network performance is often the result of using IPP2P.</longdescription> -</pkgmetadata> |