Skip to content

Commit da4b900

Browse files
tglsfdctglsfdc
committed
Advance the minimum required version of "flex" from 2.5.4 to 2.5.31, and
update documentation accordingly. This is required in order to have support for a reentrant scanner. I'm committing this bit separately in order to have an easy reference if we later decide to make the minimum something different (like 2.5.33).
1 parent 4bd556b commit da4b900

File tree

4 files changed

+37
-39
lines changed

4 files changed

+37
-39
lines changed

‎config/programs.m4

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/programs.m4,v 1.24 2008/08/29 13:02:32 petere Exp $
1+
# $PostgreSQL: pgsql/config/programs.m4,v 1.25 2009/07/13 01:51:56 tgl Exp $
22

33

44
# PGAC_PATH_BISON
@@ -42,8 +42,11 @@ AC_SUBST(BISONFLAGS)
4242
# PGAC_PATH_FLEX
4343
# --------------
4444
# Look for Flex, set the output variable FLEX to its path if found.
45-
# Avoid the buggy version 2.5.3. Also find Flex if its installed
46-
# under `lex', but do not accept other Lex programs.
45+
# Reject versions before 2.5.31, as we need a reasonably non-buggy reentrant
46+
# scanner. (Note: the well-publicized security problem in 2.5.31 does not
47+
# affect Postgres, and there are still distros shipping patched 2.5.31,
48+
# so allow it.) Also find Flex if its installed under `lex', but do not
49+
# accept other Lex programs.
4750

4851
AC_DEFUN([PGAC_PATH_FLEX],
4952
[AC_CACHE_CHECK([for flex], pgac_cv_path_flex,
@@ -65,13 +68,16 @@ else
6568
then
6669
echo '%%' > conftest.l
6770
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
68-
if $pgac_candidate --version | grep ' 2\.5\.3$' >/dev/null 2>&1; then
69-
pgac_broken_flex=$pgac_candidate
70-
continue
71+
pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
72+
if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && [$]2 = 5 && [$]3 >= 31) exit 0; else exit 1;}'
73+
then
74+
pgac_cv_path_flex=$pgac_candidate
75+
break 2
76+
else
77+
AC_MSG_WARN([
78+
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
79+
*** Flex version 2.5.31 or later is required.])
7180
fi
72-
73-
pgac_cv_path_flex=$pgac_candidate
74-
break 2
7581
fi
7682
fi
7783
done
@@ -82,14 +88,8 @@ fi
8288
])[]dnl AC_CACHE_CHECK
8389
8490
if test x"$pgac_cv_path_flex" = x"no"; then
85-
if test -n "$pgac_broken_flex"; then
86-
AC_MSG_WARN([
87-
*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
88-
*** should get version 2.5.4 or later.])
89-
fi
90-
9191
AC_MSG_WARN([
92-
*** Without Flex you will not be able to build PostgreSQL from CVS or
92+
*** Without Flex you will not be able to build PostgreSQL from CVS nor
9393
*** change any of the scanner definition files. You can obtain Flex from
9494
*** a GNU mirror site. (If you are using the official distribution of
9595
*** PostgreSQL then you do not need to worry about this because the Flex
@@ -98,7 +98,7 @@ if test x"$pgac_cv_path_flex" = x"no"; then
9898
FLEX=
9999
else
100100
FLEX=$pgac_cv_path_flex
101-
pgac_flex_version=`$FLEX -V 2>/dev/null`
101+
pgac_flex_version=`$FLEX --version 2>/dev/null`
102102
AC_MSG_NOTICE([using $pgac_flex_version])
103103
fi
104104

‎configure

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6779,13 +6779,19 @@ else
67796779
then
67806780
echo '%%' > conftest.l
67816781
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
6782-
if $pgac_candidate --version | grep ' 2\.5\.3$' >/dev/null 2>&1; then
6783-
pgac_broken_flex=$pgac_candidate
6784-
continue
6782+
pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
6783+
if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && $2 = 5 && $3 >= 31) exit 0; else exit 1;}'
6784+
then
6785+
pgac_cv_path_flex=$pgac_candidate
6786+
break 2
6787+
else
6788+
{ $as_echo "$as_me:$LINENO: WARNING:
6789+
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
6790+
*** Flex version 2.5.31 or later is required." >&5
6791+
$as_echo "$as_me: WARNING:
6792+
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
6793+
*** Flex version 2.5.31 or later is required." >&2;}
67856794
fi
6786-
6787-
pgac_cv_path_flex=$pgac_candidate
6788-
break 2
67896795
fi
67906796
fi
67916797
done
@@ -6798,23 +6804,14 @@ fi
67986804
{ $as_echo "$as_me:$LINENO: result: $pgac_cv_path_flex" >&5
67996805
$as_echo "$pgac_cv_path_flex" >&6; }
68006806
if test x"$pgac_cv_path_flex" = x"no"; then
6801-
if test -n "$pgac_broken_flex"; then
6802-
{ $as_echo "$as_me:$LINENO: WARNING:
6803-
*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
6804-
*** should get version 2.5.4 or later." >&5
6805-
$as_echo "$as_me: WARNING:
6806-
*** The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You
6807-
*** should get version 2.5.4 or later." >&2;}
6808-
fi
6809-
68106807
{ $as_echo "$as_me:$LINENO: WARNING:
6811-
*** Without Flex you will not be able to build PostgreSQL from CVS or
6808+
*** Without Flex you will not be able to build PostgreSQL from CVS nor
68126809
*** change any of the scanner definition files. You can obtain Flex from
68136810
*** a GNU mirror site. (If you are using the official distribution of
68146811
*** PostgreSQL then you do not need to worry about this because the Flex
68156812
*** output is pre-generated.)" >&5
68166813
$as_echo "$as_me: WARNING:
6817-
*** Without Flex you will not be able to build PostgreSQL from CVS or
6814+
*** Without Flex you will not be able to build PostgreSQL from CVS nor
68186815
*** change any of the scanner definition files. You can obtain Flex from
68196816
*** a GNU mirror site. (If you are using the official distribution of
68206817
*** PostgreSQL then you do not need to worry about this because the Flex
@@ -6823,7 +6820,7 @@ $as_echo "$as_me: WARNING:
68236820
FLEX=
68246821
else
68256822
FLEX=$pgac_cv_path_flex
6826-
pgac_flex_version=`$FLEX -V 2>/dev/null`
6823+
pgac_flex_version=`$FLEX --version 2>/dev/null`
68276824
{ $as_echo "$as_me:$LINENO: using $pgac_flex_version" >&5
68286825
$as_echo "$as_me: using $pgac_flex_version" >&6;}
68296826
fi

‎doc/src/sgml/install-win32.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.52 2009/04/27 16:27:35 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.53 2009/07/13 01:51:56 tgl Exp $ -->
22

33
<chapter id="install-win32">
44
<title>Installation from Source Code on <productname>Windows</productname></title>
@@ -102,7 +102,8 @@
102102
<listitem><para>
103103
Bison and Flex are required to build from CVS, but not required when
104104
building from a release file. Note that only Bison 1.875 or versions
105-
2.2 and later will work. Bison and Flex can be
105+
2.2 and later will work. Also, Flex version 2.5.31 or later is required.
106+
Bison and Flex can be
106107
downloaded from <ulink url="http://gnuwin32.sourceforge.net"></>.
107108
</para></listitem>
108109
</varlistentry>

‎doc/src/sgml/installation.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.325 2009/06/23 03:46:00 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.326 2009/07/13 01:51:56 tgl Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -296,7 +296,7 @@ su - postgres
296296
GNU <application>Flex</> and <application>Bison</>
297297
are needed to build from a CVS checkout, or if you changed the actual
298298
scanner and parser definition files. If you need them, be sure
299-
to get <application>Flex</> 2.5.4 or later and
299+
to get <application>Flex</> 2.5.31 or later and
300300
<application>Bison</> 1.875 or later. Other <application>lex</>
301301
and <application>yacc</> programs cannot be used.
302302
</para>

0 commit comments

Comments
 (0)