1 |
commit: b244369326ce423219f4a1a79b4ba431803cecac |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 30 18:53:18 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jan 30 18:53:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b2443693 |
7 |
|
8 |
net-firewall/iptables: Remove 1.6.1 |
9 |
|
10 |
Current version doesn't actually need a patch |
11 |
|
12 |
net-firewall/iptables/Manifest | 3 - |
13 |
.../iptables/files/iptables-1.6.1-musl.patch | 13 --- |
14 |
net-firewall/iptables/iptables-1.6.1.ebuild | 116 --------------------- |
15 |
3 files changed, 132 deletions(-) |
16 |
|
17 |
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest |
18 |
index b8db3c2..af369ef 100644 |
19 |
--- a/net-firewall/iptables/Manifest |
20 |
+++ b/net-firewall/iptables/Manifest |
21 |
@@ -2,7 +2,6 @@ AUX ip6tables-1.4.13.confd 690 SHA256 2938fe4206514d9868047bd8f888a699fa2097ca69 |
22 |
AUX iptables-1.4.13-r1.init 2773 SHA256 eca52b98f6d7cc0f74ad2ba65f3a4ea96a0a46424ddab321928c4e82ebf1f5aa SHA512 4e5b555dc32d8358c5a15f50d573c6581c5dc1a726976a46739f13f8f2e0a2524dc6e8faa41d38665cb9068cdfe1785bc91f34104a3bcb0078ad3b1451a418e1 WHIRLPOOL d823437736fcabf54605b7ddbee2c898bb7315cb05f536565714798dea36d66c5141dc4a4dc4a5cff75323f6b09eb361dcd635bc228d8dba4923d5d5159cf779 |
23 |
AUX iptables-1.4.13.confd 687 SHA256 7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 WHIRLPOOL 111b809b3122b04cce8ac0e551cfcdec7fde1ad563e1001bbbb3dbb4cae0ddf13851ece1024e13fb26aab2fe306dfc4fd9e59ab5a10127b301bc7a65ec20486b |
24 |
AUX iptables-1.4.21-musl.patch 2165 SHA256 1f202ca1f6549af674a7a8300376ca2c451aba5dc1a3203a799ab4c1e6fc7c76 SHA512 1460408bc9a3e08d65a2cf208badb55f927974ae8b364b16f20b15c788fab1720ea55b4d1f3d61f3fb8adcfe8f748dbd817b1ed0d9f2ca9f8be94d585980af0f WHIRLPOOL 05d0254a60872dcb1a767d503c784eca534cf66c71bf448f1863e0b88c753eece249a5b56e57f7e2abf5d1fdf14a6f53e55d045b8af2770ca292482dbf877513 |
25 |
-AUX iptables-1.6.1-musl.patch 494 SHA256 787c8a0dc79e6be1d025d8d46f7c2724d8f0f46a8034aa26c36e859496aba441 SHA512 20345147f3b1d794da2d14ee82736b55196bddf9bd0413e7ae6e71c84c280479756e0d32eaf50874380bd03ea83b6ed5046e97dbb944c999be8e97adb88b86e2 WHIRLPOOL cc44f8e9188282cea27ea2b87e3a3df81a28e14a1333ee83935fa3daddb5a9e86502d1da49eedfbe38bd4549d5c325a1db1c9350099cfa263c6d0890563fc541 |
26 |
AUX iptables.init 2794 SHA256 9e83a7dae3a75a4fd58721cf8df2888c661af9e32e478a59a2507d234bd3d95f SHA512 0fccbdd6152ff422d86bab82eea1ddd09f554107f1eab9423e5703ab805930394086ad52717241d767f9793d3e1b4accf7c9539c9431020610711ca5313d9a16 WHIRLPOOL 65a108a045910c97c7d76bf351c4283e9dc19771f54c632351063785251589aeb302ee04b58910e3faf18ee4af208396fc6af69e692b9e3806de394094bbc554 |
27 |
AUX systemd/ip6tables-restore.service 398 SHA256 611fb01a539f421a06d443ac5bec4ee412699021bb8f99bcc52056b825b72baa SHA512 4df4f73b14e123c463003656631d1affa431f722c9f598cdde6a63a531432aa3f97635b32c59aa2e1ddc4b45f500169c88da1c055fccac6c8ce89db23d015a7a WHIRLPOOL eabe0338f58a300ea53c15e09e35f8c1eb10ac9574213fbe30aff75eb350eaa676f0c927a14e24e7b2eaad6b69124645ff0df995204e65f2a23f0bc00d5d2e1c |
28 |
AUX systemd/ip6tables-store.service 243 SHA256 ce93fc2ba81f7693877479ddc75cdec94627c302a140bd27ff30656fad78e72b SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10 WHIRLPOOL d84687a142843fa9cd930171e817652afb22b950214349ca156ba6da174312989973d17fed04cd129c18d4d6fbd5ad3124b9afa0d105d128333248c90fdb4ca6 |
29 |
@@ -11,7 +10,5 @@ AUX systemd/iptables-restore.service 394 SHA256 611debe959039341f2ee93c276290046 |
30 |
AUX systemd/iptables-store.service 240 SHA256 14965fd0f3cd4285e77ea1e3d9975a818b0d64fb0026b925d8434896b2cbf839 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e WHIRLPOOL e3a5b77b2c19ad8445a21cc9c8680c2d632d968483357221fac1c309275bd17aa25c05cf23188d5ae644d5b1266c64b3dd5fe8fbdec9f2a439a212c3d1c767db |
31 |
AUX systemd/iptables.service 130 SHA256 c404c54c98521817aca75b96774a24684e0c7ed2fc8de2ced78f4ae4d8a6b99d SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef WHIRLPOOL 844296866dfe2fe6b1207c99d2f938f4c87a37592e95576f9504fe056fe82fc29878b9aa1a204fa31d6711fbe7ba5cd48f7a639e4839bbe366e6220246a0d3c3 |
32 |
DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200 |
33 |
-DIST iptables-1.6.1.tar.bz2 620890 SHA256 0fc2d7bd5d7be11311726466789d4c65fb4c8e096c9182b56ce97440864f0cf5 SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8 WHIRLPOOL e34fffbad8a5aea278cdfd11f042e2318862f8e6045a94a2eff35e6cb233ec62d030d83838613338ca2d928f6982cebf9665d039ba61218399139745c9cb08f9 |
34 |
EBUILD iptables-1.4.21-r1.ebuild 2484 SHA256 a0b493d89bb704f35e835d8fffd1d73ea8528cfaac3f7288e9b7fc9e3b63e0ae SHA512 8145a17bbcccca9aab848150f4068589f2a67562654dd5923ddce6cfdb1f1488027c9d1db878d0d6c5993e9dab1023a7a57ec28c62c924a78cce99d2380bfc67 WHIRLPOOL ca1591bfe3908d020a38c89085b92b2e5483e83f48e0579aeb897d6ff0af1f52e4f786fe600e704aa131015e978061a1376a98030b52940285b773aaac203d7d |
35 |
-EBUILD iptables-1.6.1.ebuild 3159 SHA256 d9c7887d1134c3ad98b6547f8ccac7bf11114de87657b67f4e12450e35726177 SHA512 f9a95065cd3a9f627f6ad4e86f695348df8821f7f7d31ab9d1f9b05f978ba50c2a814e6f052589f2d829e313e79350482929e04440be16e7ed1f1aedeec56f64 WHIRLPOOL 8cbf0bad8b9669e387998ca44bb6f9d74b0593cc70b654bc92063eef0ff6fc811987b41996e2e6dea06729c418f49d8155282c92993f850082c6198a21fcccd1 |
36 |
MISC metadata.xml 1450 SHA256 12a59ccb10431b7760a10a4421f05fd3763eb14c91d27239f04d9bcacec548ab SHA512 3cd157fddc3a2aeca4ba563509b021ae52f02e23a721488eaf47b2aa701e6fee5ab8432603ca9999e6854b4d8a69950cf1a156104ee5db35f9232302326601f1 WHIRLPOOL 4d48988fd6ec8b53a643206c939789a773ab59253506c4659b83f7d563bd558924845dd04bb03702dff160cc49f72a319fa68b7e1e49988022270eeac7cfe82c |
37 |
|
38 |
diff --git a/net-firewall/iptables/files/iptables-1.6.1-musl.patch b/net-firewall/iptables/files/iptables-1.6.1-musl.patch |
39 |
deleted file mode 100644 |
40 |
index 90b2be3..0000000 |
41 |
--- a/net-firewall/iptables/files/iptables-1.6.1-musl.patch |
42 |
+++ /dev/null |
43 |
@@ -1,13 +0,0 @@ |
44 |
-diff -Naurw iptables-1.6.0.orig/extensions/libip6t_ipv6header.c iptables-1.6.0/extensions/libip6t_ipv6header.c |
45 |
---- iptables-1.6.0.orig/extensions/libip6t_ipv6header.c 2015-12-09 04:55:06.000000000 -0800 |
46 |
-+++ iptables-1.6.0/extensions/libip6t_ipv6header.c 2015-12-23 17:22:56.757094312 -0800 |
47 |
-@@ -10,6 +10,9 @@ |
48 |
- #include <netdb.h> |
49 |
- #include <xtables.h> |
50 |
- #include <linux/netfilter_ipv6/ip6t_ipv6header.h> |
51 |
-+#ifndef IPPROTO_HOPOPTS |
52 |
-+# define IPPROTO_HOPOPTS 0 |
53 |
-+#endif |
54 |
- |
55 |
- enum { |
56 |
- O_HEADER = 0, |
57 |
|
58 |
diff --git a/net-firewall/iptables/iptables-1.6.1.ebuild b/net-firewall/iptables/iptables-1.6.1.ebuild |
59 |
deleted file mode 100644 |
60 |
index 396ed1b..0000000 |
61 |
--- a/net-firewall/iptables/iptables-1.6.1.ebuild |
62 |
+++ /dev/null |
63 |
@@ -1,116 +0,0 @@ |
64 |
-# Copyright 1999-2017 Gentoo Foundation |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Id$ |
67 |
- |
68 |
-EAPI="5" |
69 |
- |
70 |
-# Force users doing their own patches to install their own tools |
71 |
-AUTOTOOLS_AUTO_DEPEND=no |
72 |
- |
73 |
-inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic |
74 |
- |
75 |
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" |
76 |
-HOMEPAGE="http://www.netfilter.org/projects/iptables/" |
77 |
-SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2" |
78 |
- |
79 |
-LICENSE="GPL-2" |
80 |
-# Subslot tracks libxtables as that's the one other packages generally link |
81 |
-# against and iptables changes. Will have to revisit if other sonames change. |
82 |
-SLOT="0/11" |
83 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
84 |
-IUSE="conntrack ipv6 netlink nftables pcap static-libs" |
85 |
- |
86 |
-RDEPEND=" |
87 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
88 |
- netlink? ( net-libs/libnfnetlink ) |
89 |
- nftables? ( |
90 |
- >=net-libs/libmnl-1.0 |
91 |
- >=net-libs/libnftnl-1.0.5 |
92 |
- ) |
93 |
- pcap? ( net-libs/libpcap ) |
94 |
-" |
95 |
-DEPEND="${RDEPEND} |
96 |
- virtual/os-headers |
97 |
- virtual/pkgconfig |
98 |
- nftables? ( |
99 |
- sys-devel/flex |
100 |
- virtual/yacc |
101 |
- ) |
102 |
-" |
103 |
- |
104 |
-src_prepare() { |
105 |
- # use the saner headers from the kernel |
106 |
- rm -f include/linux/{kernel,types}.h |
107 |
- |
108 |
- # Fix for MUSL |
109 |
- epatch "${FILESDIR}"/${P}-musl.patch |
110 |
- |
111 |
- # Only run autotools if user patched something |
112 |
- epatch_user && eautoreconf || elibtoolize |
113 |
-} |
114 |
- |
115 |
-src_configure() { |
116 |
- # Some libs use $(AR) rather than libtool to build #444282 |
117 |
- tc-export AR |
118 |
- |
119 |
- # Hack around struct mismatches between userland & kernel for some ABIs. #472388 |
120 |
- use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct |
121 |
- |
122 |
- sed -i \ |
123 |
- -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \ |
124 |
- -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \ |
125 |
- configure || die |
126 |
- |
127 |
- econf \ |
128 |
- --sbindir="${EPREFIX}/sbin" \ |
129 |
- --libexecdir="${EPREFIX}/$(get_libdir)" \ |
130 |
- --enable-devel \ |
131 |
- --enable-shared \ |
132 |
- $(use_enable nftables) \ |
133 |
- $(use_enable pcap bpf-compiler) \ |
134 |
- $(use_enable pcap nfsynproxy) \ |
135 |
- $(use_enable static-libs static) \ |
136 |
- $(use_enable ipv6) |
137 |
-} |
138 |
- |
139 |
-src_compile() { |
140 |
- # Deal with parallel build errors. |
141 |
- use nftables && emake -C iptables xtables-config-parser.h |
142 |
- emake V=1 |
143 |
-} |
144 |
- |
145 |
-src_install() { |
146 |
- default |
147 |
- dodoc INCOMPATIBILITIES iptables/iptables.xslt |
148 |
- |
149 |
- # all the iptables binaries are in /sbin, so might as well |
150 |
- # put these small files in with them |
151 |
- into / |
152 |
- dosbin iptables/iptables-apply |
153 |
- dosym iptables-apply /sbin/ip6tables-apply |
154 |
- doman iptables/iptables-apply.8 |
155 |
- |
156 |
- insinto /usr/include |
157 |
- doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) |
158 |
- insinto /usr/include/iptables |
159 |
- doins include/iptables/internal.h |
160 |
- |
161 |
- keepdir /var/lib/iptables |
162 |
- newinitd "${FILESDIR}"/${PN}.init iptables |
163 |
- newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables |
164 |
- if use ipv6 ; then |
165 |
- keepdir /var/lib/ip6tables |
166 |
- newinitd "${FILESDIR}"/iptables.init ip6tables |
167 |
- newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables |
168 |
- fi |
169 |
- |
170 |
- systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service |
171 |
- if use ipv6 ; then |
172 |
- systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service |
173 |
- fi |
174 |
- |
175 |
- # Move important libs to /lib #332175 |
176 |
- gen_usr_ldscript -a ip{4,6}tc iptc xtables |
177 |
- |
178 |
- prune_libtool_files |
179 |
-} |