From 3821e2741c4a7200c8149a2db2185d695c37d825 Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Wed, 27 Jul 2016 13:59:22 -0400
Subject: [PATCH] Resolves: #1360744   Fix wrong type on num_to_read.

---
 flex-2.6.0-num_to_read.patch | 36 ++++++++++++++++++++++++++++++++++++
 flex.spec                    |  7 ++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 flex-2.6.0-num_to_read.patch

diff --git a/flex-2.6.0-num_to_read.patch b/flex-2.6.0-num_to_read.patch
new file mode 100644
index 0000000..8c1ab69
--- /dev/null
+++ b/flex-2.6.0-num_to_read.patch
@@ -0,0 +1,36 @@
+diff -Nrup a/src/flex.skl b/src/flex.skl
+--- a/src/flex.skl	2016-07-27 11:11:48.528378027 -0400
++++ b/src/flex.skl	2016-07-27 11:14:03.012351701 -0400
+@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer()
+ 
+ 	else
+ 		{
+-			yy_size_t num_to_read =
++			int num_to_read =
+ 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+ 
+ 		while ( num_to_read <= 0 )
+diff -Nrup a/src/scan.c b/src/scan.c
+--- a/src/scan.c	2015-11-17 11:17:41.000000000 -0500
++++ b/src/scan.c	2016-07-27 11:14:18.126674417 -0400
+@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void)
+ 
+ 	else
+ 		{
+-			yy_size_t num_to_read =
++			int num_to_read =
+ 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+ 
+ 		while ( num_to_read <= 0 )
+diff -Nrup a/src/skel.c b/src/skel.c
+--- a/src/skel.c	2015-11-17 11:17:39.000000000 -0500
++++ b/src/skel.c	2016-07-27 11:14:36.362857240 -0400
+@@ -1929,7 +1929,7 @@ const char *skel[] = {
+   "",
+   "	else",
+   "		{",
+-  "			yy_size_t num_to_read =",
++  "			int num_to_read =",
+   "			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;",
+   "",
+   "		while ( num_to_read <= 0 )",
diff --git a/flex.spec b/flex.spec
index 765ed2b..6d67b67 100644
--- a/flex.spec
+++ b/flex.spec
@@ -3,7 +3,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # parse.c and parse.h are under GPLv3+ with exception which allows
 #	relicensing.  Since flex is shipped under BDS-style license,
 #	let's  assume that the relicensing was done.
@@ -14,6 +14,7 @@ URL: http://flex.sourceforge.net/
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
 Patch0: flex-2.6.0-yyless.patch
+Patch1: flex-2.6.0-num_to_read.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
@@ -61,6 +62,7 @@ plain text and PDF formats.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -133,6 +135,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_pkgdocdir}
 
 %changelog
+* Wed Jul 27 2016 Patsy Franklin <pfrankli@redhat.com> - 2.6.0-2
+  Fix wrong type on num_to_read.  BZ #1360744
+
 * Thu Mar 10 2016 Patsy Franklin <pfrankli@redhat.com> - 2.6.0-1
 - Rebase to 2.6.0
 - Pick up an additional patch requested in BZ #1281976