From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- net-firewall/xtables-addons/Manifest | 4 +- .../xtables-addons/xtables-addons-3.18.ebuild | 4 +- .../xtables-addons/xtables-addons-3.20.ebuild | 189 +++++++++++++++++++++ 3 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 net-firewall/xtables-addons/xtables-addons-3.20.ebuild (limited to 'net-firewall/xtables-addons') diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest index 10488fbce900..6347c2d354f2 100644 --- a/net-firewall/xtables-addons/Manifest +++ b/net-firewall/xtables-addons/Manifest @@ -1,5 +1,7 @@ DIST xtables-addons-3.13.tar.xz 327104 BLAKE2B 110719a7425060a79df0643ea35cf28ac62af811dde0f6744cf75b632809ff02518366e12ecdf8b017648b85843e689735629fc099b23b21b1999afa3a2e5c69 SHA512 0a9874269dafefe2fc364b41d3f5fb2108ba83dc49457f3aa436b814c8c65fb00f48f664576c8ccf183939edffa854fcf9f9c82a801ac90c0e2b9dc1426e1d85 DIST xtables-addons-3.18.tar.xz 328624 BLAKE2B 9662773c4bd5464ca789975762233299ca194977d5605a3c5f9a8a5a15f51afa4c33c8c17fd622af301a0f377542b6497eac5ce7e23719d238de5df51a9554b1 SHA512 b334642ce9b6ec3fc775ddbe6b66d70467fdcbfe30dcb165dac203f9d7fcd222dfd8c91e10befa3666bf572115dc75ed32d8ece05ed2947a4ed21d1d09032b8f +DIST xtables-addons-3.20.tar.xz 333232 BLAKE2B bc6df6d6e56bd539dc649d312fe84a5fe9e4743d6b1f72f3b3bb4689cea91cef9051754d30e530fa3140b877a67b2f84490740e669993669a1ee515d0a434b8d SHA512 0a38c12159dd555a31f24dc5a74d012b27723925df827edffe2343f6b8e61e838b5dc4776bafe37587e9622b9da1e9cd4220e4f576d58e78eb21ad18a419fb2e EBUILD xtables-addons-3.13.ebuild 5481 BLAKE2B 8078905df407dc09200aabec0556deca3b1b9eab33dfdeb9ac9894acf6ca8ebf072e6774e2f977249dcdfdcae4c197027eeb0ddd1f45d2cd5e27d1d1a9045346 SHA512 ad14b41519cfd932757d5c9c9773605b9b35ec7ba52d0756c929c10f82a76ea9338bfd3e2bbb55e97034c23b58c917598f77de3dc806db3beceb068f5fd77463 -EBUILD xtables-addons-3.18.ebuild 5489 BLAKE2B b834145377296c8cbbbcce95f2d14505999d9145ebdc400cb8c0f224d7a4088015dbf83dadffd0b79dc8f51b347f65b75b363d710ecd341f95ba28e8e2e0e25e SHA512 9fd8d926a6fe1b47ea16529943666d8d68b1a4e41dce640d9e2324011ef98b51d331fd9afe2a366d6cfb3478bc81d9fd73c34a46f0991612c5fb298ecb108e29 +EBUILD xtables-addons-3.18.ebuild 5487 BLAKE2B 8ccc97f83437616e3b8fff1f4c378b9d4c82cbb23059356721ea4c5b888ed38df03394f2b301fa326a9fe07533a9e54aff5bc99ab5fa2ea1c8239c58b8a463b0 SHA512 0b048826df84585b5022bf6cfa8f10a2b1920502fe5c9e7359a0f7a3de1f26c0c6b7a974373f43f1228ddfd6c53d6f01ccf63c9acb6e1941a3f40bc3e0521b61 +EBUILD xtables-addons-3.20.ebuild 5487 BLAKE2B 14b348f6eefff235df0c7fd513e2bb411ddccc2afeefc67b18794b41351c2c9e5d7beebbbeb1f32a40325ae25e8d6ac630b37c58c8cef99635c922015f2aee8f SHA512 7736a8a92fadfd64cfd358f8bfb975e043345aaa7fc06c4e8b8e030ac1a29411c8b393d8da1349af3d4f34584b79447c757aeb3ef889cbe1ed2e99caf3e678e0 MISC metadata.xml 776 BLAKE2B bae62741f428da53e6dd8350362c442869e653ee3e71c0e3d2afa49f380ade348f2fe3e26f20fd797253aeb890a242b7bf495a1c228957d89ac36b5471a152f8 SHA512 89ae4d90febd460d0045474928bf826303421eed02e2cb648527e5be1e3c4034fec33aaa05400f6ece7ac3a5f2e380af5f146e342f9a5a387397b2ede49ff3ff diff --git a/net-firewall/xtables-addons/xtables-addons-3.18.ebuild b/net-firewall/xtables-addons/xtables-addons-3.18.ebuild index 7ec917766690..e6a368f9d8bc 100644 --- a/net-firewall/xtables-addons/xtables-addons-3.18.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-3.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq proto logmark ipmark echo dnetmap dhcpmac delude chaos account" diff --git a/net-firewall/xtables-addons/xtables-addons-3.20.ebuild b/net-firewall/xtables-addons/xtables-addons-3.20.ebuild new file mode 100644 index 000000000000..5cbe698ab496 --- /dev/null +++ b/net-firewall/xtables-addons/xtables-addons-3.20.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE=modules +MODULES_OPTIONAL_USE_IUSE_DEFAULT=1 +inherit linux-info linux-mod multilib toolchain-funcs + +DESCRIPTION="iptables extensions not yet accepted in the main kernel" +HOMEPAGE="https://inai.de/projects/xtables-addons/" +SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq proto logmark ipmark echo dnetmap dhcpmac delude chaos account" + +for mod in ${MODULES}; do + IUSE="${IUSE} xtables_addons_${mod}" +done + +DEPEND=">=net-firewall/iptables-1.6.0" + +RDEPEND="${DEPEND} + xtables_addons_geoip? ( + app-arch/unzip + dev-perl/Net-CIDR-Lite + dev-perl/Text-CSV_XS + virtual/perl-Getopt-Long + ) +" + +DEPEND="${DEPEND} + virtual/linux-sources" + +SKIP_MODULES="" + +XA_check4internal_module() { + local mod=${1} + local version=${3} + local kconfigname=${3} + + if use xtables_addons_${mod} && kernel_is -gt ${version}; then + ewarn "${kconfigname} should be provided by the kernel. Skipping its build..." + if ! linux_chkconfig_present ${kconfigname}; then + ewarn "Please enable ${kconfigname} target in your kernel + configuration or disable checksum module in ${PN}." + fi + # SKIP_MODULES in case we need to disable building of everything + # like having this USE disabled + SKIP_MODULES+=" ${mod}" + fi +} + +pkg_setup() { + if use modules; then + get_version + check_modules_supported + CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR" + ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector" + linux-mod_pkg_setup + + if ! linux_chkconfig_present IPV6; then + SKIP_IPV6_MODULES="ip6table_rawpost" + ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}" + fi + kernel_is -lt 4 18 && die "${P} requires kernel version >= 4.18" + fi +} + +# Helper for maintainer: cheks if all possible MODULES are listed. +XA_qa_check() { + local all_modules + all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig") + if [[ ${all_modules} != ${MODULES} ]]; then + ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild." + ewarn "Please, update MODULES in ebuild." + ewarn "'${all_modules}'" + fi +} + +# Is there any use flag set? +XA_has_something_to_build() { + local mod + for mod in ${MODULES}; do + use xtables_addons_${mod} && return + done + + eerror "All modules are disabled. What do you want me to build?" + eerror "Please, set XTABLES_ADDONS to any combination of" + eerror "${MODULES}" + die "All modules are disabled." +} + +# Parse Kbuid files and generates list of sources +XA_get_module_name() { + [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument." + local mod objdir build_mod sources_list + mod=${1} + objdir=${S}/extensions + # Take modules name from mconfig + build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig") + # strip .o, = and everything before = and print + sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\ + {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ + "${objdir}/Kbuild") + + if [[ -d ${S}/extensions/${sources_list} ]]; then + objdir=${S}/extensions/${sources_list} + sources_list=$(sed -n "/^obj-m/\ + {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ + "${objdir}/Kbuild") + fi + for mod_src in ${sources_list}; do + has ${mod_src} ${SKIP_IPV6_MODULES} || \ + echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})" + done +} + +# Die on modules known to fail on certain kernel version. +XA_known_failure() { + local module_name=$1 + local KV_max=$2 + + if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then + eerror + eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above." + eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel." + eerror + die + fi +} + +src_prepare() { + XA_qa_check + XA_has_something_to_build + + # Bug #553630#c2. echo fails on linux-4 and above. + # This appears to be fixed, at least as of linux-4.2 + # XA_known_failure "echo" 4 + + local mod module_name + if use modules; then + MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" + fi + for mod in ${MODULES}; do + if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then + sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die + if use modules; then + for module_name in $(XA_get_module_name ${mod}); do + MODULE_NAMES+=" ${module_name}" + done + fi + else + sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die + fi + done + einfo "${MODULE_NAMES}" # for debugging + + sed -e 's/depmod -a/true/' -i Makefile.in || die + sed -e '/^all-local:/{s: modules::}' \ + -e '/^install-exec-local:/{s: modules_install::}' \ + -i extensions/Makefile.in || die + + use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in + + eapply_user +} + +src_configure() { + set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile + econf --prefix="${EPREFIX}/" \ + --libexecdir="${EPREFIX}/$(get_libdir)/" \ + --with-kbuild="${KV_OUT_DIR}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 + use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile +} + +src_install() { + emake DESTDIR="${D}" install + use modules && linux-mod_src_install + dodoc -r README doc/* + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' +} -- cgit v1.2.3