From aca381d3b6edb9656e92530b7c1030ed118fdc3b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Sat, 2 Oct 2010 00:36:54 +0200
Subject: [PATCH] mconfig: deactivate building of xt_TEE and xt_CHECKSUM

---
 doc/changelog.txt | 4 ++++
 mconfig           | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index d76f4a6..fdb74e3 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -4,6 +4,10 @@ HEAD
 - update to ipset 4.4
   * ipport{,ip,net}hash did not work with mixed "src" and "dst"
     destination parameters
+- deactivate building xt_TEE and xt_CHECKSUM by default, as these have been
+  merged upstream in Linux 2.6.35 and 2.6.36, respectively.
+  Distros still wishing to build this need to enable it in their build
+  script, e.g. perl -i -pe 's{^build_TEE=.*}{build_TEE=m}' mconfig;
 
 
 v1.29 (September 29 2010)
diff --git a/mconfig b/mconfig
index a119e26..6bfeb71 100644
--- a/mconfig
+++ b/mconfig
@@ -2,7 +2,7 @@
 #
 build_ACCOUNT=m
 build_CHAOS=m
-build_CHECKSUM=m
+build_CHECKSUM=
 build_DELUDE=m
 build_DHCPMAC=m
 build_ECHO=
@@ -12,7 +12,7 @@ build_RAWNAT=m
 build_STEAL=m
 build_SYSRQ=m
 build_TARPIT=m
-build_TEE=m
+build_TEE=
 build_condition=m
 build_fuzzy=m
 build_geoip=m