commit: bcf1915b260e111c272d4f3296b4ef3a93b6d25e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 7 03:30:20 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 7 03:43:15 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf1915b
mail-filter/amavisd-new: drop 2.12.2, 2.13.0 Signed-off-by: Sam James <sam <AT> gentoo.org> mail-filter/amavisd-new/Manifest | 2 - mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 186 --------------- mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild | 267 ---------------------- mail-filter/amavisd-new/metadata.xml | 2 - 4 files changed, 457 deletions(-) diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index 4a13e1640f1c..3abc7ac65074 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -1,3 +1 @@ -DIST amavis-v2.12.2.tar.bz2 874946 BLAKE2B 0b52cb23e11d0b7b346e53b979b580b76f51ce22516a8e2ef6c6d579f1693a9d175ebd92e9cba74e4bed68b012250808e2f827182dddf5addbbb40f2602294f7 SHA512 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff -DIST amavis-v2.13.0.tar.bz2 890721 BLAKE2B ceb2d020a9066b530a7a05de30c1a3483010f018e9344a354a6a372581bc6442ac74990b733cf4fd4d2e63d3adfe7140ebaca7d050becb69cc26cd010d032afd SHA512 b4d623b212bd2bbdcd192cee603941af3854bcd6c09ed1d6194138c0d7e10160ab1fece821bdd134ae86a1f8e5ccd4b3f92643f2f2b4c73c3f0c1e30e4b97441 DIST amavis-v2.13.1.tar.bz2 893595 BLAKE2B 1fc24a450c2c93e39ea0f6eb2cff3e9a0c2aa2b0ce8bb8a0c9cfb744b76d12c0bd9a0549e493cfa555278e95b81ef8f18238ea63920c39aa0dd0c5c1b3dda543 SHA512 90a67fa246a2446a4fb3733f10cdb21e25f6f2aea4293a3880606e57cfa1b4c568e1670ec2a43f1d38fdf13d8eab8d22e3e293f86f594968e194dc2c8a5ae992 diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild deleted file mode 100644 index 0783e508ea24..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -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"; - -LICENSE="GPL-2 BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86" -IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https selinux snmp 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-LibIDN - >=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 - virtual/perl-Compress-Raw-Zlib - virtual/perl-Digest-MD5 - virtual/perl-File-Temp - virtual/perl-IO-Compress - virtual/perl-IO-Socket-IP - virtual/perl-MIME-Base64 - virtual/perl-Time-HiRes - 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 )" - -AMAVIS_ROOT="/var/lib/amavishome" -S="${WORKDIR}/amavis-v${PV}" - -src_prepare() { - if use courier ; then - eapply -p0 amavisd-new-courier.patch - fi - - if use qmail ; then - eapply -p0 amavisd-new-qmqpqq.patch - fi - - # 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}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file" - - if ! use dkim ; then - sed -i -e '/enable_dkim/s/1/0/' "${S}/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}/amavisd.conf" || die "missing conf file - sa" - fi - - eapply_user -} - -src_install() { - dosbin amavisd{,-agent,-nanny,-release,-signer,-status} - dobin p0f-analyzer.pl amavisd-submit - - if use snmp ; then - dosbin amavisd-snmp-subagent - newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \ - amavisd-snmp-subagent - dodoc AMAVIS-MIB.txt - fi - - if use ldap ; then - insinto /etc/openldap/schema - newins 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 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 INSTALL MANIFEST RELEASE_NOTES TODO \ - amavisd.conf-default amavisd-custom.conf - - docinto README_FILES - dodoc README_FILES/README* - dodoc -r README_FILES/*.{html,css} - docinto README_FILES/images - dodoc README_FILES/images/*.png - docinto README_FILES/images/callouts - dodoc README_FILES/images/callouts/*.png - - docinto test-messages - dodoc test-messages/README - dodoc test-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/amavisd-new-2.13.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild deleted file mode 100644 index d1ddb632100b..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2024 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"; - -LICENSE="GPL-2 BSD-2" -SLOT="0" -KEYWORDS="amd64 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 - virtual/perl-Compress-Raw-Zlib - virtual/perl-Digest-MD5 - virtual/perl-File-Temp - virtual/perl-IO-Compress - virtual/perl-IO-Socket-IP - virtual/perl-MIME-Base64 - virtual/perl-Time-HiRes - 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 - virtual/perl-ExtUtils-MakeMaker - test? ( - virtual/perl-Test-Harness - dev-perl/Test-Class - dev-perl/DBI - dev-perl/perl-ldap - dev-perl/NetAddr-IP - dev-perl/Test-Most - )" - -AMAVIS_ROOT="/var/lib/amavishome" -S="${WORKDIR}/amavis-v${PV}" - -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 - - eapply_user - - # prevent distdir-in-distdir - mv "${S}" "${T}" || die - dzil_to_distdir "${T}/amavis-v${PV}" "${S}" - - perl-module_src_prepare -} - -src_test() { - 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/metadata.xml b/mail-filter/amavisd-new/metadata.xml index 41f64a3f0423..4d9f403a357a 100644 --- a/mail-filter/amavisd-new/metadata.xml +++ b/mail-filter/amavisd-new/metadata.xml @@ -3,9 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <use> - <flag name="courier">Add courier support</flag> <flag name="dkim">Add DomainKeys Identified Mail support</flag> - <flag name="qmail">Add qmail support</flag> <flag name="razor">Add support for <pkg>mail-filter/razor</pkg></flag> <flag name="rspamd">Add support for <pkg>mail-filter/rspamd</pkg> extension (HTTP only)</flag> <flag name="rspamd-https">Add support for <pkg>mail-filter/rspamd</pkg> extension (both HTTP and HTTPS)</flag>
