diff --git a/flex-2.5.35-missing-prototypes.patch b/flex-2.5.35-missing-prototypes.patch new file mode 100644 index 0000000..3cd53e7 --- /dev/null +++ b/flex-2.5.35-missing-prototypes.patch @@ -0,0 +1,28 @@ +diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl +--- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200 ++++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200 +@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],, + void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG ); + ]]) + ++m4_ifdef( [[M4_YY_REENTRANT]], ++[[ ++m4_ifdef( [[M4_YY_NO_GET_COLUMN]],, ++[[ ++int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); ++]]) ++]]) ++ ++m4_ifdef( [[M4_YY_REENTRANT]], ++[[ ++m4_ifdef( [[M4_YY_NO_SET_COLUMN]],, ++[[ ++void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG ); ++]]) ++]]) ++ + %if-bison-bridge + m4_ifdef( [[M4_YY_NO_GET_LVAL]],, + [[ + +Diff finished. Tue Jul 13 17:27:50 2010 diff --git a/flex.spec b/flex.spec index 46b7fcc..fd18fea 100644 --- a/flex.spec +++ b/flex.spec @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers) Name: flex Version: 2.5.35 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ @@ -9,6 +9,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Patch0: flex-2.5.35-sign.patch Patch1: flex-2.5.35-hardening.patch Patch2: flex-2.5.35-gcc44.patch +Patch3: flex-2.5.35-missing-prototypes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: m4 BuildRequires: gettext bison m4 @@ -54,6 +55,7 @@ instead of implementing their own. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS" @@ -107,6 +109,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/*.a %changelog +* Tue Jul 13 2010 Petr Machata - 2.5.35-10 +- Declare yyget_column and yyset_column in reentrant mode. +- Resolves: #612465 + * Wed Jan 20 2010 Petr Machata - 2.5.35-9 - Move libraries into a sub-package of their own.