[cvs] bogofilter configure.ac,1.424,1.425 NEWS,1.579,1.580

[Matthias Andree]

David Relson <relson at users.sourceforge.net> writes:

> Update of /cvsroot/bogofilter/bogofilter
> In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18629
>
> Modified Files:
> 	configure.ac NEWS 
> Log Message:
> Fix buffer overflow problem in flex skeleton.
>
> Index: NEWS
> ===================================================================
> RCS file: /cvsroot/bogofilter/bogofilter/NEWS,v
> retrieving revision 1.579
> retrieving revision 1.580
> diff -u -d -r1.579 -r1.580
> --- NEWS	26 Nov 2006 16:47:45 -0000	1.579
> +++ NEWS	26 Nov 2006 23:56:17 -0000	1.580
> @@ -19,6 +19,8 @@
>  
>  	* Updated file comment for lexer_v3.l and removed unneeded
>  	  rules T1, T12, SHORT_TOKEN, and TOKEN_12.
> +	* Miscellaneous minor cleanups of lexer_v3.l classes and rules.
> +	* Patch buffer overflow condition in flex skeleton.
>  
>  	2006-11-21
>  
>
> Index: configure.ac
> ===================================================================
> RCS file: /cvsroot/bogofilter/bogofilter/configure.ac,v
> retrieving revision 1.424
> retrieving revision 1.425
> diff -u -d -r1.424 -r1.425
> --- configure.ac	24 Aug 2006 02:49:10 -0000	1.424
> +++ configure.ac	26 Nov 2006 23:56:17 -0000	1.425
> @@ -185,6 +185,18 @@
>  fi
>  AM_CONDITIONAL(USE_GCC4, test $gcc4 = yes)
>  
> +dnl Check whether flex needs patching
> +flex=no
> +if test -n "$LEX"; then
> +    case `$LEX --version | awk '{print $2}'` in
> +	2.5.4) flex=yes ;;
> +	2.5.31) flex=yes ;;
> +	2.5.33) flex=yes ;;
> +    esac
> +fi
> +dnl flex=yes
> +AM_CONDITIONAL(PATCH_FLEX, test $flex = yes)
> +

Hm... 
$ lex --version
/usr/bin/flex version 2.5.4
$ flex --version
flex version 2.5.4

Unsurprisingly, awk's print $2 yields "version", so the check
fails. Committing change to $3. If that doesn't work with newer
versions, we'll have to do something else, like:

$LEX --version 2>&1 | egrep -w '2\.5\.(4|31|33)'

Note that the patch doesn't work for my flex:

patching file lexer_v3.c
Hunk #1 FAILED at 2590.
1 out of 1 hunk FAILED -- saving rejects to file lexer_v3.c.rej

lexer_v3.c in separate mail.

-- 
Matthias Andree