From: Johan Huldtgren <johan+openbsd-ports@huldtgren.com>
Subject: mail/amavisd-new fix
To: giovanni@openbsd.org
Cc: ports@openbsd.org
Date: Sun, 21 Jun 2026 16:08:34 -0400

hello,

last night I upgraded my mail server from 7.8 to 7.9 and after the
upgrade amavisd-new wouldn't start. starting with debug shows the
following:

# rcctl -d start amavisd
doing _rc_parse_conf
amavisd_flags empty, using default ><
doing rc_check
amavisd
doing rc_start
doing _rc_wait_for_start
doing rc_check
doing rc_check
doing rc_check
ERROR: MISSING REQUIRED ADDITIONAL MODULES:
  auto::Crypt::OpenSSL::RSA::new_public_key
doing _rc_rm_runfile
(failed)

I found a bug report for this same issue in the FreeBSD ports tree

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=286719

and applying the 2nd (correct) patch to our patch for amavisd fixes it
for me.

https://bugs.freebsd.org/bugzilla/attachment.cgi?id=260325&action=diff

I've attached a patch.

thanks,

.jh
Index: amavisd-new//Makefile
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
diff -u -p -u -p -r1.55 Makefile
--- amavisd-new//Makefile	26 Sep 2023 12:28:09 -0000	1.55
+++ amavisd-new//Makefile	21 Jun 2026 19:46:50 -0000
@@ -6,7 +6,7 @@ DISTNAME=		amavis-v${V}
 PKGNAME-main=		amavisd-new-${V}
 PKGNAME-utils=		amavisd-new-utils-${V}
 CATEGORIES=		mail security
-REVISION-main=		0
+REVISION-main=		1
 REVISION-utils=		0
 
 HOMEPAGE=		http://www.amavis.org/
Index: amavisd-new//patches/patch-amavisd
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
diff -u -p -u -p -r1.18 patch-amavisd
--- amavisd-new//patches/patch-amavisd	11 Mar 2022 19:34:32 -0000	1.18
+++ amavisd-new//patches/patch-amavisd	21 Jun 2026 19:46:50 -0000
@@ -1,10 +1,7 @@
-Hunks 1, 4: Disable File::LibMagic in favour of safer file(1) from base.
-Hunks 2, 5: fix DKIM signing
-
 Index: amavisd
 --- amavisd.orig
 +++ amavisd
-@@ -12939,7 +12939,7 @@ sub after_chroot_init() {
+@@ -12964,7 +12964,7 @@ sub after_chroot_init() {
                 grep(/\.pm\z/, keys %INC)) {
      next  if !grep($_ eq $m, qw(Amavis::Conf
        Archive::Tar Archive::Zip Compress::Zlib Compress::Raw::Zlib
@@ -13,7 +10,27 @@ Index: amavisd
        MIME::Entity MIME::Parser MIME::Tools Mail::Header Mail::Internet
        Digest::MD5 Digest::SHA Digest::SHA1 Crypt::OpenSSL::RSA
        Authen::SASL Authen::SASL::XS Authen::SASL::Cyrus Authen::SASL::Perl
-@@ -30859,7 +30859,7 @@ sub new_SpamAssassin_instance {
+@@ -18790,7 +18790,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);
+ 
+@@ -30827,10 +30827,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
+@@ -30915,7 +30911,7 @@ sub new_SpamAssassin_instance {
  #   PREFIX            => '/usr/local',
  #   DEF_RULES_DIR     => '/usr/local/share/spamassassin',
  #   LOCAL_RULES_DIR   => '/etc/mail/spamassassin',
@@ -22,7 +39,7 @@ Index: amavisd
  #see Mail::SpamAssassin man page for other options
    };
    if ($sa_version_num < 3.001005 && !defined $sa_args->{LOCAL_STATE_DIR})
-@@ -31634,17 +31634,8 @@ BEGIN {
+@@ -31690,17 +31686,8 @@ BEGIN {
    import Amavis::Unpackers::NewFilename qw(consumed_bytes);
  }