From e745d9f89867556b0cb04a0928d31f7252a32add Mon Sep 17 00:00:00 2001 From: Christian Hartmann Date: Tue, 6 Jun 2006 17:38:22 +0000 Subject: [PATCH] Version bump; security bug #135746 Package-Manager: portage-2.1_rc4-r2 --- mail-filter/spamassassin/ChangeLog | 8 +- mail-filter/spamassassin/Manifest | 26 +- .../files/digest-spamassassin-3.1.3 | 3 + .../spamassassin/spamassassin-3.1.3.ebuild | 246 ++++++++++++++++++ 4 files changed, 268 insertions(+), 15 deletions(-) create mode 100644 mail-filter/spamassassin/files/digest-spamassassin-3.1.3 create mode 100644 mail-filter/spamassassin/spamassassin-3.1.3.ebuild diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index 93bd2aa3cbc4..acfbabc5c8c2 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-filter/spamassassin # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.101 2006/05/26 02:03:11 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.102 2006/06/06 17:38:21 ian Exp $ + +*spamassassin-3.1.3 (06 Jun 2006) + + 06 Jun 2006; Christian Hartmann + +spamassassin-3.1.3.ebuild: + Version bump; security bug #135746 *spamassassin-3.1.2 (26 May 2006) diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 8b70e6eaae75..572899bdabe5 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 3.0.0-spamd.conf 1528 RMD160 92bbeb8d14ada234e9001cae914055b2d2cb69aa SHA1 e4918b986630043b01fd739ecd090fa23453fc2a SHA256 bf6dfce0e63813da4b900987826780d4bede9a1f5cc8324e3b96bce30dfe5158 MD5 cde41d7639fa7e7077f1c74fef8a4ed2 files/3.0.0-spamd.conf 1528 RMD160 92bbeb8d14ada234e9001cae914055b2d2cb69aa files/3.0.0-spamd.conf 1528 @@ -29,6 +26,7 @@ DIST Mail-SpamAssassin-3.0.4.tar.bz2 847365 DIST Mail-SpamAssassin-3.1.0.tar.bz2 1012946 RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4 DIST Mail-SpamAssassin-3.1.1.tar.bz2 974527 RMD160 811a00bd79bb4d6c35cf107f3a67f60f488795fd SHA1 7723663486b013f738eb8e805a7503f52f50e347 SHA256 edcb4adca3e28914bb59b44c320e1139f133535928cd6dfaaa50d128ecce812f DIST Mail-SpamAssassin-3.1.2.tar.bz2 975060 RMD160 cde5ee2e9d0e2b4efdbd8b68367ca9508254a4c8 SHA1 aad32b73f2870182fe8f2dd5277e94d0da91b196 SHA256 43b932797494b4d2a299228b5c793181fb335dac6f78c099bd6ae3cda64f85d3 +DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 SHA1 e1f4489ec8805985e0ca79765bde586bf0286725 SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4 EBUILD spamassassin-3.0.4.ebuild 6561 RMD160 bc0e1a76c93306949b7b235cc2d8713b089857b0 SHA1 c1df899603985d82f8d01ee54f4a363e2168e5ab SHA256 959c26395036031dfe29ad0411ea537a221137d68939be91477274a96ff8aaa5 MD5 d054996d958c54cab0a2f99acc44ce9e spamassassin-3.0.4.ebuild 6561 RMD160 bc0e1a76c93306949b7b235cc2d8713b089857b0 spamassassin-3.0.4.ebuild 6561 @@ -53,10 +51,14 @@ EBUILD spamassassin-3.1.2.ebuild 7845 RMD160 d667ae17f5062da42686b4a5c49dd5a2a2e MD5 7dc45eaca25f274ff9267ffa1318abc1 spamassassin-3.1.2.ebuild 7845 RMD160 d667ae17f5062da42686b4a5c49dd5a2a2e38bbc spamassassin-3.1.2.ebuild 7845 SHA256 59b95fe9ad574db0818426eb80a341fc218b8359beb819638a4c61e579f76b99 spamassassin-3.1.2.ebuild 7845 -MISC ChangeLog 24840 RMD160 104e58900a25976167dbdf1331f542bd2bbeb8b6 SHA1 b6d03f2fd1f9d815e5831686960c892530b65d50 SHA256 6b3a243833281fa84c2329aa234a78ef4e36812fdac862df0b802f1d772df803 -MD5 d4cbd1130714156f1478539313d140d2 ChangeLog 24840 -RMD160 104e58900a25976167dbdf1331f542bd2bbeb8b6 ChangeLog 24840 -SHA256 6b3a243833281fa84c2329aa234a78ef4e36812fdac862df0b802f1d772df803 ChangeLog 24840 +EBUILD spamassassin-3.1.3.ebuild 7839 RMD160 3ab07ba82a70afd0610ad14827c92bacd1429f50 SHA1 201896d1cda9ace3eceb4bc1a137dddd3f5e4037 SHA256 3fa316d419e55d97b130c7d6f0a7209648d487f7c00bc106106338cb983dbb2b +MD5 783fc3718b93310db958d0309ee72416 spamassassin-3.1.3.ebuild 7839 +RMD160 3ab07ba82a70afd0610ad14827c92bacd1429f50 spamassassin-3.1.3.ebuild 7839 +SHA256 3fa316d419e55d97b130c7d6f0a7209648d487f7c00bc106106338cb983dbb2b spamassassin-3.1.3.ebuild 7839 +MISC ChangeLog 24988 RMD160 df2cb1f93f6923cd25bdb5438d03b4ab99162f7f SHA1 cdadd035513d1a4303ff23a705cd914097735c69 SHA256 a52b53d36e6e1094a90aec112860bf9eff6a0e2faf916e68b41755e87b95876e +MD5 d0fc18e6d4e722f004827bfc25b8dce6 ChangeLog 24988 +RMD160 df2cb1f93f6923cd25bdb5438d03b4ab99162f7f ChangeLog 24988 +SHA256 a52b53d36e6e1094a90aec112860bf9eff6a0e2faf916e68b41755e87b95876e ChangeLog 24988 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -79,10 +81,6 @@ SHA256 27b1a488f7058c7bdbef88fb4db129bf01b41a2be392fb7afa3a151bb7b3fba6 files/di MD5 a51abf22e224b87bef9ba74c14af8eba files/digest-spamassassin-3.1.2 274 RMD160 c29c6fdf772adc8feb7e848e7afe272633da73c4 files/digest-spamassassin-3.1.2 274 SHA256 968443cdc2caad4550af4a0d9b6066d7e1ad6a7241ebc7f3a9adf90416cdc763 files/digest-spamassassin-3.1.2 274 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFEdmHmtG5z4I8BtQoRApEwAJ9nBkkr5fOp+V3iAd6bUWo0aEnczgCfUUJb -e2BLa6P3zWZMnUnxjLvRgd4= -=AetJ ------END PGP SIGNATURE----- +MD5 53c722ea7ceaa67ec7f0738d9ea8eb3f files/digest-spamassassin-3.1.3 274 +RMD160 c9b7531ea7eb117ee77733b7a27fb9b692a806cd files/digest-spamassassin-3.1.3 274 +SHA256 f4af93fd5e39b91800c4e6ff5709d6e215b38b6a3497c5564d1249cac437aea8 files/digest-spamassassin-3.1.3 274 diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3 new file mode 100644 index 000000000000..d9ab784fb6f6 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3 @@ -0,0 +1,3 @@ +MD5 5f049f0b9fc63585a85593a3c68409bb Mail-SpamAssassin-3.1.3.tar.bz2 975274 +RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 Mail-SpamAssassin-3.1.3.tar.bz2 975274 +SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4 Mail-SpamAssassin-3.1.3.tar.bz2 975274 diff --git a/mail-filter/spamassassin/spamassassin-3.1.3.ebuild b/mail-filter/spamassassin/spamassassin-3.1.3.ebuild new file mode 100644 index 000000000000..a7e3ede0800b --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.1.3.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.3.ebuild,v 1.1 2006/06/06 17:38:21 ian 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://apache/spamassassin/source/${MY_P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.31 + >=dev-perl/Net-DNS-0.53 + dev-perl/Digest-SHA1 + dev-perl/libwww-perl + >=dev-perl/Archive-Tar-1.26 + app-crypt/gnupg + dev-perl/IO-Zlib + 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_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 + # + 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. + # and + # . + 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_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 "=dev-lang/perl-5.8.8'; then + ewarn "Perl 5.8 now uses Unicode internally by default, which causes trouble for" + ewarn "SpamAssassin (and almost all other reasonably complex pieces of perl" + ewarn "code!)." + echo "" + ewarn "We've worked around this in most places, as far as we know, but there may" + ewarn "still be some issues. In addition, there is a speed hit, which it would" + ewarn "be nice to avoid." + echo "" + ewarn "Setting the LANG environment variable before any invocation of" + ewarn "SpamAssassin sometimes seems to help fix it, like so:" + echo "" + ewarn " export LANG=en_US" + echo "" + ewarn "Notably, the LANG setting must not include \"utf8\". However, some folks" + ewarn "have reported that this makes no difference. ;)" + fi + einfo + if ! has_version 'dev-perl/Mail-SPF-Query'; then + einfo "For spf support, please emerge dev-perl/Mail-SPF-Query" + fi + if ! has_version 'mail-filter/dcc'; then + einfo "For dcc support, please emerge mail-filter/dcc" + fi + if ! has_version 'dev-python/pyzor'; then + einfo "For pyzor support, please emerge dev-python/pyzor" + fi + if ! has_version 'mail-filter/razor'; then + einfo "For razor support, please emerge mail-filter/razor" + fi + einfo + einfo "For addtional functionality, you may wish to emerge:" + einfo "dev-perl/IP-Country dev-perl/Net-Ident " + einfo "dev-perl/Mail-DomainKeys" + +} -- 2.26.2