Version bump wrt security bug #91426.

(Portage version: 2.0.51.21)

4 files changed, 188 insertions, 17 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index a72cd4529742..ab8eb6af7a17 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.26 2005/05/01 20:16:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.27 2005/05/04 18:44:42 ticho Exp $
+
+*amavisd-new-2.2.1-r2 (04 May 2005)
+
+  04 May 2005; Andrej Kacian <ticho@gentoo.org>
+  +amavisd-new-2.2.1-r2.ebuild:
+  Version bump on both stable (x86) version to fix security bug #91426 -
+  unsafe amavisd.conf file permissions. Reported by Romang
+  <zataz@zataz.net>.
 
 *amavisd-new-2.3.0 (01 May 2005)
 
@@ -23,15 +31,15 @@
   29 Mar 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.2.1.ebuild:
   Stable on ppc64
 
-  05 Mar 2005; Tuấn Văn <langthang@gentoo.org> amavisd-new-2.2.1.ebuild:
+  05 Mar 2005; TuẼn Văn <langthang@gentoo.org> amavisd-new-2.2.1.ebuild:
   x86 stable.
 
-  24 Jan 2005; Tuấn Văn <langthang@gentoo.org> amavisd-new-2.2.1.ebuild:
+  24 Jan 2005; TuẼn Văn <langthang@gentoo.org> amavisd-new-2.2.1.ebuild:
   tuned deps by Christian Zoffoli <xmerlin@gentoo.org>. Bug #79360.
 
 *amavisd-new-2.2.1 (19 Jan 2005)
 
-  19 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  19 Jan 2005; TuẼn Văn <langthang@gentoo.org>
   +files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch,
   +files/amavisd-new-2.2.1-qmail-lf-workaround.patch,
   +amavisd-new-2.2.1.ebuild:
@@ -42,11 +50,11 @@
 
 *amavisd-new-0.20040701 (19 Jan 2005)
 
-  19 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  19 Jan 2005; TuẼn Văn <langthang@gentoo.org>
   +amavisd-new-0.20040701.ebuild, -amavisd-new-20040701.ebuild:
   rename amavisd-new-20040701 to amavisd-new-0.20040701
 
-  19 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  19 Jan 2005; TuẼn Văn <langthang@gentoo.org>
   -files/addr_extensions_in_sql.patch, -files/lost_connection.patch,
   -files/sql_timeout.patch, -amavisd-new-20030616_p8.ebuild,
   -amavisd-new-20030616_p9.ebuild:
@@ -69,7 +77,7 @@
   apply courier patch. Bug #52291.
   stable on x86 in preparing to abandon date versioning scheme.
 
-  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
   amavisd-new-20040701.ebuild:
   Keyword ~alpha, bug 66068.
 
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 0c3720468542..3eb3c760797b 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 2fbc3f2a9b10ea75d8dcd2b5198372bb amavisd-new-2.2.1-r2.ebuild 4717
 MD5 fa9fe96102c9e99f6e93807307c5afa7 amavisd-new-2.3.0.ebuild 4706
 MD5 0d78e40f5c429dce29343001eca9444a amavisd-new-2.2.1-r1.ebuild 4813
 MD5 48eb7b9587a955fbb233da0ecb0739c4 ChangeLog 8627
@@ -12,11 +10,5 @@ MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround
 MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1 69
 MD5 20d1361125dc21db61b44dec3a13dea2 files/digest-amavisd-new-2.3.0 69
 MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r1 69
+MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r2 69
 MD5 13504b8528cc13c668935ff82a0680f1 files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch 6687
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCdTksQlM6RnzZP+IRAoFyAKDGFsax8Z7qhuwgE44NYJ9o4BnxTgCfRdVG
-PUK7JQCNFQTfxvtcwOyZny4=
-=lsPG
------END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..f8566b2b1f18
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2005 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.2.1-r2.ebuild,v 1.1 2005/05/04 18:44:42 ticho 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="x86 ~ppc amd64 ~sparc ~alpha ppc64"
+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
+	dev-perl/Convert-TNEF
+	>=dev-perl/Convert-UUlib-1.051
+	dev-perl/MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	dev-perl/net-server
+	>=dev-perl/libnet-1.16
+	dev-perl/Digest-MD5
+	dev-perl/IO-stringy
+	>=dev-perl/Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	>=sys-libs/db-3.1
+	dev-perl/BerkeleyDB
+	virtual/mta
+	virtual/antivirus
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	milter? ( >=mail-mta/sendmail-8.12 )"
+
+AMAVIS_ROOT=/var/amavis
+
+src_unpack() {
+	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 mail-mta/qmail) || $(has_version mail-mta/qmail-ldap) ; then
+		einfo "Patching with qmail qmqp support."
+		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
+
+		einfo "Patching with qmail lf bug workaround."
+		epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
+	fi
+
+	epatch "${FILESDIR}/${P}-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() {
+	enewgroup amavis
+	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+
+	dosbin amavisd amavisd-agent amavisd-nanny
+
+	insinto /etc
+	insopts -m0600
+	newins amavisd.conf-sample amavisd.conf
+	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
+		/etc/amavisd.conf
+	if [ "$(domainname)" = "(none)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
+			/etc/amavisd.conf
+	fi
+	if ! $(has_version mail-filter/spamassassin) ; then
+		einfo "Disabling anti-spam code in amavisd.conf..."
+
+		dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \
+			/etc/amavisd.conf
+	fi
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/amavisd.rc6" amavisd
+	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd
+
+	keepdir ${AMAVIS_ROOT}
+	fowners amavis:amavis ${AMAVIS_ROOT}
+	fperms 0750 ${AMAVIS_ROOT}
+
+	keepdir ${AMAVIS_ROOT}/db
+	fowners amavis:amavis ${AMAVIS_ROOT}/db
+
+	keepdir ${AMAVIS_ROOT}/quarantine
+	fowners amavis:amavis ${AMAVIS_ROOT}/quarantine
+
+	keepdir ${AMAVIS_ROOT}/tmp
+	fowners amavis:amavis ${AMAVIS_ROOT}/tmp
+	for i in whitelist blacklist spam_lovers; do
+		touch ${D}${AMAVIS_ROOT}/${i}
+		fowners amavis:amavis ${AMAVIS_ROOT}/${i}
+	done
+
+	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
+}
+
+pkg_postinst() {
+	if $(has_version mail-filter/razor) ; then
+		einfo "Setting up initial razor config files..."
+
+		razor-admin -create -home=${ROOT}${AMAVIS_ROOT}/.razor
+		sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+			${ROOT}${AMAVIS_ROOT}/.razor/razor-agent.conf
+		chown -R amavis:amavis ${ROOT}${AMAVIS_ROOT}/.razor
+	fi
+
+	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_virus_checks_maps = (1); in /etc/amavisd.conf."
+	fi
+}
diff --git a/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1-r2 b/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1-r2
new file mode 100644
index 000000000000..ad1a1abda341
--- /dev/null
+++ b/mail-filter/amavisd-new/files/digest-amavisd-new-2.2.1-r2
@@ -0,0 +1 @@
+MD5 567b6df37a2f049fe23c176e6fd1472f amavisd-new-2.2.1.tar.gz 741461