Version bump

Package-Manager: portage-2.2_rc67_p190/cvs/Linux x86_64

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index 144e4e21f1c56e604c7dfeb579f547dc6c07d941..88811760ef9ea3c5f4705ab6c4e2c7b41d25c811 100644 (file)
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/bogofilter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.130 2010/06/06 13:54:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.131 2010/07/09 07:22:52 tove Exp $
+
+*bogofilter-1.2.2 (09 Jul 2010)
+
+  09 Jul 2010; Torsten Veller <tove@gentoo.org> +bogofilter-1.2.2.ebuild:
+  Version bump.
+  Fixes a heap corruption in base64 decoder on invalid input (CVE-2010-2494)
 
   06 Jun 2010; Raúl Porcel <armin76@gentoo.org> bogofilter-1.2.1-r1.ebuild:
   Add ~arm/~sh wrt #314849

diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 1dca6f22c74f0a0df667d58744443ccfd8ccbab7..0d14910ef20659efff43183a7c3302eab6bca10b 100644 (file)
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST bogofilter-0.92.8.tar.bz2 637420 RMD160 72b3d7426fca787fcb774b8d6c540a4668796e35 SHA1 ffaf181f71dfee7d4475d5c20fed4a8f50a3e7c4 SHA256 1f2f103b9e0038f789f842ecad11805bb8277f701b747ec3e851b02d3ebfc807
 DIST bogofilter-1.2.1.tar.bz2 857088 RMD160 e6a39250d78b8a418613f06d56b7dd33d81761a4 SHA1 3a1ebe57b057a5c7ed930995669f7a791fbcecab SHA256 7f90dd32b2887860896683ab8ba378c1f9c1a7a55ddee64057df5b773c4cb33c
+DIST bogofilter-1.2.2.tar.bz2 867043 RMD160 a522d0c7d2deae59d479c67f64e9bd9551b59096 SHA1 6d2860c1d919fe47a8efcfc7fd6de9433872f21d SHA256 d8cfd1e68375ac8131de8a6998a38ee5b3f7d1151e71efd2b436183545216039
 EBUILD bogofilter-0.92.8.ebuild 1439 RMD160 1f597cc8a53ef3b00f95dc82baf106a5c60d2f4a SHA1 1c0e882a4dd6c0c12afee7ad0521edcc8252f375 SHA256 de7872dd5ce704cd82aaf28834101d7aaa04d2188e9f5237d2438f36f791d42b
 EBUILD bogofilter-1.2.1-r1.ebuild 3673 RMD160 088dd54065cd4d0b024b81ab4870f87e65d9015a SHA1 87f75692c87630c8b2bbefa972f4436ae9ae2a74 SHA256 5365fa0b8018dc3fe7e938607919816cdea147298d2549d542b2b3b70b17b99d
 EBUILD bogofilter-1.2.1.ebuild 2327 RMD160 cd1097aa9081180cc1f23b12de65abe23260f331 SHA1 8d76e3c0e4a84cc1b1af2992877b3d1864c24071 SHA256 c08f5659323de911de12e3781ce3db8ca6a02d242e88d78e22d0f16a6c47474e
-MISC ChangeLog 24120 RMD160 8d85ad63f2ed021c6dae82c1caeabc3257c7238b SHA1 d1d43cda47410257a577f712801009b16304ffa2 SHA256 86b129fe809f1f8709b79222932e80ca252bfc38bba3cbe3a3094938383d3f14
+EBUILD bogofilter-1.2.2.ebuild 3668 RMD160 81f9912008f147b499a1ce023edfbc96f2db25e6 SHA1 10098cb8ae9d4b027d27debf65d576aa21e43f26 SHA256 03927b2ad76349e1097490b34a7c911861877fd81597f709b03f12d8cbb89887
+MISC ChangeLog 24318 RMD160 4d1cbcfa1ee8129bb277d67b439a903f3679a2dc SHA1 03e4f7b7710aeff28825705eb28c2016e1852ae7 SHA256 b5fdf58894f399974e52f453a64157389bf1ae8d6b60188e5a7c62a47a346b76
 MISC metadata.xml 506 RMD160 7a1aa2f88f7051aa5112885306e81892f5aabafa SHA1 7f2b67a5ca36edb6760f9291fbdf3001f65ddc55 SHA256 da4c28135e6fec4478a9acdafe1d4b023815d2cb116a681917ee4b69846e665e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw2zlIACgkQV3J2n04EauypnACguu0Ilgs/IYFz2HLaut93eBJw
++X8AoNpaWVi2TlX8Qb2o8R/C6zo1bwYC
+=L7S1
+-----END PGP SIGNATURE-----

diff --git a/mail-filter/bogofilter/bogofilter-1.2.2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.2.ebuild
new file mode 100644 (file)
index 0000000..e26df18
--- /dev/null
+++ b/mail-filter/bogofilter/bogofilter-1.2.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.2.ebuild,v 1.1 2010/07/09 07:22:52 tove Exp $
+
+inherit db-use flag-o-matic
+
+DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
+HOMEPAGE="http://bogofilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb sqlite tokyocabinet"
+
+DEPEND="virtual/libiconv
+       berkdb?  ( >=sys-libs/db-3.2 )
+       !berkdb? (
+               sqlite?  ( >=dev-db/sqlite-3.6.22 )
+               !sqlite? (
+                       tokyocabinet? ( dev-db/tokyocabinet )
+                       !tokyocabinet? ( >=sys-libs/db-3.2 )
+               )
+       )
+       sci-libs/gsl"
+#      app-arch/pax" # only needed for bf_tar
+
+pkg_setup() {
+       has_version mail-filter/bogofilter || return 0
+       if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
+               ( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
+               (   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
+               ( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
+               ( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
+                       (   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
+                       ( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
+               ) ; then
+               ewarn
+               ewarn "If you want to switch the database backend, you must dump the wordlist"
+               ewarn "with the current version (old use flags) and load it with the new version!"
+               ewarn
+       fi
+}
+
+src_compile() {
+       local myconf="" berkdb=true
+       myconf="--without-included-gsl"
+
+       # determine backend: berkdb *is* default
+       if use berkdb && use sqlite ; then
+               elog "Both useflags berkdb and sqlite are in USE:"
+               elog "Using berkdb as database backend."
+       elif use berkdb && use tokyocabinet ; then
+               elog "Both useflags berkdb and tokyocabinet are in USE:"
+               elog "Using berkdb as database backend."
+       elif use sqlite && use tokyocabinet ; then
+               elog "Both useflags sqlite and tokyocabinet are in USE:"
+               elog "Using sqlite as database backend."
+               myconf="${myconf} --with-database=sqlite"
+               berkdb=false
+       elif use sqlite ; then
+               myconf="${myconf} --with-database=sqlite"
+               berkdb=false
+       elif use tokyocabinet ; then
+               myconf="${myconf} --with-database=tokyocabinet"
+               berkdb=false
+       elif ! use berkdb ; then
+               elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
+               elog "Using berkdb as database backend."
+       fi
+
+       # Include the right berkdb headers for FreeBSD
+       if ${berkdb} ; then
+               append-flags "-I$(db_includedir)"
+       fi
+
+       econf ${myconf} || die "configure failed"
+       emake || die "emake failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       exeinto /usr/share/${PN}/contrib
+       doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
+               contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
+               contrib/{spamitarium,stripsearch}.pl || die "doexec failed"
+
+       insinto /usr/share/${PN}/contrib
+       doins contrib/{README.*,dot-qmail-bogofilter-default} \
+               contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
+               contrib/vm-bogofilter.el \
+               contrib/{trainbogo,scramble}.sh || die "doins failed"
+
+       dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
+               doc/integrating-with-* doc/README.{db,sqlite} || die "dodoc failed"
+
+       dohtml doc/*.html
+
+       dodir /usr/share/doc/${PF}/samples
+       mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/
+       rmdir "${D}"/etc
+}
+
+pkg_postinst() {
+       echo
+       elog "If you need \"${ROOT}usr/bin/bf_tar\" please install app-arch/pax."
+       echo
+}