~ubuntu-branches/ubuntu/utopic/spamassassin/utopic-proposed

#! /bin/sh /usr/share/dpatch/dpatch-run

## 41_remove_openwhois.dpatch by  <noahm@crystalline-entity.csail.mit.edu>

##

## All lines beginning with `## DP:' are a description of the patch.

## DP: Remove the obsolete OPENWHOIS rules.  Debian bug #537477

 

@DPATCH@

diff -urNad Mail-SpamAssassin-3.2.5~/rules/50_scores.cf Mail-SpamAssassin-3.2.5/rules/50_scores.cf

--- Mail-SpamAssassin-3.2.5~/rules/50_scores.cf 2008-06-10 05:20:35.000000000 -0400

+++ Mail-SpamAssassin-3.2.5/rules/50_scores.cf  2009-07-20 09:25:01.000000000 -0400

@@ -63,7 +63,6 @@

 score DEAR_WINNER 3.199 3.196 3.199 3.197 # n=2

 score DIET_1 2.472 0.336 1.442 0.083

 score DIGEST_MULTIPLE 0 0.001 0 0.001 # n=0 n=2

-score DNS_FROM_OPENWHOIS 0 2.431 0 1.130 # n=0 n=2

 score DOS_FIX_MY_URI 0 # n=1 n=3

 score DOS_LET_GO_JOB 0 # n=1 n=3

 score DOS_STOCK_BAT 3.290 3.383 2.336 3.699 # n=2

diff -urNad Mail-SpamAssassin-3.2.5~/rules/72_active.cf Mail-SpamAssassin-3.2.5/rules/72_active.cf

--- Mail-SpamAssassin-3.2.5~/rules/72_active.cf 2008-06-10 05:21:33.000000000 -0400

+++ Mail-SpamAssassin-3.2.5/rules/72_active.cf  2009-07-20 09:24:39.000000000 -0400

@@ -109,15 +109,6 @@

 body DEAR_WINNER /\bdear.{1,20}winner/i

 ##} DEAR_WINNER

 

-##{ DNS_FROM_OPENWHOIS

-

-ifplugin Mail::SpamAssassin::Plugin::DNSEval

-header          DNS_FROM_OPENWHOIS  eval:check_rbl_envfrom('openwhois', 'bl.open-whois.org.')

-describe        DNS_FROM_OPENWHOIS  Envelope sender listed in bl.open-whois.org.

-tflags          DNS_FROM_OPENWHOIS  net publish

-endif

-##} DNS_FROM_OPENWHOIS

-

 ##{ DOS_FIX_MY_URI

 meta DOS_FIX_MY_URI             __MIMEOLE_1106 && __DOS_HAS_ANY_URI && __DOS_SINGLE_EXT_RELAY && __DOS_HI && __DOS_LINK

 describe DOS_FIX_MY_URI         Looks like a "fix my obfu'd URI please" spam

diff -urNad Mail-SpamAssassin-3.2.5~/rules/active.list Mail-SpamAssassin-3.2.5/rules/active.list

--- Mail-SpamAssassin-3.2.5~/rules/active.list  2008-06-10 05:20:35.000000000 -0400

+++ Mail-SpamAssassin-3.2.5/rules/active.list   2009-07-20 09:25:55.000000000 -0400

@@ -92,9 +92,6 @@

 DNS_FROM_DOB

 

 # tflags net

-DNS_FROM_OPENWHOIS

-

-# tflags net

 DNS_FROM_RFC_BOGUSMX

 

 # tflags net