CVS commit: pkgsrc/mail/spamassassin

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Aug 30 19:30:50 UTC 2025

Modified Files:
        pkgsrc/mail/spamassassin: Makefile distinfo
        pkgsrc/mail/spamassassin/patches: patch-Makefile.PL

Log Message:
mail/spamassassin: Update to 4.0.2

Upstream NEWS content:

Notable changes
---------------

This release addresses the following issues:

  - Add subs to HeaderEval plugin to detect invalid address headers

  - TxRep data when using a SQL backend might be wrong because of
  a bug in SpamAssassin 4.0.1, TxRep score can be limited with new
  txrep_min_score and txrep_max_score configuration options
  or you can remove email entries from TxRep database.

  - Redis replication is now supported, Redis connection parameters
  are splitted between read_only and read_write. Old syntax is still supported.

  - Internal Mail::SpamAssassin::GeoDB module now also supports
  IP::Geolocation::MMDB Perl module.

  - Improved detection of MIME headers

  - Improved parsing of CSS color values

  - Added "replace_rules" support to Mail::SpamAssassin::Plugin::HashBL

  - CNAME dns records are resolved and domains added to "uri_detail_list"

  - New Mail::SpamAssassin::Plugin::Redirectors plugin
  This plugin looks for URLs redirected by a list of URL redirector
  services.

  - improved handling of IDN domains

The detailed list of all commits can be found in the Changes file.
A detailed view of the issues as they were filed in the Bugzilla issue
tracker can be seen at https://s.apache.org/9er4g

New configuration options
-------------------------

txrep_min_score and txrep_max_score configurations have been added to TxRep plugin
in order to limit score assigned by the plugin.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/mail/spamassassin/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/spamassassin/Makefile
diff -u pkgsrc/mail/spamassassin/Makefile:1.154 pkgsrc/mail/spamassassin/Makefile:1.155
--- pkgsrc/mail/spamassassin/Makefile:1.154     Fri Jul  4 08:47:26 2025
+++ pkgsrc/mail/spamassassin/Makefile   Sat Aug 30 19:30:50 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.154 2025/07/04 08:47:26 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2025/08/30 19:30:50 gdt Exp $
 
-VERSION=       4.0.1
+VERSION=       4.0.2
 DISTNAME=      Mail-SpamAssassin-${VERSION}
 PKGNAME=       spamassassin-${VERSION}
-PKGREVISION=   2
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}

Index: pkgsrc/mail/spamassassin/distinfo
diff -u pkgsrc/mail/spamassassin/distinfo:1.83 pkgsrc/mail/spamassassin/distinfo:1.84
--- pkgsrc/mail/spamassassin/distinfo:1.83      Sat Mar 30 14:22:33 2024
+++ pkgsrc/mail/spamassassin/distinfo   Sat Aug 30 19:30:50 2025
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.83 2024/03/30 14:22:33 gdt Exp $
+$NetBSD: distinfo,v 1.84 2025/08/30 19:30:50 gdt Exp $
 
-BLAKE2s (Mail-SpamAssassin-4.0.1.tar.gz) = f51acb74059a28b6fe88d0b83cf4dd90d2c8328717280bb8893d690804cfd43f
-SHA512 (Mail-SpamAssassin-4.0.1.tar.gz) = 7ac2d789d8744dfe37f647013871e293de50cfcd792029956eb6cea8e51343aad135398bd91867c3c21a68e5fb6330bd6b38a04b794a24449a59287b46d4ac70
-Size (Mail-SpamAssassin-4.0.1.tar.gz) = 6789832 bytes
+BLAKE2s (Mail-SpamAssassin-4.0.2.tar.gz) = a73f37d40be1d4cbe7f8bb9f86568c0a1d427828b637e2b5ee04703996522b4f
+SHA512 (Mail-SpamAssassin-4.0.2.tar.gz) = 138ba8c4577173d0584d44757397af335e45d0f04a66834ef84c2a9065f33aec8f71c1685c6849ad048998915dd7bd1e6cb7e8be8363ef3652d695e15736aab6
+Size (Mail-SpamAssassin-4.0.2.tar.gz) = 6833828 bytes
 BLAKE2s (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = f69d64dbe6ac98e556013540cf61889b8013dbca890577a1142a4ef6f5d33a5f
 SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 8ff0e68e18dc52a88fec83239bb9dc3a1d34f2dcb4c03cd6c566b97fa91242e3c8d006612aeb4df0acf43929eaaa59d542eb5cf904498343adf5eadefcb89255
 Size (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 355737 bytes
 BLAKE2s (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 445aee22649a330357df398cd0694535cd09e83abbaf8f3d338de5f842ed8160
 SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 517dbf83b4cf984036cb7cbf92a290ea0c8eea1da87f80d202275e71d2823b7b2eed4efff2f71742ca28090d355a690346f1bf97cfc15a3ea26a6d52792b1882
 Size (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 833 bytes
-SHA1 (patch-Makefile.PL) = aa33d0062e1f63b4ba1b7a18b404ec602bb15348
+SHA1 (patch-Makefile.PL) = b52bd86ff0582038daae48b45f3193d1449864c7
 SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
 SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8
 SHA1 (patch-sa-update) = dd9a5da8dd62ced920035f39c59e0e866174cc7f

Index: pkgsrc/mail/spamassassin/patches/patch-Makefile.PL
diff -u pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.8 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.9
--- pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.8      Sat Mar 30 14:22:33 2024
+++ pkgsrc/mail/spamassassin/patches/patch-Makefile.PL  Sat Aug 30 19:30:50 2025
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.PL,v 1.8 2024/03/30 14:22:33 gdt Exp $
+$NetBSD: patch-Makefile.PL,v 1.9 2025/08/30 19:30:50 gdt Exp $
 
   - enable build of qmail-spamc
   - some files (local.cf, *.pre) are managed by pkgsrc, disable
     their installation.
   - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
 
---- Makefile.PL.orig   2024-03-26 04:52:15.000000000 +0000
+--- Makefile.PL.orig   2025-08-27 13:17:51.000000000 +0000
 +++ Makefile.PL
-@@ -134,6 +134,7 @@ my %makefile = (
+@@ -71,6 +71,7 @@ my %makefile = (
        'spamassassin.raw' => 'spamassassin',
        'sa-learn.raw'     => 'sa-learn',
        'sa-update.raw'    => 'sa-update',
@@ -15,7 +15,7 @@ $NetBSD: patch-Makefile.PL,v 1.8 2024/03
        'sa-compile.raw'   => 'sa-compile',
        'sa-awl.raw'       => 'sa-awl',
        'sa-check_spamd.raw' => 'sa-check_spamd',
-@@ -1151,24 +1152,26 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+@@ -1086,25 +1087,27 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  
  conf__install:
        -$(MKPATH) $(B_CONFDIR)
@@ -31,6 +31,7 @@ $NetBSD: patch-Makefile.PL,v 1.8 2024/03
 -      $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]"
 -      $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]"
 -      $(PERL) -MFile::Copy -e "copy(q[rules/v401.pre], q[$(B_CONFDIR)/v401.pre]) unless -f q[$(B_CONFDIR)/v401.pre]"
+-      $(PERL) -MFile::Copy -e "copy(q[rules/v402.pre], q[$(B_CONFDIR)/v402.pre]) unless -f q[$(B_CONFDIR)/v402.pre]"
 +      # manage local.cf and *.pre through pkgsrc .mk files
 +      # $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q[$(B_CONFDIR)/local.cf]) unless -f q[$(B_CONFDIR)/local.cf]"
 +      # $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q[$(B_CONFDIR)/init.pre]) unless -f q[$(B_CONFDIR)/init.pre]"
@@ -44,14 +45,15 @@ $NetBSD: patch-Makefile.PL,v 1.8 2024/03
 +      # $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]"
 +      # $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]"
 +      # $(PERL) -MFile::Copy -e "copy(q[rules/v401.pre], q[$(B_CONFDIR)/v401.pre]) unless -f q[$(B_CONFDIR)/v401.pre]"
++      # $(PERL) -MFile::Copy -e "copy(q[rules/v402.pre], q[$(B_CONFDIR)/v402.pre]) unless -f q[$(B_CONFDIR)/v402.pre]"
  
  data__install:
        -$(MKPATH) $(B_DATADIR)
        $(PERL) -e "map unlink, <$(B_DATADIR)/*>"
        $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES)
 -      $(CHMOD) $(PERM_RWX) $(B_DATADIR)
-+      # no change of directory created by pkgsrc
-+      # $(CHMOD) $(PERM_RWX) $(B_DATADIR)
++      # Do not chmod a directorry created by pkgsrc.
++      #$(CHMOD) $(PERM_RWX) $(B_DATADIR)
  
  text_html_doc: made-doc-stamp
        $(NOOP)