git: ae960dea44dc - main - security/amavisd-new: Fix at runtime after security/p5-Crypt-OpenSSL-RSA update

The branch main has been updated by madpilot:

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

commit ae960dea44dcccdba14f13b49366b59b0e25cefb
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-05-11 20:11:39 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-05-11 20:11:39 +0000

    security/amavisd-new: Fix at runtime after security/p5-Crypt-OpenSSL-RSA update
    
    PR:             286719
    Submitted by:   mat
    Approved by:    flo (maintainer)
---
 security/amavisd-new/Makefile            |  2 +-
 security/amavisd-new/files/patch-amavisd | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index fbc8af55b11d..84620ebff7bc 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	amavisd-new
 DISTVERSION=	2.12.3
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	security
 
diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd
index a3d157a8b453..84c632588d27 100644
--- a/security/amavisd-new/files/patch-amavisd
+++ b/security/amavisd-new/files/patch-amavisd
@@ -1,6 +1,6 @@
---- amavisd.orig	2022-02-07 16:26:10 UTC
+--- amavisd.orig	2025-05-11 13:36:08 UTC
 +++ amavisd
-@@ -1740,13 +1740,13 @@ BEGIN {
+@@ -1741,13 +1741,13 @@ BEGIN {
      ['tnef', \&Amavis::Unpackers::do_tnef],
  #   ['lha',  \&Amavis::Unpackers::do_lha,   \$lha],  # not safe, use 7z instead
  #   ['sit',  \&Amavis::Unpackers::do_unstuff, \$unstuff],  # not safe
@@ -18,3 +18,23 @@
      ['exe',  \&Amavis::Unpackers::do_executable, \$unrar, \$lha, \$unarj],
    );
  
+@@ -18812,7 +18812,7 @@ sub fetch_modules_extra() {
+                       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;
++        ))  if $extra_code_dkim;
+   push(@modules, 'Anomy::Sanitizer')  if $enable_anomy_sanitizer;
+   Amavis::Boot::fetch_modules('REQUIRED ADDITIONAL MODULES', 1, @modules);
+ 
+@@ -30849,10 +30849,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