[gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/files/, mail-filter/amavisd-new/
commit: c8fe3982751aa4881b42f89ed080b210c4529c81
Author: Michael Orlitzky gentoo org>
AuthorDate: Sat Nov 17 15:09:21 2018 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sun Nov 18 23:23:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8fe3982
mail-filter/amavisd-new: new version 2.11.1.
A mostly standard version bump (bug 668494) with some improvements and
bug fixes piled on:
* The sys-apps/file dependency is replaced by dev-perl/File-LibMagic
to improve performance a bit (bug 592802).
* New user creation has been moved to pkg_setup(). This allows us to
set permissions and ownership properly in src_install(), so that
we don't have to "fix" them later and cause big ol' security
problems (bug 630836).
* The OpenRC service script has been rewritten to use start-stop-daemon.
This fixes outstanding bugs 507352, 634860, and 646336.
* The systemd service dependencies have been updated (bug 581452). We
never really needed spamassassin (spamd) at all, and we shouldn't fail
to start if postfix/clamav are absent entirely.
* As part of the previous item, removed two failing "sed" calls
(that were missing die() statements!) intended to modify a service
file that no longer lives where it used to.
Thanks are due to,
* Marcin Mirosław who reported an OpenRC issue,
* Nick Wiltshire for reporting and testing the OpenRC fixes,
* Robin Lutz for reporting the OpenRC restart issue,
* Timo Rothenpieler for reporting the systemd dependency issue.
Bug: https://bugs.gentoo.org/630836
Closes: https://bugs.gentoo.org/507352
Closes: https://bugs.gentoo.org/581452
Closes: https://bugs.gentoo.org/592802
Closes: https://bugs.gentoo.org/634860
Closes: https://bugs.gentoo.org/646336
Closes: https://bugs.gentoo.org/668494
Signed-off-by: Michael Orlitzky gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-filter/amavisd-new/Manifest | 1 +
...-2.11.0-r4.ebuild => amavisd-new-2.11.1.ebuild} | 68 --
mail-filter/amavisd-new/files/amavisd.initd-r2 | 42 +
mail-filter/amavisd-new/files/amavisd.service-r1 | 21 +++
4 files changed, 101 insertions(+), 31 deletions(-)
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 44fb609486f..7b3a4228338 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
+DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B
1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75
SHA512
6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B
59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654
SHA512
a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
b/mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild
similarity index 79%
rename from mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
rename to mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild
index 0efc27e6454..3b4205bb331 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit systemd user
-MY_P="${P/_/-}"
DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/;
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz;
+HOMEPAGE="https://gitlab.com/amavis/amavis;
+SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
LICENSE="GPL-2 BSD-2"
@@ -51,7 +50,7 @@ RDEPEND="${DEPEND}
>=virtual/perl-Time-HiRes-1.49
dev-perl/Unix-Syslog
dev-perl/Net-LibIDN
- sys-apps/file
+ dev-perl/File-LibMagic
>=sys-libs/db-4.4.20
dev-perl/BerkeleyDB
dev-perl/Convert-BinHex
@@ -70,7 +69,14 @@ RDEPEND="${DEPEND}
zmq? ( dev-perl/ZMQ-LibZMQ3 )"
AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/amavis-${P}"
+
+pkg_setup() {
+ # Create the user beforehand so that we can install the config file
+ # (and some directories) with group "amavis" in src_install().
+ enewgroup amavis
+ enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
src_prepare() {
# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
@@ -103,8 +109,9 @@ src_prepare() {
if ! use spamassassin ; then
sed -i -e \
[gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/files/, mail-filter/amavisd-new/
commit: c056ed59671c776f39ce1360a6a1b0fb0f16b900
Author: Ralph Seichter seichter de>
AuthorDate: Fri Oct 5 04:23:32 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Oct 5 04:23:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c056ed59
mail-filter/amavisd-new: DKIM signing bugfix
amavisd-new version 2.11.0 introduced a bug which breaks DKIM signing
for outbound mail. This ebuild adds a patch which fixes the issue.
Closes: https://bugs.gentoo.org/603582
Signed-off-by: Ralph Seichter seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/10058
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Thomas Deutschmann gentoo.org>
.../amavisd-new/amavisd-new-2.11.0-r4.ebuild | 184 +
.../amavisd-new/files/amavisd-2.11.0-dkim.patch| 12 ++
2 files changed, 196 insertions(+)
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
new file mode 100644
index 000..0efc27e6454
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://www.ijs.si/software/amavisd/;
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz;
+PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin
zmq"
+
+DEPEND=">=sys-apps/sed-4
+ >=dev-lang/perl-5.10.0"
+
+RDEPEND="${DEPEND}
+ >=sys-apps/coreutils-5.0-r3
+ app-arch/cpio
+ app-arch/gzip
+ app-arch/bzip2
+ app-arch/arc
+ app-arch/cabextract
+ app-arch/freeze
+ app-arch/lha
+ app-arch/lrzip
+ app-arch/lzop
+ app-arch/ncompress
+ app-arch/p7zip
+ app-arch/pax
+ app-arch/unarj
+ app-arch/unrar
+ app-arch/xz-utils
+ app-arch/zoo
+ net-mail/ripole
+ >=dev-perl/Archive-Zip-1.14
+ >=virtual/perl-IO-Compress-1.35
+ >=virtual/perl-Compress-Raw-Zlib-2.017
+ net-mail/tnef
+ virtual/perl-MIME-Base64
+ >=dev-perl/MIME-tools-5.415
+ >=dev-perl/MailTools-1.58
+ >=dev-perl/Net-Server-0.91
+ virtual/perl-Digest-MD5
+ dev-perl/IO-stringy
+ virtual/perl-IO-Socket-IP
+ >=virtual/perl-Time-HiRes-1.49
+ dev-perl/Unix-Syslog
+ dev-perl/Net-LibIDN
+ sys-apps/file
+ >=sys-libs/db-4.4.20
+ dev-perl/BerkeleyDB
+ dev-perl/Convert-BinHex
+ >=dev-perl/Mail-DKIM-0.31
+ virtual/perl-File-Temp
+ dev-perl/Net-SSLeay
+ dev-perl/IO-Socket-SSL
+ 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 )
+ snmp? ( net-analyzer/net-snmp[perl] )
+ spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+ zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
+ # see https://bugs.gentoo.org/603582
+ eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
+
+ if use courier ; then
+ eapply -p0 amavisd-new-courier.patch
+ fi
+
+ if use qmail ; then
+ eapply -p0 amavisd-new-qmqpqq.patch
+ fi
+
+ 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 zmq ; then
+ sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+ || die "missing conf file - zmq"
+ 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 amavisd-agent amavisd-nanny amavisd-release \
+ amavisd-signer amavisd-status
+ dobin p0f-analyzer.pl amavisd-submit
+
+ if use snmp ; then
+ dosbin amavisd-snmp-subagent
+ use zmq && dosbin amavisd-snmp-subagent-zmq
+ dodoc AMAVIS-MIB.txt
+ newinitd "${FILESDIR}"/amavisd-snmp.initd
[gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/files/, mail-filter/amavisd-new/
commit: 4e6300ee17654ae602107855bc7cde8801153042
Author: Marc Schiffbauer gentoo org>
AuthorDate: Mon Nov 23 02:29:11 2015 +
Commit: Marc Schiffbauer gentoo org>
CommitDate: Mon Nov 23 02:29:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6300ee
mail-filter/amavisd-new: revbump 2.10.1-r3, fix run-path for init scripts
Package-Manager: portage-2.2.25
.../{amavisd-new-2.10.1-r2.ebuild => amavisd-new-2.10.1-r3.ebuild}| 0
mail-filter/amavisd-new/files/amavis-mc.initd | 4
mail-filter/amavisd-new/files/amavisd-snmp.initd | 1 +
3 files changed, 5 insertions(+)
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
b/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
similarity index 100%
rename from mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
rename to mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd
b/mail-filter/amavisd-new/files/amavis-mc.initd
index 0725ef9..eb1b499 100644
--- a/mail-filter/amavisd-new/files/amavis-mc.initd
+++ b/mail-filter/amavisd-new/files/amavis-mc.initd
@@ -12,3 +12,7 @@ depend() {
use logger
before amavisd-new snmpd
}
+
+start_pre() {
+ checkpath -d -o amavis /run/amavis
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp.initd
b/mail-filter/amavisd-new/files/amavisd-snmp.initd
index e42fe47..9732419 100644
--- a/mail-filter/amavisd-new/files/amavisd-snmp.initd
+++ b/mail-filter/amavisd-new/files/amavisd-snmp.initd
@@ -18,4 +18,5 @@ start_pre() {
if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then
command="${command}-zmq"
fi
+ checkpath -d -o amavis /run/amavis
}
