Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e9263f8f8f | ||
|
55ed42d5f2 | ||
|
f31dfe5a32 |
21 changed files with 109 additions and 691 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
9
.gitignore
vendored
9
.gitignore
vendored
|
|
@ -1,10 +1 @@
|
|||
flex-2.5.35.tar.bz2
|
||||
/flex*/
|
||||
*.rpm
|
||||
/flex-2.5.36.tar.bz2
|
||||
/flex-2.5.37.tar.bz2
|
||||
/flex-2.5.39.tar.bz2
|
||||
/flex-2.6.0.tar.bz2
|
||||
/flex-2.6.1.tar.xz
|
||||
/flex-2.6.4.tar.gz
|
||||
series
|
||||
|
|
|
|||
40
README.quilt
40
README.quilt
|
|
@ -1,40 +0,0 @@
|
|||
This package supports working with patch files using quilt.
|
||||
|
||||
To regenerate the quilt series file run:
|
||||
./gen-quilt-series.sh
|
||||
|
||||
Setup environment:
|
||||
export QUILT_PATCHES=$PWD
|
||||
|
||||
Setup the source:
|
||||
./quilt-patch.sh [-f]
|
||||
|
||||
Use `-f` if you want to have quilt-patch always remove the existing
|
||||
source directory before starting. Otherwise you'll be patching on top of
|
||||
an already patched tree generated perhaps by `*pkg prep`.
|
||||
|
||||
To add a new patch:
|
||||
|
||||
Option 1: Create a new patch:
|
||||
|
||||
cd flex-2.6.1/
|
||||
quilt new flex-rh1439367.patch
|
||||
quilt add tests/test-bison-yylloc/parser.y
|
||||
# edit tests/test-bison-yylloc/parser.y
|
||||
# you may add and edit several files in the same fashion
|
||||
|
||||
Option 2: Add an already prepared patch (e.g. from an upstream commit):
|
||||
|
||||
cd flex-2.6.1/
|
||||
quilt import -P flex-rh1439367.patch ~/backport/obsolete-bison.patch
|
||||
quilt push # if this fails, manually deal with conflicts (as in Option 1)
|
||||
|
||||
Finally:
|
||||
quilt refresh -p ab
|
||||
cd ..
|
||||
git add flex-rh1439367.patch
|
||||
# edit flex.spec to build with the new patch
|
||||
git add flex.spec
|
||||
git commit
|
||||
|
||||
You're done!
|
||||
22
flex-2.5.35-gcc44.patch
Normal file
22
flex-2.5.35-gcc44.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
|
||||
--- flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.000000000 +0530
|
||||
+++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.000000000 +0530
|
||||
@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
|
||||
/* begin standard C++ headers. */
|
||||
#include <iostream>
|
||||
#include <errno.h>
|
||||
+#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
/* end standard C++ headers. */
|
||||
diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
|
||||
--- flex-2.5.35.orig/skel.c 2009-04-20 03:09:46.000000000 +0530
|
||||
+++ flex-2.5.35/skel.c 2009-04-20 07:46:40.000000000 +0530
|
||||
@@ -284,6 +284,7 @@ const char *skel[] = {
|
||||
"/* begin standard C++ headers. */",
|
||||
"#include <iostream> ",
|
||||
"#include <errno.h>",
|
||||
+ "#include <cstdio>",
|
||||
"#include <cstdlib>",
|
||||
"#include <cstring>",
|
||||
"/* end standard C++ headers. */",
|
||||
36
flex-2.5.35-hardening.patch
Normal file
36
flex-2.5.35-hardening.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
|
||||
--- flex-2.5.35/scan.c
|
||||
+++ flex-2.5.35/scan.c
|
||||
@@ -2096,7 +2096,7 @@
|
||||
/* This used to be an fputs(), but since the string might contain NUL's,
|
||||
* we now use fwrite().
|
||||
*/
|
||||
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
|
||||
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
|
||||
#endif
|
||||
|
||||
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
|
||||
diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
|
||||
--- flex-2.5.35/flex.skl
|
||||
+++ flex-2.5.35/flex.skl
|
||||
@@ -1075,7 +1075,7 @@
|
||||
/* This used to be an fputs(), but since the string might contain NUL's,
|
||||
* we now use fwrite().
|
||||
*/
|
||||
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
|
||||
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
|
||||
%endif
|
||||
%if-c++-only C++ definition
|
||||
#define ECHO LexerOutput( yytext, yyleng )
|
||||
diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
|
||||
--- flex-2.5.35/skel.c
|
||||
+++ flex-2.5.35/skel.c
|
||||
@@ -1142,7 +1142,7 @@
|
||||
"/* This used to be an fputs(), but since the string might contain NUL's,",
|
||||
" * we now use fwrite().",
|
||||
" */",
|
||||
- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
|
||||
+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
|
||||
"%endif",
|
||||
"%if-c++-only C++ definition",
|
||||
"#define ECHO LexerOutput( yytext, yyleng )",
|
||||
11
flex-2.5.35-sign.patch
Normal file
11
flex-2.5.35-sign.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
|
||||
+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
|
||||
@@ -1890,7 +1890,7 @@
|
||||
outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
|
||||
outn ("\t\t{ \\");
|
||||
outn ("\t\tint c = '*'; \\");
|
||||
- outn ("\t\tint n; \\");
|
||||
+ outn ("\t\tunsigned n; \\");
|
||||
outn ("\t\tfor ( n = 0; n < max_size && \\");
|
||||
outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
|
||||
outn ("\t\t\tbuf[n] = (char) c; \\");
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
This patch fixes a flex-2.6.4 build failure on x86_64 and possibly other
|
||||
architectures where `size_t' is larger than `int'. The failure occurs as
|
||||
follows:
|
||||
|
||||
A missing `reallocarray' prototype during compilation means that the
|
||||
compiler assumes an `int' return type. When compiling with `-pie' (standard
|
||||
for Fedora), addresses on the heap can be larger than `int' can store. Thus,
|
||||
pointers returned from `reallocarray' are truncated and any read/write to
|
||||
them leads to a SIGSEGV.
|
||||
|
||||
From 24fd0551333e7eded87b64dd36062da3df2f6380 Mon Sep 17 00:00:00 2001
|
||||
From: Explorer09 <explorer09@gmail.com>
|
||||
Date: Mon, 4 Sep 2017 10:47:33 +0800
|
||||
Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac.
|
||||
|
||||
This would, e.g. define _GNU_SOURCE in config.h, enabling the
|
||||
reallocarray() prototype in glibc 2.26+ on Linux systems with that
|
||||
version of glibc.
|
||||
|
||||
Fixes #241.
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
Index: b/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -25,8 +25,10 @@
|
||||
# autoconf requirements and initialization
|
||||
|
||||
AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex])
|
||||
+AC_PREREQ([2.60])
|
||||
AC_CONFIG_SRCDIR([src/scan.l])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
LT_INIT
|
||||
AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects])
|
||||
AC_CONFIG_HEADER([src/config.h])
|
||||
326
flex.spec
326
flex.spec
|
|
@ -1,26 +1,19 @@
|
|||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
Summary: A tool for generating scanners (text pattern recognizers)
|
||||
Summary: A tool for creating scanners (text pattern recognizers)
|
||||
Name: flex
|
||||
Version: 2.6.4
|
||||
Release: 20%{?dist}
|
||||
|
||||
# An SPDX license string check done against flex-2.6.4 using fossology
|
||||
# found strings corresponding to the licenses noted below across the flex
|
||||
# source tree.
|
||||
License: BSD-3-Clause-flex AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-or-later WITH Texinfo-exception AND FSFAP AND FSFUL AND FSFULLR AND FSFULLRWD AND GPL-2.0-or-later AND X11
|
||||
|
||||
URL: https://github.com/westes/flex
|
||||
Source: https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.gz
|
||||
|
||||
Patch0: flex-rh1389575.patch
|
||||
|
||||
Version: 2.5.35
|
||||
Release: 7%{?dist}
|
||||
License: BSD
|
||||
Group: Development/Tools
|
||||
URL: http://flex.sourceforge.net/
|
||||
Source: flex-%{version}.tar.bz2
|
||||
Patch0: flex-2.5.35-sign.patch
|
||||
Patch1: flex-2.5.35-hardening.patch
|
||||
Patch2: flex-2.5.35-gcc44.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: m4
|
||||
BuildRequires: gettext gettext-devel bison m4 help2man gcc gcc-c++ automake libtool
|
||||
BuildRequires: make
|
||||
|
||||
Obsoletes: flex-doc < 2.6.4-8
|
||||
Provides: flex-doc = %{version}-%{release}
|
||||
BuildRequires: gettext bison m4
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
|
||||
%description
|
||||
The flex program generates scanners. Scanners are programs which can
|
||||
|
|
@ -36,65 +29,20 @@ build process.
|
|||
You should install flex if you are going to use your system for
|
||||
application development.
|
||||
|
||||
# We keep the libraries in separate sub-package to allow for multilib
|
||||
# installations of flex.
|
||||
|
||||
%define somajor 2
|
||||
|
||||
%package -n libfl%{somajor}
|
||||
Summary: Libraries for the flex scanner generator
|
||||
|
||||
%description -n libfl%{somajor}
|
||||
flex is a tool for generating scanners.
|
||||
|
||||
This package contains the shared library with default implementations of
|
||||
`main' and `yywrap' functions that binaries using flex can choose to link
|
||||
against instead of implementing on their own.
|
||||
|
||||
%package -n libfl-devel
|
||||
Summary: Development files for the flex scanner generator
|
||||
Requires: libfl%{somajor} = %{version}-%{release}
|
||||
|
||||
%description -n libfl-devel
|
||||
flex is a tool for generating scanners.
|
||||
|
||||
This package contains files required to build programs that use flex
|
||||
libraries.
|
||||
|
||||
%package -n libfl-static
|
||||
Summary: Static libraries for the flex scanner generator
|
||||
# We renamed flex-static to flex-devel in version 2.5.35-15:
|
||||
Obsoletes: flex-static < 2.5.35-15
|
||||
Provides: flex-static = %{version}-%{release}
|
||||
# We renamed flex-devel to libfl-static in version 2.6.4-6. This clarifies
|
||||
# the nature of the package and brings us in line with naming used by SUSE
|
||||
# and Debian:
|
||||
Obsoletes: flex-devel < 2.6.4-6
|
||||
Provides: flex-devel = %{version}-%{release}
|
||||
|
||||
%description -n libfl-static
|
||||
|
||||
flex is a tool for generating scanners.
|
||||
|
||||
This package contains the static library with default implementations of
|
||||
`main' and `yywrap' functions that binaries using flex can choose to
|
||||
statically link against instead of implementing their own.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -i
|
||||
%configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS"
|
||||
%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
|
||||
rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO,AUTHORS,COPYING,ONEWS}
|
||||
# Exclude libtool archives (.la) as per Fedora packaging guidelines
|
||||
find %{buildroot} -name '*.la' -delete
|
||||
|
||||
( cd ${RPM_BUILD_ROOT}
|
||||
ln -sf flex .%{_bindir}/lex
|
||||
|
|
@ -106,232 +54,36 @@ find %{buildroot} -name '*.la' -delete
|
|||
|
||||
%find_lang flex
|
||||
|
||||
%post
|
||||
if [ -f %{_infodir}/flex.info.gz ]; then # for --excludedocs
|
||||
/sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||:
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
if [ -f %{_infodir}/flex.info.gz ]; then # for --excludedocs
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir ||:
|
||||
fi
|
||||
fi
|
||||
|
||||
%check
|
||||
echo ============TESTING===============
|
||||
make check
|
||||
echo ============END TESTING===========
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files -f flex.lang
|
||||
%dir %{_pkgdocdir}
|
||||
%license COPYING
|
||||
%{_pkgdocdir}/NEWS
|
||||
%{_pkgdocdir}/README.md
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING NEWS README
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*
|
||||
%{_libdir}/*.a
|
||||
%{_includedir}/FlexLexer.h
|
||||
%{_infodir}/flex.info*
|
||||
|
||||
%files -n libfl%{somajor}
|
||||
%{_libdir}/libfl.so.%{somajor}*
|
||||
|
||||
%files -n libfl-devel
|
||||
%{_includedir}/FlexLexer.h
|
||||
%{_libdir}/libfl.so
|
||||
|
||||
%files -n libfl-static
|
||||
%dir %{_pkgdocdir}
|
||||
%license COPYING
|
||||
%{_libdir}/*.a
|
||||
|
||||
%changelog
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Apr 23 2024 Arjun Shankar <arjun@redhat.com> - 2.6.4-17
|
||||
- Provide flex-doc via the main flex package
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Oct 30 2023 Arjun Shankar <arjun@redhat.com> - 2.6.4-14
|
||||
- Analyse flex sources for license information
|
||||
- Migrate License field to SPDX identifiers for
|
||||
https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
|
||||
(#2222083)
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu May 06 2021 Arjun Shankar <arjun@redhat.com> - 2.6.4-8
|
||||
- Remove and obsolete the flex-doc subpackage; documention is provided in the
|
||||
main package itself
|
||||
- Specify versions in "Provides:" lines for flex-static and flex-devel
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Aug 21 2020 Arjun Shankar <arjun@redhat.com> - 2.6.4-6
|
||||
- Re-work flex subpackages and provide shared libraries (#1327851):
|
||||
- Remove and obsolete the flex-devel subpackage containing static libraries
|
||||
- Provide shared libraries in a new subpackage named libfl2
|
||||
- Provide development files in a new subpackage named libfl-devel
|
||||
- Provide static libraries in a new subpackage named libfl-static
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Sep 03 2018 Arjun Shankar <arjun@redhat.com> - 2.6.4-1
|
||||
- Rebase to 2.6.4
|
||||
- Fix build failure due to missing include and `reallocarray' prototype
|
||||
- Add gettext-devel, automake and libtool to build dependencies, and
|
||||
execute `autoreconf -i' to regenerate files after patching configure.ac
|
||||
|
||||
* Mon Jul 23 2018 Arjun Shankar <arjun@redhat.com> - 2.6.1-10
|
||||
- Add gcc-c++ as a build-time requirement
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jun 27 2018 Arjun Shankar <arjun@redhat.com> - 2.6.1-8
|
||||
- Remove g++ signed/unsigned comparison warning in generated scanner
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.6.1-7
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.6.1-3
|
||||
- Add missing %%license macro
|
||||
|
||||
* Sun Sep 25 2016 Patsy Franklin <pfrankli@redhat.com> - 2.6.1-2
|
||||
- Fix several type comparison issues including BZ #1373601
|
||||
|
||||
* Tue Sep 13 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.6.1-1
|
||||
- Rebase to 2.6.1 (#1318074,#1364943)
|
||||
- update URL (github), drop unused patches (#1238860)
|
||||
|
||||
* 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
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.39-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Oct 29 2015 Patsy Franklin <pfrankli@redhat.com> - 2.5.39-3
|
||||
- Remove obsolete patches from git repository. (BZ #1238860)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.39-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Apr 13 2015 Patsy Franklin <pfrankli@redhat.com> - 2.5.39-1
|
||||
- Rebase to 2.5.39
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.37-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jul 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 2.5.37-7
|
||||
- Make docdir unversioned where appropriate (#993754)
|
||||
- Install docs to one common package doc dir, drop separate one for -doc
|
||||
- Include COPYING in -devel
|
||||
- Fix bogus dates in %%changelog
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.37-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Apr 16 2014 Patsy Franklin <pfrankli@redhat.com> - 2.5.37-5
|
||||
- Add a patch to remove obsolete bison constructs YYLEX_PARAM and
|
||||
YYPARSE_PARAM. Use %%lex-param, %%parse-param, or %%param.
|
||||
|
||||
* Tue Sep 3 2013 Petr Machata <pmachata@redhat.com> - 2.5.37-4
|
||||
- Add a patch for "comparison between signed and unsigned" warnings
|
||||
that GCC produces when compiling flex-generated scanners
|
||||
(flex-2.5.37-types.patch)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.37-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Apr 4 2013 Petr Machata <pmachata@redhat.com> - 2.5.37-2
|
||||
- Update config.sub and config.guess to support aarch64
|
||||
|
||||
* Wed Mar 20 2013 Petr Machata <pmachata@redhat.com> - 2.5.37-1
|
||||
- Rebase to 2.5.37
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.36-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Oct 26 2012 Petr Machata <pmachata@redhat.com> - 2.5.36-2
|
||||
- Bump for rebuild
|
||||
|
||||
* Tue Jul 31 2012 Petr Machata <pmachata@redhat.com> - 2.5.36-1
|
||||
- Rebase to 2.5.36
|
||||
- Drop flex-2.5.35-sign.patch, flex-2.5.35-hardening.patch,
|
||||
flex-2.5.35-gcc44.patch, flex-2.5.35-missing-prototypes.patch
|
||||
- Add flex-2.5.36-bison-2.6.1.patch
|
||||
- Add a subpackage doc
|
||||
- Resolves #842073
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.35-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Mar 12 2012 Petr Machata <pmachata@redhat.com> - 2.5.35-15
|
||||
- Rename flex-static to flex-devel so that it gets to repositories of
|
||||
minor multi-lib arch (i386 on x86_64 etc.)
|
||||
- Resolves: #674301
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.35-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.35-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Aug 17 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-12
|
||||
- Drop the dependency of core package on flex-static.
|
||||
- Resolves: #624549
|
||||
|
||||
* Wed Jul 14 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-11
|
||||
- Forgot that the changes in flex.skl won't propagate to skel.c
|
||||
- Resolves: #612465
|
||||
|
||||
* Tue Jul 13 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-10
|
||||
- Declare yyget_column and yyset_column in reentrant mode.
|
||||
- Resolves: #612465
|
||||
|
||||
* Wed Jan 20 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-9
|
||||
- Move libraries into a sub-package of their own.
|
||||
|
||||
* Tue Jan 12 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-8
|
||||
- Add source URL
|
||||
|
||||
* Mon Aug 24 2009 Petr Machata <pmachata@redhat.com> - 2.5.35-7
|
||||
- Fix installation with --excludedocs
|
||||
- Resolves: #515928
|
||||
|
|
@ -450,7 +202,7 @@ echo ============END TESTING===========
|
|||
* Wed Mar 8 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.4
|
||||
- adding test for #183098 into build process
|
||||
|
||||
* Thu Mar 2 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.3
|
||||
* Fri Mar 2 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.3
|
||||
- rebuilt, no changes inside. In hunt for #183098
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4a-37.2
|
||||
|
|
@ -459,7 +211,7 @@ echo ============END TESTING===========
|
|||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4a-37.1
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Thu Feb 02 2006 Petr Machata <pmachata@redhat.com> 2.5.4a-37
|
||||
* Wed Feb 02 2006 Petr Machata <pmachata@redhat.com> 2.5.4a-37
|
||||
- adding `make bigcheck' into build process. Refreshing initscan.c to
|
||||
make this possible.
|
||||
|
||||
|
|
|
|||
19
gating.yaml
19
gating.yaml
|
|
@ -1,19 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Autogenerates the quilt `series` from the patch order in the spec file.
|
||||
# We don't use `quilt setup` because it makes a huge mess and doesn't work.
|
||||
component="flex"
|
||||
rm -f series.new
|
||||
extra_args="--fuzz=0"
|
||||
count=0
|
||||
# Filter out the patches, and use `_` as our pseudo-IFS to prevent expansion.
|
||||
for i in `grep '^%patch' flex.spec | sed -e 's,%patch,,g' -e 's, ,_,g'`; do
|
||||
# Split the patch into number and arguments.
|
||||
# 1 - Patch number.
|
||||
# 2-N - Patch arguments.
|
||||
# Get back our elements by undoing pseudo-IFS change.
|
||||
elements=(`echo $i | sed -e 's,_, ,g'`)
|
||||
num=${elements[0]}
|
||||
args=${elements[@]:1}
|
||||
# Find the next patch that applies in order and write it out.
|
||||
# This way we transform the patch # list into a patch file list in order.
|
||||
grep "Patch${num}: " flex.spec \
|
||||
| sed -e 's,Patch.*: ,,g' -e "s,\$, ${args[@]} ${extra_args},g" \
|
||||
| sed -e "s,%{name},${component},g" \
|
||||
>> series.new
|
||||
((count++))
|
||||
done
|
||||
# Double check we processed the correct number of patches.
|
||||
fcount=`wc -l series.new | sed -e 's, .*$,,g'`
|
||||
if [ $fcount -ne $count ]; then
|
||||
echo "Error! Processed patch count doesn't match spec file count ($fcount != $count)."
|
||||
exit 1
|
||||
fi
|
||||
echo "Processed $count patches."
|
||||
mv series.new series
|
||||
echo "Generated quilt ./series file. Please do not commit."
|
||||
exit 0
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
summary: CI Gating Plan
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Patches are in the current directory.
|
||||
export QUILT_PATCHES=$PWD
|
||||
# Extract source file name from sources file,
|
||||
# and assume it's the same name as the directory.
|
||||
source=`awk -F '[() ]+' '/^[A-Z0-9]+ /{print $2}; /^[0-9a-f]+ /{print $2}' sources`
|
||||
srcdir=${source%.tar.gz}
|
||||
if [ "$1" == "-f" ] && [ -d "$srcdir" ]; then
|
||||
echo Cleaning up $srcdir
|
||||
rm -rf $srcdir
|
||||
fi
|
||||
if [ -d "$srcdir" ]; then
|
||||
# Don't overwrite existing source directory.
|
||||
echo "ERROR: Source directory $srcdir already exists. Use -f to force cleanup step."
|
||||
exit 1
|
||||
fi
|
||||
tar xvf $source
|
||||
echo "Entering $srcdir"
|
||||
pushd $srcdir
|
||||
# Apply all patches.
|
||||
quilt push -a
|
||||
popd
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (flex-2.6.4.tar.gz) = e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
|
||||
10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /tools/flex/Sanity/smoke-check-flex-runs
|
||||
# Description: Show your version. Build a one-file project.
|
||||
# Author: Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2015 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
export TEST=/tools/flex/Sanity/smoke-check-flex-runs
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE count_chars_and_lines.l calc-lexer.l calc-grammar.y expected_calc_output.txt
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
run: $(FILES) build
|
||||
./runtest.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
test -x runtest.sh || chmod a+x runtest.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ $(BUILT_FILES)
|
||||
|
||||
|
||||
include /usr/share/rhts/lib/rhts-make.include
|
||||
|
||||
$(METADATA): Makefile
|
||||
@echo "Owner: Vaclav Kadlcik <vkadlcik@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: Show your version. Build a one-file project." >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 15m" >> $(METADATA)
|
||||
@echo "RunFor: flex" >> $(METADATA)
|
||||
@echo "Requires: flex bison gcc" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2+" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
PURPOSE of /tools/flex/Sanity/smoke-check-flex-runs
|
||||
Description: Show your version. Build a one-file project.
|
||||
Author: Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
%{
|
||||
#include <stdio.h>
|
||||
%}
|
||||
|
||||
%token NUMBER
|
||||
%token ADD SUB MUL DIV
|
||||
%token EOL
|
||||
|
||||
%%
|
||||
|
||||
input:
|
||||
| input EOL { }
|
||||
| input expression EOL { printf("%d\n", $2); }
|
||||
;
|
||||
|
||||
expression:
|
||||
factor
|
||||
| expression ADD factor { $$ = $1 + $3; }
|
||||
| expression SUB factor { $$ = $1 - $3; }
|
||||
;
|
||||
|
||||
factor:
|
||||
NUMBER
|
||||
| factor MUL NUMBER { $$ = $1 * $3; }
|
||||
| factor DIV NUMBER { $$ = $1 / $3; }
|
||||
;
|
||||
|
||||
%%
|
||||
|
||||
int main(int argc, char ** argv) {
|
||||
yyparse();
|
||||
}
|
||||
|
||||
yyerror(char *s) {
|
||||
fprintf(stderr, "ERROR: %s\n", s);
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
%option noyywrap
|
||||
%{
|
||||
#include "calc-grammar.tab.h"
|
||||
%}
|
||||
|
||||
%%
|
||||
"+" { return ADD; }
|
||||
"-" { return SUB; }
|
||||
"*" { return MUL; }
|
||||
"/" { return DIV; }
|
||||
[0-9]+ { yylval = atoi(yytext); return NUMBER; }
|
||||
\n { return EOL; }
|
||||
[ \t] { /* ignore whitespaces */ }
|
||||
. { yyerror("unexpected character %c", *yytext); }
|
||||
%%
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
%option noyywrap
|
||||
%{
|
||||
#include <stdio.h>
|
||||
|
||||
int chars = 0;
|
||||
int lines = 0;
|
||||
%}
|
||||
|
||||
%%
|
||||
|
||||
\n { lines++; chars++; }
|
||||
. { chars++; }
|
||||
|
||||
%%
|
||||
|
||||
int main(int argc, char ** argv) {
|
||||
yylex();
|
||||
printf("chars: %d\n", chars);
|
||||
printf("lines: %d\n", lines);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
STDOUT: 7
|
||||
STDOUT: -221
|
||||
STDOUT: 42
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
summary: Show your version. Build a one-file project.
|
||||
description: ''
|
||||
contact:
|
||||
- Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||
component:
|
||||
- flex
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- flex
|
||||
- bison
|
||||
- gcc
|
||||
duration: 15m
|
||||
extra-summary: /tools/flex/Sanity/smoke-check-flex-runs
|
||||
extra-task: /tools/flex/Sanity/smoke-check-flex-runs
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /tools/flex/Sanity/smoke-check-flex-runs
|
||||
# Description: Show your version. Build a one-file project.
|
||||
# Author: Vaclav Kadlcik <vkadlcik@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2015 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="flex"
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm $PACKAGE
|
||||
yum -y install bison gcc
|
||||
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "cp count_chars_and_lines.l calc-lexer.l calc-grammar.y expected_calc_output.txt $TmpDir"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest 'Show version'
|
||||
|
||||
rlRun -t -s 'flex -V'
|
||||
rlAssertNotGrep '^STDERR:' $rlRun_LOG
|
||||
rlAssertGrep '^STDOUT: flex [0-9]' $rlRun_LOG
|
||||
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest 'Flex works standalone'
|
||||
|
||||
rlRun 'flex -o count_chars_and_lines.c count_chars_and_lines.l'
|
||||
rlRun 'gcc -o count_chars_and_lines count_chars_and_lines.c'
|
||||
rlAssertExists 'count_chars_and_lines'
|
||||
rlRun -t -s 'echo -e "nazdar\nbazar" | ./count_chars_and_lines'
|
||||
rlAssertNotGrep '^STDERR:' $rlRun_LOG
|
||||
rlAssertGrep '^STDOUT: chars: 13$' $rlRun_LOG
|
||||
rlAssertGrep '^STDOUT: lines: 2$' $rlRun_LOG
|
||||
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest 'Flex works with Bison'
|
||||
|
||||
rlRun 'bison -d calc-grammar.y'
|
||||
rlRun 'flex calc-lexer.l'
|
||||
rlRun 'gcc -o calc calc-grammar.tab.c lex.yy.c'
|
||||
rlAssertExists 'calc'
|
||||
rlRun -t -s 'echo -e "1 + 2 * 3\n1 - 666 / 3\n42" | ./calc'
|
||||
rlAssertNotDiffer expected_calc_output.txt $rlRun_LOG
|
||||
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
Loading…
Add table
Add a link
Reference in a new issue