From 666891e82ebde0b7b23d42e4eb903d00599baec2 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Sat, 29 Jun 2013 08:57:50 +0200
Subject: [PATCH] Current state

---
 bash/bashrc                                   |   1 +
 bind/named-sec.conf                           |  22 +++
 postfix/get-checks-from-postfixbuch.sh        |   5 +-
 postfix/maps/body_checks                      | 180 ++++++++++++------
 postfix/maps/header_checks                    | 104 ++++++++--
 .../old/body_checks.2008-10-01_16:37:41}      | 180 ++++++------------
 .../old/header_checks.2008-09-12_12:52:55}    | 104 ++--------
 sgml/catalog                                  |   2 +-
 texmf/ls-R                                    |   2 +
 texmf/updmap.d/texlive-latexextra.cfg         |   3 +
 texmf/updmap.d/texlive-pictures.cfg           |   2 +
 texmf/web2c/updmap.cfg                        |   5 +
 12 files changed, 323 insertions(+), 287 deletions(-)
 rename postfix/{body_checks => maps/old/body_checks.2008-10-01_16:37:41} (82%)
 rename postfix/{header_checks => maps/old/header_checks.2008-09-12_12:52:55} (75%)
 create mode 100644 texmf/updmap.d/texlive-latexextra.cfg
 create mode 100644 texmf/updmap.d/texlive-pictures.cfg

diff --git a/bash/bashrc b/bash/bashrc
index e146196..df6b0b8 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -101,6 +101,7 @@ if [[ ${EUID} == 0 ]] ; then
 else
   alias ll="ls -l"
 fi
+alias l="ls -l"
 alias la="ls -la"
 alias md=mkdir
 alias rd=rmdir
diff --git a/bind/named-sec.conf b/bind/named-sec.conf
index b18ee47..1c9d502 100644
--- a/bind/named-sec.conf
+++ b/bind/named-sec.conf
@@ -157,6 +157,28 @@ zone "irtk.de" IN {
     };
 };
 
+zone "klavierstudio.de" IN {
+    type slave;
+    file "sec/klavierstudio.de.zone";
+    masters {
+		85.214.147.150;
+    };
+    allow-transfer {
+        common-allow-transfer;
+    };
+};
+
+zone "klavier-hamburg.de" IN {
+    type slave;
+    file "sec/klavier-hamburg.de.zone";
+    masters {
+		85.214.147.150;
+    };
+    allow-transfer {
+        common-allow-transfer;
+    };
+};
+
 zone "kleinanzeigen-mv.de" IN {
     type slave;
     file "sec/kleinanzeigen-mv.de.zone";
diff --git a/postfix/get-checks-from-postfixbuch.sh b/postfix/get-checks-from-postfixbuch.sh
index 2136bb8..30955dd 100755
--- a/postfix/get-checks-from-postfixbuch.sh
+++ b/postfix/get-checks-from-postfixbuch.sh
@@ -6,12 +6,13 @@ BASE_URL="http://www.postfixbuch.de/upload"
 echo "[$( date )]: Checking for new versions of postfix checkfiles from »${BASE_URL}« ..."
 
 POSTFIX_DIR=/etc/postfix
+PF_MAP_DIR="${POSTFIX_DIR}/maps"
 RESTART_POSTFIX=
 
-cd ${POSTFIX_DIR} || exit 5
+cd ${PF_MAP_DIR} || exit 5
 
 for FILE_BASE in body_checks header_checks; do
-    POSTFIX_FILE="${POSTFIX_DIR}/${FILE_BASE}"
+    POSTFIX_FILE="${PF_MAP_DIR}/${FILE_BASE}"
     URL="${BASE_URL}/${FILE_BASE}"
     TMP_FILE=$( mktemp "/tmp/${FILE_BASE}.XXXXXXXX.txt" )
 
diff --git a/postfix/maps/body_checks b/postfix/maps/body_checks
index c5e60c0..8a39733 100644
--- a/postfix/maps/body_checks
+++ b/postfix/maps/body_checks
@@ -1,4 +1,4 @@
-# Version 3.14 / 8.8.2008
+# Version 4.0
 #
 # Das Postfix-Buch - Sichere Mailserver mit Linux
 # http://www.postfixbuch.de
@@ -35,6 +35,7 @@
 # Es kann stattdessen auch einfacher Text benutzt werden.
 #
 
+
 #
 #
 # Tagesaktuelle, nur voruebergehende Regelungen:
@@ -42,13 +43,6 @@
 # [Immer mit Timestamp (!) und ggf. Ticket-Nummer eintragen!]
 #
 
-/Subject:.*Mittel gegen Impotenz/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
-/Subject:.*Potenzschwache - wir haben die Losung/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
-/Subject:.*Endlich wieder Spass am Leben/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
-/by hefe.heinlein-support.de; Fri, 18/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
-/Subject:.*Belebt Geist und Korper/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
-/Subject:.* Viiiiiiaaaaaaagra/	REJECT You are a stupid backscatter. Please learn how to manage your mailserver.
-
 #
 #
 # Dauerhaft genutzte Regelungen:
@@ -57,31 +51,109 @@
 #
 #
 
-/respublica@gaucherepublicaine.org/ Body-Spamschutz 1072
-/NEU - Vi Super Active/ REJECT Body-Spamschutz 1071
-/anhaltende Versagensangste und wiederholte peinliche Situationen/	REJECT Body-Spamschutz 1070
-/anhaltende Versagensangste und wiederholte peinliche Situationen/	REJECT Body-Spamschutz 1069
-/Schulfreunde Vermittlungs Service AG/  REJECT Body-Spamschutz 1068
-/Multimedia Telegramm/  REJECT Body-Spamschutz 1067
-/http.*\.fdub\.biz/     REJECT Body-Spamschutz 1066
-/TanjaGuenther/	REJECT Body-Spamschutz 1065
-/www.bestnetz24.de\/letter\/ausgabe.php/	REJECT Body-Spamschutz 1064
-/www.db.?adressen.(com|net|org|info)/	REJECT Body-Spamschutz 1063
-/thomas@jthomas.es/	REJECT Body-Spamschutz 1062
-/Ihre Marketing Agentur Espa/	REJECT Body-Spamschutz 1061
-/www.pakandu.com/	REJECT Body-Spamschutz 1060
-/Glob.?(C|K)ontact.?Team/	REJECT Body-Spamschutz 1059
-/www.gc.?datenbaken.(com|net|org|info)/	REJECT Body-Spamschutz 1058
-/www.glc-?data.(com|net|org|info)/	REJECT Body-Spamschutz 1057
-/Global.?(C|K)ontact/i	REJECT Body-Spamschutz 1056
-/www.imarketing.com.br.remove/	REJECT Body-Spamschutz 1055 
-/Bestellen Sie jetzt und vergessen Sie Ihre Enttauschungen/     REJECT Body-Spamschutz 1054
-/Online Apotheke - original Qualitaet/  REJECT Body-Spamschutz 1053
-/Wir wissen was Frauen wollern/         REJECT Body-Spamschutz 1052
-/Viiiiaaaaaagra/        REJECT Body-Spamschutz 1051
-/Web: www.eurasianpages. com/	REJECT Body-Spamschutz 1050
-/^Firma Global Contact bietet Ihnen/	REJECT Body-Spamschutz 1049
-/www.g-adressen.net/	REJECT Body-Spamschutz 1048
+/http:\/\/Super-Rabatte-2013-14111.com/ REJECT Body-Spamschutz 1159
+/http:\/\/slpia.lk/	REJECT Body-Spamschutz 1158
+/http:\/\/www.direkt-sicher.com\/starten\/privatkunde/	REJECT	Body-Spamschutz 1157
+/Unser ING-DIBA  Sicherheits Bereich investiert sehr viel Zeit,/	REJECT Body-Spamschutz 1156
+/ürzlich zeigen unsere Aufzeichnungen, dass Ihr Postbank-Konto möglich durch einen Dritten unbefugten Zutritt./	REJECT Body-Spamschutzregel 1155
+/We are the department of Asian Domain Registration Service in China. Here I have something/	REJECT Body-Spamschutzregel 1154
+/schicken Sie bitte einen Brief auf Violet@arbeitdeutschland.com/	REJECT Body-Spamschutzregel 1153
+/Dear RandomForename_/	REJECT Body-Spamscutzregel 1152
+/http:\/\/defiteq.com\/qms\/upload/	REJECT Body-Spamscutzregel 1151
+/mail.iphone.mn/	REJECT Body-Spamscutzregel 1150
+/http:\/\/www.safe-slh.com/ REJECT Body-Spamschutzregel 1149
+/Sie konnen Ihre Postsendung in unserer Postabteilung personlich kriegen/ REJECT Body-Spamschutzregel 1148
+/Sie sollen dieses Postetikett drucken lassen/ REJECT Body-Spamschutzregel 1147
+/Wenn dies nicht sofort machen Sie Ihre E-Mail-Adresse deaktiviert von unserem Server\./ REJECT Body-Spamschutzregel 1146
+/^Message-ID:*@vps332995.netsons.net/	REJECT	Body-Spamschutzregel 1145
+/dildodaddy/ REJECT Body-Spamschutzregel 1144
+/mehreren fehlgeschlagenen TAN-Eingeben/ REJECT Body-Spamschutzregel 1143
+/filename\=\"c.g.euromilion.pdf\"/	REJECT	Body-Spamscutzregel 1142
+/^Bei Interesse bitten wir um folgende$/	REJECT Body-Spamscutzregel 1141
+/palmandmore\.de/ REJECT Body-Spamschutzregel 1140
+/kundenverifikationservice\.u2m\.ru\/VERIFY\.PHP REJECT/ Body-Spamschutzregel 1139
+/co.cc\/aff\/item.php\?usn\=(aeb1|dap1|dvg1)\&i\=it\_ep\&e\=admin\@groupon.de/	REJECT	Body-Spamschutzregel 1138
+/You Are Guaranteed To Get Paid Instantly For Each Email You Process!/	REJECT	Body-Spamschutzregel 1137
+/I (talk|speak) 2 \'languages\'. Now i\'m 24. I/	REJECT	Body-Spamschutzregel 1136
+/My nickname \"Kuma\"\! \:\) I/	REJECT	Body-Spamschutzregel 1135
+/http:\/\/free.fr\/support\/verification\/compte\//	REJECT	Body-Spamschutzregel 1134
+/http:\/\/sonofages.free.fr\/images\/LogoCreditMutuel.png/ REJECT	Body-Spamschutzregel 1133
+/ucc.edu.ni/	REJECT	Body-Spamschutzregel 1132
+/7figureincome\.php/	REJECT Body-Spamschutzregel 1131
+/Cher Client Verified by Visa/	REJECT	Body-Spamschutzregel 1130
+/^From: "Topillen Apotheke" / REJECT Body-Spamschutzregel 1129
+/^Aufgrund mehrerer Phishing Versuche, unsere Visa und Mastercard/ REJECT Body-Spamschutzregel 1128
+/^ Phishing Departament/                        REJECT Body-Spamschutzregel 1127
+/We wish to invest between $5Million-$100Million in any viable projects/ REJECT Body-Spamschutzregel 1126
+/God bless you as you get back to me/   REJECT  Body-Spamschutzregel 1125
+/www.(b|B)ien(e|E)tremag.com/	REJECT	Body-Spamschutzregel 1124
+/Sehr geehrte Sparkasse Card/	REJECT	Body-Spamschutzregel 1123
+/zigaretten-discount.info/	REJECT	Body-Spamschutzregel 1122
+/zigaretten-discount\[punkt\]info/	REJECT	Body-Spamschutzregel 1121
+/Guten Tag Mitglied [0-9]{5}/	REJECT	Body-Spamschutzregel 1120
+/elenx.innovacon.com\/.e\/e.php/	REJECT	Body-Spamschutzregel 1119
+/www.sniperrs.de\/modules\/Forums\/admin/	REJECT	Body-Spamschutzregel 1118
+/boxneufnet.com\/id\/oragne.fr\/Identifiant/	REJECT	Body-Spamschutzregel 1117
+/www.colellsa.com\/img\/quienes\/pabo\/paypal-fr/	REJECT	Body-Spamschutzregel 1116
+/dekmor.cmu.ac.th\/sticker\/upload\/Logs\/Login\/webscrcmd/	REJECT	Body-Spamschutzregel 1115
+/ektoschronou.com/	REJECT	Body-Spamschutzregel 1114
+/ulouwaio.com/	REJECT	Body-Spamschutzregel 1113
+/logonature.com.nu/	REJECT	Body-Spamschutzregel 1112
+/suinlop.com/	REJECT Body-Spamschutzregel 1111
+/soudoorpo.com/	REJECT Body-Spamschutzregel 1110
+/GOOGLE AUSSTATTUNGSFONDS 20.?.? GEWINNER ANMELDEFORMULAR FUER ZAHLUNG/	REJECT Body-Spamschutzregel 1109
+/Anbieter: Privacy GG Limited, 99 Albert Street, Belize City, CA/ 	REJECT Body-Spamschutzregel 1108
+/^Die Nachricht wurde durch Interads 24 Ltd/	REJECT Body-Spamschutzregel 1107
+/www.sommer-mit-kollegen.de/	REJECT Body-Spamschutzregel 1006
+# Ein Spammer versenden immer Austragungslinks, die auf "/ausa" enden:
+/^www.*\/ausa$/			REJECT Body-Spamschutzregel 1105
+/KlickTel Telefonbuch OEM/	REJECT Body-Spamschutzregel 1104
+/www.klicktel24.org/		REJECT Body-Spamschutzregel 1103
+/Klicken Sie hier, und fühlen Sie sich endlich gut behandelt:/	REJECT Body-Spamschutzregel 1102
+/maryjanemax@yahoo.co.uk/	REJECT Body-Spamschutzregel 1101
+/http.*muqugeh\.cn/ 		REJECT Body-Spamschutzregel 1100
+/Bei uns bekommen Sie Ihren Kredit schnell, unbürokratisch, diskret und natürlich ohne Bankauskunft./	REJECT Body-Spamschutzregel 1099
+/INTERNATIONAL LOTTERIE PROMOTION SPIELGEMEINSCHAFT/	REJECT Body-Spamschutzregel 1098 
+/Leider st=F6ren Sie.=20/	REJECT Body-Spamschutzregel 1097
+/Sie haben dieses Email erhalten, weil Sie im Newsletter von Promohouse Ltd eingetragen sind/	REJECT Body-Spamschutzregel 1096
+/ATTN: Beneficiar/	REJECT Body-Spamschutzregel 1095
+/www.hedonismails.de/			REJECT Body-Spamschutzregel 1094
+/www.globadressen.(com|net|org|info)/	REJECT Body-Spamschutzregel 1093
+/elegalal.nextmail.ru/				REJECT Body-Spamschutzregel 1092
+/http:\/\/www.switzerlandpussy.eu/					REJECT Body-Spamschutzregel 1082
+/Die jungen Girls fliegen nur so auf die langen/			REJECT Body-Spamschutzregel 1081
+/\*\*\*\* Commercial use of this software is prohibited \*\*\*\*/	REJECT Body-Spamschutzregel 1080
+/I finded your email in internet and I decide to ask you for help/	REJECT Body-Spamschutzregel 1079
+/Details und moegliche Schritte zur Entsperrung finden Sie/ 	REJECT Body-Spamschutzregel 1078
+/^Amount Won:/				REJECT Body-Spamschutzregel 1077
+/AWARD WINNING NOTICE/i			REJECT Body-Spamschutzregel 1076
+/mixvarejo.com/				REJECT Body-Spamschutzregel 1075
+/www.global-db.(com|net|org)/		REJECT Body-Spamschutzregel 1074
+/^I am Barrister/			REJECT Body-Spamschutzregel 1073
+/respublica@gaucherepublicaine.org/ 	REJECT Body-Spamschutzregel 1072
+/NEU - Vi Super Active/ 		REJECT Body-Spamschutzregel 1071
+/anhaltende Versagensangste und wiederholte peinliche Situationen/	REJECT Body-Spamschutzregel 1070
+/Schulfreunde Vermittlungs Service AG/  REJECT Body-Spamschutzregel 1068
+/Multimedia Telegramm/  REJECT Body-Spamschutzregel 1067
+/http.*\.fdub\.biz/     REJECT Body-Spamschutzregel 1066
+/TanjaGuenther/	REJECT Body-Spamschutzregel 1065
+/www.bestnetz24.de\/letter\/ausgabe.php/	REJECT Body-Spamschutzregel 1064
+/www.db.?adressen.(com|net|org|info)/	REJECT Body-Spamschutzregel 1063
+/thomas@jthomas.es/	REJECT Body-Spamschutzregel 1062
+/Ihre Marketing Agentur Espa/	REJECT Body-Spamschutzregel 1061
+/www.pakandu.com/	REJECT Body-Spamschutzregel 1060
+/Glob.?.?.?(C|K)ontact.?.?.?Team/	REJECT Body-Spamschutzregel 1059
+/www.gc.?datenbaken.(com|net|org|info)/	REJECT Body-Spamschutzregel 1058
+/www.glc-?data.(com|net|org|info)/	REJECT Body-Spamschutzregel 1057
+/Global.?(C|K)ontact/i	REJECT Body-Spamschutzregel 1056
+/www.imarketing.com.br.remove/	REJECT Body-Spamschutzregel 1055 
+/Bestellen Sie jetzt und vergessen Sie Ihre Enttauschungen/     REJECT Body-Spamschutzregel 1054
+/Online Apotheke - original Qualitaet/  REJECT Body-Spamschutzregel 1053
+/Wir wissen was Frauen wollern/         REJECT Body-Spamschutzregel 1052
+/Viiiiaaaaaagra/        REJECT Body-Spamschutzregel 1051
+/Web: www.eurasianpages. com/	REJECT Body-Spamschutzregel 1050
+/^Firma Global Contact bietet Ihnen/	REJECT Body-Spamschutzregel 1049
+/www.g-adressen.net/	REJECT Body-Spamschutzregel 1048
 /NIEMALS geben Sie Ihre Passw.rter an niemanden NUR und melden Sie sich/	REJECT Body-Spamschutzregel 1047 Haspa-Pishing
 /www.loteria.es/	REJECT Body-Spamschutzregel 1046
 /Girls!  Deveelop your sexual reelationship and get even MORE pleasurre!/	REJECT Body-Spamschutzregel 1045
@@ -141,7 +213,7 @@
 
 /We recommend you to follow the instructions in order to keep your computer safe./	REJECT Body-Spamschutzregel 1
 /Sieh Dir einfach mal ein Video an und mach dann gleich ein Treffen/	REJECT Body-Spamschutzregel 2
-/money.*back.*guarant/					REJECT Body-Spamschutzregel 3
+#/money.*back.*guarant/					REJECT Body-Spamschutzregel 3
 / CIALIS /						REJECT Body-Spamschutzregel 4
 /www.galamed.biz/		 	 	REJECT Body-Spamschutzregel 5
 /Starts working in less than 15 min./		REJECT Body-Spamschutzregel 6
@@ -156,8 +228,8 @@
 /D-INFO.*REVERZ/		 	 	REJECT Body-Spamschutzregel 15
 /greatmaleenhancement.biz/			REJECT Body-Spamschutzregel 16
 / Xanax /				 	REJECT Body-Spamschutzregel 17
-/Vic(o|0)din/			 	 	REJECT Body-Spamschutzregel 18
-/Hydr(o|0)c(o|0)d(o|0)ne/		 	REJECT Body-Spamschutzregel 19
+/ Vic(o|0)din /			 	 	REJECT Body-Spamschutzregel 18
+/ Hydr(o|0)c(o|0)d(o|0)ne /		 	REJECT Body-Spamschutzregel 19
 / V1agra /			 	 	REJECT Body-Spamschutzregel 20
 /warehousefull.com/		 	 	REJECT Body-Spamschutzregel 21
 /No doctor visit needed/		 	REJECT Body-Spamschutzregel 22
@@ -199,7 +271,8 @@
 /Der Meister unter den Druckprogrammen: PRINTMASTER 8 GOLD/		 	REJECT Body-Spamschutzregel 58
 /Stellen Sie sich vor, Sie kaufen ein Produkt oder eine Dienstleistung im/ 	REJECT Body-Spamschutzregel 59
 /So finden Sie blitzschnell den NAMEN und ADRESS-EINTRAG zu jeder/		 REJECT Body-Spamschutzregel 60
-/^TVqQAAMAAAAEAAAA\/\/8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA$/   	 	 	REJECT Body-Spamschutzregel Due to recent virus attacks, we temporarily block all Win32 executable files. Please re-send your attachment in a compressed (tar, zip, rar, etc.) form. Your message has NOT been delivered. 61
+# Rausgenommen wegen Groupon, phei, 11.3.13
+# /^TVqQAAMAAAAEAAAA\/\/8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA$/   	 	 	REJECT Body-Spamschutzregel Due to recent virus attacks, we temporarily block all Win32 executable files. Please re-send your attachment in a compressed (tar, zip, rar, etc.) form. Your message has NOT been delivered. 61
 /eptember 2003, Cumulative Patch/		 	 	 		REJECT Body-Spamschutzregel 62
 /Ich bin gerade vor einem neuen.*sehr gef�rlichen V.rus gewarnt/ 	 	REJECT Body-Spamschutzregel 63
 /^RSLxwtYBDB6FCv8ybBcS0zp9VU5of3K4BXuwyehTM0RI9IrSjVuwP94xfn0wgOjouKWzGXHVk3qg$/ 	REJECT Body-Spamschutzregel This is a Sobig-Worm! 64
@@ -242,7 +315,6 @@
 /Sch.*ne Gr.*e von Lucky Casino/			 	REJECT Body-Spamschutzregel 102
 /Weil Sie oder ein anderer bei Lucky Casino/i 		 	REJECT Body-Spamschutzregel 103
 /Endlich habe ich Deine E-Mail Adresse wieder gefunden, das hat aber/i		 	 	REJECT Body-Spamschutzregel 104
-/galerie kurt im hirsch/		 	REJECT Body-Spamschutzregel 
 /X-MS_Scanner: Kein Virus erkannt/		REJECT Body-Spamschutzregel Sober-Wurmsignatur
 /Anti_Virus Service/		 	 	REJECT Body-Spamschutzregel Sober-Wurmsignatur
 
@@ -254,13 +326,13 @@
 /.*waterforge\.com.*/ 	 	 	REJECT Body-Spamschutzregel 111
 /.*capitalwave\.com\?subject=Please*/ 	REJECT Body-Spamschutzregel 112
 /\.virtmundo\.com/ 	 	 	REJECT Body-Spamschutzregel 113
-/Accept Credit Cards/ 	 	 	REJECT Body-Spamschutzregel 114
+#/Accept Credit Cards/ 	 	 	REJECT Body-Spamschutzregel 114
 /Nude Celebrities/ 	 	 	REJECT Body-Spamschutzregel 115
 /PRODUCT or SERVICE/i 	 	 	REJECT Body-Spamschutzregel 116
-/GUARANTEED!/ 	 	 	 	REJECT Body-Spamschutzregel 117
+# /GUARANTEED!/ 	 	 	 	REJECT Body-Spamschutzregel 117
 /Amateur Girls/ 	 	 	REJECT Body-Spamschutzregel 118
-/FREE MEMBERSHIP/ 	 	 	REJECT Body-Spamschutzregel 119
-/bizinfo/ 	 	 	 	REJECT Body-Spamschutzregel 120
+#/FREE MEMBERSHIP/ 	 	 	REJECT Body-Spamschutzregel 119
+#/bizinfo/ 	 	 	 	REJECT Body-Spamschutzregel 120
 # block iframe hack 122
 /<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>/ 	 	 	REJECT Body-Spamschutzregel 123
 # some porn spam phrases 125
@@ -280,12 +352,12 @@
 /(filename|name)="(dhcp*|Emanuel|kmbfejkm|NakedWife|Seicho_no_ie|JAMGCJJA|Sulfnbk)\.exe"/           	 	 	REJECT Body-Spamschutzregel 147
 /(kak|day)\.(reg|hta)/                                          	 	 	REJECT Body-Spamschutzregel 148
 /to be removed[,]* please click.*link/ 	 	 	REJECT Body-Spamschutzregel 151
-/to be removed[,]* from (the|my|our) (mailing|email|e-mail)*[ ]*list/ 	 	 	REJECT Body-Spamschutzregel 152
+# /to be removed[,]* from (the|my|our) (mailing|email|e-mail)*[ ]*list/ 	 	 	REJECT Body-Spamschutzregel 152
 /to be removed[,]* from.*(mailings|offers)/ 	 	 	REJECT Body-Spamschutzregel 153
 /to be removed[,]* from the list send a blank email/ 	 	 	REJECT Body-Spamschutzregel 154
 /to be removed[,]* [e]*[-]*mail.*with/ 	 	 	REJECT Body-Spamschutzregel 155
 /to remove[,]* please send a blank email/ 	 	 	REJECT Body-Spamschutzregel 156
-/remove yourself from this list/ 	 	 	REJECT Body-Spamschutzregel 157
+#/remove yourself from this list/ 	 	 	REJECT Body-Spamschutzregel 157
 /removed from our mail agents/ 	 	 	REJECT Body-Spamschutzregel 158
 /to remove yourself immediately/ 	 	 	REJECT Body-Spamschutzregel 159
 /to remove yourself from future/ 	 	 	REJECT Body-Spamschutzregel 160
@@ -297,8 +369,6 @@
 /our broadcast email software/ 	 	 	REJECT Body-Spamschutzregel 166
 /there are no federal regulations or laws on (email|e-mail) advertising/ 	 	 	REJECT Body-Spamschutzregel 167
 /to receive (no|any) (further|future) (offers|mailings)/ 	 	 	REJECT Body-Spamschutzregel 168
-/do not wish to receive future (e-mail|email)/ 	 	 	REJECT Body-Spamschutzregel 169
-/do not wish to receive (e-mail|email)/ 	 	 	REJECT Body-Spamschutzregel 170
 /unsubscribe from Virtumundo Rewards/ 	 	 	REJECT Body-Spamschutzregel 171
 /if you do not wish to receive email from me/ 	 	 	REJECT Body-Spamschutzregel 172
 /reply with the word remove in the subject line/ 	 	 	REJECT Body-Spamschutzregel 173
@@ -326,7 +396,7 @@
 /this is not an unsolicited mail/ 	 	 	REJECT Body-Spamschutzregel 195
 /this email has not been sent to you unsolicited/ 	 	 	REJECT Body-Spamschutzregel 196
 /has not been sent unsolicited/ 	 	 	REJECT Body-Spamschutzregel 197
-/(wish|would) to be removed from (our|the)/ 	 	 	REJECT Body-Spamschutzregel 199
+#/(wish|would) to be removed from (our|the)/ 	 	 	REJECT Body-Spamschutzregel 199
 /all removes (honored|honoured)/ 	 	 	REJECT Body-Spamschutzregel 200
 /To[ ]+remove[ ]+.*@excite.com/ 	 	 	REJECT Body-Spamschutzregel 201
 /to[ ]+be[ ]+removed[ ]+.*@excite.com/ 	 	 	REJECT Body-Spamschutzregel 202
@@ -448,9 +518,9 @@
 /Barnyard Fucking/ 	 	 	REJECT Body-Spamschutzregel 326
 /BEAUTIFUL Women On The Web/ 	 	 	REJECT Body-Spamschutzregel 327
 /Because Our Records Indicate That You Are A/ 	 	 	REJECT Body-Spamschutzregel 328
-/Because You Agree/ 	 	 	REJECT Body-Spamschutzregel 329
+# /Because You Agree/ 	 	 	REJECT Body-Spamschutzregel 329
 /Because You Have Subscribed To One Of Our/ 	 	 	REJECT Body-Spamschutzregel 330
-/Because You Registered/ 	 	 	REJECT Body-Spamschutzregel 331
+#/Because You Registered/ 	 	 	REJECT Body-Spamschutzregel 331
 /Because You Signed Up At One/ 	 	 	REJECT Body-Spamschutzregel 332
 /Best Porn/ 	 	 	REJECT Body-Spamschutzregel 333
 /Buy Preforeclosure Houses/ 	 	 	REJECT Body-Spamschutzregel 334
@@ -465,7 +535,7 @@
 /Creating Immediate Wealth/ 	 	 	REJECT Body-Spamschutzregel 344
 /Cum Shots/ 	 	 	REJECT Body-Spamschutzregel 345
 /Dear Future/ 	 	 	REJECT Body-Spamschutzregel 348
-/Dear Entrepreneur/ 	 	 	REJECT Body-Spamschutzregel 349
+#/Dear Entrepreneur/ 	 	 	REJECT Body-Spamschutzregel 349
 /Debt Consolidation/ 	 	 	REJECT Body-Spamschutzregel 350
 /Do You Want Financial/ 	 	 	REJECT Body-Spamschutzregel 351
 /Don't Need A Prescription/ 	 	 	REJECT Body-Spamschutzregel 352
@@ -482,13 +552,11 @@
 /Fix Your Credit/ 	 	 	REJECT Body-Spamschutzregel 363
 /Found this company on the internet/ 	 	 	REJECT Body-Spamschutzregel 364
 /Free Bulk Email/ 	 	 	REJECT Body-Spamschutzregel 365
-/Free Cash/ 	 	 	REJECT Body-Spamschutzregel 366
 /Free Direct Email/ 	 	 	REJECT Body-Spamschutzregel 367
 /Free Multiple Moving Cost/ 	 	 	REJECT Body-Spamschutzregel 368
 /Free no obligation/ 	 	 	REJECT Body-Spamschutzregel 369
 /Free Private Webcam/ 	 	 	REJECT Body-Spamschutzregel 370
 /Free S e x/ 	 	 	REJECT Body-Spamschutzregel 371
-/Free Sex/ 	 	 	REJECT Body-Spamschutzregel 372
 /Free Vacation Giveaway/ 	 	 	REJECT Body-Spamschutzregel 373
 /Free XXX/ 	 	 	REJECT Body-Spamschutzregel 374
 /From A Concerned Gas User/ 	 	 	REJECT Body-Spamschutzregel 375
@@ -521,7 +589,7 @@
 /I'm a total exibitionist/ 	 	 	REJECT Body-Spamschutzregel 402
 /Im a total exibitionist/ 	 	 	REJECT Body-Spamschutzregel 403
 /In Compliance With The New E[-\ ]Mail Bill/ 	 	 	REJECT Body-Spamschutzregel 404
-/Interest rates are rising/ 	 	 	REJECT Body-Spamschutzregel 405
+#/Interest rates are rising/ 	 	 	REJECT Body-Spamschutzregel 405
 /Just ONE click away from showing you/ 	 	 	REJECT Body-Spamschutzregel 406
 /Lender referral service/ 	 	 	REJECT Body-Spamschutzregel 407
 /Lenders Compete For Your Business/ 	 	 	REJECT Body-Spamschutzregel 408
@@ -533,7 +601,7 @@
 /Low[-\ ]Cost Viagra/ 	 	 	REJECT Body-Spamschutzregel 414
 /Lowest Mortgage/ 	 	 	REJECT Body-Spamschutzregel 415
 /Make money online/ 	 	 	REJECT Body-Spamschutzregel 416
-/Marketing Method/ 	 	 	REJECT Body-Spamschutzregel 417
+# /Marketing Method/ 	 	 	REJECT Body-Spamschutzregel 417
 /Million E[-\ ]mail Addresses/ 	 	 	REJECT Body-Spamschutzregel 418
 /Million Email Addresses/ 	 	 	REJECT Body-Spamschutzregel 419
 /Minutes To Complete Your Order/ 	 	 	REJECT Body-Spamschutzregel 420
@@ -596,7 +664,7 @@
 /Voted sex[-\ ]server on the web/ 	 	 	REJECT Body-Spamschutzregel 478
 /We can award any degree/ 	 	 	REJECT Body-Spamschutzregel 479
 /We know it sounds impossible/ 	 	 	REJECT Body-Spamschutzregel 480
-/Weight Loss [Drug\Medication]/ 	 	 	REJECT Body-Spamschutzregel 481
+# /Weight Loss [Drug\Medication]/ 	 	 	REJECT Body-Spamschutzregel 481
 /While working from the privacy of your own home/ 	 	 	REJECT Body-Spamschutzregel 482
 /Win Big Money Today/ 	 	 	REJECT Body-Spamschutzregel 483
 /Without Pumps Or Weights Or Stretches/ 	 	 	REJECT Body-Spamschutzregel 484
@@ -626,4 +694,4 @@
 /reference ounce a achiever sunblock syringe roadside longevity/ 	 	 	REJECT Body-Spamschutzregel 509
 /ocean distrust as antiperspirant coax lubricant entry, the northwestern politicize,/ 	 	 	REJECT Body-Spamschutzregel 510
 /By the time Scarlett had undressed and blown out the candle, her/ 	 	 	REJECT Body-Spamschutzregel 511
-
+/E-MAIL:czq7q67a@yahoo.co.jp/ 	 	 	REJECT Body-Spamschutzregel 512
diff --git a/postfix/maps/header_checks b/postfix/maps/header_checks
index cd87c64..e3b2ba3 100644
--- a/postfix/maps/header_checks
+++ b/postfix/maps/header_checks
@@ -1,4 +1,4 @@
-# Version 3.14 / 8.8.2008
+# Version 4.0
 #
 # Das Postfix-Buch - Sichere Mailserver mit Linux
 # http://www.postfixbuch.de - Peer Heinlein
@@ -19,9 +19,9 @@
 #
 # Setzen Sie in /etc/postfix/main.cf einfach
 #
-# header_checks = pcre:/etc/postfix/body_checks oder
+# header_checks = pcre:/etc/postfix/header_checks oder
 # oder
-# header_checks = regexp:/etc/postfix/body_checks
+# header_checks = regexp:/etc/postfix/header_checks
 #
 # und fuehren Sie "rcpostfix reload" aus.
 #
@@ -50,7 +50,7 @@
 # SMTP-Envelope-To verstanden und fabriziert seit nunmehr über sieben Jahren in
 # schöner Regelmäßigkeit Mailschleifen im vier/fünfstelligen Bereich.
 #
-/^Received:.*domeus\.com/	REJECT Domeus baut Mailschleifen und hat wichtige RFCs nicht verstanden
+# /^Received:.*domeus\.com/	REJECT Domeus baut Mailschleifen und hat wichtige RFCs nicht verstanden
 
 /X-policyd-weight:.*to=dresden@listen.attac.de/         IGNORE
 
@@ -60,8 +60,19 @@
 # ===============================================
 # [Immer mit Timestamp (!) und ggf. Ticket-Nummer eintragen!]
 #
+/^Received: from 62.56.132.7.satcom-systems.net/	REJECT Header-Spamschutzregel TMP-1
 
+# 20110630 - HPLS-Ticket#: 2011063010000278
+/^Received: from dsl88-247-23947.ttnet.net.tr/		REJECT Header-Spamschutzregel TMP-2
 
+# 20110925 - u.A. HPLS-Ticket#: 2011092510000102
+/^Subject: *pdf ist Ihre Gewinnchancen Informationen*/	REJECT Header-Spamschutzregel TMP-3
+
+#20121229 - chris und brian db-central-antispam - wieder ok
+
+#/^From:.*@package.*\.hosting\.db-central\.com>.*/ REJECT
+#/^To:.*@package.*\.hosting\.db-central\.com/ REJECT
+#/^From:.*@volkswagen-itc.com>.*/ REJECT
 
 #
 #
@@ -69,7 +80,74 @@
 # ===============================================
 # [Immer mit aufsteiger Nummer sauber eintragen!]
 #
-#
+
+/^X-PHP-Script: www.dorstroy-spb.ru\/templates\/beez\/back.php/	REJECT Header-Spamschutzregel 1179
+# HPLS:2013031310000105
+/^Received:.*test@sideaitalia.com@.*/ REJECT Header-Spamschutzregel 1178
+/^Subject: inolar.com/	REJECT Header-Spamschutzregel 1177
+/^Return-Path: <noreply@direkt-sicher.com>/	REJECT Header-Spamschutzregel 1176
+/^Return-Path: site258@www.pand331.nl/	REJECT Header-Spamschutzregel 1175
+/^Received:.*puck844.server4you.de.*/  REJECT Header-Spamschutzregel 1174
+/^From:.*<olgaber[1-9]@yandex.ru>.*/ REJECT Header-Spamschutzregel 1173
+/^From:.*jpberlin admin <drepcaulfield@eircom.net>.*/  REJECT Header-Spamschutzregel 1172
+/^Received:.*envelope-from <konductt@server.mwhdns.com.*/ REJECT Header-Spamschutzregel 1171
+/^From: .*dpaypal@dpaypal.at/ REJECT Header-Spamschutzregel 1170
+/^Subject:.*=?koi8-r?B?ycvBINDPIMTPzMfBzSDLz83Qwc7JyS4=?=.*/ REJECT Header-Spamschutzregel 1169
+/^Subject:.*Company founded in Gibraltar is currently looking for European sector based labor force.*/ REJECT Header-Spamschutzregel 1168
+/^From:.*@papertocad.de/	REJECT	Header-Spamschutzregel 1167
+/^From:.*admin@mailbox.com.*/ REJECT Header-Spamschutzregel 1166
+/^From:.*Billing-Service@NetPay.de.*/ REJECT Header-Spamschutzregel 1165
+/^Subject:.*V[^a-z]{3-6}[1,i,l][^a-z]{3-6}A[^a-z]{3-6}G[^a-z]{3-6}R[^a-z]{3-6}A/ REJECT Header-Spamschutzregel 1164: Viagra-Keyword
+/^Sender:.*phpscript@ws[0-9].microware.hu.*$/	REJECT Header-Spamschutzregel 1163
+/^Subject:.*async.facebook.com.*$/	REJECT Header-Spamschutzregel 1162
+/^Subject:.*Ihr freundlicher Support$/	REJECT Header-Spamschutzregel 1161
+/^From:.*@deutschseo.com/	REJECT Header-Spamschutzregel 1160
+/^X-RocketYMMF: webluck1847@att.net/	REJECT	Header-Spamschutzregel 1159
+/^Subject: offizielle sieger/	REJECT Header-Spamschutzregel 1158
+/^From: *@verifiedbyvisa.fr*/ REJECT Header-Spamschutzregel 1157 
+/^Replay-To: *@verifiedbyvisa.fr/ REJECT Header-Spamschutzregel 1156 
+/^Replay-To: *girl@mailisfree.com/ REJECT Header-Spamschutzregel 1155 
+/^Subject: vous devez reglez votre compte free.fr/ REJECT Header-Spamschutzregel 1154 
+/^Message-ID: *mscreator[0-9][0-9].fagms.de/	REJECT	Header-Spamschutzregel 1153
+/^Subject: gelegenheit zur webverbesserung/		REJECT Header-Spamschutzregel 1052
+/^Subject: Achtung! Ihr paypal-Konto wurde begrenzt!/		REJECT Header-Spamschutzregel 1051
+/^X-PHP-Script: campnetworking.ca\/images\/susscesful_soties\/nfoscomm.php*/	REJECT	Header-Spamschutzregel 1050
+/^Subject:.*zusammenarbeit zur webverbesserung/		REJECT  Header-Spamschutzregel 1049
+/^X-PHP-Script: biditsaleit.com\/dz\/mailer.php*/	REJECT	Header-Spamschutzregel 1048
+/^Subject:.*from GMC manufacturer/	REJECT Header-Spamschutzregel 1047
+/^Return-Path: *ventouxl@ns[0-9]{3}.medialook.net/	REJECT	Header-Spamschutzregel 1046
+/^From :.*Topillen Apotheke /		REJECT Header-Spamschutzregel 1145
+/^Subject: Top Apotheke/ 		REJECT Header-Spamschutzregel 1144
+/^message-ID: *phx.gbl/	REJECT	Header-Spamschutzregel 1143
+/^List-Unsubscribe: *e-mailing.pymac.fr\/[a-z]\/[a-z]\/[0-9]{4}\/[0-9]{6}/	REJECT	Header-Spamschutzregel 1142
+/^Return-Path: *@oanm[0-9]{2}.com/	REJECT Header-Spamschutzregel 1141
+/^Subject: lighting products from GMC manufacturer/	REJECT Header-Spamschutzregel 1140
+/^Subject: OFFIZIELLE GEWINNBENACHRITIGUNG/	REJECT Header-Spamschutzregel 1139
+/^Subject: God bless you as you get back to me/	REJECT  Header-Spamschutzregel 1038
+/^List-Unsubribe: *tk3.sbc01.com\/sy\/*/	REJECT	Header-Spamschutzregel 1037
+/^List-Unsubscribe: *tk3.sbc01.com\/sy\/*/	REJECT	Header-Spamschutzregel 1037
+/^Message-ID: *[0-9]{8}-[0-9]{8}-[0-9a-z]{3}-0@S102*/	REJECT	Header-Spamschutzregel 1036
+/^Subject: *YOUR EMAIL HAS WON YOU GBP*/	REJECT	Header-Spamschutzregel 1035
+/^From: *ventouxl@ns[0-9]?[0-9].medialook.net/	REJECT	Header-Spamschutzregel 1034
+/^From: *gestioncreditexpert_[0-9]{4}@gce-mailer-[0-9]{2}.com/	REJECT	Header-Spamschutzregel 1033
+/^From:.*erosvision.com/	REJECT Header-Spamschutzregel 1032
+/^From:*@payapl.fr/	REJECT	Header-Spamschutzregel 1031
+# 20110706 - HPLS-Ticket#: 2011070610000053
+/^X-PHP-Script: mars.rapidvps.com\/~emoosite\/tmp\/install_4b10cb87da737\/languages\/site\/husa.php*/	REJECT	Header-Spamschutzregel 1030
+/^Thread-Index: *Acvd0cAG8IQaasqAcNaztWODnM30ZA/	REJECT Header-Spamschutzregel 1029
+/^Subject: aktualisieren Sie Ihre Bankdaten/	REJECT Header-Spamschutzregel 1028
+/^Subject: Erfahrungsbericht Bernd Matthes/	REJECT Header-Spamschutzregel 1027
+/^Subject:.*IP PBX/i			REJECT Header-Spamschutzregel 1026
+/^From:.*Nicoll Christopher John/	REJECT Header-Spamschutzregel 1025
+/^From:.*SHELL PETROLEUM/  		REJECT Header-Spamschutzregel 1024
+/^From:.*Versicherungs Dienst/  	REJECT Header-Spamschutzregel 1023
+/^From:.*soft-cd.com/			REJECT Header-Spamschutzregel 1022
+/^From: "Oxford Business News" <info@oxford-bn.org>/	REJECT Header-Spamschutzregel 1021
+/^Subject: =?iso-8859-1?Q?Leider_st=F6?= =?iso-8859-1?Q?ren_Sie.?=/	REJECT Header-Spamschutzregel 1020
+/^From:.*Elena.*@eposta.ru/		REJECT Header-Spamschutzregel 1019
+/^Subject:.*Results 2008 !/		REJECT Header-Spamschutzregel 1018
+/^From: Sponsor Lotto/			REJECT Header-Spamschutzregel 1017
+/^From:.*nodiet@web.de/			REJECT Header-Spamschutzregel 1016
 /^From:.*edirects.com/                  REJECT Header-Spamschutzregel 1015
 /^Subject:.*WINNING NOTIFICATION!!!/		REJECT Header-Spamschutzregel 1014
 /^Subject:.*Wir wissen was Frauen wollern/         REJECT Header-Spamschutzregel 1013
@@ -144,7 +222,8 @@ if /^Subject:/i
 /^Subject:.*Affordable Premade Logos/	REJECT Header-Spamschutzregel JPBERLIN-56
 /^Subject:.*Best prices.*on the net/	REJECT Header-Spamschutzregel JPBERLIN-57
 /^Subject:.*V.?i.?a.?g.?r.?a/		REJECT Header-Spamschutzregel JPBERLIN-58: Viagra-Keyword
-/^Subject:.*X.?a.?n.?a.?x/		REJECT Header-Spamschutzregel JPBERLIN-59: Xanax-Keyword
+#/^Subject:.*X.?a.?n.?a.?x/		REJECT Header-Spamschutzregel JPBERLIN-59: Xanax-Keyword
+/^Subject:.*Phentermine/		REJECT Header-Spamschutzregel JPBERLIN-60
 /^Subject:.*Phentermine/		REJECT Header-Spamschutzregel JPBERLIN-60
 /^Subject:.*Die Sahne tropft heraus/	REJECT Header-Spamschutzregel JPBERLIN-61
 /^Subject:.* Rolex /			REJECT Header-Spamschutzregel JPBERLIN-62
@@ -256,16 +335,16 @@ If /^Subject:/i
 /^Subject: FREE Auto Insurance Quote!/ 	REJECT Header-Spamschutzregel 127
 /^Subject: Need money for college\?/ 	REJECT Header-Spamschutzregel 131
 /^Subject:(\s+\[[^]]*\])?\s+[-\.{<]*ADV(ertisement)?[-:\.>}\s]/ 	REJECT Header-Spamschutzregel 153
-/^Subject:.*\s+ADV$/ 	REJECT Header-Spamschutzregel 154
+#/^Subject:.*\s+ADV$/ 	REJECT Header-Spamschutzregel 154
 /^Subject: I viewed your site-/ 	REJECT Header-Spamschutzregel 155
 /^Subject:.*Millions?\s*(E?-?MAIL\s*)?ADDRESS/ 	REJECT Header-Spamschutzregel 156
 /^Subject:.*(are you (being investigated|in need of a lifestyle)|Free 1 Ounce Silver Coin|All foreign residents.  Check out this offer|CAN YOU ADVERTISE TO OVER 20 MILLION E-MAIL ADDRESSES\??|DSL - FREE DSL Modem! FREE Install! NO Contract!|We want to give you a Brand New FREE Motorola Pager|FREE Motorola Pager|Cellphone Signal Booster|You('| ha)?ve qualified for)/ 	REJECT Header-Spamschutzregel 157
-/^Subject:.*[ ._]{5,}[^0 ._]\d+$/ 	REJECT Header-Spamschutzregel 160
-/^Subject:.*[ ._]{5,}\[[^ ]+\]$/ 	REJECT Header-Spamschutzregel 161
+# /^Subject:.*[ ._]{5,}[^0 ._]\d+$/ 	REJECT Header-Spamschutzregel 160
+# /^Subject:.*[ ._]{5,}\[[^ ]+\]$/ 	REJECT Header-Spamschutzregel 161
 /^Subject:.*\sTime[: ]+\d+:\d+:\d+ [AP]M\s*$/i 	REJECT Header-Spamschutzregel 162
 /^Subject: Snowhite and the Seven Dwarfs - The REAL story!/ 	REJECT Header-Spamschutzregel 177
 /^Subject: new photos from my party!/ 	REJECT Header-Spamschutzregel 180
-/^Subject:.*=\?(euc-kr|ks_c_5601-1987)\?/ 	REJECT Header-Spamschutzregel 200
+#/^Subject:.*=\?(euc-kr|ks_c_5601-1987)\?/ 	REJECT Header-Spamschutzregel 200
 /^Subject: Liebe freunde, es tropft wieder/ 	REJECT Header-Spamschutzregel 201
 /^Subject: The best gift a wife or girlfriend could ever ask for/		REJECT Header-Spamschutzregel 202
 /^Subject: Increase your drive, stamina, size and performance.. reach your potential!/			REJECT Header-Spamschutzregel 203
@@ -274,7 +353,8 @@ If /^Subject:/i
 /^Subject: Nearly 65% of women claim they wish their lover was more adept.. let us help/		REJECT Header-Spamschutzregel 206
 /^Subject: Increased spending on homeland security has created incredible opportunity/			REJECT Header-Spamschutzregel 207
 /^Subject: The security explosion/									REJECT Header-Spamschutzregel 208
-
+/^Subject: Ermittlungsverfahren gegen Sie.*/	REJECT Header-Spamschutzregel 210
+/^Subject: Bekommen Sie Uhren.*/			REJECT Header-Spamschutzregel 211
 Endif
 #################################################
 
@@ -325,5 +405,3 @@ Endif
 # invalid timezone in Date header	
 /^Date:.*[+-](1[4-9]|2\d)\d\d$/ 	REJECT Header-Spamschutzregel 195
 /^From:.*icyhot.bakas24.de/ 		REJECT Header-Spamschutzregel 209
-
-
diff --git a/postfix/body_checks b/postfix/maps/old/body_checks.2008-10-01_16:37:41
similarity index 82%
rename from postfix/body_checks
rename to postfix/maps/old/body_checks.2008-10-01_16:37:41
index 8a39733..c5e60c0 100644
--- a/postfix/body_checks
+++ b/postfix/maps/old/body_checks.2008-10-01_16:37:41
@@ -1,4 +1,4 @@
-# Version 4.0
+# Version 3.14 / 8.8.2008
 #
 # Das Postfix-Buch - Sichere Mailserver mit Linux
 # http://www.postfixbuch.de
@@ -35,7 +35,6 @@
 # Es kann stattdessen auch einfacher Text benutzt werden.
 #
 
-
 #
 #
 # Tagesaktuelle, nur voruebergehende Regelungen:
@@ -43,6 +42,13 @@
 # [Immer mit Timestamp (!) und ggf. Ticket-Nummer eintragen!]
 #
 
+/Subject:.*Mittel gegen Impotenz/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
+/Subject:.*Potenzschwache - wir haben die Losung/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
+/Subject:.*Endlich wieder Spass am Leben/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
+/by hefe.heinlein-support.de; Fri, 18/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
+/Subject:.*Belebt Geist und Korper/	REJECT You are a stupid backscatter. Please learn how to manage your mailsserver.
+/Subject:.* Viiiiiiaaaaaaagra/	REJECT You are a stupid backscatter. Please learn how to manage your mailserver.
+
 #
 #
 # Dauerhaft genutzte Regelungen:
@@ -51,109 +57,31 @@
 #
 #
 
-/http:\/\/Super-Rabatte-2013-14111.com/ REJECT Body-Spamschutz 1159
-/http:\/\/slpia.lk/	REJECT Body-Spamschutz 1158
-/http:\/\/www.direkt-sicher.com\/starten\/privatkunde/	REJECT	Body-Spamschutz 1157
-/Unser ING-DIBA  Sicherheits Bereich investiert sehr viel Zeit,/	REJECT Body-Spamschutz 1156
-/ürzlich zeigen unsere Aufzeichnungen, dass Ihr Postbank-Konto möglich durch einen Dritten unbefugten Zutritt./	REJECT Body-Spamschutzregel 1155
-/We are the department of Asian Domain Registration Service in China. Here I have something/	REJECT Body-Spamschutzregel 1154
-/schicken Sie bitte einen Brief auf Violet@arbeitdeutschland.com/	REJECT Body-Spamschutzregel 1153
-/Dear RandomForename_/	REJECT Body-Spamscutzregel 1152
-/http:\/\/defiteq.com\/qms\/upload/	REJECT Body-Spamscutzregel 1151
-/mail.iphone.mn/	REJECT Body-Spamscutzregel 1150
-/http:\/\/www.safe-slh.com/ REJECT Body-Spamschutzregel 1149
-/Sie konnen Ihre Postsendung in unserer Postabteilung personlich kriegen/ REJECT Body-Spamschutzregel 1148
-/Sie sollen dieses Postetikett drucken lassen/ REJECT Body-Spamschutzregel 1147
-/Wenn dies nicht sofort machen Sie Ihre E-Mail-Adresse deaktiviert von unserem Server\./ REJECT Body-Spamschutzregel 1146
-/^Message-ID:*@vps332995.netsons.net/	REJECT	Body-Spamschutzregel 1145
-/dildodaddy/ REJECT Body-Spamschutzregel 1144
-/mehreren fehlgeschlagenen TAN-Eingeben/ REJECT Body-Spamschutzregel 1143
-/filename\=\"c.g.euromilion.pdf\"/	REJECT	Body-Spamscutzregel 1142
-/^Bei Interesse bitten wir um folgende$/	REJECT Body-Spamscutzregel 1141
-/palmandmore\.de/ REJECT Body-Spamschutzregel 1140
-/kundenverifikationservice\.u2m\.ru\/VERIFY\.PHP REJECT/ Body-Spamschutzregel 1139
-/co.cc\/aff\/item.php\?usn\=(aeb1|dap1|dvg1)\&i\=it\_ep\&e\=admin\@groupon.de/	REJECT	Body-Spamschutzregel 1138
-/You Are Guaranteed To Get Paid Instantly For Each Email You Process!/	REJECT	Body-Spamschutzregel 1137
-/I (talk|speak) 2 \'languages\'. Now i\'m 24. I/	REJECT	Body-Spamschutzregel 1136
-/My nickname \"Kuma\"\! \:\) I/	REJECT	Body-Spamschutzregel 1135
-/http:\/\/free.fr\/support\/verification\/compte\//	REJECT	Body-Spamschutzregel 1134
-/http:\/\/sonofages.free.fr\/images\/LogoCreditMutuel.png/ REJECT	Body-Spamschutzregel 1133
-/ucc.edu.ni/	REJECT	Body-Spamschutzregel 1132
-/7figureincome\.php/	REJECT Body-Spamschutzregel 1131
-/Cher Client Verified by Visa/	REJECT	Body-Spamschutzregel 1130
-/^From: "Topillen Apotheke" / REJECT Body-Spamschutzregel 1129
-/^Aufgrund mehrerer Phishing Versuche, unsere Visa und Mastercard/ REJECT Body-Spamschutzregel 1128
-/^ Phishing Departament/                        REJECT Body-Spamschutzregel 1127
-/We wish to invest between $5Million-$100Million in any viable projects/ REJECT Body-Spamschutzregel 1126
-/God bless you as you get back to me/   REJECT  Body-Spamschutzregel 1125
-/www.(b|B)ien(e|E)tremag.com/	REJECT	Body-Spamschutzregel 1124
-/Sehr geehrte Sparkasse Card/	REJECT	Body-Spamschutzregel 1123
-/zigaretten-discount.info/	REJECT	Body-Spamschutzregel 1122
-/zigaretten-discount\[punkt\]info/	REJECT	Body-Spamschutzregel 1121
-/Guten Tag Mitglied [0-9]{5}/	REJECT	Body-Spamschutzregel 1120
-/elenx.innovacon.com\/.e\/e.php/	REJECT	Body-Spamschutzregel 1119
-/www.sniperrs.de\/modules\/Forums\/admin/	REJECT	Body-Spamschutzregel 1118
-/boxneufnet.com\/id\/oragne.fr\/Identifiant/	REJECT	Body-Spamschutzregel 1117
-/www.colellsa.com\/img\/quienes\/pabo\/paypal-fr/	REJECT	Body-Spamschutzregel 1116
-/dekmor.cmu.ac.th\/sticker\/upload\/Logs\/Login\/webscrcmd/	REJECT	Body-Spamschutzregel 1115
-/ektoschronou.com/	REJECT	Body-Spamschutzregel 1114
-/ulouwaio.com/	REJECT	Body-Spamschutzregel 1113
-/logonature.com.nu/	REJECT	Body-Spamschutzregel 1112
-/suinlop.com/	REJECT Body-Spamschutzregel 1111
-/soudoorpo.com/	REJECT Body-Spamschutzregel 1110
-/GOOGLE AUSSTATTUNGSFONDS 20.?.? GEWINNER ANMELDEFORMULAR FUER ZAHLUNG/	REJECT Body-Spamschutzregel 1109
-/Anbieter: Privacy GG Limited, 99 Albert Street, Belize City, CA/ 	REJECT Body-Spamschutzregel 1108
-/^Die Nachricht wurde durch Interads 24 Ltd/	REJECT Body-Spamschutzregel 1107
-/www.sommer-mit-kollegen.de/	REJECT Body-Spamschutzregel 1006
-# Ein Spammer versenden immer Austragungslinks, die auf "/ausa" enden:
-/^www.*\/ausa$/			REJECT Body-Spamschutzregel 1105
-/KlickTel Telefonbuch OEM/	REJECT Body-Spamschutzregel 1104
-/www.klicktel24.org/		REJECT Body-Spamschutzregel 1103
-/Klicken Sie hier, und fühlen Sie sich endlich gut behandelt:/	REJECT Body-Spamschutzregel 1102
-/maryjanemax@yahoo.co.uk/	REJECT Body-Spamschutzregel 1101
-/http.*muqugeh\.cn/ 		REJECT Body-Spamschutzregel 1100
-/Bei uns bekommen Sie Ihren Kredit schnell, unbürokratisch, diskret und natürlich ohne Bankauskunft./	REJECT Body-Spamschutzregel 1099
-/INTERNATIONAL LOTTERIE PROMOTION SPIELGEMEINSCHAFT/	REJECT Body-Spamschutzregel 1098 
-/Leider st=F6ren Sie.=20/	REJECT Body-Spamschutzregel 1097
-/Sie haben dieses Email erhalten, weil Sie im Newsletter von Promohouse Ltd eingetragen sind/	REJECT Body-Spamschutzregel 1096
-/ATTN: Beneficiar/	REJECT Body-Spamschutzregel 1095
-/www.hedonismails.de/			REJECT Body-Spamschutzregel 1094
-/www.globadressen.(com|net|org|info)/	REJECT Body-Spamschutzregel 1093
-/elegalal.nextmail.ru/				REJECT Body-Spamschutzregel 1092
-/http:\/\/www.switzerlandpussy.eu/					REJECT Body-Spamschutzregel 1082
-/Die jungen Girls fliegen nur so auf die langen/			REJECT Body-Spamschutzregel 1081
-/\*\*\*\* Commercial use of this software is prohibited \*\*\*\*/	REJECT Body-Spamschutzregel 1080
-/I finded your email in internet and I decide to ask you for help/	REJECT Body-Spamschutzregel 1079
-/Details und moegliche Schritte zur Entsperrung finden Sie/ 	REJECT Body-Spamschutzregel 1078
-/^Amount Won:/				REJECT Body-Spamschutzregel 1077
-/AWARD WINNING NOTICE/i			REJECT Body-Spamschutzregel 1076
-/mixvarejo.com/				REJECT Body-Spamschutzregel 1075
-/www.global-db.(com|net|org)/		REJECT Body-Spamschutzregel 1074
-/^I am Barrister/			REJECT Body-Spamschutzregel 1073
-/respublica@gaucherepublicaine.org/ 	REJECT Body-Spamschutzregel 1072
-/NEU - Vi Super Active/ 		REJECT Body-Spamschutzregel 1071
-/anhaltende Versagensangste und wiederholte peinliche Situationen/	REJECT Body-Spamschutzregel 1070
-/Schulfreunde Vermittlungs Service AG/  REJECT Body-Spamschutzregel 1068
-/Multimedia Telegramm/  REJECT Body-Spamschutzregel 1067
-/http.*\.fdub\.biz/     REJECT Body-Spamschutzregel 1066
-/TanjaGuenther/	REJECT Body-Spamschutzregel 1065
-/www.bestnetz24.de\/letter\/ausgabe.php/	REJECT Body-Spamschutzregel 1064
-/www.db.?adressen.(com|net|org|info)/	REJECT Body-Spamschutzregel 1063
-/thomas@jthomas.es/	REJECT Body-Spamschutzregel 1062
-/Ihre Marketing Agentur Espa/	REJECT Body-Spamschutzregel 1061
-/www.pakandu.com/	REJECT Body-Spamschutzregel 1060
-/Glob.?.?.?(C|K)ontact.?.?.?Team/	REJECT Body-Spamschutzregel 1059
-/www.gc.?datenbaken.(com|net|org|info)/	REJECT Body-Spamschutzregel 1058
-/www.glc-?data.(com|net|org|info)/	REJECT Body-Spamschutzregel 1057
-/Global.?(C|K)ontact/i	REJECT Body-Spamschutzregel 1056
-/www.imarketing.com.br.remove/	REJECT Body-Spamschutzregel 1055 
-/Bestellen Sie jetzt und vergessen Sie Ihre Enttauschungen/     REJECT Body-Spamschutzregel 1054
-/Online Apotheke - original Qualitaet/  REJECT Body-Spamschutzregel 1053
-/Wir wissen was Frauen wollern/         REJECT Body-Spamschutzregel 1052
-/Viiiiaaaaaagra/        REJECT Body-Spamschutzregel 1051
-/Web: www.eurasianpages. com/	REJECT Body-Spamschutzregel 1050
-/^Firma Global Contact bietet Ihnen/	REJECT Body-Spamschutzregel 1049
-/www.g-adressen.net/	REJECT Body-Spamschutzregel 1048
+/respublica@gaucherepublicaine.org/ Body-Spamschutz 1072
+/NEU - Vi Super Active/ REJECT Body-Spamschutz 1071
+/anhaltende Versagensangste und wiederholte peinliche Situationen/	REJECT Body-Spamschutz 1070
+/anhaltende Versagensangste und wiederholte peinliche Situationen/	REJECT Body-Spamschutz 1069
+/Schulfreunde Vermittlungs Service AG/  REJECT Body-Spamschutz 1068
+/Multimedia Telegramm/  REJECT Body-Spamschutz 1067
+/http.*\.fdub\.biz/     REJECT Body-Spamschutz 1066
+/TanjaGuenther/	REJECT Body-Spamschutz 1065
+/www.bestnetz24.de\/letter\/ausgabe.php/	REJECT Body-Spamschutz 1064
+/www.db.?adressen.(com|net|org|info)/	REJECT Body-Spamschutz 1063
+/thomas@jthomas.es/	REJECT Body-Spamschutz 1062
+/Ihre Marketing Agentur Espa/	REJECT Body-Spamschutz 1061
+/www.pakandu.com/	REJECT Body-Spamschutz 1060
+/Glob.?(C|K)ontact.?Team/	REJECT Body-Spamschutz 1059
+/www.gc.?datenbaken.(com|net|org|info)/	REJECT Body-Spamschutz 1058
+/www.glc-?data.(com|net|org|info)/	REJECT Body-Spamschutz 1057
+/Global.?(C|K)ontact/i	REJECT Body-Spamschutz 1056
+/www.imarketing.com.br.remove/	REJECT Body-Spamschutz 1055 
+/Bestellen Sie jetzt und vergessen Sie Ihre Enttauschungen/     REJECT Body-Spamschutz 1054
+/Online Apotheke - original Qualitaet/  REJECT Body-Spamschutz 1053
+/Wir wissen was Frauen wollern/         REJECT Body-Spamschutz 1052
+/Viiiiaaaaaagra/        REJECT Body-Spamschutz 1051
+/Web: www.eurasianpages. com/	REJECT Body-Spamschutz 1050
+/^Firma Global Contact bietet Ihnen/	REJECT Body-Spamschutz 1049
+/www.g-adressen.net/	REJECT Body-Spamschutz 1048
 /NIEMALS geben Sie Ihre Passw.rter an niemanden NUR und melden Sie sich/	REJECT Body-Spamschutzregel 1047 Haspa-Pishing
 /www.loteria.es/	REJECT Body-Spamschutzregel 1046
 /Girls!  Deveelop your sexual reelationship and get even MORE pleasurre!/	REJECT Body-Spamschutzregel 1045
@@ -213,7 +141,7 @@
 
 /We recommend you to follow the instructions in order to keep your computer safe./	REJECT Body-Spamschutzregel 1
 /Sieh Dir einfach mal ein Video an und mach dann gleich ein Treffen/	REJECT Body-Spamschutzregel 2
-#/money.*back.*guarant/					REJECT Body-Spamschutzregel 3
+/money.*back.*guarant/					REJECT Body-Spamschutzregel 3
 / CIALIS /						REJECT Body-Spamschutzregel 4
 /www.galamed.biz/		 	 	REJECT Body-Spamschutzregel 5
 /Starts working in less than 15 min./		REJECT Body-Spamschutzregel 6
@@ -228,8 +156,8 @@
 /D-INFO.*REVERZ/		 	 	REJECT Body-Spamschutzregel 15
 /greatmaleenhancement.biz/			REJECT Body-Spamschutzregel 16
 / Xanax /				 	REJECT Body-Spamschutzregel 17
-/ Vic(o|0)din /			 	 	REJECT Body-Spamschutzregel 18
-/ Hydr(o|0)c(o|0)d(o|0)ne /		 	REJECT Body-Spamschutzregel 19
+/Vic(o|0)din/			 	 	REJECT Body-Spamschutzregel 18
+/Hydr(o|0)c(o|0)d(o|0)ne/		 	REJECT Body-Spamschutzregel 19
 / V1agra /			 	 	REJECT Body-Spamschutzregel 20
 /warehousefull.com/		 	 	REJECT Body-Spamschutzregel 21
 /No doctor visit needed/		 	REJECT Body-Spamschutzregel 22
@@ -271,8 +199,7 @@
 /Der Meister unter den Druckprogrammen: PRINTMASTER 8 GOLD/		 	REJECT Body-Spamschutzregel 58
 /Stellen Sie sich vor, Sie kaufen ein Produkt oder eine Dienstleistung im/ 	REJECT Body-Spamschutzregel 59
 /So finden Sie blitzschnell den NAMEN und ADRESS-EINTRAG zu jeder/		 REJECT Body-Spamschutzregel 60
-# Rausgenommen wegen Groupon, phei, 11.3.13
-# /^TVqQAAMAAAAEAAAA\/\/8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA$/   	 	 	REJECT Body-Spamschutzregel Due to recent virus attacks, we temporarily block all Win32 executable files. Please re-send your attachment in a compressed (tar, zip, rar, etc.) form. Your message has NOT been delivered. 61
+/^TVqQAAMAAAAEAAAA\/\/8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA$/   	 	 	REJECT Body-Spamschutzregel Due to recent virus attacks, we temporarily block all Win32 executable files. Please re-send your attachment in a compressed (tar, zip, rar, etc.) form. Your message has NOT been delivered. 61
 /eptember 2003, Cumulative Patch/		 	 	 		REJECT Body-Spamschutzregel 62
 /Ich bin gerade vor einem neuen.*sehr gef�rlichen V.rus gewarnt/ 	 	REJECT Body-Spamschutzregel 63
 /^RSLxwtYBDB6FCv8ybBcS0zp9VU5of3K4BXuwyehTM0RI9IrSjVuwP94xfn0wgOjouKWzGXHVk3qg$/ 	REJECT Body-Spamschutzregel This is a Sobig-Worm! 64
@@ -315,6 +242,7 @@
 /Sch.*ne Gr.*e von Lucky Casino/			 	REJECT Body-Spamschutzregel 102
 /Weil Sie oder ein anderer bei Lucky Casino/i 		 	REJECT Body-Spamschutzregel 103
 /Endlich habe ich Deine E-Mail Adresse wieder gefunden, das hat aber/i		 	 	REJECT Body-Spamschutzregel 104
+/galerie kurt im hirsch/		 	REJECT Body-Spamschutzregel 
 /X-MS_Scanner: Kein Virus erkannt/		REJECT Body-Spamschutzregel Sober-Wurmsignatur
 /Anti_Virus Service/		 	 	REJECT Body-Spamschutzregel Sober-Wurmsignatur
 
@@ -326,13 +254,13 @@
 /.*waterforge\.com.*/ 	 	 	REJECT Body-Spamschutzregel 111
 /.*capitalwave\.com\?subject=Please*/ 	REJECT Body-Spamschutzregel 112
 /\.virtmundo\.com/ 	 	 	REJECT Body-Spamschutzregel 113
-#/Accept Credit Cards/ 	 	 	REJECT Body-Spamschutzregel 114
+/Accept Credit Cards/ 	 	 	REJECT Body-Spamschutzregel 114
 /Nude Celebrities/ 	 	 	REJECT Body-Spamschutzregel 115
 /PRODUCT or SERVICE/i 	 	 	REJECT Body-Spamschutzregel 116
-# /GUARANTEED!/ 	 	 	 	REJECT Body-Spamschutzregel 117
+/GUARANTEED!/ 	 	 	 	REJECT Body-Spamschutzregel 117
 /Amateur Girls/ 	 	 	REJECT Body-Spamschutzregel 118
-#/FREE MEMBERSHIP/ 	 	 	REJECT Body-Spamschutzregel 119
-#/bizinfo/ 	 	 	 	REJECT Body-Spamschutzregel 120
+/FREE MEMBERSHIP/ 	 	 	REJECT Body-Spamschutzregel 119
+/bizinfo/ 	 	 	 	REJECT Body-Spamschutzregel 120
 # block iframe hack 122
 /<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>/ 	 	 	REJECT Body-Spamschutzregel 123
 # some porn spam phrases 125
@@ -352,12 +280,12 @@
 /(filename|name)="(dhcp*|Emanuel|kmbfejkm|NakedWife|Seicho_no_ie|JAMGCJJA|Sulfnbk)\.exe"/           	 	 	REJECT Body-Spamschutzregel 147
 /(kak|day)\.(reg|hta)/                                          	 	 	REJECT Body-Spamschutzregel 148
 /to be removed[,]* please click.*link/ 	 	 	REJECT Body-Spamschutzregel 151
-# /to be removed[,]* from (the|my|our) (mailing|email|e-mail)*[ ]*list/ 	 	 	REJECT Body-Spamschutzregel 152
+/to be removed[,]* from (the|my|our) (mailing|email|e-mail)*[ ]*list/ 	 	 	REJECT Body-Spamschutzregel 152
 /to be removed[,]* from.*(mailings|offers)/ 	 	 	REJECT Body-Spamschutzregel 153
 /to be removed[,]* from the list send a blank email/ 	 	 	REJECT Body-Spamschutzregel 154
 /to be removed[,]* [e]*[-]*mail.*with/ 	 	 	REJECT Body-Spamschutzregel 155
 /to remove[,]* please send a blank email/ 	 	 	REJECT Body-Spamschutzregel 156
-#/remove yourself from this list/ 	 	 	REJECT Body-Spamschutzregel 157
+/remove yourself from this list/ 	 	 	REJECT Body-Spamschutzregel 157
 /removed from our mail agents/ 	 	 	REJECT Body-Spamschutzregel 158
 /to remove yourself immediately/ 	 	 	REJECT Body-Spamschutzregel 159
 /to remove yourself from future/ 	 	 	REJECT Body-Spamschutzregel 160
@@ -369,6 +297,8 @@
 /our broadcast email software/ 	 	 	REJECT Body-Spamschutzregel 166
 /there are no federal regulations or laws on (email|e-mail) advertising/ 	 	 	REJECT Body-Spamschutzregel 167
 /to receive (no|any) (further|future) (offers|mailings)/ 	 	 	REJECT Body-Spamschutzregel 168
+/do not wish to receive future (e-mail|email)/ 	 	 	REJECT Body-Spamschutzregel 169
+/do not wish to receive (e-mail|email)/ 	 	 	REJECT Body-Spamschutzregel 170
 /unsubscribe from Virtumundo Rewards/ 	 	 	REJECT Body-Spamschutzregel 171
 /if you do not wish to receive email from me/ 	 	 	REJECT Body-Spamschutzregel 172
 /reply with the word remove in the subject line/ 	 	 	REJECT Body-Spamschutzregel 173
@@ -396,7 +326,7 @@
 /this is not an unsolicited mail/ 	 	 	REJECT Body-Spamschutzregel 195
 /this email has not been sent to you unsolicited/ 	 	 	REJECT Body-Spamschutzregel 196
 /has not been sent unsolicited/ 	 	 	REJECT Body-Spamschutzregel 197
-#/(wish|would) to be removed from (our|the)/ 	 	 	REJECT Body-Spamschutzregel 199
+/(wish|would) to be removed from (our|the)/ 	 	 	REJECT Body-Spamschutzregel 199
 /all removes (honored|honoured)/ 	 	 	REJECT Body-Spamschutzregel 200
 /To[ ]+remove[ ]+.*@excite.com/ 	 	 	REJECT Body-Spamschutzregel 201
 /to[ ]+be[ ]+removed[ ]+.*@excite.com/ 	 	 	REJECT Body-Spamschutzregel 202
@@ -518,9 +448,9 @@
 /Barnyard Fucking/ 	 	 	REJECT Body-Spamschutzregel 326
 /BEAUTIFUL Women On The Web/ 	 	 	REJECT Body-Spamschutzregel 327
 /Because Our Records Indicate That You Are A/ 	 	 	REJECT Body-Spamschutzregel 328
-# /Because You Agree/ 	 	 	REJECT Body-Spamschutzregel 329
+/Because You Agree/ 	 	 	REJECT Body-Spamschutzregel 329
 /Because You Have Subscribed To One Of Our/ 	 	 	REJECT Body-Spamschutzregel 330
-#/Because You Registered/ 	 	 	REJECT Body-Spamschutzregel 331
+/Because You Registered/ 	 	 	REJECT Body-Spamschutzregel 331
 /Because You Signed Up At One/ 	 	 	REJECT Body-Spamschutzregel 332
 /Best Porn/ 	 	 	REJECT Body-Spamschutzregel 333
 /Buy Preforeclosure Houses/ 	 	 	REJECT Body-Spamschutzregel 334
@@ -535,7 +465,7 @@
 /Creating Immediate Wealth/ 	 	 	REJECT Body-Spamschutzregel 344
 /Cum Shots/ 	 	 	REJECT Body-Spamschutzregel 345
 /Dear Future/ 	 	 	REJECT Body-Spamschutzregel 348
-#/Dear Entrepreneur/ 	 	 	REJECT Body-Spamschutzregel 349
+/Dear Entrepreneur/ 	 	 	REJECT Body-Spamschutzregel 349
 /Debt Consolidation/ 	 	 	REJECT Body-Spamschutzregel 350
 /Do You Want Financial/ 	 	 	REJECT Body-Spamschutzregel 351
 /Don't Need A Prescription/ 	 	 	REJECT Body-Spamschutzregel 352
@@ -552,11 +482,13 @@
 /Fix Your Credit/ 	 	 	REJECT Body-Spamschutzregel 363
 /Found this company on the internet/ 	 	 	REJECT Body-Spamschutzregel 364
 /Free Bulk Email/ 	 	 	REJECT Body-Spamschutzregel 365
+/Free Cash/ 	 	 	REJECT Body-Spamschutzregel 366
 /Free Direct Email/ 	 	 	REJECT Body-Spamschutzregel 367
 /Free Multiple Moving Cost/ 	 	 	REJECT Body-Spamschutzregel 368
 /Free no obligation/ 	 	 	REJECT Body-Spamschutzregel 369
 /Free Private Webcam/ 	 	 	REJECT Body-Spamschutzregel 370
 /Free S e x/ 	 	 	REJECT Body-Spamschutzregel 371
+/Free Sex/ 	 	 	REJECT Body-Spamschutzregel 372
 /Free Vacation Giveaway/ 	 	 	REJECT Body-Spamschutzregel 373
 /Free XXX/ 	 	 	REJECT Body-Spamschutzregel 374
 /From A Concerned Gas User/ 	 	 	REJECT Body-Spamschutzregel 375
@@ -589,7 +521,7 @@
 /I'm a total exibitionist/ 	 	 	REJECT Body-Spamschutzregel 402
 /Im a total exibitionist/ 	 	 	REJECT Body-Spamschutzregel 403
 /In Compliance With The New E[-\ ]Mail Bill/ 	 	 	REJECT Body-Spamschutzregel 404
-#/Interest rates are rising/ 	 	 	REJECT Body-Spamschutzregel 405
+/Interest rates are rising/ 	 	 	REJECT Body-Spamschutzregel 405
 /Just ONE click away from showing you/ 	 	 	REJECT Body-Spamschutzregel 406
 /Lender referral service/ 	 	 	REJECT Body-Spamschutzregel 407
 /Lenders Compete For Your Business/ 	 	 	REJECT Body-Spamschutzregel 408
@@ -601,7 +533,7 @@
 /Low[-\ ]Cost Viagra/ 	 	 	REJECT Body-Spamschutzregel 414
 /Lowest Mortgage/ 	 	 	REJECT Body-Spamschutzregel 415
 /Make money online/ 	 	 	REJECT Body-Spamschutzregel 416
-# /Marketing Method/ 	 	 	REJECT Body-Spamschutzregel 417
+/Marketing Method/ 	 	 	REJECT Body-Spamschutzregel 417
 /Million E[-\ ]mail Addresses/ 	 	 	REJECT Body-Spamschutzregel 418
 /Million Email Addresses/ 	 	 	REJECT Body-Spamschutzregel 419
 /Minutes To Complete Your Order/ 	 	 	REJECT Body-Spamschutzregel 420
@@ -664,7 +596,7 @@
 /Voted sex[-\ ]server on the web/ 	 	 	REJECT Body-Spamschutzregel 478
 /We can award any degree/ 	 	 	REJECT Body-Spamschutzregel 479
 /We know it sounds impossible/ 	 	 	REJECT Body-Spamschutzregel 480
-# /Weight Loss [Drug\Medication]/ 	 	 	REJECT Body-Spamschutzregel 481
+/Weight Loss [Drug\Medication]/ 	 	 	REJECT Body-Spamschutzregel 481
 /While working from the privacy of your own home/ 	 	 	REJECT Body-Spamschutzregel 482
 /Win Big Money Today/ 	 	 	REJECT Body-Spamschutzregel 483
 /Without Pumps Or Weights Or Stretches/ 	 	 	REJECT Body-Spamschutzregel 484
@@ -694,4 +626,4 @@
 /reference ounce a achiever sunblock syringe roadside longevity/ 	 	 	REJECT Body-Spamschutzregel 509
 /ocean distrust as antiperspirant coax lubricant entry, the northwestern politicize,/ 	 	 	REJECT Body-Spamschutzregel 510
 /By the time Scarlett had undressed and blown out the candle, her/ 	 	 	REJECT Body-Spamschutzregel 511
-/E-MAIL:czq7q67a@yahoo.co.jp/ 	 	 	REJECT Body-Spamschutzregel 512
+
diff --git a/postfix/header_checks b/postfix/maps/old/header_checks.2008-09-12_12:52:55
similarity index 75%
rename from postfix/header_checks
rename to postfix/maps/old/header_checks.2008-09-12_12:52:55
index e3b2ba3..cd87c64 100644
--- a/postfix/header_checks
+++ b/postfix/maps/old/header_checks.2008-09-12_12:52:55
@@ -1,4 +1,4 @@
-# Version 4.0
+# Version 3.14 / 8.8.2008
 #
 # Das Postfix-Buch - Sichere Mailserver mit Linux
 # http://www.postfixbuch.de - Peer Heinlein
@@ -19,9 +19,9 @@
 #
 # Setzen Sie in /etc/postfix/main.cf einfach
 #
-# header_checks = pcre:/etc/postfix/header_checks oder
+# header_checks = pcre:/etc/postfix/body_checks oder
 # oder
-# header_checks = regexp:/etc/postfix/header_checks
+# header_checks = regexp:/etc/postfix/body_checks
 #
 # und fuehren Sie "rcpostfix reload" aus.
 #
@@ -50,7 +50,7 @@
 # SMTP-Envelope-To verstanden und fabriziert seit nunmehr über sieben Jahren in
 # schöner Regelmäßigkeit Mailschleifen im vier/fünfstelligen Bereich.
 #
-# /^Received:.*domeus\.com/	REJECT Domeus baut Mailschleifen und hat wichtige RFCs nicht verstanden
+/^Received:.*domeus\.com/	REJECT Domeus baut Mailschleifen und hat wichtige RFCs nicht verstanden
 
 /X-policyd-weight:.*to=dresden@listen.attac.de/         IGNORE
 
@@ -60,19 +60,8 @@
 # ===============================================
 # [Immer mit Timestamp (!) und ggf. Ticket-Nummer eintragen!]
 #
-/^Received: from 62.56.132.7.satcom-systems.net/	REJECT Header-Spamschutzregel TMP-1
 
-# 20110630 - HPLS-Ticket#: 2011063010000278
-/^Received: from dsl88-247-23947.ttnet.net.tr/		REJECT Header-Spamschutzregel TMP-2
 
-# 20110925 - u.A. HPLS-Ticket#: 2011092510000102
-/^Subject: *pdf ist Ihre Gewinnchancen Informationen*/	REJECT Header-Spamschutzregel TMP-3
-
-#20121229 - chris und brian db-central-antispam - wieder ok
-
-#/^From:.*@package.*\.hosting\.db-central\.com>.*/ REJECT
-#/^To:.*@package.*\.hosting\.db-central\.com/ REJECT
-#/^From:.*@volkswagen-itc.com>.*/ REJECT
 
 #
 #
@@ -80,74 +69,7 @@
 # ===============================================
 # [Immer mit aufsteiger Nummer sauber eintragen!]
 #
-
-/^X-PHP-Script: www.dorstroy-spb.ru\/templates\/beez\/back.php/	REJECT Header-Spamschutzregel 1179
-# HPLS:2013031310000105
-/^Received:.*test@sideaitalia.com@.*/ REJECT Header-Spamschutzregel 1178
-/^Subject: inolar.com/	REJECT Header-Spamschutzregel 1177
-/^Return-Path: <noreply@direkt-sicher.com>/	REJECT Header-Spamschutzregel 1176
-/^Return-Path: site258@www.pand331.nl/	REJECT Header-Spamschutzregel 1175
-/^Received:.*puck844.server4you.de.*/  REJECT Header-Spamschutzregel 1174
-/^From:.*<olgaber[1-9]@yandex.ru>.*/ REJECT Header-Spamschutzregel 1173
-/^From:.*jpberlin admin <drepcaulfield@eircom.net>.*/  REJECT Header-Spamschutzregel 1172
-/^Received:.*envelope-from <konductt@server.mwhdns.com.*/ REJECT Header-Spamschutzregel 1171
-/^From: .*dpaypal@dpaypal.at/ REJECT Header-Spamschutzregel 1170
-/^Subject:.*=?koi8-r?B?ycvBINDPIMTPzMfBzSDLz83Qwc7JyS4=?=.*/ REJECT Header-Spamschutzregel 1169
-/^Subject:.*Company founded in Gibraltar is currently looking for European sector based labor force.*/ REJECT Header-Spamschutzregel 1168
-/^From:.*@papertocad.de/	REJECT	Header-Spamschutzregel 1167
-/^From:.*admin@mailbox.com.*/ REJECT Header-Spamschutzregel 1166
-/^From:.*Billing-Service@NetPay.de.*/ REJECT Header-Spamschutzregel 1165
-/^Subject:.*V[^a-z]{3-6}[1,i,l][^a-z]{3-6}A[^a-z]{3-6}G[^a-z]{3-6}R[^a-z]{3-6}A/ REJECT Header-Spamschutzregel 1164: Viagra-Keyword
-/^Sender:.*phpscript@ws[0-9].microware.hu.*$/	REJECT Header-Spamschutzregel 1163
-/^Subject:.*async.facebook.com.*$/	REJECT Header-Spamschutzregel 1162
-/^Subject:.*Ihr freundlicher Support$/	REJECT Header-Spamschutzregel 1161
-/^From:.*@deutschseo.com/	REJECT Header-Spamschutzregel 1160
-/^X-RocketYMMF: webluck1847@att.net/	REJECT	Header-Spamschutzregel 1159
-/^Subject: offizielle sieger/	REJECT Header-Spamschutzregel 1158
-/^From: *@verifiedbyvisa.fr*/ REJECT Header-Spamschutzregel 1157 
-/^Replay-To: *@verifiedbyvisa.fr/ REJECT Header-Spamschutzregel 1156 
-/^Replay-To: *girl@mailisfree.com/ REJECT Header-Spamschutzregel 1155 
-/^Subject: vous devez reglez votre compte free.fr/ REJECT Header-Spamschutzregel 1154 
-/^Message-ID: *mscreator[0-9][0-9].fagms.de/	REJECT	Header-Spamschutzregel 1153
-/^Subject: gelegenheit zur webverbesserung/		REJECT Header-Spamschutzregel 1052
-/^Subject: Achtung! Ihr paypal-Konto wurde begrenzt!/		REJECT Header-Spamschutzregel 1051
-/^X-PHP-Script: campnetworking.ca\/images\/susscesful_soties\/nfoscomm.php*/	REJECT	Header-Spamschutzregel 1050
-/^Subject:.*zusammenarbeit zur webverbesserung/		REJECT  Header-Spamschutzregel 1049
-/^X-PHP-Script: biditsaleit.com\/dz\/mailer.php*/	REJECT	Header-Spamschutzregel 1048
-/^Subject:.*from GMC manufacturer/	REJECT Header-Spamschutzregel 1047
-/^Return-Path: *ventouxl@ns[0-9]{3}.medialook.net/	REJECT	Header-Spamschutzregel 1046
-/^From :.*Topillen Apotheke /		REJECT Header-Spamschutzregel 1145
-/^Subject: Top Apotheke/ 		REJECT Header-Spamschutzregel 1144
-/^message-ID: *phx.gbl/	REJECT	Header-Spamschutzregel 1143
-/^List-Unsubscribe: *e-mailing.pymac.fr\/[a-z]\/[a-z]\/[0-9]{4}\/[0-9]{6}/	REJECT	Header-Spamschutzregel 1142
-/^Return-Path: *@oanm[0-9]{2}.com/	REJECT Header-Spamschutzregel 1141
-/^Subject: lighting products from GMC manufacturer/	REJECT Header-Spamschutzregel 1140
-/^Subject: OFFIZIELLE GEWINNBENACHRITIGUNG/	REJECT Header-Spamschutzregel 1139
-/^Subject: God bless you as you get back to me/	REJECT  Header-Spamschutzregel 1038
-/^List-Unsubribe: *tk3.sbc01.com\/sy\/*/	REJECT	Header-Spamschutzregel 1037
-/^List-Unsubscribe: *tk3.sbc01.com\/sy\/*/	REJECT	Header-Spamschutzregel 1037
-/^Message-ID: *[0-9]{8}-[0-9]{8}-[0-9a-z]{3}-0@S102*/	REJECT	Header-Spamschutzregel 1036
-/^Subject: *YOUR EMAIL HAS WON YOU GBP*/	REJECT	Header-Spamschutzregel 1035
-/^From: *ventouxl@ns[0-9]?[0-9].medialook.net/	REJECT	Header-Spamschutzregel 1034
-/^From: *gestioncreditexpert_[0-9]{4}@gce-mailer-[0-9]{2}.com/	REJECT	Header-Spamschutzregel 1033
-/^From:.*erosvision.com/	REJECT Header-Spamschutzregel 1032
-/^From:*@payapl.fr/	REJECT	Header-Spamschutzregel 1031
-# 20110706 - HPLS-Ticket#: 2011070610000053
-/^X-PHP-Script: mars.rapidvps.com\/~emoosite\/tmp\/install_4b10cb87da737\/languages\/site\/husa.php*/	REJECT	Header-Spamschutzregel 1030
-/^Thread-Index: *Acvd0cAG8IQaasqAcNaztWODnM30ZA/	REJECT Header-Spamschutzregel 1029
-/^Subject: aktualisieren Sie Ihre Bankdaten/	REJECT Header-Spamschutzregel 1028
-/^Subject: Erfahrungsbericht Bernd Matthes/	REJECT Header-Spamschutzregel 1027
-/^Subject:.*IP PBX/i			REJECT Header-Spamschutzregel 1026
-/^From:.*Nicoll Christopher John/	REJECT Header-Spamschutzregel 1025
-/^From:.*SHELL PETROLEUM/  		REJECT Header-Spamschutzregel 1024
-/^From:.*Versicherungs Dienst/  	REJECT Header-Spamschutzregel 1023
-/^From:.*soft-cd.com/			REJECT Header-Spamschutzregel 1022
-/^From: "Oxford Business News" <info@oxford-bn.org>/	REJECT Header-Spamschutzregel 1021
-/^Subject: =?iso-8859-1?Q?Leider_st=F6?= =?iso-8859-1?Q?ren_Sie.?=/	REJECT Header-Spamschutzregel 1020
-/^From:.*Elena.*@eposta.ru/		REJECT Header-Spamschutzregel 1019
-/^Subject:.*Results 2008 !/		REJECT Header-Spamschutzregel 1018
-/^From: Sponsor Lotto/			REJECT Header-Spamschutzregel 1017
-/^From:.*nodiet@web.de/			REJECT Header-Spamschutzregel 1016
+#
 /^From:.*edirects.com/                  REJECT Header-Spamschutzregel 1015
 /^Subject:.*WINNING NOTIFICATION!!!/		REJECT Header-Spamschutzregel 1014
 /^Subject:.*Wir wissen was Frauen wollern/         REJECT Header-Spamschutzregel 1013
@@ -222,8 +144,7 @@ if /^Subject:/i
 /^Subject:.*Affordable Premade Logos/	REJECT Header-Spamschutzregel JPBERLIN-56
 /^Subject:.*Best prices.*on the net/	REJECT Header-Spamschutzregel JPBERLIN-57
 /^Subject:.*V.?i.?a.?g.?r.?a/		REJECT Header-Spamschutzregel JPBERLIN-58: Viagra-Keyword
-#/^Subject:.*X.?a.?n.?a.?x/		REJECT Header-Spamschutzregel JPBERLIN-59: Xanax-Keyword
-/^Subject:.*Phentermine/		REJECT Header-Spamschutzregel JPBERLIN-60
+/^Subject:.*X.?a.?n.?a.?x/		REJECT Header-Spamschutzregel JPBERLIN-59: Xanax-Keyword
 /^Subject:.*Phentermine/		REJECT Header-Spamschutzregel JPBERLIN-60
 /^Subject:.*Die Sahne tropft heraus/	REJECT Header-Spamschutzregel JPBERLIN-61
 /^Subject:.* Rolex /			REJECT Header-Spamschutzregel JPBERLIN-62
@@ -335,16 +256,16 @@ If /^Subject:/i
 /^Subject: FREE Auto Insurance Quote!/ 	REJECT Header-Spamschutzregel 127
 /^Subject: Need money for college\?/ 	REJECT Header-Spamschutzregel 131
 /^Subject:(\s+\[[^]]*\])?\s+[-\.{<]*ADV(ertisement)?[-:\.>}\s]/ 	REJECT Header-Spamschutzregel 153
-#/^Subject:.*\s+ADV$/ 	REJECT Header-Spamschutzregel 154
+/^Subject:.*\s+ADV$/ 	REJECT Header-Spamschutzregel 154
 /^Subject: I viewed your site-/ 	REJECT Header-Spamschutzregel 155
 /^Subject:.*Millions?\s*(E?-?MAIL\s*)?ADDRESS/ 	REJECT Header-Spamschutzregel 156
 /^Subject:.*(are you (being investigated|in need of a lifestyle)|Free 1 Ounce Silver Coin|All foreign residents.  Check out this offer|CAN YOU ADVERTISE TO OVER 20 MILLION E-MAIL ADDRESSES\??|DSL - FREE DSL Modem! FREE Install! NO Contract!|We want to give you a Brand New FREE Motorola Pager|FREE Motorola Pager|Cellphone Signal Booster|You('| ha)?ve qualified for)/ 	REJECT Header-Spamschutzregel 157
-# /^Subject:.*[ ._]{5,}[^0 ._]\d+$/ 	REJECT Header-Spamschutzregel 160
-# /^Subject:.*[ ._]{5,}\[[^ ]+\]$/ 	REJECT Header-Spamschutzregel 161
+/^Subject:.*[ ._]{5,}[^0 ._]\d+$/ 	REJECT Header-Spamschutzregel 160
+/^Subject:.*[ ._]{5,}\[[^ ]+\]$/ 	REJECT Header-Spamschutzregel 161
 /^Subject:.*\sTime[: ]+\d+:\d+:\d+ [AP]M\s*$/i 	REJECT Header-Spamschutzregel 162
 /^Subject: Snowhite and the Seven Dwarfs - The REAL story!/ 	REJECT Header-Spamschutzregel 177
 /^Subject: new photos from my party!/ 	REJECT Header-Spamschutzregel 180
-#/^Subject:.*=\?(euc-kr|ks_c_5601-1987)\?/ 	REJECT Header-Spamschutzregel 200
+/^Subject:.*=\?(euc-kr|ks_c_5601-1987)\?/ 	REJECT Header-Spamschutzregel 200
 /^Subject: Liebe freunde, es tropft wieder/ 	REJECT Header-Spamschutzregel 201
 /^Subject: The best gift a wife or girlfriend could ever ask for/		REJECT Header-Spamschutzregel 202
 /^Subject: Increase your drive, stamina, size and performance.. reach your potential!/			REJECT Header-Spamschutzregel 203
@@ -353,8 +274,7 @@ If /^Subject:/i
 /^Subject: Nearly 65% of women claim they wish their lover was more adept.. let us help/		REJECT Header-Spamschutzregel 206
 /^Subject: Increased spending on homeland security has created incredible opportunity/			REJECT Header-Spamschutzregel 207
 /^Subject: The security explosion/									REJECT Header-Spamschutzregel 208
-/^Subject: Ermittlungsverfahren gegen Sie.*/	REJECT Header-Spamschutzregel 210
-/^Subject: Bekommen Sie Uhren.*/			REJECT Header-Spamschutzregel 211
+
 Endif
 #################################################
 
@@ -405,3 +325,5 @@ Endif
 # invalid timezone in Date header	
 /^Date:.*[+-](1[4-9]|2\d)\d\d$/ 	REJECT Header-Spamschutzregel 195
 /^From:.*icyhot.bakas24.de/ 		REJECT Header-Spamschutzregel 209
+
+
diff --git a/sgml/catalog b/sgml/catalog
index 35d8d64..213a837 100644
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -7,5 +7,5 @@ CATALOG "/etc/sgml/xml-docbook-4.1.2.cat"
 CATALOG "/etc/sgml/xml-docbook-4.3.cat"
 CATALOG "/etc/sgml/xml-docbook-4.4.cat"
 CATALOG "/etc/sgml/xml-docbook-4.5.cat"
-CATALOG "/etc/sgml/openjade-1.3.2.cat"
 CATALOG "/etc/sgml/linuxdoc.cat"
+CATALOG "/etc/sgml/openjade-1.3.2.cat"
diff --git a/texmf/ls-R b/texmf/ls-R
index b2a5cf3..5045d34 100644
--- a/texmf/ls-R
+++ b/texmf/ls-R
@@ -51,6 +51,8 @@ format.texlive-latex.cnf
 texlive-basic.cfg
 texlive-fontsrecommended.cfg
 texlive-latex.cfg
+texlive-latexextra.cfg
+texlive-pictures.cfg
 
 ./web2c:
 fmtutil.cnf
diff --git a/texmf/updmap.d/texlive-latexextra.cfg b/texmf/updmap.d/texlive-latexextra.cfg
new file mode 100644
index 0000000..b97f37f
--- /dev/null
+++ b/texmf/updmap.d/texlive-latexextra.cfg
@@ -0,0 +1,3 @@
+Map epiolmec.map
+MixedMap esint.map
+MixedMap manfnt.map
diff --git a/texmf/updmap.d/texlive-pictures.cfg b/texmf/updmap.d/texlive-pictures.cfg
new file mode 100644
index 0000000..b5b5963
--- /dev/null
+++ b/texmf/updmap.d/texlive-pictures.cfg
@@ -0,0 +1,2 @@
+Map knitfont.map
+MixedMap xypic.map
diff --git a/texmf/web2c/updmap.cfg b/texmf/web2c/updmap.cfg
index c9294cd..a098852 100644
--- a/texmf/web2c/updmap.cfg
+++ b/texmf/web2c/updmap.cfg
@@ -108,3 +108,8 @@ Map charter.map
 Map fpls.map
 Map pazo.map
 Map utopia.map
+Map epiolmec.map
+MixedMap esint.map
+MixedMap manfnt.map
+Map knitfont.map
+MixedMap xypic.map
-- 
2.39.5