<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a21e201b745f2a6baf7d9261e34ec9070e3efc9">https://github.com/macports/macports-ports/commit/9a21e201b745f2a6baf7d9261e34ec9070e3efc9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9a21e201b745f2a6baf7d9261e34ec9070e3efc9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 21 14:38:36 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> flex: Downgrade to 2.6.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53987
</span>---
devel/flex/Portfile | 19 +++++++------------
devel/flex/files/yyrestart.patch | 41 ----------------------------------------
devel/flex/files/yywrap.patch | 27 --------------------------
3 files changed, 7 insertions(+), 80 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/flex/Portfile b/devel/flex/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3d12fe..0acbbad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/flex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/flex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,10 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup westes flex 2.6.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# flex 2.6.2 and 2.6.3 cause wine to fail to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/53987
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup westes flex 2.6.1 v
</span> categories devel
license BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +21,10 @@ long_description \
</span> configuration file.
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_lzip yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e342eb76fdb3e8c4d2a4725326c26f26459093eb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 907eeec6db1af86a26921888c2912e5d68ac5499ce5727d7b850a666ae209326
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove help2man dependency once we are no longer patching flex.skl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:help2man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bc3ad53038890d0cdef1a12914cecadcc56c148c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
</span>
depends_lib port:gettext
depends_run port:m4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +32,6 @@ depends_skip_archcheck-append m4
</span>
installs_libs yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles yyrestart.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yywrap.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args ac_cv_prog_AWK=/usr/bin/awk
use_parallel_build yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/flex/files/yyrestart.patch b/devel/flex/files/yyrestart.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a1a4303..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/flex/files/yyrestart.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e666829949f82b3d8b7c722f7db5a8af38e93a2c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Harald van Dijk <harald@gigawatt.nl>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 10 Jan 2017 22:37:49 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] c++: Fix yyrestart(NULL) SEGV.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Binding a reference to a dereferenced null pointer is invalid and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers optimise away the &file == 0 check. We need a real stream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-yyin is available already, and yyrestart(NULL) is only supported when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-yyin will not be used, so there is no harm in just passing in that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since we now always have a valid stream, we can skip the null check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #98.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/flex.skl | 5 ++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/flex.skl b/src/flex.skl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 23e7063..66b7c1e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/flex.skl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/flex.skl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1896,6 +1896,9 @@ m4_ifdef( [[M4_YY_USE_LINENO]],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void yyFlexLexer::yyrestart( std::istream* input_file )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( ! input_file ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ input_file = &yyin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yyrestart( *input_file );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2057,7 +2060,7 @@ static void yy_load_buffer_state (M4_YY_DEF_ONLY_ARG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b->yy_input_file = file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %if-c++-only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- b->yy_input_file = (&file == 0) ? NULL : file.rdbuf();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ b->yy_input_file = file.rdbuf();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b->yy_fill_buffer = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/flex/files/yywrap.patch b/devel/flex/files/yywrap.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 39dd885..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/flex/files/yywrap.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f5d87f1a26f4a5c3402497008ae10e9a1345d327 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christos Zoulas <christos@zoulas.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 22 Jan 2017 18:20:44 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] scanner: Use prefix when defining yywrap to avoid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- redefinition.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes regression introduced in v2.6.3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/main.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/main.c b/src/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f70b1aa..83f66b0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1586,9 +1586,9 @@ void readin (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!do_yywrap) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!C_plus_plus) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (reentrant)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out_str ("\n#define %swrap(yyscanner) (/*CONSTCOND*/1)\n", prefix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- outn ("\n#define yywrap() (/*CONSTCOND*/1)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out_str ("\n#define %swrap() (/*CONSTCOND*/1)\n", prefix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outn ("#define YY_SKIP_YYWRAP");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>