commit: 9acda25373492d9ee06935ab43618d4635284474 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 7 05:02:10 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 7 05:02:10 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acda253
mail-filter/amavisd-new: add 2.14.0 Closes: https://bugs.gentoo.org/963369 Signed-off-by: Sam James <sam <AT> gentoo.org> mail-filter/amavisd-new/Manifest | 1 + mail-filter/amavisd-new/amavisd-new-2.14.0.ebuild | 275 +++++++++++++++++++++ .../files/amavisd-new-2.14.0-xz-test.patch | 28 +++ 3 files changed, 304 insertions(+) diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index 3abc7ac65074..3c0e8886f077 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -1 +1,2 @@ DIST amavis-v2.13.1.tar.bz2 893595 BLAKE2B 1fc24a450c2c93e39ea0f6eb2cff3e9a0c2aa2b0ce8bb8a0c9cfb744b76d12c0bd9a0549e493cfa555278e95b81ef8f18238ea63920c39aa0dd0c5c1b3dda543 SHA512 90a67fa246a2446a4fb3733f10cdb21e25f6f2aea4293a3880606e57cfa1b4c568e1670ec2a43f1d38fdf13d8eab8d22e3e293f86f594968e194dc2c8a5ae992 +DIST amavis-v2.14.0.tar.bz2 898335 BLAKE2B 5704fc9ac04141616dc62253cf3c5ceed980723c6bfad8201f8944b27394713dc346febafecf2b07e9ba718cb538e5b1a6092a8a3dbca2185a6b01b4db9aad71 SHA512 49303d86947d7ae258c6def8cf9892ff062fd054b4bc6451b1670426a5d767782ed7febd350237d36d4b62db408cbb993b6b4522eb595ead77faafb07012fe58 diff --git a/mail-filter/amavisd-new/amavisd-new-2.14.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.14.0.ebuild new file mode 100644 index 000000000000..a28d4635c1d9 --- /dev/null +++ b/mail-filter/amavisd-new/amavisd-new-2.14.0.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd perl-module + +DESCRIPTION="High-performance interface between the MTA and content checkers" +HOMEPAGE="https://gitlab.com/amavis/amavis"; +SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2"; +S="${WORKDIR}/amavis-v${PV}" + +LICENSE="GPL-2 BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="clamav dkim ldap mysql postgres razor rspamd rspamd-https selinux snmp spamassassin test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( spamassassin )" + +MY_RSPAMD_DEPEND=" + dev-perl/HTTP-Message + dev-perl/JSON + dev-perl/LWP-UserAgent-Determined +" +DEPEND="acct-user/amavis" +RDEPEND=" + ${DEPEND} + app-arch/arc + app-arch/bzip2 + app-arch/cabextract + app-alternatives/cpio + app-arch/gzip + app-arch/lha + app-arch/lrzip + app-arch/lzop + app-arch/p7zip + app-arch/pax + app-arch/arj + app-arch/unrar + app-arch/xz-utils + app-arch/zoo + dev-lang/perl:* + dev-perl/Archive-Zip + dev-perl/BerkeleyDB + dev-perl/Convert-BinHex + dev-perl/File-LibMagic + dev-perl/IO-Socket-SSL + dev-perl/IO-stringy + >=dev-perl/Mail-DKIM-0.31 + >=dev-perl/MailTools-1.58 + >=dev-perl/MIME-tools-5.415 + dev-perl/Net-LibIDN2 + >=dev-perl/Net-Server-0.91 + dev-perl/Net-SSLeay + dev-perl/Unix-Syslog + net-mail/ripole + net-mail/tnef + >=sys-apps/coreutils-5.0-r3 + >=sys-libs/db-4.4.20 + virtual/mta + clamav? ( app-antivirus/clamav ) + ldap? ( >=dev-perl/perl-ldap-0.33 ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + razor? ( mail-filter/razor ) + rspamd? ( ${MY_RSPAMD_DEPEND} ) + rspamd-https? ( + ${MY_RSPAMD_DEPEND} + dev-perl/LWP-Protocol-https + dev-perl/Net-SSLeay + ) + selinux? ( sec-policy/selinux-amavis ) + snmp? ( net-analyzer/net-snmp[perl] ) + spamassassin? ( + mail-filter/spamassassin + dev-perl/Image-Info + ) +" +BDEPEND=" + ${RDEPEND} + dev-perl/Dist-Zilla + test? ( + dev-perl/File-Slurp + dev-perl/Test-Class + dev-perl/DBI + dev-perl/perl-ldap + dev-perl/NetAddr-IP + dev-perl/Set-Scalar + dev-perl/Test-MockModule + dev-perl/Test-Most + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.14.0-xz-test.patch +) + +AMAVIS_ROOT="/var/lib/amavishome" + +dzil_to_distdir() { + local dzil_root dest has_missing modname dzil_version + dzil_root="$1" + dest="$2" + + cd "${dzil_root}" || die "Can't enter workdir '${dzil_root}'"; + + dzil_version="$(dzil version)" || die "Error invoking 'dzil version'" + einfo "Generating CPAN dist with ${dzil_version}" + + has_missing="" + + einfo "Checking dzil authordeps" + while IFS= read -d $'\n' -r modname; do + if [[ -z "${has_missing}" ]]; then + has_missing=1 + eerror "'dzil authordeps' indicates missing build dependencies" + eerror "These will prevent building, please report a bug" + eerror "Missing:" + fi + S= eerror " ${modname}" + done < <(dzil authordeps --missing --versions) + + [[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first" + + einfo "Checking dzil build deps" + while IFS= read -d $'\n' -r modname; do + if [[ -z "${has_missing}" ]]; then + has_missing=1 + ewarn "'dzil listdeps' indicates missing build dependencies" + ewarn "These may prevent building, please report a bug if they do" + ewarn "Missing:" + fi + ewarn " ${modname}" + done < <(dzil listdeps --missing --versions --author) + + einfo "Generating release" + dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'" +} + +src_prepare() { + # perl-module doesn't account for this being a directory + mv README_FILES READ_FILES || die + + # We need to fix the daemon_user and daemon_group in amavis-mc even + # though we're going to run it in the foreground, because it calls + # "drop_priv" unconditionally and will crash if its user/group + # doesn't exist. + sed -i \ + -e '/daemon/s/vscan/amavis/' \ + -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ + "${S}/conf/amavisd.conf" "${S}/bin/amavis-mc" || die "missing conf file" + + if ! use dkim ; then + sed -i -e '/enable_dkim/s/1/0/' "${S}/conf/amavisd.conf" \ + || die "missing conf file - dkim" + fi + + if ! use spamassassin ; then + sed -i -e \ + "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ + "${S}/conf/amavisd.conf" || die "missing conf file - sa" + fi + + # needs ZMQ::LibZMQ3 which only suports net-libs/zeromq-3*, + # long since removed from tree + perl_rm_files t/Amavis/ZMQTest.t + sed -e '/^ZMQ::LibZMQ3 =/d' \ + -i dist.ini || die "Can't patch dist.ini" + + rm bin/{amavis-services,amavis-mc,amavisd-snmp-subagent-zmq} + + if ! use snmp ; then + rm bin/amavisd-snmp-subagent + fi + + perl-module_src_prepare + + # prevent distdir-in-distdir + mv "${S}" "${T}" || die + dzil_to_distdir "${T}/amavis-v${PV}" "${S}" +} + +src_test() { + unset XZ_DEFAULTS XZ_OPT + prove -lr t || die +} + +src_install() { + perl-module_src_install + mkdir "${ED}"/usr/sbin + mv "${ED}"/usr/bin/amavisd "${ED}"/usr/sbin/amavisd || die + mv "${ED}"/usr/bin/amavisd-agent "${ED}"/usr/sbin/amavisd-agent || die + mv "${ED}"/usr/bin/amavisd-nanny "${ED}"/usr/sbin/amavisd-nanny || die + mv "${ED}"/usr/bin/amavisd-release "${ED}"/usr/sbin/amavisd-release || die + mv "${ED}"/usr/bin/amavisd-signer "${ED}"/usr/sbin/amavisd-signer || die + mv "${ED}"/usr/bin/amavisd-status "${ED}"/usr/sbin/amavisd-status || die + dobin contrib/p0f-analyzer.pl + + if use snmp ; then + mv "${ED}"/usr/bin/amavisd-snmp-subagent "${ED}"/usr/sbin/amavisd-snmp-subagent || die + newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \ + amavisd-snmp-subagent + dodoc AMAVIS-MIB.txt + fi + + perl_fix_packlist + + if use ldap ; then + insinto /etc/openldap/schema + newins contrib/LDAP.schema "${PN}.schema" + fi + + # The config file should be root:amavis so that the amavis user can + # read (only) it after dropping privileges. And of course he should + # own everything in his home directory. + insinto /etc + insopts -m0640 -g amavis + doins conf/amavisd.conf + + # Implementation detail? Keepdir calls dodir under the hood. + diropts -o amavis -g amavis + keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var} + + # BEWARE: + # + # Anything below this line is using the mangled insopts/diropts from + # above! + # + + newinitd "${FILESDIR}/amavisd.initd-r2" amavisd + + systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service + + dodoc AAAREADME.first RELEASE_NOTES TODO \ + conf/amavisd.conf-default conf/amavisd-custom.conf \ + conf/amavisd-docker.conf + + docinto README_FILES + dodoc READ_FILES/README* + dodoc -r READ_FILES/*.{html,css} + docinto README_FILES/images + dodoc READ_FILES/images/*.png + docinto README_FILES/images/callouts + dodoc READ_FILES/images/callouts/*.png + + docinto test-messages + dodoc t/messages/README + dodoc t/messages/sample.tar.gz.compl +} + +pkg_preinst() { + # TODO: the following is done as root, but should probably be done + # as the amavis user. + if use razor ; then + if [[ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ]] ; then + elog "Setting up initial razor config files..." + + razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor" + sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ + "${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die + fi + fi +} + +pkg_postinst() { + local d="/var/amavis" + if [[ -d ${d} ]]; then + elog "Existing data found. Please make sure to manually copy it to amavis' new" + elog "home directory by executing the following command as root from a shell:" + elog + elog " cp -a ${d}/* ${d}/.??* ${AMAVIS_ROOT}/ && rm -r ${d}" + elog + fi +} diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.14.0-xz-test.patch b/mail-filter/amavisd-new/files/amavisd-new-2.14.0-xz-test.patch new file mode 100644 index 000000000000..db29c8f4898e --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd-new-2.14.0-xz-test.patch @@ -0,0 +1,28 @@ +https://gitlab.com/amavis/amavis/-/commit/eb8c27eebe6bd7f64ca16a63fdd3c52d8c77c857 + +From eb8c27eebe6bd7f64ca16a63fdd3c52d8c77c857 Mon Sep 17 00:00:00 2001 +From: Juliano Guidini <[email protected]> +Date: Mon, 29 Sep 2025 15:09:33 +0000 +Subject: [PATCH] Solve test errors + +--- + t/Amavis/UnpackersTest.pm | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/Amavis/UnpackersTest.pm b/t/Amavis/UnpackersTest.pm +index 34e12d2..69a056d 100644 +--- a/t/Amavis/UnpackersTest.pm ++++ b/t/Amavis/UnpackersTest.pm +@@ -90,7 +90,7 @@ sub xz : Tests(3) { + skip ('xz not found', 1) unless $xz; + skip ('file not found', 1) unless $Amavis::Conf::file; + +- local $ENV{PATH} = ''; ++ local $ENV{PATH} = '/'; + my $tempdir = File::Temp->newdir('test-directory-tmp-XXXXX', CLEANUP => 1, TMPDIR => 1); + mkdir (my $partsdir = File::Spec->join($tempdir->dirname, 'parts')); + +-- +GitLab + +
