diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLanguages mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLanguages
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLanguages	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLanguages	2006-06-08 05:42:10.176248273 +1000
@@ -0,0 +1 @@
+all
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLocales mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLocales
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLocales	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/db/configuration/defaults/spamassassin/OkLocales	2006-06-08 05:42:15.552313135 +1000
@@ -0,0 +1 @@
+all
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_languages mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_languages
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_languages	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_languages	2006-06-08 05:44:52.684980724 +1000
@@ -0,0 +1,3 @@
+{
+    return "ok_languages " . ($spamassassin{OkLanguages} || 'all');
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_locales mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_locales
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_locales	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10ok_locales	2006-06-08 05:45:08.875164526 +1000
@@ -0,0 +1,3 @@
+{
+    return "ok_locales " . ($spamassassin{OkLocales} || 'all');
+}
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths	1970-01-01 10:00:00.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10paths	2006-06-08 05:45:23.834562416 +1000
@@ -0,0 +1,2 @@
+bayes_path /var/spool/spamd/.spamassassin/bayes
+bayes_file_mode 750
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10trusted_networks mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10trusted_networks
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10trusted_networks	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/10trusted_networks	2006-06-08 05:44:22.133295031 +1000
@@ -1,4 +1,4 @@
 {
     $OUT = "clear_trusted_networks\n";
-    $OUT .= "trusted_networks " . ($spamassassin{TrustedNetworks} || '127.');
+    $OUT .= "trusted_networks $LocalIP " . ($spamassassin{TrustedNetworks} || '127.');
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_00 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_00
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_00	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_00	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_00 { $spamassassin{BAYES_00} || '-1.000' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_05 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_05
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_05	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_05	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_05 { $spamassassin{BAYES_05} || '-0.750' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_20 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_20
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_20	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_20	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_20 { $spamassassin{BAYES_20} || '-0.250' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_40 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_40
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_40	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_40	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_40 { $spamassassin{BAYES_40} || '0.100' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_50 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_50
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_50	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_50	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_50 { $spamassassin{BAYES_50} || '1.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_60 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_60
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_60	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_60	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_60 { $spamassassin{BAYES_60} || '2.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_80 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_80
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_80	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_80	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_80 { $spamassassin{BAYES_80} || '3.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_95 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_95
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_95	2006-03-16 11:41:02.000000000 +1100
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_95	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_95 { $spamassassin{BAYES_95} || '4.000' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_99 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_99
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_99	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_BAYES_99	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score BAYES_99 { $spamassassin{BAYES_99} || '4.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_DCC_CHECK mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_DCC_CHECK
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_DCC_CHECK	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_DCC_CHECK	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score DCC_CHECK { $spamassassin{DCC_CHECK} || '3.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CF_RANGE_51_100 mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CF_RANGE_51_100
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CF_RANGE_51_100	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CF_RANGE_51_100	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score RAZOR2_CF_RANGE_51_100 { $spamassassin{RAZOR2_CF_RANGE_51_100} || '2.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CHECK mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CHECK
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CHECK	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RAZOR2_CHECK	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score RAZOR2_CHECK { $spamassassin{RAZOR2_CHECK} || '2.500' }
diff -Nur -x '*.orig' -x '*.rej' smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RCVD_IN_BL_SPAMCOP_NET mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RCVD_IN_BL_SPAMCOP_NET
--- smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RCVD_IN_BL_SPAMCOP_NET	2005-09-24 07:25:26.000000000 +1000
+++ mezzanine_patched_smeserver-spamassassin-1.4.0/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/40customScore_RCVD_IN_BL_SPAMCOP_NET	1970-01-01 10:00:00.000000000 +1000
@@ -1 +0,0 @@
-score RCVD_IN_BL_SPAMCOP_NET { $spamassassin{SPAMCOP_NET} || '3.000' }