From 155c12ab6d37c61d7d2cf4dfb3884e7a767611f6 Mon Sep 17 00:00:00 2001 From: Michael Cummings Date: Sun, 19 Nov 2006 00:24:37 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.1.2_rc1-r7 --- mail-filter/spamassassin/ChangeLog | 8 +- mail-filter/spamassassin/Manifest | 22 +- .../files/digest-spamassassin-3.1.7 | 3 + .../spamassassin/spamassassin-3.1.7.ebuild | 252 ++++++++++++++++++ 4 files changed, 277 insertions(+), 8 deletions(-) create mode 100644 mail-filter/spamassassin/files/digest-spamassassin-3.1.7 create mode 100644 mail-filter/spamassassin/spamassassin-3.1.7.ebuild diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index e2b04e02e109..20bdf89001e6 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.118 2006/11/18 21:45:38 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.119 2006/11/19 00:24:37 mcummings Exp $ + +*spamassassin-3.1.7 (19 Nov 2006) + + 19 Nov 2006; Michael Cummings + +spamassassin-3.1.7.ebuild: + Version bump 18 Nov 2006; Michael Cummings spamassassin-3.1.5.ebuild, spamassassin-3.1.6.ebuild: diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index cfdbe5062f27..24bef467efd5 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -29,6 +29,7 @@ DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de5 DIST Mail-SpamAssassin-3.1.4.tar.bz2 979302 RMD160 c5c0543827431a1ec0f157c8f09d23fa4f2ac64b SHA1 c764e94a4666c9bcb30b0540183b71e8edef6bb9 SHA256 646a8bc8b7ad70ea9abe003c7b0cad78955bf59558b9900f4249a9b0808ab395 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 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 @@ -49,10 +50,14 @@ EBUILD spamassassin-3.1.6.ebuild 7860 RMD160 c589c6324a114313c560578f3fddf4bbee9 MD5 bb22fd505c649ec035c359b60e770d7f spamassassin-3.1.6.ebuild 7860 RMD160 c589c6324a114313c560578f3fddf4bbee98709b spamassassin-3.1.6.ebuild 7860 SHA256 b10eb11d27bd323f3b0e295ba98c365f6a5476f673d87d669c02a030a00d5691 spamassassin-3.1.6.ebuild 7860 -MISC ChangeLog 27548 RMD160 285d586900db37576ac5a983cc41232b825ae911 SHA1 d778d5b5b2a755ccbbde81054229724d4d521802 SHA256 6134c83fcbfb77c5714db7a961f360ba47ec5a8998d716333067b3b351af3c5d -MD5 fd64e15fd982d1cd661da3e74ce4caa8 ChangeLog 27548 -RMD160 285d586900db37576ac5a983cc41232b825ae911 ChangeLog 27548 -SHA256 6134c83fcbfb77c5714db7a961f360ba47ec5a8998d716333067b3b351af3c5d ChangeLog 27548 +EBUILD spamassassin-3.1.7.ebuild 7916 RMD160 801e5452ad266b3c35cf1877f7d777bac5cb6b6a SHA1 efc1d025bca26c64b987d77bfc755c2004270f59 SHA256 149ffaf7f927e55b938e39accd3256a277379162a680290f02faf0913f08c7e7 +MD5 1ff2441b7d7ba69a59da1c35c96f9a43 spamassassin-3.1.7.ebuild 7916 +RMD160 801e5452ad266b3c35cf1877f7d777bac5cb6b6a spamassassin-3.1.7.ebuild 7916 +SHA256 149ffaf7f927e55b938e39accd3256a277379162a680290f02faf0913f08c7e7 spamassassin-3.1.7.ebuild 7916 +MISC ChangeLog 27684 RMD160 06266d401f9b99d89123fbd4bda4450885fd2305 SHA1 bddf8a448ed5d69b836301f916acc2bac410821d SHA256 5094ea95b9be699eba5d299b05269de2e17bc08abc246811fa768a19c08c16f6 +MD5 d8ad0138ee6578a9dd02d8949fb82ee9 ChangeLog 27684 +RMD160 06266d401f9b99d89123fbd4bda4450885fd2305 ChangeLog 27684 +SHA256 5094ea95b9be699eba5d299b05269de2e17bc08abc246811fa768a19c08c16f6 ChangeLog 27684 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -72,10 +77,13 @@ SHA256 063333e6900b289796b0814057ac9683e27f868301ab7e7f53d44b9672896ad6 files/di MD5 de68a80ed6f0393376bd4738ebb72b90 files/digest-spamassassin-3.1.6 274 RMD160 98a1753d48728ea77ffda63b72316f2bb2edf235 files/digest-spamassassin-3.1.6 274 SHA256 7f56d9f43f1a9a417d438e9b824e4c38990dd6fbb08192e0406c2981d75974f6 files/digest-spamassassin-3.1.6 274 +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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFX38JtG5z4I8BtQoRAsrpAJ9+eiq6Ck92g3isZ4RI0sVaPekhMgCfc6UF -XtiwRidwhjACK4g4qEuLD2o= -=jISe +iD8DBQFFX6RMtG5z4I8BtQoRAkMXAJ9l3djEsZA/a7ER/ocOYjRGjvk0HwCbB7qL +lBAfIRpOaRH0SwYc8ny9DCg= +=N+jT -----END PGP SIGNATURE----- diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.7 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.7 new file mode 100644 index 000000000000..5924b41550d8 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.7 @@ -0,0 +1,3 @@ +MD5 77242e45baa7e2b418e4d3f22a86a69e Mail-SpamAssassin-3.1.7.tar.bz2 997771 +RMD160 0dab3498e674d73face722fa61e1e38d6af897ef Mail-SpamAssassin-3.1.7.tar.bz2 997771 +SHA256 3cf1755aaa48a38b91f2b223fa998cb5f9a0c1e524b1266068b08a7151a0aa68 Mail-SpamAssassin-3.1.7.tar.bz2 997771 diff --git a/mail-filter/spamassassin/spamassassin-3.1.7.ebuild b/mail-filter/spamassassin/spamassassin-3.1.7.ebuild new file mode 100644 index 000000000000..af712f120541 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.1.7.ebuild @@ -0,0 +1,252 @@ +# 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.7.ebuild,v 1.1 2006/11/19 00:24:37 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" + +} -- 2.26.2