Fixed arptables-save, bug #339377, thank Alexey Vlasov for report. Borrowed some additional patches from debian.

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

6 files changed, 107 insertions, 2 deletions

diff --git a/net-firewall/arptables/ChangeLog b/net-firewall/arptables/ChangeLog
index e3bb042796ca..fc9d1ab97921 100644
--- a/net-firewall/arptables/ChangeLog
+++ b/net-firewall/arptables/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/arptables
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/ChangeLog,v 1.16 2010/09/15 13:51:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/ChangeLog,v 1.17 2010/10/09 13:10:07 pva Exp $
+
+*arptables-0.0.3.4-r2 (09 Oct 2010)
+
+  09 Oct 2010; Peter Volkov <pva@gentoo.org> +arptables-0.0.3.4-r2.ebuild,
+  +files/arptables-0.0.3.4-arptables_save.patch,
+  +files/arptables-0.0.3.4-manpage.patch,
+  +files/arptables-0.0.3.4-type.patch:
+  Fixed arptables-save, bug #339377, thank Alexey Vlasov for report.
+  Borrowed some additional patches from debian.
 
 *arptables-0.0.3.4-r1 (15 Sep 2010)
 
diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
index a634a658ade9..10ed50835a88 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -1,8 +1,12 @@
+AUX arptables-0.0.3.4-arptables_save.patch 893 RMD160 731ef8faef88352a9c0bb7034e4dbc302a077d49 SHA1 73a270829ac2fb2dde020b1357463ee89553ef0e SHA256 af4559f04a3bbf4f5d40237658871e3cc2f57a6a6ccfdc9d995aa3a0db358770
 AUX arptables-0.0.3.4-ldflags.patch 372 RMD160 3e794e1fc35a59979b6d857221aac184ea5dcae3 SHA1 b5bbfa8d2060ab31e897993679041e5c0298b075 SHA256 76a224ca0c93722f299e5309d708fd69a253edf496c1bfc87be6a55c6d61a55f
+AUX arptables-0.0.3.4-manpage.patch 447 RMD160 ef4e4cccf28e7b0c54ff0b8845a7cc2cdced3c49 SHA1 705a4b8cd4dfa22e60ab10afe9461ca5ef0d7a21 SHA256 b4d9014f2c1619dfb23e7d992b94ca94ff3e7d34a1e044d978a79c0d65e39c25
+AUX arptables-0.0.3.4-type.patch 935 RMD160 54ed4336d012a3dbc250b5e52205277853821b1b SHA1 6467a45ede4f6236ba3d6886d8df400ac34b19f1 SHA256 70c48ecef90b4509859c8e200f5155a9335325be04b00aadc962c74fe73b3817
 DIST arptables-v0.0.3-3.tar.gz 43903 RMD160 227712bd8b6aa7baa6059b4bd7aa11692f101dec SHA1 ebcd8cc84671fddc73d23b59f767f37af7f437ac SHA256 5fe63803a843f8c3d0c7047d8a7d78cb66fed278832090c0f2a42b97de33940f
 DIST arptables-v0.0.3-4.tar.gz 44335 RMD160 655e70ce24280dc426a7458cf462dc6e9c79a2a9 SHA1 df60f2cc701238855e5443167bf40a8c8b96a39a SHA256 e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928
 EBUILD arptables-0.0.3.3-r1.ebuild 932 RMD160 099cb2db51020ba9e0fd3a627eb74644ef5d99a7 SHA1 26db1f9b899ffdc52543c7c1b834151d71fa62a2 SHA256 ea8c8ff2429a4d4d3b9a27589185d1ee87e0782b93ee38bf0e70d23e8af77b87
 EBUILD arptables-0.0.3.4-r1.ebuild 1011 RMD160 a9270fdaf533697e405b875c59280e76965a3686 SHA1 9909bb4173350fc13782f9650d4ae09711ee3485 SHA256 4e0c2e83823ab9cfac3c308ca09010e2cf0a6bf87b99cc08675aa1db71fcb470
+EBUILD arptables-0.0.3.4-r2.ebuild 1138 RMD160 ee6faae1460b17aebe3a47e71975c311f3b99a7d SHA1 abfed4dc5d5b11c0b180d6ec469611b80673f88f SHA256 196994513330ce9967fd643c8c177a146cce7a5809e6addcb41b0978f059b67c
 EBUILD arptables-0.0.3.4.ebuild 948 RMD160 a99691e31af81152708bbf715aea433295b57de0 SHA1 4227af8cf69ace8d06b4a0fb9c34fb32f6dd2032 SHA256 90725849bd60aa5790673ee3278836850ce3e68afc7756a3f641b3a181bd9019
-MISC ChangeLog 2556 RMD160 2d34bfb69db7e3d18b0e1a3836345908f13b595d SHA1 b4faad74ba21cba64dc49efd0f96000441b716ae SHA256 4923b46055d5a8c45ec7938929e8d63d671327ab7d59fe282a79f7d96d7b9b96
+MISC ChangeLog 2916 RMD160 92f5f9eb927bf8d02f0d44da95a4475e16ed36af SHA1 3493df524c4cf398ea5a90f65a2142753b44c450 SHA256 0cf775e96cf748f2592edad6523bac9c82bfd51ced40032af94faade3ad542f9
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
diff --git a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
new file mode 100644
index 000000000000..31c4ee6978b2
--- /dev/null
+++ b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild,v 1.1 2010/10/09 13:10:15 pva Exp $
+
+EAPI="2"
+inherit versionator eutils
+
+MY_P=${PN}-v$(replace_version_separator 3 - )
+
+DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
+HOMEPAGE="http://ebtables.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-arptables_save.patch"
+	epatch "${FILESDIR}/${P}-manpage.patch"
+	epatch "${FILESDIR}/${P}-type.patch"
+}
+
+src_compile() {
+	# -O0 does not work and at least -O2 is required, bug #240752
+	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}" || die "make failed"
+	sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
+		|| die "sed failed"
+}
+
+src_install() {
+	into /
+	dosbin arptables arptables-restore arptables-save || die
+	doman arptables.8 || die
+}
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch b/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
new file mode 100644
index 000000000000..a1b60b24ea10
--- /dev/null
+++ b/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
@@ -0,0 +1,24 @@
+# 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);
+ 
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch b/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
new file mode 100644
index 000000000000..76295b6d9b5c
--- /dev/null
+++ b/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
@@ -0,0 +1,12 @@
+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
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-type.patch b/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
new file mode 100644
index 000000000000..851bf0ee247f
--- /dev/null
+++ b/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
@@ -0,0 +1,17 @@
+# 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);