svn commit: r1932590 - in spamassassin/trunk: lib/Mail/SpamAssassin/Plugin rules

Author: gbechis
Date: Fri Mar 27 08:17:35 2026
New Revision: 1932590

Log:
avoid warnings SpamAssassin versions older then trunk

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm
   spamassassin/trunk/rules/25_dmarc.cf

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm	Fri Mar 27 06:45:04 2026	(r1932589)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm	Fri Mar 27 08:17:35 2026	(r1932590)
@@ -495,6 +495,8 @@ sub _check_arc_override {
   return 0;
 }
 
+# Version features
+sub has_dmarc_errors { 1 }
 
 1;
 

Modified: spamassassin/trunk/rules/25_dmarc.cf
==============================================================================
--- spamassassin/trunk/rules/25_dmarc.cf	Fri Mar 27 06:45:04 2026	(r1932589)
+++ spamassassin/trunk/rules/25_dmarc.cf	Fri Mar 27 08:17:35 2026	(r1932590)
@@ -58,17 +58,19 @@ priority DMARC_MISSING 500
 tflags DMARC_MISSING net
 reuse DMARC_MISSING
 
-header DMARC_PERMERROR eval:check_dmarc_permerror()
-describe DMARC_PERMERROR DMARC permanent error
-priority DMARC_PERMERROR 500
-tflags DMARC_PERMERROR net
-reuse DMARC_PERMERROR
+if can(Mail::SpamAssassin::Plugin::DMARC::has_dmarc_errors)
+  header DMARC_PERMERROR eval:check_dmarc_permerror()
+  describe DMARC_PERMERROR DMARC permanent error
+  priority DMARC_PERMERROR 500
+  tflags DMARC_PERMERROR net
+  reuse DMARC_PERMERROR
 
-header DMARC_TEMPERROR eval:check_dmarc_temperror()
-describe DMARC_TEMPERROR DMARC temporary error
-priority DMARC_TEMPERROR 500
-tflags DMARC_TEMPERROR net
-reuse DMARC_TEMPERROR
+  header DMARC_TEMPERROR eval:check_dmarc_temperror()
+  describe DMARC_TEMPERROR DMARC temporary error
+  priority DMARC_TEMPERROR 500
+  tflags DMARC_TEMPERROR net
+  reuse DMARC_TEMPERROR
+endif
 
 endif