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: Sun, 18 Feb 2018 07:17:36
Message-Id: 1518938233.11a0bfafa9baaa491412dc0d39a7091f17e91ca3.blueness@gentoo
1 commit: 11a0bfafa9baaa491412dc0d39a7091f17e91ca3
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 18 07:17:13 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 18 07:17:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a0bfaf
7
8 net-firewall/xtables-addons: version bump to 3.0
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 net-firewall/xtables-addons/Manifest | 1 +
13 .../xtables-addons/xtables-addons-3.0.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 fe0b3dae8ee..6c922aa722f 100644
18 --- a/net-firewall/xtables-addons/Manifest
19 +++ b/net-firewall/xtables-addons/Manifest
20 @@ -1,2 +1,3 @@
21 DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497
22 DIST xtables-addons-2.14.tar.xz 322296 BLAKE2B f739951ff535f73be8c96b271f929821fd708cb4615a3e6c2528d9bd2574c8d801c6ac6b59f23f5054b29c31a94f90c7d3f7628b09fb78dc2e7f7da87e5af0a1 SHA512 f3d49c53aa01fadc334906e580f16605849fe7be83637fa73d51b48ded0e77c368c544ad69fa97b53a6688eaa3ba63bab489c150a9e02205e8044cdd521f4752
23 +DIST xtables-addons-3.0.tar.xz 321960 BLAKE2B ce6e034ab42fda319217b464a2c3c639787a696d58739cc7ba8e1c699894c46590c34490c8ccc41c29b8dbfb4ad01859050bdeccbac08d09f297a49cdc920c6e SHA512 164b43ff23f33187b5f557bedf765fbad21721b236ac5f5e982c5fdf88cdcbf8ca106810d2df31d9ab79e9c518f7fec3d7dae297540d0b00326a0dfffd04cfec
24
25 diff --git a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
26 new file mode 100644
27 index 00000000000..d901e345dfa
28 --- /dev/null
29 +++ b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
30 @@ -0,0 +1,187 @@
31 +# Copyright 1999-2018 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +
34 +EAPI="6"
35 +
36 +inherit eutils linux-info linux-mod multilib
37 +
38 +DESCRIPTION="iptables extensions not yet accepted in the main kernel"
39 +HOMEPAGE="http://xtables-addons.sourceforge.net/"
40 +SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
41 +
42 +LICENSE="GPL-2"
43 +SLOT="0"
44 +KEYWORDS="~amd64 ~x86"
45 +IUSE="modules"
46 +
47 +MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
48 +
49 +for mod in ${MODULES}; do
50 + IUSE="${IUSE} xtables_addons_${mod}"
51 +done
52 +
53 +DEPEND=">=net-firewall/iptables-1.6.0"
54 +
55 +RDEPEND="${DEPEND}
56 + xtables_addons_geoip? (
57 + app-arch/unzip
58 + dev-perl/Text-CSV_XS
59 + virtual/perl-Getopt-Long
60 + )
61 +"
62 +
63 +DEPEND="${DEPEND}
64 + virtual/linux-sources"
65 +
66 +SKIP_MODULES=""
67 +
68 +XA_check4internal_module() {
69 + local mod=${1}
70 + local version=${3}
71 + local kconfigname=${3}
72 +
73 + if use xtables_addons_${mod} && kernel_is -gt ${version}; then
74 + ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
75 + if ! linux_chkconfig_present ${kconfigname}; then
76 + ewarn "Please enable ${kconfigname} target in your kernel
77 + configuration or disable checksum module in ${PN}."
78 + fi
79 + # SKIP_MODULES in case we need to disable building of everything
80 + # like having this USE disabled
81 + SKIP_MODULES+=" ${mod}"
82 + fi
83 +}
84 +
85 +pkg_setup() {
86 + if use modules; then
87 + get_version
88 + check_modules_supported
89 + CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
90 + ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
91 + linux-mod_pkg_setup
92 +
93 + if ! linux_chkconfig_present IPV6; then
94 + SKIP_IPV6_MODULES="ip6table_rawpost"
95 + ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
96 + fi
97 + kernel_is -lt 4 15 && die "${P} requires kernel version >= 4.15, if you have older kernel please use 1.x version instead"
98 + fi
99 +}
100 +
101 +# Helper for maintainer: cheks if all possible MODULES are listed.
102 +XA_qa_check() {
103 + local all_modules
104 + all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
105 + if [[ ${all_modules} != ${MODULES} ]]; then
106 + ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
107 + ewarn "Please, update MODULES in ebuild."
108 + ewarn "'${all_modules}'"
109 + fi
110 +}
111 +
112 +# Is there any use flag set?
113 +XA_has_something_to_build() {
114 + local mod
115 + for mod in ${MODULES}; do
116 + use xtables_addons_${mod} && return
117 + done
118 +
119 + eerror "All modules are disabled. What do you want me to build?"
120 + eerror "Please, set XTABLES_ADDONS to any combination of"
121 + eerror "${MODULES}"
122 + die "All modules are disabled."
123 +}
124 +
125 +# Parse Kbuid files and generates list of sources
126 +XA_get_module_name() {
127 + [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
128 + local mod objdir build_mod sources_list
129 + mod=${1}
130 + objdir=${S}/extensions
131 + # Take modules name from mconfig
132 + build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
133 + # strip .o, = and everything before = and print
134 + sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
135 + {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
136 + "${objdir}/Kbuild")
137 +
138 + if [[ -d ${S}/extensions/${sources_list} ]]; then
139 + objdir=${S}/extensions/${sources_list}
140 + sources_list=$(sed -n "/^obj-m/\
141 + {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
142 + "${objdir}/Kbuild")
143 + fi
144 + for mod_src in ${sources_list}; do
145 + has ${mod_src} ${SKIP_IPV6_MODULES} || \
146 + echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
147 + done
148 +}
149 +
150 +# Die on modules known to fail on certain kernel version.
151 +XA_known_failure() {
152 + local module_name=$1
153 + local KV_max=$2
154 +
155 + if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
156 + eerror
157 + eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
158 + eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
159 + eerror
160 + die
161 + fi
162 +}
163 +
164 +src_prepare() {
165 + XA_qa_check
166 + XA_has_something_to_build
167 +
168 + # Bug #553630#c2. echo fails on linux-4 and above.
169 + # This appears to be fixed, at least as of linux-4.2
170 + # XA_known_failure "echo" 4
171 +
172 + local mod module_name
173 + if use modules; then
174 + MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
175 + fi
176 + for mod in ${MODULES}; do
177 + if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
178 + sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
179 + if use modules; then
180 + for module_name in $(XA_get_module_name ${mod}); do
181 + MODULE_NAMES+=" ${module_name}"
182 + done
183 + fi
184 + else
185 + sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
186 + fi
187 + done
188 + einfo "${MODULE_NAMES}" # for debugging
189 +
190 + sed -e 's/depmod -a/true/' -i Makefile.in || die
191 + sed -e '/^all-local:/{s: modules::}' \
192 + -e '/^install-exec-local:/{s: modules_install::}' \
193 + -i extensions/Makefile.in || die
194 +
195 + use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
196 +
197 + eapply_user
198 +}
199 +
200 +src_configure() {
201 + set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
202 + econf --prefix="${EPREFIX}/" \
203 + --libexecdir="${EPREFIX}/$(get_libdir)/" \
204 + --with-kbuild="${KV_DIR}"
205 +}
206 +
207 +src_compile() {
208 + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
209 + use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
210 +}
211 +
212 +src_install() {
213 + emake DESTDIR="${D}" install
214 + use modules && linux-mod_src_install
215 + dodoc -r README doc/*
216 + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
217 +}