Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/xtables-addons/
Date: Mon, 02 Oct 2017 21:16:46
Message-Id: 1506978996.f4e821988fad5ea0c4d4b1c714c98fc58ab9d0b8.blueness@gentoo
1 commit: f4e821988fad5ea0c4d4b1c714c98fc58ab9d0b8
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 2 21:16:21 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 2 21:16:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e82198
7
8 net-firewall/xtables-addons: remove older stable versions
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.1
11
12 net-firewall/xtables-addons/Manifest | 2 -
13 .../xtables-addons/xtables-addons-1.47.1.ebuild | 171 -------------------
14 .../xtables-addons/xtables-addons-2.8.ebuild | 185 ---------------------
15 3 files changed, 358 deletions(-)
16
17 diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
18 index e21ae160cab..6bab44f319b 100644
19 --- a/net-firewall/xtables-addons/Manifest
20 +++ b/net-firewall/xtables-addons/Manifest
21 @@ -1,3 +1 @@
22 -DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
23 DIST xtables-addons-2.13.tar.xz 322116 SHA256 d141879d438424764e953b97fbb16edafdf8ef6baa57f6e36e07b894a7775dfc SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497 WHIRLPOOL 46463d4497d3b581868ea2a60216bfd198a8f540313c557abda3cb3033be9a853403d8d336f75ed6998d831435950efbacb462406f5d55848b76f12921f39e5f
24 -DIST xtables-addons-2.8.tar.xz 320864 SHA256 08af8c85ff00ee76469741bb9eb97454903680213dc3e0602266bcbb08788490 SHA512 337a0f9f8e1236a14977b1f60f82e9f6ea4b3d1134fb4ff29cdb7edfca54501639760e8f855ac803e259660a9a5afd7366770543e2f077346cb5dda8ef80462e WHIRLPOOL b09d0d05143ce052372827487e85b7e4c9674809007624371edb4a28155e7e6b605fa2518ba494f1a11cc7e3419675a69cea966a5d79fcfeaf9e273996e059ed
25
26 diff --git a/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild b/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild
27 deleted file mode 100644
28 index c6a24586f82..00000000000
29 --- a/net-firewall/xtables-addons/xtables-addons-1.47.1.ebuild
30 +++ /dev/null
31 @@ -1,171 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -
37 -inherit eutils linux-info linux-mod multilib
38 -
39 -DESCRIPTION="iptables extensions not yet accepted in the main kernel"
40 -HOMEPAGE="http://xtables-addons.sourceforge.net/"
41 -SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="amd64 x86"
46 -IUSE="modules"
47 -
48 -MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account"
49 -
50 -for mod in ${MODULES}; do
51 - IUSE="${IUSE} xtables_addons_${mod}"
52 -done
53 -
54 -DEPEND=">=net-firewall/iptables-1.4.5"
55 -
56 -RDEPEND="${DEPEND}
57 - xtables_addons_geoip? (
58 - app-arch/unzip
59 - dev-perl/Text-CSV_XS
60 - virtual/perl-Getopt-Long
61 - )
62 -"
63 -
64 -DEPEND="${DEPEND}
65 - virtual/linux-sources"
66 -
67 -SKIP_MODULES=""
68 -
69 -# XA_kernel_check tee "2 6 32"
70 -XA_check4internal_module() {
71 - local mod=${1}
72 - local version=${2}
73 - local kconfigname=${3}
74 -
75 - if use xtables_addons_${mod} && kernel_is -gt ${version}; then
76 - ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
77 - if ! linux_chkconfig_present ${kconfigname}; then
78 - ewarn "Please enable ${kconfigname} target in your kernel
79 - configuration or disable checksum module in ${PN}."
80 - fi
81 - # SKIP_MODULES in case we need to disable building of everything
82 - # like having this USE disabled
83 - SKIP_MODULES+=" ${mod}"
84 - fi
85 -}
86 -
87 -pkg_setup() {
88 - if use modules; then
89 - get_version
90 - check_modules_supported
91 - CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
92 - ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
93 - linux-mod_pkg_setup
94 -
95 - if ! linux_chkconfig_present IPV6; then
96 - SKIP_IPV6_MODULES="ip6table_rawpost"
97 - ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
98 - fi
99 - kernel_is -lt 2 6 32 && die "${PN} requires kernel version >= 2.6.32"
100 - kernel_is -ge 3 7 && die "${PN} requires kernel version < 3.7"
101 - XA_check4internal_module tee "2 6 35" NETFILTER_XT_TARGET_TEE
102 - XA_check4internal_module checksum "2 6 36" NETFILTER_XT_TARGET_CHECKSUM
103 - fi
104 -}
105 -
106 -# Helper for maintainer: cheks if all possible MODULES are listed.
107 -XA_qa_check() {
108 - local all_modules
109 - all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
110 - if [[ ${all_modules} != ${MODULES} ]]; then
111 - ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
112 - ewarn "Please, update MODULES in ebuild."
113 - ewarn "'${all_modules}'"
114 - fi
115 -}
116 -
117 -# Is there any use flag set?
118 -XA_has_something_to_build() {
119 - local mod
120 - for mod in ${MODULES}; do
121 - use xtables_addons_${mod} && return
122 - done
123 -
124 - eerror "All modules are disabled. What do you want me to build?"
125 - eerror "Please, set XTABLES_ADDONS to any combination of"
126 - eerror "${MODULES}"
127 - die "All modules are disabled."
128 -}
129 -
130 -# Parse Kbuid files and generates list of sources
131 -XA_get_module_name() {
132 - [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
133 - local mod objdir build_mod sources_list
134 - mod=${1}
135 - objdir=${S}/extensions
136 - # Take modules name from mconfig
137 - build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
138 - # strip .o, = and everything before = and print
139 - sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
140 - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
141 - "${objdir}/Kbuild")
142 -
143 - if [[ -d ${S}/extensions/${sources_list} ]]; then
144 - objdir=${S}/extensions/${sources_list}
145 - sources_list=$(sed -n "/^obj-m/\
146 - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
147 - "${objdir}/Kbuild")
148 - fi
149 - for mod_src in ${sources_list}; do
150 - has ${mod_src} ${SKIP_IPV6_MODULES} || \
151 - echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
152 - done
153 -}
154 -
155 -src_prepare() {
156 - XA_qa_check
157 - XA_has_something_to_build
158 -
159 - local mod module_name
160 - if use modules; then
161 - MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
162 - fi
163 - for mod in ${MODULES}; do
164 - if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
165 - sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
166 - if use modules; then
167 - for module_name in $(XA_get_module_name ${mod}); do
168 - MODULE_NAMES+=" ${module_name}"
169 - done
170 - fi
171 - else
172 - sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
173 - fi
174 - done
175 - einfo "${MODULE_NAMES}" # for debugging
176 -
177 - sed -e 's/depmod -a/true/' -i Makefile.in || die
178 - sed -e '/^all-local:/{s: modules::}' \
179 - -e '/^install-exec-local:/{s: modules_install::}' \
180 - -i extensions/Makefile.in || die
181 -
182 - use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
183 -}
184 -
185 -src_configure() {
186 - set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
187 - econf --prefix="${EPREFIX}/" \
188 - --libexecdir="${EPREFIX}/$(get_libdir)/" \
189 - --with-kbuild="${KV_DIR}"
190 -}
191 -
192 -src_compile() {
193 - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
194 - use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
195 -}
196 -
197 -src_install() {
198 - emake DESTDIR="${D}" install
199 - use modules && linux-mod_src_install
200 - dodoc -r README doc/*
201 - find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
202 -}
203
204 diff --git a/net-firewall/xtables-addons/xtables-addons-2.8.ebuild b/net-firewall/xtables-addons/xtables-addons-2.8.ebuild
205 deleted file mode 100644
206 index a1473e11aca..00000000000
207 --- a/net-firewall/xtables-addons/xtables-addons-2.8.ebuild
208 +++ /dev/null
209 @@ -1,185 +0,0 @@
210 -# Copyright 1999-2016 Gentoo Foundation
211 -# Distributed under the terms of the GNU General Public License v2
212 -
213 -EAPI="5"
214 -
215 -inherit eutils linux-info linux-mod multilib
216 -
217 -DESCRIPTION="iptables extensions not yet accepted in the main kernel"
218 -HOMEPAGE="http://xtables-addons.sourceforge.net/"
219 -SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
220 -
221 -LICENSE="GPL-2"
222 -SLOT="0"
223 -KEYWORDS="amd64 x86"
224 -IUSE="modules"
225 -
226 -MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
227 -
228 -for mod in ${MODULES}; do
229 - IUSE="${IUSE} xtables_addons_${mod}"
230 -done
231 -
232 -DEPEND=">=net-firewall/iptables-1.4.5"
233 -
234 -RDEPEND="${DEPEND}
235 - xtables_addons_geoip? (
236 - app-arch/unzip
237 - dev-perl/Text-CSV_XS
238 - virtual/perl-Getopt-Long
239 - )
240 -"
241 -
242 -DEPEND="${DEPEND}
243 - virtual/linux-sources"
244 -
245 -SKIP_MODULES=""
246 -
247 -# XA_kernel_check tee "2 6 32"
248 -XA_check4internal_module() {
249 - local mod=${1}
250 - local version=${2}
251 - local kconfigname=${3}
252 -
253 - if use xtables_addons_${mod} && kernel_is -gt ${version}; then
254 - ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
255 - if ! linux_chkconfig_present ${kconfigname}; then
256 - ewarn "Please enable ${kconfigname} target in your kernel
257 - configuration or disable checksum module in ${PN}."
258 - fi
259 - # SKIP_MODULES in case we need to disable building of everything
260 - # like having this USE disabled
261 - SKIP_MODULES+=" ${mod}"
262 - fi
263 -}
264 -
265 -pkg_setup() {
266 - if use modules; then
267 - get_version
268 - check_modules_supported
269 - CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
270 - ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
271 - linux-mod_pkg_setup
272 -
273 - if ! linux_chkconfig_present IPV6; then
274 - SKIP_IPV6_MODULES="ip6table_rawpost"
275 - ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
276 - fi
277 - kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
278 - fi
279 -}
280 -
281 -# Helper for maintainer: cheks if all possible MODULES are listed.
282 -XA_qa_check() {
283 - local all_modules
284 - all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
285 - if [[ ${all_modules} != ${MODULES} ]]; then
286 - ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
287 - ewarn "Please, update MODULES in ebuild."
288 - ewarn "'${all_modules}'"
289 - fi
290 -}
291 -
292 -# Is there any use flag set?
293 -XA_has_something_to_build() {
294 - local mod
295 - for mod in ${MODULES}; do
296 - use xtables_addons_${mod} && return
297 - done
298 -
299 - eerror "All modules are disabled. What do you want me to build?"
300 - eerror "Please, set XTABLES_ADDONS to any combination of"
301 - eerror "${MODULES}"
302 - die "All modules are disabled."
303 -}
304 -
305 -# Parse Kbuid files and generates list of sources
306 -XA_get_module_name() {
307 - [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
308 - local mod objdir build_mod sources_list
309 - mod=${1}
310 - objdir=${S}/extensions
311 - # Take modules name from mconfig
312 - build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
313 - # strip .o, = and everything before = and print
314 - sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
315 - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
316 - "${objdir}/Kbuild")
317 -
318 - if [[ -d ${S}/extensions/${sources_list} ]]; then
319 - objdir=${S}/extensions/${sources_list}
320 - sources_list=$(sed -n "/^obj-m/\
321 - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
322 - "${objdir}/Kbuild")
323 - fi
324 - for mod_src in ${sources_list}; do
325 - has ${mod_src} ${SKIP_IPV6_MODULES} || \
326 - echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
327 - done
328 -}
329 -
330 -# Die on modules known to fail on certain kernel version.
331 -XA_known_failure() {
332 - local module_name=$1
333 - local KV_max=$2
334 -
335 - if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
336 - eerror
337 - eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
338 - eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
339 - eerror
340 - die
341 - fi
342 -}
343 -
344 -src_prepare() {
345 - XA_qa_check
346 - XA_has_something_to_build
347 -
348 - # Bug #553630#c2. echo fails on linux-4 and above.
349 - XA_known_failure "echo" 4
350 -
351 - local mod module_name
352 - if use modules; then
353 - MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
354 - fi
355 - for mod in ${MODULES}; do
356 - if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
357 - sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
358 - if use modules; then
359 - for module_name in $(XA_get_module_name ${mod}); do
360 - MODULE_NAMES+=" ${module_name}"
361 - done
362 - fi
363 - else
364 - sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
365 - fi
366 - done
367 - einfo "${MODULE_NAMES}" # for debugging
368 -
369 - sed -e 's/depmod -a/true/' -i Makefile.in || die
370 - sed -e '/^all-local:/{s: modules::}' \
371 - -e '/^install-exec-local:/{s: modules_install::}' \
372 - -i extensions/Makefile.in || die
373 -
374 - use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
375 -}
376 -
377 -src_configure() {
378 - set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
379 - econf --prefix="${EPREFIX}/" \
380 - --libexecdir="${EPREFIX}/$(get_libdir)/" \
381 - --with-kbuild="${KV_DIR}"
382 -}
383 -
384 -src_compile() {
385 - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
386 - use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
387 -}
388 -
389 -src_install() {
390 - emake DESTDIR="${D}" install
391 - use modules && linux-mod_src_install
392 - dodoc -r README doc/*
393 - find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
394 -}