[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4798/8267] Revert "flex: upgrade to 2.6.2"

[Emmanuele Bassi <ebassi src gnome org>]

commit 2d238896de3dd946022eab4c447243bd33641a14
Author: Trevor Woerner <twoerner gmail com>
Date:   Fri Feb 10 15:13:08 2017 -0500

    Revert "flex: upgrade to 2.6.2"
    
    This reverts commit 3632abd01abb8dfff230e18f828af705da488f97.
    
    Multiple people have expressed issues with flex-2.6.2; personally I had
    problems compiling libsepol from meta-selinux (for libselinux). I tried
    upgrading to flex-2.6.3, but that caused binutils-cross_2.27 to fail.
    
    The simplest for now is to downgrade to flex-2.6.0.
    
    (From OE-Core rev: b45776bbdafa6f6afe815714ac329494ad57e644)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...oid-c-comments-in-c-code-fails-with-gcc-6.patch |   64 ++++++
 .../recipes-devtools/flex/flex/CVE-2016-6354.patch |   59 ++++++
 meta/recipes-devtools/flex/flex/crosscompile.patch |  214 --------------------
 .../flex/flex/do_not_create_pdf_doc.patch          |   17 ++
 .../flex/{flex_2.6.2.bb => flex_2.6.0.bb}          |   11 +-
 5 files changed, 146 insertions(+), 219 deletions(-)
---
diff --git a/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch 
b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
new file mode 100644
index 0000000..438ca5f
--- /dev/null
+++ b/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
@@ -0,0 +1,64 @@
+From 7072befe1397af4eb01c3ff7edf99f0cd5076089 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony googlemail com>
+Date: Tue, 30 Aug 2016 14:25:32 +0200
+Subject: [PATCH] avoid c++ comments in c-code - fails with gcc-6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes:
+
+| error: C++ style comments are not allowed in ISO C90
+| num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony googlemail com>
+---
+ src/flex.skl | 2 +-
+ src/scan.c   | 2 +-
+ src/skel.c   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/flex.skl b/src/flex.skl
+index 73a0b9e..ed71627 100644
+--- a/src/flex.skl
++++ b/src/flex.skl
+@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void)
+                * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                * immediate realloc on the next call.
+          */
+-              num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
++              num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+               YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                                               (num_to_alloc * sizeof(struct 
yy_buffer_state*)
+                                                               M4_YY_CALL_LAST_ARG);
+diff --git a/src/scan.c b/src/scan.c
+index b55df2d..f1dce75 100644
+--- a/src/scan.c
++++ b/src/scan.c
+@@ -4672,7 +4672,7 @@ static void yyensure_buffer_stack (void)
+                * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                * immediate realloc on the next call.
+          */
+-              num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
++              num_to_alloc = 1; /* After all that talk, this was set to 1 anyways...*/
+               (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                                               (num_to_alloc * sizeof(struct 
yy_buffer_state*)
+                                                               );
+diff --git a/src/skel.c b/src/skel.c
+index ef657d3..26cc889 100644
+--- a/src/skel.c
++++ b/src/skel.c
+@@ -2561,7 +2561,7 @@ const char *skel[] = {
+   "            * scanner will even need a stack. We use 2 instead of 1 to avoid an",
+   "            * immediate realloc on the next call.",
+   "         */",
+-  "           num_to_alloc = 1; // After all that talk, this was set to 1 anyways...",
++  "           num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */",
+   "           YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc",
+   "                                                           (num_to_alloc * sizeof(struct 
yy_buffer_state*)",
+   "                                                           M4_YY_CALL_LAST_ARG);",
+-- 
+2.5.5
+
diff --git a/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch 
b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
new file mode 100644
index 0000000..216ac7a
--- /dev/null
+++ b/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
@@ -0,0 +1,59 @@
+From 3939eccdff598f47e5b37b05d58bf1b44d3796e7 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi kukkonen intel com>
+Date: Fri, 7 Oct 2016 14:15:38 +0300
+Subject: [PATCH] Prevent buffer overflow in yy_get_next_buffer
+
+This is upstream commit a5cbe929ac3255d371e698f62dc256afe7006466
+with some additional backporting to make binutils build again.
+
+Upstream-Status: Backport
+CVE: CVE-2016-6354
+Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
+---
+ src/flex.skl | 2 +-
+ src/scan.c   | 2 +-
+ src/skel.c   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/flex.skl b/src/flex.skl
+index ed71627..814d562 100644
+--- a/src/flex.skl
++++ b/src/flex.skl
+@@ -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 --git a/src/scan.c b/src/scan.c
+index f1dce75..1949872 100644
+--- a/src/scan.c
++++ b/src/scan.c
+@@ -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 --git a/src/skel.c b/src/skel.c
+index 26cc889..0344d18 100644
+--- a/src/skel.c
++++ b/src/skel.c
+@@ -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 )",
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch 
b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
new file mode 100644
index 0000000..032833a
--- /dev/null
+++ b/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate (embedded specific)
+
+Signed-off-by: Laurentiu Palcu <laurentiu palcu intel com>
+
+Index: flex-2.5.37/doc/Makefile.am
+===================================================================
+--- flex-2.5.37.orig/doc/Makefile.am   2012-07-21 04:18:27.000000000 +0300
++++ flex-2.5.37/doc/Makefile.am        2013-07-30 17:57:09.834834531 +0300
+@@ -2,7 +2,7 @@
+ 
+ info_TEXINFOS =       flex.texi
+ dist_man_MANS = flex.1
+-dist_doc_DATA= flex.pdf
++EXTRA_DIST= flex.pdf
+ 
+ CLEANFILES = \
+       flex.hks \
diff --git a/meta/recipes-devtools/flex/flex_2.6.2.bb b/meta/recipes-devtools/flex/flex_2.6.0.bb
similarity index 84%
rename from meta/recipes-devtools/flex/flex_2.6.2.bb
rename to meta/recipes-devtools/flex/flex_2.6.0.bb
index 1780cab..ab35b09 100644
--- a/meta/recipes-devtools/flex/flex_2.6.2.bb
+++ b/meta/recipes-devtools/flex/flex_2.6.0.bb
@@ -6,20 +6,21 @@ SECTION = "devel"
 LICENSE = "BSD"
 
 DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native flex-native', '', d)}"
-
 BBCLASSEXTEND = "native nativesdk"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"
 
-SRC_URI = "https://github.com/westes/flex/releases/download/v${PV}/flex-${PV}.tar.gz \
-           file://crosscompile.patch;apply=1 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
            file://run-ptest \
+           file://do_not_create_pdf_doc.patch \
            file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
+           file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch \
+           file://CVE-2016-6354.patch \
            ${@bb.utils.contains('PTEST_ENABLED', '1', '', 'file://disable-tests.patch', d)} \
            "
 
-SRC_URI[md5sum] = "cc6d76c333db7653d5caf423a3335239"
-SRC_URI[sha256sum] = "9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9"
+SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59"
+SRC_URI[sha256sum] = "24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9"
 
 # Flex has moved to github from 2.6.1 onwards
 UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases";