svn commit: r208813 - in /spamassassin/trunk/rules: 25_spf.cf 25_uribl.cf

[jm...@apache.org]

Author: jm
Date: Fri Jul  1 18:55:17 2005
New Revision: 208813

URL: http://svn.apache.org/viewcvs?rev=208813&view=rev
Log:
bug 4450: add reuse flags for SPF and URIBL rules

Modified:
    spamassassin/trunk/rules/25_spf.cf
    spamassassin/trunk/rules/25_uribl.cf

Modified: spamassassin/trunk/rules/25_spf.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/25_spf.cf?rev=208813&r1=208812&r2=208813&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_spf.cf (original)
+++ spamassassin/trunk/rules/25_spf.cf Fri Jul  1 18:55:17 2005
@@ -65,4 +65,16 @@
 tflags SPF_HELO_FAIL		net
 tflags SPF_HELO_SOFTFAIL	net
 
+# rules from earlier than current release that can be reused
+#reuse SPF_PASS
+#reuse SPF_FAIL
+#reuse SPF_SOFTFAIL
+#reuse SPF_HELO_PASS
+#reuse SPF_HELO_FAIL
+#reuse SPF_HELO_SOFTFAIL
+
+# new in 3.1, cannot be reused until 3.2
+# SPF_NEUTRAL
+# SPF_HELO_NEUTRAL
+
 endif   # Mail::SpamAssassin::Plugin::SPF

Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/25_uribl.cf?rev=208813&r1=208812&r2=208813&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Fri Jul  1 18:55:17 2005
@@ -37,36 +37,43 @@
 body		URIBL_SBL	eval:check_uridnsbl('URIBL_SBL')
 describe	URIBL_SBL	Contains an URL listed in the SBL blocklist
 tflags		URIBL_SBL	net
+#reuse		URIBL_SBL
 
 urirhssub	URIBL_SC_SURBL	multi.surbl.org.	A   2
 body		URIBL_SC_SURBL	eval:check_uridnsbl('URIBL_SC_SURBL')
 describe	URIBL_SC_SURBL	Contains an URL listed in the SC SURBL blocklist
 tflags		URIBL_SC_SURBL	net
+#reuse		URIBL_SC_SURBL
 
 urirhssub	URIBL_WS_SURBL	multi.surbl.org.	A   4
 body		URIBL_WS_SURBL	eval:check_uridnsbl('URIBL_WS_SURBL')
 describe	URIBL_WS_SURBL	Contains an URL listed in the WS SURBL blocklist
 tflags		URIBL_WS_SURBL	net
+#reuse		URIBL_WS_SURBL
 
 urirhssub	URIBL_PH_SURBL	multi.surbl.org.	A   8
 body		URIBL_PH_SURBL	eval:check_uridnsbl('URIBL_PH_SURBL')
 describe	URIBL_PH_SURBL	Contains an URL listed in the PH SURBL blocklist
 tflags		URIBL_PH_SURBL	net
+#reuse		URIBL_PH_SURBL
 
 urirhssub	URIBL_OB_SURBL	multi.surbl.org.	A   16
 body		URIBL_OB_SURBL	eval:check_uridnsbl('URIBL_OB_SURBL')
 describe	URIBL_OB_SURBL	Contains an URL listed in the OB SURBL blocklist
 tflags		URIBL_OB_SURBL	net
+#reuse		URIBL_OB_SURBL
 
 urirhssub	URIBL_AB_SURBL	multi.surbl.org.	A   32
 body		URIBL_AB_SURBL	eval:check_uridnsbl('URIBL_AB_SURBL')
 describe	URIBL_AB_SURBL	Contains an URL listed in the AB SURBL blocklist
 tflags		URIBL_AB_SURBL	net
+#reuse		URIBL_AB_SURBL
 
 urirhssub	URIBL_JP_SURBL	multi.surbl.org.	A   64
 body		URIBL_JP_SURBL	eval:check_uridnsbl('URIBL_JP_SURBL')
 describe	URIBL_JP_SURBL	Contains an URL listed in the JP SURBL blocklist
 tflags		URIBL_JP_SURBL	net
+#reuse		URIBL_JP_SURBL
 
 # Don't bother looking for example domains as per RFC 2606.
 uridnsbl_skip_domain example.com example.net example.org