| 1 |
pva 10/10/09 13:10:03 |
| 2 |
|
| 3 |
Added: arptables-0.0.3.4-manpage.patch |
| 4 |
arptables-0.0.3.4-arptables_save.patch |
| 5 |
arptables-0.0.3.4-type.patch |
| 6 |
Log: |
| 7 |
Fixed arptables-save, bug #339377, thank Alexey Vlasov for report. Borrowed some additional patches from debian. |
| 8 |
|
| 9 |
(Portage version: 2.1.9.14/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: arptables-0.0.3.4-manpage.patch |
| 18 |
=================================================================== |
| 19 |
diff -urNad arptables-0.0.3.3~/arptables.8 arptables-0.0.3.3/arptables.8 |
| 20 |
--- arptables-0.0.3.3~/arptables.8 2007-08-19 15:04:51.000000000 +0200 |
| 21 |
+++ arptables-0.0.3.3/arptables.8 2008-05-08 18:56:35.000000000 +0200 |
| 22 |
@@ -22,7 +22,7 @@ |
| 23 |
.\" |
| 24 |
.\" |
| 25 |
.SH NAME |
| 26 |
-arptables (v.0.0.3-3) \- ARP table administration |
| 27 |
+arptables \- ARP table administration |
| 28 |
.SH SYNOPSIS |
| 29 |
.BR "arptables " [ "-t table" ] " -" [ AD ] " chain rule-specification " [ options ] |
| 30 |
.br |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: arptables-0.0.3.4-arptables_save.patch |
| 40 |
=================================================================== |
| 41 |
# Don't resolve host names and don't convert '*' interface names to any. |
| 42 |
# Remove '*' interface names. |
| 43 |
|
| 44 |
diff -urNad arptables-0.0.3.3~/arptables-save arptables-0.0.3.3/arptables-save |
| 45 |
--- arptables-0.0.3.3~/arptables-save 2009-08-19 14:17:17.000000000 +0200 |
| 46 |
+++ arptables-0.0.3.3/arptables-save 2009-08-19 14:19:58.000000000 +0200 |
| 47 |
@@ -35,6 +35,8 @@ |
| 48 |
# Due to arptables "issues" with displaying device names |
| 49 |
# we need to use -v and then do some processing |
| 50 |
$line =~ s/\s,\s.*//; |
| 51 |
+ $line =~ s/-i\s\*//; |
| 52 |
+ $line =~ s/-o\s\*//; |
| 53 |
$rules = $rules . "-A $chain $line\n"; |
| 54 |
} |
| 55 |
|
| 56 |
@@ -47,7 +49,7 @@ |
| 57 |
# ======================================================== |
| 58 |
|
| 59 |
unless (-x "$tool") { print "ERROR: Tool $tool isn't executable"; exit -1; }; |
| 60 |
-$table =`$tool -t filter -L -v`; |
| 61 |
+$table =`$tool -t filter -L -v -n`; |
| 62 |
unless ($? == 0) { print $table; exit -1 }; |
| 63 |
&process_table($table); |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.1 net-firewall/arptables/files/arptables-0.0.3.4-type.patch |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/arptables/files/arptables-0.0.3.4-type.patch?rev=1.1&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/arptables/files/arptables-0.0.3.4-type.patch?rev=1.1&content-type=text/plain |
| 72 |
|
| 73 |
Index: arptables-0.0.3.4-type.patch |
| 74 |
=================================================================== |
| 75 |
# Patch from Jeroen van Wolffelaar <jeroen@××××××××××.nl> to make |
| 76 |
# arptables --proto-type also accept hexadecimal inputs (ethernet protocol |
| 77 |
# numbers are often specfied in hex, not decimal), using standard strtol() |
| 78 |
# behaviour (hex iff starts with 0x). |
| 79 |
|
| 80 |
diff -urNad arptables-0.0.3.3~/arptables.c arptables-0.0.3.3/arptables.c |
| 81 |
--- arptables-0.0.3.3~/arptables.c 2007-08-19 15:04:51.000000000 +0200 |
| 82 |
+++ arptables-0.0.3.3/arptables.c 2008-05-08 19:16:43.000000000 +0200 |
| 83 |
@@ -2039,7 +2039,7 @@ |
| 84 |
check_inverse(optarg, &invert, &optind, argc); |
| 85 |
set_option(&options, OPT_P_TYPE, &fw.arp.invflags, |
| 86 |
invert); |
| 87 |
- if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 10)) { |
| 88 |
+ if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 0)) { |
| 89 |
if (strcasecmp(argv[optind-1], "ipv4")) |
| 90 |
exit_error(PARAMETER_PROBLEM, "Problem with specified protocol type"); |
| 91 |
fw.arp.arpro = htons(0x800); |
Archives