| 1 |
pva 11/07/28 16:43:53 |
| 2 |
|
| 3 |
Modified: ChangeLog xtables-addons-1.37.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.20 net-firewall/xtables-addons/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?rev=1.20&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?rev=1.20&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?r1=1.19&r2=1.20 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v |
| 19 |
retrieving revision 1.19 |
| 20 |
retrieving revision 1.20 |
| 21 |
diff -u -r1.19 -r1.20 |
| 22 |
--- ChangeLog 24 Jul 2011 10:24:39 -0000 1.19 |
| 23 |
+++ ChangeLog 28 Jul 2011 16:43:53 -0000 1.20 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-firewall/xtables-addons |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.19 2011/07/24 10:24:39 pva Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.20 2011/07/28 16:43:53 pva Exp $ |
| 29 |
+ |
| 30 |
+ 28 Jul 2011; Peter Volkov <pva@g.o> xtables-addons-1.37.ebuild: |
| 31 |
+ Disable TEE for kernel >= 2.6.35 as it's already in kernel and no need to |
| 32 |
+ build it here. Fixes bug #376633 reported by Olivier Huber. |
| 33 |
|
| 34 |
*xtables-addons-1.37 (24 Jul 2011) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 net-firewall/xtables-addons/xtables-addons-1.37.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: xtables-addons-1.37.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.37.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- xtables-addons-1.37.ebuild 24 Jul 2011 10:24:39 -0000 1.1 |
| 52 |
+++ xtables-addons-1.37.ebuild 28 Jul 2011 16:43:53 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI="4" |
| 60 |
inherit eutils linux-info linux-mod multilib autotools |
| 61 |
@@ -54,6 +54,14 @@ |
| 62 |
die "${PN} with ipset requires kernel version >= 2.6.29" |
| 63 |
fi |
| 64 |
kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29" |
| 65 |
+ if use xtables_addons_tee && kernel_is -gt 2 6 35; then |
| 66 |
+ CONFIG_CHECK="NETFILTER_XT_TARGET_TEE" |
| 67 |
+ ERROR_NETFILTER_XT_TARGET_TEE="Please enable TEE target in your kernel." |
| 68 |
+ # SKIP_MODULES in case we need to disable building of everything |
| 69 |
+ # like having this USE disabled |
| 70 |
+ SKIP_MODULES="tee" |
| 71 |
+ ewarn "TEE modules is provided by kernel. Skipping its build..." |
| 72 |
+ fi |
| 73 |
fi |
| 74 |
} |
| 75 |
|
| 76 |
@@ -115,6 +123,7 @@ |
| 77 |
MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" |
| 78 |
fi |
| 79 |
for mod in ${MODULES}; do |
| 80 |
+ has ${mod} ${SKIP_MODULES} && continue |
| 81 |
if use xtables_addons_${mod}; then |
| 82 |
sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die |
| 83 |
if use modules; then |
Archives