1 |
mrness 09/04/25 11:09:43 |
2 |
|
3 |
Modified: ipp2p-0.8.2-iptables-1.4.3.patch |
4 |
Log: |
5 |
Improve iptables-1.4.3 patch (#265460). |
6 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: ipp2p-0.8.2-iptables-1.4.3.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/files/ipp2p-0.8.2-iptables-1.4.3.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- ipp2p-0.8.2-iptables-1.4.3.patch 10 Apr 2009 22:25:37 -0000 1.1 |
22 |
+++ ipp2p-0.8.2-iptables-1.4.3.patch 25 Apr 2009 11:09:43 -0000 1.2 |
23 |
@@ -1,6 +1,7 @@ |
24 |
---- libipt_ipp2p.c.old 2009-04-08 18:03:26.574089860 +0200 |
25 |
-+++ libipt_ipp2p.c 2009-04-08 18:03:42.871884390 +0200 |
26 |
-@@ -88,39 +88,39 @@ |
27 |
+diff -Nru ipp2p-0.8.2.orig/libipt_ipp2p.c ipp2p-0.8.2/libipt_ipp2p.c |
28 |
+--- ipp2p-0.8.2.orig/libipt_ipp2p.c 2009-04-25 11:05:43.000000000 +0000 |
29 |
++++ ipp2p-0.8.2/libipt_ipp2p.c 2009-04-25 11:06:54.000000000 +0000 |
30 |
+@@ -85,39 +85,39 @@ |
31 |
switch (c) { |
32 |
case '1': /*cmd: ipp2p*/ |
33 |
if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) |
34 |
@@ -49,7 +50,7 @@ |
35 |
*flags += IPP2P_EDK; |
36 |
info->cmd = *flags; |
37 |
break; |
38 |
-@@ -128,21 +128,21 @@ |
39 |
+@@ -125,21 +125,21 @@ |
40 |
|
41 |
case '7': /*cmd: dc*/ |
42 |
if ((*flags & IPP2P_DC) == IPP2P_DC) |
43 |
@@ -76,7 +77,7 @@ |
44 |
*flags += IPP2P_DC; |
45 |
info->cmd = *flags; |
46 |
break; |
47 |
-@@ -150,70 +150,70 @@ |
48 |
+@@ -147,70 +147,70 @@ |
49 |
|
50 |
case '9': /*cmd: gnu*/ |
51 |
if ((*flags & IPP2P_GNU) == IPP2P_GNU) |
52 |
@@ -163,7 +164,7 @@ |
53 |
*flags += IPP2P_APPLE; |
54 |
info->cmd = *flags; |
55 |
break; |
56 |
-@@ -221,14 +221,14 @@ |
57 |
+@@ -218,14 +218,14 @@ |
58 |
|
59 |
case 'd': /*cmd: soul*/ |
60 |
if ((*flags & IPP2P_SOUL) == IPP2P_SOUL) |
61 |
@@ -181,7 +182,7 @@ |
62 |
*flags += IPP2P_SOUL; |
63 |
info->cmd = *flags; |
64 |
break; |
65 |
-@@ -236,67 +236,67 @@ |
66 |
+@@ -233,67 +233,67 @@ |
67 |
|
68 |
case 'e': /*cmd: winmx*/ |
69 |
if ((*flags & IPP2P_WINMX) == IPP2P_WINMX) |
70 |
@@ -263,7 +264,7 @@ |
71 |
// "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n"); |
72 |
return 0; |
73 |
} |
74 |
-@@ -308,7 +308,7 @@ |
75 |
+@@ -305,7 +305,7 @@ |
76 |
final_check(unsigned int flags) |
77 |
{ |
78 |
if (!flags) |
79 |
@@ -272,3 +273,12 @@ |
80 |
"\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n"); |
81 |
} |
82 |
|
83 |
+@@ -378,7 +378,7 @@ |
84 |
+ .next = NULL, |
85 |
+ .name = "ipp2p", |
86 |
+ .family = PF_INET, |
87 |
+- .version = IPTABLES_VERSION, |
88 |
++ .version = XTABLES_VERSION, |
89 |
+ .size = XT_ALIGN(sizeof(struct ipt_p2p_info)), |
90 |
+ .userspacesize = XT_ALIGN(sizeof(struct ipt_p2p_info)), |
91 |
+ .help = &help, |