From 99f944b74df6bf5f91fe72165508c687741a3119 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 28 Jul 2011 16:43:53 +0000 Subject: [PATCH] Disable TEE for kernel >= 2.6.35 as it's already in kernel and no need to build it here. Fixes bug #376633 reported by Olivier Huber. Package-Manager: portage-2.1.10.7/cvs/Linux x86_64 --- net-firewall/xtables-addons/ChangeLog | 6 +++++- net-firewall/xtables-addons/Manifest | 4 ++-- .../xtables-addons/xtables-addons-1.37.ebuild | 11 ++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog index 71a362230f43..8d5151b70901 100644 --- a/net-firewall/xtables-addons/ChangeLog +++ b/net-firewall/xtables-addons/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/xtables-addons # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.19 2011/07/24 10:24:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.20 2011/07/28 16:43:53 pva Exp $ + + 28 Jul 2011; Peter Volkov xtables-addons-1.37.ebuild: + Disable TEE for kernel >= 2.6.35 as it's already in kernel and no need to + build it here. Fixes bug #376633 reported by Olivier Huber. *xtables-addons-1.37 (24 Jul 2011) diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest index 9d738a090dec..b012777972bb 100644 --- a/net-firewall/xtables-addons/Manifest +++ b/net-firewall/xtables-addons/Manifest @@ -9,6 +9,6 @@ EBUILD xtables-addons-1.28-r1.ebuild 4186 RMD160 b362f70b738c4680e0ca7dd8f1ae258 EBUILD xtables-addons-1.30.ebuild 4185 RMD160 67edabf5a465e90de16c8cc9664016de9c26d03c SHA1 9b7463c6debd14998ed3831156566830f0102a80 SHA256 780cb489b912d5ebe699a4f5d74da4f7924ab962abed31a94a65cc38b3f78036 EBUILD xtables-addons-1.31.ebuild 4193 RMD160 62d7312a966c4d91acb7c36e4c809c8c61b0e091 SHA1 9fb25977596054d7441f106930cb5784715294e0 SHA256 762ff274a169d37ac5d77bd456bc2f9ad247e06ccfa350c918c5a337efa69388 EBUILD xtables-addons-1.36.ebuild 4930 RMD160 c964eb1409a539cae9baf697cc054f991465d7ad SHA1 7cfa731fe771458c4a98f7e06ea3bc5e91848f26 SHA256 84707e6e1bfc79a55e93461a35731cab4b2150be6d1d5667e73671824bae68fb -EBUILD xtables-addons-1.37.ebuild 4822 RMD160 49c9547d35f237ca05a721a7c8cd2a1f95389de7 SHA1 10db651d61bcb1a9358d800d1fc01d8f3473ffa0 SHA256 12e35aa04659140187a20869b15c8bc74279529aeb1c91a90212201ce5fc76d0 -MISC ChangeLog 3464 RMD160 48a9d98dcf6c1d3f75131123d376bceb246918bd SHA1 e25b62be6af5bd1d690bff56041f9ff944adab01 SHA256 78dc54dea0158bf49335687cbc6d1c18a95bcb2810729d8c81b8f781d4f41f2a +EBUILD xtables-addons-1.37.ebuild 5237 RMD160 d16a47c976186d9924465f8cc1baba6600326338 SHA1 2ffddc72428d6b248235ac2b74b545c321593c78 SHA256 27a224e51ed26148529b31462325d11bd0576354560aea6c1f7cafb845db912f +MISC ChangeLog 3676 RMD160 f9696215732764e4b61d0645f793e3bb22fc256b SHA1 b10009f1c1384fa71a3de5e936bf7ebe5675b64b SHA256 51cd6ed57dbb29886ef456db17cbb1a524e01b125ac84d78254f1ce9861b73c3 MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad diff --git a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild index 07dfb3709951..f8dec5c8e780 100644 --- a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild +++ b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild,v 1.1 2011/07/24 10:24:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild,v 1.2 2011/07/28 16:43:53 pva Exp $ EAPI="4" inherit eutils linux-info linux-mod multilib autotools @@ -54,6 +54,14 @@ pkg_setup() { die "${PN} with ipset requires kernel version >= 2.6.29" fi kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29" + if use xtables_addons_tee && kernel_is -gt 2 6 35; then + CONFIG_CHECK="NETFILTER_XT_TARGET_TEE" + ERROR_NETFILTER_XT_TARGET_TEE="Please enable TEE target in your kernel." + # SKIP_MODULES in case we need to disable building of everything + # like having this USE disabled + SKIP_MODULES="tee" + ewarn "TEE modules is provided by kernel. Skipping its build..." + fi fi } @@ -115,6 +123,7 @@ src_prepare() { MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" fi for mod in ${MODULES}; do + has ${mod} ${SKIP_MODULES} && continue if use xtables_addons_${mod}; then sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die if use modules; then -- 2.26.2