From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
Date: Mon, 18 Dec 2023 20:22:19 +0000 (UTC) [thread overview]
Message-ID: <1702930848.b9f5f815e561eb08caab65c0a5c025d88bc2674a.floppym@gentoo> (raw)
commit: b9f5f815e561eb08caab65c0a5c025d88bc2674a
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Dec 14 06:10:24 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 20:20:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f5f815
mail-filter/amavisd-new: add 2.13.0
Bug: https://bugs.gentoo.org/919747
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34279
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
mail-filter/amavisd-new/Manifest | 1 +
mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild | 267 ++++++++++++++++++++++
2 files changed, 268 insertions(+)
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index b36b8358421f..766605ed8cee 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
DIST amavis-v2.12.2.tar.bz2 874946 BLAKE2B 0b52cb23e11d0b7b346e53b979b580b76f51ce22516a8e2ef6c6d579f1693a9d175ebd92e9cba74e4bed68b012250808e2f827182dddf5addbbb40f2602294f7 SHA512 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff
+DIST amavis-v2.13.0.tar.bz2 890721 BLAKE2B ceb2d020a9066b530a7a05de30c1a3483010f018e9344a354a6a372581bc6442ac74990b733cf4fd4d2e63d3adfe7140ebaca7d050becb69cc26cd010d032afd SHA512 b4d623b212bd2bbdcd192cee603941af3854bcd6c09ed1d6194138c0d7e10160ab1fece821bdd134ae86a1f8e5ccd4b3f92643f2f2b4c73c3f0c1e30e4b97441
diff --git a/mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild
new file mode 100644
index 000000000000..09f4259b7d8c
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.13.0.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2023 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-arch/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
+}
next reply other threads:[~2023-12-18 20:22 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-18 20:22 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-14 4:13 [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/ Sam James
2023-06-28 7:37 Sam James
2023-06-28 7:37 Sam James
2022-09-06 1:10 Mike Gilbert
2022-03-01 13:57 Ionen Wolkens
2022-02-28 10:14 Agostino Sarubbo
2022-02-28 10:14 Agostino Sarubbo
2022-02-27 13:43 Jakov Smolić
2022-02-27 13:17 Jakov Smolić
2022-02-27 8:57 Agostino Sarubbo
2022-01-31 1:01 Sam James
2021-12-09 6:52 Ionen Wolkens
2021-12-06 11:31 Agostino Sarubbo
2021-12-06 8:06 Agostino Sarubbo
2021-12-06 8:05 Agostino Sarubbo
2021-12-06 8:04 Agostino Sarubbo
2021-12-06 8:01 Agostino Sarubbo
2021-02-04 22:33 Thomas Deutschmann
2020-10-15 22:12 Thomas Deutschmann
2020-09-13 20:43 James Le Cuirot
2020-09-13 20:43 James Le Cuirot
2020-09-07 20:05 James Le Cuirot
2020-09-07 20:05 James Le Cuirot
2020-07-18 18:05 Sam James
2020-06-20 15:45 Thomas Deutschmann
2020-05-25 9:36 Sergei Trofimovich
2020-05-22 8:02 Sergei Trofimovich
2020-05-18 16:46 Sergei Trofimovich
2020-03-20 21:53 Matt Turner
2020-02-28 3:52 Joonas Niilola
2020-02-27 13:03 Craig Andrews
2020-02-27 13:03 Craig Andrews
2020-02-21 6:08 Joonas Niilola
2020-02-21 6:08 Joonas Niilola
2020-01-21 15:32 Michael Orlitzky
2019-09-17 17:55 Kent Fredric
2019-08-07 14:27 Michael Orlitzky
2019-02-24 1:41 Andreas K. Hüttel
2019-02-17 17:51 Sergei Trofimovich
2019-02-09 19:29 Sergei Trofimovich
2019-02-07 10:51 Mikle Kolyada
2019-02-03 9:12 Sergei Trofimovich
2019-01-05 16:13 Michael Orlitzky
2019-01-05 16:13 Michael Orlitzky
2018-11-26 0:24 Michael Orlitzky
2018-11-21 3:09 Craig Andrews
2018-11-18 23:56 Michael Orlitzky
2018-11-18 23:56 Michael Orlitzky
2018-06-19 19:13 Sergei Trofimovich
2017-09-24 16:34 Sergei Trofimovich
2017-09-24 16:34 Sergei Trofimovich
2017-08-22 21:31 Michał Górny
2017-02-04 8:53 Jeroen Roovers
2017-01-13 15:41 Agostino Sarubbo
2017-01-11 16:17 Agostino Sarubbo
2016-10-02 7:08 Jeroen Roovers
2016-10-01 8:57 Eray Aslan
2016-04-27 10:17 Eray Aslan
2016-03-09 20:48 Andreas Hüttel
2015-10-15 19:25 Marc Schiffbauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1702930848.b9f5f815e561eb08caab65c0a5c025d88bc2674a.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox