X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fdebian_specific;h=3b7ed7795aa9d174e190056c93dce4b8386b1548;hp=1041489de71b44e3de928514309248ec89cd6849;hb=d6e9cadda6ebc0595e16f8691ecebf12fc825d0f;hpb=652703901508da38854d07b3b53b6d231eff175f

diff --git a/common/debian_specific b/common/debian_specific
index 1041489..3b7ed77 100644
--- a/common/debian_specific
+++ b/common/debian_specific
@@ -1,3 +1,4 @@
+# -*- mode: spamassassin -*-
 # this contains headers and such which are Debian specific
 
 # cord, 20050811
@@ -5,9 +6,12 @@ header HEADER_X_KATIE	exists:X-Katie
 describe HEADER_X_KATIE	X-Katie-Mailheader present
 score HEADER_X_KATIE	-2
 
-header RCVD_FROM_SPOHR	Received =~ /^from spohr.debian.org \(spohr.debian.org \[140.211.166.43\]\)/
-describe RCVD_FROM_SPOHR Mail comes from Spohr
-score RCVD_FROM_SPOHR -2
+header RCVD_FROM_RIES	Received =~ /^from ries.debian.org \(ries.debian.org \[128.148.34.103\]\)/
+describe RCVD_FROM_RIES Mail comes from Ries
+score RCVD_FROM_RIES -2
+
+#testing watch
+white_from noreply@release.debian.org
 
 # Added by cord 2004/10/24 (to let Release-critical Bugreport through)
 whitelist_from_rcvd bugscan@debian.org debian.org 
@@ -19,7 +23,21 @@ describe MURPHY_DEBIAN_MESSAGE	Found Debian-Header.
 score MURPHY_DEBIAN_MESSAGE	-10
 
 # joy, 2003-08-17
-header OUR_MTA_MSGID		Message-Id =~ /\@(master|murphy|gluck)\.debian\.org/
+header OUR_MTA_MSGID		Message-Id =~ /\@(master|liszt|gluck)\.debian\.org/
 describe OUR_MTA_MSGID		Sounds like a msgid autogenerated by our MTAs
 score OUR_MTA_MSGID		2
 
+header XMAILER_REPORTBUG	X-Mailer =~ /reportbug/
+describe XMAILER_REPORTBUG	X-Mailer seems to be reportbug, a debian utility
+score XMAILER_REPORTBUG		-2
+
+header XPRPACKAGE_INSTALLREPORT	X-Debian-PR-Package =~ /installation-reports/
+describe XPRPACKAGE_INSTALLREPORT Install reports sometimes contain infos that trigger to much other test
+score XPRPACKAGE_INSTALLREPORT	-2
+
+header XMAILORIGINATOR_PODEBCONF	X-Mail-Originator =~ /podebconf-report-po/
+describe XMAILORIGINATOR_PODEBCONF	Mail from podebconf-report-po
+score XMAILORIGINATOR_PODEBCONF	-2
+
+# we bump the score of vacation up here
+score VACATIONMAIL  5