| 1 |
mrness 07/12/30 18:28:18 |
| 2 |
|
| 3 |
Modified: ipp2p-0.8.2-kernel-2.6.22.patch |
| 4 |
Added: ipp2p-0.8.2-iptables-1.4.0.patch |
| 5 |
Log: |
| 6 |
Fix incompatibilities with iptables-1.4.0 (#203744). |
| 7 |
(Portage version: 2.1.3.19) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ipp2p-0.8.2-kernel-2.6.22.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-kernel-2.6.22.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ipp2p-0.8.2-kernel-2.6.22.patch 11 Jul 2007 05:04:26 -0000 1.1 |
| 23 |
+++ ipp2p-0.8.2-kernel-2.6.22.patch 30 Dec 2007 18:28:17 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c |
| 26 |
---- ipp2p-0.8.2.orig/ipt_ipp2p.c 2006-09-27 12:52:00.000000000 +0300 |
| 27 |
-+++ ipp2p-0.8.2/ipt_ipp2p.c 2007-07-11 08:00:26.000000000 +0300 |
| 28 |
+--- ipp2p-0.8.2.orig/ipt_ipp2p.c 2007-12-04 07:50:55.000000000 +0200 |
| 29 |
++++ ipp2p-0.8.2/ipt_ipp2p.c 2007-12-04 07:50:43.000000000 +0200 |
| 30 |
@@ -2,9 +2,18 @@ |
| 31 |
#include <linux/modversions.h> |
| 32 |
#endif |
| 33 |
@@ -21,7 +21,27 @@ |
| 34 |
#include "ipt_ipp2p.h" |
| 35 |
#include <net/tcp.h> |
| 36 |
#include <net/udp.h> |
| 37 |
-@@ -748,7 +757,11 @@ |
| 38 |
+@@ -725,7 +734,11 @@ |
| 39 |
+ }; |
| 40 |
+ |
| 41 |
+ |
| 42 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) |
| 43 |
++static bool |
| 44 |
++#else |
| 45 |
+ static int |
| 46 |
++#endif |
| 47 |
+ match(const struct sk_buff *skb, |
| 48 |
+ const struct net_device *in, |
| 49 |
+ const struct net_device *out, |
| 50 |
+@@ -744,11 +757,19 @@ |
| 51 |
+ u_int16_t datalen, |
| 52 |
+ #endif |
| 53 |
+ |
| 54 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) |
| 55 |
++ bool *hotdrop) |
| 56 |
++#else |
| 57 |
+ int *hotdrop) |
| 58 |
++#endif |
| 59 |
{ |
| 60 |
const struct ipt_p2p_info *info = matchinfo; |
| 61 |
unsigned char *haystack; |
| 62 |
@@ -33,7 +53,19 @@ |
| 63 |
int p2p_result = 0, i = 0; |
| 64 |
// int head_len; |
| 65 |
int hlen = ntohs(ip->tot_len)-(ip->ihl*4); /*hlen = packet-data length*/ |
| 66 |
-@@ -831,7 +844,9 @@ |
| 67 |
+@@ -822,7 +843,11 @@ |
| 68 |
+ |
| 69 |
+ |
| 70 |
+ |
| 71 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) |
| 72 |
++static bool |
| 73 |
++#else |
| 74 |
+ static int |
| 75 |
++#endif |
| 76 |
+ checkentry(const char *tablename, |
| 77 |
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) |
| 78 |
+ const void *ip, |
| 79 |
+@@ -831,7 +856,9 @@ |
| 80 |
const struct ipt_ip *ip, |
| 81 |
#endif |
| 82 |
void *matchinfo, |
| 83 |
@@ -43,7 +75,7 @@ |
| 84 |
unsigned int hook_mask) |
| 85 |
{ |
| 86 |
/* Must specify -p tcp */ |
| 87 |
-@@ -843,15 +858,6 @@ |
| 88 |
+@@ -843,15 +870,6 @@ |
| 89 |
} |
| 90 |
|
| 91 |
|
| 92 |
@@ -59,7 +91,7 @@ |
| 93 |
static struct ipt_match ipp2p_match = { |
| 94 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) |
| 95 |
{ NULL, NULL }, |
| 96 |
-@@ -860,17 +866,16 @@ |
| 97 |
+@@ -860,17 +878,16 @@ |
| 98 |
&checkentry, |
| 99 |
NULL, |
| 100 |
THIS_MODULE |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.1 net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch?rev=1.1&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.0.patch?rev=1.1&content-type=text/plain |
| 108 |
|
| 109 |
Index: ipp2p-0.8.2-iptables-1.4.0.patch |
| 110 |
=================================================================== |
| 111 |
diff -Nru ipp2p-0.8.2.orig/libipt_ipp2p.c ipp2p-0.8.2/libipt_ipp2p.c |
| 112 |
--- ipp2p-0.8.2.orig/libipt_ipp2p.c 2006-01-04 18:24:19.000000000 +0200 |
| 113 |
+++ ipp2p-0.8.2/libipt_ipp2p.c 2007-12-30 20:20:26.000000000 +0200 |
| 114 |
@@ -64,12 +64,10 @@ |
| 115 |
|
| 116 |
|
| 117 |
static void |
| 118 |
-init(struct ipt_entry_match *m, unsigned int *nfcache) |
| 119 |
+init(struct ipt_entry_match *m) |
| 120 |
{ |
| 121 |
struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data; |
| 122 |
|
| 123 |
- *nfcache |= NFC_UNKNOWN; |
| 124 |
- |
| 125 |
/*init the module with default values*/ |
| 126 |
info->cmd = 0; |
| 127 |
info->debug = 0; |
| 128 |
@@ -79,8 +77,7 @@ |
| 129 |
|
| 130 |
static int |
| 131 |
parse(int c, char **argv, int invert, unsigned int *flags, |
| 132 |
- const struct ipt_entry *entry, |
| 133 |
- unsigned int *nfcache, |
| 134 |
+ const void *entry, |
| 135 |
struct ipt_entry_match **match) |
| 136 |
{ |
| 137 |
struct ipt_p2p_info *info = (struct ipt_p2p_info *)(*match)->data; |
| 138 |
@@ -315,7 +312,7 @@ |
| 139 |
|
| 140 |
|
| 141 |
static void |
| 142 |
-print(const struct ipt_ip *ip, |
| 143 |
+print(const void *ip, |
| 144 |
const struct ipt_entry_match *match, |
| 145 |
int numeric) |
| 146 |
{ |
| 147 |
@@ -347,7 +344,7 @@ |
| 148 |
|
| 149 |
|
| 150 |
static void |
| 151 |
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match) |
| 152 |
+save(const void *ip, const struct ipt_entry_match *match) |
| 153 |
{ |
| 154 |
struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data; |
| 155 |
|
| 156 |
|
| 157 |
|
| 158 |
|
| 159 |
-- |
| 160 |
gentoo-commits@g.o mailing list |
Archives