[gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-09-13 20:43 James Le Cuirot
  0 siblings, 0 replies; 61+ messages in thread
From: James Le Cuirot @ 2020-09-13 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2780b873f99f77d270424d8d6b0abaa32df34f56
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 20:39:10 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 20:42:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2780b873

mail-filter/amavisd-new: Stabilise 2.12.0-r4 on all arches

The only difference is replacing unarj with arj. We want to last-rite
the former and upstream recommends the latter anyway.

Bug: https://bugs.gentoo.org/694746
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
index 72dfb93265c..3054b84528d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2023-12-18 20:22 Mike Gilbert
  0 siblings, 0 replies; 61+ messages in thread
From: Mike Gilbert @ 2023-12-18 20:22 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2023-12-14  4:13 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2023-12-14  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2ff9577dfb0c8b1780395fe794a6861bf3a8535a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 04:13:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 04:13:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff9577d

mail-filter/amavisd-new: Keyword 2.12.2 arm64, #919747

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index 9946e2926b68..f48522ccbfe6 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+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


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2023-06-28  7:37 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2023-06-28  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     7b0dcecbd52cb0e935d690ab4eb60cfa9125715c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 07:33:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 07:36:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0dcecb

mail-filter/amavisd-new: add missing selinux policy dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index 26ed77e5373a..9946e2926b68 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
+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
@@ -68,6 +68,7 @@ RDEPEND="${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 )"
 


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2023-06-28  7:37 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2023-06-28  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c75ae9901fe2217b6b0075902c0b5695c5ca2987
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 07:35:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 07:36:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75ae990

mail-filter/amavisd-new: add gitlab upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/amavisd-new/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 102bbb9bf7c9..564c4ee745b7 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -11,4 +11,7 @@
 		<flag name="rspamd-https">Add support for <pkg>mail-filter/rspamd</pkg> extension (both HTTP and HTTPS)</flag>
 		<flag name="spamassassin">Add support for <pkg>mail-filter/spamassassin</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="gitlab">amavis/amavis</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-09-06  1:10 Mike Gilbert
  0 siblings, 0 replies; 61+ messages in thread
From: Mike Gilbert @ 2022-09-06  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     12ab181a5b4c42feb07c328f95298fd6c5989c26
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 01:08:58 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 01:08:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ab181a

mail-filter/amavisd-new: drop dependency on app-arch/ncompress

amavisd does not appear to call 'compress'.
amavisd uses 'gzip -d' to decompress .Z files when 'uncompress' is not
available.

Bug: https://bugs.gentoo.org/868645
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index 797e34be3276..26ed77e5373a 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND}
 	app-arch/lha
 	app-arch/lrzip
 	app-arch/lzop
-	app-arch/ncompress
 	app-arch/p7zip
 	app-arch/pax
 	app-arch/arj


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-03-01 13:57 Ionen Wolkens
  0 siblings, 0 replies; 61+ messages in thread
From: Ionen Wolkens @ 2022-03-01 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     803388b9528261f10d967edb3f808f4064149a50
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Tue Mar  1 13:33:59 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 13:55:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803388b9

mail-filter/amavisd-new: Remove obsolete ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/24383
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                  |   1 -
 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 186 ----------------------
 2 files changed, 187 deletions(-)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 5942e382bbb0..b36b8358421f 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,2 +1 @@
-DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
 DIST amavis-v2.12.2.tar.bz2 874946 BLAKE2B 0b52cb23e11d0b7b346e53b979b580b76f51ce22516a8e2ef6c6d579f1693a9d175ebd92e9cba74e4bed68b012250808e2f827182dddf5addbbb40f2602294f7 SHA512 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
deleted file mode 100644
index 30aa24ba326f..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 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 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https 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-arch/cpio
-	app-arch/gzip
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	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 )
-	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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-02-28 10:14 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2022-02-28 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     c3e05b27f34ed113d98658226e968175646e2ec0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 10:14:55 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 10:14:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e05b27

mail-filter/amavisd-new: sparc stable wrt bug #833614

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index de928a99a19b..797e34be3276 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-02-28 10:14 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2022-02-28 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     03e00e8b3fdb8d9cb210196672b6898cb9b2e63f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 10:14:18 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 10:14:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e00e8b

mail-filter/amavisd-new: ppc stable wrt bug #833614

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index 66d709fbc218..de928a99a19b 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-02-27 13:43 Jakov Smolić
  0 siblings, 0 replies; 61+ messages in thread
From: Jakov Smolić @ 2022-02-27 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     44b5f3bb54d44ff4196ab1f43dff185b7d2dc336
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 13:43:02 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 13:43:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b5f3bb

mail-filter/amavisd-new: Stabilize 2.12.2 x86, #833614

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index 49d7fb7bda55..66d709fbc218 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-02-27 13:17 Jakov Smolić
  0 siblings, 0 replies; 61+ messages in thread
From: Jakov Smolić @ 2022-02-27 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9ae5e56fb8c5d656c449c5d797ee247c7c279d45
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 13:17:52 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 13:17:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae5e56f

mail-filter/amavisd-new: Stabilize 2.12.2 amd64, #833614

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index 36d11c8f77a5..49d7fb7bda55 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-02-27  8:57 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2022-02-27  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1fb87ef73bad9c677c878bfc931f0ef7db0af309
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 08:56:54 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 08:56:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb87ef7

mail-filter/amavisd-new: ppc64 stable wrt bug #833614

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index f1305667633c..36d11c8f77a5 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2022-01-31  1:01 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2022-01-31  1:01 UTC (permalink / raw
  To: gentoo-commits

commit:     3573c36b138dade9a2b547012bfc79ff4745dc78
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sun Jan 30 17:42:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 00:58:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3573c36b

mail-filter/amavisd-new: Bump to version 2.12.2

Closes: https://bugs.gentoo.org/829582
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/24024
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                  |   1 +
 mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild | 186 ++++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index fccc10b76617..5942e382bbb0 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
 DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
+DIST amavis-v2.12.2.tar.bz2 874946 BLAKE2B 0b52cb23e11d0b7b346e53b979b580b76f51ce22516a8e2ef6c6d579f1693a9d175ebd92e9cba74e4bed68b012250808e2f827182dddf5addbbb40f2602294f7 SHA512 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
new file mode 100644
index 000000000000..f1305667633c
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https 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-arch/cpio
+	app-arch/gzip
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	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 )
+	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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-12-09  6:52 Ionen Wolkens
  0 siblings, 0 replies; 61+ messages in thread
From: Ionen Wolkens @ 2021-12-09  6:52 UTC (permalink / raw
  To: gentoo-commits

commit:     24da2bfaefba27b54c621726086390b967cb32d7
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Mon Dec  6 18:24:35 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 06:40:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24da2bfa

mail-filter/amavisd-new: Remove obsolete ebuild

amavisd-new-2.12.1.ebuild has been stabilised.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/23199
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                   |   1 -
 .../amavisd-new/amavisd-new-2.12.0-r5.ebuild       | 186 ---------------------
 2 files changed, 187 deletions(-)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 052d0bf39cc4..fccc10b76617 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,2 +1 @@
-DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
 DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
deleted file mode 100644
index f2e542b6b7c8..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2020 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 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https 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-arch/cpio
-	app-arch/gzip
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	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 )
-	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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-12-06 11:31 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2021-12-06 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     aa6a71c3d8d438bd7279f5a7b0c9b6ffccd8c2fe
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 11:30:32 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 11:30:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6a71c3

mail-filter/amavisd-new: x86 stable wrt bug #828359

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index f099f187c904..30aa24ba326f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-12-06  8:06 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2021-12-06  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     190699c7bc595c7908667dd9d428c2912252c2b9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 08:06:35 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 08:06:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190699c7

mail-filter/amavisd-new: sparc stable wrt bug #828359

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index d2f778615928..f099f187c904 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-12-06  8:05 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2021-12-06  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     b8789e9e0f35a2a5b35c5ae512722636e672cf07
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 08:05:11 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 08:05:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8789e9e

mail-filter/amavisd-new: ppc64 stable wrt bug #828359

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index 7e4a90848f7a..d2f778615928 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-12-06  8:04 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2021-12-06  8:04 UTC (permalink / raw
  To: gentoo-commits

commit:     d9764f61c91c8a7f796b4d37e7ab27f20155542f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 08:04:28 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 08:04:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9764f61

mail-filter/amavisd-new: ppc stable wrt bug #828359

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index 9c1451630d7e..7e4a90848f7a 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-12-06  8:01 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2021-12-06  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     2066f929d3f3d383cc8a9c18d29ae94c48d54e60
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 08:01:00 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 08:01:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2066f929

mail-filter/amavisd-new: amd64 stable wrt bug #828359

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index 4245de32669f..9c1451630d7e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2021-02-04 22:33 Thomas Deutschmann
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Deutschmann @ 2021-02-04 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     d8152db6c63b726dd9a765efdbc06368d2b0865b
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sat Jan 30 17:37:16 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 22:32:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8152db6

mail-filter/amavisd-new: Bump to version 2.12.1

Closes: https://bugs.gentoo.org/767295
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/19267
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                  |   1 +
 mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild | 186 ++++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 7fa6cba45aa..052d0bf39cc 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
+DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
new file mode 100644
index 00000000000..4245de32669
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https 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-arch/cpio
+	app-arch/gzip
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	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 )
+	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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-10-15 22:12 Thomas Deutschmann
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Deutschmann @ 2020-10-15 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     ce0708605b03a9a9f2bc82367009b20e3e8dfda5
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Thu Oct 15 18:56:48 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 22:12:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce070860

mail-filter/amavisd-new: Drop 0MQ support

As discussed in https://bugs.gentoo.org/740900, this ebuild drops
support for 0MQ, in a deliberate straight-to-stable commit.

Closes: https://bugs.gentoo.org/740900
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/17939
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ....12.0-r4.ebuild => amavisd-new-2.12.0-r5.ebuild} | 21 ++-------------------
 mail-filter/amavisd-new/metadata.xml                |  1 -
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
similarity index 90%
rename from mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
rename to mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
index 3054b84528d..f2e542b6b7c 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message
 	dev-perl/JSON
@@ -70,8 +70,7 @@ RDEPEND="${DEPEND}
 		dev-perl/LWP-Protocol-https
 		dev-perl/Net-SSLeay )
 	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )"
 
 AMAVIS_ROOT="/var/lib/amavishome"
 S="${WORKDIR}/amavis-v${PV}"
@@ -99,11 +98,6 @@ src_prepare() {
 			|| 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/^#//" \
@@ -122,17 +116,6 @@ src_install() {
 		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
 				 amavisd-snmp-subagent
 		dodoc AMAVIS-MIB.txt
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
 	fi
 
 	if use ldap ; then

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 358d0af9a71..a4f1bca475e 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -17,6 +17,5 @@
 		<flag name="rspamd">Add support for mail-filter/rspamd extension (HTTP only)</flag>
 		<flag name="rspamd-https">Add support for mail-filter/rspamd extension (both HTTP and HTTPS)</flag>
 		<flag name="spamassassin">Add support for mail-filter/spamassassin</flag>
-		<flag name="zmq">Add support for zeromq sockets</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-09-13 20:43 James Le Cuirot
  0 siblings, 0 replies; 61+ messages in thread
From: James Le Cuirot @ 2020-09-13 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b1fd5fa7032160601b99a9d9cbbbea7273a83820
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 20:40:08 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 20:42:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fd5fa7

mail-filter/amavisd-new: Drop old 2.12.0-r3

Bug: https://bugs.gentoo.org/694746
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.12.0-r3.ebuild       | 203 ---------------------
 1 file changed, 203 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
deleted file mode 100644
index 04e130e5d3e..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 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 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
-
-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/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	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 )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-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 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{,-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
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-09-07 20:05 James Le Cuirot
  0 siblings, 0 replies; 61+ messages in thread
From: James Le Cuirot @ 2020-09-07 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8d366df8f7d8731b360ca4f78f9e06e20022fa7b
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sun Sep  6 21:27:04 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 19:59:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d366df8

mail-filter/amavisd-new: Remove obsolete ebuilds

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/17446
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                   |   1 -
 .../amavisd-new/amavisd-new-2.11.1-r3.ebuild       | 197 ---------------------
 mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild  | 193 --------------------
 3 files changed, 391 deletions(-)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index e9ebe5f421b..7fa6cba45aa 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,2 +1 @@
-DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
deleted file mode 100644
index ba4e5ba01f5..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="https://gitlab.com/amavis/amavis/-/archive/${P}/amavis-${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~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/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
-	dev-perl/File-LibMagic
-	>=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}/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,
-	# 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
-
-	# 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 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{,-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
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		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
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
deleted file mode 100644
index e38d6d4fe4f..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd user
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
-
-MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"
-RDEPEND=">=dev-lang/perl-5.10.0
-	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/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	clamav? ( app-antivirus/clamav )
-	>=dev-perl/Archive-Zip-1.14
-	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
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	net-mail/ripole
-	net-mail/tnef
-	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 )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	>=sys-apps/coreutils-5.0-r3
-	>=sys-libs/db-4.4.20
-	virtual/mta
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Temp
-	>=virtual/perl-IO-Compress-1.35
-	virtual/perl-IO-Socket-IP
-	virtual/perl-MIME-Base64
-	>=virtual/perl-Time-HiRes-1.49
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/amavis-v${PV}"
-
-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() {
-	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 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{,-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
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-09-07 20:05 James Le Cuirot
  0 siblings, 0 replies; 61+ messages in thread
From: James Le Cuirot @ 2020-09-07 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     49e5ef6551f5d4e11e684d7ab4c32e09dcaf0295
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Sun Sep  6 20:23:53 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 19:59:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e5ef65

mail-filter/amavisd-new: Depend on app-arch/arj

Depend on app-arch/arj instead of app-arch/unarj because of licensing.

Bug: https://bugs.gentoo.org/694746
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.12.0-r4.ebuild       | 203 +++++++++++++++++++++
 1 file changed, 203 insertions(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
new file mode 100644
index 00000000000..72dfb93265c
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r4.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+
+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/ncompress
+	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 )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+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 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{,-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
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+	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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-07-18 18:05 Sam James
  0 siblings, 0 replies; 61+ messages in thread
From: Sam James @ 2020-07-18 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     b314df82bc3dd87cf4bbd6e619114c2493c36ed0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 18:04:43 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 18:04:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b314df82

mail-filter/amavisd-new: amd64 stable (bug #721534)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index 19b811676bb..04e130e5d3e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-06-20 15:45 Thomas Deutschmann
  0 siblings, 0 replies; 61+ messages in thread
From: Thomas Deutschmann @ 2020-06-20 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     41e32251d72319bc9c8c377ef6b0389f75d0e63c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 15:25:25 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 15:45:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e32251

mail-filter/amavisd-new: x86 stable (bug #721534)

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index 0f4143d9a4d..19b811676bb 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-05-25  9:36 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2020-05-25  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     435ebeb35457d6765227250c9d682999c7973d61
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 09:33:50 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May 25 09:33:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435ebeb3

mail-filter/amavisd-new: stable 2.12.0-r3 for ppc, bug #721534

Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index d6b2e628306..0f4143d9a4d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-05-22  8:02 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2020-05-22  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     689bc928182a0239a502dc7b5372e91971fad4e3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 07:57:29 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 22 08:02:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689bc928

mail-filter/amavisd-new: stable 2.12.0-r3 for ppc64, bug #721534

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index f628b68b1fd..d6b2e628306 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-05-18 16:46 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2020-05-18 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ac30e390b1a07601f964cd07413063366ebbc689
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon May 18 15:32:56 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May 18 16:46:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac30e390

mail-filter/amavisd-new: stable 2.12.0-r3 for sparc, bug #721534

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index a46381630e2..f628b68b1fd 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-03-20 21:53 Matt Turner
  0 siblings, 0 replies; 61+ messages in thread
From: Matt Turner @ 2020-03-20 21:53 UTC (permalink / raw
  To: gentoo-commits

commit:     8413693be83b3bac21d49e7dda7e27f54e1727e8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 21:48:25 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 21:52:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8413693b

mail-filter/amavisd-new: drop hppa keywords

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild | 2 +-
 mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild | 2 +-
 mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index aed561d90ce..ba4e5ba01f5 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index 12e9e6ba1f1..a46381630e2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
index 5494757a110..e38d6d4fe4f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-02-28  3:52 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2020-02-28  3:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7a335f0bf2b81890fc4331c17f88aad03e5ba831
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 03:52:04 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 03:52:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a335f0b

mail-filter/amavisd-new: add missing dep for dev-perl/Archive-Zip

Closes: https://bugs.gentoo.org/710982
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../{amavisd-new-2.12.0-r2.ebuild => amavisd-new-2.12.0-r3.ebuild}       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
similarity index 99%
rename from mail-filter/amavisd-new/amavisd-new-2.12.0-r2.ebuild
rename to mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
index db14bb2c4af..12e9e6ba1f1 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r3.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 	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


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-02-27 13:03 Craig Andrews
  0 siblings, 0 replies; 61+ messages in thread
From: Craig Andrews @ 2020-02-27 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     45ffd7c8407d4f8c51b513947fd178dd70cec9cf
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 01:44:59 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 13:03:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ffd7c8

mail-filter/amavisd-new: Add missing dependencies

Closes: https://bugs.gentoo.org/710842
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14778
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.12.0-r2.ebuild       | 202 +++++++++++++++++++++
 1 file changed, 202 insertions(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r2.ebuild
new file mode 100644
index 00000000000..db14bb2c4af
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+
+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/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	dev-lang/perl:*
+	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 )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+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 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{,-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
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+	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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-02-27 13:03 Craig Andrews
  0 siblings, 0 replies; 61+ messages in thread
From: Craig Andrews @ 2020-02-27 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b100ea77be8256dea3f7a852d34cd6a4a06bc41b
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 01:46:37 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 13:03:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b100ea77

mail-filter/amavisd-new: Cleanup old version

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.12.0-r1.ebuild       | 197 ---------------------
 1 file changed, 197 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
deleted file mode 100644
index f10cddad89e..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
-
-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/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	dev-lang/perl:*
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	dev-perl/File-LibMagic
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-stringy
-	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 )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-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 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{,-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
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-02-21  6:08 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2020-02-21  6:08 UTC (permalink / raw
  To: gentoo-commits

commit:     a30c37ecf9d93913f9d79aacefe2ca8e0c655c99
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Fri Feb 14 10:31:00 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 05:42:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30c37ec

mail-filter/amavisd-new: Migrate to GLEP 81

Updated ebuild uses acct-user/amavis.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.12.0-r1.ebuild       | 198 +++++++++++++++++++++
 1 file changed, 198 insertions(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
new file mode 100644
index 00000000000..f68990e14fa
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+
+MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"
+BDEPEND="acct-user/amavis"
+RDEPEND="${BDEPEND}
+	>=dev-lang/perl-5.10.0
+	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/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	clamav? ( app-antivirus/clamav )
+	>=dev-perl/Archive-Zip-1.14
+	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
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	net-mail/ripole
+	net-mail/tnef
+	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 )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	>=sys-apps/coreutils-5.0-r3
+	>=sys-libs/db-4.4.20
+	virtual/mta
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Temp
+	>=virtual/perl-IO-Compress-1.35
+	virtual/perl-IO-Socket-IP
+	virtual/perl-MIME-Base64
+	>=virtual/perl-Time-HiRes-1.49
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+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 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{,-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
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+	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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-02-21  6:08 Joonas Niilola
  0 siblings, 0 replies; 61+ messages in thread
From: Joonas Niilola @ 2020-02-21  6:08 UTC (permalink / raw
  To: gentoo-commits

commit:     fe4d2530ec228792fac96fd3c04599f181056dfd
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Fri Feb 14 21:06:12 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 05:42:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4d2530

mail-filter/amavisd-new: Change maintainer list

Replace the quasi-defunct Gentoo Antivirus Project with Proxy
Maintainers in ebuild metadata, as suggested by M. Orlitzky.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/14656
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.12.0-r1.ebuild       | 43 +++++++++++-----------
 mail-filter/amavisd-new/metadata.xml               |  8 ++--
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
index f68990e14fa..f10cddad89e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0-r1.ebuild
@@ -2,6 +2,7 @@
 # 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"
@@ -13,10 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
-MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"
-BDEPEND="acct-user/amavis"
-RDEPEND="${BDEPEND}
-	>=dev-lang/perl-5.10.0
+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
@@ -32,40 +34,37 @@ RDEPEND="${BDEPEND}
 	app-arch/unrar
 	app-arch/xz-utils
 	app-arch/zoo
-	clamav? ( app-antivirus/clamav )
-	>=dev-perl/Archive-Zip-1.14
+	dev-lang/perl:*
 	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
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
 	net-mail/ripole
 	net-mail/tnef
-	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 )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
 	>=sys-apps/coreutils-5.0-r3
 	>=sys-libs/db-4.4.20
 	virtual/mta
-	>=virtual/perl-Compress-Raw-Zlib-2.017
+	virtual/perl-Compress-Raw-Zlib
 	virtual/perl-Digest-MD5
 	virtual/perl-File-Temp
-	>=virtual/perl-IO-Compress-1.35
+	virtual/perl-IO-Compress
 	virtual/perl-IO-Socket-IP
 	virtual/perl-MIME-Base64
-	>=virtual/perl-Time-HiRes-1.49
+	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 )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
 	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
 
 AMAVIS_ROOT="/var/lib/amavishome"

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index a3ae4f14111..358d0af9a71 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>antivirus@gentoo.org</email>
-		<name>Gentoo Antivirus Project</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="courier">Add courier support</flag>
 		<flag name="dkim">Add DomainKeys Identified Mail support</flag>


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2020-01-21 15:32 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2020-01-21 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     7c246c087b8ad8cfb92e14cf1d4e3a6aa2db830f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 15:30:17 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 15:30:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c246c08

mail-filter/amavisd-new: remove myself as maintainer.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/amavisd-new/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 3aa9e682863..a3ae4f14111 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -5,10 +5,6 @@
 		<email>antivirus@gentoo.org</email>
 		<name>Gentoo Antivirus Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mjo@gentoo.org</email>
-		<name>Michael Orlitzky</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-09-17 17:55 Kent Fredric
  0 siblings, 0 replies; 61+ messages in thread
From: Kent Fredric @ 2019-09-17 17:55 UTC (permalink / raw
  To: gentoo-commits

commit:     22cd5577c98001e84ca7c5095b825459b66640fd
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 17:55:12 2019 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 17:55:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cd5577

mail-filter/amavisd-new: Restore ~ppc64 re bug #691340

Tested by ernsteiswuerfel

Closes: https://bugs.gentoo.org/691340
Package-Manager: Portage-2.3.75, Repoman-2.3.16
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
index 6648dadf9c1..cbb0a554421 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
 
 MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-08-07 14:27 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2019-08-07 14:27 UTC (permalink / raw
  To: gentoo-commits

commit:     c06cd310cdb05ed117dbd2c486827732d48eead9
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Tue Jul 30 17:09:53 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 14:09:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06cd310

mail-filter/amavisd-new: Upstream release 2.12.0

This ebuild uses EAPI 7 and introduces USE flags 'rspamd' and
'rspamd-https' to support Amavis' new Rspamd extension.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                  |   1 +
 mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild | 193 ++++++++++++++++++++++
 mail-filter/amavisd-new/metadata.xml              |   6 +
 3 files changed, 200 insertions(+)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 276f10f8e9d..e9ebe5f421b 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 amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
new file mode 100644
index 00000000000..6648dadf9c1
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="${HOMEPAGE}/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin zmq"
+
+MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined )"
+RDEPEND=">=dev-lang/perl-5.10.0
+	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/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	clamav? ( app-antivirus/clamav )
+	>=dev-perl/Archive-Zip-1.14
+	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
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	net-mail/ripole
+	net-mail/tnef
+	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 )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	>=sys-apps/coreutils-5.0-r3
+	>=sys-libs/db-4.4.20
+	virtual/mta
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Temp
+	>=virtual/perl-IO-Compress-1.35
+	virtual/perl-IO-Socket-IP
+	virtual/perl-MIME-Base64
+	>=virtual/perl-Time-HiRes-1.49
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/amavis-v${PV}"
+
+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() {
+	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 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{,-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
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+	fi
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		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
+}

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 1b1c868add7..3aa9e682863 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -9,11 +9,17 @@
 		<email>mjo@gentoo.org</email>
 		<name>Michael Orlitzky</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
 	<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 mail-filter/razor</flag>
+		<flag name="rspamd">Add support for mail-filter/rspamd extension (HTTP only)</flag>
+		<flag name="rspamd-https">Add support for mail-filter/rspamd extension (both HTTP and HTTPS)</flag>
 		<flag name="spamassassin">Add support for mail-filter/spamassassin</flag>
 		<flag name="zmq">Add support for zeromq sockets</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-02-24  1:41 Andreas K. Hüttel
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas K. Hüttel @ 2019-02-24  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     ca14d145f771fb8c26f40a260550484c3cfef85e
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 01:39:22 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 01:39:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca14d145

mail-filter/amavisd-new: Remove old

Bug: https://bugs.gentoo.org/669206
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 mail-filter/amavisd-new/Manifest                   |   1 -
 .../amavisd-new/amavisd-new-2.11.0-r3.ebuild       | 180 ---------------------
 2 files changed, 181 deletions(-)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 7b3a4228338..276f10f8e9d 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,2 +1 @@
 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-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
deleted file mode 100644
index 7ccaa3f1f4d..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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() {
-	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 amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	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
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-02-17 17:51 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2019-02-17 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     a5b157ffeb18bc0e1cc9c75e3a8f83dc616f7207
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 17:51:26 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 17:51:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b157ff

mail-filter/amavisd-new: stable 2.11.1-r3 for ppc64, bug #630898

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 82b6f097433..91ff573e636 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-02-09 19:29 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2019-02-09 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     40da5affff80ca4eaef90fdc11fd7a37357f3b0d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 19:29:11 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 19:29:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40da5aff

mail-filter/amavisd-new: stable 2.11.1-r3 for hppa, bug #630898

Package-Manager: Portage-2.3.59, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 7d73c8a4fa9..82b6f097433 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-02-07 10:51 Mikle Kolyada
  0 siblings, 0 replies; 61+ messages in thread
From: Mikle Kolyada @ 2019-02-07 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6fc0e0529236281aeaaa0a46993dbae9c0bf0c12
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 10:48:14 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 10:51:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc0e052

mail-filter/amavisd-new: amd64 stable wrt bug #630898

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index c15348cea95..7d73c8a4fa9 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-02-03  9:12 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2019-02-03  9:12 UTC (permalink / raw
  To: gentoo-commits

commit:     c4f6c954c308bc219aea252414d7b0372d6277c8
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Feb  3 09:05:35 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb  3 09:11:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f6c954

mail-filter/amavisd-new: stable 2.11.1-r3 for sparc, bug #630898

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index bcb13d13706..c15348cea95 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-01-05 16:13 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2019-01-05 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     47f2bbe9f5bd4184e43fbc6f59471e40ec36b1b4
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 16:03:14 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jan  5 16:12:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f2bbe9

mail-filter/amavisd-new: remove "unused" amavisd-new-2.11.1-r1.ebuild.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../amavisd-new/amavisd-new-2.11.1-r1.ebuild       | 190 ---------------------
 1 file changed, 190 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
deleted file mode 100644
index d436def3bdb..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-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"
-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
-	dev-perl/File-LibMagic
-	>=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}/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,
-	# 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 amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema ${PN}.schema || die
-	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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2019-01-05 16:13 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2019-01-05 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     185658bff21832b12c76e6e74fe9a7d1c6ea71cf
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 16:11:31 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jan  5 16:12:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185658bf

mail-filter/amavisd-new: new revision sans the app-arch/freeze dependency.

The app-arch/freeze package fails to build with a modern compiler and
glibc. It's probably time to lay this package to rest. The last
upstream release is from circa 1999. Fedora has some patches against
it, but an email from the author (in the Fedora RPM) suggests that
even he thinks the package is dead.

While it's fun to see a long list of supported file types in amavisd,
I've never actually seen one of these archives in real life. The
recent build failures are due to some code quality issues; so even if
it's possible to patch them, one has to ask: do we want to be feeding
this unmaintained program untrusted input from the network? With all
things considered, its removal is for the best.

Bug: https://bugs.gentoo.org/669206
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../{amavisd-new-2.11.1-r2.ebuild => amavisd-new-2.11.1-r3.ebuild}     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
similarity index 98%
rename from mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
rename to mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 1767bdefc4a..fb89008a1ca 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@@ -23,7 +23,6 @@ RDEPEND="${DEPEND}
 	app-arch/bzip2
 	app-arch/arc
 	app-arch/cabextract
-	app-arch/freeze
 	app-arch/lha
 	app-arch/lrzip
 	app-arch/lzop

^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2018-11-26  0:24 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2018-11-26  0:24 UTC (permalink / raw
  To: gentoo-commits

commit:     03cfea608f3fab587beeff90ecf657533bcdecf2
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 02:29:45 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 00:17:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cfea60

mail-filter/amavisd-new: remove "unused" amavisd-new-2.11.1.ebuild.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild | 190 ----------------------
 1 file changed, 190 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild
deleted file mode 100644
index 3b4205bb331..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-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"
-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
-	dev-perl/File-LibMagic
-	>=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}/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,
-	# 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 amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema ${PN}.schema || die
-	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_dounit "${FILESDIR}/amavisd.service-r1"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2018-11-21  3:09 Craig Andrews
  0 siblings, 0 replies; 61+ messages in thread
From: Craig Andrews @ 2018-11-21  3:09 UTC (permalink / raw
  To: gentoo-commits

commit:     aeffb0da0983d2fa61c3e8e61471dd835f91355c
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 02:14:08 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 02:14:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeffb0da

mail-filter/amavisd-new: Fix installed systemd service filename

Closes: https://bugs.gentoo.org/671598
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../amavisd-new/amavisd-new-2.11.1-r1.ebuild       | 190 +++++++++++++++++++++
 1 file changed, 190 insertions(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
new file mode 100644
index 00000000000..d436def3bdb
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+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"
+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
+	dev-perl/File-LibMagic
+	>=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}/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,
+	# 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 amavisd-snmp
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+	fi
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		newins LDAP.schema ${PN}.schema || die
+	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
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2018-11-18 23:56 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2018-11-18 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     34ddfef24e1740025854af215d7b04809fb7e65f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 14:53:30 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 23:23:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ddfef2

mail-filter/amavisd-new: remove old "unused" versions.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-filter/amavisd-new/Manifest                   |   4 -
 .../amavisd-new/amavisd-new-2.10.1-r4.ebuild       | 181 --------------------
 mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild  | 180 --------------------
 .../amavisd-new/amavisd-new-2.11.0-r2.ebuild       | 177 -------------------
 mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild   | 167 ------------------
 .../amavisd-new/amavisd-new-2.8.1-r1.ebuild        | 188 ---------------------
 .../amavisd-new/amavisd-new-2.9.1-r2.ebuild        | 180 --------------------
 7 files changed, 1077 deletions(-)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index ebee6ac630e..44fb609486f 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,5 +1 @@
-DIST amavisd-new-2.10.1.tar.xz 767716 BLAKE2B 603dabc34e2304084f725633bb772fc78316bbccbd5635940cf257bf19d38ffcfc44087832d5d8db270b943c27b5074f32fb76804e2f19a721e7bc9aae09d9c6 SHA512 1939cc60136fe37a078ebd6117a774bcc7ee34b68807472eb08ab15414749300925f74898131299fb051c539cc59d264003439a6307c9d0fa16971d02dab1ff9
 DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
-DIST amavisd-new-2.7.2.tar.gz 945448 BLAKE2B b6315f080b246a8715761fbc9516631b6737fa6b7995a52b0e013ed8704546d741d678e09ed5f21d590527bcfb9fa27d051167cd673828b85539d9e495b8dafc SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756
-DIST amavisd-new-2.8.1.tar.xz 731816 BLAKE2B 6becb5a9d2029605030f04fc8876570aedd2c8d925a9a202aff22969d0e0001d9ed56e25e00ad7f1181671c16482a90b139f8327abf8478a3c56e5e132e5f662 SHA512 a840b57513b8a7b18e15085016c273ba2fba5cceb76ef52c52aa2ca34e9257be78f8bb8ea350dbdac3b26d2aba8f5aae821c1c45f2d37bc6be04ff2efb9f3ade
-DIST amavisd-new-2.9.1.tar.xz 753076 BLAKE2B 835ce09dcaa98b44447d48522b3dfddb8066add0e2fe10767118c5979aeaee37c0db439e17721d9e5c6b40977b5db3ff0213261ea0fc88a2d6566249c1d57888 SHA512 6829a769f50498aaec4fd5c198059f828e9ba90223083e439caa9d2bd19006e0cff8ae7b1e2416009bd2514aae4428598142e86a63260b5292c15b515792a7af

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
deleted file mode 100644
index f9e7a0683a5..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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.8.2"
-
-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/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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-}
-
-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 amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml 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
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
deleted file mode 100644
index 0a0c01a71b0..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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.8.2"
-
-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/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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-}
-
-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
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml 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
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
deleted file mode 100644
index 37446c48476..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 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 ~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/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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	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 amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	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
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
deleted file mode 100644
index b2bce29bb34..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils 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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-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/ncompress
-	app-arch/pax
-	app-arch/unarj
-	app-arch/xz-utils
-	|| ( app-arch/unrar app-arch/rar )
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	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-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	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 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd" amavisd
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml 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
-
-	#for i in whitelist blacklist spam_lovers; do
-	#	if [ -f ${AMAVIS_ROOT}/${i} ]; then
-	#		cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-	#	else
-	#		touch "${D}"/${AMAVIS_ROOT}/${i}
-	#	fi
-	#done
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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"
-		fi
-	fi
-
-	if ! use spamassassin ; then
-		elog "Disabling anti-spam code in amavisd.conf..."
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${D}/etc/amavisd.conf"
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
deleted file mode 100644
index fac90db569b..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils 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"
-
-LICENSE="GPL-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.8.2"
-
-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
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	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
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf"
-	fi
-}
-
-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
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml 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
-
-	#for i in whitelist blacklist spam_lovers; do
-	#	if [ -f ${AMAVIS_ROOT}/${i} ]; then
-	#		cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-	#	else
-	#		touch "${D}"/${AMAVIS_ROOT}/${i}
-	#	fi
-	#done
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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"
-		fi
-	fi
-
-	if ! use spamassassin ; then
-		elog "Disabling anti-spam code in amavisd.conf..."
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${D}/etc/amavisd.conf"
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}

diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
deleted file mode 100644
index 72d7bbcee46..00000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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.8.2"
-
-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
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-}
-
-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 amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dohtml 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
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	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
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2018-11-18 23:56 Michael Orlitzky
  0 siblings, 0 replies; 61+ messages in thread
From: Michael Orlitzky @ 2018-11-18 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     1f3f2b55ce509e53857fe3afdc78d42f2ebbe7c4
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 14:49:34 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 23:23:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3f2b55

mail-filter/amavisd-new: add myself as a maintainer.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-filter/amavisd-new/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 2a38ad5c4da..8ab3437f40f 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -9,6 +9,10 @@
 		<email>antivirus@gentoo.org</email>
 		<name>Gentoo Antivirus Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mjo@gentoo.org</email>
+		<name>Michael Orlitzky</name>
+	</maintainer>
 	<use>
 		<flag name="courier">Add courier support</flag>
 		<flag name="dkim">Add DomainKeys Identified Mail support</flag>


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2018-06-19 19:13 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2018-06-19 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f3a9fb75774159b90a8a725b73000d9c43d02740
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Jun 19 15:16:23 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 19:12:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a9fb75

mail-filter/amavisd-new: stable 2.11.0-r3 for sparc

Bug: https://bugs.gentoo.org/591998
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index b50747597c0..7ccaa3f1f4d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2017-09-24 16:34 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2017-09-24 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b52946cb7ceb13201416409dd1c99e523284e346
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 16:30:13 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 16:34:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b52946cb

mail-filter/amavisd-new: keyworded 2.10.1-r4 for ppc, bug #531512

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
index a402bb7b496..f9e7a0683a5 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2017-09-24 16:34 Sergei Trofimovich
  0 siblings, 0 replies; 61+ messages in thread
From: Sergei Trofimovich @ 2017-09-24 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     c3777aeca0efdeeaa3a912470545b9705cf82a97
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 16:32:32 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 16:34:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3777aec

mail-filter/amavisd-new: keyworded 2.11.0-r3 for ppc, bug #531512

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index faa907017a1..b50747597c0 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -12,7 +12,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2017-08-22 21:31 Michał Górny
  0 siblings, 0 replies; 61+ messages in thread
From: Michał Górny @ 2017-08-22 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c9bb29a202816789f3980d6d93d7c76069c30ed7
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Tue Aug 22 11:51:21 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:31:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bb29a2

mail-filter/amavisd-new: HOMEPAGE and SRC_URI 301 redirect to HTTPS

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild | 6 +++---
 mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild    | 6 +++---
 mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild | 6 +++---
 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 4 ++--
 mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild     | 6 +++---
 mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild  | 6 +++---
 mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild  | 6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
index 04e7502d59d..a402bb7b496 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ inherit eutils systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
index 8e720c580f6..0a0c01a71b0 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ inherit eutils systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
index 5fe4b6fe6d7..37446c48476 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ inherit systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+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"

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index 990c767a9dd..faa907017a1 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -6,8 +6,8 @@ inherit systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+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"

diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
index eee7546ee58..b2bce29bb34 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ inherit eutils user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.gz"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
index 6c51cdbd954..fac90db569b 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ inherit eutils systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
index c31429ea756..72d7bbcee46 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ inherit eutils systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="http://www.ijs.si/software/amavisd/"
-SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2017-02-04  8:53 Jeroen Roovers
  0 siblings, 0 replies; 61+ messages in thread
From: Jeroen Roovers @ 2017-02-04  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     93cee796fb1e9d9c2ea09111961fc52eebdba183
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 08:53:01 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 08:53:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93cee796

mail-filter/amavisd-new: Stable for HPPA (bug #591998).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index 8d97e75..1cc487f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -13,7 +13,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc64 x86"
+KEYWORDS="amd64 hppa ppc64 x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2017-01-13 15:41 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2017-01-13 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     22c66a2deadc5c69f688851c5f88171edeac84d6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 15:41:36 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 15:41:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c66a2d

mail-filter/amavisd-new: x86 stable wrt bug #591998

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index 0236944..d6e15db 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -13,7 +13,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc64 x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2017-01-11 16:17 Agostino Sarubbo
  0 siblings, 0 replies; 61+ messages in thread
From: Agostino Sarubbo @ 2017-01-11 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ad2fac60ae18af5a2978cf79cbcfed93babdce1b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 16:16:58 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 16:16:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2fac60

mail-filter/amavisd-new: amd64 stable wrt bug #591998

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index e86b9ca..0236944 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc64 ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2016-10-02  7:08 Jeroen Roovers
  0 siblings, 0 replies; 61+ messages in thread
From: Jeroen Roovers @ 2016-10-02  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f44db5c047f30ce82becb36f7c330e46b5223cde
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 07:07:39 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 07:08:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44db5c0

mail-filter/amavisd-new: Mark ~hppa (bug #595766).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index 31c2f69..e86b9ca 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -13,7 +13,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2016-10-01  8:57 Eray Aslan
  0 siblings, 0 replies; 61+ messages in thread
From: Eray Aslan @ 2016-10-01  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     8916f85c4b54106e0c2b804fbd397c20e41c99fc
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 08:56:54 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 08:56:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8916f85c

mail-filter/amavisd-new: add missing dependencies (bug 592666)

Package-Manager: portage-2.3.1

 .../amavisd-new/amavisd-new-2.11.0-r3.ebuild       | 181 +++++++++++++++++++++
 1 file changed, 181 insertions(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
new file mode 100644
index 00000000..31c2f69
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://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 ~ppc64 ~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() {
+	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 amavisd-snmp
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+	fi
+
+	insinto /etc
+	insopts -m0640
+	doins amavisd.conf
+
+	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+	systemd_dounit "${FILESDIR}/amavisd.service"
+	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
+	keepdir "${AMAVIS_ROOT}"
+	keepdir "${AMAVIS_ROOT}/db"
+	keepdir "${AMAVIS_ROOT}/quarantine"
+	keepdir "${AMAVIS_ROOT}/tmp"
+	keepdir "${AMAVIS_ROOT}/var"
+
+	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
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+	fi
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+	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() {
+	chown root:amavis "${ROOT}/etc/amavisd.conf"
+	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2016-04-27 10:17 Eray Aslan
  0 siblings, 0 replies; 61+ messages in thread
From: Eray Aslan @ 2016-04-27 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     812acf8c46ea39fdd084cc1cdb87f658cc494d74
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 10:17:13 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 10:17:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812acf8c

mail-filter/amavisd-new: Version bump to 2.11.0

Package-Manager: portage-2.2.28

 mail-filter/amavisd-new/Manifest                  |   1 +
 mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild | 178 ++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 9967179..96db3cb 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,4 +1,5 @@
 DIST amavisd-new-2.10.1.tar.xz 767716 SHA256 1d3d3f372d0888018b950ee19704c298b5d02e2c287ca2d5f1a785a078b6038f SHA512 1939cc60136fe37a078ebd6117a774bcc7ee34b68807472eb08ab15414749300925f74898131299fb051c539cc59d264003439a6307c9d0fa16971d02dab1ff9 WHIRLPOOL 81a7ed98075f9286516487b69dc011ec13a49b6aea1671aa46085c21373bd7cf8c9257999e61517fbf6f6d3f0aeade6748f4f20a31ef63a8f20df06b489a6274
+DIST amavisd-new-2.11.0.tar.xz 780548 SHA256 b41de4f0796cb344120c9792c82fc25177cbf9f51aaa5f91536cdf34aea89906 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957 WHIRLPOOL 25a9c3fcc0ac7613aea56bb969e708657db87aae6b33c85cab4758e9fe79d1ca8b73f5c321f7c7603dbd63859e87d26c038568d3a310d1dfb882a2a26d3ae877
 DIST amavisd-new-2.7.2.tar.gz 945448 SHA256 4665e0fb9a71f483f1123113a006291e37f744a5880f945ccf9fd34d51cb9275 SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 WHIRLPOOL c0422d80b9dc11a7a2e9cb10092b7c97c02536aa852f70c566ab6e2e6a865b901ad24caf626b8b02ee64979bced7c25f03888827fd47ffbc4e733bb733e08c9e
 DIST amavisd-new-2.8.1.tar.xz 731816 SHA256 6e333a70adbd24ec52202700059fbf133e20b3c3bf5ec6f4bb10f9a2f25ea82e SHA512 a840b57513b8a7b18e15085016c273ba2fba5cceb76ef52c52aa2ca34e9257be78f8bb8ea350dbdac3b26d2aba8f5aae821c1c45f2d37bc6be04ff2efb9f3ade WHIRLPOOL 0d0ce9a1e8adae101d0aace45251c02118c8f4481e67ab1af7fb32843010ac9e0b9f8ab88f0769a27c1e74e297507efe53c3a6e8ce84c616e1beeaf281027044
 DIST amavisd-new-2.9.1.tar.xz 753076 SHA256 442d6c185c19fd1d3288ee7eb2ac102a7d541c4d6e1724cdaf369df6ca629ba0 SHA512 6829a769f50498aaec4fd5c198059f828e9ba90223083e439caa9d2bd19006e0cff8ae7b1e2416009bd2514aae4428598142e86a63260b5292c15b515792a7af WHIRLPOOL 82c8630323e718b5fe9eccf38d592f6539cc56616f2eb0bea590e4d0b8ad70f30cfb2a7c13afddd1f838a26cd82cc6338199c3f9e2a402f1c67e1fe240deaed1

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild
new file mode 100644
index 0000000..d83e555
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://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 ~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/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 )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	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 amavisd-snmp
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+	fi
+
+	insinto /etc
+	insopts -m0640
+	doins amavisd.conf
+
+	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+	systemd_dounit "${FILESDIR}/amavisd.service"
+	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
+	keepdir "${AMAVIS_ROOT}"
+	keepdir "${AMAVIS_ROOT}/db"
+	keepdir "${AMAVIS_ROOT}/quarantine"
+	keepdir "${AMAVIS_ROOT}/tmp"
+	keepdir "${AMAVIS_ROOT}/var"
+
+	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
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+	fi
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+	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() {
+	chown root:amavis "${ROOT}/etc/amavisd.conf"
+	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2016-03-09 20:48 Andreas Hüttel
  0 siblings, 0 replies; 61+ messages in thread
From: Andreas Hüttel @ 2016-03-09 20:48 UTC (permalink / raw
  To: gentoo-commits

commit:     92fca51a76fa68ea3ce7c03391d6cd829db705e7
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Sun Mar  6 09:16:53 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 20:48:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92fca51a

mail-filter/amavisd-new: Fix dependency on dev-perl/Net-Server

Package-Manager: portage-2.2.27

 mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild | 4 ++--
 mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild    | 4 ++--
 mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild     | 4 ++--
 mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild  | 4 ++--
 mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
index 4d3cef2..3dcf29e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
+	>=dev-perl/Net-Server-0.91
 	virtual/perl-Digest-MD5
 	dev-perl/IO-stringy
 	virtual/perl-IO-Socket-IP

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
index a7255e2..ff5d0e8 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
+	>=dev-perl/Net-Server-0.91
 	virtual/perl-Digest-MD5
 	dev-perl/IO-stringy
 	virtual/perl-IO-Socket-IP

diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
index b65388c..1850f9d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
+	>=dev-perl/Net-Server-0.91
 	virtual/perl-Digest-MD5
 	dev-perl/IO-stringy
 	>=virtual/perl-Time-HiRes-1.49

diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
index d5cb776..8e0d06a 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,7 +45,7 @@ RDEPEND="${DEPEND}
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
+	>=dev-perl/Net-Server-0.91
 	virtual/perl-Digest-MD5
 	dev-perl/IO-stringy
 	virtual/perl-IO-Socket-IP

diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
index 860a1e3..c84f491 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
-	>=dev-perl/net-server-0.91
+	>=dev-perl/Net-Server-0.91
 	virtual/perl-Digest-MD5
 	dev-perl/IO-stringy
 	virtual/perl-IO-Socket-IP


^ permalink raw reply related	[flat|nested] 61+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/
@ 2015-10-15 19:25 Marc Schiffbauer
  0 siblings, 0 replies; 61+ messages in thread
From: Marc Schiffbauer @ 2015-10-15 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b34cd27b8ab94d1ab20b38686da7978716181003
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 19:25:14 2015 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 19:25:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34cd27b

mail-filter/amavisd-new: rebumped 2.10.1 as well (r2)

Package-Manager: portage-2.2.23

 .../{amavisd-new-2.10.1-r1.ebuild => amavisd-new-2.10.1-r2.ebuild}       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
similarity index 98%
rename from mail-filter/amavisd-new/amavisd-new-2.10.1-r1.ebuild
rename to mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
index cd552ed..4d3cef2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r2.ebuild
@@ -109,6 +109,7 @@ src_install() {
 		dosbin amavisd-snmp-subagent
 		use zmq && dosbin amavisd-snmp-subagent-zmq
 		dodoc AMAVIS-MIB.txt
+		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
 	fi
 
 	if use zmq ; then


^ permalink raw reply related	[flat|nested] 61+ messages in thread

end of thread, other threads:[~2023-12-18 20:22 UTC | newest]

Thread overview: 61+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-13 20:43 [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2023-12-18 20:22 Mike Gilbert
2023-12-14  4:13 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-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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox