summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-05-22 20:19:26 +0000
committerAlin Năstac <mrness@gentoo.org>2007-05-22 20:19:26 +0000
commit187f67d06c97e24c63f0047096f9a4b2a85b67a5 (patch)
tree997b74936144018e27a6442e69bd54d42b619353 /net-firewall
parentRevert previous change, as use flags on meta packages are pointless. (diff)
downloadhistorical-187f67d06c97e24c63f0047096f9a4b2a85b67a5.tar.gz
historical-187f67d06c97e24c63f0047096f9a4b2a85b67a5.tar.bz2
historical-187f67d06c97e24c63f0047096f9a4b2a85b67a5.zip
define ipt_match (bug 179425 comment 5)
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/ipp2p/Manifest14
-rw-r--r--net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.21.patch14
2 files changed, 14 insertions, 14 deletions
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 9a194d0e2ae2..95a4470be1d5 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,10 +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-kernel-2.6.21.patch 2066 RMD160 e5927f91ade4abdaf4191318708e38ae6123db85 SHA1 a2c4ecbf0d016cc25db2410dabebefd9a48f42a9 SHA256 a26004618740016e69d06815991bb955e65b9ca3b68855610538a2664d52787b
+MD5 e3e9b1db626af65eb536cd4d075c2a01 files/ipp2p-0.8.2-kernel-2.6.21.patch 2066
+RMD160 e5927f91ade4abdaf4191318708e38ae6123db85 files/ipp2p-0.8.2-kernel-2.6.21.patch 2066
+SHA256 a26004618740016e69d06815991bb955e65b9ca3b68855610538a2664d52787b files/ipp2p-0.8.2-kernel-2.6.21.patch 2066
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
@@ -35,7 +35,7 @@ SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGUyjcJnxX6mF440QRAhmbAKDyFPkXBQMozo3S9Adzrcm2EqxBdgCfcKOI
-jtFxjCj66M0SNITCehOtCv4=
-=MqbM
+iD8DBQFGU1BYJnxX6mF440QRAsmBAKCKLSAjCVsX2C53Hnd/tUtN/FBItgCgizPI
+NntCM+7VjQw/Dn9i8aKXsgg=
+=lSwO
-----END PGP SIGNATURE-----
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
index 87993a7bb321..22beed6c5763 100644
--- 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
@@ -1,7 +1,6 @@
-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 @@
+--- ipp2p-0.8.2.orig/ipt_ipp2p.c 2006-09-27 06:52:00.000000000 -0300
++++ ipp2p-0.8.2/ipt_ipp2p.c 2007-05-22 15:58:57.000000000 -0300
+@@ -2,9 +2,18 @@
#include <linux/modversions.h>
#endif
#include <linux/module.h>
@@ -12,6 +11,7 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
+# 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
+# include <linux/netfilter_ipv4/ip_tables.h>
//#include <linux/netfilter_ipv4/ipt_ipp2p.h>
@@ -20,7 +20,7 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
#include "ipt_ipp2p.h"
#include <net/tcp.h>
#include <net/udp.h>
-@@ -831,7 +839,9 @@
+@@ -831,7 +840,9 @@
const struct ipt_ip *ip,
#endif
void *matchinfo,
@@ -30,7 +30,7 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
unsigned int hook_mask)
{
/* Must specify -p tcp */
-@@ -843,15 +853,6 @@
+@@ -843,15 +854,6 @@
}
@@ -46,7 +46,7 @@ diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
static struct ipt_match ipp2p_match = {
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
{ NULL, NULL },
-@@ -860,17 +861,16 @@
+@@ -860,17 +862,16 @@
&checkentry,
NULL,
THIS_MODULE