diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 2c6fdac..b3edfc9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ flex-2.5.35.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 diff --git a/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch b/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch deleted file mode 100644 index eb46be3..0000000 --- a/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 35aba3d6e3c99fcd527c677bef8efeb59963fe8a Mon Sep 17 00:00:00 2001 -Message-Id: <35aba3d6e3c99fcd527c677bef8efeb59963fe8a.1397340102.git.srivasta@golden-gryphon.com> -From: Manoj Srivastava -Date: Wed, 9 Apr 2014 00:23:07 -0700 -Subject: [PATCH 1/1] [bison-test-fixes] Do not use obsolete bison constructs in tests. - -In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been -removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or -%param. This commit fixes the tests so they still work. - -Signed-off-by: Manoj Srivastava ---- - tests/test-bison-yylloc/parser.y | 4 ++-- - tests/test-bison-yylval/parser.y | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - 50.0% tests/test-bison-yylloc/ - 50.0% tests/test-bison-yylval/ - -diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y -index e8f4e56..224d252 100644 ---- a/tests/test-bison-yylloc/parser.y -+++ b/tests/test-bison-yylloc/parser.y -@@ -22,6 +22,7 @@ - */ - - %parse-param { void* scanner } -+%lex-param { void* scanner } - - /* - How to compile: -@@ -34,7 +35,6 @@ - #include "config.h" - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - extern int testget_lineno(void*); - -@@ -52,7 +52,7 @@ int process_text(char* s) { - - %} - --%pure_parser -+%pure-parser - - %union { - int lineno; -diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.y -index 0ffdb89..626c5e7 100644 ---- a/tests/test-bison-yylval/parser.y -+++ b/tests/test-bison-yylval/parser.y -@@ -26,6 +26,7 @@ - bison --defines --output-file="parser.c" --name-prefix="test" parser.y - */ - %parse-param { void* scanner } -+%lex-param { void* scanner } - %{ - #include - #include -@@ -33,7 +34,6 @@ - #include "config.h" - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - - /* A dummy function. A check against seg-faults in yylval->str. */ -@@ -49,7 +49,7 @@ int process_text(char* s) { - - %} - --%pure_parser -+%pure-parser - - %union { - long unused; --- -1.9.2 - diff --git a/README.quilt b/README.quilt new file mode 100644 index 0000000..e53b9b9 --- /dev/null +++ b/README.quilt @@ -0,0 +1,40 @@ +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! diff --git a/flex-2.6.0-num_to_read.patch b/flex-2.6.0-num_to_read.patch deleted file mode 100644 index 8c1ab69..0000000 --- a/flex-2.6.0-num_to_read.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nrup a/src/flex.skl b/src/flex.skl ---- a/src/flex.skl 2016-07-27 11:11:48.528378027 -0400 -+++ b/src/flex.skl 2016-07-27 11:14:03.012351701 -0400 -@@ -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 -Nrup a/src/scan.c b/src/scan.c ---- a/src/scan.c 2015-11-17 11:17:41.000000000 -0500 -+++ b/src/scan.c 2016-07-27 11:14:18.126674417 -0400 -@@ -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 -Nrup a/src/skel.c b/src/skel.c ---- a/src/skel.c 2015-11-17 11:17:39.000000000 -0500 -+++ b/src/skel.c 2016-07-27 11:14:36.362857240 -0400 -@@ -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 )", diff --git a/flex-2.6.0-yyless.patch b/flex-2.6.0-yyless.patch deleted file mode 100644 index 4bb7c3e..0000000 --- a/flex-2.6.0-yyless.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nrup a/src/flex.skl b/src/flex.skl ---- a/src/flex.skl 2015-11-10 18:28:54.000000000 -0500 -+++ b/src/flex.skl 2016-03-07 23:52:46.527139783 -0500 -@@ -506,7 +506,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], - */ - #define YY_LESS_LINENO(n) \ - do { \ -- int yyl;\ -+ yy_size_t yyl;\ - for ( yyl = n; yyl < yyleng; ++yyl )\ - if ( yytext[yyl] == '\n' )\ - --yylineno;\ -@@ -532,7 +532,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], - do \ - { \ - /* Undo effects of setting up yytext. */ \ -- int yyless_macro_arg = (n); \ -+ yy_size_t yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = YY_G(yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ -@@ -2591,7 +2591,7 @@ void yyFlexLexer::LexerError( yyconst ch - do \ - { \ - /* Undo effects of setting up yytext. */ \ -- int yyless_macro_arg = (n); \ -+ yy_size_t yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = YY_G(yy_hold_char); \ - YY_G(yy_c_buf_p) = yytext + yyless_macro_arg; \ diff --git a/flex-bz1364943.patch b/flex-bz1364943.patch deleted file mode 100644 index 69707d1..0000000 --- a/flex-bz1364943.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 07d89829cce4527c7614a34642d4b2c2ef5d6005 -Author: Will Estes -Date: Fri Dec 11 09:45:14 2015 -0500 - - Commented in C style in skeleton; fixed sf#195 - -diff --git a/src/flex.skl b/src/flex.skl -index b63c8c8..40287b6 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/flex-rh1389575.patch b/flex-rh1389575.patch new file mode 100644 index 0000000..9095626 --- /dev/null +++ b/flex-rh1389575.patch @@ -0,0 +1,39 @@ +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 +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]) diff --git a/flex.spec b/flex.spec index c6719d5..90a52a3 100644 --- a/flex.spec +++ b/flex.spec @@ -1,27 +1,26 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -Summary: A tool for creating scanners (text pattern recognizers) +Summary: A tool for generating scanners (text pattern recognizers) Name: flex -Version: 2.6.0 -Release: 3%{?dist} -# parse.c and parse.h are under GPLv3+ with exception which allows -# relicensing. Since flex is shipped under BDS-style license, -# let's assume that the relicensing was done. -# gettext.h (copied from gnulib) is under LGPLv2+ -License: BSD and LGPLv2+ -Group: Development/Tools -URL: http://flex.sourceforge.net/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Version: 2.6.4 +Release: 20%{?dist} -Patch0: flex-2.6.0-yyless.patch -Patch1: flex-2.6.0-num_to_read.patch -Patch2: flex-bz1364943.patch +# 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: m4 -BuildRequires: gettext bison m4 help2man -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +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} %description The flex program generates scanners. Scanners are programs which can @@ -39,34 +38,53 @@ application development. # We keep the libraries in separate sub-package to allow for multilib # installations of flex. -%package devel -Summary: Libraries for flex scanner generator -Group: Development/Tools + +%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 +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 devel +%description -n libfl-static -This package contains the library with default implementations of -`main' and `yywrap' functions that the client binary can choose to use -instead of implementing their own. +flex is a tool for generating scanners. -%package doc -Summary: Documentation for flex scanner generator -Group: Documentation - -%description doc - -This package contains documentation for flex scanner generator in -plain text and PDF formats. +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 -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build +autoreconf -i %configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -74,16 +92,9 @@ make %{?_smp_mflags} 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} -# For now, excluding the new .la and .so files as we haven't had -# any requests for them and adding them will require a new subpackage. -# The .so files contain 2 optional implementations of main and yywrap -# for developer convenience. They are also available in the .a file -# provided in flex-devel. +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 -find %{buildroot} -name '*.so' -delete -find %{buildroot} -name '*.so.2' -delete -find %{buildroot} -name '*.so.2.0.0' -delete ( cd ${RPM_BUILD_ROOT} ln -sf flex .%{_bindir}/lex @@ -95,50 +106,136 @@ find %{buildroot} -name '*.so.2.0.0' -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 -%defattr(-,root,root) %dir %{_pkgdocdir} -%{_pkgdocdir}/COPYING +%license COPYING %{_pkgdocdir}/NEWS -%{_pkgdocdir}/README +%{_pkgdocdir}/README.md %{_bindir}/* %{_mandir}/man1/* %{_includedir}/FlexLexer.h %{_infodir}/flex.info* -%files devel -%defattr(-,root,root) +%files -n libfl%{somajor} +%{_libdir}/libfl.so.%{somajor}* + +%files -n libfl-devel +%{_includedir}/FlexLexer.h +%{_libdir}/libfl.so + +%files -n libfl-static %dir %{_pkgdocdir} -%{_pkgdocdir}/COPYING +%license COPYING %{_libdir}/*.a -%files doc -%defattr(-,root,root) -%{_pkgdocdir} - %changelog -* Thu Oct 20 2016 Patsy Franklin - 2.6.0-3 -- Replace C++ style comment with C comment. BZ #1364943 +* Wed Jul 23 2025 Fedora Release Engineering - 2.6.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 2.6.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 2.6.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Apr 23 2024 Arjun Shankar - 2.6.4-17 +- Provide flex-doc via the main flex package + +* Wed Jan 24 2024 Fedora Release Engineering - 2.6.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.6.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 30 2023 Arjun Shankar - 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 - 2.6.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.6.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.6.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.6.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.6.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 06 2021 Arjun Shankar - 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 - 2.6.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Aug 21 2020 Arjun Shankar - 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 - 2.6.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.6.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Sep 03 2018 Arjun Shankar - 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 - 2.6.1-10 +- Add gcc-c++ as a build-time requirement + +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Arjun Shankar - 2.6.1-8 +- Remove g++ signed/unsigned comparison warning in generated scanner + +* Fri Feb 09 2018 Igor Gnatenko - 2.6.1-7 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 2.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Feb 01 2017 Stephen Gallagher - 2.6.1-3 +- Add missing %%license macro + +* Sun Sep 25 2016 Patsy Franklin - 2.6.1-2 +- Fix several type comparison issues including BZ #1373601 + +* Tue Sep 13 2016 Rex Dieter - 2.6.1-1 +- Rebase to 2.6.1 (#1318074,#1364943) +- update URL (github), drop unused patches (#1238860) * Wed Jul 27 2016 Patsy Franklin - 2.6.0-2 Fix wrong type on num_to_read. BZ #1360744 @@ -173,7 +270,7 @@ rm -rf ${RPM_BUILD_ROOT} * Wed Apr 16 2014 Patsy Franklin - 2.5.37-5 - Add a patch to remove obsolete bison constructs YYLEX_PARAM and - YYPARSE_PARAM. Use %lex-param, %parse-param, or %param. + YYPARSE_PARAM. Use %%lex-param, %%parse-param, or %%param. * Tue Sep 3 2013 Petr Machata - 2.5.37-4 - Add a patch for "comparison between signed and unsigned" warnings diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce3cdc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !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} diff --git a/gen-quilt-series.sh b/gen-quilt-series.sh new file mode 100755 index 0000000..6a2fc3a --- /dev/null +++ b/gen-quilt-series.sh @@ -0,0 +1,34 @@ +#!/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 diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..3fd3ab7 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,5 @@ +summary: CI Gating Plan +discover: + how: fmf +execute: + how: tmt diff --git a/quilt-patch.sh b/quilt-patch.sh new file mode 100755 index 0000000..ff55b53 --- /dev/null +++ b/quilt-patch.sh @@ -0,0 +1,22 @@ +#!/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 diff --git a/sources b/sources index 628235b..67236e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -266270f13c48ed043d95648075084d59 flex-2.6.0.tar.bz2 +SHA512 (flex-2.6.4.tar.gz) = e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e diff --git a/tests/Sanity/smoke-check-flex-runs/Makefile b/tests/Sanity/smoke-check-flex-runs/Makefile new file mode 100644 index 0000000..3abe871 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/flex/Sanity/smoke-check-flex-runs +# Description: Show your version. Build a one-file project. +# Author: Vaclav Kadlcik +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# 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 " > $(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) diff --git a/tests/Sanity/smoke-check-flex-runs/PURPOSE b/tests/Sanity/smoke-check-flex-runs/PURPOSE new file mode 100644 index 0000000..ed0f21f --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/flex/Sanity/smoke-check-flex-runs +Description: Show your version. Build a one-file project. +Author: Vaclav Kadlcik diff --git a/tests/Sanity/smoke-check-flex-runs/calc-grammar.y b/tests/Sanity/smoke-check-flex-runs/calc-grammar.y new file mode 100644 index 0000000..53d4a85 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/calc-grammar.y @@ -0,0 +1,36 @@ +%{ +#include +%} + +%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); +} diff --git a/tests/Sanity/smoke-check-flex-runs/calc-lexer.l b/tests/Sanity/smoke-check-flex-runs/calc-lexer.l new file mode 100644 index 0000000..fa9ac41 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/calc-lexer.l @@ -0,0 +1,15 @@ +%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); } +%% diff --git a/tests/Sanity/smoke-check-flex-runs/count_chars_and_lines.l b/tests/Sanity/smoke-check-flex-runs/count_chars_and_lines.l new file mode 100644 index 0000000..7b90045 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/count_chars_and_lines.l @@ -0,0 +1,21 @@ +%option noyywrap +%{ +#include + +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; +} diff --git a/tests/Sanity/smoke-check-flex-runs/expected_calc_output.txt b/tests/Sanity/smoke-check-flex-runs/expected_calc_output.txt new file mode 100644 index 0000000..7baa841 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/expected_calc_output.txt @@ -0,0 +1,3 @@ +STDOUT: 7 +STDOUT: -221 +STDOUT: 42 diff --git a/tests/Sanity/smoke-check-flex-runs/main.fmf b/tests/Sanity/smoke-check-flex-runs/main.fmf new file mode 100644 index 0000000..2b25e69 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/main.fmf @@ -0,0 +1,15 @@ +summary: Show your version. Build a one-file project. +description: '' +contact: +- Vaclav Kadlcik +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 diff --git a/tests/Sanity/smoke-check-flex-runs/runtest.sh b/tests/Sanity/smoke-check-flex-runs/runtest.sh new file mode 100755 index 0000000..68ee8a3 --- /dev/null +++ b/tests/Sanity/smoke-check-flex-runs/runtest.sh @@ -0,0 +1,78 @@ +#!/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 +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# 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