Quick revbump to fix a (now, starting with 2010) wrong regexp in FH_DATE_PAST_20XX (#299256).

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

4 files changed, 284 insertions, 3 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 8d1c8d43a794..bbcb977b5502 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/spamassassin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.162 2009/10/27 07:22:18 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.163 2010/01/01 22:24:31 dertobi123 Exp $
+
+*spamassassin-3.2.1-r2 (01 Jan 2010)
+
+  01 Jan 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/FH_DATE_PAST_20XX.patch, +spamassassin-3.2.1-r2.ebuild:
+  Quick revbump to fix a (now, starting with 2010) wrong regexp in
+  FH_DATE_PAST_20XX (#299256).
 
 *spamassassin-3.2.5-r1 (27 Oct 2009)
 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 62f84d668081..b094c652c989 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -3,6 +3,7 @@ AUX 3.0.0-spamd.init 891 RMD160 d8f80c02238e22704cd588f0fee5d198f787df38 SHA1 2e
 AUX 3.1.8-archive-iterator.patch 501 RMD160 6eb7ef7c73d8f207d04e5cffe59e8d924d13c06e SHA1 0b3fbbeb778daffa72094a68d91a48073438ef0a SHA256 244fa7e6af21998f7ba1d7632c618b50924401effb84db79070b9c7c24e41215
 AUX 3.2.2-upstream-5574-fix.patch 1271 RMD160 4b8a47313b220701f2fb74d4c2c8f552f90a9c82 SHA1 6a1a42770f30eeef76d29fa38e5f19817b68b827 SHA256 ac262a3950e0d6c00619488d14be34859e774ff3b7b3bd6cf97ce556c36f660d
 AUX 3.2.2-upstream-5574-testcase.patch 1611 RMD160 e94baa4f60c825777744ffcd58fdcda2951721f6 SHA1 1a4e7947bb46d2e475d9db33e682136295075c91 SHA256 9d5439c465418c89c10bd10b0802c80f73332fc47d5ce7df3e506696f6cb559e
+AUX FH_DATE_PAST_20XX.patch 416 RMD160 85ccd5fce6faa70ceb16bbdc98cf0c710dd15847 SHA1 c97166533adcfe5c75cd6df9ae07632ea98e7306 SHA256 682668c68d0765cddda23f731c2d83a4da0852c38557a1406e4e74b18f5100c3
 AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
 AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342ba5569c8c SHA1 045a446362b8b0491164a53cff18391c49fe6786 SHA256 f73e3d63b7fd79c364799cd1e3525369ac483019e55c079f33529b6ce81c9264
 DIST Mail-SpamAssassin-3.1.8.tar.bz2 1003128 RMD160 90a9cc31795493c194932141d88daa7cc4d7386c SHA1 0d092c4de6e6df66f1d0fb0ca8589147ee4096cb SHA256 ff6ad3d06719859e7bb47bbfd360750bf561bf3bfb6c8443064e73eb05dcb2ea
@@ -17,11 +18,12 @@ EBUILD spamassassin-3.1.8.ebuild 7939 RMD160 7d44c9a36ef1496a45587d215c844b75b41
 EBUILD spamassassin-3.2.0-r1.ebuild 7954 RMD160 6ab5793e3b37217fd3a0045abdbdee39475d042e SHA1 885dd3ae170c4044b8c2317c37ab2cec20b88a88 SHA256 b90168f57d48d0f4dd00daa0dfee27e1de494f9547b9d02e304215dbed98d428
 EBUILD spamassassin-3.2.0.ebuild 7940 RMD160 74b758e766eb5727fb068212c4a4ffc2a4b4d20f SHA1 5fa75ad40d42646f62ba7510b7cb252a120b9ef2 SHA256 4b39ac7d3514e2fa218d179e803d5f7977e20cdc8d7f989b2c6304406a530e0a
 EBUILD spamassassin-3.2.1-r1.ebuild 7963 RMD160 e3078fdc008a51d559f94d733a54915dfa55eb50 SHA1 1ba5dfc4ce3486004cc4b63e806e1b1881c8a204 SHA256 e80856d7173ec980278e607c01f16296709bbc1c11ec6c7d97342528dc1cdc9b
+EBUILD spamassassin-3.2.1-r2.ebuild 8061 RMD160 475c63cb0a59f4f4282f24f5193b3e8e5e1bb4ed SHA1 cd0b18d08a1705faf2260eb9f36d356f6140269e SHA256 c5095147a3af34e6fae4a8b50c805da3eda63326491b25b5c4036216cb3582da
 EBUILD spamassassin-3.2.1.ebuild 7916 RMD160 56dbb2b0cf22c15395b39d83b0a219c22cef002f SHA1 aee39a96b89ca2d9011551f460556316402789d6 SHA256 2beb389f58e15dc107437424b4e47874f7aa48ff5cc1625833023ea9dcb1373f
 EBUILD spamassassin-3.2.2.ebuild 8168 RMD160 23d6405016bcff93aa809339e169af5cd7e72ccd SHA1 8aad3b988d093b5c5dee753d1ccd9fd4aa6afedd SHA256 c8a7e9cad43df234de2fe383ef522992f7af328f988a05c3f9c0d1bb4f988ae0
 EBUILD spamassassin-3.2.3.ebuild 7997 RMD160 5aada8f3c4070001165447cc6175ef83cc4af110 SHA1 28e825fa40b8427fa3a8f65d0a7d1eadeda06c59 SHA256 789464cbcaed25be17aaf54b2f0fd4579a517e61f303a72e7da9047ad410e8a9
 EBUILD spamassassin-3.2.4.ebuild 7997 RMD160 dd825387ee0ba720ddc32886901451422c17031d SHA1 9750c67ff839b2b8de79475bb576242a4dfd79a0 SHA256 08de1dd68d1491de86a7f760612f9854c06a280b8f8e9df137815bd468cb418d
 EBUILD spamassassin-3.2.5-r1.ebuild 8034 RMD160 5a2dae1564c43f17963f6f32f66ef6f7b4f0ba67 SHA1 d3acc5eab188eeff14b5ce1b6b394372fe62955d SHA256 1533b2792e1587360a8e6acc8d026191eeaca6f6b66f257f611b43fa377e48ad
 EBUILD spamassassin-3.2.5.ebuild 8008 RMD160 0b625d821ed735c6accb57077252989f2f26f279 SHA1 3bf3b736a723407bda10bab847bea72b823e52d4 SHA256 6fc719e87f9e6628e32adbf7f4ce8030088c630ea161bd684ae0b5e2da5e3636
-MISC ChangeLog 34329 RMD160 1cf4a38f105da4963661fed54ffc12f8ff9691f2 SHA1 fab93c51ac6b21ce42cbfcdee6d44438e111659f SHA256 6e87f33780bd063575ec00979c72a2c0551be1e635ce97de3d85b440d055b8b2
+MISC ChangeLog 34589 RMD160 c7d3b187d4ce746689569b3c9a4230f1a7fd306b SHA1 843dfe5387b072a467e75bdbef1a5f04a2afbf88 SHA256 36a4685411ee762bc88eeff53babe2704d70af7279298a114e1d026d43cfde9f
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/files/FH_DATE_PAST_20XX.patch b/mail-filter/spamassassin/files/FH_DATE_PAST_20XX.patch
new file mode 100644
index 000000000000..e7b2aa097c66
--- /dev/null
+++ b/mail-filter/spamassassin/files/FH_DATE_PAST_20XX.patch
@@ -0,0 +1,11 @@
+--- rules/72_active.cf.orig	2010-01-01 23:09:53.794608796 +0100
++++ rules/72_active.cf	2010-01-01 23:12:14.622599894 +0100
+@@ -562,7 +562,7 @@
+ ##} FH_DATE_IS_19XX
+ 
+ ##{ FH_DATE_PAST_20XX
+-header   FH_DATE_PAST_20XX	Date =~ /20[1-9][0-9]/ [if-unset: 2006]

++header   FH_DATE_PAST_20XX	Date =~ /20[2-9][0-9]/ [if-unset: 2006]

+ describe FH_DATE_PAST_20XX	The date is grossly in the future.

+ ##} FH_DATE_PAST_20XX
+ 
diff --git a/mail-filter/spamassassin/spamassassin-3.2.1-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..d94db29d95d2
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.2.1-r2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.2.1-r2.ebuild,v 1.1 2010/01/01 22:24:31 dertobi123 Exp $
+
+inherit perl-module eutils
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
+HOMEPAGE="http://spamassassin.apache.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+#SRC_TEST="do"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
+
+DEPEND=">=dev-lang/perl-5.8.2-r1
+	virtual/perl-MIME-Base64
+	>=virtual/perl-PodParser-1.32
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+	>=dev-perl/HTML-Parser-3.43
+	>=dev-perl/Net-DNS-0.53
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	>=virtual/perl-Archive-Tar-1.26
+	app-crypt/gnupg
+	>=virtual/perl-IO-Zlib-1.04
+	>=dev-util/re2c-0.12.0
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-libs/openssl
+	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+
+	ipv6? (
+		dev-perl/IO-Socket-INET6
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/FH_DATE_PAST_20XX.patch"
+}
+
+src_compile() {
+	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	#   (just to be sure, nobody knows how it could happen in the first place).
+	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
+
+	# If ssl is enabled, spamc can be built with ssl support
+	if use ssl; then
+		myconf="${myconf} ENABLE_SSL=yes"
+	else
+		myconf="${myconf} ENABLE_SSL=no"
+	fi
+
+	# Set the path to the Perl executable explictly.  This will be used to
+	# create the initial sharpbang line in the scripts and might cause
+	# a versioned app name end in there, see
+	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
+	myconf="${myconf} PERL_BIN=/usr/bin/perl"
+
+	# If you are going to enable taint mode, make sure that the bug where
+	# spamd doesn't start when the PATH contains . is addressed, and make
+	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
+	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
+	# <http://spamassassin.org/released/Razor2.patch>.
+	myconf="${myconf} PERL_TAINT=no"
+
+	# No settings needed for 'make all'.
+	mymake=""
+
+	# Neither for 'make install'.
+	myinst=""
+
+	# Add Gentoo tag to make it easier for the upstream devs to spot
+	# possible modifications or patches.
+	version_tag="g${PV:6}${PR}"
+	version_str="${PV//_/-}-${version_tag}"
+
+	# Create the Gentoo config file before Makefile.PL is called so it
+	# is copied later on.
+	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
+
+	# Setting the following env var ensures that no questions are asked.
+	export PERL_MM_USE_DEFAULT=1
+	perl-module_src_prep
+	# Run the autoconf stuff now, just to make the build sequence look more
+	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
+	# calls to Perl.
+	make spamc/Makefile VERSION_STRING="${version_str}"
+
+	# Now compile all the stuff selected.
+	perl-module_src_compile
+	if use qmail; then
+		make spamc/qmail-spamc || die building qmail-spamc failed
+	fi
+
+	# Remove the MANIFEST files as they aren't docu files
+	rm -f MANIFEST*
+
+	use doc && make text_html_doc
+}
+
+src_install () {
+	perl-module_src_test
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Create the stub dir used by sa-update and friends
+	dodir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
+
+	use qmail && dobin spamc/qmail-spamc
+
+	dosym /etc/mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
+	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
+
+	if use doc; then
+		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
+		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
+		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
+		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
+		spamd/PROTOCOL
+
+		# Rename some docu files so they don't clash with others
+		newdoc spamd/README README.spamd
+		newdoc sql/README README.sql
+		newdoc ldap/README README.ldap
+		use qmail && newdoc spamc/README.qmail README.qmail
+
+		dohtml doc/*.html
+		docinto sql
+		dodoc sql/*.sql
+	fi
+
+	# Install provided tools. See bug 108168
+	if use tools; then
+		docinto tools
+		dodoc tools/*
+	fi
+
+	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf.example
+	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
+	echo "">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf.example
+	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf.example
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if ! has_version "perl-core/DB_File"; then
+		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
+		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
+	fi
+
+	if has_version "mail-filter/razor"; then
+		if ! has_version ">=mail-filter/razor-2.61"; then
+				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
+				if has_version "<mail-filter/razor-2.40"; then
+					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
+				else
+					ewarn "recommends at least version 2.61."
+				fi
+		fi
+	fi
+
+	if use doc; then
+		einfo
+		einfo "Please read the file INSTALL in"
+		einfo "  /usr/share/doc/${PF}/"
+		einfo "to find out which optional modules you need to install to enable"
+		einfo "additional features which depend on them."
+		einfo
+		einfo "If upgraded from 2.x, please read the file UPGRADE in"
+		einfo "  /usr/share/doc/${PF}/"
+		einfo
+	fi
+
+	ewarn
+	ewarn "spamd is not designed to listen to an untrusted network"
+	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
+	ewarn "configured to do so"
+	ewarn
+	elog "If you plan on using the -u flag to spamd, please read the notes"
+	elog "in /etc/conf.d/spamd regarding the location of the pid file."
+
+	einfo
+	einfo "If you build ${PN} with optional dependancy support,"
+	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
+	einfo
+
+	if has_version '>=dev-lang/perl-5.8.8'; then
+		elog "A note from the SA developers:"
+		elog "Perl 5.8 now uses Unicode internally by default, which causes trouble for"
+		elog "SpamAssassin (and almost all other reasonably complex pieces of perl"
+		elog "code!)."
+		elog ""
+		elog "We've worked around this in most places, as far as we know, but there may"
+		elog "still be some issues.  In addition, there is a speed hit, which it would"
+		elog "be nice to avoid."
+		elog ""
+		elog "Setting the LANG environment variable before any invocation of"
+		elog "SpamAssassin sometimes seems to help fix it, like so:"
+		elog ""
+		elog "  export LANG=en_US"
+		elog ""
+		elog "Notably, the LANG setting must not include \"utf8\".   However, some folks"
+		elog "have reported that this makes no difference. ;)"
+	fi
+	einfo
+	if ! has_version 'dev-perl/Mail-SPF-Query'; then
+		elog "For spf support, please emerge dev-perl/Mail-SPF-Query"
+	fi
+	if ! has_version 'mail-filter/dcc'; then
+		elog "For dcc support, please emerge mail-filter/dcc"
+	fi
+	if ! has_version 'dev-python/pyzor'; then
+		elog "For pyzor support, please emerge dev-python/pyzor"
+	fi
+	if ! has_version 'mail-filter/razor'; then
+		elog "For razor support, please emerge mail-filter/razor"
+	fi
+	einfo
+	elog "For addtional functionality, you may wish to emerge:"
+	elog "dev-perl/IP-Country       dev-perl/Net-Ident "
+	elog "dev-perl/Mail-DKIM"
+
+}