remove useless patches

flex-2.6.0-yyless.patch

@@ -1,31 +0,0 @@
-Index: b/src/flex.skl
-===================================================================
---- a/src/flex.skl
-+++ b/src/flex.skl
-@@ -494,7 +494,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
-      */
-     #define  YY_LESS_LINENO(n) \
-             do { \
--                int yyl;\
-+                yy_size_t yyl;\
-                 for ( yyl = n; yyl < yyleng; ++yyl )\
-                     if ( yytext[yyl] == '\n' )\
-                         --yylineno;\
-@@ -520,7 +520,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
- 	do \
- 		{ \
- 		/* Undo effects of setting up yytext. */ \
--        int yyless_macro_arg = (n); \
-+        yy_size_t yyless_macro_arg = (n); \
-         YY_LESS_LINENO(yyless_macro_arg);\
- 		*yy_cp = YY_G(yy_hold_char); \
- 		YY_RESTORE_YY_MORE_OFFSET \
-@@ -2576,7 +2576,7 @@ void yyFlexLexer::LexerError( yyconst ch
- 	do \
- 		{ \
- 		/* Undo effects of setting up yytext. */ \
--        int yyless_macro_arg = (n); \
-+        yy_size_t yyless_macro_arg = (n); \
-         YY_LESS_LINENO(yyless_macro_arg);\
- 		yytext[yyleng] = YY_G(yy_hold_char); \
- 		YY_G(yy_c_buf_p) = yytext + yyless_macro_arg; \

flex-max_size.patch

@@ -1,37 +0,0 @@
-commit 3946924ed5e77420c453bf841603c7278766093a
-Author: rlar <rlar>
-Date:   Sun Feb 28 15:20:31 2016 +0100
-
-    generated code, `max_size' seems to be of type `int', fix casts accordingly
-
-Index: b/src/gen.c
-===================================================================
---- a/src/gen.c
-+++ b/src/gen.c
-@@ -1875,7 +1875,7 @@ void make_tables (void)
- 	if (!C_plus_plus) {
- 		if (use_read) {
- 			outn ("\terrno=0; \\");
--			outn ("\twhile ( (result = (int) read( fileno(yyin), buf, max_size )) < 0 ) \\");
-+			outn ("\twhile ( (result = (int) read( fileno(yyin), buf, (yy_size_t) max_size )) < 0 ) \\");
- 			outn ("\t{ \\");
- 			outn ("\t\tif( errno != EINTR) \\");
- 			outn ("\t\t{ \\");
-@@ -1891,7 +1891,7 @@ void make_tables (void)
- 			outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- 			outn ("\t\t{ \\");
- 			outn ("\t\tint c = '*'; \\");
--			outn ("\t\tsize_t n; \\");
-+			outn ("\t\tint 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; \\");
-@@ -1904,7 +1904,7 @@ void make_tables (void)
- 			outn ("\telse \\");
- 			outn ("\t\t{ \\");
- 			outn ("\t\terrno=0; \\");
--			outn ("\t\twhile ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \\");
-+			outn ("\t\twhile ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \\");
- 			outn ("\t\t\t{ \\");
- 			outn ("\t\t\tif( errno != EINTR) \\");
- 			outn ("\t\t\t\t{ \\");

flex-new_size.patch

@@ -1,19 +0,0 @@
-commit 986bb5e29492a927a2ad157505c900f75c97016a
-Author: rlar <rlar>
-Date:   Sun Feb 28 15:20:31 2016 +0100
-
-    generated code, here `new_size' is of type `int', fix casts accordingly
-
-Index: b/src/flex.skl
-===================================================================
---- a/src/flex.skl
-+++ b/src/flex.skl
-@@ -1782,7 +1782,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
- 		/* Extend the array by 50%, plus the number we really need. */
- 		int new_size = YY_G(yy_n_chars) + number_to_move + (YY_G(yy_n_chars) >> 1);
- 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
--			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, new_size M4_YY_CALL_LAST_ARG );
-+			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size M4_YY_CALL_LAST_ARG );
- 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
- 	}

flex-yy_buf_size.patch

@@ -1,43 +0,0 @@
-commit 33dd868353ab98bc33363d43be5a8b0e7e049072
-Author: rlar <rlar>
-Date:   Sun Feb 28 15:20:31 2016 +0100
-
-    generated code, `yy_buf_size' is of type `int', fix casts accordingly
-
-Index: b/src/flex.skl
-===================================================================
---- a/src/flex.skl
-+++ b/src/flex.skl
-@@ -1732,7 +1732,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
- 				b->yy_ch_buf = (char *)
- 					/* Include room in for 2 EOB chars. */
- 					yyrealloc( (void *) b->yy_ch_buf,
--							 b->yy_buf_size + 2 M4_YY_CALL_LAST_ARG );
-+							 (yy_size_t) (b->yy_buf_size + 2) M4_YY_CALL_LAST_ARG );
- 				}
- 			else
- 				/* Can't grow it, we don't own it. */
-@@ -2102,12 +2102,12 @@ static void yy_load_buffer_state  YYFARG
- 	if ( ! b )
- 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
- 
--	b->yy_buf_size = (yy_size_t)size;
-+	b->yy_buf_size = size;
- 
- 	/* yy_ch_buf has to be 2 characters longer than the size given because
- 	 * we need to put in 2 end-of-buffer characters.
- 	 */
--	b->yy_ch_buf = (char *) yyalloc( b->yy_buf_size + 2 M4_YY_CALL_LAST_ARG );
-+	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) M4_YY_CALL_LAST_ARG );
- 	if ( ! b->yy_ch_buf )
- 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
- 
-@@ -2397,7 +2397,7 @@ YY_BUFFER_STATE yy_scan_buffer  YYFARGS2
- 	if ( ! b )
- 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
- 
--	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-+	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
- 	b->yy_buf_pos = b->yy_ch_buf = base;
- 	b->yy_is_our_buffer = 0;
- 	b->yy_input_file = NULL;

flex-yybytes_len.patch

@@ -1,24 +0,0 @@
-commit cf4121fa97abac8aeaa5e08b8fc0b2380228494e
-Author: rlar <rlar>
-Date:   Sat Feb 27 22:46:02 2016 +0100
-
-    generated code, `_yybytes_len' is of type `int', fix code accordingly
-
-Index: b/src/flex.skl
-===================================================================
---- a/src/flex.skl
-+++ b/src/flex.skl
-@@ -2451,11 +2451,11 @@ YY_BUFFER_STATE yy_scan_bytes  YYFARGS2(
- 	YY_BUFFER_STATE b;
- 	char *buf;
- 	yy_size_t n;
--	yy_size_t i;
-+	int i;
-     m4_dnl M4_YY_DECL_GUTS_VAR();
- 
- 	/* Get memory for full buffer, including space for trailing EOB's. */
--	n = (yy_size_t) _yybytes_len + 2;
-+	n = (yy_size_t) (_yybytes_len + 2);
- 	buf = (char *) yyalloc( n M4_YY_CALL_LAST_ARG );
- 	if ( ! buf )
- 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );

flex.spec

@@ -1,17 +1,11 @@
 Name: flex
 Version: 2.6.1
-Release: 12
+Release: 13
 Summary: A fast lexical analyzer generator
 License: BSD and LGPLv2+
 URL: https://github.com/westes/flex
 Source0: https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.xz
 
-Patch0: flex-2.6.0-yyless.patch
-Patch1: flex-max_size.patch
-Patch2: flex-new_size.patch
-Patch3: flex-yy_buf_size.patch
-Patch4: flex-yybytes_len.patch
-
 BuildRequires: gcc gettext help2man m4 bison
 Requires: m4
 Requires(post): info
@@ -42,7 +36,7 @@ Obsoletes:      flex-doc
 Man pages and other related documents for %{name}. 
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version}
 
 %build
 %configure
@@ -93,6 +87,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 7 2019 chengquan<chengquan3@huawei.com> - 2.6.1-13
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:remove useless patches
+
 * Fri Sep 27 2019 chengquan<chengquan3@huawei.com> - 2.6.1-12
 - Type:bugfix
 - ID:NA