You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2010/02/06 02:04:47 UTC
svn commit: r907147 -
/spamassassin/trunk/rulesrc/sandbox/khopesh/65_debian.cf
Author: khopesh
Date: Sat Feb 6 01:04:47 2010
New Revision: 907147
URL: http://svn.apache.org/viewvc?rev=907147&view=rev
Log:
permissions obtained, cleanup, added jm's suggested safeties, removed redundancy
Modified:
spamassassin/trunk/rulesrc/sandbox/khopesh/65_debian.cf
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/65_debian.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/65_debian.cf?rev=907147&r1=907146&r2=907147&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/65_debian.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/65_debian.cf Sat Feb 6 01:04:47 2010
@@ -1,41 +1,43 @@
-# Imported from debian spamassassin 3.2.5-7 package
-# under assumed license compatibility and cooperation.
-# Flagged 'nopublish' until that is confirmed.
+# Imported from Debian spamassassin 3.2.5-7 package.
+# Direct use confirmation from original author Duncan Findlay (Apache CLA is
+# on file), plus blanket license compatibility assured by package maintainer
+# Noah Meyerhans. Modified for safety, consistency, and tweaks.
# Special SpamAssassin rules for Debian
# Duncan Findlay
-header D_SENT_BY_DEBCONF Subject =~ /^Debconf:/
+header __D_SENT_BY_DEBCONF Subject =~ /^Debconf:/
+meta D_SENT_BY_DEBCONF __D_SENT_BY_DEBCONF && ALL_TRUSTED
#score D_SENT_BY_DEBCONF -5.0
describe D_SENT_BY_DEBCONF Sent by Debconf
tflags D_SENT_BY_DEBCONF nice nopublish
-body D_SENT_BY_AFBACKUP /^\[Afbackup\]: Overall exit status:/
+body __D_SENT_BY_AFBACKUP /^\[Afbackup\]: Overall exit status:/
+meta D_SENT_BY_AFBACKUP __D_SENT_BY_AFBACKUP && ALL_TRUSTED
#score D_SENT_BY_AFBACKUP -5.0
describe D_SENT_BY_AFBACKUP Sent by Afbackup
tflags D_SENT_BY_AFBACKUP nice nopublish
-header D_SENT_BY_APTLC Subject =~ /^apt-listchanges: (changelogs|news) for/
+header __D_SENT_BY_APTLC Subject =~ /^apt-listchanges: (changelogs|news) for/
+meta D_SENT_BY_APTLC __D_SENT_BY_APTLC && ALL_TRUSTED
#score D_SENT_BY_APTLC -5.0
describe D_SENT_BY_APTLC Sent by apt-listchanges
tflags D_SENT_BY_APTLC nice nopublish
header __ANACRON_SUBJ Subject =~ /^Anacron job '[a-z0-9_.-]+' on/i
tflags __ANACRON_SUBJ nice nopublish
-header __ANACRON_FROM From =~ /^Anacron/
+header __ANACRON_FROM From:name =~ /^Anacron/
tflags __ANACRON_FROM nice nopublish
-meta D_SENT_BY_ANACRON __ANACRON_SUBJ && __ANACRON_FROM
+meta D_SENT_BY_ANACRON __ANACRON_SUBJ && __ANACRON_FROM && ALL_TRUSTED
#score D_SENT_BY_ANACRON -5.0
describe D_SENT_BY_ANACRON Sent by Anacron Daemon
tflags D_SENT_BY_ANACRON nice nopublish
-header __CRON_FROM From =~ /^Cron Daemon/
+header __CRON_FROM From:name =~ /^Cron Daemon/
tflags __CRON_FROM nice nopublish
-header __CRON_HEADER X-Cron-Env =~ /./
-tflags __CRON_HEADER nice nopublish
-meta D_SENT_BY_CRON __CRON_FROM && __CRON_HEADER
+meta D_SENT_BY_CRON __CRON_FROM && __X_CRON_ENV && ALL_TRUSTED
#score D_SENT_BY_CRON -5.0
describe D_SENT_BY_CRON Sent by Cron Daemon
tflags D_SENT_BY_CRON nice nopublish