From: Michael Cummings Date: Fri, 16 Feb 2007 16:22:24 +0000 (+0000) Subject: Version bump, bug 166969 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=209810c1fb5a502e9fc6da1e36c919d7cebb6654;p=gentoo.git Version bump, bug 166969 Package-Manager: portage-2.1.2-r9 --- diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index fd535078e3a6..12080d12002b 100644 --- a/mail-filter/spamassassin/ChangeLog +++ b/mail-filter/spamassassin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-filter/spamassassin # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.121 2007/02/11 19:46:32 ian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.122 2007/02/16 16:22:24 mcummings Exp $ + +*spamassassin-3.1.8 (16 Feb 2007) + + 16 Feb 2007; Michael Cummings + +spamassassin-3.1.8.ebuild: + Version bump, bug 166969 11 Feb 2007; Christian Hartmann files/3.0.0-spamd.init: Added reload function to spamd; bug #159933 diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 0b81e92312eb..4c1d93537f97 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,3 +1,6 @@ +-----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 @@ -27,6 +30,7 @@ DIST Mail-SpamAssassin-3.1.4.tar.bz2 979302 RMD160 c5c0543827431a1ec0f157c8f09d2 DIST Mail-SpamAssassin-3.1.5.tar.bz2 992013 RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c SHA1 9c9bcf4098c2b3418d5ea9ba69d1dcdfa255a819 SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed DIST Mail-SpamAssassin-3.1.6.tar.bz2 998136 RMD160 e852f311695b5f0a932f6b0fbf2f2fe40c2ed555 SHA1 16575633e60177733069c1681d6bf9528c076274 SHA256 66f13606d66d079def2c48173e3afaaac606af018536ec6786a694774cbd8890 DIST Mail-SpamAssassin-3.1.7.tar.bz2 997771 RMD160 0dab3498e674d73face722fa61e1e38d6af897ef SHA1 6660dd3aa87f4ddd3ba9b19cf232dd006c6e8219 SHA256 3cf1755aaa48a38b91f2b223fa998cb5f9a0c1e524b1266068b08a7151a0aa68 +DIST Mail-SpamAssassin-3.1.8.tar.bz2 1003128 RMD160 90a9cc31795493c194932141d88daa7cc4d7386c SHA1 0d092c4de6e6df66f1d0fb0ca8589147ee4096cb SHA256 ff6ad3d06719859e7bb47bbfd360750bf561bf3bfb6c8443064e73eb05dcb2ea EBUILD spamassassin-3.1.3-r1.ebuild 8057 RMD160 303a6cbc6e8e48dbc3909431dce849683ecefd06 SHA1 5635fb60f2b59286f0615c057a7e5262237eeecc SHA256 063a0f24b41cf3dfd2053afe642d0c98699386c24d8916f896784eddbdb9d1a2 MD5 27386d4542358191f0bd972e89555956 spamassassin-3.1.3-r1.ebuild 8057 RMD160 303a6cbc6e8e48dbc3909431dce849683ecefd06 spamassassin-3.1.3-r1.ebuild 8057 @@ -51,10 +55,14 @@ EBUILD spamassassin-3.1.7.ebuild 7914 RMD160 110573f0fe62ac948eac030bfbd358db0e0 MD5 3173431562ea5a27854c3167f1f0a07c spamassassin-3.1.7.ebuild 7914 RMD160 110573f0fe62ac948eac030bfbd358db0e06df9c spamassassin-3.1.7.ebuild 7914 SHA256 0c08545b84648f7686a69b08cd88e72d1ea3b395e22b1b25e0de283d2b133e04 spamassassin-3.1.7.ebuild 7914 -MISC ChangeLog 27902 RMD160 b82524c8544112befaaa6a09e4e294679190ba7c SHA1 26594d121bb3aa2ab132e3352251a82404a74eca SHA256 5b38a93bce1952f900ac63bf1acd74e88050bbfcdcc31c68c130a8602182c635 -MD5 012812cce03b747a3cef673aa6d4f97b ChangeLog 27902 -RMD160 b82524c8544112befaaa6a09e4e294679190ba7c ChangeLog 27902 -SHA256 5b38a93bce1952f900ac63bf1acd74e88050bbfcdcc31c68c130a8602182c635 ChangeLog 27902 +EBUILD spamassassin-3.1.8.ebuild 7916 RMD160 1ec53c8ed8a2dde404e067b2fc630feff626e961 SHA1 c26c797440e348847817ec7bf27aeb62d31ac510 SHA256 c2f2993a2a2f086d88e6f3f2f667a9b7b87cf5e57dd40bd7797f906151135046 +MD5 53f48549353c68bcf42194437d0945a0 spamassassin-3.1.8.ebuild 7916 +RMD160 1ec53c8ed8a2dde404e067b2fc630feff626e961 spamassassin-3.1.8.ebuild 7916 +SHA256 c2f2993a2a2f086d88e6f3f2f667a9b7b87cf5e57dd40bd7797f906151135046 spamassassin-3.1.8.ebuild 7916 +MISC ChangeLog 28056 RMD160 cca2f99fc4c5bbf402730e87051886097b070cfe SHA1 6eeef16c3cfd3ae7215f1b6a8a935b745271f02e SHA256 0673cbfa89c2c31243cd934aa6bd8f30bd399085ebb82fb2d46654af9334e284 +MD5 f14ca638279453683ecedfe611745761 ChangeLog 28056 +RMD160 cca2f99fc4c5bbf402730e87051886097b070cfe ChangeLog 28056 +SHA256 0673cbfa89c2c31243cd934aa6bd8f30bd399085ebb82fb2d46654af9334e284 ChangeLog 28056 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -77,3 +85,13 @@ SHA256 7f56d9f43f1a9a417d438e9b824e4c38990dd6fbb08192e0406c2981d75974f6 files/di MD5 b656a45f47a5c60d8df90925f1215e86 files/digest-spamassassin-3.1.7 274 RMD160 617cbac6436484db47c90c92b1cad06f629e29f7 files/digest-spamassassin-3.1.7 274 SHA256 75568ec0019ac02b2f075fe6bacec77fa856af25cfc7caf33d02e25e6218684a files/digest-spamassassin-3.1.7 274 +MD5 3ed550c9011e8b5585b3d4f5ee51f558 files/digest-spamassassin-3.1.8 277 +RMD160 95897db0012cb8e4031e17b7d6c6379b8c5922e8 files/digest-spamassassin-3.1.8 277 +SHA256 53352d4d2cc381c308dc166a6d9652317e7f16f27926280ffd8907bde2e526c8 files/digest-spamassassin-3.1.8 277 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF1dpHtG5z4I8BtQoRAux5AJ98M0pFXyqSGGKRNP35Q94fjThfJwCeN6W7 +p2WtKxL/PWCX8HzpxB1OSXk= +=dd4a +-----END PGP SIGNATURE----- diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.8 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.8 new file mode 100644 index 000000000000..271cc9566a98 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.8 @@ -0,0 +1,3 @@ +MD5 e8184a9a4ff11da5bd20b294cfeac7ac Mail-SpamAssassin-3.1.8.tar.bz2 1003128 +RMD160 90a9cc31795493c194932141d88daa7cc4d7386c Mail-SpamAssassin-3.1.8.tar.bz2 1003128 +SHA256 ff6ad3d06719859e7bb47bbfd360750bf561bf3bfb6c8443064e73eb05dcb2ea Mail-SpamAssassin-3.1.8.tar.bz2 1003128 diff --git a/mail-filter/spamassassin/spamassassin-3.1.8.ebuild b/mail-filter/spamassassin/spamassassin-3.1.8.ebuild new file mode 100644 index 000000000000..aec523fece30 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.1.8.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.8.ebuild,v 1.1 2007/02/16 16:22:24 mcummings 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" + +SRC_TEST="do" +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_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 "=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-DomainKeys" + +}