CVS commit: pkgsrc/mail/amavisd-new

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 12 13:33:21 UTC 2025

Modified Files:
        pkgsrc/mail/amavisd-new: Makefile distinfo
Added Files:
        pkgsrc/mail/amavisd-new/patches: patch-amavisd

Log Message:
amavisd-new: Fix for latest p5-Crypt-OpenSSL-RSA.

Pull in upstream submitted patch originally from Arch.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/amavisd-new/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/amavisd-new/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/mail/amavisd-new/patches/patch-amavisd

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

Modified files:

Index: pkgsrc/mail/amavisd-new/Makefile
diff -u pkgsrc/mail/amavisd-new/Makefile:1.33 pkgsrc/mail/amavisd-new/Makefile:1.34
--- pkgsrc/mail/amavisd-new/Makefile:1.33       Mon Sep 25 19:33:33 2023
+++ pkgsrc/mail/amavisd-new/Makefile    Wed Nov 12 13:33:21 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2023/09/25 19:33:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2025/11/12 13:33:21 jperkin Exp $
 
 # pkgname kept as amavisd-new even though that migrated to be amavis again
 PKGNAME=       amavisd-new-${VERSION}
 DISTNAME=      amavis-${GITLAB_TAG}
 VERSION=       2.12.2
-PKGREVISION=   1
+PKGREVISION=   2
 
 CATEGORIES=    mail security
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=amavis/}

Index: pkgsrc/mail/amavisd-new/distinfo
diff -u pkgsrc/mail/amavisd-new/distinfo:1.11 pkgsrc/mail/amavisd-new/distinfo:1.12
--- pkgsrc/mail/amavisd-new/distinfo:1.11       Sat Sep 17 09:26:12 2022
+++ pkgsrc/mail/amavisd-new/distinfo    Wed Nov 12 13:33:21 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2022/09/17 09:26:12 spz Exp $
+$NetBSD: distinfo,v 1.12 2025/11/12 13:33:21 jperkin Exp $
 
 BLAKE2s (amavis-v2.12.2.tar.gz) = fd9dc23a2923bcbf198a5a7d7993dd90a426a056fd96bf28a6bf421c98ff3770
 SHA512 (amavis-v2.12.2.tar.gz) = 7ef5ba670b530bf19352ba8aebd57a171e32d90adffc0b248b93a39f740fe4bb8ddf1d5ecdd46d0c9e1b4ca1a9ff0a9e86e73900e73a1a2cac514656c3a7db01
 Size (amavis-v2.12.2.tar.gz) = 1097754 bytes
 SHA1 (patch-aa) = d9076df1115ca88cef2ccb586a6c5e15288130a5
+SHA1 (patch-amavisd) = 3692e0d148f967130040fe562d51f1642da8a9d9

Added files:

Index: pkgsrc/mail/amavisd-new/patches/patch-amavisd
diff -u /dev/null pkgsrc/mail/amavisd-new/patches/patch-amavisd:1.3
--- /dev/null   Wed Nov 12 13:33:21 2025
+++ pkgsrc/mail/amavisd-new/patches/patch-amavisd       Wed Nov 12 13:33:21 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-amavisd,v 1.3 2025/11/12 13:33:21 jperkin Exp $
+
+https://gitlab.com/amavis/amavis/-/issues/128
+
+--- amavisd.orig       2025-11-12 13:25:33.638220968 +0000
++++ amavisd
+@@ -18789,8 +18789,7 @@ sub fetch_modules_extra() {
+                       auto::Net::SSLeay::ssl_read_until
+                       auto::Net::SSLeay::dump_peer_certificate));
+   }
+-  push(@modules, qw(Net::DNS::RR::TXT Text::ParseWords
+-         auto::Crypt::OpenSSL::RSA::new_public_key))  if $extra_code_dkim;
++  push(@modules, qw(Net::DNS::RR::TXT Text::ParseWords))  if $extra_code_dkim;
+   push(@modules, 'Anomy::Sanitizer')  if $enable_anomy_sanitizer;
+   Amavis::Boot::fetch_modules('REQUIRED ADDITIONAL MODULES', 1, @modules);
+ 
+@@ -30827,10 +30826,6 @@ sub getSAPlugins {
+       $mod_names{'Mail::SpamAssassin::Plugin::DKIM'}) {
+     push(@modules, qw(
+       Crypt::OpenSSL::RSA
+-      auto::Crypt::OpenSSL::RSA::new_public_key
+-      auto::Crypt::OpenSSL::RSA::new_key_from_parameters
+-      auto::Crypt::OpenSSL::RSA::get_key_parameters
+-      auto::Crypt::OpenSSL::RSA::import_random_seed
+       Digest::SHA Error));
+   }
+ # HTML/HeadParser.pm