Revision: 6765
http://ipcop.svn.sourceforge.net/ipcop/?rev=6765&view=rev
Author: gespinasse
Date: 2012-08-16 21:49:40 +0000 (Thu, 16 Aug 2012)
Log Message:
-----------
Upgrade flex to 2.5.37
Remove a bit of make noise during make check using --no-print-directory
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/flex
ipcop/trunk/lfs/flex
Added Paths:
-----------
ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/flex-2.5.35-hardening.patch
ipcop/trunk/src/patches/flex-2.5.35-missing-prototypes.patch
ipcop/trunk/src/patches/flex-2.5.35-sign.patch
Modified: ipcop/trunk/config/rootfiles/common/flex
===================================================================
--- ipcop/trunk/config/rootfiles/common/flex 2012-08-16 21:40:47 UTC (rev
6764)
+++ ipcop/trunk/config/rootfiles/common/flex 2012-08-16 21:49:40 UTC (rev
6765)
@@ -1,9 +1,19 @@
#usr/bin/flex
+#usr/bin/flex++
#usr/bin/lex
#usr/include/FlexLexer.h
#usr/lib/libfl.a
#usr/lib/libfl_pic.a
#usr/lib/libl.a
+#usr/share/doc/flex
+#usr/share/doc/flex/AUTHORS
+#usr/share/doc/flex/COPYING
+#usr/share/doc/flex/NEWS
+#usr/share/doc/flex/ONEWS
+#usr/share/doc/flex/README
+#usr/share/doc/flex/README.cvs
+#usr/share/doc/flex/TODO
+#usr/share/doc/flex/flex.pdf
#usr/share/info/flex.info
#usr/share/info/flex.info-1
#usr/share/info/flex.info-2
Modified: ipcop/trunk/lfs/flex
===================================================================
--- ipcop/trunk/lfs/flex 2012-08-16 21:40:47 UTC (rev 6764)
+++ ipcop/trunk/lfs/flex 2012-08-16 21:49:40 UTC (rev 6765)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = flex
-VER = 2.5.35
+VER = 2.5.37
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,25 +43,17 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PATCH1 := $(THISAPP)-sign.patch
-PATCH2 := $(THISAPP)-hardening.patch
-PATCH3 := $(THISAPP)-gcc44-1.patch
-PATCH4 := $(THISAPP)-missing-prototypes.patch
-
CFLAGS += -Wall -Wextra
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) \
- $(PATCH3)
+objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH3) = $(URL_LFS)/$(PKG_NAME)/$(PATCH3)
-$(DL_FILE)_MD5 = 10714e50cea54dc7a227e3eddcd44d57
-$(PATCH3)_MD5 = ad9109820534278c6dd0898178c0788f
+$(DL_FILE)_MD5 = c75940e1fc25108f2a7b3ef42abdae06
install : $(TARGET)
@@ -91,16 +83,13 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(PATCH1)
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(PATCH2)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH3)
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(PATCH4)
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)-2.5.36_bison-2.6.1.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
# no test should fail
- cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ cd $(DIR_APP) && make --no-print-directory check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
ln -sfv libfl.a /usr/lib/libl.a
Deleted: ipcop/trunk/src/patches/flex-2.5.35-hardening.patch
===================================================================
--- ipcop/trunk/src/patches/flex-2.5.35-hardening.patch 2012-08-16 21:40:47 UTC
(rev 6764)
+++ ipcop/trunk/src/patches/flex-2.5.35-hardening.patch 2012-08-16 21:49:40 UTC
(rev 6765)
@@ -1,37 +0,0 @@
-Fedora borrowed http://pkgs.fedoraproject.org/gitweb/?p=flex.git
-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: ipcop/trunk/src/patches/flex-2.5.35-missing-prototypes.patch
===================================================================
--- ipcop/trunk/src/patches/flex-2.5.35-missing-prototypes.patch
2012-08-16 21:40:47 UTC (rev 6764)
+++ ipcop/trunk/src/patches/flex-2.5.35-missing-prototypes.patch
2012-08-16 21:49:40 UTC (rev 6765)
@@ -1,54 +0,0 @@
-Fedora borrowed http://pkgs.fedoraproject.org/gitweb/?p=flex.git
-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: ipcop/trunk/src/patches/flex-2.5.35-sign.patch
===================================================================
--- ipcop/trunk/src/patches/flex-2.5.35-sign.patch 2012-08-16 21:40:47 UTC
(rev 6764)
+++ ipcop/trunk/src/patches/flex-2.5.35-sign.patch 2012-08-16 21:49:40 UTC
(rev 6765)
@@ -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; \\");
Added: ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch
===================================================================
--- ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch
(rev 0)
+++ ipcop/trunk/src/patches/flex-2.5.36_bison-2.6.1.patch 2012-08-16
21:49:40 UTC (rev 6765)
@@ -0,0 +1,91 @@
+fix 2 flex tests that fail with bison-2.6.{1,2} fedora borrowed
+http://pkgs.fedoraproject.org/cgit/flex.git/plain/flex-2.5.36-bison-2.6.1.patch
+
+diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~
flex-2.5.36/tests/test-bison-yylloc/main.c
+--- flex-2.5.36/tests/test-bison-yylloc/main.c~ 2002-06-25
21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylloc/main.c 2012-07-31 18:53:22.007394045
+0200
+@@ -21,8 +21,6 @@
+ #include "parser.h"
+ #include "scanner.h"
+
+-extern int testparse(yyscan_t);
+-
+ int main ( int argc, char** argv )
+ {
+ yyscan_t scanner;
+diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~
flex-2.5.36/tests/test-bison-yylloc/parser.y
+--- flex-2.5.36/tests/test-bison-yylloc/parser.y~ 2002-07-25
02:43:47.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylloc/parser.y 2012-08-01
01:06:53.093155586 +0200
+@@ -21,6 +21,8 @@
+ * PURPOSE.
+ */
+
++%parse-param { void* scanner }
++
+ /*
+ How to compile:
+ bison --defines --output-file="parser.c" --name-prefix="test" parser.y
+@@ -32,10 +34,8 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYPARSE_PARAM scanner
+ #define YYLEX_PARAM scanner
+
+-int yyerror(char* msg);
+ extern int testget_lineno(void*);
+
+
+@@ -89,7 +89,7 @@ line:
+
+ %%
+
+-int yyerror(char* msg) {
++int yyerror(void* scanner, char* msg) {
+ fprintf(stderr,"%s\n",msg);
+ return 0;
+ }
+diff -up flex-2.5.36/tests/test-bison-yylval/main.c~
flex-2.5.36/tests/test-bison-yylval/main.c
+--- flex-2.5.36/tests/test-bison-yylval/main.c~ 2002-06-25
21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylval/main.c 2012-08-01 01:10:02.015510280
+0200
+@@ -24,8 +24,6 @@
+ #include "parser.h"
+ #include "scanner.h"
+
+-extern int testparse(yyscan_t);
+-
+ int main ( int argc, char** argv )
+ {
+ yyscan_t scanner;
+diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~
flex-2.5.36/tests/test-bison-yylval/parser.y
+--- flex-2.5.36/tests/test-bison-yylval/parser.y~ 2002-06-25
21:37:06.000000000 +0200
++++ flex-2.5.36/tests/test-bison-yylval/parser.y 2012-08-01
01:13:11.239867147 +0200
+@@ -25,6 +25,7 @@
+ How to compile:
+ bison --defines --output-file="parser.c" --name-prefix="test" parser.y
+ */
++%parse-param { void* scanner }
+ %{
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -32,11 +33,8 @@
+ #include "config.h"
+
+ #define YYERROR_VERBOSE 1
+-#define YYPARSE_PARAM scanner
+ #define YYLEX_PARAM scanner
+
+-int yyerror(char* msg);
+-
+
+ /* A dummy function. A check against seg-faults in yylval->str. */
+ int process_text(char* s) {
+@@ -76,7 +74,7 @@ starttag: LT TAGNAME GT { process_
+ endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ;
+ %%
+
+-int yyerror(char* msg) {
++int yyerror(void* scanner, char* msg) {
+ fprintf(stderr,"%s\n",msg);
+ return 0;
+ }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
