From 06f2bf359fe8b4bf3880598c5c9dffee14dc635c Mon Sep 17 00:00:00 2001
From: Patrick McLean <chutzpah@gentoo.org>
Date: Wed, 31 Jan 2007 15:47:27 +0000
Subject: [PATCH] Version bump, add ewarn about p0f-analyzer.pl only listening
 on lo rather than all interfaces. Package-Manager: portage-2.1.2-r5

---
 mail-filter/amavisd-new/ChangeLog             |   9 +-
 mail-filter/amavisd-new/Manifest              |  26 ++-
 .../amavisd-new/amavisd-new-2.4.5.ebuild      | 183 ++++++++++++++++++
 .../files/digest-amavisd-new-2.4.5            |   3 +
 4 files changed, 206 insertions(+), 15 deletions(-)
 create mode 100644 mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild
 create mode 100644 mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index c96d4f8d8379..9e2878362e26 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.101 2007/01/30 00:18:32 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.102 2007/01/31 15:47:27 chutzpah Exp $
+
+*amavisd-new-2.4.5 (31 Jan 2007)
+
+  31 Jan 2007; Patrick McLean <chutzpah@gentoo.org>
+  +amavisd-new-2.4.5.ebuild:
+  Version bump, add ewarn about p0f-analyzer.pl only listening on lo rather
+  than all interfaces.
 
   30 Jan 2007; Andrej Kacian <ticho@gentoo.org>
   +files/amavisd-new-2.4.4-qmail-lf-workaround.patch,
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 88866c1ab8e3..e81414f54107 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX amavisd-new-2.2.1-qmail-lf-workaround.patch 688 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 SHA1 5ab50c58bd125d545dd6a2081c3b4bc2892af7a2 SHA256 5e32e1fbcf172ce108ba1b494722894719ea31ed90d55610bffdb241246cfb57
 MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
 RMD160 45092cfb4180d5cac8abc38068105b619945dfe6 files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
@@ -42,6 +39,7 @@ DIST amavisd-new-2.4.1.tar.gz 841988 RMD160 edd91dde774838345159064ef6012f7927d5
 DIST amavisd-new-2.4.2.tar.gz 854326 RMD160 fd82a0f3a1166d7f70846651b7b91af147b3fb70 SHA1 48893e23b03bb4ef493473b0f066e4f4d65ff1b7 SHA256 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a
 DIST amavisd-new-2.4.3.tar.gz 876615 RMD160 9301d2ea30bd6a620d827384facc5a1bbace86db SHA1 d3b8b1a3c1707b120e9230821ba4ede449eed646 SHA256 ff71af590a0dc62bda558a037daceaea3b776d1ef7d0689ab0bfb582d436cf15
 DIST amavisd-new-2.4.4.tar.gz 887625 RMD160 3d6ac62f57b68440a7ca3766ff374f4763db6bbf SHA1 20943dd3787c33a1f39c9e486bc00e8f670e3f7e SHA256 b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889
+DIST amavisd-new-2.4.5.tar.gz 895870 RMD160 3167b7660c84e33b59b87f8b437814c074c0e89c SHA1 2a99083b72d08cad7bf6fa6cc2eb8bd55e44f22b SHA256 cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53
 EBUILD amavisd-new-2.3.3-r2.ebuild 5208 RMD160 58617a2670759a0e388f9bdc9bbb2911f1b8f648 SHA1 a7cd71f57ef0709f1b075e14379bdedd19327d93 SHA256 28cfcbc2ec5ee1192e23d63eefe9cea3443387a30471d5fc726f7face92609dc
 MD5 53c6dfa51a7d90c7b526160504cdb57e amavisd-new-2.3.3-r2.ebuild 5208
 RMD160 58617a2670759a0e388f9bdc9bbb2911f1b8f648 amavisd-new-2.3.3-r2.ebuild 5208
@@ -66,10 +64,14 @@ EBUILD amavisd-new-2.4.4.ebuild 5126 RMD160 b416940c18022922b0aa8cb8abc0220a7386
 MD5 f02e837530cb41c6d56ee328915709ec amavisd-new-2.4.4.ebuild 5126
 RMD160 b416940c18022922b0aa8cb8abc0220a7386041c amavisd-new-2.4.4.ebuild 5126
 SHA256 6363632a0254213678b973d374676713c5141403cc35a14e2144d96cb5392798 amavisd-new-2.4.4.ebuild 5126
-MISC ChangeLog 21130 RMD160 7c6e4a94136910c0b391b3dc3374ccacfe01bba7 SHA1 0da085527d8598b32e2a45a3c6666b91e2b7e1d0 SHA256 0454f65e89ce45e9f4692ebcd8bec159e1a29a7ba151d886c86329f5ad7979db
-MD5 9710bfa129987d60404132beccce3eda ChangeLog 21130
-RMD160 7c6e4a94136910c0b391b3dc3374ccacfe01bba7 ChangeLog 21130
-SHA256 0454f65e89ce45e9f4692ebcd8bec159e1a29a7ba151d886c86329f5ad7979db ChangeLog 21130
+EBUILD amavisd-new-2.4.5.ebuild 5471 RMD160 27a2da2615bfdcaeba6f56a690047b1c42f3ec0a SHA1 48a42c70d1b7a0dcc8fb204991b16e666452ee64 SHA256 4161780cefdbc1ee395cdd641a1be7e9456923614fd83c2605af60ed01cf1928
+MD5 2b6274867e44e7413e9ddb43343c7ea4 amavisd-new-2.4.5.ebuild 5471
+RMD160 27a2da2615bfdcaeba6f56a690047b1c42f3ec0a amavisd-new-2.4.5.ebuild 5471
+SHA256 4161780cefdbc1ee395cdd641a1be7e9456923614fd83c2605af60ed01cf1928 amavisd-new-2.4.5.ebuild 5471
+MISC ChangeLog 21348 RMD160 74429ebf300194699e31f54bb493e170be05874d SHA1 125d097a958839440b5a159f2dcb4d0697aa5ac4 SHA256 f3f12590af0160f6400ec8b43e7c1701ebda82e7eb99af1982ee88980207e0c4
+MD5 75cb7628b4ef82a783ef4ca44973d212 ChangeLog 21348
+RMD160 74429ebf300194699e31f54bb493e170be05874d ChangeLog 21348
+SHA256 f3f12590af0160f6400ec8b43e7c1701ebda82e7eb99af1982ee88980207e0c4 ChangeLog 21348
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -92,10 +94,6 @@ SHA256 071e7e9667b41342dc744663935b714e0858ec0091901e993eaac59dc9822027 files/di
 MD5 83635931b292ec0088abfc75e7e2b8e1 files/digest-amavisd-new-2.4.4 253
 RMD160 baf26470a8658bfbe0780197dd2e93a378ef1827 files/digest-amavisd-new-2.4.4 253
 SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/digest-amavisd-new-2.4.4 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFvo7lQlM6RnzZP+IRAhEQAJ0UWOz8xCg/Yu2xxB7LZTfcHsKmhACfQ9Rb
-wmg+n6HfkntDulEQBCX1AU8=
-=HKWe
------END PGP SIGNATURE-----
+MD5 8a753a8cbf16255eed1625def44bdfa5 files/digest-amavisd-new-2.4.5 253
+RMD160 e972ad004ce2186c1dde42911606a16645c1df95 files/digest-amavisd-new-2.4.5 253
+SHA256 c53492eedc474159bc50f0ee9f20bd171ad2f0b460f564203bdbaaceeec00ca6 files/digest-amavisd-new-2.4.5 253
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild
new file mode 100644
index 000000000000..816a2bcf34e4
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild,v 1.1 2007/01/31 15:47:27 chutzpah Exp $
+
+inherit eutils
+
+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/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap mysql postgres milter"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/freeze
+	app-arch/lha
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/zoo
+	dev-perl/Archive-Tar
+	>=dev-perl/Archive-Zip-1.14
+	>=dev-perl/Compress-Zlib-1.35
+	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-libnet-1.16
+	dev-perl/IO-stringy
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	>=sys-libs/db-3.1
+	dev-perl/BerkeleyDB
+	virtual/mta
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"
+
+AMAVIS_ROOT="/var/amavis"
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
+src_unpack() {
+	if $(has_version "<mail-filter/spamassassin-3") ; then
+		echo
+		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
+		ewarn "         Consider upgrading your SpamAssassin installation."
+		ebeep 3
+		epause
+	fi
+	unpack ${A}
+	cd ${S}
+	if $(has_version mail-mta/courier) ; then
+		einfo "Patching with courier support."
+		epatch "amavisd-new-courier.patch" || die "patch failed"
+	fi
+
+	if $(has_version virtual/qmail) ; then
+		einfo "Patching with qmail qmqp support."
+		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
+
+		einfo "Patching with qmail lf bug workaround."
+		epatch "${FILESDIR}/${PN}-2.4.4-qmail-lf-workaround.patch" || die "patch failed"
+	fi
+		einfo "Patching with qmail lf bug workaround."
+		epatch "${FILESDIR}/${PN}-2.4.4-qmail-lf-workaround.patch" || die "patch failed"
+
+	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch" || die "patch failed"
+}
+
+src_compile() {
+	if use milter ; then
+		cd "${S}/helper-progs"
+
+		econf --with-runtime-dir=${AMAVIS_ROOT} \
+			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
+			--with-user=amavis || die "helper-progs econf failed"
+		emake || die "helper-progs compile problem"
+
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
+
+	dobin p0f-analyzer.pl
+
+	insinto /etc
+	insopts -m0640
+	newins amavisd.conf-sample amavisd.conf
+	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
+		/etc/amavisd.conf
+	if [ "$(dnsdomainname)" = "(none)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
+			/etc/amavisd.conf
+	fi
+
+	newinitd "${FILESDIR}/amavisd.rc6" amavisd
+	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
+
+	keepdir ${AMAVIS_ROOT}
+	keepdir ${AMAVIS_ROOT}/db
+	keepdir ${AMAVIS_ROOT}/quarantine
+	keepdir ${AMAVIS_ROOT}/tmp
+
+	if $(has_version net-nds/openldap ) ; then
+		einfo "Adding ${P} schema to openldap schema dir."
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		insopts -o root -g root -m 644
+		newins LDAP.schema ${PN}.schema || die
+		newins LDAP.schema ${PN}.schema.default || die
+	fi
+
+	newdoc test-messages/README README.samples
+	dodoc AAAREADME.first INSTALL LICENSE MANIFEST RELEASE_NOTES \
+		README_FILES/* test-messages/sample* amavisd.conf-default amavisd-agent
+
+	if use milter ; then
+		cd "${S}/helper-progs"
+		einstall
+	fi
+
+	for i in whitelist blacklist spam_lovers; do
+		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
+			touch ${D}/${AMAVIS_ROOT}/${i}
+		fi
+	done
+
+	if $(has_version mail-filter/razor) ; then
+		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
+			einfo "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
+
+	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+}
+
+pkg_postinst() {
+	if ! $(has_version mail-filter/spamassassin) ; then
+		echo
+		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
+		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
+		einfo "and comment out the line containing: "
+		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+	fi
+	echo
+	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"
+	ewarn "by default instead of to all interfaces. You will need to change $bind_addr"
+	ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different"
+	ewarn "host from amavisd or from other querying clients."
+	echo
+	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
+	echo
+	chmod o-rwx /etc/amavisd.conf
+	chown root:amavis /etc/amavisd.conf
+	chown -R amavis:amavis ${AMAVIS_ROOT}
+}
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5
new file mode 100644
index 000000000000..fa3876ba3d69
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.4.5
@@ -0,0 +1,3 @@
+MD5 eef8c03855f9e3a4c6c53c06006d77ea amavisd-new-2.4.5.tar.gz 895870
+RMD160 3167b7660c84e33b59b87f8b437814c074c0e89c amavisd-new-2.4.5.tar.gz 895870
+SHA256 cfd9150878ebaf51b021935ebc19f57be1a39f55194ef5e82f589cf80823ac53 amavisd-new-2.4.5.tar.gz 895870
-- 
2.26.2