Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/arptables/, net-firewall/arptables/files/
Date: Wed, 09 May 2018 11:05:24
Message-Id: 1525863907.9dacb769388e9ebcf0f852008832d161e2cd01ed.zlogene@gentoo
1 commit: 9dacb769388e9ebcf0f852008832d161e2cd01ed
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 9 11:05:07 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed May 9 11:05:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dacb769
7
8 net-firewall/arptables: Drop old
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 net-firewall/arptables/Manifest | 1 -
13 net-firewall/arptables/arptables-0.0.3.4-r2.ebuild | 38 ----------------------
14 .../files/arptables-0.0.3.4-arptables_save.patch | 24 --------------
15 .../files/arptables-0.0.3.4-ldflags.patch | 13 --------
16 .../files/arptables-0.0.3.4-manpage.patch | 12 -------
17 .../arptables/files/arptables-0.0.3.4-type.patch | 17 ----------
18 6 files changed, 105 deletions(-)
19
20 diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
21 index 6ecca60a894..b2363806184 100644
22 --- a/net-firewall/arptables/Manifest
23 +++ b/net-firewall/arptables/Manifest
24 @@ -1,2 +1 @@
25 -DIST arptables-v0.0.3-4.tar.gz 44335 BLAKE2B a5764ad0976cddd10d0fc727609a5d6d68bd19422900401040990d464940c87855b82e8da994a23e62a233ace2a7f1fdecc20161855ed41925f34cf1e796a29f SHA512 a566b6df5c4b22c9c15d22c3801763e640f15b76043123c4ca8db1cc753a20a99b8b7b6dae2f0d9277cc6c49bcb269ba481958bcff3f6a516c7c9d8b553d35b5
26 DIST arptables-v0.0.4.tar.gz 45380 BLAKE2B a256aa280aa65fae8c5b17477fedb3fed4973e8d76746d5832184858b77111eb22bec63211a1ddfb74d25bdc23b0f237caf5ac7effa85433d0f63c51e23a3ef1 SHA512 bd84e93ab5e0a038753aa17dae9e1f48364f2d2b1492dce2edac117e21edd5aa912be7b9e21bf4fb3698031d2f765a75fa067fe10ce20a1c8951ae7efcc5dbbd
27
28 diff --git a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
29 deleted file mode 100644
30 index 14b31b9b264..00000000000
31 --- a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
32 +++ /dev/null
33 @@ -1,38 +0,0 @@
34 -# Copyright 1999-2011 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="2"
38 -inherit versionator eutils
39 -
40 -MY_P=${PN}-v$(replace_version_separator 3 - )
41 -
42 -DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
43 -HOMEPAGE="http://ebtables.sourceforge.net/"
44 -SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="amd64 ppc x86"
49 -IUSE=""
50 -
51 -S=${WORKDIR}/${MY_P}
52 -
53 -src_prepare() {
54 - epatch "${FILESDIR}/${P}-ldflags.patch"
55 - epatch "${FILESDIR}/${P}-arptables_save.patch"
56 - epatch "${FILESDIR}/${P}-manpage.patch"
57 - epatch "${FILESDIR}/${P}-type.patch"
58 -}
59 -
60 -src_compile() {
61 - # -O0 does not work and at least -O2 is required, bug #240752
62 - emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}" || die "make failed"
63 - sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
64 - || die "sed failed"
65 -}
66 -
67 -src_install() {
68 - into /
69 - dosbin arptables arptables-restore arptables-save || die
70 - doman arptables.8 || die
71 -}
72
73 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
74 deleted file mode 100644
75 index a1b60b24ea1..00000000000
76 --- a/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
77 +++ /dev/null
78 @@ -1,24 +0,0 @@
79 -# Don't resolve host names and don't convert '*' interface names to any.
80 -# Remove '*' interface names.
81 -
82 -diff -urNad arptables-0.0.3.3~/arptables-save arptables-0.0.3.3/arptables-save
83 ---- arptables-0.0.3.3~/arptables-save 2009-08-19 14:17:17.000000000 +0200
84 -+++ arptables-0.0.3.3/arptables-save 2009-08-19 14:19:58.000000000 +0200
85 -@@ -35,6 +35,8 @@
86 - # Due to arptables "issues" with displaying device names
87 - # we need to use -v and then do some processing
88 - $line =~ s/\s,\s.*//;
89 -+ $line =~ s/-i\s\*//;
90 -+ $line =~ s/-o\s\*//;
91 - $rules = $rules . "-A $chain $line\n";
92 - }
93 -
94 -@@ -47,7 +49,7 @@
95 - # ========================================================
96 -
97 - unless (-x "$tool") { print "ERROR: Tool $tool isn't executable"; exit -1; };
98 --$table =`$tool -t filter -L -v`;
99 -+$table =`$tool -t filter -L -v -n`;
100 - unless ($? == 0) { print $table; exit -1 };
101 - &process_table($table);
102 -
103
104 diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch b/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch
105 deleted file mode 100644
106 index b5ced69c504..00000000000
107 --- a/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch
108 +++ /dev/null
109 @@ -1,13 +0,0 @@
110 -=== modified file 'Makefile'
111 ---- Makefile 2010-09-15 11:51:49 +0000
112 -+++ Makefile 2010-09-15 11:52:56 +0000
113 -@@ -31,7 +31,7 @@
114 - $(CC) $(CFLAGS) -c -o $@ $<
115 -
116 - arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
117 -- $(CC) $(CFLAGS) -o $@ $^
118 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
119 -
120 - $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
121 - mkdir -p $(@D)
122 -
123
124 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
125 deleted file mode 100644
126 index 76295b6d9b5..00000000000
127 --- a/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
128 +++ /dev/null
129 @@ -1,12 +0,0 @@
130 -diff -urNad arptables-0.0.3.3~/arptables.8 arptables-0.0.3.3/arptables.8
131 ---- arptables-0.0.3.3~/arptables.8 2007-08-19 15:04:51.000000000 +0200
132 -+++ arptables-0.0.3.3/arptables.8 2008-05-08 18:56:35.000000000 +0200
133 -@@ -22,7 +22,7 @@
134 - .\"
135 - .\"
136 - .SH NAME
137 --arptables (v.0.0.3-3) \- ARP table administration
138 -+arptables \- ARP table administration
139 - .SH SYNOPSIS
140 - .BR "arptables " [ "-t table" ] " -" [ AD ] " chain rule-specification " [ options ]
141 - .br
142
143 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
144 deleted file mode 100644
145 index 851bf0ee247..00000000000
146 --- a/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
147 +++ /dev/null
148 @@ -1,17 +0,0 @@
149 -# Patch from Jeroen van Wolffelaar <jeroen@××××××××××.nl> to make
150 -# arptables --proto-type also accept hexadecimal inputs (ethernet protocol
151 -# numbers are often specfied in hex, not decimal), using standard strtol()
152 -# behaviour (hex iff starts with 0x).
153 -
154 -diff -urNad arptables-0.0.3.3~/arptables.c arptables-0.0.3.3/arptables.c
155 ---- arptables-0.0.3.3~/arptables.c 2007-08-19 15:04:51.000000000 +0200
156 -+++ arptables-0.0.3.3/arptables.c 2008-05-08 19:16:43.000000000 +0200
157 -@@ -2039,7 +2039,7 @@
158 - check_inverse(optarg, &invert, &optind, argc);
159 - set_option(&options, OPT_P_TYPE, &fw.arp.invflags,
160 - invert);
161 -- if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 10)) {
162 -+ if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 0)) {
163 - if (strcasecmp(argv[optind-1], "ipv4"))
164 - exit_error(PARAMETER_PROBLEM, "Problem with specified protocol type");
165 - fw.arp.arpro = htons(0x800);