From d56d144655e3785864da43c9acb6c228ef9360ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Jun 2019 11:30:24 +0100 Subject: gentoo resync : 22.06.2019 --- net-firewall/xtables-addons/Manifest | 10 +- .../xtables-addons/xtables-addons-2.14.ebuild | 188 --------------------- .../xtables-addons/xtables-addons-3.0.ebuild | 188 --------------------- .../xtables-addons/xtables-addons-3.1.ebuild | 188 --------------------- .../xtables-addons/xtables-addons-3.2.ebuild | 188 --------------------- .../xtables-addons/xtables-addons-3.3.ebuild | 1 + 6 files changed, 2 insertions(+), 761 deletions(-) delete mode 100644 net-firewall/xtables-addons/xtables-addons-2.14.ebuild delete mode 100644 net-firewall/xtables-addons/xtables-addons-3.0.ebuild delete mode 100644 net-firewall/xtables-addons/xtables-addons-3.1.ebuild delete mode 100644 net-firewall/xtables-addons/xtables-addons-3.2.ebuild (limited to 'net-firewall/xtables-addons') diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest index 4a04175e8e83..1cf0f9f494b8 100644 --- a/net-firewall/xtables-addons/Manifest +++ b/net-firewall/xtables-addons/Manifest @@ -1,13 +1,5 @@ DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497 -DIST xtables-addons-2.14.tar.xz 322296 BLAKE2B f739951ff535f73be8c96b271f929821fd708cb4615a3e6c2528d9bd2574c8d801c6ac6b59f23f5054b29c31a94f90c7d3f7628b09fb78dc2e7f7da87e5af0a1 SHA512 f3d49c53aa01fadc334906e580f16605849fe7be83637fa73d51b48ded0e77c368c544ad69fa97b53a6688eaa3ba63bab489c150a9e02205e8044cdd521f4752 -DIST xtables-addons-3.0.tar.xz 321960 BLAKE2B ce6e034ab42fda319217b464a2c3c639787a696d58739cc7ba8e1c699894c46590c34490c8ccc41c29b8dbfb4ad01859050bdeccbac08d09f297a49cdc920c6e SHA512 164b43ff23f33187b5f557bedf765fbad21721b236ac5f5e982c5fdf88cdcbf8ca106810d2df31d9ab79e9c518f7fec3d7dae297540d0b00326a0dfffd04cfec -DIST xtables-addons-3.1.tar.xz 323684 BLAKE2B eb75bf41c7ca2f1b1dc41bb7c602de8856e86db244a4e247e3089037e176d5f84e472719e7fc31836e898b615f8b6630ddeacf0754807e6684a22aa593550b1a SHA512 d9cbd3278ac156b3edb024bad98dab2bb1f83546aacf038b85b9203064e301de17c638dae4e05ea907b00b4038377e9aefebb65367ffc335b149f7e17596d931 -DIST xtables-addons-3.2.tar.xz 323608 BLAKE2B a23ae7d779d7cb2f77f2c0cceae54c1b73fa9dcb9dab22a83c2af22562d2c1b1d0a6df7eef7809961d1cb0484793a65a57259af4934b3e7fe624c20c397ce215 SHA512 57b02aec83765ad407a813cc8bb5ba471739da09ee8177094592833d1eaa54300ce06b326e9897cb80f563bdaec24b33d42c2cdb72f8a0ec8f86b085fcc6494d DIST xtables-addons-3.3.tar.xz 322676 BLAKE2B caea009b76e813d72a0490ac961be8e97340b6afda078062104ad8a320d7e6e673450232a0f670829b616e07596397e72c51c8d21f905c664749de6301dec12e SHA512 76e76f8cb385d1f471b01c60be1561910123a4a083374a3976fae98943197c3e77fad62363addba8d14d0aaf23713df9a10a22b1906bbdbb702a61c297d3cb3c EBUILD xtables-addons-2.13.ebuild 5499 BLAKE2B 165def630f60562886928e7cc45a58c2446dc345745fcb0bc8245681042d88eef72001c3d8c2c86d085bb7dd9596567f64366319bf4e403146459355fef30c62 SHA512 fce73d0812ae0923585fd5d02878677a8364cb5c256e411ff579bd60ac446188981c72bf534dcc0168098d727c404d567e42855aa24474c874ca562ec1e017ac -EBUILD xtables-addons-2.14.ebuild 5501 BLAKE2B b0f5d1b577cee3effc7d24d342c36b3f49678860d2a498f496722b5e43d96d0a03f446c07753c0bd02ce908476f1076fb27421e23cb95739ec8d04091d95f56f SHA512 f9b1c681220f335fc4a258f487ea637780f2d8723429df78879b648c1da692d9695493c9de85d4e5b20cda4a399bdaef0b1ca5e2826ec4fa585180de9acc8f50 -EBUILD xtables-addons-3.0.ebuild 5503 BLAKE2B 62a2b6f18a5b8f42b2f593e913340476abd2c32cc6a66d68647d8618fef85a1068181b2d5c099a71c2cd599641c3e743392302c883e05c9f1209a7026e9fdbac SHA512 d3168387cac66c155c2bc7e3db3d46efdb684049f6c73833d5e83b097f2261578be89b20b1c58e80d923dcf34afe13b3fd4518a8ac7ef4c97a4185d9ce0b9d9f -EBUILD xtables-addons-3.1.ebuild 5446 BLAKE2B 639870cffe55f38a98967830b1a12ea422090319a8a1afc991b36ef960d2fd4541e2678bdfa188707fcc756a4110b25e986f5055932b2024b111f78e7b8d2164 SHA512 0f6fa016b58d4739d9b0770925ef1cd26ec7b658e1f5bb211ba578b352c7612e270a2c4fe8bcef59d5f7c4792cc966e7367e671ad9eb7a79d0c3d365453a3984 -EBUILD xtables-addons-3.2.ebuild 5446 BLAKE2B 639870cffe55f38a98967830b1a12ea422090319a8a1afc991b36ef960d2fd4541e2678bdfa188707fcc756a4110b25e986f5055932b2024b111f78e7b8d2164 SHA512 0f6fa016b58d4739d9b0770925ef1cd26ec7b658e1f5bb211ba578b352c7612e270a2c4fe8bcef59d5f7c4792cc966e7367e671ad9eb7a79d0c3d365453a3984 -EBUILD xtables-addons-3.3.ebuild 5446 BLAKE2B 048a3518605916ce4d7a0a74f51cbdb641f87737970fb1e07a7edfa651aa923bd1bd3eb99271814d582204a3ff6daf520a251a4c29c96fe9dd194d06fb879c0f SHA512 c7fff35bb77561d752efeddeddf45384a1cc9bba24a8f13d9158708dcef1faaf9a99c1124cf69b9597f42cdf7e84691d34c9710f73e8c5ebd1149ced8114e4ba +EBUILD xtables-addons-3.3.ebuild 5471 BLAKE2B d0d15134eaa4adf16cbfeb289dd3bfbbf3fce8635e0448a23298e3e275016a735fcbe08fb1427de7203344a5c24eb839d6eedae360ab4bb238378a03abac7057 SHA512 f885f314f54bf2b26218f7daf06c763e004f19d2e36f3f658cff75f428a2ce5891ebd555f7b5464db129d6d419a4aca9339dbb2e5b861a30077e13f678a4ee8e MISC metadata.xml 775 BLAKE2B 3462baf963682f15042f1fe9a985fdce50d46abb5fbe1080f6ce5285314a3e24581d780d84112a5bed0a4a132ce17f29678983711a38745d0fd7969091e76182 SHA512 85474ba552703d77bc7cc18ccef424f5eeb68e23eb41e14a8c360afcdcb2632a99420fda2dca57ea15dbda3f850d939c16b18cbdc96dbfcf31a6af3f40743f0c diff --git a/net-firewall/xtables-addons/xtables-addons-2.14.ebuild b/net-firewall/xtables-addons/xtables-addons-2.14.ebuild deleted file mode 100644 index 5fc031f3e9ca..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-2.14.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MODULES_OPTIONAL_USE=modules -MODULES_OPTIONAL_USE_IUSE_DEFAULT=1 -inherit eutils linux-info linux-mod multilib - -DESCRIPTION="iptables extensions not yet accepted in the main kernel" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/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 logmark ipmark echo dnetmap dhcpmac delude chaos account" - -for mod in ${MODULES}; do - IUSE="${IUSE} xtables_addons_${mod}" -done - -DEPEND=">=net-firewall/iptables-1.4.5" - -RDEPEND="${DEPEND} - xtables_addons_geoip? ( - app-arch/unzip - 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 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead" - 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 '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild deleted file mode 100644 index 80ab8675e8f4..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MODULES_OPTIONAL_USE=modules -MODULES_OPTIONAL_USE_IUSE_DEFAULT=1 -inherit eutils linux-info linux-mod multilib - -DESCRIPTION="iptables extensions not yet accepted in the main kernel" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/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 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/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 15 && die "${P} requires kernel version >= 4.15, if you have older kernel please use 2.x version instead" - 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 '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-3.1.ebuild b/net-firewall/xtables-addons/xtables-addons-3.1.ebuild deleted file mode 100644 index bbc32dee9f88..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-3.1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MODULES_OPTIONAL_USE=modules -MODULES_OPTIONAL_USE_IUSE_DEFAULT=1 -inherit eutils linux-info linux-mod multilib - -DESCRIPTION="iptables extensions not yet accepted in the main kernel" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/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 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/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 '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-3.2.ebuild b/net-firewall/xtables-addons/xtables-addons-3.2.ebuild deleted file mode 100644 index bbc32dee9f88..000000000000 --- a/net-firewall/xtables-addons/xtables-addons-3.2.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MODULES_OPTIONAL_USE=modules -MODULES_OPTIONAL_USE_IUSE_DEFAULT=1 -inherit eutils linux-info linux-mod multilib - -DESCRIPTION="iptables extensions not yet accepted in the main kernel" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/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 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/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 '{}' '+' -} diff --git a/net-firewall/xtables-addons/xtables-addons-3.3.ebuild b/net-firewall/xtables-addons/xtables-addons-3.3.ebuild index f5b31b42fdca..a19790d7af14 100644 --- a/net-firewall/xtables-addons/xtables-addons-3.3.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-3.3.ebuild @@ -26,6 +26,7 @@ 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 ) -- cgit v1.2.3