1 |
commit: 48da1a6befa7654c4bd96a63e879160d714b16ca |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 25 23:24:01 2019 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 25 23:24:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48da1a6b |
7 |
|
8 |
net-firewall/ipset: version bumps |
9 |
|
10 |
Includes intermediate versions for ease of testing over the major |
11 |
upgrade. |
12 |
|
13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
14 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
15 |
|
16 |
net-firewall/ipset/Manifest | 3 ++ |
17 |
net-firewall/ipset/ipset-6.38.ebuild | 99 ++++++++++++++++++++++++++++++++++++ |
18 |
net-firewall/ipset/ipset-7.0.ebuild | 99 ++++++++++++++++++++++++++++++++++++ |
19 |
net-firewall/ipset/ipset-7.1.ebuild | 99 ++++++++++++++++++++++++++++++++++++ |
20 |
4 files changed, 300 insertions(+) |
21 |
|
22 |
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest |
23 |
index f909863eb09..80346c6ee35 100644 |
24 |
--- a/net-firewall/ipset/Manifest |
25 |
+++ b/net-firewall/ipset/Manifest |
26 |
@@ -2,3 +2,6 @@ DIST ipset-6.29.tar.bz2 542735 BLAKE2B 2229eb802597b38287f49cc2936a8be1afde2f638 |
27 |
DIST ipset-6.30.tar.bz2 544054 BLAKE2B eb9a6368436f0c4a813a6733b2122be975c752aee4d8ac9a2e7a02ebd2da372351c318cf1b0c06c1b389c523cd9572dfe1bff813e23a4e924391f9c7a946b75b SHA512 6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903 |
28 |
DIST ipset-6.32.tar.bz2 544635 BLAKE2B 684354b0b24b15a657b21d44fa58b2cf7823f78d78ccd2b3f1c2d50b9e1396db6ed1414edb69102e3f82810d844ccd5eb738d1a968921b76b20e5d15c6ae5fb1 SHA512 7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7 |
29 |
DIST ipset-6.34.tar.bz2 547940 BLAKE2B a42ad1b0af07250ecae645424d6a9564f16a388da452fa22817318947d114ca6e0a7ac175c2d2ec8a8602529bcefd361a206b083c231c33e96a76570b8ae8bcd SHA512 5a8cd743eee5abdbaba452c3b4508e9f0569a5a5ae83c9aeafb3d92c2c17672b489302a4a0953668c8b6d51cf7e510660b03b9dbd4ccb2deddffa41e6e6db33a |
30 |
+DIST ipset-6.38.tar.bz2 545568 BLAKE2B 14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f SHA512 ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60 |
31 |
+DIST ipset-7.0.tar.bz2 552144 BLAKE2B 722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4 SHA512 4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669 |
32 |
+DIST ipset-7.1.tar.bz2 669520 BLAKE2B 0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699 SHA512 eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854 |
33 |
|
34 |
diff --git a/net-firewall/ipset/ipset-6.38.ebuild b/net-firewall/ipset/ipset-6.38.ebuild |
35 |
new file mode 100644 |
36 |
index 00000000000..b6bd9375ea6 |
37 |
--- /dev/null |
38 |
+++ b/net-firewall/ipset/ipset-6.38.ebuild |
39 |
@@ -0,0 +1,99 @@ |
40 |
+# Copyright 1999-2019 Gentoo Authors |
41 |
+# Distributed under the terms of the GNU General Public License v2 |
42 |
+ |
43 |
+EAPI="6" |
44 |
+MODULES_OPTIONAL_USE=modules |
45 |
+inherit linux-info linux-mod |
46 |
+ |
47 |
+DESCRIPTION="IPset tool for iptables, successor to ippool" |
48 |
+HOMEPAGE="http://ipset.netfilter.org/" |
49 |
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
50 |
+ |
51 |
+LICENSE="GPL-2" |
52 |
+SLOT="0" |
53 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
54 |
+ |
55 |
+RDEPEND=">=net-firewall/iptables-1.4.7 |
56 |
+ net-libs/libmnl" |
57 |
+DEPEND="${RDEPEND}" |
58 |
+ |
59 |
+DOCS=( ChangeLog INSTALL README UPGRADE ) |
60 |
+ |
61 |
+# configurable from outside, e.g. /etc/portage/make.conf |
62 |
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
63 |
+ |
64 |
+BUILD_TARGETS="modules" |
65 |
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
66 |
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
67 |
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do |
68 |
+ MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
69 |
+done |
70 |
+ |
71 |
+pkg_setup() { |
72 |
+ get_version |
73 |
+ CONFIG_CHECK="NETFILTER" |
74 |
+ ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
75 |
+ # It does still build without NET_NS, but it may be needed in future. |
76 |
+ #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" |
77 |
+ #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." |
78 |
+ CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" |
79 |
+ ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" |
80 |
+ |
81 |
+ build_modules=0 |
82 |
+ if use modules; then |
83 |
+ if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
84 |
+ if linux_chkconfig_present "IP_NF_SET" || \ |
85 |
+ linux_chkconfig_present "IP_SET"; then #274577 |
86 |
+ eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
87 |
+ eerror "Please either build ipset with modules USE flag disabled" |
88 |
+ eerror "or rebuild kernel without IP_SET support and make sure" |
89 |
+ eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
90 |
+ die "USE=modules and in-kernel ipset support detected." |
91 |
+ else |
92 |
+ einfo "Modular kernel detected. Gonna build kernel modules..." |
93 |
+ build_modules=1 |
94 |
+ fi |
95 |
+ else |
96 |
+ eerror "Nonmodular kernel detected, but USE=modules. Either build" |
97 |
+ eerror "modular kernel (without IP_SET) or disable USE=modules" |
98 |
+ die "Nonmodular kernel detected, will not build kernel modules" |
99 |
+ fi |
100 |
+ fi |
101 |
+ [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
102 |
+} |
103 |
+ |
104 |
+src_configure() { |
105 |
+ econf \ |
106 |
+ $(use_with modules kmod) \ |
107 |
+ --disable-static \ |
108 |
+ --with-maxsets=${IP_NF_SET_MAX} \ |
109 |
+ --libdir="${EPREFIX}/$(get_libdir)" \ |
110 |
+ --with-ksource="${KV_DIR}" \ |
111 |
+ --with-kbuild="${KV_OUT_DIR}" |
112 |
+} |
113 |
+ |
114 |
+src_compile() { |
115 |
+ einfo "Building userspace" |
116 |
+ emake |
117 |
+ |
118 |
+ if [[ ${build_modules} -eq 1 ]]; then |
119 |
+ einfo "Building kernel modules" |
120 |
+ set_arch_to_kernel |
121 |
+ emake modules |
122 |
+ fi |
123 |
+} |
124 |
+ |
125 |
+src_install() { |
126 |
+ einfo "Installing userspace" |
127 |
+ default |
128 |
+ prune_libtool_files |
129 |
+ |
130 |
+ newinitd "${FILESDIR}"/ipset.initd-r4 ${PN} |
131 |
+ newconfd "${FILESDIR}"/ipset.confd ${PN} |
132 |
+ keepdir /var/lib/ipset |
133 |
+ |
134 |
+ if [[ ${build_modules} -eq 1 ]]; then |
135 |
+ einfo "Installing kernel modules" |
136 |
+ linux-mod_src_install |
137 |
+ fi |
138 |
+} |
139 |
|
140 |
diff --git a/net-firewall/ipset/ipset-7.0.ebuild b/net-firewall/ipset/ipset-7.0.ebuild |
141 |
new file mode 100644 |
142 |
index 00000000000..b6bd9375ea6 |
143 |
--- /dev/null |
144 |
+++ b/net-firewall/ipset/ipset-7.0.ebuild |
145 |
@@ -0,0 +1,99 @@ |
146 |
+# Copyright 1999-2019 Gentoo Authors |
147 |
+# Distributed under the terms of the GNU General Public License v2 |
148 |
+ |
149 |
+EAPI="6" |
150 |
+MODULES_OPTIONAL_USE=modules |
151 |
+inherit linux-info linux-mod |
152 |
+ |
153 |
+DESCRIPTION="IPset tool for iptables, successor to ippool" |
154 |
+HOMEPAGE="http://ipset.netfilter.org/" |
155 |
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
156 |
+ |
157 |
+LICENSE="GPL-2" |
158 |
+SLOT="0" |
159 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
160 |
+ |
161 |
+RDEPEND=">=net-firewall/iptables-1.4.7 |
162 |
+ net-libs/libmnl" |
163 |
+DEPEND="${RDEPEND}" |
164 |
+ |
165 |
+DOCS=( ChangeLog INSTALL README UPGRADE ) |
166 |
+ |
167 |
+# configurable from outside, e.g. /etc/portage/make.conf |
168 |
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
169 |
+ |
170 |
+BUILD_TARGETS="modules" |
171 |
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
172 |
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
173 |
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do |
174 |
+ MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
175 |
+done |
176 |
+ |
177 |
+pkg_setup() { |
178 |
+ get_version |
179 |
+ CONFIG_CHECK="NETFILTER" |
180 |
+ ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
181 |
+ # It does still build without NET_NS, but it may be needed in future. |
182 |
+ #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" |
183 |
+ #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." |
184 |
+ CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" |
185 |
+ ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" |
186 |
+ |
187 |
+ build_modules=0 |
188 |
+ if use modules; then |
189 |
+ if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
190 |
+ if linux_chkconfig_present "IP_NF_SET" || \ |
191 |
+ linux_chkconfig_present "IP_SET"; then #274577 |
192 |
+ eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
193 |
+ eerror "Please either build ipset with modules USE flag disabled" |
194 |
+ eerror "or rebuild kernel without IP_SET support and make sure" |
195 |
+ eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
196 |
+ die "USE=modules and in-kernel ipset support detected." |
197 |
+ else |
198 |
+ einfo "Modular kernel detected. Gonna build kernel modules..." |
199 |
+ build_modules=1 |
200 |
+ fi |
201 |
+ else |
202 |
+ eerror "Nonmodular kernel detected, but USE=modules. Either build" |
203 |
+ eerror "modular kernel (without IP_SET) or disable USE=modules" |
204 |
+ die "Nonmodular kernel detected, will not build kernel modules" |
205 |
+ fi |
206 |
+ fi |
207 |
+ [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
208 |
+} |
209 |
+ |
210 |
+src_configure() { |
211 |
+ econf \ |
212 |
+ $(use_with modules kmod) \ |
213 |
+ --disable-static \ |
214 |
+ --with-maxsets=${IP_NF_SET_MAX} \ |
215 |
+ --libdir="${EPREFIX}/$(get_libdir)" \ |
216 |
+ --with-ksource="${KV_DIR}" \ |
217 |
+ --with-kbuild="${KV_OUT_DIR}" |
218 |
+} |
219 |
+ |
220 |
+src_compile() { |
221 |
+ einfo "Building userspace" |
222 |
+ emake |
223 |
+ |
224 |
+ if [[ ${build_modules} -eq 1 ]]; then |
225 |
+ einfo "Building kernel modules" |
226 |
+ set_arch_to_kernel |
227 |
+ emake modules |
228 |
+ fi |
229 |
+} |
230 |
+ |
231 |
+src_install() { |
232 |
+ einfo "Installing userspace" |
233 |
+ default |
234 |
+ prune_libtool_files |
235 |
+ |
236 |
+ newinitd "${FILESDIR}"/ipset.initd-r4 ${PN} |
237 |
+ newconfd "${FILESDIR}"/ipset.confd ${PN} |
238 |
+ keepdir /var/lib/ipset |
239 |
+ |
240 |
+ if [[ ${build_modules} -eq 1 ]]; then |
241 |
+ einfo "Installing kernel modules" |
242 |
+ linux-mod_src_install |
243 |
+ fi |
244 |
+} |
245 |
|
246 |
diff --git a/net-firewall/ipset/ipset-7.1.ebuild b/net-firewall/ipset/ipset-7.1.ebuild |
247 |
new file mode 100644 |
248 |
index 00000000000..b6bd9375ea6 |
249 |
--- /dev/null |
250 |
+++ b/net-firewall/ipset/ipset-7.1.ebuild |
251 |
@@ -0,0 +1,99 @@ |
252 |
+# Copyright 1999-2019 Gentoo Authors |
253 |
+# Distributed under the terms of the GNU General Public License v2 |
254 |
+ |
255 |
+EAPI="6" |
256 |
+MODULES_OPTIONAL_USE=modules |
257 |
+inherit linux-info linux-mod |
258 |
+ |
259 |
+DESCRIPTION="IPset tool for iptables, successor to ippool" |
260 |
+HOMEPAGE="http://ipset.netfilter.org/" |
261 |
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
262 |
+ |
263 |
+LICENSE="GPL-2" |
264 |
+SLOT="0" |
265 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
266 |
+ |
267 |
+RDEPEND=">=net-firewall/iptables-1.4.7 |
268 |
+ net-libs/libmnl" |
269 |
+DEPEND="${RDEPEND}" |
270 |
+ |
271 |
+DOCS=( ChangeLog INSTALL README UPGRADE ) |
272 |
+ |
273 |
+# configurable from outside, e.g. /etc/portage/make.conf |
274 |
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
275 |
+ |
276 |
+BUILD_TARGETS="modules" |
277 |
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
278 |
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
279 |
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do |
280 |
+ MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
281 |
+done |
282 |
+ |
283 |
+pkg_setup() { |
284 |
+ get_version |
285 |
+ CONFIG_CHECK="NETFILTER" |
286 |
+ ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
287 |
+ # It does still build without NET_NS, but it may be needed in future. |
288 |
+ #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" |
289 |
+ #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." |
290 |
+ CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" |
291 |
+ ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" |
292 |
+ |
293 |
+ build_modules=0 |
294 |
+ if use modules; then |
295 |
+ if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
296 |
+ if linux_chkconfig_present "IP_NF_SET" || \ |
297 |
+ linux_chkconfig_present "IP_SET"; then #274577 |
298 |
+ eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
299 |
+ eerror "Please either build ipset with modules USE flag disabled" |
300 |
+ eerror "or rebuild kernel without IP_SET support and make sure" |
301 |
+ eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
302 |
+ die "USE=modules and in-kernel ipset support detected." |
303 |
+ else |
304 |
+ einfo "Modular kernel detected. Gonna build kernel modules..." |
305 |
+ build_modules=1 |
306 |
+ fi |
307 |
+ else |
308 |
+ eerror "Nonmodular kernel detected, but USE=modules. Either build" |
309 |
+ eerror "modular kernel (without IP_SET) or disable USE=modules" |
310 |
+ die "Nonmodular kernel detected, will not build kernel modules" |
311 |
+ fi |
312 |
+ fi |
313 |
+ [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
314 |
+} |
315 |
+ |
316 |
+src_configure() { |
317 |
+ econf \ |
318 |
+ $(use_with modules kmod) \ |
319 |
+ --disable-static \ |
320 |
+ --with-maxsets=${IP_NF_SET_MAX} \ |
321 |
+ --libdir="${EPREFIX}/$(get_libdir)" \ |
322 |
+ --with-ksource="${KV_DIR}" \ |
323 |
+ --with-kbuild="${KV_OUT_DIR}" |
324 |
+} |
325 |
+ |
326 |
+src_compile() { |
327 |
+ einfo "Building userspace" |
328 |
+ emake |
329 |
+ |
330 |
+ if [[ ${build_modules} -eq 1 ]]; then |
331 |
+ einfo "Building kernel modules" |
332 |
+ set_arch_to_kernel |
333 |
+ emake modules |
334 |
+ fi |
335 |
+} |
336 |
+ |
337 |
+src_install() { |
338 |
+ einfo "Installing userspace" |
339 |
+ default |
340 |
+ prune_libtool_files |
341 |
+ |
342 |
+ newinitd "${FILESDIR}"/ipset.initd-r4 ${PN} |
343 |
+ newconfd "${FILESDIR}"/ipset.confd ${PN} |
344 |
+ keepdir /var/lib/ipset |
345 |
+ |
346 |
+ if [[ ${build_modules} -eq 1 ]]; then |
347 |
+ einfo "Installing kernel modules" |
348 |
+ linux-mod_src_install |
349 |
+ fi |
350 |
+} |