Fixed bug #135940 - broken --exit-code command-line option

Package-Manager: portage-2.1.1_pre1-r1

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 526e10314ac86a1817d6182b8f5864e9a83675fe..a345b8bd5eab9d7fa90d499fd2567bc3f8fe7844 100644 (file)
--- 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.109 2006/06/18 17:12:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.110 2006/06/20 19:26:47 ian Exp $
+
+*spamassassin-3.1.3-r1 (20 Jun 2006)
+
+  20 Jun 2006; Christian Hartmann <ian@gentoo.org>
+  +files/spamassassin-3.1.3-bug-4930.diff, +spamassassin-3.1.3-r1.ebuild:
+  Fixed bug #135940 - broken --exit-code command-line option
 
   18 Jun 2006; Bryan Østergaard <kloeri@gentoo.org>
   spamassassin-3.1.3.ebuild:

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 95269e990cad21e2bd8ae5c52310bff36349be52..94454edb410f91e28f2639762200ae37d9709d10 100644 (file)
--- 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
@@ -17,6 +14,10 @@ AUX spamassassin-3.1.1-lint-de.diff 3779 RMD160 a28f308380634e607d307763b51b381b
 MD5 3b1ec9cd3b71b0c0fbd4db9a0a9715e5 files/spamassassin-3.1.1-lint-de.diff 3779
 RMD160 a28f308380634e607d307763b51b381bd254b173 files/spamassassin-3.1.1-lint-de.diff 3779
 SHA256 b5c405e8fd698a3360d4255ad0533ee8e0f2a8be587e4936d1e3d30c7369e907 files/spamassassin-3.1.1-lint-de.diff 3779
+AUX spamassassin-3.1.3-bug-4930.diff 627 RMD160 159305a6523b39141797683e49312952c093f820 SHA1 bd005f211623af8312f8777196414485d7177139 SHA256 b9615710931f259956b878eb1f5c6edfe90fd4d591df90b5fe67fe3102a61c2d
+MD5 d7431feb86847e0f0166e9f13e9f9e28 files/spamassassin-3.1.3-bug-4930.diff 627
+RMD160 159305a6523b39141797683e49312952c093f820 files/spamassassin-3.1.3-bug-4930.diff 627
+SHA256 b9615710931f259956b878eb1f5c6edfe90fd4d591df90b5fe67fe3102a61c2d files/spamassassin-3.1.3-bug-4930.diff 627
 AUX spamd.conf 604 RMD160 b93b367d735801e0d6c30ba41daa749555238e00 SHA1 43c719187a6d9be1e19f1da668a381db1f7b6e29 SHA256 2d91fde46ccc70fc157824e9fca564f398ddf8e7d75526bc26d390df02b389cc
 MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
 RMD160 b93b367d735801e0d6c30ba41daa749555238e00 files/spamd.conf 604
@@ -28,8 +29,8 @@ SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/sp
 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 SHA256 edcb4adca3e28914bb59b44c320e1139f133535928cd6dfaaa50d128ecce812f
-DIST Mail-SpamAssassin-3.1.2.tar.bz2 975060 RMD160 cde5ee2e9d0e2b4efdbd8b68367ca9508254a4c8 SHA256 43b932797494b4d2a299228b5c793181fb335dac6f78c099bd6ae3cda64f85d3
-DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4
+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
@@ -54,14 +55,18 @@ 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
+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
+SHA256 063a0f24b41cf3dfd2053afe642d0c98699386c24d8916f896784eddbdb9d1a2 spamassassin-3.1.3-r1.ebuild 8057
 EBUILD spamassassin-3.1.3.ebuild 7834 RMD160 b456eceae31a9a43862c95065c19ba8afa88873c SHA1 cefd8ffc28b694b693acc7de524fb27fcbc79979 SHA256 eec4f5b69a2f1be0a9a600ef3a65044674502ee8bfef2bc1be3326575bf5d8e2
 MD5 e0b79272c10b1986d6327163c916ebd7 spamassassin-3.1.3.ebuild 7834
 RMD160 b456eceae31a9a43862c95065c19ba8afa88873c spamassassin-3.1.3.ebuild 7834
 SHA256 eec4f5b69a2f1be0a9a600ef3a65044674502ee8bfef2bc1be3326575bf5d8e2 spamassassin-3.1.3.ebuild 7834
-MISC ChangeLog 25811 RMD160 d4f11374c137bd9c3e9a6d45c8ed795a8b8b7c43 SHA1 202e89e7d22ebf20a297fa006442904259956bbf SHA256 37977cc04921476028826863bdb837d3d1c85e5560d0baed65367e93880475c6
-MD5 2ec6e975c097d82ebcf0828ff16c734d ChangeLog 25811
-RMD160 d4f11374c137bd9c3e9a6d45c8ed795a8b8b7c43 ChangeLog 25811
-SHA256 37977cc04921476028826863bdb837d3d1c85e5560d0baed65367e93880475c6 ChangeLog 25811
+MISC ChangeLog 26033 RMD160 6350496ac466fc7319a86dd9c7eae2f5f8ab497e SHA1 d8912c0c4555800628d18eada8607e538a33b6c2 SHA256 6290748c95e46027fa8477134a5d8d560e2ae97120b1f3fd8c993d67c5115903
+MD5 8c2b8c08b546edc6cbe443dbe6f8a72e ChangeLog 26033
+RMD160 6350496ac466fc7319a86dd9c7eae2f5f8ab497e ChangeLog 26033
+SHA256 6290748c95e46027fa8477134a5d8d560e2ae97120b1f3fd8c993d67c5115903 ChangeLog 26033
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -87,10 +92,6 @@ SHA256 968443cdc2caad4550af4a0d9b6066d7e1ad6a7241ebc7f3a9adf90416cdc763 files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFElaXEugEuf3OQ0akRAgaMAKCAUScVs6UAjVyGsz2eIMtkmAQEZQCfX3Wt
-tkQBMyCBNIMjzb7ZzypgVKg=
-=bkw0
------END PGP SIGNATURE-----
+MD5 53c722ea7ceaa67ec7f0738d9ea8eb3f files/digest-spamassassin-3.1.3-r1 274
+RMD160 c9b7531ea7eb117ee77733b7a27fb9b692a806cd files/digest-spamassassin-3.1.3-r1 274
+SHA256 f4af93fd5e39b91800c4e6ff5709d6e215b38b6a3497c5564d1249cac437aea8 files/digest-spamassassin-3.1.3-r1 274

diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1
new file mode 100644 (file)
index 0000000..d9ab784
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.1.3-r1
@@ -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/files/spamassassin-3.1.3-bug-4930.diff b/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff
new file mode 100644 (file)
index 0000000..356aad0
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.1.3-bug-4930.diff
@@ -0,0 +1,16 @@
+Index: spamassassin.raw
+===================================================================
+--- spamassassin.raw   (revision 411851)
++++ spamassassin.raw   (working copy)
+@@ -336,7 +336,10 @@
+ }
+ 
+ # Go run the messages!
+-eval { $exitvalue ||= !$iter->run(@targets); };
++# bug 4930: use a temp variable since "||=" decides whether or not to set the
++# value before the RHS is actually run, so if the RHS separately sets the LHS
++# variable, things don't work right.  Stupid global variables. ;)
++eval { my $runreturn = !$iter->run(@targets);  $exitvalue ||= $runreturn; };
+ 
+ $progress->final() if ($opt{progress} && $progress);
+ 

diff --git a/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild
new file mode 100644 (file)
index 0000000..d246d09
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.1.3-r1.ebuild
@@ -0,0 +1,251 @@
+# 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-r1.ebuild,v 1.1 2006/06/20 19:26:47 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() {
+       # Fix upstream bug causing 0 returns. (spam is being marked nonspam)
+       # See bug #135940
+       # Upstream: http://issues.apache.org/SpamAssassin/show_bug.cgi?id=4930
+       epatch ${FILESDIR}/spamassassin-3.1.3-bug-4930.diff
+
+       # - 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_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"
+               einfo "  /usr/share/doc/${PF}/INSTALL.gz"
+               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"
+               einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
+               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
+       ewarn "If you plan on using the -u flag to spamd, please read the notes"
+       ewarn "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"
+
+       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"
+
+}