OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Nov-2007 10:39:03
Branch: HEAD Handle: 2007110409390300
Modified files:
openpkg-src/flex flex.patch flex.spec
Log:
apply a bunch of bugfixes floating around on the net
Summary:
Revision Changes Path
1.18 +122 -0 openpkg-src/flex/flex.patch
1.87 +1 -1 openpkg-src/flex/flex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 flex.patch
--- openpkg-src/flex/flex.patch 23 Feb 2006 14:45:28 -0000 1.17
+++ openpkg-src/flex/flex.patch 4 Nov 2007 09:39:03 -0000 1.18
@@ -1,3 +1,15 @@
+Index: Makefile.in
+--- Makefile.in.orig 2006-02-21 03:45:12 +0100
++++ Makefile.in 2007-11-04 10:35:32 +0100
+@@ -291,7 +291,7 @@
+
+
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" [EMAIL PROTECTED]@
-I$(top_srcdir)/intl
++AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
+
+ # Run GNU indent on sources. Don't run this unless all the sources compile
cleanly.
+ #
Index: doc/flex.texi
--- doc/flex.texi.orig 2006-02-20 18:30:19 +0100
+++ doc/flex.texi 2006-02-23 15:27:26 +0100
@@ -45,6 +57,41 @@
Index: flex.skl
--- flex.skl.orig 2006-02-16 23:20:43 +0100
+++ flex.skl 2006-02-23 15:32:55 +0100
+@@ -54,6 +54,34 @@ m4_changequote([[, ]])
+ %# the generated scanner as a C-style comment. This is to aid those who
+ %# edit the skeleton.
+ %#
++
++%not-for-header
++%if-c-only
++%if-not-reentrant
++m4_ifelse(M4_YY_PREFIX,yy,,
++#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]
++#define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]]
++#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]
++#define yy_init_buffer M4_YY_PREFIX[[_init_buffer]]
++#define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]]
++#define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]]
++#define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]]
++#define yyin M4_YY_PREFIX[[in]]
++#define yyleng M4_YY_PREFIX[[leng]]
++#define yylex M4_YY_PREFIX[[lex]]
++#define yylineno M4_YY_PREFIX[[lineno]]
++#define yyout M4_YY_PREFIX[[out]]
++#define yyrestart M4_YY_PREFIX[[restart]]
++#define yytext M4_YY_PREFIX[[text]]
++#define yywrap M4_YY_PREFIX[[wrap]]
++#define yyalloc M4_YY_PREFIX[[alloc]]
++#define yyrealloc M4_YY_PREFIX[[realloc]]
++#define yyfree M4_YY_PREFIX[[free]]
++)
++%endif
++%endif
++%ok-for-header
++
+ #define FLEX_SCANNER
+ #define YY_FLEX_MAJOR_VERSION FLEX_MAJOR_VERSION
+ #define YY_FLEX_MINOR_VERSION FLEX_MINOR_VERSION
@@ -916,6 +916,18 @@
void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
]])
@@ -254,6 +301,41 @@
Index: skel.c
--- skel.c.orig 2006-02-21 03:45:41 +0100
+++ skel.c 2006-02-23 15:43:40 +0100
+@@ -59,6 +59,34 @@ const char *skel[] = {
+ "%# the generated scanner as a C-style comment. This is to aid those
who",
+ "%# edit the skeleton.",
+ "%#",
++ "",
++ "%not-for-header",
++ "%if-c-only",
++ "%if-not-reentrant",
++ "m4_ifelse(M4_YY_PREFIX,yy,,",
++ "#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]",
++ "#define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]]",
++ "#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]",
++ "#define yy_init_buffer M4_YY_PREFIX[[_init_buffer]]",
++ "#define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]]",
++ "#define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]]",
++ "#define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]]",
++ "#define yyin M4_YY_PREFIX[[in]]",
++ "#define yyleng M4_YY_PREFIX[[leng]]",
++ "#define yylex M4_YY_PREFIX[[lex]]",
++ "#define yylineno M4_YY_PREFIX[[lineno]]",
++ "#define yyout M4_YY_PREFIX[[out]]",
++ "#define yyrestart M4_YY_PREFIX[[restart]]",
++ "#define yytext M4_YY_PREFIX[[text]]",
++ "#define yywrap M4_YY_PREFIX[[wrap]]",
++ "#define yyalloc M4_YY_PREFIX[[alloc]]",
++ "#define yyrealloc M4_YY_PREFIX[[realloc]]",
++ "#define yyfree M4_YY_PREFIX[[free]]",
++ ")",
++ "%endif",
++ "%endif",
++ "%ok-for-header",
++ "",
+ "#define FLEX_SCANNER",
+ "#define YY_FLEX_MAJOR_VERSION 2",
+ "#define YY_FLEX_MINOR_VERSION 5",
@@ -983,6 +983,18 @@
"void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
"]])",
@@ -309,3 +391,43 @@
th->th_flags = 0;
th->th_version = copy_string (version_str);
th->th_name = copy_string (name);
+Index: scanopt.c
+--- scanopt.c.orig 2002-08-29 22:30:25.000000000 +0200
++++ scanopt.c 2007-05-11 17:48:29.000000000 +0200
+@@ -789,12 +789,12 @@ int scanopt (svoid, arg, optindex)
+ }
+
+ optarg = pstart + 1;
+- arglen = 0;
+- while (optarg[arglen])
+- arglen++;
+-
+- if (arglen == 0)
++ if (!*optarg) {
+ optarg = NULL;
++ arglen = 0;
++ }
++ else
++ arglen = strlen (optarg);
+ }
+
+ /* At this point, we have a long or short option matched at opt_offset
into
+@@ -812,13 +812,16 @@ int scanopt (svoid, arg, optindex)
+
+ /* case: no args allowed */
+ if (auxp->flags & ARG_NONE) {
+- if (optarg) {
++ if (optarg && !is_short) {
+ scanopt_err (s, opt_offset, is_short, errcode =
+ SCANOPT_ERR_ARG_NOT_ALLOWED);
+ INC_INDEX (s, 1);
+ return errcode;
+ }
+- INC_INDEX (s, 1);
++ else if (!optarg)
++ INC_INDEX (s, 1);
++ else
++ s->subscript++;
+ return optp->r_val;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.spec
============================================================================
$ cvs diff -u -r1.86 -r1.87 flex.spec
--- openpkg-src/flex/flex.spec 7 May 2007 16:06:07 -0000 1.86
+++ openpkg-src/flex/flex.spec 4 Nov 2007 09:39:03 -0000 1.87
@@ -38,7 +38,7 @@
Group: CompilerCompiler
License: BSD
Version: %{V_new}
-Release: 20070507
+Release: 20071104
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/flex/flex-%{V_new}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
