git: c9827a426405 - main - mail/spamassassin: Fix NS queries, A dns queries were always triggered

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Tue, 16 Jun 2026 23:00:53 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c9827a42640560c9a8b5a2c1cbc671e1075a8c8e

commit c9827a42640560c9a8b5a2c1cbc671e1075a8c8e
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2026-06-16 22:57:00 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-06-16 23:00:46 +0000

    mail/spamassassin: Fix NS queries, A dns queries were always triggered
    
    Upstream bz #8374.
    
    Reported by:    laszlo@karolyi.hu
    Obtained from:  Upstream commit f0a163ba1
    MFH:            2026Q2
---
 mail/spamassassin/Makefile                           |  2 +-
 .../patch-lib_Mail_SpamAssassin_Plugin_URIDNSBL.pm   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 6d49861ed994..86b19a77ad39 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	spamassassin
 PORTVERSION=	4.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	mail perl5
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}
diff --git a/mail/spamassassin/files/patch-lib_Mail_SpamAssassin_Plugin_URIDNSBL.pm b/mail/spamassassin/files/patch-lib_Mail_SpamAssassin_Plugin_URIDNSBL.pm
new file mode 100644
index 000000000000..0f13405ac757
--- /dev/null
+++ b/mail/spamassassin/files/patch-lib_Mail_SpamAssassin_Plugin_URIDNSBL.pm
@@ -0,0 +1,20 @@
+--- lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm.orig	2025-08-27 06:17:47.000000000 -0700
++++ lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2026-06-16 15:54:55.370330000 -0700
+@@ -967,7 +967,7 @@
+ 
+   my $nsrhsblrules = $pms->{uridnsbl_active_rules_nsrhsbl};
+   my $fullnsrhsblrules = $pms->{uridnsbl_active_rules_fullnsrhsbl};
+-  my $areviprules = $pms->{uridnsbl_active_rules_arevipbl};
++  my $nsreviprules = $pms->{uridnsbl_active_rules_nsrevipbl};
+   my $seen_lookups = $pms->{uridnsbl_seen_lookups};
+ 
+   my $j = 0;
+@@ -998,7 +998,7 @@
+       else {
+         if (!$seen_lookups->{"A:$nsmatch"}) {
+           $seen_lookups->{"A:$nsmatch"} = 1;
+-          $self->lookup_a_record($pms, $nsmatch, [keys %$areviprules]);
++          $self->lookup_a_record($pms, $nsmatch, [keys %$nsreviprules]);
+         }
+         $nsrhblstr = $self->{main}->{registryboundaries}->trim_domain($nsmatch);
+       }