diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2015-07-06 13:13:45 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2015-07-06 13:13:45 +0000 |
commit | b972f70e86520e0e7a24306008433413df043d24 (patch) | |
tree | 60d00ddb1f0f8503965b80b729a1a593873f2252 /net-firewall | |
parent | Stable for x86, wrt bug #553980 (diff) | |
download | gentoo-2-b972f70e86520e0e7a24306008433413df043d24.tar.gz gentoo-2-b972f70e86520e0e7a24306008433413df043d24.tar.bz2 gentoo-2-b972f70e86520e0e7a24306008433413df043d24.zip |
Generalize module + kernel version checking since XTABLES_ADDONS=tarpit doesn't build on linux-4.1 and above. Bug #553630.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'net-firewall')
-rw-r--r-- | net-firewall/xtables-addons/ChangeLog | 7 | ||||
-rw-r--r-- | net-firewall/xtables-addons/xtables-addons-2.6.ebuild | 32 | ||||
-rw-r--r-- | net-firewall/xtables-addons/xtables-addons-2.7.ebuild | 32 |
3 files changed, 46 insertions, 25 deletions
diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog index 6c92dbda0923..55cba2cc97fb 100644 --- a/net-firewall/xtables-addons/ChangeLog +++ b/net-firewall/xtables-addons/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/xtables-addons # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.50 2015/07/06 12:38:13 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.51 2015/07/06 13:13:45 blueness Exp $ + + 06 Jul 2015; Anthony G. Basile <blueness@gentoo.org> + xtables-addons-2.6.ebuild, xtables-addons-2.7.ebuild: + Generalize module + kernel version checking since XTABLES_ADDONS=tarpit + doesn't build on linux-4.1 and above. Bug #553630. 06 Jul 2015; Anthony G. Basile <blueness@gentoo.org> -xtables-addons-2.4.ebuild, -xtables-addons-2.5.ebuild, diff --git a/net-firewall/xtables-addons/xtables-addons-2.6.ebuild b/net-firewall/xtables-addons/xtables-addons-2.6.ebuild index 9028d4ca7e88..59570730c351 100644 --- a/net-firewall/xtables-addons/xtables-addons-2.6.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.2 2015/07/06 12:38:13 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.3 2015/07/06 13:13:45 blueness Exp $ EAPI="5" @@ -119,10 +119,29 @@ XA_get_module_name() { done } +# Die on modules known to fial 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#c0. tarpit fails on linux-4.1 and above. + # Bug #553630#c2. echo fails on linux-4 and above. + XA_known_failure "tarpit" 4.1 + XA_known_failure "echo" 4 + local mod module_name if use modules; then MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" @@ -139,17 +158,6 @@ src_prepare() { sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die fi done - - # Bug #553630. echo fails to build on linux-4 kernels. - KV_max=4.0.0 - if use xtables_addons_echo && kernel_is ge ${KV_max//./ }; then - eerror - eerror "XTABLES_ADDONS=echo fails to build on linux ${KV_max} or above." - eerror "Either XTABLES_ADDONS=echo or use an earlier version of the kernel." - eerror - die - fi - einfo "${MODULE_NAMES}" # for debugging sed -e 's/depmod -a/true/' -i Makefile.in || die diff --git a/net-firewall/xtables-addons/xtables-addons-2.7.ebuild b/net-firewall/xtables-addons/xtables-addons-2.7.ebuild index d77993c025d7..cb672f6ce91e 100644 --- a/net-firewall/xtables-addons/xtables-addons-2.7.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.2 2015/07/06 12:38:13 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.3 2015/07/06 13:13:45 blueness Exp $ EAPI="5" @@ -119,10 +119,29 @@ XA_get_module_name() { done } +# Die on modules known to fial 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#c0. tarpit fails on linux-4.1 and above. + # Bug #553630#c2. echo fails on linux-4 and above. + XA_known_failure "tarpit" 4.1 + XA_known_failure "echo" 4 + local mod module_name if use modules; then MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" @@ -139,17 +158,6 @@ src_prepare() { sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die fi done - - # Bug #553630. echo fails to build on linux-4 kernels. - KV_max=4.0.0 - if use xtables_addons_echo && kernel_is ge ${KV_max//./ }; then - eerror - eerror "XTABLES_ADDONS=echo fails to build on linux ${KV_max} or above." - eerror "Either XTABLES_ADDONS=echo or use an earlier version of the kernel." - eerror - die - fi - einfo "${MODULE_NAMES}" # for debugging sed -e 's/depmod -a/true/' -i Makefile.in || die |