File bnc#606231.diff of Package spamassassin
--- rules/active.list 2010-05-17 12:11:55.000000000 +0200
+++ rules/active.list 2010-05-17 12:11:02.000000000 +0200
@@ -92,9 +92,6 @@
DNS_FROM_DOB
# tflags net
-DNS_FROM_OPENWHOIS
-
-# tflags net
DNS_FROM_RFC_BOGUSMX
# tflags net
@@ -1069,123 +1066,6 @@
# tflags userconf
USER_IN_WHITELIST_TO
-# tflags net
-WHOIS_1AND1PR
-
-# tflags net
-WHOIS_AITPRIV
-
-# tflags net
-WHOIS_CONTACTPRIV
-
-# tflags net
-WHOIS_DMNBYPROXY
-
-# tflags net
-WHOIS_DOMESCROW
-
-# tflags net
-WHOIS_DOMPRIVCORP
-
-# tflags net
-WHOIS_DREAMPRIV
-
-# tflags net
-WHOIS_DROA
-
-# tflags net
-WHOIS_DYNADOT
-
-# tflags net
-WHOIS_FINEXE
-
-# tflags net
-WHOIS_GKGPROXY
-
-# tflags net
-WHOIS_IDSHIELD
-
-# tflags net
-WHOIS_IDTHEFTPROT
-
-# tflags net
-WHOIS_KATZ
-
-# tflags net
-WHOIS_LISTINGAG
-
-# tflags net
-WHOIS_LNOA
-
-# tflags net
-WHOIS_MAPNAME
-
-# tflags net
-WHOIS_MONIKER_PRIV
-
-# tflags net
-WHOIS_MYPRIVREG
-
-# tflags net
-WHOIS_NAMEKING
-
-# tflags net
-WHOIS_NAMESECURE
-
-# tflags net
-WHOIS_NETID
-
-# tflags net
-WHOIS_NETSOLPR
-
-# tflags net
-WHOIS_NOLDC
-
-# tflags net
-WHOIS_NOMINET
-
-# tflags net
-WHOIS_PRIVACYPOST
-
-# tflags net
-WHOIS_PRIVDOMAIN
-
-# tflags net
-WHOIS_PRIVPROT
-
-# tflags net
-WHOIS_REGISTER4LESS
-
-# tflags net
-WHOIS_REGISTERFLY
-
-# tflags net
-WHOIS_REGTEK
-
-# tflags net
-WHOIS_SAFENAMES
-
-# tflags net
-WHOIS_SECINFOSERV
-
-# tflags net
-WHOIS_SECUREWHOIS
-
-# tflags net
-WHOIS_SPAMFREE
-
-# tflags net
-WHOIS_SRSPLUS
-
-# tflags net
-WHOIS_UNLISTED
-
-# tflags net
-WHOIS_WHOISGUARD
-
-# tflags net
-WHOIS_WHOISPROT
-
# good enough
XMAILER_MIMEOLE_OL_015D5
@@ -1325,9 +1205,6 @@
__DNS_FROM_RFC_POST
# tflags net
-__DNS_FROM_RFC_WHOIS
-
-# tflags net
__RCVD_IN_DOB
# tflags net
--- rules/72_active.cf 2010-05-17 11:43:55.000000000 +0200
+++ rules/72_active.cf 2010-05-17 12:09:36.000000000 +0200
@@ -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
@@ -2044,396 +2035,6 @@
endif
##} URIBL_RHS_DOB
-##{ WHOIS_1AND1PR
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_1AND1PR bl.open-whois.org. A 127.0.0.2
-body WHOIS_1AND1PR eval:check_uridnsbl('WHOIS_1AND1PR')
-describe WHOIS_1AND1PR URL registered to 1&1 Private Registration
-tflags WHOIS_1AND1PR net
-endif
-##} WHOIS_1AND1PR
-
-##{ WHOIS_AITPRIV
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_AITPRIV bl.open-whois.org. A 127.0.0.19
-body WHOIS_AITPRIV eval:check_uridnsbl('WHOIS_AITPRIV')
-describe WHOIS_AITPRIV URL registered as an AIT Private Registration
-tflags WHOIS_AITPRIV net publish
-endif
-##} WHOIS_AITPRIV
-
-##{ WHOIS_CONTACTPRIV
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_CONTACTPRIV bl.open-whois.org. A 127.0.0.37
-body WHOIS_CONTACTPRIV eval:check_uridnsbl('WHOIS_CONTACTPRIV')
-describe WHOIS_CONTACTPRIV URL registered to contactprivacy.com
-tflags WHOIS_CONTACTPRIV net
-endif
-##} WHOIS_CONTACTPRIV
-
-##{ WHOIS_DMNBYPROXY
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_DMNBYPROXY bl.open-whois.org. A 127.0.0.15
-body WHOIS_DMNBYPROXY eval:check_uridnsbl('WHOIS_DMNBYPROXY')
-describe WHOIS_DMNBYPROXY Contains URL registered to Domains by Proxy
-tflags WHOIS_DMNBYPROXY net
-endif
-##} WHOIS_DMNBYPROXY
-
-##{ WHOIS_DOMESCROW
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_DOMESCROW bl.open-whois.org. A 127.0.0.10
-body WHOIS_DOMESCROW eval:check_uridnsbl('WHOIS_DOMESCROW')
-describe WHOIS_DOMESCROW URL registered to Domain Escrow Services
-tflags WHOIS_DOMESCROW net
-endif
-##} WHOIS_DOMESCROW
-
-##{ WHOIS_DOMPRIVCORP
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_DOMPRIVCORP bl.open-whois.org. A 127.0.0.24
-body WHOIS_DOMPRIVCORP eval:check_uridnsbl('WHOIS_DOMPRIVCORP')
-describe WHOIS_DOMPRIVCORP URL registered to DomainPrivacyCorp.com
-tflags WHOIS_DOMPRIVCORP net
-endif
-##} WHOIS_DOMPRIVCORP
-
-##{ WHOIS_DREAMPRIV
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_DREAMPRIV bl.open-whois.org. A 127.0.0.8
-body WHOIS_DREAMPRIV eval:check_uridnsbl('WHOIS_DREAMPRIV')
-describe WHOIS_DREAMPRIV URL registered as a DreamHost Private Registration
-tflags WHOIS_DREAMPRIV net
-endif
-##} WHOIS_DREAMPRIV
-
-##{ WHOIS_DROA
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_DROA bl.open-whois.org. A 127.0.0.26
-body WHOIS_DROA eval:check_uridnsbl('WHOIS_DROA')
-describe WHOIS_DROA URL registered as an DROA Private Registration
-tflags WHOIS_DROA net
-endif
-##} WHOIS_DROA
-
-##{ WHOIS_DYNADOT
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_DYNADOT bl.open-whois.org. A 127.0.0.27
-body WHOIS_DYNADOT eval:check_uridnsbl('WHOIS_DYNADOT')
-describe WHOIS_DYNADOT URL registered to Dynadot Privacy
-tflags WHOIS_DYNADOT net
-endif
-##} WHOIS_DYNADOT
-
-##{ WHOIS_FINEXE
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_FINEXE bl.open-whois.org. A 127.0.0.25
-body WHOIS_FINEXE eval:check_uridnsbl('WHOIS_FINEXE')
-describe WHOIS_FINEXE URL registered to Finexe Domain Proxy Service
-tflags WHOIS_FINEXE net
-endif
-##} WHOIS_FINEXE
-
-##{ WHOIS_GKGPROXY
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_GKGPROXY bl.open-whois.org. A 127.0.0.29
-body WHOIS_GKGPROXY eval:check_uridnsbl('WHOIS_GKGPROXY')
-describe WHOIS_GKGPROXY URL registered to GKG.NET Domain Proxy Service
-tflags WHOIS_GKGPROXY net
-endif
-##} WHOIS_GKGPROXY
-
-##{ WHOIS_IDSHIELD
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_IDSHIELD bl.open-whois.org. A 127.0.0.16
-body WHOIS_IDSHIELD eval:check_uridnsbl('WHOIS_IDSHIELD')
-describe WHOIS_IDSHIELD Contains URL registered to WHOIS ID Shield
-tflags WHOIS_IDSHIELD net
-endif
-##} WHOIS_IDSHIELD
-
-##{ WHOIS_IDTHEFTPROT
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_IDTHEFTPROT bl.open-whois.org. A 127.0.0.39
-body WHOIS_IDTHEFTPROT eval:check_uridnsbl('WHOIS_IDTHEFTPROT')
-describe WHOIS_IDTHEFTPROT URL registered to Whois ID Theft Protection
-tflags WHOIS_IDTHEFTPROT net
-endif
-##} WHOIS_IDTHEFTPROT
-
-##{ WHOIS_KATZ
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_KATZ bl.open-whois.org. A 127.0.0.31
-body WHOIS_KATZ eval:check_uridnsbl('WHOIS_KATZ')
-describe WHOIS_KATZ URL registered to Katz Global Domain Name Trust
-tflags WHOIS_KATZ net
-endif
-##} WHOIS_KATZ
-
-##{ WHOIS_LISTINGAG
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_LISTINGAG bl.open-whois.org. A 127.0.0.33
-body WHOIS_LISTINGAG eval:check_uridnsbl('WHOIS_LISTINGAG')
-describe WHOIS_LISTINGAG URL registered to Domain Listing Agent
-tflags WHOIS_LISTINGAG net
-endif
-##} WHOIS_LISTINGAG
-
-##{ WHOIS_LNOA
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_LNOA bl.open-whois.org. A 127.0.0.28
-body WHOIS_LNOA eval:check_uridnsbl('WHOIS_LNOA')
-describe WHOIS_LNOA URL registered to LNOA WHOIS Privacy
-tflags WHOIS_LNOA net
-endif
-##} WHOIS_LNOA
-
-##{ WHOIS_MAPNAME
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_MAPNAME bl.open-whois.org. A 127.0.0.34
-body WHOIS_MAPNAME eval:check_uridnsbl('WHOIS_MAPNAME')
-describe WHOIS_MAPNAME URL registered to MapName
-tflags WHOIS_MAPNAME net
-endif
-##} WHOIS_MAPNAME
-
-##{ WHOIS_MONIKER_PRIV
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_MONIKER_PRIV bl.open-whois.org. A 127.0.0.11
-body WHOIS_MONIKER_PRIV eval:check_uridnsbl('WHOIS_MONIKER_PRIV')
-describe WHOIS_MONIKER_PRIV URL registered to Moniker Privacy Protection
-tflags WHOIS_MONIKER_PRIV net
-endif
-##} WHOIS_MONIKER_PRIV
-
-##{ WHOIS_MYPRIVREG
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_MYPRIVREG bl.open-whois.org. A 127.0.0.17
-body WHOIS_MYPRIVREG eval:check_uridnsbl('WHOIS_MYPRIVREG')
-describe WHOIS_MYPRIVREG URL registered to myprivateregistration.com
-tflags WHOIS_MYPRIVREG net
-endif
-##} WHOIS_MYPRIVREG
-
-##{ WHOIS_NAMEKING
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_NAMEKING bl.open-whois.org. A 127.0.0.35
-body WHOIS_NAMEKING eval:check_uridnsbl('WHOIS_NAMEKING')
-describe WHOIS_NAMEKING URL registered to NameKing
-tflags WHOIS_NAMEKING net publish
-endif
-##} WHOIS_NAMEKING
-
-##{ WHOIS_NAMESECURE
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_NAMESECURE bl.open-whois.org. A 127.0.0.9
-body WHOIS_NAMESECURE eval:check_uridnsbl('WHOIS_NAMESECURE')
-describe WHOIS_NAMESECURE Contains URL registered to NameSecure
-tflags WHOIS_NAMESECURE net
-endif
-##} WHOIS_NAMESECURE
-
-##{ WHOIS_NETID
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_NETID bl.open-whois.org. A 127.0.0.42
-body WHOIS_NETID eval:check_uridnsbl('WHOIS_NETID')
-describe WHOIS_NETID URL registered to NetIdentity
-tflags WHOIS_NETID net
-endif
-##} WHOIS_NETID
-
-##{ WHOIS_NETSOLPR
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_NETSOLPR bl.open-whois.org. A 127.0.0.4
-body WHOIS_NETSOLPR eval:check_uridnsbl('WHOIS_NETSOLPR')
-describe WHOIS_NETSOLPR URL registered as a NetSol Private Registration
-tflags WHOIS_NETSOLPR net
-endif
-##} WHOIS_NETSOLPR
-
-##{ WHOIS_NOLDC
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_NOLDC bl.open-whois.org. A 127.0.0.41
-body WHOIS_NOLDC eval:check_uridnsbl('WHOIS_NOLDC')
-describe WHOIS_NOLDC URL registered to NOLDC, Inc.
-tflags WHOIS_NOLDC net
-endif
-##} WHOIS_NOLDC
-
-##{ WHOIS_NOMINET
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_NOMINET bl.open-whois.org. A 127.0.0.36
-body WHOIS_NOMINET eval:check_uridnsbl('WHOIS_NOMINET')
-describe WHOIS_NOMINET URL registered to Nominet Private Registrant
-tflags WHOIS_NOMINET net
-endif
-##} WHOIS_NOMINET
-
-##{ WHOIS_PRIVACYPOST
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_PRIVACYPOST bl.open-whois.org. A 127.0.0.7
-body WHOIS_PRIVACYPOST eval:check_uridnsbl('WHOIS_PRIVACYPOST')
-describe WHOIS_PRIVACYPOST Contains URL registered to PrivacyPost
-tflags WHOIS_PRIVACYPOST net
-endif
-##} WHOIS_PRIVACYPOST
-
-##{ WHOIS_PRIVDOMAIN
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_PRIVDOMAIN bl.open-whois.org. A 127.0.0.38
-body WHOIS_PRIVDOMAIN eval:check_uridnsbl('WHOIS_PRIVDOMAIN')
-describe WHOIS_PRIVDOMAIN URL registered to privacy-domain.com
-tflags WHOIS_PRIVDOMAIN net
-endif
-##} WHOIS_PRIVDOMAIN
-
-##{ WHOIS_PRIVPROT
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_PRIVPROT bl.open-whois.org. A 127.0.0.3
-body WHOIS_PRIVPROT eval:check_uridnsbl('WHOIS_PRIVPROT')
-describe WHOIS_PRIVPROT URL registered to WHOIS Privacy Protection
-tflags WHOIS_PRIVPROT net publish
-endif
-##} WHOIS_PRIVPROT
-
-##{ WHOIS_REGISTER4LESS
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_REGISTER4LESS bl.open-whois.org. A 127.0.0.30
-body WHOIS_REGISTER4LESS eval:check_uridnsbl('WHOIS_REGISTER4LESS')
-describe WHOIS_REGISTER4LESS URL registered to R4L Privacy
-tflags WHOIS_REGISTER4LESS net
-endif
-##} WHOIS_REGISTER4LESS
-
-##{ WHOIS_REGISTERFLY
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_REGISTERFLY bl.open-whois.org. A 127.0.0.14
-body WHOIS_REGISTERFLY eval:check_uridnsbl('WHOIS_REGISTERFLY')
-describe WHOIS_REGISTERFLY Contains URL registered to RegisterFly
-tflags WHOIS_REGISTERFLY net publish
-endif
-##} WHOIS_REGISTERFLY
-
-##{ WHOIS_REGTEK
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_REGTEK bl.open-whois.org. A 127.0.0.40
-body WHOIS_REGTEK eval:check_uridnsbl('WHOIS_REGTEK')
-describe WHOIS_REGTEK URL registered to RegTek Whois Envoy
-tflags WHOIS_REGTEK net
-endif
-##} WHOIS_REGTEK
-
-##{ WHOIS_SAFENAMES
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_SAFENAMES bl.open-whois.org. A 127.0.0.12
-body WHOIS_SAFENAMES eval:check_uridnsbl('WHOIS_SAFENAMES')
-describe WHOIS_SAFENAMES Contains URL registered to SafeNames
-tflags WHOIS_SAFENAMES net
-endif
-##} WHOIS_SAFENAMES
-
-##{ WHOIS_SECINFOSERV
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_SECINFOSERV bl.open-whois.org. A 127.0.0.21
-body WHOIS_SECINFOSERV eval:check_uridnsbl('WHOIS_SECINFOSERV')
-describe WHOIS_SECINFOSERV URL registered to Secure WHOIS Information Services
-tflags WHOIS_SECINFOSERV net
-endif
-##} WHOIS_SECINFOSERV
-
-##{ WHOIS_SECUREWHOIS
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_SECUREWHOIS bl.open-whois.org. A 127.0.0.5
-body WHOIS_SECUREWHOIS eval:check_uridnsbl('WHOIS_SECUREWHOIS')
-describe WHOIS_SECUREWHOIS Contains URL registered to SecureWhois
-tflags WHOIS_SECUREWHOIS net publish
-endif
-##} WHOIS_SECUREWHOIS
-
-##{ WHOIS_SPAMFREE
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_SPAMFREE bl.open-whois.org. A 127.0.0.32
-body WHOIS_SPAMFREE eval:check_uridnsbl('WHOIS_SPAMFREE')
-describe WHOIS_SPAMFREE URL registered to SpamFreeReg.com
-tflags WHOIS_SPAMFREE net
-endif
-##} WHOIS_SPAMFREE
-
-##{ WHOIS_SRSPLUS
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_SRSPLUS bl.open-whois.org. A 127.0.0.23
-body WHOIS_SRSPLUS eval:check_uridnsbl('WHOIS_SRSPLUS')
-describe WHOIS_SRSPLUS URL registered as an SRSPlus Private Registration
-tflags WHOIS_SRSPLUS net
-endif
-##} WHOIS_SRSPLUS
-
-##{ WHOIS_UNLISTED
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_UNLISTED bl.open-whois.org. A 127.0.0.13
-body WHOIS_UNLISTED eval:check_uridnsbl('WHOIS_UNLISTED')
-describe WHOIS_UNLISTED Contains URL registered to Unlisted-Whois.com
-tflags WHOIS_UNLISTED net
-endif
-##} WHOIS_UNLISTED
-
-##{ WHOIS_WHOISGUARD
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_WHOISGUARD bl.open-whois.org. A 127.0.0.18
-body WHOIS_WHOISGUARD eval:check_uridnsbl('WHOIS_WHOISGUARD')
-describe WHOIS_WHOISGUARD URL registered to WhoisGuard
-tflags WHOIS_WHOISGUARD net publish
-endif
-##} WHOIS_WHOISGUARD
-
-##{ WHOIS_WHOISPROT
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-urirhssub WHOIS_WHOISPROT bl.open-whois.org. A 127.0.0.20
-body WHOIS_WHOISPROT eval:check_uridnsbl('WHOIS_WHOISPROT')
-describe WHOIS_WHOISPROT URL registered to WhoisProtector
-tflags WHOIS_WHOISPROT net
-endif
-##} WHOIS_WHOISPROT
-
##{ XMAILER_MIMEOLE_OL_015D5
meta XMAILER_MIMEOLE_OL_015D5 (__XM_OL_015D5 && __MO_OL_015D5)
##} XMAILER_MIMEOLE_OL_015D5
