freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

security/amavisd-new: Update to 2.13.1

Browse Source 
PR:		286838
This commit is contained in:
Florian Smeets 2025-05-18 10:22:25 +02:00
parent 8ccebccf01
commit 475e45a40f
5 changed files with 124 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
security/amavisd-new/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= amavisd-new
DISTVERSION= 2.12.3
PORTREVISION= 7
DISTVERSION= 2.13.1
PORTEPOCH= 1
CATEGORIES= security
@ -10,45 +9,46 @@ WWW= https://www.ijs.si/software/amavisd/
LICENSE= GPLv2
RUN_DEPENDS= p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \
p5-MIME-Tools>=0:mail/p5-MIME-Tools \
RUN_DEPENDS= p5-Archive-Zip>=1.14:archivers/p5-Archive-Zip \
p5-Convert-TNEF>=0:converters/p5-Convert-TNEF \
p5-Convert-UUlib>=1.08,1:converters/p5-Convert-UUlib \
p5-Archive-Zip>=1.14:archivers/p5-Archive-Zip \
p5-Net-Server>=2.0:net/p5-Net-Server \
p5-Mail-DKIM>=0.33:mail/p5-Mail-DKIM \
p5-Net-LibIDN>=0:dns/p5-Net-LibIDN
p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-Net-LibIDN>=0:dns/p5-Net-LibIDN \
p5-Net-Server>=2.0:net/p5-Net-Server \
p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog
USES= perl5 shebangfix tar:bz2
USE_GITLAB= yes
USE_PERL5= run
USE_GITLAB= yes
GL_ACCOUNT= amavis
GL_PROJECT= amavis
GL_TAGNAME= 3290c9c2a11a8cc9595b5810b2f86c1dac25a392
GL_TAGNAME= cdd11b069e20a4cb99960614ca9c3eb385d4e200
SHEBANG_FILES= amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl \
amavisd-snmp-subagent amavisd
SHEBANG_FILES= bin/amavisd bin/amavisd-agent bin/amavisd-nanny \
bin/amavisd-release bin/amavisd-snmp-subagent \
contrib/p0f-analyzer.pl
NO_ARCH= yes
NO_BUILD= yes
DOCS= AAAREADME.first AMAVIS-MIB.txt INSTALL LDAP.schema LICENSE \
DOCS= AAAREADME.first AMAVIS-MIB.txt contrib/LDAP.schema LICENSE \
RELEASE_NOTES README_FILES/README.* README_FILES/screen.css \
README_FILES/amavisd-new-docs.html
AMAVISUSER?= vscan
AMAVISGROUP?= vscan
USERS= ${AMAVISUSER}
GROUPS= ${AMAVISGROUP}
AMAVISDIR?= /var/amavis
AMAVISUSER?= vscan
AMAVISGROUP?= vscan
USERS= ${AMAVISUSER}
GROUPS= ${AMAVISGROUP}
AMAVISDIR?= /var/amavis
AMAVISQUARANTINE?= /var/virusmails
DAEMON?= /usr/sbin/daemon -p
DAEMON?= /usr/sbin/daemon -p
OPTIONS_DEFINE= IPV6 BDB SNMP SQLITE MYSQL PGSQL LDAP SASL SPAMASSASSIN P0F \
FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB RPM ZOO UNZOO LZOP \
7ZIP MSWORD TNEF DOCS
OPTIONS_DEFAULT= BDB SPAMASSASSIN FILE UNRAR ARJ ARC CAB RPM ZOO LZOP \
7ZIP MSWORD
OPTIONS_DEFINE= 7ZIP ARC ARJ BDB CAB DOCS FILE IPV6 LDAP LHA LZOP \
MSWORD MYSQL NOMARCH P0F PGSQL RAR RPM SASL SNMP \
SPAMASSASSIN SQLITE TNEF UNARJ UNRAR UNZOO ZOO
OPTIONS_DEFAULT= 7ZIP ARC ARJ BDB CAB FILE LZOP MSWORD RPM SPAMASSASSIN \
UNRAR ZOO
BDB_DESC= Use BerkeleyDB for nanny/cache/snmp
SNMP_DESC= Install amavisd snmp subagent
SQLITE_DESC= Use SQLite for lookups
@ -77,18 +77,18 @@ TNEF_DESC= Add external tnef decoder converters/tnef
SUB_FILES= pkg-deinstall pkg-message
SUB_LIST+= AMAVISUSER=${AMAVISUSER} \
SUB_LIST+= AMAVISDIR=${AMAVISDIR} \
AMAVISGROUP=${AMAVISGROUP} \
AMAVISDIR=${AMAVISDIR} \
AMAVISQUARANTINE=${AMAVISQUARANTINE} \
AMAVISUSER=${AMAVISUSER} \
DAEMON="${DAEMON}" \
PERL=${PERL}
PLIST_SUB+= AMAVISUSER=${AMAVISUSER} \
AMAVISGROUP=${AMAVISGROUP} \
PLIST_SUB+= AMAVIS_NOP0F=${AMAVIS_NOP0F} \
AMAVISDIR=${AMAVISDIR} \
AMAVISGROUP=${AMAVISGROUP} \
AMAVISQUARANTINE=${AMAVISQUARANTINE} \
AMAVIS_NOP0F=${AMAVIS_NOP0F}
AMAVISUSER=${AMAVISUSER}
.include <bsd.port.options.mk>
@ -151,7 +151,7 @@ RUN_DEPENDS+= file>=4.21:sysutils/file
.if ${ARCH} == "i386" || ${ARCH} == "amd64"
RUN_DEPENDS+= ${LOCALBASE}/bin/rar:archivers/rar
.else
IGNORE= archivers/rar is a x86 binary port and is not compatible with ${ARCH}
IGNORE= archivers/rar is a x86 binary port and is not compatible with ${ARCH}
.endif
.endif
@ -215,40 +215,41 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/tnef:converters/tnef
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e "s|$$daemon_user = 'vscan';|$$daemon_user = '${AMAVISUSER}';|" \
-e "s|$$daemon_group = 'vscan';|$$daemon_group = '${AMAVISGROUP}';|" \
@${REINPLACE_CMD} -e "s|$daemon_user = 'vscan';|$daemon_user = '${AMAVISUSER}';|" \
-e "s|@daemon_groups = 'vscan';|@daemon_groups = '${AMAVISGROUP}';|" \
-e "s|/var/amavis|${AMAVISDIR}|" \
-e "s|/var/lib/amavis|${AMAVISDIR}|" \
-e "s|/var/virusmails|${AMAVISQUARANTINE}|" \
-e 's|$$localhost_name = .localhost.;|$$localhost_name = $$myhostname;|' \
-e 's|/var/run/clamav/clamd|/var/run/clamav/clamd|g' \
${WRKSRC}/amavisd.conf
@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-agent
@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-nanny
${WRKSRC}/conf/amavisd.conf
@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/bin/amavisd-agent
@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/bin/amavisd-nanny
@${REINPLACE_CMD} -e "s|/var/amavis/db|${AMAVISDIR}/db|" \
${WRKSRC}/amavisd-snmp-subagent
${WRKSRC}/bin/amavisd-snmp-subagent
@${REINPLACE_CMD} "s|/var/amavis/amavisd.sock|${AMAVISDIR}/amavisd.sock|" \
${WRKSRC}/amavisd-release
${WRKSRC}/bin/amavisd-release
@${REINPLACE_CMD} -e "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \
-e "s|/var/amavis|${AMAVISDIR}|g" \
-e 's|$$localhost_name = .localhost.;|$$localhost_name = $$myhostname;|' \
${WRKSRC}/amavisd
-e "s|/var/amavis|${AMAVISDIR}|g" \
${WRKSRC}/lib/Amavis.pm
@${REINPLACE_CMD} -e "s|/var/amavis|${AMAVISDIR}|g" \
${WRKSRC}/lib/Amavis/Conf.pm
do-install:
.for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent
${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin
.for i in amavisd amavisd-agent amavisd-nanny amavisd-release \
amavisd-snmp-subagent
${INSTALL_SCRIPT} ${WRKSRC}/bin/${i} ${STAGEDIR}${PREFIX}/sbin
.endfor
${INSTALL_DATA} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample
${INSTALL_DATA} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default
${INSTALL_DATA} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample
${INSTALL_DATA} ${WRKSRC}/conf/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample
${INSTALL_DATA} ${WRKSRC}/conf/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default
${INSTALL_DATA} ${WRKSRC}/conf/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample
${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue
${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Amavis
(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL})
${MKDIR} ${STAGEDIR}${AMAVISDIR}/var
${MKDIR} ${STAGEDIR}${AMAVISDIR}/tmp
${MKDIR} ${STAGEDIR}${AMAVISDIR}/db
${MKDIR} ${STAGEDIR}${AMAVISQUARANTINE}
do-install-P0F-on:
${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin
${INSTALL_SCRIPT} ${WRKSRC}/contrib/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/images

6
security/amavisd-new/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1710676870
SHA256 (amavis-amavis-3290c9c2a11a8cc9595b5810b2f86c1dac25a392_GL0.tar.gz) = 83a24db2887afa9ae099a1d9842941cb93e162b137903b4d0cd857ec477ff243
SIZE (amavis-amavis-3290c9c2a11a8cc9595b5810b2f86c1dac25a392_GL0.tar.gz) = 1100231
TIMESTAMP = 1747417723
SHA256 (amavis-amavis-cdd11b069e20a4cb99960614ca9c3eb385d4e200_GL0.tar.gz) = beebeaa0bbdd6d59301d5e140f0d71f716588e6e3fcfe73a26594ff1f2c7704c
SIZE (amavis-amavis-cdd11b069e20a4cb99960614ca9c3eb385d4e200_GL0.tar.gz) = 1132629

40
security/amavisd-new/files/patch-amavisd
View File

@ -1,40 +0,0 @@
--- amavisd.orig 2025-05-11 13:36:08 UTC
+++ amavisd
@@ -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
- [['zip','kmz'], \&Amavis::Unpackers::do_7zip, ['7za', '7z'] ],
+ [['zip','kmz'], \&Amavis::Unpackers::do_7zip, ['7za', '7zz', '7z'] ],
[['zip','kmz'], \&Amavis::Unpackers::do_unzip],
- ['7z', \&Amavis::Unpackers::do_7zip, ['7zr', '7za', '7z'] ],
+ ['7z', \&Amavis::Unpackers::do_7zip, ['7zr', '7za', '7zz', '7z'] ],
[[qw(gz bz2 Z tar)],
- \&Amavis::Unpackers::do_7zip, ['7za', '7z'] ],
+ \&Amavis::Unpackers::do_7zip, ['7za', '7zz', '7z'] ],
[[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
- \&Amavis::Unpackers::do_7zip, '7z' ],
+ \&Amavis::Unpackers::do_7zip, ['7zz', '7z'] ],
['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

20
security/amavisd-new/files/patch-amavisd.conf
View File

@ -1,20 +0,0 @@
--- amavisd.conf.orig 2021-10-13 08:10:54 UTC
+++ amavisd.conf
@@ -348,13 +348,13 @@ $banned_filename_re = new_RE(
['tnef', \&do_tnef],
# ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
# ['sit', \&do_unstuff, 'unstuff'], # not safe
- [['zip','kmz'], \&do_7zip, ['7za', '7z'] ],
+ [['zip','kmz'], \&do_7zip, ['7za', '7zz', '7z'] ],
[['zip','kmz'], \&do_unzip],
- ['7z', \&do_7zip, ['7zr', '7za', '7z'] ],
+ ['7z', \&do_7zip, ['7zr', '7za', '7zz', '7z'] ],
[[qw(gz bz2 Z tar)],
- \&do_7zip, ['7za', '7z'] ],
+ \&do_7zip, ['7za', '7zz', '7z'] ],
[[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
- \&do_7zip, '7z' ],
+ \&do_7zip, ['7zz', '7z'] ],
['exe', \&do_executable, ['unrar','rar'], 'lha', ['unarj','arj'] ],
);

73
security/amavisd-new/pkg-plist
View File

@ -1,6 +1,5 @@
%%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first
%%PORTDOCS%%%%DOCSDIR%%/AMAVIS-MIB.txt
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/LDAP.schema
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README.CVE-2024-28054
@ -67,6 +66,78 @@
etc/amavisd.conf-default
@sample etc/amavisd.conf.sample
%%AMAVIS_NOP0F%%sbin/p0f-analyzer.pl
%%SITE_PERL%%/Amavis.pm
%%SITE_PERL%%/Amavis.pm.bak
%%SITE_PERL%%/Amavis/AV.pm
%%SITE_PERL%%/Amavis/Boot.pm
%%SITE_PERL%%/Amavis/Conf.pm
%%SITE_PERL%%/Amavis/Conf.pm.bak
%%SITE_PERL%%/Amavis/Custom.pm
%%SITE_PERL%%/Amavis/DB.pm
%%SITE_PERL%%/Amavis/DB/SNMP.pm
%%SITE_PERL%%/Amavis/DKIM.pm
%%SITE_PERL%%/Amavis/DKIM/CustomSigner.pm
%%SITE_PERL%%/Amavis/DbgLog.pm
%%SITE_PERL%%/Amavis/Expand.pm
%%SITE_PERL%%/Amavis/IO/FileHandle.pm
%%SITE_PERL%%/Amavis/IO/RW.pm
%%SITE_PERL%%/Amavis/IO/SQL.pm
%%SITE_PERL%%/Amavis/IO/Zlib.pm
%%SITE_PERL%%/Amavis/In/AMPDP.pm
%%SITE_PERL%%/Amavis/In/Connection.pm
%%SITE_PERL%%/Amavis/In/Message.pm
%%SITE_PERL%%/Amavis/In/Message/PerRecip.pm
%%SITE_PERL%%/Amavis/In/SMTP.pm
%%SITE_PERL%%/Amavis/JSON.pm
%%SITE_PERL%%/Amavis/LDAP/Connection.pm
%%SITE_PERL%%/Amavis/Log.pm
%%SITE_PERL%%/Amavis/Lookup.pm
%%SITE_PERL%%/Amavis/Lookup/DNSxL.pm
%%SITE_PERL%%/Amavis/Lookup/IP.pm
%%SITE_PERL%%/Amavis/Lookup/LDAP.pm
%%SITE_PERL%%/Amavis/Lookup/LDAPattr.pm
%%SITE_PERL%%/Amavis/Lookup/Label.pm
%%SITE_PERL%%/Amavis/Lookup/Opaque.pm
%%SITE_PERL%%/Amavis/Lookup/OpaqueRef.pm
%%SITE_PERL%%/Amavis/Lookup/RE.pm
%%SITE_PERL%%/Amavis/Lookup/SQL.pm
%%SITE_PERL%%/Amavis/Lookup/SQLfield.pm
%%SITE_PERL%%/Amavis/MIME/Body/OnOpenFh.pm
%%SITE_PERL%%/Amavis/Notify.pm
%%SITE_PERL%%/Amavis/OS_Fingerprint.pm
%%SITE_PERL%%/Amavis/Out.pm
%%SITE_PERL%%/Amavis/Out/BSMTP.pm
%%SITE_PERL%%/Amavis/Out/EditHeader.pm
%%SITE_PERL%%/Amavis/Out/Local.pm
%%SITE_PERL%%/Amavis/Out/Pipe.pm
%%SITE_PERL%%/Amavis/Out/SMTP.pm
%%SITE_PERL%%/Amavis/Out/SMTP/Protocol.pm
%%SITE_PERL%%/Amavis/Out/SMTP/Session.pm
%%SITE_PERL%%/Amavis/Out/SQL/Connection.pm
%%SITE_PERL%%/Amavis/Out/SQL/Log.pm
%%SITE_PERL%%/Amavis/Out/SQL/Quarantine.pm
%%SITE_PERL%%/Amavis/ProcControl.pm
%%SITE_PERL%%/Amavis/Redis.pm
%%SITE_PERL%%/Amavis/SpamControl.pm
%%SITE_PERL%%/Amavis/SpamControl/ExtProg.pm
%%SITE_PERL%%/Amavis/SpamControl/RspamdClient.pm
%%SITE_PERL%%/Amavis/SpamControl/SpamAssassin.pm
%%SITE_PERL%%/Amavis/SpamControl/SpamdClient.pm
%%SITE_PERL%%/Amavis/TempDir.pm
%%SITE_PERL%%/Amavis/Timing.pm
%%SITE_PERL%%/Amavis/TinyRedis.pm
%%SITE_PERL%%/Amavis/Tools.pm
%%SITE_PERL%%/Amavis/UnmangleSender.pm
%%SITE_PERL%%/Amavis/Unpackers.pm
%%SITE_PERL%%/Amavis/Unpackers/MIME.pm
%%SITE_PERL%%/Amavis/Unpackers/NewFilename.pm
%%SITE_PERL%%/Amavis/Unpackers/OurFiler.pm
%%SITE_PERL%%/Amavis/Unpackers/Part.pm
%%SITE_PERL%%/Amavis/Unpackers/Validity.pm
%%SITE_PERL%%/Amavis/Util.pm
%%SITE_PERL%%/Amavis/ZMQ.pm
%%SITE_PERL%%/Amavis/rfc2821_2822_Tools.pm
%%SITE_PERL%%/Mail/SpamAssassin/Logger/Amavislog.pm
sbin/amavisd
sbin/amavisd-agent
sbin/amavisd-nanny