Version bump, fixes #258589 and #255077

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 336 insertions, 2 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 133f8fcbd7e0..13b6810d7306 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.135 2009/03/07 14:06:47 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.136 2009/05/04 17:21:39 dertobi123 Exp $
+
+*amavisd-new-2.6.3 (04 May 2009)
+
+  04 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch,
+  +files/amavisd-new-2.6.3-dkimconf.patch, +amavisd-new-2.6.3.ebuild:
+  Version bump, fixes #258589 and #255077
 
   07 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> files/amavisd.rc6:
   Fix init.d for openrc. Bug 259086. Thanks to Ian Pickworth
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index ad18ceb905cf..d3df4eafd0b3 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,7 +1,11 @@
 AUX amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878 RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 SHA1 18a44d7cf4e155206b26582abf4e3b92682275ea SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3
+AUX amavisd-new-2.6.3-amavisd.conf-gentoo.patch 4882 RMD160 0d6b26e68128f021fb6869e4a1804dd60c9dae28 SHA1 0127b60d376fffacafcc20db1a82e9be2114ae77 SHA256 f928336035c432e1358fef2a494ae3727b789f4eb8847ca8c7ac816c622a184e
+AUX amavisd-new-2.6.3-dkimconf.patch 735 RMD160 778aad1195caf735eb44ff2c4e9147e88b68881d SHA1 3ff44615cb9b161da069055eb4fc79f6b24fd70c SHA256 1d0489bfd14d794617c12ec797404373a632b2c26e381d9e09c364cbfa2ae248
 AUX amavisd-new-dkimconf.patch 735 RMD160 721bc3fdaf15c2838092825e0b88c781841184b0 SHA1 7b57c4c80a92c3d764f9d338dac6146cd37e3080 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8
 AUX amavisd.rc6 371 RMD160 d32a99dd9a229a133741501ec443509e22c6867a SHA1 f353cd12004bff30ac2361df2a2784f697b0cb8d SHA256 f2010650d3ef408359f41e3a84173c2b27300e9d6d2e4f7558ef39858e01da9d
 DIST amavisd-new-2.6.1.tar.gz 911740 RMD160 c9e248540bfaf9cc6ab967776bd98e164b636db8 SHA1 51e3e3d9c2aaa33f6a41a84092c82adb94e2a806 SHA256 4c98786e4b694459f6bac42413cd34b7d0165763b908b3234d5407126fb3b13d
+DIST amavisd-new-2.6.3.tar.gz 918888 RMD160 911e356dbc2a900734c5c87bdd231846abe4f9e8 SHA1 12a120b4fc614a0b3269cb0ec0ee185cb3e7c13f SHA256 47e774579fdab1e1c10ef2295d49cb511b13e05431a7955c73f07e98025d788e
 EBUILD amavisd-new-2.6.1-r1.ebuild 5432 RMD160 77ed20df18eefb893912d58b551286c25d5893fd SHA1 8336dab1bc31328c4da5ffc58f96a2f3405bd649 SHA256 f2b06ef3105e1d65614cfdd41153f7cfd431fb3d57c83d539fd9a414c13c995b
-MISC ChangeLog 28052 RMD160 9ce490ff88091a455dfc4dcfd2ba8b00e9e23317 SHA1 454e69246849b771996164287abbf6b94ea6312c SHA256 e4ff0fa7e9373d4bf7fb4bb6adba006b00a4e3d9ed1e00de248caa76a85c76f0
+EBUILD amavisd-new-2.6.3.ebuild 5430 RMD160 b8be86a3e304e39616ed063ad16c53f6d1afecc3 SHA1 e287c12a3fda58ac34d42ec385cb0ba3e9071e88 SHA256 7f7ba69caf6950542d1bc4743ca78097c8bbbc7ee7fea6ac30f03b9877635bde
+MISC ChangeLog 28311 RMD160 91ddb6e50808a1bafe1925d24b009f13084b3a6e SHA1 e844e2d7c44edcb43bc06238560c83951c850844 SHA256 a6d76f5541234463d992a6fba0f7aca06806e11bbe3a9d2cd92ba19416e3fe68
 MISC metadata.xml 624 RMD160 1b4f583fff7c7aabde0e8696eaac0e297604a208 SHA1 628528ee48c3c366c8c2b5536991735c6d0e0e12 SHA256 4bda1a166dafc8df735495e0d66e1d8fded9fddc9d0366c423614593a9be84dc
diff --git a/mail-filter/amavisd-new/amavisd-new-2.6.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.6.3.ebuild
new file mode 100644
index 000000000000..c83fd0603712
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.6.3.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2009 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.6.3.ebuild,v 1.1 2009/05/04 17:21:39 dertobi123 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="courier dkim ldap milter mysql postgres qmail razor spamassassin"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.8.2
+	milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )"
+
+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/rar )
+	app-arch/zoo
+	>=dev-perl/Archive-Zip-1.14
+	>=virtual/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-Digest-MD5
+	dev-perl/IO-stringy
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	>=sys-libs/db-3.2
+	dev-perl/BerkeleyDB
+	virtual/mta
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	dkim? ( >=dev-perl/Mail-DKIM-0.31 )
+	razor? ( mail-filter/razor )
+	spamassassin? ( mail-filter/spamassassin )"
+
+AMAVIS_ROOT="/var/amavis"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use courier ; then
+		epatch amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		epatch amavisd-new-qmqpqq.patch
+	fi
+
+	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch"
+
+	if ! use dkim ; then
+		epatch "${FILESDIR}/${P}-dkimconf.patch"
+	fi
+}
+
+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
+
+	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
+
+	newdoc test-messages/README README.samples
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \
+		test-messages/sample* amavisd.conf-default amavisd-agent \
+		amavisd-custom.conf
+
+	dodir /usr/share/doc/${PF}/html
+	insinto /usr/share/doc/${PF}/html
+	doins README_FILES/*.{html,css}
+	dodir /usr/share/doc/${PF}/html/images
+	insinto /usr/share/doc/${PF}/html/images
+	doins README_FILES/images/*
+
+	if use milter ; then
+		cd "${S}/helper-progs"
+		einstall
+		cd "${S}"
+	fi
+
+	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
+		elog "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
+
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+}
+
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+
+	if [ -z "$(dnsdomainname)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
+			/etc/amavisd.conf
+	fi
+
+	if use razor ; then
+		if [ ! -d ${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
+		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
+}
+
+pkg_postinst() {
+	if ! use spamassassin ; then
+		echo
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@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/amavisd-new-2.6.3-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch
new file mode 100644
index 000000000000..37ea8cad655f
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-amavisd.conf-gentoo.patch
@@ -0,0 +1,115 @@
+--- amavisd.conf-sample.orig	2009-04-22 02:23:58.000000000 +0200
++++ amavisd.conf-sample	2009-05-04 19:13:20.000000000 +0200
+@@ -74,14 +74,14 @@
+ 
+ # Set the user and group to which the daemon will change if started as root
+ # (otherwise just keeps the UID unchanged, and these settings have no effect):
+-$daemon_user  = 'vscan';   # (no default;  customary: vscan or amavis), -u
+-$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis), -g
++$daemon_user  = 'amavis';   # (no default;  customary: vscan or amavis), -u
++$daemon_group = 'amavis';   # (no default;  customary: vscan or amavis), -g
+ 
+ # Runtime working directory (cwd), and a place where
+ # temporary directories for unpacking mail are created.
+ # (no trailing slash, may be a scratch file system)
+-$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is), -T
+-#$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
++#$TEMPBASE = $MYHOME;	        # (must be set if other config vars use is), -T
++$TEMPBASE = "$MYHOME/tmp";     # prefer to keep home dir /var/amavis clean?
+ 
+ #$db_home = "$MYHOME/db";    # DB databases directory, default "$MYHOME/db", -D
+ 
+@@ -500,22 +500,43 @@
+ # default setting of an associative array %final_destiny_by_ccat which is
+ # backwards compatible and contains references to these traditional variables:
+ #
+-$final_virus_destiny      = D_DISCARD; # (defaults to D_DISCARD)
+-$final_banned_destiny     = D_BOUNCE;  # (defaults to D_BOUNCE)
+-$final_spam_destiny       = D_BOUNCE;  # (defaults to D_BOUNCE)
+-$final_bad_header_destiny = D_PASS;    # (defaults to D_PASS)
++#$final_virus_destiny      = D_DISCARD; # (defaults to D_DISCARD)
++#$final_banned_destiny     = D_BOUNCE;  # (defaults to D_BOUNCE)
++#$final_spam_destiny       = D_BOUNCE;  # (defaults to D_BOUNCE)
++#$final_bad_header_destiny = D_PASS;    # (defaults to D_PASS)
++
++########
++#
++# Please think about what you are doing when you set these options.
++# If necessary, question your origanization's e-mail policies:
++#
++# D_BOUNCE contributes to the overall spread of virii and spam on the
++# internet. Both the envelope and header from addresses can be forged
++# accurately with no effort, causing the bounces to go to innocent parties,
++# whose addresses have been forged.
++# 
++# D_DISCARD breaks internet mail specifications. However, with a
++# properly implemented Quaratine system, the concern for breaking the
++# specification is addressed to some extent.
++#
++# D_PASS is the safest way to handle e-mails. You must implement
++# client-side filtering to handle this method.
++#
++# -Cory Visi <merlin@gentoo.org> 07/28/04
++#
++#######
+ 
+ # to explicitly list all (or most) possible contents category (ccat) keys:
+-#%final_destiny_by_ccat = (
+-#  CC_VIRUS,      D_DISCARD,
+-#  CC_BANNED,     D_BOUNCE,
+-#  CC_UNCHECKED,  D_PASS,
+-#  CC_SPAM,       D_BOUNCE,
+-#  CC_BADH,       D_PASS,
+-#  CC_OVERSIZED,  D_BOUNCE,
+-#  CC_CLEAN,      D_PASS,
+-#  CC_CATCHALL,   D_PASS,
+-#);
++%final_destiny_by_ccat = (
++  CC_VIRUS,      D_DISCARD,
++  CC_BANNED,     D_BOUNCE,
++  CC_UNCHECKED,  D_PASS,
++  CC_SPAM,       D_DISCARD,
++  CC_BADH,       D_PASS,
++  CC_OVERSIZED,  D_BOUNCE,
++  CC_CLEAN,      D_PASS,
++  CC_CATCHALL,   D_PASS,
++);
+ 
+ # to rely on a catchall ccat key and only list exceptions (alternative 1):
+ #%final_destiny_by_ccat = (
+@@ -694,7 +715,7 @@
+ #   or a directory (no trailing slash)
+ #   (the default value is undef, meaning no quarantine)
+ #
+-$QUARANTINEDIR = '/var/virusmails';  # -Q
++$QUARANTINEDIR = "$MYHOME/quarantine";
+ 
+ #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
+ 
+@@ -1674,7 +1695,7 @@
+ # NOTE: if $daemon_chroot_dir is nonempty, the directories will be
+ #       relative to the chroot directory specified;
+ 
+-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
++$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin:/opt/bin';
+ 
+ # For external programs specify one string or a search list of strings (first
+ # match wins). The string (or: each string in a list) may be an absolute path,
+@@ -2188,7 +2209,7 @@
+ 
+   ### http://www.nai.com/
+   ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
+-    '--secure -rv --mime --summary --noboot - {}', [0], [13],
++    '--secure -rv --mime --summary --noboot --mailbox --program --timeout 180 - {}', [0], [13],
+     qr/(?x) Found (?:
+         \ the\ (.+)\ (?:virus|trojan)  |
+         \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
+@@ -2333,7 +2354,7 @@
+ 
+   ### http://www.f-prot.com/   - backs up F-Prot Daemon (old)
+   ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
+-    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
++	'-dumb -ai -archive -packed -server {}', [0,8], [3,6],   # or: [0], [3,6,8],
+     qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/m ],
+ 
+   ### http://www.trendmicro.com/   - backs up Trophie
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.6.3-dkimconf.patch b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-dkimconf.patch
new file mode 100644
index 000000000000..da8664d03d9d
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.6.3-dkimconf.patch
@@ -0,0 +1,13 @@
+--- amavisd.conf-sample.orig	2009-05-04 19:14:20.000000000 +0200
++++ amavisd.conf-sample	2009-05-04 19:14:57.000000000 +0200
+@@ -102,8 +102,8 @@
+ $enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
+ $enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
+ 
+-$enable_dkim_verification = 1;  # enable DKIM signatures verification
+-$enable_dkim_signing = 1;    # load DKIM signing code, keys defined by dkim_key
++$enable_dkim_verification = 0;  # enable DKIM signatures verification
++$enable_dkim_signing = 0;    # load DKIM signing code, keys defined by dkim_key
+ 
+ # MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
+ # both $forward_method and $notify_method default to 'smtp:[127.0.0.1]:10025'