[arch-commits] Commit in flex/trunk (4 files)
Allan McRae
allan at archlinux.org
Sat Jul 21 10:31:39 UTC 2012
Date: Saturday, July 21, 2012 @ 06:31:39
Author: allan
Revision: 163834
upgpkg: flex 2.5.36-1
upstream update
Deleted:
flex/trunk/flex-2.5.35-gcc44.patch
flex/trunk/flex-2.5.35-hardening.patch
flex/trunk/flex-2.5.35-missing-prototypes.patch
flex/trunk/flex-2.5.35-sign.patch
--------------------------------------+
flex-2.5.35-gcc44.patch | 22 -------------
flex-2.5.35-hardening.patch | 36 ----------------------
flex-2.5.35-missing-prototypes.patch | 53 ---------------------------------
flex-2.5.35-sign.patch | 11 ------
4 files changed, 122 deletions(-)
Deleted: flex-2.5.35-gcc44.patch
===================================================================
--- flex-2.5.35-gcc44.patch 2012-07-21 10:29:53 UTC (rev 163833)
+++ flex-2.5.35-gcc44.patch 2012-07-21 10:31:39 UTC (rev 163834)
@@ -1,22 +0,0 @@
-diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.000000000 +0530
-@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
- /* begin standard C++ headers. */
- #include <iostream>
- #include <errno.h>
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- /* end standard C++ headers. */
-diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
---- flex-2.5.35.orig/skel.c 2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/skel.c 2009-04-20 07:46:40.000000000 +0530
-@@ -284,6 +284,7 @@ const char *skel[] = {
- "/* begin standard C++ headers. */",
- "#include <iostream> ",
- "#include <errno.h>",
-+ "#include <cstdio>",
- "#include <cstdlib>",
- "#include <cstring>",
- "/* end standard C++ headers. */",
Deleted: flex-2.5.35-hardening.patch
===================================================================
--- flex-2.5.35-hardening.patch 2012-07-21 10:29:53 UTC (rev 163833)
+++ flex-2.5.35-hardening.patch 2012-07-21 10:31:39 UTC (rev 163834)
@@ -1,36 +0,0 @@
-diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
---- flex-2.5.35/scan.c
-+++ flex-2.5.35/scan.c
-@@ -2096,7 +2096,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- #endif
-
- /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
-diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl
-+++ flex-2.5.35/flex.skl
-@@ -1075,7 +1075,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- %endif
- %if-c++-only C++ definition
- #define ECHO LexerOutput( yytext, yyleng )
-diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
---- flex-2.5.35/skel.c
-+++ flex-2.5.35/skel.c
-@@ -1142,7 +1142,7 @@
- "/* This used to be an fputs(), but since the string might contain NUL's,",
- " * we now use fwrite().",
- " */",
-- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
-+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
- "%endif",
- "%if-c++-only C++ definition",
- "#define ECHO LexerOutput( yytext, yyleng )",
Deleted: flex-2.5.35-missing-prototypes.patch
===================================================================
--- flex-2.5.35-missing-prototypes.patch 2012-07-21 10:29:53 UTC (rev 163833)
+++ flex-2.5.35-missing-prototypes.patch 2012-07-21 10:31:39 UTC (rev 163834)
@@ -1,53 +0,0 @@
-diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200
-+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200
-@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
- void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
- ]])
-
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
-+[[
-+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
-+]])
-+]])
-+
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
-+[[
-+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
-+]])
-+]])
-+
- %if-bison-bridge
- m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
- [[
-
-Diff finished. Tue Jul 13 17:27:50 2010
---- flex-2.5.35/skel.c~ 2010-07-14 13:15:42.000000000 +0200
-+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +0200
-@@ -1027,6 +1027,22 @@
- "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
- "]])",
- "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
-+ "[[",
-+ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
-+ "]])",
-+ "]])",
-+ "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
-+ "[[",
-+ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
-+ "]])",
-+ "]])",
-+ "",
- "%if-bison-bridge",
- "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
- "[[",
Deleted: flex-2.5.35-sign.patch
===================================================================
--- flex-2.5.35-sign.patch 2012-07-21 10:29:53 UTC (rev 163833)
+++ flex-2.5.35-sign.patch 2012-07-21 10:31:39 UTC (rev 163834)
@@ -1,11 +0,0 @@
---- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
-+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
-@@ -1890,7 +1890,7 @@
- outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- outn ("\t\t{ \\");
- outn ("\t\tint c = '*'; \\");
-- outn ("\t\tint n; \\");
-+ outn ("\t\tunsigned n; \\");
- outn ("\t\tfor ( n = 0; n < max_size && \\");
- outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
- outn ("\t\t\tbuf[n] = (char) c; \\");
More information about the arch-commits
mailing list