- fix type mismatch in generated lexer

- rel 6

diff --git a/bogofilter.spec b/bogofilter.spec
index 7076aff8ac3e02f585ec50fe80b2760346ec745c..4825be21bb1a571cae2fe46dbd0f1142e3790996 100644 (file)
--- a/bogofilter.spec
+++ b/bogofilter.spec
@@ -8,12 +8,13 @@ Summary:      Bayesian Spam Filter
 Summary(pl.UTF-8):     Bayesowski Filtr Antyspamowy
 Name:          bogofilter
 Version:       1.2.2
 Summary(pl.UTF-8):     Bayesowski Filtr Antyspamowy
 Name:          bogofilter
 Version:       1.2.2

-Release:       5
+Release:       6

 License:       GPL v2
 Group:         Applications/Mail
 Source0:       http://dl.sourceforge.net/bogofilter/%{name}-%{version}.tar.bz2
 # Source0-md5: 4bcabdf8c5e7efefcb508eda7e80eebc
 Patch0:                %{name}-home_etc.patch
 License:       GPL v2
 Group:         Applications/Mail
 Source0:       http://dl.sourceforge.net/bogofilter/%{name}-%{version}.tar.bz2
 # Source0-md5: 4bcabdf8c5e7efefcb508eda7e80eebc
 Patch0:                %{name}-home_etc.patch

+Patch1:                lexer.patch

 URL:           http://bogofilter.sourceforge.net/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 URL:           http://bogofilter.sourceforge.net/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake


@@ -48,6 +49,7 @@ które przetwarzają duże ilości poczty.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p1

 
 %build
 %{__aclocal}
 
 %build
 %{__aclocal}

diff --git a/lexer.patch b/lexer.patch
new file mode 100644 (file)
index 0000000..a393c2d
--- /dev/null
+++ b/lexer.patch
@@ -0,0 +1,20 @@
+--- bogofilter-1.2.2/src/lexer.h~      2007-07-27 05:36:37.000000000 +0200
++++ bogofilter-1.2.2/src/lexer.h       2015-12-27 13:42:32.966722605 +0100
+@@ -48,7 +48,7 @@
+ typedef struct lexer_s {
+     yylex_t  *yylex;
+     char    **yytext;
+-    int      *yyleng; /* DO NOT EVEN CONSIDER MAKING THIS SIZE_T! */
++    size_t   *yyleng; /* DO NOT EVEN CONSIDER MAKING THIS SIZE_T! */
+ } lexer_t;
+ 
+ extern lexer_t *lexer;
+@@ -56,7 +56,7 @@
+ 
+ /* in lexer_v3.l */
+ extern token_t        yylex(void);
+-extern int    yyleng;
++extern size_t yyleng;
+ extern char   * yytext;
+ extern void   lexer_v3_init(FILE *fp);
+