Bump to address bug #153939.

Package-Manager: portage-2.1.2_rc1-r5

5 files changed, 137 insertions, 5 deletions

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index 03373405f48f..9753a9a31793 100644
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/bogofilter
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.67 2006/11/04 22:40:54 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.68 2006/11/08 10:13:51 tove Exp $
+
+*bogofilter-1.1.1-r1 (08 Nov 2006)
+
+  08 Nov 2006; Torsten Veller <tove@gentoo.org>
+  +files/1.1.1-patch.1107.lexer_v3_l, +bogofilter-1.1.1-r1.ebuild:
+  Bump to address bug #153939.
 
   04 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org>
   bogofilter-1.1.1.ebuild:
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 08a309cfa9fc..bfd4a3232908 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1.1-patch.1107.lexer_v3_l 935 RMD160 35ca23f9dd5b9c3fedd7b208dd8a7406213fd161 SHA1 2951a153c01a011a4d3c4759e5289f6a958d309e SHA256 ffb8786865750cbf77263a7162555bca947e5442835888b320106b458b01ebe9
+MD5 b71e8f0a1740ae7dc60f11a2211ac0a6 files/1.1.1-patch.1107.lexer_v3_l 935
+RMD160 35ca23f9dd5b9c3fedd7b208dd8a7406213fd161 files/1.1.1-patch.1107.lexer_v3_l 935
+SHA256 ffb8786865750cbf77263a7162555bca947e5442835888b320106b458b01ebe9 files/1.1.1-patch.1107.lexer_v3_l 935
 DIST bogofilter-0.92.8.tar.bz2 637420 RMD160 72b3d7426fca787fcb774b8d6c540a4668796e35 SHA1 ffaf181f71dfee7d4475d5c20fed4a8f50a3e7c4 SHA256 1f2f103b9e0038f789f842ecad11805bb8277f701b747ec3e851b02d3ebfc807
 DIST bogofilter-1.0.2.tar.bz2 765201 RMD160 f51995be7db22d51a1e724d305d5ceb874f02a03 SHA1 c4702d16e4183ba650f60f768c1fc97c3d877924 SHA256 4d030bbeabc2d8ec712b357a23b9dde72a51c8b1e8ae26b04c22fd04e6a71a08
 DIST bogofilter-1.0.3.tar.bz2 778983 RMD160 d4b6d5329919cefbc4e17168350157b27bb08b9c SHA1 88d72c810dc3ae613cb4178e19b45c6508062210 SHA256 71d9f184ceba98233543a7f620eed6fdd447c38541f7e46a99e2c991f38c5e95
@@ -14,14 +21,18 @@ EBUILD bogofilter-1.0.3.ebuild 2337 RMD160 ce488fcf36736e67281b88c79922b993d3071
 MD5 cbeb491744ecd045110186aecba25ad3 bogofilter-1.0.3.ebuild 2337
 RMD160 ce488fcf36736e67281b88c79922b993d307192d bogofilter-1.0.3.ebuild 2337
 SHA256 2961025b751d498864f2627f65d5ff89ae974d7a7b8382de706906f6bcb617a7 bogofilter-1.0.3.ebuild 2337
+EBUILD bogofilter-1.1.1-r1.ebuild 2243 RMD160 d605b3591d0394df1f964aca76a349ba0d59a722 SHA1 48bccded02c0efdb0883615b3ac108773c26b495 SHA256 b02b79e380c712cb111e4400738ce3b76ed6552cb5bc240c6123ed7117d0b5a5
+MD5 e224589a49987a89c1582e3fac9c7b99 bogofilter-1.1.1-r1.ebuild 2243
+RMD160 d605b3591d0394df1f964aca76a349ba0d59a722 bogofilter-1.1.1-r1.ebuild 2243
+SHA256 b02b79e380c712cb111e4400738ce3b76ed6552cb5bc240c6123ed7117d0b5a5 bogofilter-1.1.1-r1.ebuild 2243
 EBUILD bogofilter-1.1.1.ebuild 2189 RMD160 e63727c82051102eff8a6267e015f1203c691ba7 SHA1 a3c1966f6bbe6b1f6a3befebe311842e3d3c5393 SHA256 6d084f9132b5dcab96c74afe50d55b99287be73174c906d33ee6fec84ba449f5
 MD5 a782eee904ad1df053dd145dbf7e2f1d bogofilter-1.1.1.ebuild 2189
 RMD160 e63727c82051102eff8a6267e015f1203c691ba7 bogofilter-1.1.1.ebuild 2189
 SHA256 6d084f9132b5dcab96c74afe50d55b99287be73174c906d33ee6fec84ba449f5 bogofilter-1.1.1.ebuild 2189
-MISC ChangeLog 16169 RMD160 f1743e00530888d0012d19797ffc73a49f26746d SHA1 20a7baa5a763cbb1fe56b2e00b1e1b368f0b8bc4 SHA256 16f5f76188ca24ddec3d94d0e2362daa87045070fd680871f042e67dc04b8332
-MD5 b53d488cb6042353f7c3779b65b8e031 ChangeLog 16169
-RMD160 f1743e00530888d0012d19797ffc73a49f26746d ChangeLog 16169
-SHA256 16f5f76188ca24ddec3d94d0e2362daa87045070fd680871f042e67dc04b8332 ChangeLog 16169
+MISC ChangeLog 16351 RMD160 f8d9e4035049802468708937aabcf23844b6b128 SHA1 556b93c2cd2aea5f4d0f78d3321b7d2fdcc6c703 SHA256 d166181d65793f645ee16d6a4c93454f80c68c782ec9633a32baa276b8221041
+MD5 7df78e298f8d7815f25ec9f96971861f ChangeLog 16351
+RMD160 f8d9e4035049802468708937aabcf23844b6b128 ChangeLog 16351
+SHA256 d166181d65793f645ee16d6a4c93454f80c68c782ec9633a32baa276b8221041 ChangeLog 16351
 MISC metadata.xml 424 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 SHA1 0b17aa0a89b5854ee1850da8e222b95015e1afd9 SHA256 ace8b08d5d5b207b9226c509b6d1f9610da16264d08033e28713df61063563d9
 MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 metadata.xml 424
@@ -38,3 +49,13 @@ SHA256 023efb686f8bb8cbc513d5b82100360e5e43ea8c37ad752ae1b08116ce7e758e files/di
 MD5 b8e0e6cb411b297e2d338fe300ee9bbe files/digest-bogofilter-1.1.1 253
 RMD160 97fecdec25faf7c29fd7fb8761b27a54d00313e3 files/digest-bogofilter-1.1.1 253
 SHA256 60de5207a6505e04638e479ab398b93193f89a134d006d538d76fb4f9a383dc0 files/digest-bogofilter-1.1.1 253
+MD5 b8e0e6cb411b297e2d338fe300ee9bbe files/digest-bogofilter-1.1.1-r1 253
+RMD160 97fecdec25faf7c29fd7fb8761b27a54d00313e3 files/digest-bogofilter-1.1.1-r1 253
+SHA256 60de5207a6505e04638e479ab398b93193f89a134d006d538d76fb4f9a383dc0 files/digest-bogofilter-1.1.1-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFUa4YV3J2n04EauwRAox2AJ9AT1OSXTigJ8kP72UoDwXfQ0leBwCgnfHM
+elszmufXuuhyjmX4QecqKak=
+=mIUA
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/bogofilter/bogofilter-1.1.1-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..355980e9c7e3
--- /dev/null
+++ b/mail-filter/bogofilter/bogofilter-1.1.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.1.1-r1.ebuild,v 1.1 2006/11/08 10:13:51 tove Exp $
+
+inherit eutils
+
+DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
+HOMEPAGE="http://bogofilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gsl berkdb sqlite"
+
+DEPEND="virtual/libiconv
+	berkdb?  ( >=sys-libs/db-3.2 )
+	!berkdb? (
+		sqlite?  ( >=dev-db/sqlite-3.2.6 )
+		!sqlite? ( >=sys-libs/db-3.2 ) )
+	gsl? ( sci-libs/gsl )"
+#	app-arch/pax" # only needed for bf_tar
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-patch.1107.lexer_v3_l
+}
+
+src_compile() {
+	local myconf=""
+	myconf="$(use_with !gsl included-gsl)"
+
+	# determine backend: berkdb *is* default
+	if use berkdb && use sqlite ; then
+		einfo "Both berkdb and sqlite are in USE."
+		einfo "Choosing berkdb as default database backend."
+	elif use sqlite ; then
+		myconf="${myconf} --with-database=sqlite"
+	elif ! use berkdb ; then
+		einfo "Using berkdb as database backend."
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make 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
+	einfo "If you need ${ROOT}usr/bin/bf_tar please install app-arch/pax."
+	echo
+}
diff --git a/mail-filter/bogofilter/files/1.1.1-patch.1107.lexer_v3_l b/mail-filter/bogofilter/files/1.1.1-patch.1107.lexer_v3_l
new file mode 100644
index 000000000000..d48c07df5d3f
--- /dev/null
+++ b/mail-filter/bogofilter/files/1.1.1-patch.1107.lexer_v3_l
@@ -0,0 +1,26 @@
+--- 111/src/lexer_v3.l	2006-07-03 23:47:37.000000000 -0400
++++ cvs/src/lexer_v3.l	2006-11-06 19:04:06.000000000 -0500
+@@ -1,4 +1,4 @@
+-/* $Id: 1.1.1-patch.1107.lexer_v3_l,v 1.1 2006/11/08 10:13:51 tove Exp $ */
++/* $Id: 1.1.1-patch.1107.lexer_v3_l,v 1.1 2006/11/08 10:13:51 tove Exp $ */
+ 
+ %{
+ /*
+@@ -137,7 +137,7 @@
+ BCHARS		[[:alnum:]()+_,-./:=?#\' ]
+ MIME_BOUNDARY	{BCHARS}*{BCHARSNOSPC}
+ 
+-ID		<?[[:alnum:]\-\.]*>?
++ID		<?[[:alnum:]\-\.]+>?
+ CHARSET		[[:alnum:]-]+
+ VERPID		[[:alnum:]#-]+[[:digit:]]+[[:alnum:]#-]+
+ MTYPE		[[:blank:]]*[[:alnum:]/-]*
+@@ -252,7 +252,7 @@
+ <INITIAL>charset=\"?{CHARSET}\"?		{ got_charset(yytext); skip_to('='); return TOKEN; }
+ 
+ <INITIAL>(file)?name=\"?			/* ignore */
+-<INITIAL>\n?[[:blank:]]id\ {ID}			{ return QUEUE_ID; }
++<INITIAL>\n?[[:blank:]]id{WHITESPACE}+{ID}	{ return QUEUE_ID; }
+ 
+ <INITIAL>\n[[:blank:]]				{ lineno += 1; }
+ <INITIAL>\n\n					{ enum mimetype type = get_content_type();
diff --git a/mail-filter/bogofilter/files/digest-bogofilter-1.1.1-r1 b/mail-filter/bogofilter/files/digest-bogofilter-1.1.1-r1
new file mode 100644
index 000000000000..424c90ed7043
--- /dev/null
+++ b/mail-filter/bogofilter/files/digest-bogofilter-1.1.1-r1
@@ -0,0 +1,3 @@
+MD5 e7f236002daf22d732cad0433adac2ff bogofilter-1.1.1.tar.bz2 790929
+RMD160 0510317b5cac1197dc99e837b0fc67471422c9d3 bogofilter-1.1.1.tar.bz2 790929
+SHA256 98684dd687139af5c04ed73c3c64016f7ec9e951da8d435d9666a9a036099fa5 bogofilter-1.1.1.tar.bz2 790929