From: Christian Hartmann Date: Sun, 25 Feb 2007 12:38:45 +0000 (+0000) Subject: Fixed bug #167585 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2742afa424c14be842e62bd78053ea3ceb1a1fcc;p=gentoo.git Fixed bug #167585 Package-Manager: portage-2.1.2-r11 --- diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog index 71faa1bcc857..3d1807e000a6 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.131 2007/02/23 17:30:16 ian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.132 2007/02/25 12:38:45 ian Exp $ + +*spamassassin-3.1.8-r1 (25 Feb 2007) + + 25 Feb 2007; Christian Hartmann + +files/3.1.8-archive-iterator.patch, +spamassassin-3.1.8-r1.ebuild: + Fix bug #167515 23 Feb 2007; Christian Hartmann spamassassin-3.1.8.ebuild: diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index b47d075c190e..221bfbeb9aab 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -6,19 +6,27 @@ AUX 3.0.0-spamd.init 877 RMD160 84e5f29bb1177789fa3b19dd3d2aa68d624c3e07 SHA1 09 MD5 73aa2955361e80f4896c596d4704e54b files/3.0.0-spamd.init 877 RMD160 84e5f29bb1177789fa3b19dd3d2aa68d624c3e07 files/3.0.0-spamd.init 877 SHA256 a36847dcae3f9a117d9cbac37e65ce2197031a434ac2afce6dfa7328c28132c1 files/3.0.0-spamd.init 877 +AUX 3.1.8-archive-iterator.patch 501 RMD160 6eb7ef7c73d8f207d04e5cffe59e8d924d13c06e SHA1 0b3fbbeb778daffa72094a68d91a48073438ef0a SHA256 244fa7e6af21998f7ba1d7632c618b50924401effb84db79070b9c7c24e41215 +MD5 fb5d2b50c8f5b53b326110783422e4bd files/3.1.8-archive-iterator.patch 501 +RMD160 6eb7ef7c73d8f207d04e5cffe59e8d924d13c06e files/3.1.8-archive-iterator.patch 501 +SHA256 244fa7e6af21998f7ba1d7632c618b50924401effb84db79070b9c7c24e41215 files/3.1.8-archive-iterator.patch 501 AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139 MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a files/secrets.cf 664 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139 files/secrets.cf 664 DIST Mail-SpamAssassin-3.1.8.tar.bz2 1003128 RMD160 90a9cc31795493c194932141d88daa7cc4d7386c SHA1 0d092c4de6e6df66f1d0fb0ca8589147ee4096cb SHA256 ff6ad3d06719859e7bb47bbfd360750bf561bf3bfb6c8443064e73eb05dcb2ea +EBUILD spamassassin-3.1.8-r1.ebuild 8071 RMD160 0bb35f9b89a44b0976b197db515fe28c6ce57457 SHA1 1144c397bad0a3bc738feef41bbf7685fd9071d4 SHA256 db146e33e26f232ba97085ef87422af4de8e884529653f2da65bd2e5a40a718d +MD5 2137bd4ef8b4b936ea067f616e70f06c spamassassin-3.1.8-r1.ebuild 8071 +RMD160 0bb35f9b89a44b0976b197db515fe28c6ce57457 spamassassin-3.1.8-r1.ebuild 8071 +SHA256 db146e33e26f232ba97085ef87422af4de8e884529653f2da65bd2e5a40a718d spamassassin-3.1.8-r1.ebuild 8071 EBUILD spamassassin-3.1.8.ebuild 7913 RMD160 812f71c7ca18a104c90cc004c6b6620b600ddb40 SHA1 dd99e6c93d84c38a48fc0c50521b989dc6968341 SHA256 4a102b46c0ece29876e3ec1a9cbff787899fbe817b1c3b1bd93838cfe857aefa MD5 03d32408a1d39e4534475efba1b205a8 spamassassin-3.1.8.ebuild 7913 RMD160 812f71c7ca18a104c90cc004c6b6620b600ddb40 spamassassin-3.1.8.ebuild 7913 SHA256 4a102b46c0ece29876e3ec1a9cbff787899fbe817b1c3b1bd93838cfe857aefa spamassassin-3.1.8.ebuild 7913 -MISC ChangeLog 29266 RMD160 3e6682daf0faef6726115d7f04fbc9520b13e8e5 SHA1 9cf25c76f00823c0d3fd289d7067afdfb86b6077 SHA256 6527a154421b3f91e883f1f8f96fc384c5dad6ef0d3394707cce6fcea9619f54 -MD5 c4a7c13fbcda0e3f346eaa5c442f1a6b ChangeLog 29266 -RMD160 3e6682daf0faef6726115d7f04fbc9520b13e8e5 ChangeLog 29266 -SHA256 6527a154421b3f91e883f1f8f96fc384c5dad6ef0d3394707cce6fcea9619f54 ChangeLog 29266 +MISC ChangeLog 29444 RMD160 5d42b311a6dde0f46634eea73d4405118547fe12 SHA1 fe90789d9e70204badba1e1d8ec2cce8d8299624 SHA256 99b4d2d5245726c6575b9a87ab109ee0a49ab354276603e7fce97e5266801326 +MD5 2209e9e588e21bd32b76c902f0d439e1 ChangeLog 29444 +RMD160 5d42b311a6dde0f46634eea73d4405118547fe12 ChangeLog 29444 +SHA256 99b4d2d5245726c6575b9a87ab109ee0a49ab354276603e7fce97e5266801326 ChangeLog 29444 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -26,3 +34,6 @@ SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata 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 +MD5 3ed550c9011e8b5585b3d4f5ee51f558 files/digest-spamassassin-3.1.8-r1 277 +RMD160 95897db0012cb8e4031e17b7d6c6379b8c5922e8 files/digest-spamassassin-3.1.8-r1 277 +SHA256 53352d4d2cc381c308dc166a6d9652317e7f16f27926280ffd8907bde2e526c8 files/digest-spamassassin-3.1.8-r1 277 diff --git a/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch b/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch new file mode 100644 index 000000000000..b4007f099025 --- /dev/null +++ b/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch @@ -0,0 +1,16 @@ +Index: sa-learn.raw +=================================================================== +--- sa-learn.raw (revision 507745) ++++ sa-learn.raw (working copy) +@@ -402,7 +402,10 @@ + + # make sure the target list is in the normal AI format + if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) { +- $targets[$elem] = target($targets[$elem]); ++ my $item = splice @targets, $elem, 1; ++ $elem--; # go back to this element again ++ target($item); # add back to the list ++ next; + } + } + diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.8-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.8-r1 new file mode 100644 index 000000000000..271cc9566a98 --- /dev/null +++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.8-r1 @@ -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-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild new file mode 100644 index 000000000000..6839e2120939 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.1.8-r1.ebuild @@ -0,0 +1,261 @@ +# 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-r1.ebuild,v 1.1 2007/02/25 12:38:45 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" + +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_unpack() { + unpack ${A} + cd ${S} + + # - bug #167515 - should be fixed by upstream in 3.1.9 + epatch ${FILESDIR}/3.1.8-archive-iterator.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 + # + 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" + +}