diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 8f2ed8dc5e2a..95e3da436905 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,263 +1,263 @@ PORTNAME= amavisd-new -DISTVERSION= 2.14.0 +DISTVERSION= 2.15.0 PORTEPOCH= 1 CATEGORIES= security MAINTAINER= flo@FreeBSD.org COMMENT= Mail scanner interface between mailer and content checkers WWW= https://www.ijs.si/software/amavisd/ LICENSE= GPLv2 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-Mail-DKIM>=0.33:mail/p5-Mail-DKIM \ 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_PERL5= run USE_GITLAB= yes GL_ACCOUNT= amavis GL_PROJECT= amavis -GL_TAGNAME= fc0e86edb3fd4fb779e4e906fb1cc61fdf7e6e7f +GL_TAGNAME= 5cd43bdfb1b83e299471e179ff7c13d733ed3c43 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 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 AMAVISQUARANTINE?= /var/virusmails DAEMON?= /usr/sbin/daemon -p 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 MYSQL_DESC= Use MySQL for lookups/logging/quarantine PGSQL_DESC= Use PgSQL for lookups/logging/quarantine LDAP_DESC= Use LDAP for lookups SASL_DESC= Use SASL authentication SPAMASSASSIN_DESC= Use mail/spamassassin P0F_DESC= Passive operating system fingerprinting FILE_DESC= Use newer file(1) utility from ports RAR_DESC= RAR support with archivers/rar UNRAR_DESC= RAR support with archivers/unrar ARJ_DESC= ARJ support with archivers/arj UNARJ_DESC= ARJ support with archivers/unarj LHA_DESC= LHA support with archivers/lha ARC_DESC= ARC support with archivers/arc NOMARCH_DESC= ARC support with archivers/nomarch CAB_DESC= CAB support with archivers/cabextract RPM_DESC= RPM support with archivers/rpm2cpio ZOO_DESC= ZOO support with archivers/zoo UNZOO_DESC= ZOO support with archivers/unzoo LZOP_DESC= LZOP support with archivers/lzop 7ZIP_DESC= 7ZIP support with archivers/7-zip MSWORD_DESC= Ms Word support with textproc/ripole TNEF_DESC= Add external tnef decoder converters/tnef SUB_FILES= pkg-deinstall pkg-message SUB_LIST+= AMAVISDIR=${AMAVISDIR} \ AMAVISGROUP=${AMAVISGROUP} \ AMAVISQUARANTINE=${AMAVISQUARANTINE} \ AMAVISUSER=${AMAVISUSER} \ DAEMON="${DAEMON}" \ PERL=${PERL} PLIST_SUB+= AMAVIS_NOP0F=${AMAVIS_NOP0F} \ AMAVISDIR=${AMAVISDIR} \ AMAVISGROUP=${AMAVISGROUP} \ AMAVISQUARANTINE=${AMAVISQUARANTINE} \ AMAVISUSER=${AMAVISUSER} .include USE_RC_SUBR+= amavisd .if ${PORT_OPTIONS:MIPV6} RUN_DEPENDS+= p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 .endif .if ${PORT_OPTIONS:MSNMP} && ${PORT_OPTIONS:MBDB} USE_RC_SUBR+= amavisd_snmp RUN_DEPENDS+= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP .endif .if ${PORT_OPTIONS:MBDB} RUN_DEPENDS+= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB .endif .if ${PORT_OPTIONS:MSQLITE} RUN_DEPENDS+= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite .endif .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${DBD_MYSQL} USES+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg .endif .if ${PORT_OPTIONS:MLDAP} RUN_DEPENDS+= p5-perl-ldap>=0:net/p5-perl-ldap .endif .if ${PORT_OPTIONS:MSASL} RUN_DEPENDS+= p5-Authen-SASL>=0:security/p5-Authen-SASL .endif .if ${PORT_OPTIONS:MSPAMASSASSIN} RUN_DEPENDS+= spamassassin>=0:mail/spamassassin .endif .if ${PORT_OPTIONS:MP0F} RUN_DEPENDS+= ${LOCALBASE}/bin/p0f:net-mgmt/p0f USE_RC_SUBR+= amavis_p0fanalyzer .else AMAVIS_NOP0F= "@comment " .endif .if ${PORT_OPTIONS:MFILE} # security fix, file >= 4.21 needed RUN_DEPENDS+= file>=4.21:sysutils/file .endif # archivers/rar is a x86 binary port, we don't want the install to fail # at that port, therefore we will block instantly here if the platform does # not suit rar. .if ${PORT_OPTIONS:MRAR} .if ${ARCH} == "i386" RUN_DEPENDS+= ${LOCALBASE}/bin/rar:archivers/rar-i386 .elif ${ARCH} == "amd64" RUN_DEPENDS+= ${LOCALBASE}/bin/rar:archivers/rar .else IGNORE= archivers/rar is a x86 binary port and is not compatible with ${ARCH} .endif .endif .if ${PORT_OPTIONS:MUNRAR} RUN_DEPENDS+= ${LOCALBASE}/bin/unrar:archivers/unrar .endif .if ${PORT_OPTIONS:MARJ} RUN_DEPENDS+= ${LOCALBASE}/bin/arj:archivers/arj .endif .if ${PORT_OPTIONS:MUNARJ} RUN_DEPENDS+= ${LOCALBASE}/bin/unarj:archivers/unarj .endif .if ${PORT_OPTIONS:MLHA} RUN_DEPENDS+= ${LOCALBASE}/bin/lha:archivers/lha .endif .if ${PORT_OPTIONS:MARC} RUN_DEPENDS+= ${LOCALBASE}/bin/arc:archivers/arc .endif .if ${PORT_OPTIONS:MNOMARCH} RUN_DEPENDS+= ${LOCALBASE}/bin/nomarch:archivers/nomarch .endif .if ${PORT_OPTIONS:MCAB} RUN_DEPENDS+= ${LOCALBASE}/bin/cabextract:archivers/cabextract .endif .if ${PORT_OPTIONS:MRPM} RUN_DEPENDS+= ${LOCALBASE}/bin/rpm2cpio.pl:archivers/rpm2cpio .endif .if ${PORT_OPTIONS:MZOO} # DOS condition in 2.10.1_2 RUN_DEPENDS+= zoo>=2.10.1_2:archivers/zoo .endif .if ${PORT_OPTIONS:MUNZOO} RUN_DEPENDS+= unzoo>=4.4_1:archivers/unzoo .endif .if ${PORT_OPTIONS:MLZOP} RUN_DEPENDS+= ${LOCALBASE}/bin/lzop:archivers/lzop .endif .if ${PORT_OPTIONS:M7ZIP} RUN_DEPENDS+= ${LOCALBASE}/bin/7zz:archivers/7-zip .endif .if ${PORT_OPTIONS:MMSWORD} RUN_DEPENDS+= ${LOCALBASE}/bin/ripole:textproc/ripole .endif .if ${PORT_OPTIONS:MTNEF} RUN_DEPENDS+= ${LOCALBASE}/bin/tnef:converters/tnef .endif .include post-patch: @${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/virusmails|${AMAVISQUARANTINE}|" \ ${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}/bin/amavisd-snmp-subagent @${REINPLACE_CMD} "s|/var/amavis/amavisd.sock|${AMAVISDIR}/amavisd.sock|" \ ${WRKSRC}/bin/amavisd-release @${REINPLACE_CMD} -e "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \ -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}/bin/${i} ${STAGEDIR}${PREFIX}/sbin .endfor ${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}/contrib/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/images .for i in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor @${CP} -pr ${WRKSRC}/README_FILES/images/ ${STAGEDIR}${DOCSDIR}/images .include diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index 3cde9f37a62e..19fc34e37ddb 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752691896 -SHA256 (amavis-amavis-fc0e86edb3fd4fb779e4e906fb1cc61fdf7e6e7f_GL0.tar.gz) = bd722b9096b52d383efcf6b3f91a75399c08973a396e6e27da6efa9733555ef3 -SIZE (amavis-amavis-fc0e86edb3fd4fb779e4e906fb1cc61fdf7e6e7f_GL0.tar.gz) = 1136776 +TIMESTAMP = 1788816925 +SHA256 (amavis-amavis-5cd43bdfb1b83e299471e179ff7c13d733ed3c43_GL0.tar.gz) = d4644df485b85522229da5847e70d8ad0ea5b8a79c75eee1a45e3f350ac91e7d +SIZE (amavis-amavis-5cd43bdfb1b83e299471e179ff7c13d733ed3c43_GL0.tar.gz) = 1146934 diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist index 23bf8ce53792..c4a0b1b0a24a 100644 --- a/security/amavisd-new/pkg-plist +++ b/security/amavisd-new/pkg-plist @@ -1,151 +1,152 @@ %%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first %%PORTDOCS%%%%DOCSDIR%%/AMAVIS-MIB.txt %%PORTDOCS%%%%DOCSDIR%%/LDAP.schema %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.CVE-2024-28054 %%PORTDOCS%%%%DOCSDIR%%/README.banned %%PORTDOCS%%%%DOCSDIR%%/README.chroot %%PORTDOCS%%%%DOCSDIR%%/README.contributed %%PORTDOCS%%%%DOCSDIR%%/README.courier %%PORTDOCS%%%%DOCSDIR%%/README.courier-old %%PORTDOCS%%%%DOCSDIR%%/README.customize %%PORTDOCS%%%%DOCSDIR%%/README.exim_v3 %%PORTDOCS%%%%DOCSDIR%%/README.exim_v3_app %%PORTDOCS%%%%DOCSDIR%%/README.exim_v4 %%PORTDOCS%%%%DOCSDIR%%/README.exim_v4_app %%PORTDOCS%%%%DOCSDIR%%/README.exim_v4_app2 %%PORTDOCS%%%%DOCSDIR%%/README.ldap %%PORTDOCS%%%%DOCSDIR%%/README.lookups %%PORTDOCS%%%%DOCSDIR%%/README.milter %%PORTDOCS%%%%DOCSDIR%%/README.old.scanners %%PORTDOCS%%%%DOCSDIR%%/README.performance %%PORTDOCS%%%%DOCSDIR%%/README.policy-on-notifications %%PORTDOCS%%%%DOCSDIR%%/README.postfix %%PORTDOCS%%%%DOCSDIR%%/README.postfix.html %%PORTDOCS%%%%DOCSDIR%%/README.protocol %%PORTDOCS%%%%DOCSDIR%%/README.rspamd %%PORTDOCS%%%%DOCSDIR%%/README.sendmail %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual.old %%PORTDOCS%%%%DOCSDIR%%/README.sql %%PORTDOCS%%%%DOCSDIR%%/README.sql-mysql %%PORTDOCS%%%%DOCSDIR%%/README.sql-pg %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/amavisd-new-docs.html %%PORTDOCS%%%%DOCSDIR%%/screen.css %%PORTDOCS%%%%DOCSDIR%%/images/blank.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/10.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/11.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/12.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/13.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/14.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/15.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/2.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/3.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/4.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/5.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/6.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/7.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/8.png %%PORTDOCS%%%%DOCSDIR%%/images/callouts/9.png %%PORTDOCS%%%%DOCSDIR%%/images/caution.png %%PORTDOCS%%%%DOCSDIR%%/images/draft.png %%PORTDOCS%%%%DOCSDIR%%/images/home.png %%PORTDOCS%%%%DOCSDIR%%/images/important.png %%PORTDOCS%%%%DOCSDIR%%/images/next.png %%PORTDOCS%%%%DOCSDIR%%/images/note.png %%PORTDOCS%%%%DOCSDIR%%/images/prev.png %%PORTDOCS%%%%DOCSDIR%%/images/tip.png %%PORTDOCS%%%%DOCSDIR%%/images/toc-blank.png %%PORTDOCS%%%%DOCSDIR%%/images/toc-minus.png %%PORTDOCS%%%%DOCSDIR%%/images/toc-plus.png %%PORTDOCS%%%%DOCSDIR%%/images/up.png %%PORTDOCS%%%%DOCSDIR%%/images/warning.png @sample etc/amavisd-custom.conf.sample 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/ZMQ/FFICompat.pm %%SITE_PERL%%/Amavis/rfc2821_2822_Tools.pm %%SITE_PERL%%/Mail/SpamAssassin/Logger/Amavislog.pm sbin/amavisd sbin/amavisd-agent sbin/amavisd-nanny sbin/amavisd-release sbin/amavisd-requeue sbin/amavisd-snmp-subagent @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISQUARANTINE%% @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/var @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/tmp @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/db @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%