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: Tue, 25 Jul 2017 19:47:47
Message-Id: 1501012058.4dbd255403e96f29de759dfd64e0dc45d0bb8a95.blueness@gentoo
1 commit: 4dbd255403e96f29de759dfd64e0dc45d0bb8a95
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 25 19:47:21 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 25 19:47:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbd2554
7
8 net-firewall/xtables-addons: version bump to 2.13
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 net-firewall/xtables-addons/Manifest | 1 +
13 .../xtables-addons/xtables-addons-2.13.ebuild | 187 +++++++++++++++++++++
14 2 files changed, 188 insertions(+)
15
16 diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
17 index ed3e487c158..5593aba2655 100644
18 --- a/net-firewall/xtables-addons/Manifest
19 +++ b/net-firewall/xtables-addons/Manifest
20 @@ -1,3 +1,4 @@
21 DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
22 DIST xtables-addons-2.12.tar.xz 309724 SHA256 c4865aa1c64c5ff173ff7b5d69425466c71f0f9b5eb5299c52c68bdcd46fa63b SHA512 2d93dcb98969d0fb149746b2282eafbf566d0f97c74839d194c7b6cb77d50ec71469d6bbb2565dd855fe8ed6783be2fd705f21f9f7e2842aae9205174a79a6bd WHIRLPOOL 3e25eb102b6a7e6eb85ddac8176f470acc02bfad6830cfa96d7f585a6c3d42c8821fc3c29f41322b5d0ee9273fbc1b11ca29d128b24fa9470f1d7cd965fef899
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-2.13.ebuild b/net-firewall/xtables-addons/xtables-addons-2.13.ebuild
27 new file mode 100644
28 index 00000000000..c81d47572de
29 --- /dev/null
30 +++ b/net-firewall/xtables-addons/xtables-addons-2.13.ebuild
31 @@ -0,0 +1,187 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI="6"
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 tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude 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_check4internal_module() {
70 + local mod=${1}
71 + local version=${3}
72 + local kconfigname=${3}
73 +
74 + if use xtables_addons_${mod} && kernel_is -gt ${version}; then
75 + ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
76 + if ! linux_chkconfig_present ${kconfigname}; then
77 + ewarn "Please enable ${kconfigname} target in your kernel
78 + configuration or disable checksum module in ${PN}."
79 + fi
80 + # SKIP_MODULES in case we need to disable building of everything
81 + # like having this USE disabled
82 + SKIP_MODULES+=" ${mod}"
83 + fi
84 +}
85 +
86 +pkg_setup() {
87 + if use modules; then
88 + get_version
89 + check_modules_supported
90 + CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR UNUSED_SYMBOLS"
91 + ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
92 + linux-mod_pkg_setup
93 +
94 + if ! linux_chkconfig_present IPV6; then
95 + SKIP_IPV6_MODULES="ip6table_rawpost"
96 + ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
97 + fi
98 + kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
99 + fi
100 +}
101 +
102 +# Helper for maintainer: cheks if all possible MODULES are listed.
103 +XA_qa_check() {
104 + local all_modules
105 + all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
106 + if [[ ${all_modules} != ${MODULES} ]]; then
107 + ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
108 + ewarn "Please, update MODULES in ebuild."
109 + ewarn "'${all_modules}'"
110 + fi
111 +}
112 +
113 +# Is there any use flag set?
114 +XA_has_something_to_build() {
115 + local mod
116 + for mod in ${MODULES}; do
117 + use xtables_addons_${mod} && return
118 + done
119 +
120 + eerror "All modules are disabled. What do you want me to build?"
121 + eerror "Please, set XTABLES_ADDONS to any combination of"
122 + eerror "${MODULES}"
123 + die "All modules are disabled."
124 +}
125 +
126 +# Parse Kbuid files and generates list of sources
127 +XA_get_module_name() {
128 + [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
129 + local mod objdir build_mod sources_list
130 + mod=${1}
131 + objdir=${S}/extensions
132 + # Take modules name from mconfig
133 + build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
134 + # strip .o, = and everything before = and print
135 + sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
136 + {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
137 + "${objdir}/Kbuild")
138 +
139 + if [[ -d ${S}/extensions/${sources_list} ]]; then
140 + objdir=${S}/extensions/${sources_list}
141 + sources_list=$(sed -n "/^obj-m/\
142 + {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
143 + "${objdir}/Kbuild")
144 + fi
145 + for mod_src in ${sources_list}; do
146 + has ${mod_src} ${SKIP_IPV6_MODULES} || \
147 + echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
148 + done
149 +}
150 +
151 +# Die on modules known to fail on certain kernel version.
152 +XA_known_failure() {
153 + local module_name=$1
154 + local KV_max=$2
155 +
156 + if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
157 + eerror
158 + eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
159 + eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
160 + eerror
161 + die
162 + fi
163 +}
164 +
165 +src_prepare() {
166 + XA_qa_check
167 + XA_has_something_to_build
168 +
169 + # Bug #553630#c2. echo fails on linux-4 and above.
170 + # This appears to be fixed, at least as of linux-4.2
171 + # XA_known_failure "echo" 4
172 +
173 + local mod module_name
174 + if use modules; then
175 + MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
176 + fi
177 + for mod in ${MODULES}; do
178 + if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
179 + sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
180 + if use modules; then
181 + for module_name in $(XA_get_module_name ${mod}); do
182 + MODULE_NAMES+=" ${module_name}"
183 + done
184 + fi
185 + else
186 + sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
187 + fi
188 + done
189 + einfo "${MODULE_NAMES}" # for debugging
190 +
191 + sed -e 's/depmod -a/true/' -i Makefile.in || die
192 + sed -e '/^all-local:/{s: modules::}' \
193 + -e '/^install-exec-local:/{s: modules_install::}' \
194 + -i extensions/Makefile.in || die
195 +
196 + use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
197 +
198 + eapply_user
199 +}
200 +
201 +src_configure() {
202 + set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
203 + econf --prefix="${EPREFIX}/" \
204 + --libexecdir="${EPREFIX}/$(get_libdir)/" \
205 + --with-kbuild="${KV_DIR}"
206 +}
207 +
208 +src_compile() {
209 + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
210 + use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
211 +}
212 +
213 +src_install() {
214 + emake DESTDIR="${D}" install
215 + use modules && linux-mod_src_install
216 + dodoc -r README doc/*
217 + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
218 +}