From 9d8e6e2a2facb921e93585a5b4779b28596b2bea Mon Sep 17 00:00:00 2001
From: Daniel Gryniewicz <dang@gentoo.org>
Date: Sat, 4 Nov 2006 23:40:03 +0000
Subject: New patch

svn path=/user/; revision=8
---
 mail-filter/bogofilter/Manifest                    | 12 ++++++++----
 mail-filter/bogofilter/bogofilter-1.1.1.ebuild     |  2 +-
 .../files/bogofilter-1.1.1-queue-id.patch          | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 mail-filter/bogofilter/files/bogofilter-1.1.1-queue-id.patch

diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index d227bf1..64424c1 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,11 +2,15 @@ AUX bogofilter-1.1.1-id-core.patch 449 RMD160 4f4d6a8981e6e4023f655eba2c473a9749
 MD5 51f91f774884bc0a89b64d0cceddc39a files/bogofilter-1.1.1-id-core.patch 449
 RMD160 4f4d6a8981e6e4023f655eba2c473a97494e45d7 files/bogofilter-1.1.1-id-core.patch 449
 SHA256 b5828daf347d888d6b3da1575ef87d0bfe4b12ff61492d0b8ceb52ad0042675b files/bogofilter-1.1.1-id-core.patch 449
+AUX bogofilter-1.1.1-queue-id.patch 1072 RMD160 5eaa9dd9c87dfaf4d13b062e8a8ecb20b58b9878 SHA1 03f3db23a61ec35be43fdbb6983c97cf8b9dec68 SHA256 c94d10be32a6c0d9f1912c914dbaa858a069c0bb9dd1b8d7e9b2300062e9adad
+MD5 cc81633046bd3fb2b7d896284bf54adf files/bogofilter-1.1.1-queue-id.patch 1072
+RMD160 5eaa9dd9c87dfaf4d13b062e8a8ecb20b58b9878 files/bogofilter-1.1.1-queue-id.patch 1072
+SHA256 c94d10be32a6c0d9f1912c914dbaa858a069c0bb9dd1b8d7e9b2300062e9adad files/bogofilter-1.1.1-queue-id.patch 1072
 DIST bogofilter-1.1.1.tar.bz2 790929 RMD160 0510317b5cac1197dc99e837b0fc67471422c9d3 SHA1 5c88e00f0b8415eb6a9b4274f5a4a335639a40b9 SHA256 98684dd687139af5c04ed73c3c64016f7ec9e951da8d435d9666a9a036099fa5
-EBUILD bogofilter-1.1.1.ebuild 2247 RMD160 38aa09424c3f81b9407e1b5a4ae34874b001ab87 SHA1 b060a5cce1b6b317dd21c524f8200981595a8f2e SHA256 247026bb4fb5bd53a2736b5bfc680e47fd5d2ea6f5a916c7656722bc5ec7b752
-MD5 1ee091ba2e54ee8e1f1f4e75b74ee2c4 bogofilter-1.1.1.ebuild 2247
-RMD160 38aa09424c3f81b9407e1b5a4ae34874b001ab87 bogofilter-1.1.1.ebuild 2247
-SHA256 247026bb4fb5bd53a2736b5bfc680e47fd5d2ea6f5a916c7656722bc5ec7b752 bogofilter-1.1.1.ebuild 2247
+EBUILD bogofilter-1.1.1.ebuild 2248 RMD160 648fe68bda7769e1af1634b4a24d8951154d48b7 SHA1 bdd65fc17ed00e1458c3a3904dfc6e1be29ff917 SHA256 95a4781bae5854d0d7c9f4a2f8a711d30795f84e03ca92060448bb0c40599ef0
+MD5 d97fb08ce276041dd794438550039517 bogofilter-1.1.1.ebuild 2248
+RMD160 648fe68bda7769e1af1634b4a24d8951154d48b7 bogofilter-1.1.1.ebuild 2248
+SHA256 95a4781bae5854d0d7c9f4a2f8a711d30795f84e03ca92060448bb0c40599ef0 bogofilter-1.1.1.ebuild 2248
 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
diff --git a/mail-filter/bogofilter/bogofilter-1.1.1.ebuild b/mail-filter/bogofilter/bogofilter-1.1.1.ebuild
index 5e62182..ca54e00 100644
--- a/mail-filter/bogofilter/bogofilter-1.1.1.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.1.1.ebuild
@@ -23,7 +23,7 @@ DEPEND="virtual/libiconv
 #	app-arch/pax" # only needed for bf_tar
 
 src_compile() {
-	epatch ${FILESDIR}/${P}-id-core.patch
+	epatch ${FILESDIR}/${P}-queue-id.patch
 
 	local myconf=""
 	myconf="$(use_with !gsl included-gsl)"
diff --git a/mail-filter/bogofilter/files/bogofilter-1.1.1-queue-id.patch b/mail-filter/bogofilter/files/bogofilter-1.1.1-queue-id.patch
new file mode 100644
index 0000000..e25b75e
--- /dev/null
+++ b/mail-filter/bogofilter/files/bogofilter-1.1.1-queue-id.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN bogofilter-1.1.1.orig/src/lexer_v3.l bogofilter-1.1.1/src/lexer_v3.l
+--- bogofilter-1.1.1.orig/src/lexer_v3.l	2006-07-03 23:47:37.000000000 -0400
++++ bogofilter-1.1.1/src/lexer_v3.l	2006-11-04 18:17:19.000000000 -0500
+@@ -137,7 +137,7 @@ BCHARSNOSPC	[[:alnum:]()+_,-./:=?#\']
+ BCHARS		[[:alnum:]()+_,-./:=?#\' ]
+ MIME_BOUNDARY	{BCHARS}*{BCHARSNOSPC}
+ 
+-ID		<?[[:alnum:]\-\.]*>?
++ID		<?[[:alnum:]\-\.]+>?
+ CHARSET		[[:alnum:]-]+
+ VERPID		[[:alnum:]#-]+[[:digit:]]+[[:alnum:]#-]+
+ MTYPE		[[:blank:]]*[[:alnum:]/-]*
+@@ -252,7 +252,7 @@ VERP		{TOKEN}-{VERPID}-{TOKEN}={TOKEN}@{
+ <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();
+Files bogofilter-1.1.1.orig/src/.token.c.swp and bogofilter-1.1.1/src/.token.c.swp differ
-- 
cgit v1.2.3-65-gdbad