[gentoo-commits] gentoo-x86 commit in net-firewall/xtables-addons: xtables-addons-2.7.ebuild xtables-addons-2.6.ebuild ChangeLog xtables-addons-2.4.ebuild xtables-addons-2.5.ebuild
blueness15/07/06 12:38:14 Modified: xtables-addons-2.7.ebuild xtables-addons-2.6.ebuild ChangeLog Removed: xtables-addons-2.4.ebuild xtables-addons-2.5.ebuild Log: XTABLES_ADDONS=echo doesn't build on linux-4.0.0 and above. Bug #553630. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) Revision ChangesPath 1.2 net-firewall/xtables-addons/xtables-addons-2.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?rev=1.2view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?rev=1.2content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?r1=1.1r2=1.2 Index: xtables-addons-2.7.ebuild === RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xtables-addons-2.7.ebuild 6 Jul 2015 12:03:08 - 1.1 +++ xtables-addons-2.7.ebuild 6 Jul 2015 12:38:13 - 1.2 @@ -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.1 2015/07/06 12:03:08 blueness Exp $ +# $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 $ EAPI=5 @@ -139,6 +139,17 @@ 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 1.2 net-firewall/xtables-addons/xtables-addons-2.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?rev=1.2view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?rev=1.2content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?r1=1.1r2=1.2 Index: xtables-addons-2.6.ebuild === RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xtables-addons-2.6.ebuild 30 Sep 2014 21:35:28 - 1.1 +++ xtables-addons-2.6.ebuild 6 Jul 2015 12:38:13 - 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.1 2014/09/30 21:35:28 blueness Exp $ +# $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 $ EAPI=5 @@ -139,6 +139,17 @@ 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 1.50 net-firewall/xtables-addons/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?rev=1.50view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?rev=1.50content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?r1=1.49r2=1.50 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 6 Jul 2015 12:03:08 - 1.49 +++
[gentoo-commits] gentoo-x86 commit in net-firewall/xtables-addons: xtables-addons-2.7.ebuild xtables-addons-2.6.ebuild ChangeLog
blueness15/07/06 13:13:45 Modified: xtables-addons-2.7.ebuild xtables-addons-2.6.ebuild ChangeLog Log: 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) Revision ChangesPath 1.3 net-firewall/xtables-addons/xtables-addons-2.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?r1=1.2r2=1.3 Index: xtables-addons-2.7.ebuild === RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xtables-addons-2.7.ebuild 6 Jul 2015 12:38:13 - 1.2 +++ xtables-addons-2.7.ebuild 6 Jul 2015 13:13:45 - 1.3 @@ -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 @@ 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 @@ 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 1.3 net-firewall/xtables-addons/xtables-addons-2.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?r1=1.2r2=1.3 Index: xtables-addons-2.6.ebuild === RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xtables-addons-2.6.ebuild 6 Jul 2015 12:38:13 - 1.2 +++ xtables-addons-2.6.ebuild 6 Jul 2015 13:13:45 - 1.3 @@ -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 @@ 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