[patch] arptables: some patches from debian

[Peter Volkov <pva@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 644 bytes --]

Hi again. What is the best way to contact arptables developers? My
previous patch was left without attention, should I resend it? In
attachment there are three fixes from debian:

1. arptables_save patch makes arp_tables don't resolve host names and
don't convert '*' interface names to any. Remove '*' interface names.
2. manpage patch removes old version from man page
3. is a patch from Jeroen van Wolffelaar to make arptables --proto-type
also accept hexadecimal inputs (ethernet protocol numbers are often
specfied in hex, not decimal), using standard strtol() behaviour (hex
iff starts with 0x).

Please, apply.
-- 
Peter.

[-- Attachment #1.2: arptables-0.0.3.4-arptables_save.patch --]
[-- Type: text/x-patch, Size: 917 bytes --]

# Don't resolve host names and don't convert '*' interface names to any.
# Remove '*' interface names.

diff -urNad arptables-0.0.3.3~/arptables-save arptables-0.0.3.3/arptables-save
--- arptables-0.0.3.3~/arptables-save	2009-08-19 14:17:17.000000000 +0200
+++ arptables-0.0.3.3/arptables-save	2009-08-19 14:19:58.000000000 +0200
@@ -35,6 +35,8 @@
 	# Due to arptables "issues" with displaying device names
         # we need to use -v and then do some processing
 	$line =~ s/\s,\s.*//;
+	$line =~ s/-i\s\*//;
+	$line =~ s/-o\s\*//;
         $rules = $rules . "-A $chain $line\n";
     }
 
@@ -47,7 +49,7 @@
 # ========================================================
 
 unless (-x "$tool") { print "ERROR: Tool $tool isn't executable"; exit -1; };
-$table =`$tool -t filter -L -v`;
+$table =`$tool -t filter -L -v -n`;
 unless ($? == 0) { print $table; exit -1 };
 &process_table($table);
 

[-- Attachment #1.3: arptables-0.0.3.4-manpage.patch --]
[-- Type: text/x-patch, Size: 459 bytes --]

diff -urNad arptables-0.0.3.3~/arptables.8 arptables-0.0.3.3/arptables.8
--- arptables-0.0.3.3~/arptables.8	2007-08-19 15:04:51.000000000 +0200
+++ arptables-0.0.3.3/arptables.8	2008-05-08 18:56:35.000000000 +0200
@@ -22,7 +22,7 @@
 .\"
 .\"
 .SH NAME
-arptables (v.0.0.3-3) \- ARP table administration
+arptables \- ARP table administration
 .SH SYNOPSIS
 .BR "arptables " [ "-t table" ] " -" [ AD ] " chain rule-specification " [ options ]
 .br

[-- Attachment #1.4: arptables-0.0.3.4-type.patch --]
[-- Type: text/x-patch, Size: 952 bytes --]

# Patch from Jeroen van Wolffelaar <jeroen@wolffelaar.nl> to make
# arptables --proto-type also accept hexadecimal inputs (ethernet protocol
# numbers are often specfied in hex, not decimal), using standard strtol()
# behaviour (hex iff starts with 0x).

diff -urNad arptables-0.0.3.3~/arptables.c arptables-0.0.3.3/arptables.c
--- arptables-0.0.3.3~/arptables.c	2007-08-19 15:04:51.000000000 +0200
+++ arptables-0.0.3.3/arptables.c	2008-05-08 19:16:43.000000000 +0200
@@ -2039,7 +2039,7 @@
 			check_inverse(optarg, &invert, &optind, argc);
 			set_option(&options, OPT_P_TYPE, &fw.arp.invflags,
 				   invert);
-			if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 10)) {
+			if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 0)) {
 				if (strcasecmp(argv[optind-1], "ipv4"))
 					exit_error(PARAMETER_PROBLEM, "Problem with specified protocol type");
 				fw.arp.arpro = htons(0x800);

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]