1 |
commit: 070fae35cc6d85cdb9c35b92b476394e17c8c144 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 20 13:53:28 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 20 13:54:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070fae35 |
7 |
|
8 |
net-firewall/iptables: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-firewall/iptables/Manifest | 1 - |
14 |
.../iptables/files/iptables-1.4.21-configure.patch | 34 ------- |
15 |
.../iptables-1.4.21-static-connlabel-config.patch | 77 --------------- |
16 |
net-firewall/iptables/iptables-1.4.21-r1.ebuild | 93 ------------------ |
17 |
net-firewall/iptables/iptables-1.4.21-r5.ebuild | 104 --------------------- |
18 |
5 files changed, 309 deletions(-) |
19 |
|
20 |
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest |
21 |
index 8808dd33a3a..2d94c7883a8 100644 |
22 |
--- a/net-firewall/iptables/Manifest |
23 |
+++ b/net-firewall/iptables/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST iptables-1.4.21.tar.bz2 547439 BLAKE2B e30f25581a118b91781dcc02761d4c8c420fb19876ec9e8ade3aff22b574931065f9a1c1ec31983a444c406dd928c47673d02698553da85c3db4f31484b1597d SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b |
26 |
DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8 |
27 |
DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86ded14834a45db21b964d82840b62216ce3cea4ae4960e8c5f0671df3cc6bfb222f68d29cf3a8c99e0eee14bf017 SHA512 04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0 |
28 |
DIST iptables-1.8.1.tar.bz2 678706 BLAKE2B 671e7329cc07dae0fbc54c1f6061bc148c4823e1f675369ee36a7cd2346cc1a9a516d5aa2e8a3506d5400027c1ba306cbe426940894117710bc61aacd256fccd SHA512 96a896b6dd26c2d0b4e1672d428ea3c3aab0a3c9e56a896af3a2b8428c4212d7378ba555e0be198b0ccb3fd370bca529466ab8b4edc1777eb7deed600d3f0e11 |
29 |
|
30 |
diff --git a/net-firewall/iptables/files/iptables-1.4.21-configure.patch b/net-firewall/iptables/files/iptables-1.4.21-configure.patch |
31 |
deleted file mode 100644 |
32 |
index e827885f168..00000000000 |
33 |
--- a/net-firewall/iptables/files/iptables-1.4.21-configure.patch |
34 |
+++ /dev/null |
35 |
@@ -1,34 +0,0 @@ |
36 |
-https://bugs.gentoo.org/557586 |
37 |
- |
38 |
-From b24e59fba39120bfdb9e521bbd0af8f33a60466e Mon Sep 17 00:00:00 2001 |
39 |
-From: Mike Frysinger <vapier@g.o> |
40 |
-Date: Sat, 15 Aug 2015 14:12:39 -0400 |
41 |
-Subject: [PATCH] configure: fix 3rd arg w/AC_ARG_ENABLE |
42 |
- |
43 |
-The 3rd arg is used when --{enable,disable}-foo are passed in, not when |
44 |
-the feature is enabled. Use the existing $enableval instead. |
45 |
- |
46 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
47 |
---- |
48 |
- configure.ac | 4 ++-- |
49 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
50 |
- |
51 |
---- a/configure |
52 |
-+++ b/configure |
53 |
-@@ -11898,14 +11898,14 @@ fi |
54 |
- |
55 |
- # Check whether --enable-bpf-compiler was given. |
56 |
- if test "${enable_bpf_compiler+set}" = set; then : |
57 |
-- enableval=$enable_bpf_compiler; enable_bpfc="yes" |
58 |
-+ enableval=$enable_bpf_compiler; enable_bpfc="$enableval" |
59 |
- else |
60 |
- enable_bpfc="no" |
61 |
- fi |
62 |
- |
63 |
- # Check whether --enable-nfsynproxy was given. |
64 |
- if test "${enable_nfsynproxy+set}" = set; then : |
65 |
-- enableval=$enable_nfsynproxy; enable_nfsynproxy="yes" |
66 |
-+ enableval=$enable_nfsynproxy; enable_nfsynproxy="$enableval" |
67 |
- else |
68 |
- enable_nfsynproxy="no" |
69 |
- fi |
70 |
|
71 |
diff --git a/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch b/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch |
72 |
deleted file mode 100644 |
73 |
index a4183d6d402..00000000000 |
74 |
--- a/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch |
75 |
+++ /dev/null |
76 |
@@ -1,77 +0,0 @@ |
77 |
-https://bugs.gentoo.org/558234 |
78 |
-http://git.netfilter.org/iptables/commit/?id=825fbda5482a7d5ec5a6619c81fe07ff865c7d6e |
79 |
- |
80 |
-From 825fbda5482a7d5ec5a6619c81fe07ff865c7d6e Mon Sep 17 00:00:00 2001 |
81 |
-From: Florian Westphal <fw@××××××.de> |
82 |
-Date: Fri, 5 Sep 2014 20:45:56 +0200 |
83 |
-Subject: [PATCH] extensions: libxt_connlabel: do not open config file from |
84 |
- _init hook |
85 |
- |
86 |
-else, static builds will print this for every iptables invocation, |
87 |
-even 'iptables -L'. Delay open until we need to translate a mapping. |
88 |
- |
89 |
-Reported-by: Thomas De Schampheleire <patrickdepinguin@×××××.com> |
90 |
-Signed-off-by: Florian Westphal <fw@××××××.de> |
91 |
---- |
92 |
- extensions/libxt_connlabel.c | 27 ++++++++++++++++++++------- |
93 |
- 1 file changed, 20 insertions(+), 7 deletions(-) |
94 |
- |
95 |
-diff --git a/extensions/libxt_connlabel.c b/extensions/libxt_connlabel.c |
96 |
-index c84a167..1f83095 100644 |
97 |
---- a/extensions/libxt_connlabel.c |
98 |
-+++ b/extensions/libxt_connlabel.c |
99 |
-@@ -29,11 +29,26 @@ static const struct xt_option_entry connlabel_mt_opts[] = { |
100 |
- XTOPT_TABLEEND, |
101 |
- }; |
102 |
- |
103 |
-+/* cannot do this via _init, else static builds might spew error message |
104 |
-+ * for every iptables invocation. |
105 |
-+ */ |
106 |
-+static void connlabel_open(void) |
107 |
-+{ |
108 |
-+ if (map) |
109 |
-+ return; |
110 |
-+ |
111 |
-+ map = nfct_labelmap_new(NULL); |
112 |
-+ if (!map && errno) |
113 |
-+ xtables_error(RESOURCE_PROBLEM, "cannot open connlabel.conf: %s\n", |
114 |
-+ strerror(errno)); |
115 |
-+} |
116 |
-+ |
117 |
- static void connlabel_mt_parse(struct xt_option_call *cb) |
118 |
- { |
119 |
- struct xt_connlabel_mtinfo *info = cb->data; |
120 |
- int tmp; |
121 |
- |
122 |
-+ connlabel_open(); |
123 |
- xtables_option_parse(cb); |
124 |
- |
125 |
- switch (cb->entry->id) { |
126 |
-@@ -54,7 +69,11 @@ static void connlabel_mt_parse(struct xt_option_call *cb) |
127 |
- |
128 |
- static const char *connlabel_get_name(int b) |
129 |
- { |
130 |
-- const char *name = nfct_labelmap_get_name(map, b); |
131 |
-+ const char *name; |
132 |
-+ |
133 |
-+ connlabel_open(); |
134 |
-+ |
135 |
-+ name = nfct_labelmap_get_name(map, b); |
136 |
- if (name && strcmp(name, "")) |
137 |
- return name; |
138 |
- return NULL; |
139 |
-@@ -114,11 +133,5 @@ static struct xtables_match connlabel_mt_reg = { |
140 |
- |
141 |
- void _init(void) |
142 |
- { |
143 |
-- map = nfct_labelmap_new(NULL); |
144 |
-- if (!map) { |
145 |
-- fprintf(stderr, "cannot open connlabel.conf, not registering '%s' match: %s\n", |
146 |
-- connlabel_mt_reg.name, strerror(errno)); |
147 |
-- return; |
148 |
-- } |
149 |
- xtables_register_match(&connlabel_mt_reg); |
150 |
- } |
151 |
--- |
152 |
-2.4.4 |
153 |
- |
154 |
|
155 |
diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild |
156 |
deleted file mode 100644 |
157 |
index 47f4a175748..00000000000 |
158 |
--- a/net-firewall/iptables/iptables-1.4.21-r1.ebuild |
159 |
+++ /dev/null |
160 |
@@ -1,93 +0,0 @@ |
161 |
-# Copyright 1999-2018 Gentoo Foundation |
162 |
-# Distributed under the terms of the GNU General Public License v2 |
163 |
- |
164 |
-EAPI="5" |
165 |
- |
166 |
-# Force users doing their own patches to install their own tools |
167 |
-AUTOTOOLS_AUTO_DEPEND=no |
168 |
- |
169 |
-inherit eutils multilib systemd toolchain-funcs autotools |
170 |
- |
171 |
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" |
172 |
-HOMEPAGE="https://www.netfilter.org/projects/iptables/" |
173 |
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2" |
174 |
- |
175 |
-LICENSE="GPL-2" |
176 |
-SLOT="0" |
177 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" |
178 |
-IUSE="conntrack ipv6 netlink static-libs" |
179 |
- |
180 |
-RDEPEND=" |
181 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
182 |
- netlink? ( net-libs/libnfnetlink ) |
183 |
-" |
184 |
-DEPEND="${RDEPEND} |
185 |
- virtual/os-headers |
186 |
- virtual/pkgconfig |
187 |
-" |
188 |
- |
189 |
-src_prepare() { |
190 |
- # use the saner headers from the kernel |
191 |
- rm -f include/linux/{kernel,types}.h |
192 |
- |
193 |
- # Only run autotools if user patched something |
194 |
- epatch_user && eautoreconf || elibtoolize |
195 |
-} |
196 |
- |
197 |
-src_configure() { |
198 |
- # Some libs use $(AR) rather than libtool to build #444282 |
199 |
- tc-export AR |
200 |
- |
201 |
- sed -i \ |
202 |
- -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \ |
203 |
- -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \ |
204 |
- configure || die |
205 |
- |
206 |
- econf \ |
207 |
- --sbindir="${EPREFIX}/sbin" \ |
208 |
- --libexecdir="${EPREFIX}/$(get_libdir)" \ |
209 |
- --enable-devel \ |
210 |
- --enable-shared \ |
211 |
- $(use_enable static-libs static) \ |
212 |
- $(use_enable ipv6) |
213 |
-} |
214 |
- |
215 |
-src_compile() { |
216 |
- emake V=1 |
217 |
-} |
218 |
- |
219 |
-src_install() { |
220 |
- default |
221 |
- dodoc INCOMPATIBILITIES iptables/iptables.xslt |
222 |
- |
223 |
- # all the iptables binaries are in /sbin, so might as well |
224 |
- # put these small files in with them |
225 |
- into / |
226 |
- dosbin iptables/iptables-apply |
227 |
- dosym iptables-apply /sbin/ip6tables-apply |
228 |
- doman iptables/iptables-apply.8 |
229 |
- |
230 |
- insinto /usr/include |
231 |
- doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) |
232 |
- insinto /usr/include/iptables |
233 |
- doins include/iptables/internal.h |
234 |
- |
235 |
- keepdir /var/lib/iptables |
236 |
- newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables |
237 |
- newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables |
238 |
- if use ipv6 ; then |
239 |
- keepdir /var/lib/ip6tables |
240 |
- newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables |
241 |
- newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables |
242 |
- fi |
243 |
- |
244 |
- systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service |
245 |
- if use ipv6 ; then |
246 |
- systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service |
247 |
- fi |
248 |
- |
249 |
- # Move important libs to /lib #332175 |
250 |
- gen_usr_ldscript -a ip{4,6}tc iptc xtables |
251 |
- |
252 |
- prune_libtool_files |
253 |
-} |
254 |
|
255 |
diff --git a/net-firewall/iptables/iptables-1.4.21-r5.ebuild b/net-firewall/iptables/iptables-1.4.21-r5.ebuild |
256 |
deleted file mode 100644 |
257 |
index 6dbce98c427..00000000000 |
258 |
--- a/net-firewall/iptables/iptables-1.4.21-r5.ebuild |
259 |
+++ /dev/null |
260 |
@@ -1,104 +0,0 @@ |
261 |
-# Copyright 1999-2018 Gentoo Foundation |
262 |
-# Distributed under the terms of the GNU General Public License v2 |
263 |
- |
264 |
-EAPI="5" |
265 |
- |
266 |
-# Force users doing their own patches to install their own tools |
267 |
-AUTOTOOLS_AUTO_DEPEND=no |
268 |
- |
269 |
-inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic |
270 |
- |
271 |
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" |
272 |
-HOMEPAGE="https://www.netfilter.org/projects/iptables/" |
273 |
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2" |
274 |
- |
275 |
-LICENSE="GPL-2" |
276 |
-# Subslot tracks libxtables as that's the one other packages generally link |
277 |
-# against and iptables changes. Will have to revisit if other sonames change. |
278 |
-SLOT="0/10" |
279 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
280 |
-IUSE="conntrack ipv6 netlink pcap static-libs" |
281 |
- |
282 |
-RDEPEND=" |
283 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
284 |
- netlink? ( net-libs/libnfnetlink ) |
285 |
- pcap? ( net-libs/libpcap ) |
286 |
-" |
287 |
-DEPEND="${RDEPEND} |
288 |
- virtual/os-headers |
289 |
- virtual/pkgconfig |
290 |
-" |
291 |
- |
292 |
-src_prepare() { |
293 |
- # use the saner headers from the kernel |
294 |
- rm -f include/linux/{kernel,types}.h |
295 |
- |
296 |
- epatch "${FILESDIR}"/${P}-configure.patch #557586 |
297 |
- epatch "${FILESDIR}"/${P}-static-connlabel-config.patch #558234 |
298 |
- |
299 |
- # Only run autotools if user patched something |
300 |
- epatch_user && eautoreconf || elibtoolize |
301 |
-} |
302 |
- |
303 |
-src_configure() { |
304 |
- # Some libs use $(AR) rather than libtool to build #444282 |
305 |
- tc-export AR |
306 |
- |
307 |
- # Hack around struct mismatches between userland & kernel for some ABIs. #472388 |
308 |
- use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct |
309 |
- |
310 |
- sed -i \ |
311 |
- -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \ |
312 |
- -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \ |
313 |
- configure || die |
314 |
- |
315 |
- econf \ |
316 |
- --sbindir="${EPREFIX}/sbin" \ |
317 |
- --libexecdir="${EPREFIX}/$(get_libdir)" \ |
318 |
- --enable-devel \ |
319 |
- --enable-shared \ |
320 |
- $(use_enable pcap bpf-compiler) \ |
321 |
- $(use_enable pcap nfsynproxy) \ |
322 |
- $(use_enable static-libs static) \ |
323 |
- $(use_enable ipv6) |
324 |
-} |
325 |
- |
326 |
-src_compile() { |
327 |
- emake V=1 |
328 |
-} |
329 |
- |
330 |
-src_install() { |
331 |
- default |
332 |
- dodoc INCOMPATIBILITIES iptables/iptables.xslt |
333 |
- |
334 |
- # all the iptables binaries are in /sbin, so might as well |
335 |
- # put these small files in with them |
336 |
- into / |
337 |
- dosbin iptables/iptables-apply |
338 |
- dosym iptables-apply /sbin/ip6tables-apply |
339 |
- doman iptables/iptables-apply.8 |
340 |
- |
341 |
- insinto /usr/include |
342 |
- doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) |
343 |
- insinto /usr/include/iptables |
344 |
- doins include/iptables/internal.h |
345 |
- |
346 |
- keepdir /var/lib/iptables |
347 |
- newinitd "${FILESDIR}"/${PN}.init iptables |
348 |
- newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables |
349 |
- if use ipv6 ; then |
350 |
- keepdir /var/lib/ip6tables |
351 |
- newinitd "${FILESDIR}"/iptables.init ip6tables |
352 |
- newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables |
353 |
- fi |
354 |
- |
355 |
- systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service |
356 |
- if use ipv6 ; then |
357 |
- systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service |
358 |
- fi |
359 |
- |
360 |
- # Move important libs to /lib #332175 |
361 |
- gen_usr_ldscript -a ip{4,6}tc iptc xtables |
362 |
- |
363 |
- prune_libtool_files |
364 |
-} |