Improve spec file compatibility [2/2] (#163)

.github/workflows/validate-cg-manifest.sh

@@ -19,6 +19,7 @@ ignore_list=" \
   mariner-rpm-macros \
   moby-buildx \
   moby-containerd \
+  openjdk8 \
   qt5-rpm-macros \
   runc \
   grub2-efi-binary-signed-aarch64 \

SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON

@@ -21,12 +21,18 @@ xinted
 python-iniparse
 
 SPEC files that are derived from Fedora SPEC files, which are under the MIT license unless specifically noted otherwise (https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files):
+atf
 c-ares
 chkconfig
-initscripts
+dwz
-oniguruma
 elfutils
-zsh
+initscripts
+kyua
+lua
+lutok
+lvm2
+mariadb
+oniguruma
 perl-DBI
 perl-DBIx-simple
 perl-exporter-tiny
@@ -41,14 +47,14 @@ perl-types-serializer
 perl-www-curl
 perl-yaml
 perl-yaml-tiny
-tcsh
+pkgconf
-tcl
-python-pbr
 pypam
+python-pbr
 pyyaml
-mariadb
-lvm2
 systemtap
+tcl
+tcsh
+zsh
 
 SPEC files that are derived from OpenSuse SPEC files, which are under the license of the package itself, or MIT license if it the package is not under an open source license (https://en.opensuse.org/openSUSE:Specfile_guidelines):
 python-jinja2

SPECS/atf/README

@@ -0,0 +1,22 @@
+This package provides the full collection of test programs to validate
+the functionality of ATF, including all of its libraries and tools.
+
+Because the Linux Standard Base does not recognize a /usr/tests/
+directory (the standard location for ATF-based tests), the Fedora ATF
+packages place its own test suite within the libexec hierarchy.  In
+particular, such tests can be found in /usr/libexec/atf/tests/ .
+
+In order to execute these tests, you need to go into the directory and
+use either kyua(1) (provided by the kyua-cli package) or atf-run(1) to
+run them.  It is highly recommended that you use kyua(1) instead of
+atf-run(1), as the latter is deprecated in favor of the former.
+
+As an example, you can simply do the following to run the full test
+suite:
+
+    $ kyua test -k /usr/libexec/atf/tests/Kyuafile
+
+Or, using the deprecated tools:
+
+    $ cd /usr/libexec/atf/tests/
+    $ atf-run | atf-report

SPECS/atf/atf.signatures.json

@@ -0,0 +1,6 @@
+{
+ "Signatures": {
+  "README": "53d994475bc9a2a10891860c3a865ef0291186998c0a423448c660a478349059",
+  "atf-0.20.tar.gz": "9bc4ab004603331301410c293394b7e8b7341e59a528a4b51e16effeb1142cd9"
+ }
+}

SPECS/atf/atf.spec

@@ -0,0 +1,278 @@
+Name:          atf
+Version:       0.20
+Release:       16%{?dist}
+License:       BSD
+Summary:       Automated Testing Framework
+Vendor:        Microsoft Corporation
+Distribution:  Mariner
+URL:           https://github.com/jmmv/atf
+
+Source0: https://github.com/jmmv/atf/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1: README
+
+%define _testsdir %{_libexecdir}/atf/tests
+
+%define common_description The Automated Testing Framework (ATF) is a collection of libraries to \
+implement test programs in a variety of languages.  At the moment, ATF \
+offers C, C++ and POSIX shell bindings with which to implement tests. \
+These bindings all offer a similar set of functionality and any test \
+program written with them exposes a consistent user interface. \
+\
+ATF-based test programs rely on a separate runtime engine to execute them. \
+The runtime engine is in charge of isolating the test programs from the \
+rest of the system to ensure that their results are deterministic and that \
+they cannot affect the running system.  The runtime engine is also \
+responsible for gathering the results of all tests and composing reports. \
+The current runtime of choice is Kyua.
+
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+
+%description
+There is no main package being built here.  This is unused.
+
+%prep
+%setup -q
+
+# Put the README file in the top-level directory of the source tree so
+# that the %doc call below can pick it up.
+cp -p %{SOURCE1} README
+
+%build
+%configure INSTALL="/usr/bin/install -p" --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags} pkgtestsdir=%{_testsdir} testsdir=%{_testsdir}
+
+%if %{with_check}
+%check
+make check
+%endif
+
+%install
+make install DESTDIR=%{buildroot} doc_DATA= \
+             pkgtestsdir=%{_testsdir} testsdir=%{_pkgtestsdir}
+rm %{buildroot}%{_libdir}/libatf*.la
+
+# Ideally, we would ship one tests package for every component, namely
+# libatf-c-tests, libatf-c++-tests and libatf-sh-tests.  However, the test
+# suite of ATF has not been written with this in mind, and the tests of one
+# component often have dependencies on the rest of the components.  It is
+# much easier to ship a single package with the whole test suite rather
+# than attempting to fight this fact.
+%package tests
+Summary: Automated Testing Framework - Test suite
+Requires: libatf-c = %{version}-%{release}
+Requires: libatf-c++ = %{version}-%{release}
+Requires: libatf-sh = %{version}-%{release}
+Requires: libatf-c-devel = %{version}-%{release}
+Requires: libatf-c++-devel = %{version}-%{release}
+Requires: libatf-sh-devel = %{version}-%{release}
+
+%description tests
+%{common_description}
+
+This package installs the run-time tests for all the components of ATF, which
+include tests for the C, C++ and POSIX shell libraries and the run-time tools.
+Please see the README file in the documentation directory for further
+details on how to run the installed tests.
+
+%files tests
+%doc README
+%{_testsdir}
+
+
+%package -n libatf-c
+Summary: Automated Testing Framework - C bindings
+
+%description -n libatf-c
+%{common_description}
+
+This package provides the run-time libraries to run tests that use the
+ATF C bindings.
+
+%files -n libatf-c
+%license COPYING
+%{_libdir}/libatf-c.so.0
+%{_libdir}/libatf-c.so.0.0.0
+%{_datadir}/man/man1/atf-test-program.1.gz
+%{_datadir}/man/man4/atf-test-case.4.gz
+
+%ldconfig_scriptlets -n libatf-c
+
+
+%package -n libatf-c-devel
+Summary: Automated Testing Framework - C bindings (headers)
+Requires: libatf-c = %{version}-%{release}
+
+%description -n libatf-c-devel
+%{common_description}
+
+This package provides the libraries, header files and documentation to
+develop tests that use the ATF C bindings.
+
+%files -n libatf-c-devel
+%{_datadir}/aclocal/atf-c.m4
+%{_datadir}/aclocal/atf-common.m4
+%{_includedir}/atf-c.h
+%{_includedir}/atf-c
+%{_libdir}/libatf-c.so
+%{_libdir}/pkgconfig/atf-c.pc
+%{_mandir}/man3/atf-c-api.3.gz
+
+
+%package -n libatf-c++
+Summary: Automated Testing Framework - C++ bindings
+
+%description -n libatf-c++
+%{common_description}
+
+This package provides the run-time libraries to run tests that use the
+ATF C++ bindings.
+
+%files -n libatf-c++
+%license COPYING
+%{_libdir}/libatf-c++.so.1
+%{_libdir}/libatf-c++.so.1.0.0
+
+%ldconfig_scriptlets -n libatf-c++
+
+
+%package -n libatf-c++-devel
+Summary: Automated Testing Framework - C++ bindings (headers)
+Requires: libatf-c = %{version}-%{release}
+Requires: libatf-c-devel = %{version}-%{release}
+Requires: libatf-c++ = %{version}-%{release}
+
+%description -n libatf-c++-devel
+%{common_description}
+
+This package provides the libraries, header files and documentation to
+develop applications that use the ATF C++ bindings.
+
+%files -n libatf-c++-devel
+%{_datadir}/aclocal/atf-c++.m4
+%{_includedir}/atf-c++.hpp
+%{_includedir}/atf-c++
+%{_libdir}/libatf-c++.so
+%{_libdir}/pkgconfig/atf-c++.pc
+%{_mandir}/man3/atf-c++-api.3.gz
+
+
+%package -n libatf-sh
+Summary: Automated Testing Framework - POSIX shell bindings
+Requires: libatf-c++ = %{version}-%{release}
+
+%description -n libatf-sh
+%{common_description}
+
+This package provides the run-time libraries to run tests that use the
+ATF POSIX shell bindings.
+
+%files -n libatf-sh
+%{_bindir}/atf-sh
+# Cheat a bit: While this directory should be supposedly owned by the main
+# 'atf' package, 'atf' depends on libatf-sh.  Therefore, it's easier to handle
+# ownership here.
+%{_datadir}/atf
+%{_libexecdir}/atf-check
+%{_mandir}/man1/atf-sh.1.gz
+
+
+%package -n libatf-sh-devel
+Summary: Automated Testing Framework - POSIX shell bindings (headers)
+Requires: libatf-sh = %{version}-%{release}
+
+%description -n libatf-sh-devel
+%{common_description}
+
+This package provides the supporting files and documentation to develop
+applications that use the ATF POSIX shell bindings.
+
+%files -n libatf-sh-devel
+%{_datadir}/aclocal/atf-sh.m4
+%{_libdir}/pkgconfig/atf-sh.pc
+%{_mandir}/man1/atf-check.1.gz
+%{_mandir}/man3/atf-sh-api.3.gz
+
+%changelog
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 0.20-16
+- Initial CBL-Mariner import from Fedora 32 (license: MIT).
+- Update URL.
+- Add with_check conditional.
+- Rename README.Fedora to README.
+- Add %%license file.
+- License verified.
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.20-10
+- Switch to %%ldconfig_scriptlets
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.20-4
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Feb 10 2014 Julio Merino <julio@meroh.net> 0.20-1
+- Update to new upstream version 0.20.
+- The atf binary package, which used to provide the deprecated binary
+  tools (atf-config, atf-report, atf-run and atf-version), is now gone.
+- The libatf-c package now installs the atf-test-program(1) and
+  atf-test-case(4) manual pages and the package documentation files.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Julio Merino <julio@meroh.net> 0.17-1
+- Update to new upstream version 0.17.
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jul 10 2012 Julio Merino <julio@meroh.net> 0.16-1
+- Updated to new upstream version 0.16.
+
+* Mon Jun 18 2012 Julio Merino <jmmv@julipedia.org> 0.15-2
+- Added the atf-tests package, which provides the run-time tests of ATF
+  readily runnable by the end users.
+- Made the installation of the package preserve the build times of the files.
+- Fixed URL to the project's page.
+
+* Thu May 3 2012 Julio Merino <jmmv@julipedia.org> 0.15-1
+- Initial release for Fedora.

SPECS/check/check.spec

@@ -1,11 +1,12 @@
 Summary:        Check-0.12.0
 Name:           check
 Version:        0.12.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv2+
 URL:            https://libcheck.github.io/check/
 #Source0:       https://github.com/libcheck/check/archive/%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.gz
+Provides:       %{name}-devel = %{version}-%{release}
 Group:          Development/Tools
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -45,9 +46,10 @@ make %{?_smp_mflags} check
 /usr/share/aclocal/*
 
 %changelog
-* Sat May 09 00:21:19 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.12.0-4
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 0.12.0-5
-- Added %%license line automatically
+-   Provide check-devel
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 0.12.0-4
+-   Added %%license line automatically
 *   Thu Apr 23 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 0.12.0-3
 -   License verified.
 -   Updated 'Url' and 'Source0' tags.

SPECS/cmake/cmake.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
   "cmake-3.17.3.tar.gz": "0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40",
-  "macros.cmake": "dd2ad8398fb802f921dc6fed38bdaa4c9bc630ddecee37d10c335af2931628ff"
+  "macros.cmake": "9a6818c55dd2dc0904b240596ae8a17bbe0354ddb765be1beefd833a2c43c02c"
  }
 }

SPECS/cmake/cmake.spec

@@ -1,7 +1,9 @@
+%global major_version 3
+
 Summary:        Cmake
 Name:           cmake
 Version:        3.17.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD and LGPLv2+
 URL:            https://www.cmake.org/
 Source0:        https://github.com/Kitware/CMake/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -10,6 +12,7 @@ Patch0:         disableUnstableUT.patch
 Group:          Development/Tools
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Provides:       %{name}%{major_version} = %{version}-%{release}
 BuildRequires:  ncurses-devel
 BuildRequires:  xz
 BuildRequires:  xz-devel
@@ -48,6 +51,7 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.la' -delete
 install -Dpm0644 %{SOURCE1} %{buildroot}%{_libdir}/rpm/macros.d/macros.cmake
+sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{_libdir}/rpm/macros.d/macros.cmake
 
 %check
 make  %{?_smp_mflags} test
@@ -62,6 +66,9 @@ make  %{?_smp_mflags} test
 %{_libdir}/rpm/macros.d/macros.cmake
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 3.17.3-3
+-   Update cmake version related macros
+-   Provide cmake3
 *   Mon Jul 06 2020 Eric Li <eli@microsoft.com> 3.17.3-2
 -   Update Source0: to the new location
 *   Tue Jun 23 2020 Paul Monson <paulmon@microsoft.com> 3.17.3-1

SPECS/cmake/macros.cmake

@@ -23,3 +23,4 @@
 %endif \
 	-DBUILD_SHARED_LIBS:BOOL=ON
 
+%cmake@@CMAKE_MAJOR_VERSION@@ %cmake

SPECS/curl/curl.spec

@@ -1,7 +1,7 @@
 Summary:        An URL retrieval utility and library
 Name:           curl
 Version:        7.68.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://curl.haxx.se
 Group:          System Environment/NetworkingLibraries
@@ -26,12 +26,14 @@ functions like streaming media.
 %package devel
 Summary:    Libraries and header files for curl
 Requires:   %{name} = %{version}-%{release}
+Provides:   libcurl-devel = %{version}-%{release}
 %description devel
 Static libraries and header files for the support library for curl
 
 %package libs
 Summary: Libraries for curl
 Group:      System Environment/Libraries
+Provides:   libcurl = %{version}-%{release}
 %description libs
 This package contains minimal set of shared curl libraries.
 
@@ -87,11 +89,13 @@ rm -rf %{buildroot}/*
 %{_libdir}/libcurl.so.*
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 7.68.0-2
+-   Add explicit provides for libcurl and libcurl-devel
 *   Tue Aug 11 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 7.68.0-1
 -   Upgrading to 7.68.0 to enable verification against a partial cert chain.
 *   Thu May 14 2020 Nicolas Ontiveros <niontive@microsoft.com> 7.66.0-1
 -   Upgrade to version 7.66.0, which fixes CVE-2018-16890 and CVE-2019-3822/3833.
-*   Sat May 09 00:21:39 PST 2020 Nick Samson <nisamson@microsoft.com> - 7.61.1-6
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 7.61.1-6
 -   Added %%license line automatically
 *   Wed May 06 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 7.61.1-5
 -   Removing *Requires for "ca-certificates".

SPECS/docbook-style-xsl/docbook-style-xsl.spec

@@ -1,13 +1,14 @@
 Summary:	Docbook-xsl-1.79.1
 Name:		docbook-style-xsl
 Version:	1.79.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	ASL 2.0
 URL:		http://www.docbook.org
 Source0:	http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
 Group:		Development/Tools
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Provides:       docbook-xsl = %{version}-%{release}
 Requires:	libxml2
 BuildRequires:	libxml2
 BuildRequires:  zip
@@ -91,9 +92,10 @@ fi
 %{_docdir}/*
 
 %changelog
-* Sat May 09 00:20:40 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.79.1-10
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.79.1-11
-- Added %%license line automatically
+-   Provide docbook-xsl
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.79.1-10
+-   Added %%license line automatically
 *   Tue May 05 2020 Emre Girgin <mrgirgin@microsoft.com> 1.79.1-9
 -   Renaming docbook-xsl to docbook-style-xsl
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.79.1-8

SPECS/dwz/dwz.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "dwz-0.13.tar.xz": "e8f6b0474bff2c4880495c666724793e90960e99cce3e56b90916fc961a37335"
+ }
+}

SPECS/dwz/dwz.spec

@@ -0,0 +1,140 @@
+Summary:        DWARF optimization and duplicate removal tool
+Name:           dwz
+Version:        0.13
+Release:        4%{?dist}
+License:        GPLv2+ and GPLv3+
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+URL:            https://sourceware.org/dwz
+Source:         https://sourceware.org/ftp/dwz/releases/%{name}-%{version}.tar.xz
+BuildRequires:  gcc, elfutils-libelf-devel
+
+%description
+The dwz package contains a program that attempts to optimize DWARF
+debugging information contained in ELF shared libraries and ELF executables
+for size, by replacing DWARF information representation with equivalent
+smaller representation where possible and by reducing the amount of
+duplication using techniques from DWARF standard appendix E - creating
+DW_TAG_partial_unit compilation units (CUs) for duplicated information
+and using DW_TAG_imported_unit to import it into each CU that needs it.
+
+%prep
+%setup -q -n dwz
+
+%build
+make %{?_smp_mflags} CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' \
+  prefix=%{_prefix} mandir=%{_mandir} bindir=%{_bindir}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} prefix=%{_prefix} mandir=%{_mandir} bindir=%{_bindir} \
+  install
+
+%files
+%license COPYING COPYING3 COPYING.RUNTIME
+%{_bindir}/dwz
+%{_mandir}/man1/dwz.1*
+
+%changelog
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 0.13-4
+- Add URL.
+- License verified.
+
+* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> - 0.13-3
+- Initial CBL-Mariner import from Fedora 32 (license: MIT)
+- Remove dejagnu buildrequire and %%check
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Dec 11 2019 Jakub Jelinek <jakub@redhat.com> 0.13-1
+- update to a new upstream release
+- add make check
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 19 2018 Marek Polacek <polacek@redhat.com> 0.12-9
+- remove %{?_isa} from BuildRequires (#1545173)
+- add gcc to BuildRequires
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 23 2018 Florian Weimer <fweimer@redhat.com> - 0.12-7
+- Use LDFLAGS from redhat-rpm-config
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 0.12-3
+- Add missing %%license macro
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jul 13 2015 Jakub Jelinek <jakub@redhat.com> 0.12-1
+- fix up alignment of moved non-allocated sections and section header table
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.11-5
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul  2 2013 Jakub Jelinek <jakub@redhat.com> 0.11-1
+- handle .gdb_index version 8 (#969454)
+
+* Mon Mar 11 2013 Jakub Jelinek <jakub@redhat.com> 0.10-1
+- when creating DW_AT_stmt_list, use DW_FORM_sec_offset for dwarf4
+  and DW_FORM_data4 for dwarf[23] rather than vice versa (#919755)
+
+* Mon Feb  4 2013 Jakub Jelinek <jakub@redhat.com> 0.9-1
+- fix up handling of DIE equality if more than one DIE in the same
+  CU compare equal (#889283)
+- check DW_FORM_ref_addr properly during fi_multifile phase
+
+* Thu Nov 29 2012 Jakub Jelinek <jakub@redhat.com> 0.8-1
+- fix recompute_abbrevs (#880634)
+- optimize DW_FORM_data[48] DW_AT_high_pc that GCC 4.8 produces
+
+* Fri Aug 10 2012 Jakub Jelinek <jakub@redhat.com> 0.7-1
+- fix iterative hasing on big-endian targets (#846685)
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jul 17 2012 Jakub Jelinek <jakub@redhat.com> 0.6-1
+- add --version/-v option support (Matt Newsome)
+- fix building on RHEL 5
+
+* Wed Jul  4 2012 Jakub Jelinek <jakub@redhat.com> 0.5-1
+- handle .gdb_index version 7
+
+* Fri Jun 22 2012 Jakub Jelinek <jakub@redhat.com> 0.4-1
+- fix up DIE counting in low-mem mode for testing the -L limit
+
+* Fri Jun 15 2012 Jakub Jelinek <jakub@redhat.com> 0.3-1
+- update to dwz-0.3 (#830863)
+
+* Mon Jun 11 2012 Jakub Jelinek <jakub@redhat.com> 0.2-1
+- new package

SPECS/filesystem/filesystem.spec

@@ -1,7 +1,7 @@
 Summary:      Default file system
 Name:         filesystem
 Version:      1.1
-Release:      7%{?dist}
+Release:      8%{?dist}
 License:      GPLv3
 Group:        System Environment/Base
 Vendor:       Microsoft Corporation
@@ -31,7 +31,7 @@ install -vdm 755 %{buildroot}/usr/{,local/}share/{misc,terminfo,zoneinfo}
 install -vdm 755 %{buildroot}/usr/libexec
 install -vdm 755 %{buildroot}/usr/{,local/}share/man/man{1..8}
 install -vdm 755 %{buildroot}/etc/profile.d
-install -vdm 755 %{buildroot}/usr/lib/debug/{lib,bin,sbin,usr}
+install -vdm 755 %{buildroot}/usr/lib/debug/{lib,bin,sbin,usr,.dwz}
 
 ln -svfn usr/lib %{buildroot}/lib
 ln -svfn usr/bin %{buildroot}/bin
@@ -47,6 +47,7 @@ ln -svfn ../lib %{buildroot}/usr/lib/debug/usr/lib
 	ln -svfn lib %{buildroot}/usr/local/lib64
         ln -svfn lib %{buildroot}/usr/lib/debug/lib64
         ln -svfn ../lib %{buildroot}/usr/lib/debug/usr/lib64
+        ln -svfn ../.dwz %{buildroot}/usr/lib/debug/usr/.dwz
 
 install -vdm 755 %{buildroot}/var/{log,mail,spool,mnt,srv}
 
@@ -422,6 +423,7 @@ posix.symlink("../bin", "/usr/lib/debug/usr/bin")
 posix.symlink("../sbin", "/usr/lib/debug/usr/sbin")
 posix.symlink("../lib", "/usr/lib/debug/usr/lib")
 posix.symlink("../lib", "/usr/lib/debug/usr/lib64")
+posix.symlink("../.dwz", "/usr/lib/debug/usr/.dwz")
 return 0
 
 %files
@@ -478,6 +480,7 @@ return 0
 %dir /usr/lib/debug/lib
 %dir /usr/lib/debug/sbin
 %dir /usr/lib/debug/usr
+%dir /usr/lib/debug/.dwz
 %dir /usr/libexec
 %dir /usr/local
 %dir /usr/local/bin
@@ -532,6 +535,7 @@ return 0
 %ghost /usr/lib/debug/usr/lib
 %ghost /usr/lib/debug/usr/lib64
 %ghost /usr/lib/debug/usr/sbin
+%ghost /usr/lib/debug/usr/.dwz
 
 #	var filesystem
 %dir /var/cache
@@ -558,6 +562,8 @@ return 0
 /usr/local/lib64
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.1-8
+-   Add folders and symlinks for .dwz files.
 *   Mon Jun 15 2020 Joe Schmitt <joschmit@microsoft.com> 1.1-7
 -   Use ghost directive for /usr/lib/debug/* symlinks to avoid conflicting with debuginfo packages.
 *   Wed May 20 2020 Emre Girgin <mrgirgin@microsoft.com> 1.1-6

SPECS/flex/flex.spec

@@ -1,7 +1,7 @@
 Summary:        A utility for generating programs that recognize patterns in text
 Name:           flex
 Version:        2.6.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        BSD
 URL:            https://github.com/westes/flex
 Group:          Applications/System
@@ -18,6 +18,7 @@ that recognize patterns in text.
 %package devel
 Summary: Development libraries and header files for the flex library
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -70,9 +71,10 @@ make %{?_smp_mflags} check
 %{_includedir}/*
 
 %changelog
-* Sat May 09 00:21:32 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.6.4-5
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.6.4-6
-- Added %%license line automatically
+-   Provide flex-static
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.6.4-5
+-   Added %%license line automatically
 *   Thu Apr 23 2020 Andrew Phelps <anphel@microsoft.com> 2.6.4-4
 -   Fix URL.
 -   License verified.

SPECS/gcc/gcc.spec

@@ -3,7 +3,7 @@
 Summary:        Contains the GNU compiler collection
 Name:           gcc
 Version:        9.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPLv2+
 URL:            https://gcc.gnu.org/
 Group:          Development/Tools
@@ -13,12 +13,15 @@ Source0:        https://ftp.gnu.org/gnu/gcc/%{name}-%{version}/%{name}-%{version
 Patch0:         090_all_pr55930-dependency-tracking.patch
 # Only applies to the Power9 ISA
 Patch1:         CVE-2019-15847.nopatch
+Requires:       gcc-c++ = %{version}-%{release}
 Requires:       libstdc++-devel = %{version}-%{release}
 Requires:       libgcc-devel = %{version}-%{release}
 Requires:       libgomp-devel = %{version}-%{release}
 Requires:       libgcc-atomic = %{version}-%{release}
 Requires:       gmp
 Requires:       libmpc
+Provides:       cpp = %{version}-%{release}
+
 #%if %{with_check}
 #BuildRequires:  autogen
 #BuildRequires:  dejagnu
@@ -31,6 +34,8 @@ which includes the C and C++ compilers.
 %package -n     gfortran
 Summary:        GNU Fortran compiler.
 Group:          Development/Tools
+Requires:       gcc = %{version}-%{release}
+Provides:       gcc-gfortran = %{version}-%{release}
 %description -n gfortran
 The gfortran package contains GNU Fortran compiler.
 
@@ -44,6 +49,7 @@ The libgcc package contains GCC shared libraries for gcc.
 Summary:        GNU C Library for atomic counter updates
 Group:          System Environment/Libraries
 Requires:       libgcc = %{version}-%{release}
+Provides:       libatomic = %{version}-%{release}
 %description -n libgcc-atomic
 The libgcc package contains GCC shared libraries for atomic counter updates.
 
@@ -55,6 +61,18 @@ Requires:       libgcc = %{version}-%{release}
 The libgcc package contains GCC shared libraries for gcc .
 This package contains development headers and static library for libgcc.
 
+%package        c++
+Summary:        C++ support for GCC
+Group:          System Environment/Libraries
+Requires:       gcc = %{version}-%{release}
+Requires:       libstdc++-devel = %{version}-%{release}
+Provides:       gcc-g++ = %{version}-%{release}
+Provides:       g++ = %{version}-%{release}
+%description    c++
+This package adds C++ support to the GNU Compiler Collection.
+It includes support for most of the current C++ specification,
+including templates and exception handling.
+
 %package -n     libstdc++
 Summary:        GNU C Library
 Group:          System Environment/Libraries
@@ -66,6 +84,7 @@ This package contains the GCC Standard C++ Library v3, an ongoing project to imp
 Summary:        GNU C Library
 Group:          Development/Libraries
 Requires:       libstdc++ = %{version}-%{release}
+Provides:       libstdc++-static = %{version}-%{release}
 %description -n libstdc++-devel
 This is the GNU implementation of the standard C++ libraries.
 This package includes the headers files and libraries needed for C++ development.
@@ -144,10 +163,13 @@ make %{?_smp_mflags} check-gcc
 %{_lib}/cpp
 #   Executables
 %exclude %{_bindir}/*gfortran
+%exclude %{_bindir}/*c++
+%exclude %{_bindir}/*g++
 %{_bindir}/*
 #   Libraries
 %{_lib64dir}/*
 %exclude %{_libexecdir}/gcc/%{_arch}-%{_host_vendor}-linux-gnu/%{version}/f951
+%exclude %{_libexecdir}/gcc/%{_arch}-%{_host_vendor}-linux-gnu/%{version}/cc1plus
 %{_libdir}/gcc/*
 #   Library executables
 %{_libexecdir}/gcc/*
@@ -163,6 +185,7 @@ make %{?_smp_mflags} check-gcc
 
 %exclude %{_lib64dir}/libgcc*
 %exclude %{_lib64dir}/libstdc++*
+%exclude %{_lib64dir}/libsupc++*
 %exclude %{_lib64dir}/libgomp*
 
 %files -n gfortran
@@ -184,6 +207,12 @@ make %{?_smp_mflags} check-gcc
 %{_lib64dir}/libgcc_s.so
 %{_lib}/libcc1.*
 
+%files c++
+%defattr(-,root,root)
+%{_bindir}/*c++
+%{_bindir}/*g++
+%{_libexecdir}/gcc/%{_arch}-%{_host_vendor}-linux-gnu/%{version}/cc1plus
+
 %files -n libstdc++
 %defattr(-,root,root)
 %{_lib64dir}/libstdc++.so.*
@@ -196,6 +225,8 @@ make %{?_smp_mflags} check-gcc
 %{_lib64dir}/libstdc++.la
 %{_lib64dir}/libstdc++.a
 %{_lib64dir}/libstdc++fs.a
+%{_lib64dir}/libsupc++.a
+%{_lib64dir}/libsupc++.la
 
 %{_includedir}/c++/*
 
@@ -211,6 +242,10 @@ make %{?_smp_mflags} check-gcc
 %{_lib64dir}/libgomp.spec
 
 %changelog
+* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 9.1.0-8
+- Split gcc-c++ subpackage.
+- Provide cpp, gcc-gfortran, libatomic, and listdc++-static.
+
 * Thu Sep 10 2020 Thomas Crain <thcrain@microsoft.com> - 9.1.0-7
 - Ignore CVE-2019-15847, as it applies to an unsupported ISA
 

SPECS/gettext/gettext.signatures.json

@@ -1,5 +1,5 @@
 {
- "Signatures": {
+    "Signatures": {
-  "gettext-0.19.8.1.tar.xz": "105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4"
+     "gettext-0.21.tar.xz": "d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192"
- }
+    }
 }

SPECS/gettext/gettext.spec

@@ -1,14 +1,14 @@
-Summary:	Utilities for internationalization and localization
+Summary:        Utilities for internationalization and localization
-Name:		gettext
+Name:           gettext
-Version:	0.19.8.1
+Version:        0.21
-Release:        3%{?dist}
+Release:        1%{?dist}
-License:	GPLv3
+License:        GPLv3
-URL:		http://www.gnu.org/software/gettext
+URL:            https://www.gnu.org/software/gettext
-Group:		Applications/System
+Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
+Source0:        https://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
-%define sha1 gettext=e0fe90ede22f7f16bbde7bdea791a835f2773fc9
+Provides:       %{name}-devel = %{version}-%{release}
 
 %description
 These allow programs to be compiled with NLS
@@ -56,6 +56,10 @@ make %{?_smp_mflags} check
 %{_mandir}/*
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 0.21-1
+-   Update to version 0.21.
+-   Update URL and Source0 to use https.
+-   Provide gettext-devel
 *   Thu Jun 11 2020 Henry Beberman <henry.beberman@microsoft.com> - 0.19.8.1-3
 -   Disable -Wno-error=format-security to build with hardened cflags
 *   Sat May 09 00:21:19 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.19.8.1-2

SPECS/glib/glib.spec

@@ -1,7 +1,7 @@
 Summary:	Low-level libraries useful for providing data structure handling for C.
 Name:		glib
 Version:	2.58.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 License:	LGPLv2+
 URL:		https://developer.gnome.org/glib/
 Group:		Applications/System
@@ -21,13 +21,8 @@ BuildRequires:	python2 >= 2.7
 BuildRequires:	python2-libs >= 2.7
 Requires:	pcre-libs
 Requires:	libffi
-Provides:	pkgconfig(glib-2.0)
+Provides:	glib2 = %{version}-%{release}
-Provides:	pkgconfig(gmodule-2.0)
+
-Provides:	pkgconfig(gmodule-no-export-2.0)
-Provides:	pkgconfig(gobject-2.0)
-Provides:	pkgconfig(gio-2.0)
-Provides:	pkgconfig(gio-unix-2.0)
-Provides:	pkgconfig(gthread-2.0)
 %description
 The GLib package contains a low-level libraries useful for providing data structure handling for C, portability wrappers and interfaces for such runtime functionality as an event loop, threads, dynamic loading and an object system. Development libs and headers are in glib-devel.
 
@@ -40,6 +35,15 @@ Requires:	pcre-devel
 Requires:	python2
 Requires:	libffi-devel
 
+Provides:	glib2-devel = %{version}-%{release}
+Provides:	pkgconfig(glib-2.0)
+Provides:	pkgconfig(gmodule-2.0)
+Provides:	pkgconfig(gmodule-no-export-2.0)
+Provides:	pkgconfig(gobject-2.0)
+Provides:	pkgconfig(gio-2.0)
+Provides:	pkgconfig(gio-unix-2.0)
+Provides:	pkgconfig(gthread-2.0)
+
 %description devel
 Static libraries and header files for the support library for the glib library
 
@@ -47,6 +51,7 @@ Static libraries and header files for the support library for the glib library
 Summary:	gsettings schemas compiling tool
 Group:		Development/Libraries
 Requires:	glib
+Provides:	glib2-schemas = %{version}-%{release}
 
 %description schemas
 Gsettings schemas compiling tool
@@ -96,6 +101,10 @@ make DESTDIR=%{buildroot} install
 %{_datadir}/glib-2.0/schemas/*
 
 %changelog
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 2.58.0-8
+-   Provide glib2 versions from each package.
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.58.0-7
+-   Move "Provides:pkgconfig(...)" to glib-devel
 * Sat May 09 00:21:11 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.58.0-6
 - Added %%license line automatically
 

SPECS/glibc/glibc.spec

@@ -5,7 +5,7 @@
 Summary:        Main C library
 Name:           glibc
 Version:        2.28
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        LGPLv2+
 URL:            https://www.gnu.org/software/libc
 Group:          Applications/System
@@ -32,6 +32,7 @@ Patch10:        CVE-2020-1751.nopatch
 # Rationale: Exploit requires crafted pattern in regex compiler meant only for trusted content
 Patch11:		CVE-2018-20796.nopatch
 ExcludeArch:    armv7 ppc i386 i686
+Provides:       %{name}-common = %{version}-%{release}
 Provides:       rtld(GNU_HASH)
 Provides:       /sbin/ldconfig
 Requires:       filesystem
@@ -44,6 +45,8 @@ and so on.
 %package devel
 Summary: Header files for glibc
 Group: Applications/System
+Provides: %{name}-headers = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 %description devel
 These are the header files of glibc.
@@ -67,7 +70,7 @@ Summary: gconv modules for glibc
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 %description iconv
-These is gconv modules for iconv() and iconv tools.
+These are gconv modules for iconv().
 
 %package tools
 Summary: tools for glibc
@@ -243,6 +246,9 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:
 %{_lib64dir}/*.so
 /sbin/ldconfig
 /sbin/locale-gen.sh
+/usr/sbin/zdump
+/usr/sbin/zic
+/usr/sbin/iconvconfig
 %{_bindir}/*
 %{_libexecdir}/*
 %{_datadir}/i18n/charmaps/UTF-8.gz
@@ -250,32 +256,19 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:
 %{_datadir}/i18n/locales/en_US
 %{_datarootdir}/locale/locale.alias
 %exclude %{_localstatedir}/lib/nss_db/Makefile
-%exclude /usr/bin/catchsegv
-%exclude /usr/bin/iconv
 %exclude /usr/bin/mtrace
 %exclude /usr/bin/pcprofiledump
-%exclude /usr/bin/pldd
-%exclude /usr/bin/sotruss
-%exclude /usr/bin/sprof
 %exclude /usr/bin/xtrace
 
 %files iconv
 %defattr(-,root,root)
 %{_lib64dir}/gconv/*
-/usr/bin/iconv
-/usr/sbin/iconvconfig
 
 %files tools
 %defattr(-,root,root)
-/usr/bin/catchsegv
 /usr/bin/mtrace
 /usr/bin/pcprofiledump
-/usr/bin/pldd
-/usr/bin/sotruss
-/usr/bin/sprof
 /usr/bin/xtrace
-/usr/sbin/zdump
-/usr/sbin/zic
 /sbin/sln
 %{_lib64dir}/audit/*
 /lib64/libpcprofile.so
@@ -308,6 +301,10 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:
 
 
 %changelog
+* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> - 2.28-13
+- Move some tools from glibc-tools and glibc-iconv to glibc and provide glibc-common
+- Provide glibc-static and glibc-headers under glibc-devel
+
 * Wed Jul 29 2020 Thomas Crain <thcrain@microsoft.com> - 2.28-12
 - Ignore CVE-2018-20796, as it is not a security issue
 

SPECS/gnupg2/gnupg2.spec

@@ -1,7 +1,7 @@
 Summary:        OpenPGP standard implementation used for encrypted communication and data storage.
 Name:           gnupg2
 Version:        2.2.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD and CC0 and GPLv2+ and LGPLv2+
 URL:            https://gnupg.org/index.html
 Group:          Applications/Cryptography.
@@ -24,7 +24,9 @@ Requires:       npth
 Requires:       libassuan
 Requires:       pinentry
 
-Provides:       gpg
+Provides:       gpg = %{version}-%{release}
+Provides:       gnupg = %{version}-%{release}
+Provides:       %{name}-smime = %{version}-%{release}
 
 %description
 GnuPG is GNU's tool for secure communication and data storage.  It can
@@ -42,12 +44,18 @@ is provided by the gnupg2-smime package.
 %setup -q -n gnupg-%{version}
 
 %build
-%configure
+%configure \
+  --enable-gpg-is-gpg2
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
 
+pushd %{buildroot}%{_bindir}
+ln -s gpg2 gpg
+ln -s gpgv2 gpgv
+popd
+
 %check
 make %{?_smp_mflags} check
 
@@ -65,6 +73,9 @@ make %{?_smp_mflags} check
 %exclude /usr/share/doc/*
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.2.20-4
+-   Build with gpg2 option and gpg compatibility
+-   Provide gnupg2-smime, gnupg
 *   Mon Jun 01 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 2.2.20-3
 -   Adding a license reference.
 -   License verified.

SPECS/kernel-headers/kernel-headers.spec

@@ -1,7 +1,7 @@
 Summary:        Linux API header files
 Name:           kernel-headers
 Version:        5.4.51
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 Group:          System Environment/Kernel
@@ -9,6 +9,7 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-%{version}.tar.gz
 BuildArch:      noarch
+Provides:       glibc-kernheaders = %{version}-%{release}
 %description
 The Linux API Headers expose the kernel's API for use by Glibc.
 %prep
@@ -27,6 +28,8 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
 %defattr(-,root,root)
 %{_includedir}/*
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 5.4.51-3
+-   Add explicit provide for glibc-kernheaders
 *   Tue Sep 01 2020 Chris Co <chrco@microsoft.com> 5.4.51-2
 -   Update source hash
 *   Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.51-1

SPECS/kmod/kmod.spec

@@ -1,14 +1,15 @@
 Summary:        Utilities for loading kernel modules
 Name:           kmod
 Version:        25
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv2.1+ and GPLv2+
 URL:            http://www.kernel.org/pub/linux/utils/kernel/kmod
 Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        http://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
-%define sha1    %{name}-%{version}=761ee76bc31f5db10d470dad607a5f9d68acef68
+Provides:       module-init-tools
+Provides:       /sbin/modprobe
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 Requires:       xz
@@ -60,9 +61,10 @@ find %{buildroot} -name '*.la' -delete
 %{_libdir}/*.so
 
 %changelog
-* Sat May 09 00:21:03 PST 2020 Nick Samson <nisamson@microsoft.com> - 25-4
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 25-5
-- Added %%license line automatically
+-   Provide /sbin/modprobe and module-init-tools for base package
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 25-4
+-   Added %%license line automatically
 *   Tue Jan 21 2020 Andrew Phelps <anphel@microsoft.com> 25-3
 -   Fix changelog date
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 25-2

SPECS/kyua/kyua.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "kyua-0.13.tar.gz": "db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6"
+ }
+}

SPECS/kyua/kyua.spec

@@ -0,0 +1,103 @@
+%global _testsdir %{_libexecdir}/%{name}/tests
+%global _make_args pkgtestsdir=%%{_testsdir} testsdir=%%{_testsdir}
+
+Name:           kyua
+Version:        0.13
+Release:        6%{?dist}
+Summary:        Testing framework for infrastructure software
+
+License:        BSD
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+URL:            https://github.com/jmmv/kyua
+Source0:        %{url}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires:  make
+BuildRequires:  gcc-c++
+BuildRequires:  libatf-c++-devel >= 0.17
+BuildRequires:  libatf-sh-devel >= 0.15
+BuildRequires:  pkgconfig(lutok) >= 0.4
+BuildRequires:  pkgconfig(sqlite3) >= 3.6.22
+
+Obsoletes:      kyua-cli < 0.10
+Provides:       kyua-cli = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      kyua-testers < 0.10
+Obsoletes:      kyua-testers-devel < 0.10
+
+%description
+Kyua is a testing framework for infrastructure software, originally designed
+to equip BSD-based operating systems with a test suite. This means that
+Kyua is lightweight and simple, and that Kyua integrates well with various
+build systems and continuous integration frameworks.
+
+Kyua features an expressive test suite definition language, a safe runtime
+engine for test suites and a powerful report generation engine.
+
+Kyua is for both developers and users, from the developer applying a simple
+fix to a library to the system administrator deploying a new release
+on a production machine.
+
+Kyua is able to execute test programs written with a plethora of
+testing libraries and languages. The library of choice is ATF, for which
+Kyua was originally designed, but simple, framework-less test programs and
+TAP-compliant test programs can also be executed through Kyua.
+
+%package tests
+Summary:        Runtime tests of the Kyua toolchain
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      kyua-cli-tests < 0.10
+Obsoletes:      kyua-testers-tests < 0.10
+
+%description tests
+%{summary}.
+
+%prep
+%autosetup
+
+%build
+%configure \
+  --with-doxygen=no   \
+  --with-with-atf=yes \
+  %{nil}
+%make_build %{_make_args}
+
+%install
+%make_install %{_make_args} doc_DATA=
+
+%if %{with_check}
+%check
+# Tests expect dumping core to file which is different from machine to machine
+HOME=$(pwd)/check %make_build check %{_make_args} || :
+%endif
+
+%files
+%license LICENSE
+%doc AUTHORS CONTRIBUTORS NEWS.md README.md
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
+%{_mandir}/man1/%{name}*.1*
+%{_mandir}/man5/%{name}*.5*
+
+%files tests
+%{_libexecdir}/%{name}/
+
+%changelog
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 0.13-6
+- Initial CBL-Mariner import from Fedora 32 (license: MIT).
+- Add with_check conditional.
+- License verified.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.13-1
+- Initial package

SPECS/libarchive/libarchive.spec

@@ -1,7 +1,7 @@
 Summary:        Multi-format archive and compression library
 Name:           libarchive
 Version:        3.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 # Certain files have individual licenses. For more details see contents of "COPYING".
 License:        BSD and Public Domain and (ASL 2.0 or CC0 1.0 or OpenSSL)
 URL:            https://www.libarchive.org/
@@ -9,6 +9,7 @@ Group:          System Environment/Development
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        https://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
+Provides:       bsdtar = %{version}-%{release}
 
 BuildRequires:  xz-libs
 BuildRequires:  xz-devel
@@ -60,9 +61,10 @@ make %{?_smp_mflags} check
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sat May 09 00:21:07 PST 2020 Nick Samson <nisamson@microsoft.com> - 3.4.2-2
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 3.4.2-3
-- Added %%license line automatically
+-   Provide bsdtar for base package
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.4.2-2
+-   Added %%license line automatically
 *   Fri May 01 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 3.4.2-1
 -   Bumping version up to 3.4.2 to fix following CVEs:
 -       CVE-2018-1000877,
@@ -76,7 +78,7 @@ make %{?_smp_mflags} check
 -   Fixed "Source0" and "URL" tags.
 -   License verified.
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.3.3-2
--   Initial CBL-Mariner import from Photon (license: Apache2).
+-   Initial CBL-Mariner import from Photon (license: dual Apache2/GPL2).
 *   Thu Sep 13 2018 Siju Maliakkal <smaliakkal@vmware.com> 3.3.3-1
 -   Updated to latest version
 *   Fri Sep 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.3.1-2

SPECS/libassuan/libassuan.spec

@@ -1,16 +1,18 @@
-Summary:	Provides IPC between GnuPG Components
+Summary:	   Provides IPC between GnuPG Components
-Name:		libassuan
+Name:		   libassuan
-Version:	2.5.1
+Version:	   2.5.1
-Release:        3%{?dist}
+Release:       5%{?dist}
-License:	GPLv3+
+License:	   GPLv3+
-URL:		https://www.gnupg.org/(fr)/related_software/libassuan/index.html
+URL:		   https://www.gnupg.org/(fr)/related_software/libassuan/index.html
-Group:		Development/Libraries
+Group:		   Development/Libraries
-Vendor:         Microsoft Corporation
+Vendor:        Microsoft Corporation
-Distribution:   Mariner
+Distribution:  Mariner
-Source0:	ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2
+Source0:	   ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2
-%define sha1 libassuan=c8432695bf1daa914a92f51e911881ed93d50604
+Provides:      %{name}-devel = %{version}-%{release}
-Requires:	libgpg-error >= 1.21
+Provides:      pkgconfig(libassuan) = %{version}-%{release}
-BuildRequires:	libgpg-error-devel >= 1.21
+Requires:	   libgpg-error >= 1.21
+BuildRequires: libgpg-error-devel >= 1.21
+
 %description
 The libassuan package contains an inter process communication library
 used by some of the other GnuPG related packages. libassuan's primary use
@@ -18,11 +20,14 @@ is to allow a client to interact with a non-persistent server.
 libassuan is not, however, limited to use with GnuPG servers and clients.
 It was designed to be flexible enough to meet the demands
 of many transaction based environments with non-persistent servers.
+
 %prep
 %setup -q
+
 %build
 %configure
 make %{?_smp_mflags}
+
 %install
 make DESTDIR=%{buildroot} install
 rm %{buildroot}/%{_libdir}/*.la
@@ -40,12 +45,16 @@ make %{?_smp_mflags} check
 %{_includedir}/*.h
 %{_libdir}/*.so*
 %{_datadir}/aclocal/*
-%changelog
-* Sat May 09 00:21:03 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.5.1-3
-- Added %%license line automatically
 
+%changelog
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 2.5.1-5
+-   Provide pkgconfig(libassuan).
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.5.1-4
+-   Provide libassuan-devel
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.5.1-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.5.1-2
--   Initial CBL-Mariner import from Photon (license: Apache2).
+-   Initial CBL-Mariner import from Photon (license: dual Apache2/GPL2).
 *   Fri Sep 21 2018 Keerthana K <keerthanak@vmware.com> 2.5.1-1
 -   Update to version 2.5.1
 *   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 2.4.3-1

SPECS/libgpg-error/libgpg-error.spec

@@ -1,7 +1,7 @@
 Summary:        libgpg-error
 Name:           libgpg-error
 Version:        1.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 URL:            https://gnupg.org/
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ pinentry, SmartCard Daemon and possibly more in the future.
 %package devel
 Summary:	Libraries and header files for libgpg-error
 Requires:	%{name} = %{version}-%{release}
+Provides:   pkgconfig(gpg-error) = %{version}-%{release}
 %description devel
 Static libraries and header files for the support library for libgpg-error
 
@@ -71,9 +72,10 @@ make %{?_smp_mflags} check
 %defattr(-,root,root)
 
 %changelog
-* Sat May 09 00:21:43 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.32-4
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 1.32-5
-- Added %%license line automatically
+-   Explicitly add Provides pkgconfig(gpg-error) to devel package.
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.32-4
+-   Added %%license line automatically
 *   Thu Apr 23 2020 Nick Samson <nisamson@microsoft.com> 1.32-3
 -   Updated Source0, URL. License verified.
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.32-2

SPECS/libksba/libksba.spec

@@ -1,14 +1,14 @@
 Summary:	Library for accessing X.509 and CMS data structure.
 Name:		libksba
 Version:	1.3.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:	GPLv3+
 URL:		https://www.gnupg.org/(fr)/download/index.html#libksba
 Group:		Security/Libraries.
 Source0:        https://www.gnupg.org/ftp/gcrypt/%{name}/%{name}-%{version}.tar.bz2
-%define sha1 libksba=a98385734a0c3f5b713198e8d6e6e4aeb0b76fde
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Provides:       %{name}-devel = %{version}-%{release}
 BuildRequires:  libgpg-error-devel >= 1.2
 
 %description
@@ -46,9 +46,10 @@ make %{?_smp_mflags} -k check
 %exclude %{_datadir}/info/dir
 
 %changelog
-* Sat May 09 00:20:39 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.3.5-3
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.3.5-4
-- Added %%license line automatically
+-   Provide libksba-devel for base package
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.3.5-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.3.5-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *	Tue	Apr 11 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.3.5-1

SPECS/libmpc/libmpc.spec

@@ -1,7 +1,7 @@
 Summary:        Library for the arithmetic of complex numbers
 Name:           libmpc
 Version:        1.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        LGPLv3+
 URL:            http://www.multiprecision.org
 Group:          Applications/System
@@ -9,6 +9,7 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        https://ftp.gnu.org/gnu/mpc/mpc-%{version}.tar.gz
 Requires:       gmp
+Provides:       %{name}-devel = %{version}-%{release}
 
 %description
 The MPC package contains a library for the arithmetic of complex
@@ -44,9 +45,10 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so.*
 
 %changelog
-* Sat May 09 00:20:44 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.1.0-5
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.1.0-6
-- Added %%license line automatically
+-   Provide libmpc-devel
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.1.0-5
+-   Added %%license line automatically
 *   Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 1.1.0-4
 -   Renaming mpc to libmpc
 *   Tue Apr 07 2020 Paul Monson <paulmon@microsoft.com> 1.1.0-3

SPECS/libselinux/libselinux.spec

@@ -3,7 +3,7 @@
 Summary:        SELinux library and simple utilities
 Name:           libselinux
 Version:        2.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        Public Domain
 Group:          System Environment/Libraries
 URL:            https://github.com/SELinuxProject/selinux/wiki
@@ -66,6 +66,7 @@ SELinux applications.
 %package        python3
 Summary:        SELinux python3 bindings for libselinux
 Group:          Development/Libraries
+Provides:       python3-%{name} = %{version}-%{release}
 Requires:       libselinux = %{version}-%{release}
 Requires:       python3
 Requires:       python3-libs
@@ -133,9 +134,10 @@ rm -rf %{buildroot}
 %{python3_sitelib}/*
 
 %changelog
-* Sat May 09 00:21:01 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.9-3
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.9-4
-- Added %%license line automatically
+-   Provide python3-libselinux for -python3 subpackage
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.9-3
+-   Added %%license line automatically
 *   Tue Mar 24 2020 Henry Beberman <henry.beberman@microsoft.com> 2.9-2
 -   Add -Wno-error=strict-overflow to resolve build break with gcc9
 *   Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 2.9-1

SPECS/libsepol/libsepol.spec

@@ -1,7 +1,7 @@
 Summary:	    SELinux binary policy manipulation library
 Name:		    libsepol
 Version:	    2.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:	    LGPLv2+
 Group:		    System Environment/Libraries
 URL:		    http://www.selinuxproject.org
@@ -26,11 +26,12 @@ It is used by checkpolicy (the policy compiler) and similar tools, as well
 as by programs like load_policy that need to perform specific transformations
 on binary policies such as customizing policy boolean settings.
 
-%package	devel
+%package       devel
-Summary:	Header files and libraries used to build policy manipulation tools
+Summary:       Header files and libraries used to build policy manipulation tools
-Group:		Development/Libraries
+Group:         Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
-Provides:	pkgconfig(libsepol)
+Provides:      pkgconfig(libsepol) = %{version}-%{release}
+Provides:      %{name}-static = %{version}-%{release}
 
 %description	devel
 The libsepol-devel package contains the libraries and header files
@@ -94,6 +95,8 @@ exit 0
 %{_lib}/libsepol.so.1
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.9-6
+-   Add explicit provide for libsepol-static
 *   Tue Jun 09 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.9-5
 -   Remove unused "systemd-bootstrap" from requires.
 *   Fri May 29 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.9-4

SPECS/libtool/libtool.spec

@@ -1,7 +1,7 @@
 Summary:        Shared libraries, portable interface
 Name:           libtool
 Version:        2.4.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2
 URL:            http://www.gnu.org/software/libtool
 Group:          Development/Tools
@@ -15,6 +15,7 @@ consistent, portable interface.
 %package -n libltdl
 Summary:       Shared library files for %{name}
 Group:         Development/Libraries
+Provides:      %{name}-ltdl = %{version}-%{release}
 %description -n libltdl
 The libtool package contains the GNU libtool, a set of shell scripts which automatically configure UNIX and UNIX-like architectures to generically build shared libraries.
 Libtool provides a consistent, portable interface which simplifies the process of using shared libraries.
@@ -22,6 +23,7 @@ Shared library files for libtool DLL library from the libtool package.
 %package -n libltdl-devel
 Summary:       Development files for %{name}
 Group:         Development/Libraries
+Provides:      %{name}-ltdl-devel = %{version}-%{release}
 Requires:      libltdl = %{version}
 %description -n libltdl-devel
 The libtool package contains the GNU libtool, a set of shell scripts which automatically configure UNIX and UNIX-like architectures to generically build shared libraries.
@@ -79,9 +81,10 @@ make %{?_smp_mflags} check
 %{_libdir}/libltdl.so.7.3.1
 
 %changelog
-* Sat May 09 00:21:36 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.4.6-5
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.4.6-6
-- Added %%license line automatically
+-   Add explicit provides for libtool-ltdl, libtool-ltdl-devel
-
+*   Sat May 09 00:21:36 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.4.6-5
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.4.6-4
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 2.4.6-3

SPECS/lldb/lldb.spec

@@ -2,7 +2,7 @@
 Summary:        A next generation, high-performance debugger.
 Name:           lldb
 Version:        8.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        NCSA
 URL:            https://lldb.llvm.org
 Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz
@@ -58,7 +58,10 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr           \
       -DLLDB_PATH_TO_CLANG_BUILD=%{_prefix} \
       -DLLVM_DIR=/usr/lib/cmake/llvm        \
       -DLLVM_BUILD_LLVM_DYLIB=ON ..         \
-      -DLLDB_DISABLE_LIBEDIT:BOOL=ON
+      -DLLDB_DISABLE_LIBEDIT:BOOL=ON        \
+      -DPYTHON_EXECUTABLE:STRING=%{__python2} \
+      -DPYTHON_VERSION_MAJOR:STRING=$(%{__python2} -c "import sys; print(sys.version_info.major)") \
+      -DPYTHON_VERSION_MINOR:STRING=$(%{__python2} -c "import sys; print(sys.version_info.minor)")
 
 make %{?_smp_mflags}
 
@@ -98,6 +101,8 @@ rm -rf %{buildroot}/*
 %{python2_sitelib}/*
 
 %changelog
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 8.0.1-4
+-   Explicitly set python verison.
 *   Fri Jun 12 2020 Henry Beberman <henry.beberman@microsoft.com> 8.0.1-3
 -   Temporarily disable generation of debug symbols.
 *   Sat May 09 00:21:04 PST 2020 Nick Samson <nisamson@microsoft.com> - 8.0.1-2

SPECS/lua/CVE-2019-6706-use-after-free-lua_upvaluejoin.patch

@@ -0,0 +1,22 @@
+--- a/src/lapi.c
++++ b/src/lapi.c
+@@ -1285,14 +1285,14 @@ LUA_API void *lua_upvalueid (lua_State *
+ 
+ LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
+                                             int fidx2, int n2) {
+-  LClosure *f1;
+-  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
++  UpVal **up1 = getupvalref(L, fidx1, n1, NULL); /* the last parameter not needed */
+   UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
++  if (*up1 == *up2) return; /* Already joined */
++  (*up2)->refcount++;
++  if (upisopen(*up2)) (*up2)->u.open.touched = 1;
++  luaC_upvalbarrier(L, *up2);
+   luaC_upvdeccount(L, *up1);
+   *up1 = *up2;
+-  (*up1)->refcount++;
+-  if (upisopen(*up1)) (*up1)->u.open.touched = 1;
+-  luaC_upvalbarrier(L, *up1);
+ }
+ 
+ 

SPECS/lua/LICENSE.PTR

@@ -1,27 +0,0 @@
-The source for this package does not include an explicit copy of the licenses.
-License information is contained within the package source.
-
-See:
-src/lua.h
-
-Copyright (C) 1994-2018 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

SPECS/lua/lua-5.2.2-configure-linux.patch

@@ -0,0 +1,22 @@
+diff -up lua-5.2.2/configure.ac.linux lua-5.2.2/configure.ac
+--- lua-5.2.2/configure.ac.linux	2013-05-10 15:42:27.269437631 -0400
++++ lua-5.2.2/configure.ac	2013-05-10 15:43:23.530435620 -0400
+@@ -50,6 +50,7 @@ AC_SUBST(READLINE_LIBS)
+ case "$host" in
+   *-mingw*)  use_os=win32  ;;
+   *-darwin*) use_os=macosx ;;
++  *-linux*)  use_os=linux  ;;
+   *)         use_os=posix  ;;
+ esac
+ 
+@@ -62,6 +63,10 @@ if test "x$use_os" == "xwin32"; then
+ elif test "x$use_os" == "xmacosx"; then
+   POSIX_DEFS="#define LUA_USE_POSIX"
+   LUA_DL_DEFS="#define LUA_DL_DYLD"
++elif test "x$use_os" == "xlinux"; then
++  POSIX_DEFS="#define LUA_USE_LINUX"
++  LUA_DL_DEFS="#define LUA_DL_DLOPEN"
++  LUA_LIBS="$LUA_LIBS -ldl"
+ elif test "x$use_os" == "xposix"; then
+   POSIX_DEFS="#define LUA_USE_POSIX"
+   LUA_DL_DEFS="#define LUA_DL_DLOPEN"

SPECS/lua/lua-5.3.0-autotoolize.patch

@@ -0,0 +1,192 @@
+diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
+--- lua-5.3.0/configure.ac.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/configure.ac	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.59)
++AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
++AC_SUBST([MAJOR_VERSION], [5.3])
++
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_SRCDIR([src/lapi.c])
++
++AM_INIT_AUTOMAKE([1.9 foreign])
++
++AC_PROG_CC
++AC_PROG_LIBTOOL
++
++AC_ARG_WITH(
++  [readline],
++  [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
++  [use_readline=$withval],
++  [use_readline=yes]
++)
++
++LUA_LIBS="-lm"
++
++# Check for readline
++READLINE_DEFS="#undef LUA_USE_READLINE"
++if test "x$use_readline" == "xyes"; then
++  AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
++  AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
++  if test "x$use_readline" == "xno"; then
++    AC_MSG_WARN([readline headers could not be found, disabling readline support])
++  else
++    READLINE_DEFS="#define LUA_USE_READLINE"
++    READLINE_LIBS="-lreadline -lncurses"
++  fi
++fi
++AC_SUBST(READLINE_DEFS)
++AC_SUBST(READLINE_LIBS)
++
++case "$host" in
++  *-mingw*)  use_os=win32  ;;
++  *-darwin*) use_os=macosx ;;
++  *)         use_os=posix  ;;
++esac
++
++POSIX_DEFS="#undef LUA_USE_POSIX"
++LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
++LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
++
++if test "x$use_os" == "xwin32"; then
++  LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
++elif test "x$use_os" == "xmacosx"; then
++  POSIX_DEFS="#define LUA_USE_POSIX"
++  LUA_DL_DEFS="#define LUA_DL_DYLD"
++elif test "x$use_os" == "xposix"; then
++  POSIX_DEFS="#define LUA_USE_POSIX"
++  LUA_DL_DEFS="#define LUA_DL_DLOPEN"
++  LUA_LIBS="$LUA_LIBS -ldl"
++fi
++AC_SUBST(POSIX_DEFS)
++AC_SUBST(LUA_DL_DEFS)
++AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
++
++AC_SUBST(LUA_LIBS)
++
++AC_CONFIG_FILES([Makefile
++                 src/Makefile
++                 src/lua.pc
++                 src/luaconf.h.template
++                 doc/Makefile
++])
++AC_OUTPUT
+diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am
+--- lua-5.3.0/doc/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/doc/Makefile.am	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,4 @@
++man1_MANS = lua.1 luac.1
++
++EXTRA_DIST = \
++	contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
+diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am
+--- lua-5.3.0/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/Makefile.am	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,3 @@
++SUBDIRS = src doc
++
++EXTRA_DIST = README
+diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore
+--- lua-5.3.0/src/.gitignore.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/.gitignore	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,5 @@
++lua
++lua.pc
++luac
++luaconf.h
++luaconf.h.template
+diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.autoxxx	2015-01-15 10:20:03.828889562 -0500
++++ lua-5.3.0/src/luaconf.h.template.in	2015-01-15 10:22:37.420027778 -0500
+@@ -11,6 +11,11 @@
+ #include <limits.h>
+ #include <stddef.h>
+ 
++@POSIX_DEFS@
++@LUA_DL_DEFS@
++@LUA_BUILD_AS_DLL_DEFS@
++@READLINE_DEFS@
++
+ 
+ /*
+ ** ===================================================================
+@@ -175,9 +180,9 @@
+ 
+ #else			/* }{ */
+ 
+-#define LUA_ROOT	"/usr/local/"
+-#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+-#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
++#define LUA_ROOT	"@prefix@/"
++#define LUA_LDIR	"@pkgdatadir@/lua/" LUA_VDIR "/"
++#define LUA_CDIR	"@libdir@/lua/" LUA_VDIR "/"
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+ 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
+--- lua-5.3.0/src/lua.pc.in.autoxxx	2015-01-15 10:20:03.827889568 -0500
++++ lua-5.3.0/src/lua.pc.in	2015-01-15 10:20:03.827889568 -0500
+@@ -0,0 +1,13 @@
++V= @MAJOR_VERSION@
++R= @VERSION@
++prefix= @prefix@
++exec_prefix=${prefix}
++libdir= @libdir@
++includedir=${prefix}/include
++
++Name: Lua
++Description: An Extensible Extension Language
++Version: ${R}
++Requires:
++Libs: -llua @LUA_LIBS@
++Cflags: -I${includedir}
+diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
+--- lua-5.3.0/src/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/Makefile.am	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,46 @@
++AM_CFLAGS = -Wall
++
++include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
++
++nodist_include_HEADERS = luaconf.h
++
++lib_LTLIBRARIES = liblua.la
++liblua_la_LDFLAGS = -release @MAJOR_VERSION@
++liblua_la_SOURCES = \
++	lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
++	ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
++	loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
++	ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
++	lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
++	lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
++	lundump.h lvm.h lzio.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = lua.pc
++
++bin_PROGRAMS = lua luac
++
++lua_SOURCES = lua.c
++lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
++lua_DEPENDENCIES = liblua.la
++
++luac_SOURCES = luac.c
++# Statically link liblua against luac since luac uses symbols not exported in liblua
++luac_LDADD = .libs/liblua.a @LUA_LIBS@
++luac_DEPENDENCIES = liblua.la
++
++EXTRA_DIST = luaconf.h.template
++BUILT_SOURCES = luaconf.h
++CLEANFILES = luaconf.h luaconf.h.template
++
++readline_defs = @READLINE_DEFS@
++
++edit = 	sed \
++	  -e 's,%prefix%,$(prefix),g' \
++	  -e 's,%lua_datadir%,$(datadir),g' \
++	  -e 's,%lua_libdir%,$(libdir),g'
++
++luaconf.h : luaconf.h.template
++	rm -f $@ $@.tmp
++	$(edit) $< >$@.tmp
++	mv $@.tmp $@

SPECS/lua/lua-5.3.0-configure-compat-module.patch

@@ -0,0 +1,35 @@
+diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac
+--- lua-5.2.2/configure.ac.compat-module	2013-05-10 10:16:05.344137597 -0400
++++ lua-5.2.2/configure.ac	2013-05-10 10:16:05.357137596 -0400
+@@ -11,6 +11,20 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
+ AC_ARG_WITH(
++  [compat-module],
++  [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
++  [use_compat_module=$withval],
++  [use_compat_module=no]
++)
++
++COMPAT_DEFS="#undef LUA_COMPAT_ALL"
++if test "x$use_compat_module" == "xyes"; then
++  COMPAT_DEFS="#define LUA_COMPAT_5_1
++#define LUA_COMPAT_5_2"
++fi
++AC_SUBST(COMPAT_DEFS)
++
++AC_ARG_WITH(
+   [readline],
+   [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
+   [use_readline=$withval],
+diff -up lua-5.2.2/src/luaconf.h.template.in.compat-module lua-5.2.2/src/luaconf.h.template.in
+--- lua-5.2.2/src/luaconf.h.template.in.compat-module	2013-05-10 10:25:42.586116963 -0400
++++ lua-5.2.2/src/luaconf.h.template.in	2013-05-10 10:26:29.957115269 -0400
+@@ -15,6 +15,7 @@
+ @LUA_DL_DEFS@
+ @LUA_BUILD_AS_DLL_DEFS@
+ @READLINE_DEFS@
++@COMPAT_DEFS@
+ 
+ 
+ /*

SPECS/lua/lua-5.3.0-idsize.patch

@@ -0,0 +1,12 @@
+diff -up lua-5.3.0/src/luaconf.h.template.in.idsize lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.idsize	2015-01-15 10:23:20.515801344 -0500
++++ lua-5.3.0/src/luaconf.h.template.in	2015-01-15 10:23:48.955651916 -0500
+@@ -693,7 +693,7 @@
+ @@ of a function in debug information.
+ ** CHANGE it if you want a different size.
+ */
+-#define LUA_IDSIZE	60
++#define LUA_IDSIZE	512
+ 
+ 
+ /*

SPECS/lua/lua-5.3.4-shared_library-1.patch

@@ -1,61 +0,0 @@
-Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
-Date:                    2013-06-19
-Initial Package Version: 5.2.2
-Upstream Status:         Rejected
-Origin:                  Arch Linux packages repository
-Description:             Adds the compilation of a shared library.
-
-diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile
---- lua-5.3.0.orig/Makefile	2014-10-30 00:14:41.000000000 +0100
-+++ lua-5.3.0/Makefile	2015-01-19 22:14:09.822290828 +0100
-@@ -52,7 +52,7 @@
- all:	$(PLAT)
- 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
- 
- test:	dummy
- 	src/lua -v
-diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile
---- lua-5.3.0.orig/src/Makefile	2015-01-05 17:04:52.000000000 +0100
-+++ lua-5.3.0/src/Makefile	2015-01-19 22:14:52.559378543 +0100
-@@ -7,7 +7,7 @@
- PLAT= none
- 
- CC= gcc -std=gnu99
--CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
-+CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
- LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
- LIBS= -lm $(SYSLIBS) $(MYLIBS)
- 
-@@ -29,6 +29,7 @@
- PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO= liblua.so
- CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
- 	ltm.o lundump.o lvm.o lzio.o
-@@ -43,7 +44,7 @@
- LUAC_O=	luac.o
- 
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
- ALL_A= $(LUA_A)
- 
- # Targets start here.
-@@ -59,6 +60,12 @@
- 	$(AR) $@ $(BASE_O)
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO)
-+
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 

SPECS/lua/lua.signatures.json

@@ -1,6 +1,9 @@
 {
  "Signatures": {
-  "LICENSE.PTR": "1cf3e48430c4fc4d5289a2459a38f56a39a8682c7a80fd9cbb49d42e9f634897",
+  "lua-5.3.4-tests.tar.gz": "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f",
-  "lua-5.3.5.tar.gz": "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"
+  "lua-5.3.5.tar.gz": "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac",
+  "luaconf.h": "88e9751d81e778de9546db7c57eab5aeba4dfd8051e010f53ae36fbbce115e45",
+  "macros.lua": "7b76da36607dfca54757b3f0f711be8651bb06782c55fab3b06276cf32436db0",
+  "mit.txt": "ac92bb84aa21edfecf0112e59c96c75620313d504ada0d66e8e78fe6788d3a4d"
  }
 }

SPECS/lua/lua.spec

@@ -1,113 +1,408 @@
-%define LICENSE_PATH LICENSE.PTR
+%global major_version 5.3
-%define majmin %(echo %{version} | cut -d. -f1-2)
+# Normally, this is the same as version, but... not always.
+# No tests yet for 5.3.5
+%global test_version 5.3.4
+# Place rpm-macros into proper location.
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
 
-Summary:        Programming language
 Name:           lua
-Version:        5.3.5
+Version:        %{major_version}.5
-Release:        6%{?dist}
+Release:        9%{?dist}
+Summary:        Powerful light-weight programming language
 License:        MIT
-URL:            https://www.lua.org
+URL:            https://www.lua.org/
 Group:          Development/Tools
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-Source0:        https://www.lua.org/ftp/%{name}-%{version}.tar.gz
+Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
-Source1:        %{LICENSE_PATH}
+# copied from doc/readme.html on 2014-07-18
-Patch0:         lua-5.3.4-shared_library-1.patch
+Source1:        mit.txt
-BuildRequires:  readline-devel
+Source2:        http://www.lua.org/tests/lua-%{test_version}-tests.tar.gz
-Requires:       readline
+# multilib
+Source3:        luaconf.h
+# rpm-macro
+Source1000:     macros.lua
+Patch0:         %{name}-5.3.0-autotoolize.patch
+Patch1:         %{name}-5.3.0-idsize.patch
+Patch2:         %{name}-5.2.2-configure-linux.patch
+Patch3:         %{name}-5.3.0-configure-compat-module.patch
+# Fixes CVE-2019-6706
+Patch4:         CVE-2019-6706-use-after-free-lua_upvaluejoin.patch
+
+BuildRequires:  automake autoconf libtool readline-devel ncurses-devel
+Requires:       lua-libs = %{version}-%{release}
 
 %description
-Lua is a powerful, light-weight programming language designed for extending
+Lua is a powerful light-weight programming language designed for
-applications. Lua is also frequently used as a general-purpose, stand-alone
+extending applications. Lua is also frequently used as a
-language. Lua is free software
+general-purpose, stand-alone language. Lua is free software.
+Lua combines simple procedural syntax with powerful data description
+constructs based on associative arrays and extensible semantics. Lua
+is dynamically typed, interpreted from bytecodes, and has automatic
+memory management with garbage collection, making it ideal for
+configuration, scripting, and rapid prototyping.
 
 %package devel
-Summary:	Libraries and header files for lua
+Summary:        Development files for %{name}
-Requires:	%{name} = %{version}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       pkgconfig
+
 %description devel
-Static libraries and header files for the support library for lua
+This package contains development files for %{name}.
+
+%package libs
+Summary:        Libraries for %{name}
+Provides:       lua(abi) = %{major_version}
+
+%description libs
+This package contains the shared libraries for %{name}.
+
+%package static
+Summary:        Static library for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description static
+This package contains the static version of liblua for %{name}.
+
 
 %prep
-%setup -q
+%setup -q -a 2 -n %{name}-%{version}
-%patch0 -p1
+cp %{SOURCE1} .
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h
+mv src/luaconf.h src/luaconf.h.template.in
-sed -i 's/CFLAGS= -fPIC -O2 /CFLAGS+= -fPIC -O2 -DLUA_COMPAT_MODULE /' src/Makefile
+%patch0 -p1 -E -z .autoxxx
-cp %{SOURCE1} ./
+%patch1 -p1 -z .idsize
+%patch2 -p1 -z .configure-linux
+%patch3 -p1 -z .configure-compat-all
+%patch4 -p1 -b .CVE-2019-6706
+# Put proper version in configure.ac, patch0 hardcodes 5.3.0
+sed -i 's|5.3.0|%{version}|g' configure.ac
+autoreconf -ifv
 
 %build
-make V=%{majmin} R=%{version} VERBOSE=1 %{?_smp_mflags} linux
+%configure --with-readline --with-compat-module
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# Autotools give me a headache sometimes.
+sed -i 's|@pkgdatadir@|%{_datadir}|g' src/luaconf.h.template
 
-%install
+# hack so that only /usr/bin/lua gets linked with readline as it is the
-make %{?_smp_mflags} \
+# only one which needs this and otherwise we get License troubles
-	V=%{majmin} \
+make %{?_smp_mflags} LIBS="-lm -ldl"
-	R=%{version} \
+# only /usr/bin/lua links with readline now #luac_LDADD="liblua.la -lm -ldl"
-	INSTALL_TOP=%{buildroot}/usr TO_LIB="liblua.so \
-	liblua.so.%{majmin} liblua.so.%{version}" \
-	INSTALL_DATA="cp -d" \
-	INSTALL_MAN=%{buildroot}/usr/share/man/man1 \
-	install
-install -vdm 755 %{buildroot}%{_libdir}/pkgconfig
-cat > %{buildroot}%{_libdir}/pkgconfig/lua.pc <<- "EOF"
-	V=%{majmin}
-	R=%{version}
-
-	prefix=/usr
-	INSTALL_BIN=${prefix}/bin
-	INSTALL_INC=${prefix}/include
-	INSTALL_LIB=${prefix}/lib
-	INSTALL_MAN=${prefix}/man/man1
-	exec_prefix=${prefix}
-	libdir=${exec_prefix}/lib
-	includedir=${prefix}/include
-
-	Name: Lua
-	Description: An Extensible Extension Language
-	Version: ${R}
-	Requires:
-	Libs: -L${libdir} -llua -lm
-	Cflags: -I${includedir}
-EOF
-rmdir %{buildroot}%{_libdir}/lua/5.3
-rmdir %{buildroot}%{_libdir}/lua
 
 %check
-make test
+cd ./lua-%{test_version}-tests/
 
-%clean
+# Dont skip the fully portable or ram-hungry tests:
-rm -rf %{buildroot}
+# sed -i.orig -e '
-%post	-p /sbin/ldconfig
+#     /attrib.lua/d;
-%postun	-p /sbin/ldconfig
+#     /files.lua/d;
+#     /db.lua/d;
+#     /errors.lua/d;
+#     ' all.lua
+# LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir}/lua all.lua
+
+# Removing tests that fail under mock/koji
+sed -i.orig -e '
+    /db.lua/d;
+    /errors.lua/d;
+    ' all.lua
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir}/lua -e"_U=true" all.lua
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
+
+# Rename luaconf.h to luaconf-<arch>.h to avoid file conflicts on
+# multilib systems and install luaconf.h wrapper
+mv %{buildroot}%{_includedir}/luaconf.h %{buildroot}%{_includedir}/luaconf-%{_arch}.h
+install -p -m 644 %{SOURCE3} %{buildroot}%{_includedir}/luaconf.h
+
+# Install rpm-macro
+install -Dpm 0644 %{SOURCE1000} $RPM_BUILD_ROOT/%{macrosdir}/macros.lua
 
 %files
-%license %{LICENSE_PATH}
+%{!?_licensedir:%global license %%doc}
-%defattr(-,root,root)
+%license mit.txt
-%{_bindir}/*
+
-%{_libdir}/liblua.so.*
+%doc README doc/*.html doc/*.css doc/*.gif doc/*.png
-%{_mandir}/*/*
+%{_bindir}/lua
+%{_bindir}/luac
+%{_mandir}/man1/lua*.1*
+
+%files libs
+%dir %{_libdir}/lua
+%dir %{_libdir}/lua/%{major_version}
+%{_libdir}/liblua-%{major_version}.so
+%dir %{_datadir}/lua
+%dir %{_datadir}/lua/%{major_version}
 
 %files devel
-%{_includedir}/*
+%{_includedir}/l*.h
-%{_libdir}/pkgconfig/lua.pc
+%{_includedir}/l*.hpp
 %{_libdir}/liblua.so
+%{_libdir}/pkgconfig/*.pc
+%{macrosdir}/macros.lua
+
+%files static
+%{_libdir}/*.a
+
 
 %changelog
-*   Tue Aug 11 2020 Mateusz Malisz <mamalisz@microsoft.com> 5.3.5-6
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 5.3.5-9
--   Append -fPIC and -O2 to CFLAGS to fix build issues.
+- Update URL to https.
-*   Fri Jul 31 2020 Leandro Pereira <leperei@microsoft.com> 5.3.5-5
+- License verified.
--   Don't stomp on CFLAGS.
+
-*   Thu Jun 06 2020 Joe Schmitt <joschmit@microsoft.com> 5.3.5-4
+* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> - 5.3.5-8
--   Added %%license macro.
+- Initial CBL-Mariner import from Fedora 32 (license: MIT)
-*   Mon Apr 13 2020 Jon Slobodzian <joslobo@microsoft.com> 5.3.5-3
+- Remove bootstrap option
--   Verified License. Fixed Source0 download URL. Fixed URL.  Fixed Formatting.
+
-*   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 5.3.5-2
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-7
--   Initial CBL-Mariner import from Photon (license: Apache2).
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-*   Wed Sep 05 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 5.3.5-1
+
--   Update to version 5.3.5
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-6
-*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 5.3.4-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
--   Update package version
+
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.3.2-2
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.3.5-5
--   GA - Bump release of all rpms
+- Rebuild for readline 8.0
-*   Wed Apr 27 2016 Xiaolin Li <xiaolinl@vmware.com> 5.3.2-1
+
--   Update to version 5.3.2.
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-4
-*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2.3-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
--   Initial build.	First version
+
+* Mon Jan 28 2019 Tom Callaway <spot@fedoraproject.org> - 5.3.5-3
+- apply fix for CVE-2019-6706 (bz1670020)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Tom Callaway <spot@fedoraproject.org> - 5.3.5-1
+- update to 5.3.5
+
+* Tue Feb 13 2018 Tom Callaway <spot@fedoraproject.org> - 5.3.4-10
+- move lua(abi) provide to -libs
+- add fix for bug 6
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan  2 2018 Richard W.M. Jones <rjones@redhat.com> - 5.3.4-8
+- Unnecessary change to RISC-V macros in GCC requires change in luaconf.h.
+
+* Mon Dec  4 2017 Tom Callaway <spot@fedoraproject.org> - 5.3.4-7
+- fix pkgconfig provides (bz1519921)
+
+* Sun Oct 29 2017 Tom Callaway <spot@fedoraproject.org> - 5.3.4-6
+- apply known upstream bugfixes
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun May 28 2017 Björn Esser <besser82@fedoraproject.org> - 5.3.4-3
+- Refactor macros to a more common syntax
+- Use rpm's build-in lua for macros
+
+* Wed May 24 2017 Björn Esser <besser82@fedoraproject.org> - 5.3.4-2
+- Add rpm-macros file, providing packaging macros for lua add-ons (#1447324)
+
+* Thu Feb  9 2017 Tom Callaway <spot@fedoraproject.org> 5.3.4-1
+- update to 5.3.4
+
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 5.3.3-4
+- Rebuild for readline 7.x
+
+* Tue Jul 26 2016 Tom Callaway <spot@fedoraproject.org> - 5.3.3-3
+- create lua-libs subpackage
+- disable bootstrap
+
+* Mon Jul 25 2016 Tom Callaway <spot@fedoraproject.org> - 5.3.3-2
+- apply fixes for upstream bug 1 & 2
+
+* Tue Jun  7 2016 Tom Callaway <spot@fedoraproject.org> - 5.3.3-1
+- update to 5.3.3
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Dec 11 2015 Tom Callaway <spot@fedoraproject.org> - 5.3.2-2
+- fix multilib support (#1229992)
+
+* Fri Dec 11 2015 "D. Johnson" <fenris02@fedoraproject.org> - 5.3.2-1
+- Update to 5.3.2 (#1039249,1173984)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Mar 20 2015 Kalev Lember <kalevlember@gmail.com> - 5.3.0-3
+- Define LUA_COMPAT_5_2 in addition to LUA_COMPAT_5_1 (#1204129)
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 5.3.0-2
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Thu Jan 15 2015 Tom Callaway <spot@fedoraproject.org> - 5.3.0-1
+- update to 5.3.0
+- add bootstrapping glue
+
+* Wed Dec 10 2014 Tom Callaway <spot@fedoraproject.org> - 5.2.3-1
+- update to 5.2.3
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jul 18 2014 Tom Callaway <spot@fedoraproject.org> - 5.2.2-7
+- fix license handling
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Oct 23 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-5
+- readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead
+
+* Wed Oct 23 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-4
+- drop configure-compat-module.patch, if you really need old lua behavior, use compat-lua
+
+* Mon Aug 05 2013 Hans de Goede <hdegoede@redhat.com> - 5.2.2-3
+- Drop compat-lua-libs package, as there now is a separate compat-lua
+  package (including a -devel)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Apr 11 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-1
+- update to 5.2.2
+- incorporate Aaron Faanes's changes
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Apr 06 2011 Tim Niemueller <tim@niemueller.de> - 5.1.4-9
+- Provide lua(abi) = 5.1 for better distro updates later
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 28 2011 Tim Niemueller <tim@niemueller.de> - 5.1.4-7
+- Add patch to from lua.org with smaller bugfixes
+- sed -i -e 's/5\.1\.3/5.1.4/g' on autotoolize patch, bug #641144
+
+* Fri Jan 28 2011 Tim Niemueller <tim@niemueller.de> - 5.1.4-6
+- Add patch to increase IDSIZE for more useful error messages
+
+* Sun May 09 2010 Tim Niemueller <tim@niemueller.de> - 5.1.4-5
+- Add patch regarding dlopen flags to support Lunatic (Lua-Python bridge)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 11 2009 Tim Niemueller <tim@niemueller.de> - 5.1.4-2
+- Link liblua.so with -lm (math lib), fixes rhbz #499238
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Sep 03 2008 Tim Niemueller <tim@niemueller.de> - 5.1.4-1
+- New upstream release 5.1.4
+
+* Mon May 12 2008 Tim Niemueller <tim@niemueller.de> - 5.1.3-6
+- Add -static subpackage with static liblua, fixes rh bug #445939
+
+* Sun Apr 13 2008 Tim Niemueller <tim@niemueller.de> - 5.1.3-5
+- Provide lua = 5.1, this way add-on packages can easily depend on the Lua
+  base version and expect certain paths for packages
+
+* Sat Apr  5 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.3-4
+- Not only own $libdir/lua/5.1 and $datadir/lua/5.1 but also $libdir/lua
+  and $datadir/lua for proper removal of these dirs upon lua removal
+
+* Fri Mar 14 2008 Tim Niemueller <tim@niemueller.de> - 5.1.3-3
+- own $libdir/lua/5.1 and $datadir/lua/5.1. These are the standard package
+  search path for Lua. Packaging them properly allows for easy creation of
+  Lua addon packages.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.1.3-2
+- Autorebuild for GCC 4.3
+
+* Sat Jan 26 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.3-1
+- New upstream release 5.1.3
+
+* Mon Nov 26 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-4
+- Fix libdir in lua.pc being /usr/lib on x86_64 (bz 399101)
+
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-3
+- Also use lib64 instead of lib on ia64 and sparc64 
+
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-2
+- Fix multilib condlict in luaconf.h (bz 342561)
+
+* Mon Apr  2 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-1
+- New upstream release 5.1.2
+- Fix use of rpath on x86_64
+
+* Fri Jan 19 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.1-3
+- Remove "-lreadline -lncurses" from lua.pc (bz 213895)
+
+* Sun Oct 15 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.1-2
+- Only link /usr/bin/lua with readline / do not link %%{_libdir}/liblua-5.1.so
+  with readline so that we don't cause any License troubles for packages
+  linking against liblua-5.1.so, otherwise lua could drag the GPL only readline
+  lib into the linking of non GPL apps.
+
+* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.1-1
+- New upstream release 5.1.1
+- Fix detection of readline during compile (iow add readline support back)
+
+* Sun Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7
+- Rebuild for FC6
+
+* Thu Jun 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-6
+- fixed broken provides
+
+* Tue Jun 06 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-5
+- split out devel subpackage
+
+* Thu Jun 01 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-4
+- added Requires for pkgconfig BZ#193674
+
+* Mon May 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-3
+- added autotools patch from Petri Lehtinen, http://lua-users.org
+
+* Mon May 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-2
+- fixed x86_64 builds
+
+* Mon May 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-1
+- version bump
+
+* Sun Oct 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 5.0.2-5
+- Fix -debuginfo (#165304).
+- Cosmetic specfile improvements.
+
+* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 5.0.2-4
+- rebuild on all arches
+
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.0.2-3
+- rebuilt
+
+* Sat Feb 12 2005 David Woodhouse <dwmw2@infradead.org> - 5.0.2-2
+- Don't use fastround on ppc
+
+* Tue Feb 01 2005 Panu Matilainen <pmatilai@welho.com> - 5.0.2-1
+- update to 5.0.2
+- remove epoch 0, drop fedora.us release tag
+
+* Mon Nov 17 2003 Oren Tirosh <oren at hishome.net> - 0:5.0-0.fdr.2
+- Enable readline support.
+
+* Sat Jun 21 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:5.0-0.fdr.1
+- First build.

SPECS/lua/luaconf.h

@@ -0,0 +1,61 @@
+/*
+ * This luaconf.h is a wrapper include file for the original luaconf.h, 
+ * which has been renamed to luaconf-<arch>.h. There are conflicts for the 
+ * original luaconf.h on multilib systems, which result from arch-specific
+ * configuration options. Please do not use the arch-specific file directly.
+ *
+ * Copyright (C) 2015 Tom Callaway <spot@fedoraproject.org>
+ */
+
+/**
+ *  \file luaconf.h
+ */
+
+#ifdef luaconf_wrapper_h
+#error "luaconf_wrapper_h should not be defined!"
+#endif
+#define luaconf_wrapper_h
+
+#if defined(__i386__)
+#include "luaconf-i386.h"
+#elif defined(__ia64__)
+#include "luaconf-ia64.h"
+#elif defined(__powerpc64__)
+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#include "luaconf-ppc64.h"
+# else
+#include "luaconf-ppc64le.h"
+# endif
+#elif defined(__powerpc__)
+#include "luaconf-ppc.h"
+#elif defined(__s390x__)
+#include "luaconf-s390x.h"
+#elif defined(__s390__)
+#include "luaconf-s390.h"
+#elif defined(__x86_64__)
+#include "luaconf-x86_64.h"
+#elif defined(__arm__)
+#include "luaconf-arm.h"
+#elif defined(__alpha__)
+#include "luaconf-alpha.h"
+#elif defined(__sparc__) && defined (__arch64__)
+#include "luaconf-sparc64.h"
+#elif defined(__sparc__)
+#include "luaconf-sparc.h"
+#elif defined(__aarch64__)
+#include "luaconf-aarch64.h"
+#elif defined(__mips64) && defined(__MIPSEL__)
+#include "luaconf-mips64el.h"
+#elif defined(__mips64)
+#include "luaconf-mips64.h"
+#elif defined(__mips) && defined(__MIPSEL__)
+#include "luaconf-mipsel.h"
+#elif defined(__mips)
+#include "luaconf-mips.h"
+#elif defined(__riscv)
+#include "luaconf-riscv64.h"
+#else
+#error "The lua-devel package is not usable with the architecture."
+#endif
+
+#undef luaconf_wrapper_h

SPECS/lua/macros.lua

@@ -0,0 +1,13 @@
+%lua_version %{lua: print(string.sub(_VERSION, 5))}
+
+%lua_libdir %{_libdir}/lua/%{lua_version}
+%lua_pkgdir %{_datadir}/lua/%{lua_version}
+
+%lua_requires \
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 \
+Requires: lua(abi) = %{lua_version} \
+%else \
+Requires: lua >= %{lua_version} \
+Requires: lua < %{lua: os.setlocale('C'); print(string.sub(_VERSION, 5) + 0.1)} \
+%endif \
+%{nil}

SPECS/lua/mit.txt

@@ -0,0 +1,19 @@
+Copyright (c) 1994-2013 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

SPECS/lutok/README

@@ -0,0 +1,13 @@
+This package provides the full collection of test programs to validate
+the functionality of Lutok.
+
+Because the Linux Standard Base does not recognize a /usr/tests/
+directory (the standard location for ATF-based tests), the test suite is
+installed within the libexec hierarchy.  In particular, such tests can
+be found in /usr/libexec/lutok/tests/ .
+
+In order to execute these tests, you need to install the kyua(1) tool
+from the kyua-cli package.  Once that is done, you can simply run the
+tests by issuing the following command:
+
+    $ kyua test -k /usr/libexec/lutok/tests/Kyuafile

SPECS/lutok/lutok.signatures.json

@@ -0,0 +1,6 @@
+{
+ "Signatures": {
+  "README": "5c54df3e694dbaf5ab4ed5cef493c63792fa21e819a97a1e96c4eae16b9cd681",
+  "lutok-0.4.tar.gz": "2cec51efa0c8d65ace8b21eaa08384b77abc5087b46e785f78de1c21fb754cd5"
+ }
+}

SPECS/lutok/lutok.spec

@@ -0,0 +1,193 @@
+Name:          lutok
+Version:       0.4
+Release:       16%{?dist}
+License:       BSD
+Vendor:        Microsoft Corporation
+Distribution:  Mariner
+URL:           https://github.com/jmmv/lutok
+Summary:       Lightweight C++ API library for Lua
+
+Source0:       https://github.com/jmmv/lutok/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:       README
+
+Requires:      lua >= 5.2
+BuildRequires: gcc
+BuildRequires: libatf-c++-devel >= 0.20
+BuildRequires: lua-devel >= 5.2
+
+%define _testsdir %{_libexecdir}/lutok/tests
+
+%description
+Lutok provides thin C++ wrappers around the Lua C API to ease the
+interaction between C++ and Lua.  These wrappers make intensive use of
+RAII to prevent resource leakage, expose C++-friendly data types, report
+errors by means of exceptions and ensure that the Lua stack is always
+left untouched in the face of errors.  The library also provides a small
+subset of miscellaneous utility functions built on top of the wrappers.
+
+Lutok focuses on providing a clean and safe C++ interface; the drawback
+is that it is not suitable for performance-critical environments.  In
+order to implement error-safe C++ wrappers on top of a Lua C binary
+library, Lutok adds several layers or abstraction and error checking
+that go against the original spirit of the Lua C API and thus degrade
+performance.
+
+%prep
+%setup -q
+
+# Put the README file in the top-level directory of the source tree so
+# that the %doc call below can pick it up.
+cp -p %{SOURCE1} README
+
+%build
+%configure --docdir=%{_defaultdocdir}/lutok-doc-%{version} \
+           --disable-static \
+           --htmldir=%{_defaultdocdir}/lutok-doc-%{version}/html \
+           --without-doxygen
+make %{?_smp_mflags} testsdir=%{_testsdir}
+
+%check
+# In order to enable this, we need to add a BuildRequires on kyua-cli.  The
+# problem is that kyua-cli depends on lutok.  Introducing a circular dependency
+# for this minor benefit does not seem like the best move.  After all, we can
+# always install lutok-tests later and run the tests post-install.
+#make check testsdir=%{_testsdir}
+
+%install
+make install DESTDIR=%{buildroot} doc_DATA= testsdir=%{_testsdir}
+rm %{buildroot}%{_libdir}/liblutok.la
+
+%files
+%doc AUTHORS NEWS README
+%license COPYING
+%{_libdir}/liblutok.so.3
+%{_libdir}/liblutok.so.3.0.0
+
+%ldconfig_scriptlets
+
+%package devel
+Summary: Libraries and header files for Lutok development
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: lua-devel >= 5.1
+Provides: pkgconfig(lutok) = %{version}-%{release}
+
+%description devel
+Provides the libraries and header files to develop applications that
+use the Lutok C++ API to Lua.
+
+%files devel
+%{_includedir}/lutok
+%{_libdir}/liblutok.so
+%{_libdir}/pkgconfig/lutok.pc
+
+%package doc
+Summary: API documentation of the Lutok library and example programs
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+Provides HTML documentation describing the API of the Lutok library
+and a collection of sample source programs to demonstrate the use
+of the library.
+
+%files doc
+%{_defaultdocdir}/lutok-doc-%{version}
+
+%package tests
+Summary: Run-time tests of the Lutok library
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: libatf-c++ >= 0.20
+
+%description tests
+This package installs the run-time tests for the Lutok library.
+Please see the README file in the documentation directory for further
+details on how to run the installed tests.
+
+%files tests
+%doc README
+%{_testsdir}
+
+%changelog
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 0.4-16
+- Initial CBL-Mariner import from Fedora 32 (license: MIT).
+- Update URL.
+- Update Source0.
+- Explicitly provide pkgconfig(lutok).
+- Rename README.Fedora to README.
+- Add %%license file.
+- License verified.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.4-5
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Feb 11 2014 Julio Merino <julio@meroh.net> 0.4-2
+- Depend on atf-0.20 for libatf-c++ ABI changes.
+
+* Sat Dec 07 2013 Julio Merino <julio@meroh.net> 0.4-1
+- Package updated to Lutok 0.4.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Jun 14 2013 Julio Merino <jmmv@google.com> 0.3-1
+- Package updated to Lutok 0.3.
+- Lutok now supports both Lua 5.1 and 5.2.  The specific version used in this
+  release depends on the Fedora branch this package is built for.
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jun 18 2012 Julio Merino <jmmv@google.com> 0.2-2
+- Added the lutok-tests package providing the run-time tests of Lutok, readily
+  runnable by the end users.
+
+* Wed May 30 2012 Julio Merino <jmmv@google.com> 0.2-1
+- Package updated to Lutok 0.2.
+
+* Sun May 06 2012 Julio Merino <jmmv@google.com> 0.1-2
+- Made lutok-devel depend on lua-devel (needed for c_gate.hpp).
+- Forced lutok and lutok-devel to depend on Lua 5.1; 5.2 is not supported
+  by Lutok 0.1.
+
+* Fri Feb 03 2012 Julio Merino <jmmv@google.com> 0.1-1
+- Initial release for Fedora.

SPECS/man-db/man-db.spec

@@ -1,13 +1,14 @@
 Summary:        Programs for finding and viewing man pages
 Name:           man-db
 Version:        2.8.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 URL:            https://nongnu.org/man-db
 Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        https://download.savannah.nongnu.org/releases/man-db/%{name}-%{version}.tar.xz
+Provides:       man = %{version}-%{release}
 Requires:       libpipeline
 Requires:       gdbm
 Requires:       xz
@@ -76,9 +77,10 @@ fi
 %{_libdir}/tmpfiles.d/man-db.conf
 
 %changelog
-* Sat May 09 00:21:02 PST 2020 Nick Samson <nisamson@microsoft.com>
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.8.4-6
-- Added %%license line automatically
+-   Add explicit provide for "man"
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.8.4-5
+-   Added %%license line automatically
 *   Fri Apr 17 2020 Emre Girgin <mrgirgin@microsoft.com> 2.8.4-4
 -   Rename shadow to shadow-utils.
 *   Tue Apr 07 2020 Joe Schmitt <joschmit@microsoft.com> 2.8.4-3

SPECS/mariner-rpm-macros/macros

@@ -25,8 +25,14 @@
 %_var               /var
 %_localstatedir     /var
 
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%_pkgdocdir         %{_docdir}/%{name}
+%_docdir_fmt        %%{NAME}
+
 %__tar              /bin/tar --no-same-owner
 
+%_fmoddir           %{_libdir}/gfortran/modules
+
 # This section overrides the default behavior of the build macro to export
 # all of the flags handled by set_build_flags. Once the configure macros
 # are consistently applied this override should be removed.
@@ -59,6 +65,13 @@
 %build_fflags %{optflags} -I%{_fmoddir}
 %build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags}
 
+# Deprecated names.  For backwards compatibility only.
+%__global_cflags %{build_cflags}
+%__global_cxxflags %{build_cxxflags}
+%__global_fflags %{build_fflags}
+%__global_fcflags %{build_fflags}
+%__global_ldflags %{build_ldflags}
+
 %set_build_flags \
   CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \
@@ -118,4 +131,15 @@
 %_ld_as_needed          1
 %_ld_as_needed_flags    %{?_ld_as_needed:-Wl,--as-needed}
 
-%__global_compiler_flags        -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} %{_annotated_cflags}%{?_legacy_common_support: -fcommon}
+%__global_compiler_flags        -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} %{_annotated_cflags}%{?_legacy_common_support: -fcommon}
+
+# https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/macros.ldconfig
+#%ldconfig /sbin/ldconfig
+%ldconfig_post(n:) %{?ldconfig:%post -p %ldconfig %{?*} %{-n:-n %{-n*}}\
+%end}
+%ldconfig_postun(n:) %{?ldconfig:%postun -p %ldconfig %{?*} %{-n:-n %{-n*}}\
+%end}
+%ldconfig_scriptlets(n:) %{?ldconfig:\
+%ldconfig_post %{?*} %{-n:-n %{-n*}}\
+%ldconfig_postun %{?*} %{-n:-n %{-n*}}\
+}

SPECS/mariner-rpm-macros/macros.mono-srpm

@@ -0,0 +1,5 @@
+# arches that mono builds on
+%mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} aarch64 alpha s390x ppc ppc64 ppc64le
+
+%_monodir %{_prefix}/lib/mono
+%_monogacdir %{_monodir}/gac

SPECS/mariner-rpm-macros/macros.nodejs-srpm

@@ -0,0 +1,7 @@
+# nodejs_arches lists what arches Node.js and dependent packages run on.
+#
+# Enabling Node.js on other arches requires porting the V8 JavaScript JIT to
+# those arches. Support for POWER and aarch64 arrived in nodejs v4. Support
+# for s390x arrived in nodejs v6
+
+%nodejs_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x

SPECS/mariner-rpm-macros/macros.ocaml-srpm

@@ -0,0 +1,15 @@
+# Note that OCaml is compiled on all architectures.  However
+# on some (rare) architectures, only bytecode compilation is
+# available.  Use these macros to find out if native code
+# compilation is available on a particular architecture.
+
+# Architectures that support the OCaml native code compiler.
+%ocaml_native_compiler  aarch64 %{arm} %{ix86} ppc ppc64 ppc64le riscv64 s390x sparc sparcv9 x86_64
+
+# Architectures that support native dynamic linking of OCaml code.
+%ocaml_natdynlink       aarch64 %{arm} %{ix86} ppc ppc64 ppc64le riscv64 s390x sparc sparcv9 x86_64
+
+# Architectures that support profiling of native code (ocamlopt -p).
+# This was removed in OCaml 4.09.
+# https://github.com/ocaml/ocaml/pull/2314
+%ocaml_native_profiling %{nil}

SPECS/mariner-rpm-macros/macros.openblas-srpm

@@ -0,0 +1,2 @@
+# Architectures that OpenBLAS supports
+%openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64 s390x

SPECS/mariner-rpm-macros/macros.perl-srpm

@@ -0,0 +1,19 @@
+# Copyright (c) 2012  Petr Pisar <ppisar@redhat.com>.
+# This file is distributed under the terms of GNU GPL license version 3, or
+# any later version.
+
+# This file contains macros that can be used for building source RPM package
+# from git source repository. This file must present in minimal build root to
+# take effect.
+# This file must not use Perl or any non-minimal-build-root package. The
+# purpose is to enable bootstrapping perl.
+ 
+# Perl bootstrap For rebuild of Perl and all related packages is needed
+# switch, which enable only vital build requires. This could help cyclic
+# dependencies, for example: perl-Test-Minimum-Version <->
+# perl-Perl-Minimum-Version Defined for bootstraping, undefined otherwise.
+# Usage: %%if !%%{defined perl_bootstrap} ... %%endif
+%perl_bootstrap 1
+
+# Perl macro, no longer part of rpm >= 4.15
+%__perl %{_bindir}/perl

SPECS/mariner-rpm-macros/macros.python

@@ -0,0 +1,91 @@
+# unversioned macros: used with user defined __python, no longer part of rpm >= 4.15
+# __python is defined to error by default in the srpm macros
+%python_sitelib %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%python_sitearch %(%{__python} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
+%python_version %(%{__python} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
+%python_version_nodots %(%{__python} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
+
+%py_setup setup.py
+%py_shbang_opts -s
+%py_shbang_opts_nodash %(opts=%{py_shbang_opts}; echo ${opts#-})
+%py_shebang_flags %(opts=%{py_shbang_opts}; echo ${opts#-})
+%py_shebang_fix %{expand:/usr/bin/pathfix.py -pni %{__python} -k%{?py_shebang_flags:a %py_shebang_flags}}
+
+# Use the slashes after expand so that the command starts on the same line as
+# the macro
+%py_build() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python} %{py_shbang_opts}" %{?*}
+  sleep 1
+}
+
+%py_build_egg() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
+  sleep 1
+}
+
+%py_build_wheel() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
+  sleep 1
+}
+
+%py_install() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%py_install_egg() %{expand:\\\
+  mkdir -p %{buildroot}%{python_sitelib}
+  easy_install -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python_version}.egg %{?*}
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%py_install_wheel() %{expand:\\\
+  pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%python_provide() %{lua:
+  function string.starts(String,Start)
+    return string.sub(String,1,string.len(Start))==Start
+  end
+  package = rpm.expand("%{?1}")
+  vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
+  if (string.starts(package, "python2-")) then
+    --No unversioned provides as python2 is not default
+  elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then
+    print("\\nProvides: python-")
+    l = 8 + string.len(rpm.expand("%{python3_pkgversion}"))
+    print(string.sub(package,l,string.len(package)))
+    print(" = ")
+    print(vr)
+    --Obsoleting the previous default python package (if it doesn't have isa)
+    if (string.sub(package, "-1") ~= ")") then
+      print("\\nObsoletes: python-")
+      print(string.sub(package,l,string.len(package)))
+      print(" < ")
+      print(vr)
+    end
+  elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then
+    --No unversioned provides as python3_other is not default
+  elseif (string.starts(package, "pypy-")) then
+    --No unversioned provides as pypy is not default
+  elseif (string.starts(package, "pypy2-")) then
+    --No unversioned provides as pypy is not default
+  elseif (string.starts(package, "pypy3-")) then
+    --No unversioned provides as pypy is not default
+  elseif (string.starts(package, "python-")) then
+    --No unversioned provides needed for unversioned python
+  else
+    print("%python_provide: ERROR: ")
+    print(package)
+    print(" not recognized.")
+  end
+}
+
+%python_disable_dependency_generator() \
+%undefine __pythondist_requires \
+%{nil}

SPECS/mariner-rpm-macros/macros.python-srpm

@@ -0,0 +1,151 @@
+# Define the Python interpreter paths in the SRPM macros so that
+# - they can be used in Build/Requires
+# - they can be used in non-Python packages where requiring pythonX-devel would
+#   be an overkill
+
+# use the underscored macros to redefine the behavior of %%python3_version etc.
+%__python2 /usr/bin/python2
+%__python3 /usr/bin/python3
+
+# use the non-underscored macros to refer to Python in spec, etc.
+%python2 %__python2
+%python3 %__python3
+
+# For backwards compatibility only
+# See the comments in https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/22
+%__python /usr/bin/python
+
+# Users can use %%python only if they redefined %%__python (e.g. to %%__python3)
+%python() %{lua:\
+    __python = rpm.expand("%__python")\
+    if __python == "/usr/bin/python" then\
+        rpm.expand("%{error:Cannot use %%python if %%__python wasn't redefined to something other than /usr/bin/python.}")\
+    else\
+        print(__python)\
+    end\
+}
+
+# python3_pkgversion specifies the version of Python 3 in the distro.  It can be
+# a specific version (e.g. 34 in Fedora EPEL7)
+%python3_pkgversion 3
+
+# Set to /bin/true to avoid %ifdefs and %{? in specfiles
+%__python3_other /bin/true
+%py3_other_build /bin/true
+%py3_other_install /bin/true
+
+
+
+# === Macros for Build/Requires tags using Python dist tags ===
+# - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+# - These macros need to be in macros.python-srpm, because BuildRequires tags
+#   get rendered as runtime requires into the metadata of SRPMs.
+
+# Converts Python dist name to a canonical format
+%py_dist_name() %{lua:\
+        name = rpm.expand("%{?1:%{1}}");\
+        canonical = string.gsub(string.lower(name), "[^%w%.]+", "-");\
+        print(canonical);\
+}
+
+# Creates Python 2 dist tag(s) after converting names to canonical format
+#   Needs to first put all arguments into a list, because invoking a different
+#   macro (%py_dist_name) overwrites them
+%py2_dist() %{lua:\
+        args = {}\
+        arg = 1\
+        while (true) do\
+                name = rpm.expand("%{?" .. arg .. ":%{" .. arg .. "}}");\
+                if (name == nil or name == '') then\
+                        break\
+                end\
+                args[arg] = name\
+                arg = arg + 1\
+        end\
+        for arg, name in ipairs(args) do\
+                canonical = rpm.expand("%py_dist_name " .. name);\
+                print("python2dist(" .. canonical .. ") ");\
+        end\
+}
+
+# Creates Python 3 dist tag(s) after converting names to canonical format
+#   Needs to first put all arguments into a list, because invoking a different
+#   macro (%py_dist_name) overwrites them
+%py3_dist() %{lua:\
+        args = {}\
+        arg = 1\
+        while (true) do\
+                name = rpm.expand("%{?" .. arg .. ":%{" .. arg .. "}}");\
+                if (name == nil or name == '') then\
+                        break\
+                end\
+                args[arg] = name\
+                arg = arg + 1\
+        end\
+        for arg, name in ipairs(args) do\
+                canonical = rpm.expand("%py_dist_name " .. name);\
+                print("python3dist(" .. canonical .. ") ");\
+        end\
+}
+
+# Macro to replace overly complicated references to PyPI source files.
+# Expands to the pythonhosted URL for a package
+# Accepts zero to three arguments:
+# 1:  The PyPI project name, defaulting to %srcname if it is defined, then
+#     %pypi_name if it is defined, then just %name.
+# 2:  The PYPI version, defaulting to %version with tildes stripped.
+# 3:  The file extension, defaulting to "tar.gz".  (A period will be added
+#     automatically.)
+# Requires %__pypi_url and %__pypi_default_extension to be defined.
+%__pypi_url https://files.pythonhosted.org/packages/source/
+%__pypi_default_extension tar.gz
+
+%pypi_source() %{lua:
+    local src = rpm.expand('%1')
+    local ver = rpm.expand('%2')
+    local ext = rpm.expand('%3')
+    local url = rpm.expand('%__pypi_url')
+\
+    -- If no first argument, try %srcname, then %pypi_name, then %name
+    -- Note that rpm leaves macros unchanged if they are not defined.
+    if src == '%1' then
+        src = rpm.expand('%srcname')
+    end
+    if src == '%srcname' then
+        src = rpm.expand('%pypi_name')
+    end
+    if src == '%pypi_name' then
+        src = rpm.expand('%name')
+    end
+\
+    -- If no second argument, use %version
+    if ver == '%2' then
+        ver = rpm.expand('%version'):gsub('~', '')
+    end
+\
+    -- If no third argument, use the preset default extension
+    if ext == '%3' then
+        ext = rpm.expand('%__pypi_default_extension')
+    end
+\
+    local first = string.sub(src, 1, 1)
+\
+    print(url .. first .. '/' .. src .. '/' .. src .. '-' .. ver .. '.' .. ext)
+}
+
+%py_provides() %{lua:
+    local name = rpm.expand('%1')
+    if name == '%1' then
+        rpm.expand('%{error:%%py_provides requires at least 1 argument, the name to provide}')
+    end
+    local evr = rpm.expand('%2')
+    if evr == '%2' then
+        evr = rpm.expand('%{?epoch:%{epoch}:}%{version}-%{release}')
+    end
+    print('Provides: ' .. name .. ' = ' .. evr .. '\\n')
+    -- NB: dash needs to be escaped!
+    if name:match('^python3%-') then
+      replaced = name:gsub('^python3%-', 'python-')
+      print('Provides: ' .. replaced .. ' = ' .. evr .. '\\n')
+    end
+}

SPECS/mariner-rpm-macros/macros.python2

@@ -0,0 +1,51 @@
+%python2_sitelib %(%{__python2} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%python2_sitearch %(%{__python2} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
+%python2_version %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
+%python2_version_nodots %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
+
+%py2_shbang_opts -s
+%py2_shbang_opts_nodash %(opts=%{py2_shbang_opts}; echo ${opts#-})
+%py2_shebang_flags %(opts=%{py2_shbang_opts}; echo ${opts#-})
+%py2_shebang_fix %{expand:/usr/bin/pathfix.py -pni %{__python2} -k%{?py2_shebang_flags:a %py2_shebang_flags}}
+
+# Use the slashes after expand so that the command starts on the same line as
+# the macro
+# The `sleep 1` commands work around a race in install; see:
+#   https://bugzilla.redhat.com/show_bug.cgi?id=1644923
+%py2_build() %{expand:\\\
+  sleep 1
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?*}
+  sleep 1
+}
+
+%py2_build_egg() %{expand:\\\
+  sleep 1
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python2} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
+  sleep 1
+}
+
+%py2_build_wheel() %{expand:\\\
+  sleep 1
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python2} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
+  sleep 1
+}
+
+%py2_install() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%py2_install_egg() %{expand:\\\
+  mkdir -p %{buildroot}%{python2_sitelib}
+  easy_install-%{python2_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python2_version}.egg %{?*}
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%py2_install_wheel() %{expand:\\\
+  pip%{python2_version} install -I dist/%{1} --root %{buildroot} --no-deps
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}

SPECS/mariner-rpm-macros/macros.python3

@@ -0,0 +1,69 @@
+%python3_sitelib %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%python3_sitearch %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
+%python3_version %(%{__python3} -Ic "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
+%python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
+%python3_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())")
+%py3dir %{_builddir}/python3-%{name}-%{version}-%{release}
+
+%py3_shbang_opts -s
+%py3_shbang_opts_nodash %(opts=%{py3_shbang_opts}; echo ${opts#-})
+%py3_shebang_flags %(opts=%{py3_shbang_opts}; echo ${opts#-})
+%py3_shebang_fix %{expand:/usr/bin/pathfix.py -pni %{__python3} -k%{?py3_shebang_flags:a %py3_shebang_flags}}
+
+# Use the slashes after expand so that the command starts on the same line as
+# the macro
+%py3_build() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*}
+}
+
+%py3_build_egg() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python3} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
+}
+
+%py3_build_wheel() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
+}
+
+%py3_install() %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
+   rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%py3_install_egg() %{expand:\\\
+  mkdir -p %{buildroot}%{python3_sitelib}
+  easy_install-%{python3_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_version}.egg %{?*}
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+%py3_install_wheel() %{expand:\\\
+  pip%{python3_version} install -I dist/%{1} --root %{buildroot} --no-deps
+  rm -rfv %{buildroot}%{_bindir}/__pycache__
+}
+
+# This only supports Python 3.5+ and will never work with Python 2.
+# Hence, it has no Python version in the name.
+%pycached() %{lua:
+  path = rpm.expand("%{?*}")
+  if (string.sub(path, "-3") ~= ".py") then
+    rpm.expand("%{error:%%pycached can only be used with paths explicitly ending with .py}")
+  else
+    print(path)
+    pyminor = path:match("/python3.(%d+)/") or "*"
+    dirname = path:match("(.*/)")
+    modulename = path:match(".*/([^/]+).py")
+    print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. "{,.opt-?}.pyc")
+  end
+}
+
+# This is intended for Python 3 only, hence also no Python version in the name.
+%__pytest /usr/bin/pytest
+%pytest %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  PATH="%{buildroot}%{_bindir}:$PATH"\\\
+  PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
+  PYTHONDONTWRITEBYTECODE=1\\\
+  %__pytest}

SPECS/mariner-rpm-macros/mariner-rpm-macros.signatures.json

@@ -3,8 +3,17 @@
   "default-annobin-cc1": "2315f86ffa724b9121b5a94d752883c11cbce581ac5e691717269ccbdac66625",
   "default-hardened-cc1": "2102bdfbb06934d95ceb3c81f789c59c9f77f91b0f996fd39588e0aa052d6f77",
   "default-hardened-ld": "4dbb822a27eed292759bc4e9cabb4b84f34fc6701535fcac2fdddac33328678b",
-  "macros": "4d16419d5168e266991ab234961176f0106c42acceaa20ce9889f71d3ef51eba",
+  "macros": "f3aa74f86a58534295c735f06ab68831223a5ea115464fcb17b7d459203f7a38",
   "macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
+  "macros.mono-srpm": "a9201ae36fc482e966134e38f42412378e955faf296b214cb6dd63981af8bc49",
+  "macros.nodejs-srpm": "b2515cc7fad3f14849cff8593b10543a3f73edccff4c3c6d0d2764dae19c38e8",
+  "macros.ocaml-srpm": "cd34e1d89cf45b1a76a8803a7fe3aefa6e5e6380e983a85d8dae4912ba360b3f",
+  "macros.openblas-srpm": "bd46ab2c99aa504d3fb09de1f071f0e19a9b2605772c1a738a32cfb0129d33b8",
+  "macros.perl-srpm": "27f09c386944fc7478cdde55168bbc720d03ecd11ec60ae1133a42db6432e7f7",
+  "macros.python": "3a1bf3e8fbbcffe87acc2f44b3597ae0aacc829c92f1579154f2e7e782c9ad1d",
+  "macros.python-srpm": "63d73bc64d58739e7d4ca020a698cc83106d6e555508d0c7bd186e24a5067366",
+  "macros.python2": "954d866a657d44f1a0418935475633961223ddb7ef84de50d58bc907d7651b37",
+  "macros.python3": "2d9559f1ffdd20908bbe3d483bb2b7b8127137750cf65ef5552e008fed339c1f",
   "rpmrc": "c197369d806430f581de9d5f0e89384d231745712f394ce39497ada47d1f4efe"
  }
 }

SPECS/mariner-rpm-macros/mariner-rpm-macros.spec

@@ -1,7 +1,7 @@
 Summary:	Mariner specific rpm macro files
 Name:		mariner-rpm-macros
 Version:	1.0
-Release:	3%{?dist}
+Release:	6%{?dist}
 License:	GPL+
 Group:		Development/System
 Vendor:		Microsoft Corporation
@@ -12,7 +12,19 @@ Source2: default-hardened-cc1
 Source3: default-hardened-ld
 Source4: default-annobin-cc1
 Source5: macros.check
-
+Source6: macros.python
+Source7: macros.python2
+Source8: macros.python3
+Source9: macros.python-srpm
+Source10: macros.openblas-srpm
+Source11: macros.nodejs-srpm
+Source12: macros.mono-srpm
+Source13: macros.ocaml-srpm
+Source14: macros.perl-srpm
+Provides: redhat-rpm-config
+Provides: openblas-srpm-macros
+Provides: ocaml-srpm-macros
+Provides: perl-srpm-macros
 BuildArch: noarch
 
 
@@ -29,6 +41,18 @@ Group:          Development/System
 %description -n mariner-check-macros
 Mariner specific rpm macros to override default %%check behavior
 
+%package -n mariner-python-macros
+Summary:        Mariner python macros
+License:        GPL+
+Group:          Development/System
+Provides:       python-srpm-macros
+Provides:       python-rpm-macros
+Provides:       python2-rpm-macros
+Provides:       python3-rpm-macros
+
+%description -n mariner-python-macros
+Mariner python macros
+
 %prep
 %setup -c -T
 cp -p %{sources} .
@@ -48,11 +72,29 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
 %{rcdir}/rpmrc
 %{rcdir}/default-hardened-*
 %{rcdir}/default-annobin-*
+%{_rpmconfigdir}/macros.d/macros.openblas-srpm
+%{_rpmconfigdir}/macros.d/macros.nodejs-srpm
+%{_rpmconfigdir}/macros.d/macros.mono-srpm
+%{_rpmconfigdir}/macros.d/macros.ocaml-srpm
+%{_rpmconfigdir}/macros.d/macros.perl-srpm
 
 %files -n mariner-check-macros
 %{_rpmconfigdir}/macros.d/macros.check
 
+%files -n mariner-python-macros
+%{_rpmconfigdir}/macros.d/macros.python*
+
 %changelog
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 1.0-6
+- Add backwards compatibility macros for compiling and linking.
+- Define _fmoddir macro.
+- Turn on perl_bootstrap by default.
+- Add perl-srpm macros.
+* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> - 1.0-5
+- Add srpm macros.
+- Add python related macros derived from Fedora 32 python-rpm-macros.
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 1.0-4
+- Add ldconfig_scriptlets related macros derived from Fedora 32 redhat-rpm-config.
 * Tue Jun 23 2020 Henry Beberman <henry.beberman@microsoft.com> - 1.0-3
 - Add macros.check to support non-fatal check section runs for log collection.
 * Mon Jun 08 2020 Henry Beberman <henry.beberman@microsoft.com> - 1.0-2

SPECS/nss/nss.spec

@@ -1,7 +1,7 @@
 Summary:        Security client
 Name:           nss
 Version:        3.44
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MPLv2.0
 URL:            https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 Group:          Applications/System
@@ -12,6 +12,8 @@ Patch:          nss-3.44-standalone-1.patch
 Requires:       nspr
 BuildRequires:  nspr-devel
 BuildRequires:  sqlite-devel
+Provides:       %{name}-tools = %{version}-%{release}
+Provides:       %{name}-softokn = %{version}-%{release}
 Requires:       nss-libs = %{version}-%{release}
 
 %description
@@ -26,6 +28,10 @@ Requires:       nss-libs = %{version}-%{release}
 %package devel
 Summary: Development Libraries for Network Security Services
 Group: Development/Libraries
+Provides: %{name}-static = %{version}-%{release}
+Provides: %{name}-softokn-devel = %{version}-%{release}
+Provides: %{name}-pkcs11-devel = %{version}-%{release}
+Provides: %{name}-pkcs11-devel-static = %{version}-%{release}
 Requires: nspr-devel
 Requires: nss = %{version}-%{release}
 %description devel
@@ -34,6 +40,7 @@ Header files for doing development with Network Security Services.
 %package libs
 Summary: Libraries for Network Security Services
 Group:      System Environment/Libraries
+Provides:   %{name}-util = %{version}-%{release}
 Requires:   sqlite-libs
 Requires:   nspr
 %description libs
@@ -97,9 +104,11 @@ sudo -u test ./all.sh && userdel test -r -f
 %{_libdir}/libsoftokn3.so
 
 %changelog
-* Sat May 09 00:21:35 PST 2020 Nick Samson <nisamson@microsoft.com> - 3.44-2
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 3.44-3
-- Added %%license line automatically
+-   Provide nss-tools, -util, -static, -softokn, -softokn-devel
-
+-   Provide nss-pkcs11-devel, -pkcs11-devel-static
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.44-2
+-   Added %%license line automatically
 *   Tue Mar 17 2020 Andrew Phelps <anphel@microsoft.com> 3.44-1
 -   Update version to 3.44. License verified.
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.39-2

SPECS/openjdk8/openjdk8.spec

@@ -3,7 +3,7 @@
 Summary:        OpenJDK
 Name:           openjdk8
 Version:        1.8.0.212
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
 URL:            https://openjdk.java.net
 Group:          Development/Tools
@@ -17,11 +17,11 @@ Patch1:         check-system-ca-certs.patch
 ExclusiveArch:  x86_64
 BuildRequires:  alsa-lib
 BuildRequires:  alsa-lib-devel
-BuildRequires:  chkconfig
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  glib-devel
 BuildRequires:  pcre-devel
+BuildRequires:  zip
 BuildRequires:  unzip
 BuildRequires:  which
 BuildRequires:  zlib-devel
@@ -30,6 +30,8 @@ Requires:       chkconfig
 Obsoletes:      openjdk <= %{version}
 AutoReqProv:    no
 
+Provides: java-1.8.0-openjdk-headless = %{version}-%{release}
+
 %description
 The OpenJDK package installs java class library and javac java compiler.
 
@@ -248,7 +250,11 @@ rm -rf %{buildroot}/*
 %{_libdir}/jvm/OpenJDK-%{version}/src.zip
 
 %changelog
-*   Thu Jun 11 2020 Henry Beberman <henry.beberman@microsoft.com> - 1.8.0.212-10
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 1.8.0.212-11
+-   Remove unused buildrequires.
+-   Provide java-1.8.0-openjdk-headless.
+-   Add zip as a build requires.
+*   Thu Jun 11 2020 Henry Beberman <henry.beberman@microsoft.com> 1.8.0.212-10
 -   Disable -Werrors that break the build in cflags and cxxflags.
 *   Tue May 26 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 1.8.0.212-9
 -   Adding the "%%license" macro.

SPECS/openjdk8/openjdk8_aarch64.spec

@@ -8,7 +8,7 @@
 Summary:        OpenJDK
 Name:           openjdk8
 Version:        1.8.0.181
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
 URL:            https://hg.openjdk.java.net/aarch64-port/jdk8u/
 Group:          Development/Tools
@@ -23,7 +23,6 @@ BuildRequires:	which
 BuildRequires:	zip
 BuildRequires:	unzip
 BuildRequires:  zlib-devel
-BuildRequires:	chkconfig
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  glib-devel
@@ -33,6 +32,8 @@ Obsoletes:      openjdk <= %{version}
 AutoReqProv: 	no
 %define bootstrapjdk /usr/lib/jvm/OpenJDK-1.8.0.181-bootstrap
 
+Provides: java-1.8.0-openjdk-headless = %{version}-%{release}
+
 %description
 The OpenJDK package installs java class library and javac java compiler.
 
@@ -248,9 +249,12 @@ rm -rf %{buildroot}/*
 %{_libdir}/jvm/OpenJDK-%{version}/src.zip
 
 %changelog
-*   Thu Jun 11 2020 Henry Beberman <henry.beberman@microsoft.com> - 1.8.0.181-8
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 1.8.0.181-9
+-   Remove unused buildrequires.
+-   Provide java-1.8.0-openjdk-headless.
+*   Thu Jun 11 2020 Henry Beberman <henry.beberman@microsoft.com> 1.8.0.181-8
 -   Disable -Werrors that break the build in cflags and cxxflags.
-*   Sat May 09 00:20:52 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.8.0.181-7
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.8.0.181-7
 -   Added %%license line automatically
 *   Wed May 06 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 1.8.0.181-6
 -   Removing *Requires for "ca-certificates".

SPECS/openldap/openldap.spec

@@ -2,7 +2,7 @@
 Summary:        OpenLDAP (Lightweight Directory Access Protocol)
 Name:           openldap
 Version:        2.4.50
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        OpenLDAP
 URL:            https://www.openldap.org/
 Group:          System Environment/Security
@@ -18,6 +18,7 @@ BuildRequires:  cyrus-sasl >= 2.1
 BuildRequires:  openssl-devel >= 1.0.1
 BuildRequires:  groff
 BuildRequires:  e2fsprogs-devel
+Provides:       %{name}-devel = %{version}-%{release}
 
 %description
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@@ -77,6 +78,8 @@ rm -rf %{buildroot}/*
 /etc/openldap/*
 
 %changelog
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.4.50-2
+-   Explicit provide -devel subpackage
 *   Wed Jun 03 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.4.50-1
 -   Upgrade to version 2.4.50, which resolves CVE-2020-12243.
 *   Tue May 12 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.4.48-1

SPECS/openscap/openscap.spec

@@ -1,7 +1,7 @@
 Summary:        Open Source Security Compliance Solution
 Name:           openscap
 Version:        1.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        LGPLv2+
 URL:            https://www.open-scap.org
 Source0:        https://github.com/OpenSCAP/openscap/releases/download/%{version}/%{name}-%{version}.tar.gz
@@ -58,6 +58,9 @@ mkdir build
 cd build
 %cmake -DENABLE_PERL=ON \
        -DENABLE_SCE=ON \
+       -DPYTHON_EXECUTABLE:STRING=%{__python2} \
+       -DPYTHON_VERSION_MAJOR:STRING=$(%{__python2} -c "import sys; print(sys.version_info.major)") \
+       -DPYTHON_VERSION_MINOR:STRING=$(%{__python2} -c "import sys; print(sys.version_info.minor)") \
        ..
 make %{?_smp_flags}
 
@@ -102,9 +105,10 @@ find %{buildroot} -name '*.la' -delete
 %{_libdir}/python2.7/*
 
 %changelog
-* Sat May 09 00:20:55 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.3.1-3
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 1.3.1-4
-- Added %%license line automatically
+-   Explicitly set python verison.
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.3.1-3
+-   Added %%license line automatically
 *   Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 1.3.1-2
 -   Renaming XML-Parser to perl-XML-Parser
 *   Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 1.3.1-1

SPECS/perl-File-HomeDir/perl-File-HomeDir.spec

@@ -1,7 +1,7 @@
 Summary:        File-HomeDir
 Name:           perl-File-HomeDir
 Version:        1.004
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        The Perl 5 License (Artistic 1 & GPL 1)
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/File-HomeDir/
@@ -47,21 +47,22 @@ make test
 %{perl_vendorlib}/File/HomeDir/Unix.pm
 %{perl_vendorlib}/File/HomeDir/Windows.pm
 %{_mandir}/man3
-%{_mandir}/man3/File::HomeDir.3.gz
+%{_mandir}/man3/File::HomeDir.3pm.gz
-%{_mandir}/man3/File::HomeDir::Darwin.3.gz
+%{_mandir}/man3/File::HomeDir::Darwin.3pm.gz
-%{_mandir}/man3/File::HomeDir::Darwin::Carbon.3.gz
+%{_mandir}/man3/File::HomeDir::Darwin::Carbon.3pm.gz
-%{_mandir}/man3/File::HomeDir::Darwin::Cocoa.3.gz
+%{_mandir}/man3/File::HomeDir::Darwin::Cocoa.3pm.gz
-%{_mandir}/man3/File::HomeDir::Driver.3.gz
+%{_mandir}/man3/File::HomeDir::Driver.3pm.gz
-%{_mandir}/man3/File::HomeDir::FreeDesktop.3.gz
+%{_mandir}/man3/File::HomeDir::FreeDesktop.3pm.gz
-%{_mandir}/man3/File::HomeDir::MacOS9.3.gz
+%{_mandir}/man3/File::HomeDir::MacOS9.3pm.gz
-%{_mandir}/man3/File::HomeDir::Test.3.gz
+%{_mandir}/man3/File::HomeDir::Test.3pm.gz
-%{_mandir}/man3/File::HomeDir::Unix.3.gz
+%{_mandir}/man3/File::HomeDir::Unix.3pm.gz
-%{_mandir}/man3/File::HomeDir::Windows.3.gz
+%{_mandir}/man3/File::HomeDir::Windows.3pm.gz
 
 %changelog
-* Sat May 09 00:21:38 PST 2020 Nick Samson <nisamson@microsoft.com>
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 1.004-4
-- Added %%license line automatically
+-   Switch to new perl man page extension.
-
+*   Sat May 09 00:21:38 PST 2020 Nick Samson <nisamson@microsoft.com> 1.004-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.004-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.004-1

SPECS/perl-File-Which/perl-File-Which.spec

@@ -1,7 +1,7 @@
 Summary:        File-Which
 Name:           perl-File-Which
 Version:        1.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        The Perl 5 License (Artistic 1 & GPL 1)
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/File-Which/
@@ -49,13 +49,14 @@ make test
 %license LICENSE
 %{perl_vendorlib}/*
 %{perl_vendorlib}/File/Which.pm
-%{_mandir}/man3/File::Which.3.gz
+%{_mandir}/man3/File::Which.3pm.gz
 
 
 %changelog
-* Sat May 09 00:21:42 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.22-3
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 1.22-4
-- Added %%license line automatically
+-   Switch to new perl man page extension.
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.22-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.22-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.22-1

SPECS/perl-List-MoreUtils/perl-List-MoreUtils.spec

@@ -2,7 +2,7 @@
 Summary:	Provide the stuff missing in List::Util
 Name:		perl-List-MoreUtils
 Version:	0.428
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:	GPL+ or Artistic
 Group:          Development/Libraries
 URL:		http://search.cpan.org/dist/List-MoreUtils/
@@ -44,12 +44,13 @@ make test
 %{perl_vendorlib}/List/
 %{_mandir}/man3/List::MoreUtils.3*
 %{_mandir}/man3/List::MoreUtils::PP.3*
-%{_mandir}/man3/List::MoreUtils::Contributing.3.gz
+%{_mandir}/man3/List::MoreUtils::Contributing.3pm.gz
 
 %changelog
-* Sat May 09 00:21:01 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.428-4
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 0.428-5
-- Added %%license line automatically
+-   Switch to new perl man page extension.
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 0.428-4
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.428-3
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 0.428-2

SPECS/perl/additional-provides.inc

@@ -0,0 +1,17 @@
+# Mariner perl.spec provides mostly the same modules as Fedora's version. This file lists additional subpackage and explicit provides to meet Fedora spec's build requirements
+
+# version and compat versions provided by perl-libs
+Provides: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Provides: perl(:MODULE_COMPAT_5.30.0)
+Provides: perl(:MODULE_COMPAT_5.30.1)
+Provides: perl(:MODULE_COMPAT_5.30.2)
+Provides: perl(:VERSION) = 5.30.3
+
+# subpackages that are used for building other specs
+Provides: perl-interpreter
+Provides: perl-devel
+Provides: perl-macros
+Provides: perl-ExtUtils-Embed
+Provides: perl-open
+Provides: perl-Test
+

SPECS/perl/macros.perl

@@ -0,0 +1,158 @@
+# Sensible Perl-specific RPM build macros.
+#
+# Note that these depend on the generic filtering system being in place in
+# rpm core; but won't cause a build to fail if they're not present.
+#
+# Chris Weyl <cweyl@alumni.drew.edu> 2009
+# Marcela Mašláňová <mmaslano@redhat.com> 2011
+
+# This macro unsets several common vars used to control how Makefile.PL (et
+# al) build and install packages.  We also set a couple to help some of the
+# common systems be less interactive.  This was blatantly stolen from
+# cpanminus, and helps building rpms locally when one makes extensive use of
+# local::lib, etc.
+#
+# Usage, in %build, before "%{__perl} Makefile.PL ..."
+#
+#   %{?perl_ext_env_unset}
+
+%perl_ext_env_unset %{expand:
+unset PERL_MM_OPT MODULEBUILDRC PERL5INC
+export PERL_AUTOINSTALL="--defaultdeps"
+export PERL_MM_USE_DEFAULT=1
+}
+
+#############################################################################
+# Perl specific macros, no longer part of rpm >= 4.15
+%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+%perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%perl_archlib    %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
+%perl_privlib    %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
+
+#############################################################################
+# Filtering macro incantations
+
+# keep track of what "revision" of the filtering we're at.  Each time we
+# change the filter we should increment this.
+
+%perl_default_filter_revision 3
+
+# By default, for perl packages we want to filter all files in _docdir from 
+# req/prov scanning.
+# Filtering out any provides caused by private libs in vendorarch/archlib
+# (vendor/core) is done by rpmbuild since Fedora 20
+# <https://fedorahosted.org/fpc/ticket/353>.
+#
+# Note that this must be invoked in the spec file, preferably as 
+# "%{?perl_default_filter}", before any %description block.
+
+%perl_default_filter %{expand: \
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}
+%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}^%{_docdir}
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\\\(VMS|^perl\\\\(Win32|^perl\\\\(DB\\\\)|^perl\\\\(UNIVERSAL\\\\)
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\\\(VMS|^perl\\\\(Win32
+}
+
+#############################################################################
+# Macros to assist with generating a "-tests" subpackage in a semi-automatic
+# manner.
+#
+# The following macros are still in a highly experimental stage and users
+# should be aware that the interface and behaviour may change. 
+#
+# PLEASE, PLEASE CONDITIONALIZE THESE MACROS IF YOU USE THEM.
+#
+# See http://gist.github.com/284409
+
+# These macros should be invoked as above, right before the first %description
+# section, and conditionalized.  e.g., for the common case where all our tests
+# are located under t/, the correct usage is:
+#
+#   %{?perl_default_subpackage_tests}
+#
+# If custom files/directories need to be specified, this can be done as such:
+#
+#   %{?perl_subpackage_tests:%perl_subpackage_tests t/ one/ three.sql}
+#
+# etc, etc.
+
+%perl_version   %(eval "`%{__perl} -V:version`"; echo $version)
+%perl_testdir   %{_libexecdir}/perl5-tests
+%cpan_dist_name %(eval echo %{name} | %{__sed} -e 's/^perl-//')
+
+# easily mark something as required by -tests and BR to the main package
+%tests_req() %{expand:\
+BuildRequires: %*\
+%%tests_subpackage_requires %*\
+}
+
+# fixup (and create if needed) the shbang lines in tests, so they work and
+# rpmlint doesn't (correctly) have a fit
+%fix_shbang_line() \
+TMPHEAD=`mktemp`\
+TMPBODY=`mktemp`\
+for file in %* ; do \
+    head -1 $file > $TMPHEAD\
+    tail -n +2 $file > $TMPBODY\
+    %{__perl} -pi -e '$f = /^#!/ ? "" : "#!%{__perl}$/"; $_="$f$_"' $TMPHEAD\
+    cat $TMPHEAD $TMPBODY > $file\
+done\
+%{__perl} -MExtUtils::MakeMaker -e "ExtUtils::MM_Unix->fixin(qw{%*})"\
+%{__rm} $TMPHEAD $TMPBODY\
+%{nil}
+
+# additional -tests subpackage requires, if any
+%tests_subpackage_requires() %{expand: \
+%global __tests_spkg_req %{?__tests_spkg_req} %* \
+}
+
+# additional -tests subpackage provides, if any
+%tests_subpackage_provides() %{expand: \
+%global __tests_spkg_prov %{?__tests_spkg_prov} %* \
+}
+
+#
+# Runs after the body of %check completes.
+#
+
+%__perl_check_pre %{expand: \
+%{?__spec_check_pre} \
+pushd %{buildsubdir} \
+%define perl_br_testdir %{buildroot}%{perl_testdir}/%{cpan_dist_name} \
+%{__mkdir_p} %{perl_br_testdir} \
+%{__tar} -cf - %{__perl_test_dirs} | ( cd %{perl_br_testdir} && %{__tar} -xf - ) \
+find . -maxdepth 1 -type f -name '*META*' -exec %{__cp} -vp {} %{perl_br_testdir} ';' \
+find %{perl_br_testdir} -type f -exec %{__chmod} -c -x {} ';' \
+T_FILES=`find %{perl_br_testdir} -type f -name '*.t'` \
+%fix_shbang_line $T_FILES \
+%{__chmod} +x $T_FILES \
+%{_fixperms} %{perl_br_testdir} \
+popd \
+}
+
+#
+# The actual invoked macro
+#
+
+%perl_subpackage_tests() %{expand: \
+%global __perl_package 1\
+%global __perl_test_dirs %* \
+%global __spec_check_pre %{expand:%{__perl_check_pre}} \
+%package tests\
+Summary: Test suite for package %{name}\
+Group: Development/Debug\
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}\
+Requires: /usr/bin/prove \
+%{?__tests_spkg_req:Requires: %__tests_spkg_req}\
+%{?__tests_spkg_prov:Provides: %__tests_spkg_prov}\
+AutoReqProv: 0 \
+%description tests\
+This package provides the test suite for package %{name}.\
+%files tests\
+%defattr(-,root,root,-)\
+%{perl_testdir}\
+}
+
+# shortcut sugar
+%perl_default_subpackage_tests %perl_subpackage_tests t/
+

SPECS/perl/perl.signatures.json

@@ -1,5 +1,7 @@
 {
  "Signatures": {
+  "additional-provides.inc": "1f13a675ca5e857811d6720e579c53a9ba677e2b085d136254285afe6b250b08",
+  "macros.perl": "0597172591cea26c81e92b580b63cb1c5e812cc354c34ac21b8ebc1854713183",
   "perl-5.30.3.tar.gz": "32e04c8bb7b1aecb2742a7f7ac0eabac100f38247352a73ad7fa104e39e7406f"
  }
 }

SPECS/perl/perl.spec

@@ -9,17 +9,20 @@
 Summary:        Practical Extraction and Report Language
 Name:           perl
 Version:        5.30.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        GPL+ or Artistic
 URL:            https://www.perl.org/
 Group:          Development/Languages
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        https://www.cpan.org/src/5.0/%{name}-%{version}.tar.gz
+Source1:        additional-provides.inc
+Source2:        macros.perl
 Provides:       perl >= 0:5.003000
 Provides:       perl(getopts.pl)
 Provides:       perl(s)
 Provides:       /bin/perl
+%include %{SOURCE1}
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  gdbm-devel
@@ -46,6 +49,7 @@ sh Configure -des \
     -Dvendorprefix=%{_prefix} \
     -Dman1dir=%{_mandir}/man1 \
     -Dman3dir=%{_mandir}/man3 \
+    -Dman3ext=3pm \
     -Dpager=%{_bindir}"/less -isR" \
     -Duseshrplib \
     -Dusethreads \
@@ -55,6 +59,10 @@ make VERBOSE=1 %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install
 unset BUILD_ZLIB BUILD_BZIP2
+
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+install -p -m 644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d
+
 %check
 sed -i '/02zlib.t/d' MANIFEST
 sed -i '/cz-03zlib-v1.t/d' MANIFEST
@@ -71,8 +79,13 @@ make test TEST_SKIP_VERSION_CHECK=1
 %dir %{_libdir}/perl5/%{version}
 %{_libdir}/perl5/%{version}/*
 %{_mandir}/*/*
+%{_rpmconfigdir}/macros.d/macros.perl
 
 %changelog
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 5.30.3-3
+-   Configue man3 extension to 3pm.
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 5.30.3-2
+-   Add additional explicit provides and macros
 *   Tue Jun 09 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 5.30.3-1
 -   Updating to newer version to fix CVE-2020-10878 and CVE-2020-12723.
 *   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 5.28.1-4

SPECS/pkg-config/pkg-config-glib-CVE-2018-16428.patch

@@ -1,67 +0,0 @@
-
-m fccef3cc822af74699cca84cd202719ae61ca3b9 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall@endlessm.com>
-Date: Mon, 30 Jul 2018 18:33:39 +0100
-Subject: [PATCH] gmarkup: Fix crash in error handling path for closing
- elements
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If something which looks like a closing tag is left unfinished, but
-isn’t paired to an opening tag in the document, the error handling code
-would do a null pointer dereference. Avoid that, at the cost of
-introducing a new translatable error message.
-
-Includes a test case, courtesy of pdknsk.
-
-Signed-off-by: Philip Withnall <withnall@endlessm.com>
-
-https://gitlab.gnome.org/GNOME/glib/issues/1461
----
-glib/gmarkup.c                      | 11 ++++++++---
- glib/tests/markups/fail-51.expected |  1 +
- glib/tests/markups/fail-51.gmarkup  |  1 +
- 3 files changed, 10 insertions(+), 3 deletions(-)
- create mode 100644 glib/tests/markups/fail-51.expected
- create mode 100644 glib/tests/markups/fail-51.gmarkup
-
-diff --git a/glib/gmarkup.c b/glib/gmarkup.c
-index ed30ed2..a159d7b 100644
---- a/glib/gmarkup.c
-+++ b/glib/gmarkup.c
-@@ -1832,9 +1832,14 @@ g_markup_parse_context_end_parse (GMarkupParseContext  *context,
-     case STATE_AFTER_CLOSE_TAG_SLASH:
-     case STATE_INSIDE_CLOSE_TAG_NAME:
-     case STATE_AFTER_CLOSE_TAG_NAME:
--      set_error (context, error, G_MARKUP_ERROR_PARSE,
--                 _("Document ended unexpectedly inside the close tag for "
--                   "element '%s'"), current_element (context));
-+      if (context->tag_stack != NULL)
-+        set_error (context, error, G_MARKUP_ERROR_PARSE,
-+                   _("Document ended unexpectedly inside the close tag for "
-+                     "element '%s'"), current_element (context));
-+      else
-+        set_error (context, error, G_MARKUP_ERROR_PARSE,
-+                   _("Document ended unexpectedly inside the close tag for an "
-+                     "unopened element"));
-       break;
- 
-     case STATE_INSIDE_PASSTHROUGH:
-diff --git a/glib/tests/markups/fail-51.expected b/glib/tests/markups/fail-51.expected
-new file mode 100644
-index 0000000..1c7e8d4
---- /dev/null
-+++ b/glib/tests/markups/fail-51.expected
-@@ -0,0 +1 @@
-+ERROR Error on line 1 char 5: Document ended unexpectedly inside the close tag for an unopened element
-diff --git a/glib/tests/markups/fail-51.gmarkup b/glib/tests/markups/fail-51.gmarkup
-new file mode 100644
-index 0000000..860e1e6
---- /dev/null
-+++ b/glib/tests/markups/fail-51.gmarkup
-@@ -0,0 +1 @@
-+</0<
-\ No newline at end of file
--- 
-2.7.4

SPECS/pkg-config/pkg-config-glib-CVE-2018-16429.patch

@@ -1,72 +0,0 @@
-From cec71705406f0b2790422f0c1aa0ff3b4b464b1b Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall@endlessm.com>
-Date: Mon, 30 Jul 2018 18:10:25 +0100
-Subject: [PATCH] gmarkup: Fix unvalidated UTF-8 read in markup parsing error
- paths
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When formatting the error messages for markup parsing errors, the parser
-was unconditionally reading a UTF-8 character from the input buffer —
-but the buffer might end with a partial code sequence, resulting in
-reading off the end of the buffer by up to three bytes.
-
-Fix this and add a test case, courtesy of pdknsk.
-
-Signed-off-by: Philip Withnall <withnall@endlessm.com>
-
----
- glib/gmarkup.c                      | 14 +++++++++++++-
- glib/tests/markups/fail-50.expected |  1 +
- glib/tests/markups/fail-50.gmarkup  |  1 +
- 3 files changed, 15 insertions(+), 1 deletions(-)
- create mode 100644 glib/tests/markups/fail-50.expected
- create mode 100644 glib/tests/markups/fail-50.gmarkup
-
-diff --git a/glib/gmarkup.c b/glib/gmarkup.c
-index a159d7b..a2b1ed0 100644
---- a/glib/gmarkup.c
-+++ b/glib/gmarkup.c
-@@ -557,11 +557,23 @@ char_str (gunichar c,
-   return buf;
- }
- 
-+/* Format the next UTF-8 character as a gchar* for printing in error output
-+ * when we encounter a syntax error. This correctly handles invalid UTF-8,
-+ * emitting it as hex escapes. */
- static gchar*
- utf8_str (const gchar *utf8,
-           gchar       *buf)
- {
--  char_str (g_utf8_get_char (utf8), buf);
-+  gunichar c = g_utf8_get_char_validated (utf8, -1);
-+  if (c == (gunichar) -1 || c == (gunichar) -2)
-+    {
-+      gchar *temp = g_strdup_printf ("\\x%02x", (guint)(guchar)*utf8);
-+      memset (buf, 0, 8);
-+      memcpy (buf, temp, strlen (temp));
-+      g_free (temp);
-+    }
-+  else
-+    char_str (c, buf);
-   return buf;
- }
- 
-diff --git a/glib/tests/markups/fail-50.expected b/glib/tests/markups/fail-50.expected
-new file mode 100644
-index 0000000..70d4498
---- /dev/null
-+++ b/glib/tests/markups/fail-50.expected
-@@ -0,0 +1 @@
-+ERROR Error on line 1 char 5: Odd character '\xfc', expected an open quote mark after the equals sign when giving value for attribute 'r' of element ''
-diff --git a/glib/tests/markups/fail-50.gmarkup b/glib/tests/markups/fail-50.gmarkup
-new file mode 100644
-index 0000000..f110f15
---- /dev/null
-+++ b/glib/tests/markups/fail-50.gmarkup
-@@ -0,0 +1 @@
-+<	r=<3D>
-\ No newline at end of file
--- 
-2.7.4

SPECS/pkg-config/pkg-config.signatures.json

@@ -1,5 +0,0 @@
-{
- "Signatures": {
-  "pkg-config-0.29.2.tar.gz": "6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
- }
-}

SPECS/pkg-config/pkg-config.spec

@@ -1,63 +0,0 @@
-Summary:	Build tool
-Name:		pkg-config
-Version:	0.29.2
-Release:        4%{?dist}
-License:	GPLv2+
-URL:		http://www.freedesktop.org/wiki/Software/pkg-config
-Group:		Development/Tools
-Vendor:         Microsoft Corporation
-Distribution:   Mariner
-Source0:	http://pkgconfig.freedesktop.org/releases/%{name}-%{version}.tar.gz
-%define sha1 pkg-config=76e501663b29cb7580245720edfb6106164fad2b
-Patch0:         pkg-config-glib-CVE-2018-16428.patch
-Patch1:         pkg-config-glib-CVE-2018-16429.patch
-
-%description
-Contains a tool for passing the include path and/or library paths
-to build tools during the configure and make file execution.
-
-%prep
-%setup -q
-cd glib  # patches need to apply to internal glib
-%patch0 -p1
-%patch1 -p1
-cd ..
-
-%build
-%configure \
-	--prefix=%{_prefix} \
-	--with-internal-glib \
-	--disable-host-tool \
-	--docdir=%{_defaultdocdir}/%{name}-%{version} \
-	--disable-silent-rules
-make %{?_smp_mflags}
-
-%install
-make DESTDIR=%{buildroot} install
-
-%check
-make %{?_smp_mflags} check
-
-%files
-%defattr(-,root,root)
-%license COPYING
-%{_bindir}/pkg-config
-%{_datadir}/aclocal/pkg.m4
-%{_docdir}/pkg-config-*/pkg-config-guide.html
-%{_mandir}/man1/pkg-config.1.gz
-%changelog
-* Sat May 09 00:20:57 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.29.2-4
-- Added %%license line automatically
-
-*   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.29.2-3
--   Initial CBL-Mariner import from Photon (license: Apache2).
-*       Fri Jan 18 2019 Ajay Kaher <akaher@vmware.com> 0.29.2-2
--       Fix internal glib for CVE-2018-16428 and CVE-2018-16429
-*       Mon Apr 03 2017 Rongrong Qiu <rqiu@vmware.com> 0.29.2-1
--       upgrade for 2.0
-*       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 0.28-3
--       Modified %check
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.28-2
--	GA - Bump release of all rpms
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 0.28-1
--	Initial build. First version

SPECS/pkgconf/pkgconf.signatures.json

@@ -0,0 +1,6 @@
+{
+ "Signatures": {
+  "pkgconf-1.7.0.tar.xz": "1e6eb09ede29faf33d86be21435955face4c6302f80f5db68d56e1f8a8506169",
+  "platform-pkg-config.in": "e538d3f70c68ab3c7bbbc9e0161f21df12d5715698b4d02fbe2895c8c4421a33"
+ }
+}

SPECS/pkgconf/pkgconf.spec

@@ -0,0 +1,351 @@
+# pkgconf acts as pkgconfig for Mariner
+%bcond_without pkgconfig_compat
+
+%if %{with pkgconfig_compat}
+%global pkgconfig_ver 0.29.1
+# For obsoleting pkgconfig
+%global pkgconfig_verrel %{pkgconfig_ver}-3
+%global pkgconfig_evr 1:%{pkgconfig_verrel}
+%endif
+
+# Search path for pc files for pkgconf
+%global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
+
+Name:           pkgconf
+Version:        1.7.0
+Release:        3%{?dist}
+Summary:        Package compiler and linker metadata toolkit
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+
+License:        ISC
+URL:            http://pkgconf.org/
+# Mirror at https://releases.pagure.org/pkgconf/pkgconf/
+Source0:        https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz
+
+# Simple wrapper script to offer platform versions of pkgconfig
+Source1:        platform-pkg-config.in
+
+BuildRequires:  gcc
+BuildRequires:  make
+
+# For regenerating autotools scripts
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+
+# pkgconf uses libpkgconf internally
+Requires:       lib%{name}%{?_isa} = %{version}-%{release}
+
+# This is defined within pkgconf code as a virtual pc (just like in pkgconfig)
+Provides:       pkgconfig(pkgconf) = %{version}
+
+%description
+pkgconf is a program which helps to configure compiler and linker flags
+for development frameworks. It is similar to pkg-config from freedesktop.org
+and handles .pc files in a similar manner as pkg-config.
+
+%package -n lib%{name}
+Summary:        Backend library for %{name}
+
+%description -n lib%{name}
+This package provides libraries for applications to use the functionality
+of %{name}.
+
+%package -n lib%{name}-devel
+Summary:        Development files for lib%{name}
+Requires:       lib%{name}%{?_isa} = %{version}-%{release}
+
+%description -n lib%{name}-devel
+This package provides files necessary for developing applications
+to use functionality provided by %{name}.
+
+%if %{with pkgconfig_compat}
+%package m4
+Summary:        m4 macros for pkgconf
+License:        GPLv2+ with exceptions
+BuildArch:      noarch
+# Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it
+Conflicts:      pkgconfig < %{pkgconfig_evr}
+Obsoletes:      pkgconfig < %{pkgconfig_evr}
+
+%description m4
+This package includes m4 macros used to support PKG_CHECK_MODULES
+when using pkgconf with autotools.
+
+%package pkg-config
+Summary:        %{name} shim to provide /usr/bin/pkg-config
+# Ensure that it Conflicts with pkgconfig and is considered "better"
+Conflicts:      pkgconfig < %{pkgconfig_evr}
+Obsoletes:      pkgconfig < %{pkgconfig_evr}
+Provides:       pkgconfig = %{pkgconfig_evr}
+Provides:       pkgconfig%{?_isa} = %{pkgconfig_evr}
+# This is in the original pkgconfig package, set to match output from pkgconf
+Provides:       pkgconfig(pkg-config) = %{version}
+# Generic pkg-config Provides for those who might use alternate package name
+Provides:       pkg-config = %{pkgconfig_verrel}
+Provides:       pkg-config%{?_isa} = %{pkgconfig_verrel}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-m4 = %{version}-%{release}
+
+%description pkg-config
+This package provides the shim links for pkgconf to be automatically
+used in place of pkgconfig. This ensures that pkgconf is used as
+the system provider of pkg-config.
+
+%endif
+
+
+%prep
+%autosetup -p1
+
+%build
+autoreconf -fiv
+%configure --disable-static \
+           --with-pkg-config-dir=%{pkgconf_libdirs} \
+           --with-system-includedir=%{_includedir} \
+           --with-system-libdir=%{_libdir}
+
+%make_build V=1
+
+%install
+%make_install
+
+find %{buildroot} -name '*.la' -print -delete
+
+mkdir -p %{buildroot}%{_sysconfdir}/pkgconfig/personality.d
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/personality.d
+
+# pkgconf rpm macros
+mkdir -p %{buildroot}%{_rpmmacrodir}/
+
+cat > %{buildroot}%{_rpmmacrodir}/macros.pkgconf <<EOM
+%%pkgconfig_personalitydir %{_datadir}/pkgconfPig/personality.d
+EOM
+
+%if %{with pkgconfig_compat}
+install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
+
+sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \
+    -e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \
+    -e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \
+    -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \
+    -i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
+
+ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
+
+# Link pkg-config(1) to pkgconf(1)
+echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1
+
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mkdir -p %{buildroot}%{_datadir}/pkgconfig
+%endif
+
+# If we're not providing pkgconfig override & compat
+# we should not provide the pkgconfig m4 macros
+%if ! %{with pkgconfig_compat}
+rm -rf %{buildroot}%{_datadir}/aclocal
+%endif
+
+%ldconfig_scriptlets -n lib%{name}
+
+%files
+%license COPYING
+%doc README.md AUTHORS NEWS
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/pc.5*
+%{_mandir}/man5/%{name}-personality.5*
+%{_rpmmacrodir}/macros.pkgconf
+%dir %{_sysconfdir}/pkgconfig
+%dir %{_sysconfdir}/pkgconfig/personality.d
+%dir %{_datadir}/pkgconfig/personality.d
+
+%files -n lib%{name}
+%license COPYING
+%{_libdir}/lib%{name}*.so.*
+
+%files -n lib%{name}-devel
+%{_libdir}/lib%{name}*.so
+%{_includedir}/%{name}/
+%{_libdir}/pkgconfig/lib%{name}.pc
+
+%if %{with pkgconfig_compat}
+%files m4
+%{_datadir}/aclocal/pkg.m4
+%{_mandir}/man7/pkg.m4.7*
+
+%files pkg-config
+%{_bindir}/pkg-config
+%{_bindir}/%{_target_platform}-pkg-config
+%{_mandir}/man1/pkg-config.1*
+%dir %{_libdir}/pkgconfig
+%dir %{_datadir}/pkgconfig
+%endif
+
+%changelog
+* Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> - 1.7.0-2
+- Initial CBL-Mariner import from Fedora 32 (license: MIT).
+- License verified.
+
+* Mon May 25 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.7.0-1
+- Update to 1.7.0
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jul 14 13:23:30 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.3-1
+- Update to 1.6.3
+
+* Fri Jul 12 09:36:57 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.2-1
+- Update to 1.6.2
+
+* Mon Mar 25 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1
+
+* Sat Feb 09 2019 Neal Gompa <ngompa13@gmail.com> - 1.6.0-1
+- Update to 1.6.0
+- Add personality.d directories for cross-targets
+- Add pkgconf rpm macros for pkgconf directories
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Nov 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5.4-1
+- Update to 1.5.4
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.5.3-2
+- Rebuild with fixed binutils
+
+* Sun Jul 29 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5.3-1
+- Update to 1.5.3
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Neal Gompa <ngompa13@gmail.com> - 1.5.1-2
+- Add patch to fix system path override issue
+
+* Wed Jun 27 2018 Neal Gompa <ngompa13@gmail.com> - 1.5.1-1
+- Upgrade to 1.5.1
+
+* Sat Mar 31 2018 Neal Gompa <ngompa13@gmail.com> - 1.4.2-1
+- Update to 1.4.2
+- Drop conditionals for old Fedora releases
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.4.1-2
+- Switch to %%ldconfig_scriptlets
+
+* Tue Jan 23 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.4.1-1
+- Update to 1.4.1
+
+* Sun Jan 07 2018 Neal Gompa <ngompa13@gmail.com> - 1.4.0-2
+- Move pc(5) manpage to main pkgconf package
+
+* Fri Jan 05 2018 Neal Gompa <ngompa13@gmail.com> - 1.4.0-1
+- Update to 1.4.0
+
+* Fri Jan 05 2018 Neal Gompa <ngompa13@gmail.com> - 1.3.90-2
+- Add simple wrapper to support platform-specific pkg-config paths (#1513810)
+
+* Tue Dec 19 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.90-1
+- Update to 1.3.90
+
+* Sun Dec 10 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.12-1
+- Update to 1.3.12
+
+* Wed Nov 01 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.10-1
+- Update to 1.3.10
+
+* Wed Sep 20 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.9-1
+- Update to 1.3.9
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 17 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.8-1
+- Update to 1.3.8
+
+* Sun May 28 2017 Neal Gompa <ngompa13@gmail.com> - 1.3.7-1
+- Update to 1.3.7
+
+* Wed May 10 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.6-1
+- Update to 1.3.6
+
+* Tue Apr 04 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.5-1
+- Update to 1.3.5
+
+* Thu Mar 30 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.4-1
+- Update to 1.3.4
+
+* Mon Mar 27 2017 Neal Gompa <ngompa13@gmail.com> - 1.3.3-1
+- Update to 1.3.3
+
+* Fri Mar 24 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.2-1
+- Update to 1.3.2
+
+* Sat Feb 25 2017 Neal Gompa <ngompa13@gmail.com> - 1.3.0-1
+- Update to 1.3.0
+
+* Tue Feb 07 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.2-2
+- Backport patch from upstream to remove extraneous whitespace (#1419685)
+
+* Fri Feb 03 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.2-1
+- Update to 1.2.2
+
+* Thu Feb 02 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.1-3
+- Fix Obsoletes and Conflicts to prevent self-conflicts
+
+* Thu Feb 02 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.1-2
+- Adjust Obsoletes and Conflicts to use inclusive range
+
+* Tue Jan 24 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.2.1-1
+- Update to 1.2.1
+
+* Sat Jan 21 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.0-1
+- Upgrade to 1.2.0
+- Enable pkgconf-pkg-config and pkgconf-m4 for F26+
+
+* Sat Jan 14 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.1-3
+- Add missing pkgconfig() Provides for virtual .pc files defined in pkgconf
+
+* Fri Jan 13 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.1-2
+- Add missing Epoch to pkgconfig Provides/Conflicts for pkgconf-pkg-config
+- Add copy of pkgconf.1 as pkg-config.1 in pkgconf-pkg-config
+
+* Sat Jan 07 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.1-1
+- Upgrade to 1.1.1
+- Add missing directories to pkgconf-pkg-config
+
+* Sun Jan 01 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.0-3
+- Fix up spec per package review (#1409332)
+
+* Sat Dec 31 2016 Neal Gompa <ngompa13@gmail.com> - 1.1.0-2
+- Rework package to not generate conflict with pkgconfig
+- Disable pkgconf-m4 and pkgconf-pkg-config by default
+
+* Sat Dec 31 2016 Neal Gompa <ngompa13@gmail.com> - 1.1.0-1
+- Upgrade to 1.1.0
+- Enable libpkgconf libraries now that they are ABI+API stable
+
+* Tue Oct 25 2016 Neal Gompa <ngompa13@gmail.com> - 1.0.2-1
+- Upgrade to 1.0.2
+
+* Fri Aug 26 2016 Neal Gompa <ngompa13@gmail.com> - 1.0.1-2
+- Add subpackage for providing pkg-config shim
+- Enable tests
+
+* Thu Aug 25 2016 Neal Gompa <ngompa13@gmail.com> - 1.0.1-1
+- Upgrade to 1.0.1
+
+* Wed Aug 24 2016 Neal Gompa <ngompa13@gmail.com> - 1-1
+- Initial packaging

SPECS/pkgconf/platform-pkg-config.in

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config
+# Platform: @TARGET_PLATFORM@
+
+export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}"
+export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}"
+export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}"
+
+exec pkgconf "$@"

SPECS/procps-ng/procps-ng.spec

@@ -1,15 +1,16 @@
 Summary:        Programs for monitoring processes
 Name:           procps-ng
 Version:        3.3.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 URL:            http://procps.sourceforge.net/
 Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        http://sourceforge.net/projects/procps-ng/files/Production/%{name}-%{version}.tar.xz
-%define sha1    procps-ng=2929bc64f0cf7b2db997eef79b7187658e47230d
 BuildRequires:  ncurses-devel
+Provides:       /bin/ps
+Provides:       procps = %{version}-%{release}
 Requires:       ncurses
 Conflicts:      toybox
 %description
@@ -101,9 +102,10 @@ make %{?_smp_mflags} check
 %defattr(-,root,root)
 
 %changelog
-* Sat May 09 00:21:44 PST 2020 Nick Samson <nisamson@microsoft.com> - 3.3.15-3
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 3.3.15-4
-- Added %%license line automatically
+-   Provide procps and /bin/ps
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.3.15-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.3.15-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Fri Aug 10 2018 Tapas Kundu <tkundu@vmware.com> 3.3.15-1

SPECS/python3/python3.spec

@@ -3,7 +3,7 @@
 Summary:        A high-level scripting language
 Name:           python3
 Version:        3.7.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 License:        PSF
 URL:            http://www.python.org/
 Group:          System Environment/Programming
@@ -33,10 +33,10 @@ Provides:       /usr/bin/python
 Provides:       /bin/python
 Provides:       /bin/python3
 
-%if %{with_check}
+# %if %{with_check}
-BuildRequires:  iana-etc
+# BuildRequires:  iana-etc
-BuildRequires:  tzdata
+# BuildRequires:  tzdata
-%endif
+# %endif
 
 %description
 The Python 3 package contains a new version of Python development environment.
@@ -82,6 +82,8 @@ The python3-curses package provides interface for ncurses library.
 Summary: The libraries and header files needed for Python development.
 Group:          Development/Libraries
 Requires:       python3 = %{version}-%{release}
+Requires:       python3-setuptools = %{version}-%{release}
+Requires:       python3-xml = %{version}-%{release}
 Requires:       expat-devel >= 2.1.0
 # Needed here because of the migration of Makefile from -devel to the main
 # package
@@ -164,8 +166,8 @@ find %{buildroot}%{_libdir} -name '*.pyo' -delete
 find %{buildroot}%{_libdir} -name '*.o' -delete
 rm %{buildroot}%{_bindir}/2to3
 
-%check
+# %check
-make  %{?_smp_mflags} test
+# make  %{?_smp_mflags} test
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -265,6 +267,10 @@ rm -rf %{buildroot}/*
 %{_libdir}/python3.7/test/*
 
 %changelog
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 3.7.7-4
+-   Comment out check section to avoid unmet dependencies.
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 3.7.7-3
+-   Add Requires for python3-xml and python3-setuptools in python3-devel.
 *   Mon Jul 06 2020 Henry Beberman <henry.beberman@microsoft.com> 3.7.7-2
 -   Add BuildRequires for iana-etc and tzdata for check section.
 *   Wed Jun 10 2020 Paul Monson <paulmon@microsoft.com> 3.7.7-1

SPECS/rpcsvc-proto/rpcsvc-proto.spec

@@ -1,14 +1,14 @@
 Summary:        rcpsvc protocol.x files and headers
 Name:           rpcsvc-proto
 Version:        1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Source0:        https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4/rpcsvc-proto-1.4.tar.gz
-%define sha1    rpcsvc=01267dbc7d999c4ffdda1f69532e1f8331489b5f
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            https://github.com/thkukuk/rpcsvc-proto
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Provides:       rpcgen = %{version}-%{release}
 
 %description
 The rpcsvc-proto package contains the rcpsvc protocol.x files and headers,
@@ -43,9 +43,10 @@ make install DESTDIR=%{buildroot}
 %{_includedir}/rpcsvc/*
 
 %changelog
-* Sat May 09 00:21:05 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.4-3
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.4-4
-- Added %%license line automatically
+-   Explicit provides rpcgen
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.4-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.4-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 * Fri Sep 21 2018 Alexey Makhalov <amakhalov@vmware.com> 1.4-1

SPECS/systemtap/systemtap.spec

@@ -1,3 +1,5 @@
+%define _unpackaged_files_terminate_build 0
+
 %define        with_boost     1
 %define        with_crash     1
 %define        with_docs      0
@@ -8,7 +10,7 @@
 
 Name:          systemtap
 Version:       4.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Programmable system-wide instrumentation system
 Group:         Development/System
 Vendor:         Microsoft Corporation
@@ -28,10 +30,10 @@ BuildRequires: libstdc++-devel
 BuildRequires: libtirpc-devel
 BuildRequires: libxml2-devel
 BuildRequires: perl
-BuildRequires: python-setuptools
+BuildRequires: python3-setuptools
 BuildRequires: nss
 BuildRequires: shadow-utils
-BuildRequires: python2-devel
+BuildRequires: python3-devel
 %if %with_boost
 BuildRequires: boost-devel
 %endif
@@ -73,7 +75,7 @@ Initscript for Systemtap scripts.
 %package python
 Group:         System/Tools
 Summary:       Python interface for systemtap
-Requires:      python2
+Requires:      python3
 
 %description python
 This packages has the python interface to systemtap
@@ -137,7 +139,9 @@ sed -i "s#"devel"#"dev"#g" stap-prep
 	--disable-pie \
 %endif
 	--disable-grapher \
-        --disable-virt \
+    --disable-virt \
+	--without-python2-probes \
+	--with-python3 \
 	--disable-silent-rules
 
 make
@@ -315,8 +319,8 @@ fi
 
 %files python
 %defattr(-,root,root)
-/usr/lib/python2.7/site-packages/*
+%{_libdir}/python3.7/site-packages/*
-/usr/libexec/systemtap/python/stap-resolve-module-function.py
+%{_libexecdir}/systemtap/python/stap-resolve-module-function.py
 
 %files runtime
 %defattr(-,root,root)
@@ -357,6 +361,9 @@ fi
 %{_mandir}/man8/systemtap-service.8*
 
 %changelog
+*   Mon Sep 28 2020 Joe Schmitt <joschmit@microsoft.com> 4.1-6
+-   Explicitly use python3 during build.
+-   Use lib macros for paths.
 * Sat May 09 00:20:54 PST 2020 Nick Samson <nisamson@microsoft.com> - 4.1-5
 - Added %%license line automatically
 

SPECS/texinfo/texinfo.spec

@@ -1,7 +1,7 @@
 Summary:        Reading, writing, and converting info pages
 Name:           texinfo
 Version:        6.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPLv3+
 URL:            https://www.gnu.org/software/texinfo/
 Group:          Applications/System
@@ -9,6 +9,8 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Patch0:         texinfo-perl-fix.patch
+Provides:       info = %{version}-%{release}
+Provides:       %{name}-tex = %{version}-%{release}
 BuildRequires:  perl
 
 Requires:       perl-libintl-perl
@@ -56,9 +58,10 @@ rm -rf %{buildroot}%{_infodir}
 %{_libdir}/texinfo/*
 
 %changelog
-* Sat May 09 00:20:40 PST 2020 Nick Samson <nisamson@microsoft.com> - 6.5-7
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 6.5-8
-- Added %%license line automatically
+-   Provide info and texinfo-tex
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 6.5-7
+-   Added %%license line automatically
 *   Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 6.5-6
 -   Renaming perl-libintl to perl-libintl-perl
 *   Mon Apr 20 2020 Eric Li <eli@microsoft.com> 6.5-5

SPECS/util-linux/util-linux.spec

@@ -1,7 +1,7 @@
 Summary:        Utilities for file systems, consoles, partitions, and messages
 Name:           util-linux
 Version:        2.32.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/
 License:        GPLv2+
 Group:          Applications/System
@@ -28,6 +28,9 @@ These are the additional language files of util-linux.
 %package devel
 Summary: Header and library files for util-linux
 Group: Development/Libraries
+Provides: libmount-devel = %{version}-%{release}
+Provides: libblkid-devel = %{version}-%{release}
+Provides: libuuid-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 %description devel
 These are the header and library files of util-linux.
@@ -101,9 +104,10 @@ rm -rf %{buildroot}/lib/systemd/system
 %{_mandir}/man3/*
 
 %changelog
-* Sat May 09 00:20:52 PST 2020 Nick Samson <nisamson@microsoft.com>
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.32.1-4
-- Added %%license line automatically
+-   Provide libmount-devel, libblkid-devel, libuuid-devel in util-linux-devel
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.23.1-3
+-   Added %%license line automatically
 *   Tue Apr 14 2020 Emre Girgin <mrgirgin@microsoft.com> 2.32.1-2
 -   Rename ncurses-terminfo to ncurses-term.
 *   Tue Mar 17 2020 Andrew Phelps <anphel@microsoft.com> 2.32.1-1

SPECS/xz/xz.spec

@@ -1,14 +1,15 @@
 Summary:        Programs for compressing and decompressing files
 Name:           xz
 Version:        5.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://tukaani.org/xz
 License:        GPLv2+ and GPLv3+ and LGPLv2+
 Group:          Applications/File
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        http://tukaani.org/xz/%{name}-%{version}.tar.xz
-%define sha1    xz=1d3a6910c28d40df0134f4a49e5570e8249120c5
+Provides:       xz-lzma-compat = %{version}-%{release}
+Provides:       lzma = %{version}-%{release}
 Requires:       xz-libs = %{version}-%{release}
 %description
 The Xz package contains programs for compressing and
@@ -97,9 +98,10 @@ make  %{?_smp_mflags}  check
 %defattr(-,root,root)
 
 %changelog
-* Sat May 09 00:21:42 PST 2020 Nick Samson <nisamson@microsoft.com> - 5.2.4-3
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 5.2.4-4
-- Added %%license line automatically
+-   Provide xz-lzma-compat and lzma
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com>  5.2.4-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 5.2.4-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Thu Sep 13 2018 Siju Maliakkal <smaliakkal@vmware.com> 5.2.4-1

SPECS/zlib/zlib.spec

@@ -1,19 +1,19 @@
 Summary:        Compression and decompression routines
 Name:           zlib
 Version:        1.2.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.zlib.net/
 License:        zlib
 Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Source0:        http://www.zlib.net/%{name}-%{version}.tar.xz
-%define sha1    zlib=e1cb0d5c92da8e9a8c2635dfa249c341dfd00322
 %description
 Compression and decompression routines
 %package    devel
 Summary:    Header and development files for zlib
 Requires:   %{name} = %{version}
+Provides:   zlib-static = %{version}-%{release}
 %description    devel
 It contains the libraries and header files to create applications
 for handling compiled objects.
@@ -47,9 +47,10 @@ make  %{?_smp_mflags} check
 %{_mandir}/man3/zlib.3.gz
 
 %changelog
-* Sat May 09 00:20:52 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.2.11-3
+*   Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.2.11-4
-- Added %%license line automatically
+-   Add explicit provide for zlib-static
-
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.2.11-3
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.2.11-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 1.2.11-1

cgmanifest.json

@@ -100,6 +100,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "atf",
+          "version": "0.20",
+          "downloadUrl": "https://github.com/jmmv/atf/releases/download/atf-0.20/atf-0.20.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -645,7 +655,7 @@
         "type": "other",
         "other": {
           "name": "curl",
-          "version": "7.66.0",
+          "version": "7.68.0",
           "downloadUrl": "http://curl.haxx.se/download/curl-7.66.0.tar.gz"
         }
       }
@@ -860,6 +870,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "dwz",
+          "version": "0.13",
+          "downloadUrl": "https://sourceware.org/ftp/dwz/releases/dwz-0.13.tar.xz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -1135,8 +1155,8 @@
         "type": "other",
         "other": {
           "name": "gettext",
-          "version": "0.19.8.1",
+          "version": "0.21",
-          "downloadUrl": "http://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.xz"
+          "downloadUrl": "http://ftp.gnu.org/gnu/gettext/gettext-0.21.tar.xz"
         }
       }
     },
@@ -1850,6 +1870,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "kyua",
+          "version": "0.13",
+          "downloadUrl": "https://github.com/jmmv/kyua/releases/download/kyua-0.13/kyua-0.13.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -2790,6 +2820,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "lutok",
+          "version": "0.4",
+          "downloadUrl": "https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -3784,9 +3824,9 @@
       "component": {
         "type": "other",
         "other": {
-          "name": "pkg-config",
+          "name": "pkgconf",
-          "version": "0.29.2",
+          "version": "1.7.0",
-          "downloadUrl": "http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz"
+          "downloadUrl": "https://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.0.tar.xz"
         }
       }
     },

toolkit/resources/imageconfigs/packagelists/iso-initrd-packages.json

@@ -47,7 +47,7 @@
         "mariner-release",
         "parted",
         "pcre",
-        "pkg-config",
+        "pkgconfig",
         "popt",
         "readline",
         "rpm",

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -1,14 +1,14 @@
-filesystem-1.1-7.cm1.aarch64.rpm
+filesystem-1.1-8.cm1.aarch64.rpm
-kernel-headers-5.4.51-2.cm1.noarch.rpm
+kernel-headers-5.4.51-3.cm1.noarch.rpm
-glibc-2.28-12.cm1.aarch64.rpm
+glibc-2.28-13.cm1.aarch64.rpm
-glibc-devel-2.28-12.cm1.aarch64.rpm
+glibc-devel-2.28-13.cm1.aarch64.rpm
-glibc-i18n-2.28-12.cm1.aarch64.rpm
+glibc-i18n-2.28-13.cm1.aarch64.rpm
-glibc-iconv-2.28-12.cm1.aarch64.rpm
+glibc-iconv-2.28-13.cm1.aarch64.rpm
-glibc-lang-2.28-12.cm1.aarch64.rpm
+glibc-lang-2.28-13.cm1.aarch64.rpm
-glibc-nscd-2.28-12.cm1.aarch64.rpm
+glibc-nscd-2.28-13.cm1.aarch64.rpm
-glibc-tools-2.28-12.cm1.aarch64.rpm
+glibc-tools-2.28-13.cm1.aarch64.rpm
-zlib-1.2.11-3.cm1.aarch64.rpm
+zlib-1.2.11-4.cm1.aarch64.rpm
-zlib-devel-1.2.11-3.cm1.aarch64.rpm
+zlib-devel-1.2.11-4.cm1.aarch64.rpm
 file-5.38-1.cm1.aarch64.rpm
 file-devel-5.38-1.cm1.aarch64.rpm
 file-libs-5.38-1.cm1.aarch64.rpm
@@ -18,16 +18,20 @@ gmp-6.1.2-5.cm1.aarch64.rpm
 gmp-devel-6.1.2-5.cm1.aarch64.rpm
 mpfr-4.0.1-3.cm1.aarch64.rpm
 mpfr-devel-4.0.1-3.cm1.aarch64.rpm
-libmpc-1.1.0-5.cm1.aarch64.rpm
+libmpc-1.1.0-6.cm1.aarch64.rpm
-libgcc-9.1.0-7.cm1.aarch64.rpm
+libgcc-9.1.0-8.cm1.aarch64.rpm
-libgcc-atomic-9.1.0-7.cm1.aarch64.rpm
+libgcc-atomic-9.1.0-8.cm1.aarch64.rpm
-libgcc-devel-9.1.0-7.cm1.aarch64.rpm
+libgcc-devel-9.1.0-8.cm1.aarch64.rpm
-libstdc++-9.1.0-7.cm1.aarch64.rpm
+libstdc++-9.1.0-8.cm1.aarch64.rpm
-libstdc++-devel-9.1.0-7.cm1.aarch64.rpm
+libstdc++-devel-9.1.0-8.cm1.aarch64.rpm
-libgomp-9.1.0-7.cm1.aarch64.rpm
+libgomp-9.1.0-8.cm1.aarch64.rpm
-libgomp-devel-9.1.0-7.cm1.aarch64.rpm
+libgomp-devel-9.1.0-8.cm1.aarch64.rpm
-gcc-9.1.0-7.cm1.aarch64.rpm
+gcc-9.1.0-8.cm1.aarch64.rpm
-pkg-config-0.29.2-4.cm1.aarch64.rpm
+gcc-c++-9.1.0-8.cm1.aarch64.rpm
+libpkgconf-1.7.0-3.cm1.aarch64.rpm
+pkgconf-1.7.0-3.cm1.aarch64.rpm
+pkgconf-m4-1.7.0-3.cm1.noarch.rpm
+pkgconf-pkg-config-1.7.0-3.cm1.aarch64.rpm
 ncurses-6.2-4.cm1.aarch64.rpm
 ncurses-compat-6.2-4.cm1.aarch64.rpm
 ncurses-devel-6.2-4.cm1.aarch64.rpm
@@ -45,9 +49,9 @@ bzip2-devel-1.0.6-15.cm1.aarch64.rpm
 bzip2-libs-1.0.6-15.cm1.aarch64.rpm
 sed-4.5-3.cm1.aarch64.rpm
 sed-lang-4.5-3.cm1.aarch64.rpm
-procps-ng-3.3.15-3.cm1.aarch64.rpm
+procps-ng-3.3.15-4.cm1.aarch64.rpm
-procps-ng-devel-3.3.15-3.cm1.aarch64.rpm
+procps-ng-devel-3.3.15-4.cm1.aarch64.rpm
-procps-ng-lang-3.3.15-3.cm1.aarch64.rpm
+procps-ng-lang-3.3.15-4.cm1.aarch64.rpm
 m4-1.4.18-4.cm1.aarch64.rpm
 grep-3.1-3.cm1.aarch64.rpm
 grep-lang-3.1-3.cm1.aarch64.rpm
@@ -55,25 +59,25 @@ diffutils-3.6-4.cm1.aarch64.rpm
 gawk-4.2.1-3.cm1.aarch64.rpm
 findutils-4.6.0-7.cm1.aarch64.rpm
 findutils-lang-4.6.0-7.cm1.aarch64.rpm
-gettext-0.19.8.1-3.cm1.aarch64.rpm
+gettext-0.21-1.cm1.aarch64.rpm
 gzip-1.9-4.cm1.aarch64.rpm
 make-4.2.1-4.cm1.aarch64.rpm
 mariner-release-1.0-9.cm1.noarch.rpm
 patch-2.7.6-7.cm1.aarch64.rpm
-util-linux-2.32.1-3.cm1.aarch64.rpm
+util-linux-2.32.1-4.cm1.aarch64.rpm
-util-linux-devel-2.32.1-3.cm1.aarch64.rpm
+util-linux-devel-2.32.1-4.cm1.aarch64.rpm
-util-linux-libs-2.32.1-3.cm1.aarch64.rpm
+util-linux-libs-2.32.1-4.cm1.aarch64.rpm
 tar-1.32-2.cm1.aarch64.rpm
-xz-5.2.4-3.cm1.aarch64.rpm
+xz-5.2.4-4.cm1.aarch64.rpm
-xz-devel-5.2.4-3.cm1.aarch64.rpm
+xz-devel-5.2.4-4.cm1.aarch64.rpm
-xz-lang-5.2.4-3.cm1.aarch64.rpm
+xz-lang-5.2.4-4.cm1.aarch64.rpm
-xz-libs-5.2.4-3.cm1.aarch64.rpm
+xz-libs-5.2.4-4.cm1.aarch64.rpm
 zstd-1.4.4-1.cm1.aarch64.rpm
 zstd-devel-1.4.4-1.cm1.aarch64.rpm
 zstd-libs-1.4.4-1.cm1.aarch64.rpm
-libtool-2.4.6-5.cm1.aarch64.rpm
+libtool-2.4.6-6.cm1.aarch64.rpm
-flex-2.6.4-5.cm1.aarch64.rpm
+flex-2.6.4-6.cm1.aarch64.rpm
-flex-devel-2.6.4-5.cm1.aarch64.rpm
+flex-devel-2.6.4-6.cm1.aarch64.rpm
 bison-3.1-3.cm1.aarch64.rpm
 popt-1.16-7.cm1.aarch64.rpm
 popt-devel-1.16-7.cm1.aarch64.rpm
@@ -83,9 +87,9 @@ nspr-devel-4.21-2.cm1.aarch64.rpm
 sqlite-3.32.3-1.cm1.aarch64.rpm
 sqlite-devel-3.32.3-1.cm1.aarch64.rpm
 sqlite-libs-3.32.3-1.cm1.aarch64.rpm
-nss-3.44-2.cm1.aarch64.rpm
+nss-3.44-3.cm1.aarch64.rpm
-nss-devel-3.44-2.cm1.aarch64.rpm
+nss-devel-3.44-3.cm1.aarch64.rpm
-nss-libs-3.44-2.cm1.aarch64.rpm
+nss-libs-3.44-3.cm1.aarch64.rpm
 elfutils-0.176-3.cm1.aarch64.rpm
 elfutils-devel-0.176-3.cm1.aarch64.rpm
 elfutils-devel-static-0.176-3.cm1.aarch64.rpm
@@ -101,8 +105,8 @@ libpipeline-devel-1.5.0-3.cm1.aarch64.rpm
 gdbm-1.18-3.cm1.aarch64.rpm
 gdbm-devel-1.18-3.cm1.aarch64.rpm
 gdbm-lang-1.18-3.cm1.aarch64.rpm
-perl-5.30.3-1.cm1.aarch64.rpm
+perl-5.30.3-3.cm1.aarch64.rpm
-texinfo-6.5-7.cm1.aarch64.rpm
+texinfo-6.5-8.cm1.aarch64.rpm
 autoconf-2.69-9.cm1.noarch.rpm
 automake-1.16.1-3.cm1.noarch.rpm
 openssl-1.1.1g-6.cm1.aarch64.rpm
@@ -129,9 +133,9 @@ libsolv-0.7.7-4.cm1.aarch64.rpm
 libsolv-devel-0.7.7-4.cm1.aarch64.rpm
 libssh2-1.9.0-1.cm1.aarch64.rpm
 libssh2-devel-1.9.0-1.cm1.aarch64.rpm
-curl-7.68.0-1.cm1.aarch64.rpm
+curl-7.68.0-2.cm1.aarch64.rpm
-curl-devel-7.68.0-1.cm1.aarch64.rpm
+curl-devel-7.68.0-2.cm1.aarch64.rpm
-curl-libs-7.68.0-1.cm1.aarch64.rpm
+curl-libs-7.68.0-2.cm1.aarch64.rpm
 tdnf-2.1.0-4.cm1.aarch64.rpm
 tdnf-cli-libs-2.1.0-4.cm1.aarch64.rpm
 tdnf-devel-2.1.0-4.cm1.aarch64.rpm
@@ -139,27 +143,41 @@ tdnf-plugin-repogpgcheck-2.1.0-4.cm1.aarch64.rpm
 createrepo_c-0.11.1-6.cm1.aarch64.rpm
 libxml2-2.9.10-2.cm1.aarch64.rpm
 libxml2-devel-2.9.10-2.cm1.aarch64.rpm
-glib-2.58.0-6.cm1.aarch64.rpm
+glib-2.58.0-8.cm1.aarch64.rpm
-libltdl-2.4.6-5.cm1.aarch64.rpm
+libltdl-2.4.6-6.cm1.aarch64.rpm
-libltdl-devel-2.4.6-5.cm1.aarch64.rpm
+libltdl-devel-2.4.6-6.cm1.aarch64.rpm
 pcre-libs-8.42-4.cm1.aarch64.rpm
 krb5-1.17-3.cm1.aarch64.rpm
-lua-5.3.5-6.cm1.aarch64.rpm
+lua-5.3.5-9.cm1.aarch64.rpm
-mariner-rpm-macros-1.0-3.cm1.noarch.rpm
+lua-libs-5.3.5-9.cm1.aarch64.rpm
-mariner-check-macros-1.0-3.cm1.noarch.rpm
+mariner-rpm-macros-1.0-6.cm1.noarch.rpm
-libassuan-2.5.1-3.cm1.aarch64.rpm
+mariner-python-macros-1.0-6.cm1.noarch.rpm
-libgpg-error-1.32-4.cm1.aarch64.rpm
+mariner-check-macros-1.0-6.cm1.noarch.rpm
+libassuan-2.5.1-5.cm1.aarch64.rpm
+libgpg-error-1.32-5.cm1.aarch64.rpm
 libgcrypt-1.8.3-4.cm1.aarch64.rpm
-libksba-1.3.5-3.cm1.aarch64.rpm
+libksba-1.3.5-4.cm1.aarch64.rpm
 npth-1.6-3.cm1.aarch64.rpm
 pinentry-1.1.0-3.cm1.aarch64.rpm
-gnupg2-2.2.20-3.cm1.aarch64.rpm
+gnupg2-2.2.20-4.cm1.aarch64.rpm
 gpgme-1.13.1-5.cm1.aarch64.rpm
 mariner-repos-1.0-9.cm1.noarch.rpm
 libffi-3.2.1-10.cm1.aarch64.rpm
+libffi-devel-3.2.1-10.cm1.aarch64.rpm
 libtasn1-4.14-2.cm1.aarch64.rpm
 p11-kit-0.23.16.1-2.cm1.aarch64.rpm
 p11-kit-trust-0.23.16.1-2.cm1.aarch64.rpm
 ca-certificates-shared-20200720-7.cm1.noarch.rpm
 ca-certificates-tools-20200720-7.cm1.noarch.rpm
 ca-certificates-base-20200720-7.cm1.noarch.rpm
+dwz-0.13-4.cm1.aarch64.rpm
+unzip-6.0-15.cm1.aarch64.rpm
+python2-2.7.18-3.cm1.aarch64.rpm
+python2-devel-2.7.18-3.cm1.aarch64.rpm
+python2-libs-2.7.18-3.cm1.aarch64.rpm
+python-xml-2.7.18-3.cm1.aarch64.rpm
+python3-3.7.7-4.cm1.aarch64.rpm
+python3-devel-3.7.7-4.cm1.aarch64.rpm
+python3-libs-3.7.7-4.cm1.aarch64.rpm
+python3-setuptools-3.7.7-4.cm1.noarch.rpm
+python3-xml-3.7.7-4.cm1.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -1,14 +1,14 @@
-filesystem-1.1-7.cm1.x86_64.rpm
+filesystem-1.1-8.cm1.x86_64.rpm
-kernel-headers-5.4.51-2.cm1.noarch.rpm
+kernel-headers-5.4.51-3.cm1.noarch.rpm
-glibc-2.28-12.cm1.x86_64.rpm
+glibc-2.28-13.cm1.x86_64.rpm
-glibc-devel-2.28-12.cm1.x86_64.rpm
+glibc-devel-2.28-13.cm1.x86_64.rpm
-glibc-i18n-2.28-12.cm1.x86_64.rpm
+glibc-i18n-2.28-13.cm1.x86_64.rpm
-glibc-iconv-2.28-12.cm1.x86_64.rpm
+glibc-iconv-2.28-13.cm1.x86_64.rpm
-glibc-lang-2.28-12.cm1.x86_64.rpm
+glibc-lang-2.28-13.cm1.x86_64.rpm
-glibc-nscd-2.28-12.cm1.x86_64.rpm
+glibc-nscd-2.28-13.cm1.x86_64.rpm
-glibc-tools-2.28-12.cm1.x86_64.rpm
+glibc-tools-2.28-13.cm1.x86_64.rpm
-zlib-1.2.11-3.cm1.x86_64.rpm
+zlib-1.2.11-4.cm1.x86_64.rpm
-zlib-devel-1.2.11-3.cm1.x86_64.rpm
+zlib-devel-1.2.11-4.cm1.x86_64.rpm
 file-5.38-1.cm1.x86_64.rpm
 file-devel-5.38-1.cm1.x86_64.rpm
 file-libs-5.38-1.cm1.x86_64.rpm
@@ -18,16 +18,20 @@ gmp-6.1.2-5.cm1.x86_64.rpm
 gmp-devel-6.1.2-5.cm1.x86_64.rpm
 mpfr-4.0.1-3.cm1.x86_64.rpm
 mpfr-devel-4.0.1-3.cm1.x86_64.rpm
-libmpc-1.1.0-5.cm1.x86_64.rpm
+libmpc-1.1.0-6.cm1.x86_64.rpm
-libgcc-9.1.0-7.cm1.x86_64.rpm
+libgcc-9.1.0-8.cm1.x86_64.rpm
-libgcc-atomic-9.1.0-7.cm1.x86_64.rpm
+libgcc-atomic-9.1.0-8.cm1.x86_64.rpm
-libgcc-devel-9.1.0-7.cm1.x86_64.rpm
+libgcc-devel-9.1.0-8.cm1.x86_64.rpm
-libstdc++-9.1.0-7.cm1.x86_64.rpm
+libstdc++-9.1.0-8.cm1.x86_64.rpm
-libstdc++-devel-9.1.0-7.cm1.x86_64.rpm
+libstdc++-devel-9.1.0-8.cm1.x86_64.rpm
-libgomp-9.1.0-7.cm1.x86_64.rpm
+libgomp-9.1.0-8.cm1.x86_64.rpm
-libgomp-devel-9.1.0-7.cm1.x86_64.rpm
+libgomp-devel-9.1.0-8.cm1.x86_64.rpm
-gcc-9.1.0-7.cm1.x86_64.rpm
+gcc-9.1.0-8.cm1.x86_64.rpm
-pkg-config-0.29.2-4.cm1.x86_64.rpm
+gcc-c++-9.1.0-8.cm1.x86_64.rpm
+libpkgconf-1.7.0-3.cm1.x86_64.rpm
+pkgconf-1.7.0-3.cm1.x86_64.rpm
+pkgconf-m4-1.7.0-3.cm1.noarch.rpm
+pkgconf-pkg-config-1.7.0-3.cm1.x86_64.rpm
 ncurses-6.2-4.cm1.x86_64.rpm
 ncurses-compat-6.2-4.cm1.x86_64.rpm
 ncurses-devel-6.2-4.cm1.x86_64.rpm
@@ -45,9 +49,9 @@ bzip2-devel-1.0.6-15.cm1.x86_64.rpm
 bzip2-libs-1.0.6-15.cm1.x86_64.rpm
 sed-4.5-3.cm1.x86_64.rpm
 sed-lang-4.5-3.cm1.x86_64.rpm
-procps-ng-3.3.15-3.cm1.x86_64.rpm
+procps-ng-3.3.15-4.cm1.x86_64.rpm
-procps-ng-devel-3.3.15-3.cm1.x86_64.rpm
+procps-ng-devel-3.3.15-4.cm1.x86_64.rpm
-procps-ng-lang-3.3.15-3.cm1.x86_64.rpm
+procps-ng-lang-3.3.15-4.cm1.x86_64.rpm
 m4-1.4.18-4.cm1.x86_64.rpm
 grep-3.1-3.cm1.x86_64.rpm
 grep-lang-3.1-3.cm1.x86_64.rpm
@@ -55,25 +59,25 @@ diffutils-3.6-4.cm1.x86_64.rpm
 gawk-4.2.1-3.cm1.x86_64.rpm
 findutils-4.6.0-7.cm1.x86_64.rpm
 findutils-lang-4.6.0-7.cm1.x86_64.rpm
-gettext-0.19.8.1-3.cm1.x86_64.rpm
+gettext-0.21-1.cm1.x86_64.rpm
 gzip-1.9-4.cm1.x86_64.rpm
 make-4.2.1-4.cm1.x86_64.rpm
 mariner-release-1.0-9.cm1.noarch.rpm
 patch-2.7.6-7.cm1.x86_64.rpm
-util-linux-2.32.1-3.cm1.x86_64.rpm
+util-linux-2.32.1-4.cm1.x86_64.rpm
-util-linux-devel-2.32.1-3.cm1.x86_64.rpm
+util-linux-devel-2.32.1-4.cm1.x86_64.rpm
-util-linux-libs-2.32.1-3.cm1.x86_64.rpm
+util-linux-libs-2.32.1-4.cm1.x86_64.rpm
 tar-1.32-2.cm1.x86_64.rpm
-xz-5.2.4-3.cm1.x86_64.rpm
+xz-5.2.4-4.cm1.x86_64.rpm
-xz-devel-5.2.4-3.cm1.x86_64.rpm
+xz-devel-5.2.4-4.cm1.x86_64.rpm
-xz-lang-5.2.4-3.cm1.x86_64.rpm
+xz-lang-5.2.4-4.cm1.x86_64.rpm
-xz-libs-5.2.4-3.cm1.x86_64.rpm
+xz-libs-5.2.4-4.cm1.x86_64.rpm
 zstd-1.4.4-1.cm1.x86_64.rpm
 zstd-devel-1.4.4-1.cm1.x86_64.rpm
 zstd-libs-1.4.4-1.cm1.x86_64.rpm
-libtool-2.4.6-5.cm1.x86_64.rpm
+libtool-2.4.6-6.cm1.x86_64.rpm
-flex-2.6.4-5.cm1.x86_64.rpm
+flex-2.6.4-6.cm1.x86_64.rpm
-flex-devel-2.6.4-5.cm1.x86_64.rpm
+flex-devel-2.6.4-6.cm1.x86_64.rpm
 bison-3.1-3.cm1.x86_64.rpm
 popt-1.16-7.cm1.x86_64.rpm
 popt-devel-1.16-7.cm1.x86_64.rpm
@@ -83,9 +87,9 @@ nspr-devel-4.21-2.cm1.x86_64.rpm
 sqlite-3.32.3-1.cm1.x86_64.rpm
 sqlite-devel-3.32.3-1.cm1.x86_64.rpm
 sqlite-libs-3.32.3-1.cm1.x86_64.rpm
-nss-3.44-2.cm1.x86_64.rpm
+nss-3.44-3.cm1.x86_64.rpm
-nss-devel-3.44-2.cm1.x86_64.rpm
+nss-devel-3.44-3.cm1.x86_64.rpm
-nss-libs-3.44-2.cm1.x86_64.rpm
+nss-libs-3.44-3.cm1.x86_64.rpm
 elfutils-0.176-3.cm1.x86_64.rpm
 elfutils-devel-0.176-3.cm1.x86_64.rpm
 elfutils-devel-static-0.176-3.cm1.x86_64.rpm
@@ -101,8 +105,8 @@ libpipeline-devel-1.5.0-3.cm1.x86_64.rpm
 gdbm-1.18-3.cm1.x86_64.rpm
 gdbm-devel-1.18-3.cm1.x86_64.rpm
 gdbm-lang-1.18-3.cm1.x86_64.rpm
-perl-5.30.3-1.cm1.x86_64.rpm
+perl-5.30.3-3.cm1.x86_64.rpm
-texinfo-6.5-7.cm1.x86_64.rpm
+texinfo-6.5-8.cm1.x86_64.rpm
 autoconf-2.69-9.cm1.noarch.rpm
 automake-1.16.1-3.cm1.noarch.rpm
 openssl-1.1.1g-6.cm1.x86_64.rpm
@@ -129,9 +133,9 @@ libsolv-0.7.7-4.cm1.x86_64.rpm
 libsolv-devel-0.7.7-4.cm1.x86_64.rpm
 libssh2-1.9.0-1.cm1.x86_64.rpm
 libssh2-devel-1.9.0-1.cm1.x86_64.rpm
-curl-7.68.0-1.cm1.x86_64.rpm
+curl-7.68.0-2.cm1.x86_64.rpm
-curl-devel-7.68.0-1.cm1.x86_64.rpm
+curl-devel-7.68.0-2.cm1.x86_64.rpm
-curl-libs-7.68.0-1.cm1.x86_64.rpm
+curl-libs-7.68.0-2.cm1.x86_64.rpm
 tdnf-2.1.0-4.cm1.x86_64.rpm
 tdnf-cli-libs-2.1.0-4.cm1.x86_64.rpm
 tdnf-devel-2.1.0-4.cm1.x86_64.rpm
@@ -139,27 +143,41 @@ tdnf-plugin-repogpgcheck-2.1.0-4.cm1.x86_64.rpm
 createrepo_c-0.11.1-6.cm1.x86_64.rpm
 libxml2-2.9.10-2.cm1.x86_64.rpm
 libxml2-devel-2.9.10-2.cm1.x86_64.rpm
-glib-2.58.0-6.cm1.x86_64.rpm
+glib-2.58.0-8.cm1.x86_64.rpm
-libltdl-2.4.6-5.cm1.x86_64.rpm
+libltdl-2.4.6-6.cm1.x86_64.rpm
-libltdl-devel-2.4.6-5.cm1.x86_64.rpm
+libltdl-devel-2.4.6-6.cm1.x86_64.rpm
 pcre-libs-8.42-4.cm1.x86_64.rpm
 krb5-1.17-3.cm1.x86_64.rpm
-lua-5.3.5-6.cm1.x86_64.rpm
+lua-5.3.5-9.cm1.x86_64.rpm
-mariner-rpm-macros-1.0-3.cm1.noarch.rpm
+lua-libs-5.3.5-9.cm1.x86_64.rpm
-mariner-check-macros-1.0-3.cm1.noarch.rpm
+mariner-rpm-macros-1.0-6.cm1.noarch.rpm
-libassuan-2.5.1-3.cm1.x86_64.rpm
+mariner-python-macros-1.0-6.cm1.noarch.rpm
-libgpg-error-1.32-4.cm1.x86_64.rpm
+mariner-check-macros-1.0-6.cm1.noarch.rpm
+libassuan-2.5.1-5.cm1.x86_64.rpm
+libgpg-error-1.32-5.cm1.x86_64.rpm
 libgcrypt-1.8.3-4.cm1.x86_64.rpm
-libksba-1.3.5-3.cm1.x86_64.rpm
+libksba-1.3.5-4.cm1.x86_64.rpm
 npth-1.6-3.cm1.x86_64.rpm
 pinentry-1.1.0-3.cm1.x86_64.rpm
-gnupg2-2.2.20-3.cm1.x86_64.rpm
+gnupg2-2.2.20-4.cm1.x86_64.rpm
 gpgme-1.13.1-5.cm1.x86_64.rpm
 mariner-repos-1.0-9.cm1.noarch.rpm
 libffi-3.2.1-10.cm1.x86_64.rpm
+libffi-devel-3.2.1-10.cm1.x86_64.rpm
 libtasn1-4.14-2.cm1.x86_64.rpm
 p11-kit-0.23.16.1-2.cm1.x86_64.rpm
 p11-kit-trust-0.23.16.1-2.cm1.x86_64.rpm
 ca-certificates-shared-20200720-7.cm1.noarch.rpm
 ca-certificates-tools-20200720-7.cm1.noarch.rpm
 ca-certificates-base-20200720-7.cm1.noarch.rpm
+dwz-0.13-4.cm1.x86_64.rpm
+unzip-6.0-15.cm1.x86_64.rpm
+python2-2.7.18-3.cm1.x86_64.rpm
+python2-devel-2.7.18-3.cm1.x86_64.rpm
+python2-libs-2.7.18-3.cm1.x86_64.rpm
+python-xml-2.7.18-3.cm1.x86_64.rpm
+python3-3.7.7-4.cm1.x86_64.rpm
+python3-devel-3.7.7-4.cm1.x86_64.rpm
+python3-libs-3.7.7-4.cm1.x86_64.rpm
+python3-setuptools-3.7.7-4.cm1.noarch.rpm
+python3-xml-3.7.7-4.cm1.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -23,10 +23,10 @@ ca-certificates-legacy-20200720-7.cm1.noarch.rpm
 ca-certificates-microsoft-20200720-7.cm1.noarch.rpm
 ca-certificates-shared-20200720-7.cm1.noarch.rpm
 ca-certificates-tools-20200720-7.cm1.noarch.rpm
-check-0.12.0-4.cm1.aarch64.rpm
+check-0.12.0-5.cm1.aarch64.rpm
-check-debuginfo-0.12.0-4.cm1.aarch64.rpm
+check-debuginfo-0.12.0-5.cm1.aarch64.rpm
-cmake-3.17.3-2.cm1.aarch64.rpm
+cmake-3.17.3-3.cm1.aarch64.rpm
-cmake-debuginfo-3.17.3-2.cm1.aarch64.rpm
+cmake-debuginfo-3.17.3-3.cm1.aarch64.rpm
 coreutils-8.30-5.cm1.aarch64.rpm
 coreutils-debuginfo-8.30-5.cm1.aarch64.rpm
 coreutils-lang-8.30-5.cm1.aarch64.rpm
@@ -47,10 +47,10 @@ cryptsetup-debuginfo-2.3.3-2.cm1.aarch64.rpm
 cryptsetup-devel-2.3.3-2.cm1.aarch64.rpm
 cryptsetup-libs-2.3.3-2.cm1.aarch64.rpm
 cryptsetup-reencrypt-2.3.3-2.cm1.aarch64.rpm
-curl-7.68.0-1.cm1.aarch64.rpm
+curl-7.68.0-2.cm1.aarch64.rpm
-curl-debuginfo-7.68.0-1.cm1.aarch64.rpm
+curl-debuginfo-7.68.0-2.cm1.aarch64.rpm
-curl-devel-7.68.0-1.cm1.aarch64.rpm
+curl-devel-7.68.0-2.cm1.aarch64.rpm
-curl-libs-7.68.0-1.cm1.aarch64.rpm
+curl-libs-7.68.0-2.cm1.aarch64.rpm
 device-mapper-2.03.05-5.cm1.aarch64.rpm
 device-mapper-devel-2.03.05-5.cm1.aarch64.rpm
 device-mapper-event-2.03.05-5.cm1.aarch64.rpm
@@ -60,7 +60,9 @@ device-mapper-libs-2.03.05-5.cm1.aarch64.rpm
 diffutils-3.6-4.cm1.aarch64.rpm
 diffutils-debuginfo-3.6-4.cm1.aarch64.rpm
 docbook-dtd-xml-4.5-11.cm1.noarch.rpm
-docbook-style-xsl-1.79.1-10.cm1.noarch.rpm
+docbook-style-xsl-1.79.1-11.cm1.noarch.rpm
+dwz-0.13-4.cm1.aarch64.rpm
+dwz-debuginfo-0.13-4.cm1.aarch64.rpm
 e2fsprogs-1.44.6-3.cm1.aarch64.rpm
 e2fsprogs-debuginfo-1.44.6-3.cm1.aarch64.rpm
 e2fsprogs-devel-1.44.6-3.cm1.aarch64.rpm
@@ -82,46 +84,50 @@ file-5.38-1.cm1.aarch64.rpm
 file-debuginfo-5.38-1.cm1.aarch64.rpm
 file-devel-5.38-1.cm1.aarch64.rpm
 file-libs-5.38-1.cm1.aarch64.rpm
-filesystem-1.1-7.cm1.aarch64.rpm
+filesystem-1.1-8.cm1.aarch64.rpm
 findutils-4.6.0-7.cm1.aarch64.rpm
 findutils-debuginfo-4.6.0-7.cm1.aarch64.rpm
 findutils-lang-4.6.0-7.cm1.aarch64.rpm
-flex-2.6.4-5.cm1.aarch64.rpm
+flex-2.6.4-6.cm1.aarch64.rpm
-flex-debuginfo-2.6.4-5.cm1.aarch64.rpm
+flex-debuginfo-2.6.4-6.cm1.aarch64.rpm
-flex-devel-2.6.4-5.cm1.aarch64.rpm
+flex-devel-2.6.4-6.cm1.aarch64.rpm
+fontconfig-2.13.1-4.cm1.aarch64.rpm
+fontconfig-debuginfo-2.13.1-4.cm1.aarch64.rpm
+fontconfig-devel-2.13.1-4.cm1.aarch64.rpm
 freetype-2.9.1-4.cm1.aarch64.rpm
 freetype-debuginfo-2.9.1-4.cm1.aarch64.rpm
 freetype-devel-2.9.1-4.cm1.aarch64.rpm
 gawk-4.2.1-3.cm1.aarch64.rpm
 gawk-debuginfo-4.2.1-3.cm1.aarch64.rpm
-gcc-9.1.0-7.cm1.aarch64.rpm
+gcc-9.1.0-8.cm1.aarch64.rpm
-gcc-debuginfo-9.1.0-7.cm1.aarch64.rpm
+gcc-c++-9.1.0-8.cm1.aarch64.rpm
+gcc-debuginfo-9.1.0-8.cm1.aarch64.rpm
 gdbm-1.18-3.cm1.aarch64.rpm
 gdbm-debuginfo-1.18-3.cm1.aarch64.rpm
 gdbm-devel-1.18-3.cm1.aarch64.rpm
 gdbm-lang-1.18-3.cm1.aarch64.rpm
-gettext-0.19.8.1-3.cm1.aarch64.rpm
+gettext-0.21-1.cm1.aarch64.rpm
-gettext-debuginfo-0.19.8.1-3.cm1.aarch64.rpm
+gettext-debuginfo-0.21-1.cm1.aarch64.rpm
-gfortran-9.1.0-7.cm1.aarch64.rpm
+gfortran-9.1.0-8.cm1.aarch64.rpm
-glib-2.58.0-6.cm1.aarch64.rpm
+glib-2.58.0-8.cm1.aarch64.rpm
-glibc-2.28-12.cm1.aarch64.rpm
+glibc-2.28-13.cm1.aarch64.rpm
-glibc-devel-2.28-12.cm1.aarch64.rpm
+glibc-devel-2.28-13.cm1.aarch64.rpm
-glibc-i18n-2.28-12.cm1.aarch64.rpm
+glibc-i18n-2.28-13.cm1.aarch64.rpm
-glibc-iconv-2.28-12.cm1.aarch64.rpm
+glibc-iconv-2.28-13.cm1.aarch64.rpm
-glibc-lang-2.28-12.cm1.aarch64.rpm
+glibc-lang-2.28-13.cm1.aarch64.rpm
-glibc-nscd-2.28-12.cm1.aarch64.rpm
+glibc-nscd-2.28-13.cm1.aarch64.rpm
-glibc-tools-2.28-12.cm1.aarch64.rpm
+glibc-tools-2.28-13.cm1.aarch64.rpm
-glib-debuginfo-2.58.0-6.cm1.aarch64.rpm
+glib-debuginfo-2.58.0-8.cm1.aarch64.rpm
-glib-devel-2.58.0-6.cm1.aarch64.rpm
+glib-devel-2.58.0-8.cm1.aarch64.rpm
-glib-schemas-2.58.0-6.cm1.aarch64.rpm
+glib-schemas-2.58.0-8.cm1.aarch64.rpm
 gmock-1.8.1-5.cm1.aarch64.rpm
 gmock-devel-1.8.1-5.cm1.aarch64.rpm
 gmock-static-1.8.1-5.cm1.aarch64.rpm
 gmp-6.1.2-5.cm1.aarch64.rpm
 gmp-debuginfo-6.1.2-5.cm1.aarch64.rpm
 gmp-devel-6.1.2-5.cm1.aarch64.rpm
-gnupg2-2.2.20-3.cm1.aarch64.rpm
+gnupg2-2.2.20-4.cm1.aarch64.rpm
-gnupg2-debuginfo-2.2.20-3.cm1.aarch64.rpm
+gnupg2-debuginfo-2.2.20-4.cm1.aarch64.rpm
 gperf-3.1-3.cm1.aarch64.rpm
 gperf-debuginfo-3.1-3.cm1.aarch64.rpm
 gpgme-1.13.1-5.cm1.aarch64.rpm
@@ -145,10 +151,10 @@ json-c-debuginfo-0.14-2.cm1.aarch64.rpm
 json-c-devel-0.14-2.cm1.aarch64.rpm
 kbd-2.0.4-5.cm1.aarch64.rpm
 kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm
-kernel-headers-5.4.51-2.cm1.noarch.rpm
+kernel-headers-5.4.51-3.cm1.noarch.rpm
-kmod-25-4.cm1.aarch64.rpm
+kmod-25-5.cm1.aarch64.rpm
-kmod-debuginfo-25-4.cm1.aarch64.rpm
+kmod-debuginfo-25-5.cm1.aarch64.rpm
-kmod-devel-25-4.cm1.aarch64.rpm
+kmod-devel-25-5.cm1.aarch64.rpm
 krb5-1.17-3.cm1.aarch64.rpm
 krb5-debuginfo-1.17-3.cm1.aarch64.rpm
 krb5-devel-1.17-3.cm1.aarch64.rpm
@@ -156,11 +162,11 @@ krb5-lang-1.17-3.cm1.aarch64.rpm
 libaio-0.3.112-2.cm1.aarch64.rpm
 libaio-debuginfo-0.3.112-2.cm1.aarch64.rpm
 libaio-devel-0.3.112-2.cm1.aarch64.rpm
-libarchive-3.4.2-2.cm1.aarch64.rpm
+libarchive-3.4.2-3.cm1.aarch64.rpm
-libarchive-debuginfo-3.4.2-2.cm1.aarch64.rpm
+libarchive-debuginfo-3.4.2-3.cm1.aarch64.rpm
-libarchive-devel-3.4.2-2.cm1.aarch64.rpm
+libarchive-devel-3.4.2-3.cm1.aarch64.rpm
-libassuan-2.5.1-3.cm1.aarch64.rpm
+libassuan-2.5.1-5.cm1.aarch64.rpm
-libassuan-debuginfo-2.5.1-3.cm1.aarch64.rpm
+libassuan-debuginfo-2.5.1-5.cm1.aarch64.rpm
 libcap-2.26-2.cm1.aarch64.rpm
 libcap-debuginfo-2.26-2.cm1.aarch64.rpm
 libcap-devel-2.26-2.cm1.aarch64.rpm
@@ -171,39 +177,41 @@ libdb-docs-5.3.28-4.cm1.aarch64.rpm
 libffi-3.2.1-10.cm1.aarch64.rpm
 libffi-debuginfo-3.2.1-10.cm1.aarch64.rpm
 libffi-devel-3.2.1-10.cm1.aarch64.rpm
-libgcc-9.1.0-7.cm1.aarch64.rpm
+libgcc-9.1.0-8.cm1.aarch64.rpm
-libgcc-atomic-9.1.0-7.cm1.aarch64.rpm
+libgcc-atomic-9.1.0-8.cm1.aarch64.rpm
-libgcc-devel-9.1.0-7.cm1.aarch64.rpm
+libgcc-devel-9.1.0-8.cm1.aarch64.rpm
 libgcrypt-1.8.3-4.cm1.aarch64.rpm
 libgcrypt-debuginfo-1.8.3-4.cm1.aarch64.rpm
 libgcrypt-devel-1.8.3-4.cm1.aarch64.rpm
-libgomp-9.1.0-7.cm1.aarch64.rpm
+libgomp-9.1.0-8.cm1.aarch64.rpm
-libgomp-devel-9.1.0-7.cm1.aarch64.rpm
+libgomp-devel-9.1.0-8.cm1.aarch64.rpm
-libgpg-error-1.32-4.cm1.aarch64.rpm
+libgpg-error-1.32-5.cm1.aarch64.rpm
-libgpg-error-debuginfo-1.32-4.cm1.aarch64.rpm
+libgpg-error-debuginfo-1.32-5.cm1.aarch64.rpm
-libgpg-error-devel-1.32-4.cm1.aarch64.rpm
+libgpg-error-devel-1.32-5.cm1.aarch64.rpm
-libgpg-error-lang-1.32-4.cm1.aarch64.rpm
+libgpg-error-lang-1.32-5.cm1.aarch64.rpm
-libksba-1.3.5-3.cm1.aarch64.rpm
+libksba-1.3.5-4.cm1.aarch64.rpm
-libksba-debuginfo-1.3.5-3.cm1.aarch64.rpm
+libksba-debuginfo-1.3.5-4.cm1.aarch64.rpm
-libltdl-2.4.6-5.cm1.aarch64.rpm
+libltdl-2.4.6-6.cm1.aarch64.rpm
-libltdl-devel-2.4.6-5.cm1.aarch64.rpm
+libltdl-devel-2.4.6-6.cm1.aarch64.rpm
-libmpc-1.1.0-5.cm1.aarch64.rpm
+libmpc-1.1.0-6.cm1.aarch64.rpm
-libmpc-debuginfo-1.1.0-5.cm1.aarch64.rpm
+libmpc-debuginfo-1.1.0-6.cm1.aarch64.rpm
 libpipeline-1.5.0-3.cm1.aarch64.rpm
 libpipeline-debuginfo-1.5.0-3.cm1.aarch64.rpm
 libpipeline-devel-1.5.0-3.cm1.aarch64.rpm
+libpkgconf-1.7.0-3.cm1.aarch64.rpm
+libpkgconf-devel-1.7.0-3.cm1.aarch64.rpm
 libpwquality-1.4.2-4.cm1.aarch64.rpm
 libpwquality-debuginfo-1.4.2-4.cm1.aarch64.rpm
 libpwquality-devel-1.4.2-4.cm1.aarch64.rpm
-libselinux-2.9-3.cm1.aarch64.rpm
+libselinux-2.9-4.cm1.aarch64.rpm
-libselinux-debuginfo-2.9-3.cm1.aarch64.rpm
+libselinux-debuginfo-2.9-4.cm1.aarch64.rpm
-libselinux-devel-2.9-3.cm1.aarch64.rpm
+libselinux-devel-2.9-4.cm1.aarch64.rpm
-libselinux-python-2.9-3.cm1.aarch64.rpm
+libselinux-python-2.9-4.cm1.aarch64.rpm
-libselinux-python3-2.9-3.cm1.aarch64.rpm
+libselinux-python3-2.9-4.cm1.aarch64.rpm
-libselinux-utils-2.9-3.cm1.aarch64.rpm
+libselinux-utils-2.9-4.cm1.aarch64.rpm
-libsepol-2.9-5.cm1.aarch64.rpm
+libsepol-2.9-6.cm1.aarch64.rpm
-libsepol-debuginfo-2.9-5.cm1.aarch64.rpm
+libsepol-debuginfo-2.9-6.cm1.aarch64.rpm
-libsepol-devel-2.9-5.cm1.aarch64.rpm
+libsepol-devel-2.9-6.cm1.aarch64.rpm
 libsolv-0.7.7-4.cm1.aarch64.rpm
 libsolv-debuginfo-0.7.7-4.cm1.aarch64.rpm
 libsolv-devel-0.7.7-4.cm1.aarch64.rpm
@@ -211,13 +219,13 @@ libsolv-tools-0.7.7-4.cm1.aarch64.rpm
 libssh2-1.9.0-1.cm1.aarch64.rpm
 libssh2-debuginfo-1.9.0-1.cm1.aarch64.rpm
 libssh2-devel-1.9.0-1.cm1.aarch64.rpm
-libstdc++-9.1.0-7.cm1.aarch64.rpm
+libstdc++-9.1.0-8.cm1.aarch64.rpm
-libstdc++-devel-9.1.0-7.cm1.aarch64.rpm
+libstdc++-devel-9.1.0-8.cm1.aarch64.rpm
 libtasn1-4.14-2.cm1.aarch64.rpm
 libtasn1-debuginfo-4.14-2.cm1.aarch64.rpm
 libtasn1-devel-4.14-2.cm1.aarch64.rpm
-libtool-2.4.6-5.cm1.aarch64.rpm
+libtool-2.4.6-6.cm1.aarch64.rpm
-libtool-debuginfo-2.4.6-5.cm1.aarch64.rpm
+libtool-debuginfo-2.4.6-6.cm1.aarch64.rpm
 libxml2-2.9.10-2.cm1.aarch64.rpm
 libxml2-debuginfo-2.9.10-2.cm1.aarch64.rpm
 libxml2-devel-2.9.10-2.cm1.aarch64.rpm
@@ -225,9 +233,11 @@ libxml2-python-2.9.10-2.cm1.aarch64.rpm
 libxslt-1.1.34-2.cm1.aarch64.rpm
 libxslt-debuginfo-1.1.34-2.cm1.aarch64.rpm
 libxslt-devel-1.1.34-2.cm1.aarch64.rpm
-lua-5.3.5-6.cm1.aarch64.rpm
+lua-5.3.5-9.cm1.aarch64.rpm
-lua-debuginfo-5.3.5-6.cm1.aarch64.rpm
+lua-debuginfo-5.3.5-9.cm1.aarch64.rpm
-lua-devel-5.3.5-6.cm1.aarch64.rpm
+lua-devel-5.3.5-9.cm1.aarch64.rpm
+lua-libs-5.3.5-9.cm1.aarch64.rpm
+lua-static-5.3.5-9.cm1.aarch64.rpm
 lvm2-2.03.05-5.cm1.aarch64.rpm
 lvm2-debuginfo-2.03.05-5.cm1.aarch64.rpm
 lvm2-devel-2.03.05-5.cm1.aarch64.rpm
@@ -236,10 +246,11 @@ m4-1.4.18-4.cm1.aarch64.rpm
 m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
 make-4.2.1-4.cm1.aarch64.rpm
 make-debuginfo-4.2.1-4.cm1.aarch64.rpm
-mariner-check-macros-1.0-3.cm1.noarch.rpm
+mariner-check-macros-1.0-6.cm1.noarch.rpm
+mariner-python-macros-1.0-6.cm1.noarch.rpm
 mariner-release-1.0-9.cm1.noarch.rpm
 mariner-repos-1.0-9.cm1.noarch.rpm
-mariner-rpm-macros-1.0-3.cm1.noarch.rpm
+mariner-rpm-macros-1.0-6.cm1.noarch.rpm
 meson-0.49.2-1.cm1.noarch.rpm
 mpfr-4.0.1-3.cm1.aarch64.rpm
 mpfr-debuginfo-4.0.1-3.cm1.aarch64.rpm
@@ -258,16 +269,16 @@ npth-devel-1.6-3.cm1.aarch64.rpm
 nspr-4.21-2.cm1.aarch64.rpm
 nspr-debuginfo-4.21-2.cm1.aarch64.rpm
 nspr-devel-4.21-2.cm1.aarch64.rpm
-nss-3.44-2.cm1.aarch64.rpm
+nss-3.44-3.cm1.aarch64.rpm
-nss-debuginfo-3.44-2.cm1.aarch64.rpm
+nss-debuginfo-3.44-3.cm1.aarch64.rpm
-nss-devel-3.44-2.cm1.aarch64.rpm
+nss-devel-3.44-3.cm1.aarch64.rpm
-nss-libs-3.44-2.cm1.aarch64.rpm
+nss-libs-3.44-3.cm1.aarch64.rpm
-openjdk8-1.8.0.181-8.cm1.aarch64.rpm
+openjdk8-1.8.0.181-9.cm1.aarch64.rpm
-openjdk8-debuginfo-1.8.0.181-8.cm1.aarch64.rpm
+openjdk8-debuginfo-1.8.0.181-9.cm1.aarch64.rpm
-openjdk8-doc-1.8.0.181-8.cm1.aarch64.rpm
+openjdk8-doc-1.8.0.181-9.cm1.aarch64.rpm
-openjdk8-sample-1.8.0.181-8.cm1.aarch64.rpm
+openjdk8-sample-1.8.0.181-9.cm1.aarch64.rpm
-openjdk8-src-1.8.0.181-8.cm1.aarch64.rpm
+openjdk8-src-1.8.0.181-9.cm1.aarch64.rpm
-openjre8-1.8.0.181-8.cm1.aarch64.rpm
+openjre8-1.8.0.181-9.cm1.aarch64.rpm
 openssl-1.1.1g-6.cm1.aarch64.rpm
 openssl-debuginfo-1.1.1g-6.cm1.aarch64.rpm
 openssl-devel-1.1.1g-6.cm1.aarch64.rpm
@@ -289,13 +300,13 @@ pcre-8.42-4.cm1.aarch64.rpm
 pcre-debuginfo-8.42-4.cm1.aarch64.rpm
 pcre-devel-8.42-4.cm1.aarch64.rpm
 pcre-libs-8.42-4.cm1.aarch64.rpm
-perl-5.30.3-1.cm1.aarch64.rpm
+perl-5.30.3-3.cm1.aarch64.rpm
 perl-DBD-SQLite-1.62-3.cm1.aarch64.rpm
 perl-DBD-SQLite-debuginfo-1.62-3.cm1.aarch64.rpm
 perl-DBI-1.641-3.cm1.aarch64.rpm
 perl-DBI-debuginfo-1.641-3.cm1.aarch64.rpm
 perl-DBIx-Simple-1.37-2.cm1.noarch.rpm
-perl-debuginfo-5.30.3-1.cm1.aarch64.rpm
+perl-debuginfo-5.30.3-3.cm1.aarch64.rpm
 perl-libintl-perl-1.29-4.cm1.aarch64.rpm
 perl-libintl-perl-debuginfo-1.29-4.cm1.aarch64.rpm
 perl-Object-Accessor-0.48-6.cm1.noarch.rpm
@@ -305,27 +316,39 @@ perl-XML-Parser-2.44-10.cm1.aarch64.rpm
 perl-XML-Parser-debuginfo-2.44-10.cm1.aarch64.rpm
 pinentry-1.1.0-3.cm1.aarch64.rpm
 pinentry-debuginfo-1.1.0-3.cm1.aarch64.rpm
-pkg-config-0.29.2-4.cm1.aarch64.rpm
+pkgconf-1.7.0-3.cm1.aarch64.rpm
-pkg-config-debuginfo-0.29.2-4.cm1.aarch64.rpm
+pkgconf-debuginfo-1.7.0-3.cm1.aarch64.rpm
+pkgconf-m4-1.7.0-3.cm1.noarch.rpm
+pkgconf-pkg-config-1.7.0-3.cm1.aarch64.rpm
 popt-1.16-7.cm1.aarch64.rpm
 popt-debuginfo-1.16-7.cm1.aarch64.rpm
 popt-devel-1.16-7.cm1.aarch64.rpm
 popt-lang-1.16-7.cm1.aarch64.rpm
-procps-ng-3.3.15-3.cm1.aarch64.rpm
+procps-ng-3.3.15-4.cm1.aarch64.rpm
-procps-ng-debuginfo-3.3.15-3.cm1.aarch64.rpm
+procps-ng-debuginfo-3.3.15-4.cm1.aarch64.rpm
-procps-ng-devel-3.3.15-3.cm1.aarch64.rpm
+procps-ng-devel-3.3.15-4.cm1.aarch64.rpm
-procps-ng-lang-3.3.15-3.cm1.aarch64.rpm
+procps-ng-lang-3.3.15-4.cm1.aarch64.rpm
 python2-2.7.18-3.cm1.aarch64.rpm
 python2-debuginfo-2.7.18-3.cm1.aarch64.rpm
 python2-devel-2.7.18-3.cm1.aarch64.rpm
 python2-libs-2.7.18-3.cm1.aarch64.rpm
 python2-test-2.7.18-3.cm1.aarch64.rpm
 python2-tools-2.7.18-3.cm1.aarch64.rpm
+python3-3.7.7-4.cm1.aarch64.rpm
 python3-cracklib-2.9.7-2.cm1.aarch64.rpm
+python3-curses-3.7.7-4.cm1.aarch64.rpm
+python3-debuginfo-3.7.7-4.cm1.aarch64.rpm
+python3-devel-3.7.7-4.cm1.aarch64.rpm
 python3-gpg-1.13.1-5.cm1.aarch64.rpm
+python3-libs-3.7.7-4.cm1.aarch64.rpm
 python3-libxml2-2.9.10-2.cm1.aarch64.rpm
+python3-pip-3.7.7-4.cm1.noarch.rpm
 python3-pwquality-1.4.2-4.cm1.aarch64.rpm
 python3-rpm-4.14.2-10.cm1.aarch64.rpm
+python3-setuptools-3.7.7-4.cm1.noarch.rpm
+python3-test-3.7.7-4.cm1.aarch64.rpm
+python3-tools-3.7.7-4.cm1.aarch64.rpm
+python3-xml-3.7.7-4.cm1.aarch64.rpm
 python-curses-2.7.18-3.cm1.aarch64.rpm
 python-gpg-1.13.1-5.cm1.aarch64.rpm
 python-rpm-4.14.2-10.cm1.aarch64.rpm
@@ -367,30 +390,30 @@ tdnf-debuginfo-2.1.0-4.cm1.aarch64.rpm
 tdnf-devel-2.1.0-4.cm1.aarch64.rpm
 tdnf-plugin-repogpgcheck-2.1.0-4.cm1.aarch64.rpm
 tdnf-python-2.1.0-4.cm1.aarch64.rpm
-texinfo-6.5-7.cm1.aarch64.rpm
+texinfo-6.5-8.cm1.aarch64.rpm
-texinfo-debuginfo-6.5-7.cm1.aarch64.rpm
+texinfo-debuginfo-6.5-8.cm1.aarch64.rpm
 unzip-6.0-15.cm1.aarch64.rpm
 unzip-debuginfo-6.0-15.cm1.aarch64.rpm
-util-linux-2.32.1-3.cm1.aarch64.rpm
+util-linux-2.32.1-4.cm1.aarch64.rpm
-util-linux-debuginfo-2.32.1-3.cm1.aarch64.rpm
+util-linux-debuginfo-2.32.1-4.cm1.aarch64.rpm
-util-linux-devel-2.32.1-3.cm1.aarch64.rpm
+util-linux-devel-2.32.1-4.cm1.aarch64.rpm
-util-linux-lang-2.32.1-3.cm1.aarch64.rpm
+util-linux-lang-2.32.1-4.cm1.aarch64.rpm
-util-linux-libs-2.32.1-3.cm1.aarch64.rpm
+util-linux-libs-2.32.1-4.cm1.aarch64.rpm
 veritysetup-2.3.3-2.cm1.aarch64.rpm
 wget-1.20.3-1.cm1.aarch64.rpm
 wget-debuginfo-1.20.3-1.cm1.aarch64.rpm
 which-2.21-7.cm1.aarch64.rpm
 which-debuginfo-2.21-7.cm1.aarch64.rpm
-xz-5.2.4-3.cm1.aarch64.rpm
+xz-5.2.4-4.cm1.aarch64.rpm
-xz-debuginfo-5.2.4-3.cm1.aarch64.rpm
+xz-debuginfo-5.2.4-4.cm1.aarch64.rpm
-xz-devel-5.2.4-3.cm1.aarch64.rpm
+xz-devel-5.2.4-4.cm1.aarch64.rpm
-xz-lang-5.2.4-3.cm1.aarch64.rpm
+xz-lang-5.2.4-4.cm1.aarch64.rpm
-xz-libs-5.2.4-3.cm1.aarch64.rpm
+xz-libs-5.2.4-4.cm1.aarch64.rpm
 zip-3.0-5.cm1.aarch64.rpm
 zip-debuginfo-3.0-5.cm1.aarch64.rpm
-zlib-1.2.11-3.cm1.aarch64.rpm
+zlib-1.2.11-4.cm1.aarch64.rpm
-zlib-debuginfo-1.2.11-3.cm1.aarch64.rpm
+zlib-debuginfo-1.2.11-4.cm1.aarch64.rpm
-zlib-devel-1.2.11-3.cm1.aarch64.rpm
+zlib-devel-1.2.11-4.cm1.aarch64.rpm
 zstd-1.4.4-1.cm1.aarch64.rpm
 zstd-debuginfo-1.4.4-1.cm1.aarch64.rpm
 zstd-devel-1.4.4-1.cm1.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -23,10 +23,10 @@ ca-certificates-legacy-20200720-7.cm1.noarch.rpm
 ca-certificates-microsoft-20200720-7.cm1.noarch.rpm
 ca-certificates-shared-20200720-7.cm1.noarch.rpm
 ca-certificates-tools-20200720-7.cm1.noarch.rpm
-check-0.12.0-4.cm1.x86_64.rpm
+check-0.12.0-5.cm1.x86_64.rpm
-check-debuginfo-0.12.0-4.cm1.x86_64.rpm
+check-debuginfo-0.12.0-5.cm1.x86_64.rpm
-cmake-3.17.3-2.cm1.x86_64.rpm
+cmake-3.17.3-3.cm1.x86_64.rpm
-cmake-debuginfo-3.17.3-2.cm1.x86_64.rpm
+cmake-debuginfo-3.17.3-3.cm1.x86_64.rpm
 coreutils-8.30-5.cm1.x86_64.rpm
 coreutils-debuginfo-8.30-5.cm1.x86_64.rpm
 coreutils-lang-8.30-5.cm1.x86_64.rpm
@@ -47,10 +47,10 @@ cryptsetup-debuginfo-2.3.3-2.cm1.x86_64.rpm
 cryptsetup-devel-2.3.3-2.cm1.x86_64.rpm
 cryptsetup-libs-2.3.3-2.cm1.x86_64.rpm
 cryptsetup-reencrypt-2.3.3-2.cm1.x86_64.rpm
-curl-7.68.0-1.cm1.x86_64.rpm
+curl-7.68.0-2.cm1.x86_64.rpm
-curl-debuginfo-7.68.0-1.cm1.x86_64.rpm
+curl-debuginfo-7.68.0-2.cm1.x86_64.rpm
-curl-devel-7.68.0-1.cm1.x86_64.rpm
+curl-devel-7.68.0-2.cm1.x86_64.rpm
-curl-libs-7.68.0-1.cm1.x86_64.rpm
+curl-libs-7.68.0-2.cm1.x86_64.rpm
 device-mapper-2.03.05-5.cm1.x86_64.rpm
 device-mapper-devel-2.03.05-5.cm1.x86_64.rpm
 device-mapper-event-2.03.05-5.cm1.x86_64.rpm
@@ -60,7 +60,9 @@ device-mapper-libs-2.03.05-5.cm1.x86_64.rpm
 diffutils-3.6-4.cm1.x86_64.rpm
 diffutils-debuginfo-3.6-4.cm1.x86_64.rpm
 docbook-dtd-xml-4.5-11.cm1.noarch.rpm
-docbook-style-xsl-1.79.1-10.cm1.noarch.rpm
+docbook-style-xsl-1.79.1-11.cm1.noarch.rpm
+dwz-0.13-4.cm1.x86_64.rpm
+dwz-debuginfo-0.13-4.cm1.x86_64.rpm
 e2fsprogs-1.44.6-3.cm1.x86_64.rpm
 e2fsprogs-debuginfo-1.44.6-3.cm1.x86_64.rpm
 e2fsprogs-devel-1.44.6-3.cm1.x86_64.rpm
@@ -82,46 +84,50 @@ file-5.38-1.cm1.x86_64.rpm
 file-debuginfo-5.38-1.cm1.x86_64.rpm
 file-devel-5.38-1.cm1.x86_64.rpm
 file-libs-5.38-1.cm1.x86_64.rpm
-filesystem-1.1-7.cm1.x86_64.rpm
+filesystem-1.1-8.cm1.x86_64.rpm
 findutils-4.6.0-7.cm1.x86_64.rpm
 findutils-debuginfo-4.6.0-7.cm1.x86_64.rpm
 findutils-lang-4.6.0-7.cm1.x86_64.rpm
-flex-2.6.4-5.cm1.x86_64.rpm
+flex-2.6.4-6.cm1.x86_64.rpm
-flex-debuginfo-2.6.4-5.cm1.x86_64.rpm
+flex-debuginfo-2.6.4-6.cm1.x86_64.rpm
-flex-devel-2.6.4-5.cm1.x86_64.rpm
+flex-devel-2.6.4-6.cm1.x86_64.rpm
+fontconfig-2.13.1-4.cm1.x86_64.rpm
+fontconfig-debuginfo-2.13.1-4.cm1.x86_64.rpm
+fontconfig-devel-2.13.1-4.cm1.x86_64.rpm
 freetype-2.9.1-4.cm1.x86_64.rpm
 freetype-debuginfo-2.9.1-4.cm1.x86_64.rpm
 freetype-devel-2.9.1-4.cm1.x86_64.rpm
 gawk-4.2.1-3.cm1.x86_64.rpm
 gawk-debuginfo-4.2.1-3.cm1.x86_64.rpm
-gcc-9.1.0-7.cm1.x86_64.rpm
+gcc-9.1.0-8.cm1.x86_64.rpm
-gcc-debuginfo-9.1.0-7.cm1.x86_64.rpm
+gcc-c++-9.1.0-8.cm1.x86_64.rpm
+gcc-debuginfo-9.1.0-8.cm1.x86_64.rpm
 gdbm-1.18-3.cm1.x86_64.rpm
 gdbm-debuginfo-1.18-3.cm1.x86_64.rpm
 gdbm-devel-1.18-3.cm1.x86_64.rpm
 gdbm-lang-1.18-3.cm1.x86_64.rpm
-gettext-0.19.8.1-3.cm1.x86_64.rpm
+gettext-0.21-1.cm1.x86_64.rpm
-gettext-debuginfo-0.19.8.1-3.cm1.x86_64.rpm
+gettext-debuginfo-0.21-1.cm1.x86_64.rpm
-gfortran-9.1.0-7.cm1.x86_64.rpm
+gfortran-9.1.0-8.cm1.x86_64.rpm
-glib-2.58.0-6.cm1.x86_64.rpm
+glib-2.58.0-8.cm1.x86_64.rpm
-glibc-2.28-12.cm1.x86_64.rpm
+glibc-2.28-13.cm1.x86_64.rpm
-glibc-devel-2.28-12.cm1.x86_64.rpm
+glibc-devel-2.28-13.cm1.x86_64.rpm
-glibc-i18n-2.28-12.cm1.x86_64.rpm
+glibc-i18n-2.28-13.cm1.x86_64.rpm
-glibc-iconv-2.28-12.cm1.x86_64.rpm
+glibc-iconv-2.28-13.cm1.x86_64.rpm
-glibc-lang-2.28-12.cm1.x86_64.rpm
+glibc-lang-2.28-13.cm1.x86_64.rpm
-glibc-nscd-2.28-12.cm1.x86_64.rpm
+glibc-nscd-2.28-13.cm1.x86_64.rpm
-glibc-tools-2.28-12.cm1.x86_64.rpm
+glibc-tools-2.28-13.cm1.x86_64.rpm
-glib-debuginfo-2.58.0-6.cm1.x86_64.rpm
+glib-debuginfo-2.58.0-8.cm1.x86_64.rpm
-glib-devel-2.58.0-6.cm1.x86_64.rpm
+glib-devel-2.58.0-8.cm1.x86_64.rpm
-glib-schemas-2.58.0-6.cm1.x86_64.rpm
+glib-schemas-2.58.0-8.cm1.x86_64.rpm
 gmock-1.8.1-5.cm1.x86_64.rpm
 gmock-devel-1.8.1-5.cm1.x86_64.rpm
 gmock-static-1.8.1-5.cm1.x86_64.rpm
 gmp-6.1.2-5.cm1.x86_64.rpm
 gmp-debuginfo-6.1.2-5.cm1.x86_64.rpm
 gmp-devel-6.1.2-5.cm1.x86_64.rpm
-gnupg2-2.2.20-3.cm1.x86_64.rpm
+gnupg2-2.2.20-4.cm1.x86_64.rpm
-gnupg2-debuginfo-2.2.20-3.cm1.x86_64.rpm
+gnupg2-debuginfo-2.2.20-4.cm1.x86_64.rpm
 gperf-3.1-3.cm1.x86_64.rpm
 gperf-debuginfo-3.1-3.cm1.x86_64.rpm
 gpgme-1.13.1-5.cm1.x86_64.rpm
@@ -145,10 +151,10 @@ json-c-debuginfo-0.14-2.cm1.x86_64.rpm
 json-c-devel-0.14-2.cm1.x86_64.rpm
 kbd-2.0.4-5.cm1.x86_64.rpm
 kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm
-kernel-headers-5.4.51-2.cm1.noarch.rpm
+kernel-headers-5.4.51-3.cm1.noarch.rpm
-kmod-25-4.cm1.x86_64.rpm
+kmod-25-5.cm1.x86_64.rpm
-kmod-debuginfo-25-4.cm1.x86_64.rpm
+kmod-debuginfo-25-5.cm1.x86_64.rpm
-kmod-devel-25-4.cm1.x86_64.rpm
+kmod-devel-25-5.cm1.x86_64.rpm
 krb5-1.17-3.cm1.x86_64.rpm
 krb5-debuginfo-1.17-3.cm1.x86_64.rpm
 krb5-devel-1.17-3.cm1.x86_64.rpm
@@ -156,11 +162,11 @@ krb5-lang-1.17-3.cm1.x86_64.rpm
 libaio-0.3.112-2.cm1.x86_64.rpm
 libaio-debuginfo-0.3.112-2.cm1.x86_64.rpm
 libaio-devel-0.3.112-2.cm1.x86_64.rpm
-libarchive-3.4.2-2.cm1.x86_64.rpm
+libarchive-3.4.2-3.cm1.x86_64.rpm
-libarchive-debuginfo-3.4.2-2.cm1.x86_64.rpm
+libarchive-debuginfo-3.4.2-3.cm1.x86_64.rpm
-libarchive-devel-3.4.2-2.cm1.x86_64.rpm
+libarchive-devel-3.4.2-3.cm1.x86_64.rpm
-libassuan-2.5.1-3.cm1.x86_64.rpm
+libassuan-2.5.1-5.cm1.x86_64.rpm
-libassuan-debuginfo-2.5.1-3.cm1.x86_64.rpm
+libassuan-debuginfo-2.5.1-5.cm1.x86_64.rpm
 libcap-2.26-2.cm1.x86_64.rpm
 libcap-debuginfo-2.26-2.cm1.x86_64.rpm
 libcap-devel-2.26-2.cm1.x86_64.rpm
@@ -171,39 +177,41 @@ libdb-docs-5.3.28-4.cm1.x86_64.rpm
 libffi-3.2.1-10.cm1.x86_64.rpm
 libffi-debuginfo-3.2.1-10.cm1.x86_64.rpm
 libffi-devel-3.2.1-10.cm1.x86_64.rpm
-libgcc-9.1.0-7.cm1.x86_64.rpm
+libgcc-9.1.0-8.cm1.x86_64.rpm
-libgcc-atomic-9.1.0-7.cm1.x86_64.rpm
+libgcc-atomic-9.1.0-8.cm1.x86_64.rpm
-libgcc-devel-9.1.0-7.cm1.x86_64.rpm
+libgcc-devel-9.1.0-8.cm1.x86_64.rpm
 libgcrypt-1.8.3-4.cm1.x86_64.rpm
 libgcrypt-debuginfo-1.8.3-4.cm1.x86_64.rpm
 libgcrypt-devel-1.8.3-4.cm1.x86_64.rpm
-libgomp-9.1.0-7.cm1.x86_64.rpm
+libgomp-9.1.0-8.cm1.x86_64.rpm
-libgomp-devel-9.1.0-7.cm1.x86_64.rpm
+libgomp-devel-9.1.0-8.cm1.x86_64.rpm
-libgpg-error-1.32-4.cm1.x86_64.rpm
+libgpg-error-1.32-5.cm1.x86_64.rpm
-libgpg-error-debuginfo-1.32-4.cm1.x86_64.rpm
+libgpg-error-debuginfo-1.32-5.cm1.x86_64.rpm
-libgpg-error-devel-1.32-4.cm1.x86_64.rpm
+libgpg-error-devel-1.32-5.cm1.x86_64.rpm
-libgpg-error-lang-1.32-4.cm1.x86_64.rpm
+libgpg-error-lang-1.32-5.cm1.x86_64.rpm
-libksba-1.3.5-3.cm1.x86_64.rpm
+libksba-1.3.5-4.cm1.x86_64.rpm
-libksba-debuginfo-1.3.5-3.cm1.x86_64.rpm
+libksba-debuginfo-1.3.5-4.cm1.x86_64.rpm
-libltdl-2.4.6-5.cm1.x86_64.rpm
+libltdl-2.4.6-6.cm1.x86_64.rpm
-libltdl-devel-2.4.6-5.cm1.x86_64.rpm
+libltdl-devel-2.4.6-6.cm1.x86_64.rpm
-libmpc-1.1.0-5.cm1.x86_64.rpm
+libmpc-1.1.0-6.cm1.x86_64.rpm
-libmpc-debuginfo-1.1.0-5.cm1.x86_64.rpm
+libmpc-debuginfo-1.1.0-6.cm1.x86_64.rpm
 libpipeline-1.5.0-3.cm1.x86_64.rpm
 libpipeline-debuginfo-1.5.0-3.cm1.x86_64.rpm
 libpipeline-devel-1.5.0-3.cm1.x86_64.rpm
+libpkgconf-1.7.0-3.cm1.x86_64.rpm
+libpkgconf-devel-1.7.0-3.cm1.x86_64.rpm
 libpwquality-1.4.2-4.cm1.x86_64.rpm
 libpwquality-debuginfo-1.4.2-4.cm1.x86_64.rpm
 libpwquality-devel-1.4.2-4.cm1.x86_64.rpm
-libselinux-2.9-3.cm1.x86_64.rpm
+libselinux-2.9-4.cm1.x86_64.rpm
-libselinux-debuginfo-2.9-3.cm1.x86_64.rpm
+libselinux-debuginfo-2.9-4.cm1.x86_64.rpm
-libselinux-devel-2.9-3.cm1.x86_64.rpm
+libselinux-devel-2.9-4.cm1.x86_64.rpm
-libselinux-python-2.9-3.cm1.x86_64.rpm
+libselinux-python-2.9-4.cm1.x86_64.rpm
-libselinux-python3-2.9-3.cm1.x86_64.rpm
+libselinux-python3-2.9-4.cm1.x86_64.rpm
-libselinux-utils-2.9-3.cm1.x86_64.rpm
+libselinux-utils-2.9-4.cm1.x86_64.rpm
-libsepol-2.9-5.cm1.x86_64.rpm
+libsepol-2.9-6.cm1.x86_64.rpm
-libsepol-debuginfo-2.9-5.cm1.x86_64.rpm
+libsepol-debuginfo-2.9-6.cm1.x86_64.rpm
-libsepol-devel-2.9-5.cm1.x86_64.rpm
+libsepol-devel-2.9-6.cm1.x86_64.rpm
 libsolv-0.7.7-4.cm1.x86_64.rpm
 libsolv-debuginfo-0.7.7-4.cm1.x86_64.rpm
 libsolv-devel-0.7.7-4.cm1.x86_64.rpm
@@ -211,13 +219,13 @@ libsolv-tools-0.7.7-4.cm1.x86_64.rpm
 libssh2-1.9.0-1.cm1.x86_64.rpm
 libssh2-debuginfo-1.9.0-1.cm1.x86_64.rpm
 libssh2-devel-1.9.0-1.cm1.x86_64.rpm
-libstdc++-9.1.0-7.cm1.x86_64.rpm
+libstdc++-9.1.0-8.cm1.x86_64.rpm
-libstdc++-devel-9.1.0-7.cm1.x86_64.rpm
+libstdc++-devel-9.1.0-8.cm1.x86_64.rpm
 libtasn1-4.14-2.cm1.x86_64.rpm
 libtasn1-debuginfo-4.14-2.cm1.x86_64.rpm
 libtasn1-devel-4.14-2.cm1.x86_64.rpm
-libtool-2.4.6-5.cm1.x86_64.rpm
+libtool-2.4.6-6.cm1.x86_64.rpm
-libtool-debuginfo-2.4.6-5.cm1.x86_64.rpm
+libtool-debuginfo-2.4.6-6.cm1.x86_64.rpm
 libxml2-2.9.10-2.cm1.x86_64.rpm
 libxml2-debuginfo-2.9.10-2.cm1.x86_64.rpm
 libxml2-devel-2.9.10-2.cm1.x86_64.rpm
@@ -225,9 +233,11 @@ libxml2-python-2.9.10-2.cm1.x86_64.rpm
 libxslt-1.1.34-2.cm1.x86_64.rpm
 libxslt-debuginfo-1.1.34-2.cm1.x86_64.rpm
 libxslt-devel-1.1.34-2.cm1.x86_64.rpm
-lua-5.3.5-6.cm1.x86_64.rpm
+lua-5.3.5-9.cm1.x86_64.rpm
-lua-debuginfo-5.3.5-6.cm1.x86_64.rpm
+lua-debuginfo-5.3.5-9.cm1.x86_64.rpm
-lua-devel-5.3.5-6.cm1.x86_64.rpm
+lua-devel-5.3.5-9.cm1.x86_64.rpm
+lua-libs-5.3.5-9.cm1.x86_64.rpm
+lua-static-5.3.5-9.cm1.x86_64.rpm
 lvm2-2.03.05-5.cm1.x86_64.rpm
 lvm2-debuginfo-2.03.05-5.cm1.x86_64.rpm
 lvm2-devel-2.03.05-5.cm1.x86_64.rpm
@@ -236,10 +246,11 @@ m4-1.4.18-4.cm1.x86_64.rpm
 m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
 make-4.2.1-4.cm1.x86_64.rpm
 make-debuginfo-4.2.1-4.cm1.x86_64.rpm
-mariner-check-macros-1.0-3.cm1.noarch.rpm
+mariner-check-macros-1.0-6.cm1.noarch.rpm
+mariner-python-macros-1.0-6.cm1.noarch.rpm
 mariner-release-1.0-9.cm1.noarch.rpm
 mariner-repos-1.0-9.cm1.noarch.rpm
-mariner-rpm-macros-1.0-3.cm1.noarch.rpm
+mariner-rpm-macros-1.0-6.cm1.noarch.rpm
 meson-0.49.2-1.cm1.noarch.rpm
 mpfr-4.0.1-3.cm1.x86_64.rpm
 mpfr-debuginfo-4.0.1-3.cm1.x86_64.rpm
@@ -258,16 +269,16 @@ npth-devel-1.6-3.cm1.x86_64.rpm
 nspr-4.21-2.cm1.x86_64.rpm
 nspr-debuginfo-4.21-2.cm1.x86_64.rpm
 nspr-devel-4.21-2.cm1.x86_64.rpm
-nss-3.44-2.cm1.x86_64.rpm
+nss-3.44-3.cm1.x86_64.rpm
-nss-debuginfo-3.44-2.cm1.x86_64.rpm
+nss-debuginfo-3.44-3.cm1.x86_64.rpm
-nss-devel-3.44-2.cm1.x86_64.rpm
+nss-devel-3.44-3.cm1.x86_64.rpm
-nss-libs-3.44-2.cm1.x86_64.rpm
+nss-libs-3.44-3.cm1.x86_64.rpm
-openjdk8-1.8.0.212-10.cm1.x86_64.rpm
+openjdk8-1.8.0.212-11.cm1.x86_64.rpm
-openjdk8-debuginfo-1.8.0.212-10.cm1.x86_64.rpm
+openjdk8-debuginfo-1.8.0.212-11.cm1.x86_64.rpm
-openjdk8-doc-1.8.0.212-10.cm1.x86_64.rpm
+openjdk8-doc-1.8.0.212-11.cm1.x86_64.rpm
-openjdk8-sample-1.8.0.212-10.cm1.x86_64.rpm
+openjdk8-sample-1.8.0.212-11.cm1.x86_64.rpm
-openjdk8-src-1.8.0.212-10.cm1.x86_64.rpm
+openjdk8-src-1.8.0.212-11.cm1.x86_64.rpm
-openjre8-1.8.0.212-10.cm1.x86_64.rpm
+openjre8-1.8.0.212-11.cm1.x86_64.rpm
 openssl-1.1.1g-6.cm1.x86_64.rpm
 openssl-debuginfo-1.1.1g-6.cm1.x86_64.rpm
 openssl-devel-1.1.1g-6.cm1.x86_64.rpm
@@ -289,43 +300,55 @@ pcre-8.42-4.cm1.x86_64.rpm
 pcre-debuginfo-8.42-4.cm1.x86_64.rpm
 pcre-devel-8.42-4.cm1.x86_64.rpm
 pcre-libs-8.42-4.cm1.x86_64.rpm
-perl-5.30.3-1.cm1.x86_64.rpm
+perl-5.30.3-3.cm1.x86_64.rpm
 perl-DBD-SQLite-1.62-3.cm1.x86_64.rpm
 perl-DBD-SQLite-debuginfo-1.62-3.cm1.x86_64.rpm
 perl-DBI-1.641-3.cm1.x86_64.rpm
 perl-DBI-debuginfo-1.641-3.cm1.x86_64.rpm
 perl-DBIx-Simple-1.37-2.cm1.noarch.rpm
+perl-debuginfo-5.30.3-3.cm1.x86_64.rpm
+perl-libintl-perl-1.29-4.cm1.x86_64.rpm
+perl-libintl-perl-debuginfo-1.29-4.cm1.x86_64.rpm
 perl-Object-Accessor-0.48-6.cm1.noarch.rpm
 perl-Test-Warnings-0.028-3.cm1.noarch.rpm
 perl-Text-Template-1.51-2.cm1.noarch.rpm
 perl-XML-Parser-2.44-10.cm1.x86_64.rpm
 perl-XML-Parser-debuginfo-2.44-10.cm1.x86_64.rpm
-perl-debuginfo-5.30.3-1.cm1.x86_64.rpm
-perl-libintl-perl-1.29-4.cm1.x86_64.rpm
-perl-libintl-perl-debuginfo-1.29-4.cm1.x86_64.rpm
 pinentry-1.1.0-3.cm1.x86_64.rpm
 pinentry-debuginfo-1.1.0-3.cm1.x86_64.rpm
-pkg-config-0.29.2-4.cm1.x86_64.rpm
+pkgconf-1.7.0-3.cm1.x86_64.rpm
-pkg-config-debuginfo-0.29.2-4.cm1.x86_64.rpm
+pkgconf-debuginfo-1.7.0-3.cm1.x86_64.rpm
+pkgconf-m4-1.7.0-3.cm1.noarch.rpm
+pkgconf-pkg-config-1.7.0-3.cm1.x86_64.rpm
 popt-1.16-7.cm1.x86_64.rpm
 popt-debuginfo-1.16-7.cm1.x86_64.rpm
 popt-devel-1.16-7.cm1.x86_64.rpm
 popt-lang-1.16-7.cm1.x86_64.rpm
-procps-ng-3.3.15-3.cm1.x86_64.rpm
+procps-ng-3.3.15-4.cm1.x86_64.rpm
-procps-ng-debuginfo-3.3.15-3.cm1.x86_64.rpm
+procps-ng-debuginfo-3.3.15-4.cm1.x86_64.rpm
-procps-ng-devel-3.3.15-3.cm1.x86_64.rpm
+procps-ng-devel-3.3.15-4.cm1.x86_64.rpm
-procps-ng-lang-3.3.15-3.cm1.x86_64.rpm
+procps-ng-lang-3.3.15-4.cm1.x86_64.rpm
 python2-2.7.18-3.cm1.x86_64.rpm
 python2-debuginfo-2.7.18-3.cm1.x86_64.rpm
 python2-devel-2.7.18-3.cm1.x86_64.rpm
 python2-libs-2.7.18-3.cm1.x86_64.rpm
 python2-test-2.7.18-3.cm1.x86_64.rpm
 python2-tools-2.7.18-3.cm1.x86_64.rpm
+python3-3.7.7-4.cm1.x86_64.rpm
 python3-cracklib-2.9.7-2.cm1.x86_64.rpm
+python3-curses-3.7.7-4.cm1.x86_64.rpm
+python3-debuginfo-3.7.7-4.cm1.x86_64.rpm
+python3-devel-3.7.7-4.cm1.x86_64.rpm
 python3-gpg-1.13.1-5.cm1.x86_64.rpm
+python3-libs-3.7.7-4.cm1.x86_64.rpm
 python3-libxml2-2.9.10-2.cm1.x86_64.rpm
+python3-pip-3.7.7-4.cm1.noarch.rpm
 python3-pwquality-1.4.2-4.cm1.x86_64.rpm
 python3-rpm-4.14.2-10.cm1.x86_64.rpm
+python3-setuptools-3.7.7-4.cm1.noarch.rpm
+python3-test-3.7.7-4.cm1.x86_64.rpm
+python3-tools-3.7.7-4.cm1.x86_64.rpm
+python3-xml-3.7.7-4.cm1.x86_64.rpm
 python-curses-2.7.18-3.cm1.x86_64.rpm
 python-gpg-1.13.1-5.cm1.x86_64.rpm
 python-rpm-4.14.2-10.cm1.x86_64.rpm
@@ -367,30 +390,30 @@ tdnf-debuginfo-2.1.0-4.cm1.x86_64.rpm
 tdnf-devel-2.1.0-4.cm1.x86_64.rpm
 tdnf-plugin-repogpgcheck-2.1.0-4.cm1.x86_64.rpm
 tdnf-python-2.1.0-4.cm1.x86_64.rpm
-texinfo-6.5-7.cm1.x86_64.rpm
+texinfo-6.5-8.cm1.x86_64.rpm
-texinfo-debuginfo-6.5-7.cm1.x86_64.rpm
+texinfo-debuginfo-6.5-8.cm1.x86_64.rpm
 unzip-6.0-15.cm1.x86_64.rpm
 unzip-debuginfo-6.0-15.cm1.x86_64.rpm
-util-linux-2.32.1-3.cm1.x86_64.rpm
+util-linux-2.32.1-4.cm1.x86_64.rpm
-util-linux-debuginfo-2.32.1-3.cm1.x86_64.rpm
+util-linux-debuginfo-2.32.1-4.cm1.x86_64.rpm
-util-linux-devel-2.32.1-3.cm1.x86_64.rpm
+util-linux-devel-2.32.1-4.cm1.x86_64.rpm
-util-linux-lang-2.32.1-3.cm1.x86_64.rpm
+util-linux-lang-2.32.1-4.cm1.x86_64.rpm
-util-linux-libs-2.32.1-3.cm1.x86_64.rpm
+util-linux-libs-2.32.1-4.cm1.x86_64.rpm
 veritysetup-2.3.3-2.cm1.x86_64.rpm
 wget-1.20.3-1.cm1.x86_64.rpm
 wget-debuginfo-1.20.3-1.cm1.x86_64.rpm
 which-2.21-7.cm1.x86_64.rpm
 which-debuginfo-2.21-7.cm1.x86_64.rpm
-xz-5.2.4-3.cm1.x86_64.rpm
+xz-5.2.4-4.cm1.x86_64.rpm
-xz-debuginfo-5.2.4-3.cm1.x86_64.rpm
+xz-debuginfo-5.2.4-4.cm1.x86_64.rpm
-xz-devel-5.2.4-3.cm1.x86_64.rpm
+xz-devel-5.2.4-4.cm1.x86_64.rpm
-xz-lang-5.2.4-3.cm1.x86_64.rpm
+xz-lang-5.2.4-4.cm1.x86_64.rpm
-xz-libs-5.2.4-3.cm1.x86_64.rpm
+xz-libs-5.2.4-4.cm1.x86_64.rpm
 zip-3.0-5.cm1.x86_64.rpm
 zip-debuginfo-3.0-5.cm1.x86_64.rpm
-zlib-1.2.11-3.cm1.x86_64.rpm
+zlib-1.2.11-4.cm1.x86_64.rpm
-zlib-debuginfo-1.2.11-3.cm1.x86_64.rpm
+zlib-debuginfo-1.2.11-4.cm1.x86_64.rpm
-zlib-devel-1.2.11-3.cm1.x86_64.rpm
+zlib-devel-1.2.11-4.cm1.x86_64.rpm
 zstd-1.4.4-1.cm1.x86_64.rpm
 zstd-debuginfo-1.4.4-1.cm1.x86_64.rpm
 zstd-devel-1.4.4-1.cm1.x86_64.rpm

toolkit/resources/manifests/package/update_manifests.sh

@@ -45,7 +45,8 @@ remove_packages_for_pkggen_core () {
     sed -i '/ca-certificates-legacy/d' $TmpPkgGen
     sed -i '/ca-certificates-microsoft/d' $TmpPkgGen
     sed -i '/libtasn1-d/d' $TmpPkgGen
-    sed -i '/libffi-d/d' $TmpPkgGen
+    sed -i '/libpkgconf-devel/d' $TmpPkgGen
+    sed -i '/lua-static/d' $TmpPkgGen
     sed -i '/p11-kit-d/d' $TmpPkgGen
     sed -i '/p11-kit-server/d' $TmpPkgGen
     sed -i '/^check/d' $TmpPkgGen
@@ -85,9 +86,18 @@ remove_packages_for_pkggen_core () {
     sed -i '/perl-Object-Accessor/d' $TmpPkgGen
     sed -i '/perl-Test-Warnings/d' $TmpPkgGen
     sed -i '/perl-Text-Template/d' $TmpPkgGen
-    sed -i '/python/d' $TmpPkgGen
+    sed -i '/python2-test/d' $TmpPkgGen
+    sed -i '/python2-tools/d' $TmpPkgGen
+    sed -i '/python3-curses/d' $TmpPkgGen
+    sed -i '/python3-gpg/d' $TmpPkgGen
+    sed -i '/python3-libxml2/d' $TmpPkgGen
+    sed -i '/python3-pip/d' $TmpPkgGen
+    sed -i '/python3-pwquality/d' $TmpPkgGen
+    sed -i '/python3-rpm/d' $TmpPkgGen
+    sed -i '/python3-test/d' $TmpPkgGen
+    sed -i '/python3-tools/d' $TmpPkgGen
     sed -i '/shadow/d' $TmpPkgGen
-    sed -i '/unzip/d' $TmpPkgGen
+    sed -i '/tdnf-python/d' $TmpPkgGen
     sed -i '/util-linux-lang/d' $TmpPkgGen
     sed -i '/wget/d' $TmpPkgGen
     sed -i '/which/d' $TmpPkgGen
@@ -112,7 +122,8 @@ generate_pkggen_core () {
     cat $TmpPkgGen | grep "^libstdc++-" >> $1
     cat $TmpPkgGen | grep "^libgomp-" >> $1
     cat $TmpPkgGen | grep "^gcc-" >> $1
-    cat $TmpPkgGen | grep "^pkg-config-" >> $1
+    cat $TmpPkgGen | grep "^libpkgconf-" >> $1
+    cat $TmpPkgGen | grep "^pkgconf-" >> $1
     cat $TmpPkgGen | grep "^ncurses-" >> $1
     cat $TmpPkgGen | grep "^readline-" >> $1
     cat $TmpPkgGen | grep "^coreutils-" >> $1
@@ -167,6 +178,7 @@ generate_pkggen_core () {
     cat $TmpPkgGen | grep "^krb5-" >> $1
     cat $TmpPkgGen | grep "^lua-" >> $1
     cat $TmpPkgGen | grep "^mariner-rpm-macros-" >> $1
+    cat $TmpPkgGen | grep "^mariner-python-macros-" >> $1
     cat $TmpPkgGen | grep "^mariner-check-" >> $1
     cat $TmpPkgGen | grep "^libassuan-" >> $1
     cat $TmpPkgGen | grep "^libgpg-error-" >> $1
@@ -183,6 +195,12 @@ generate_pkggen_core () {
     cat $TmpPkgGen | grep "^ca-certificates-shared-" >> $1
     cat $TmpPkgGen | grep "^ca-certificates-tools-" >> $1
     cat $TmpPkgGen | grep "^ca-certificates-base-" >> $1
+    cat $TmpPkgGen | grep "^dwz-" >> $1
+    cat $TmpPkgGen | grep "^unzip-" >> $1
+    cat $TmpPkgGen | grep "^libffi-" >> $1
+    cat $TmpPkgGen | grep "^python2-" >> $1
+    cat $TmpPkgGen | grep "^python-xml-" >> $1
+    cat $TmpPkgGen | grep "^python3-" >> $1
 }
 
 # Generate toolchain_*.txt based on the toolchain_built_rpms_all.tar.gz file contents

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

@@ -170,7 +170,8 @@ build_rpm_in_chroot_no_install () {
     else
         echo only building RPM $1 within the chroot
         specPath=$(find $SPECROOT -name "$1.spec" -print -quit)
-        srpmName=$(rpmspec -q $specPath --srpm --define="with_check 1" --define="dist $PARAM_DIST_TAG" --queryformat %{NAME}-%{VERSION}-%{RELEASE}.src.rpm)
+        specDir=$(dirname $specPath)
+        srpmName=$(rpmspec -q $specPath --srpm --define="with_check 1" --define="_sourcedir $specDir" --define="dist $PARAM_DIST_TAG" --queryformat %{NAME}-%{VERSION}-%{RELEASE}.src.rpm)
         srpmPath=$MARINER_INPUT_SRPMS_DIR/$srpmName
         cp $srpmPath $CHROOT_SRPMS_DIR
         chroot_and_run_rpmbuild $srpmName 2>&1 | tee $TOOLCHAIN_LOGS/$1.txt
@@ -215,7 +216,6 @@ build_rpm_in_chroot_no_install gmp
 build_rpm_in_chroot_no_install mpfr
 build_rpm_in_chroot_no_install libmpc
 build_rpm_in_chroot_no_install gcc
-build_rpm_in_chroot_no_install pkg-config
 build_rpm_in_chroot_no_install ncurses
 build_rpm_in_chroot_no_install readline
 build_rpm_in_chroot_no_install bash
@@ -265,6 +265,12 @@ build_rpm_in_chroot_no_install perl-DBIx-Simple
 build_rpm_in_chroot_no_install elfutils
 build_rpm_in_chroot_no_install automake
 
+build_rpm_in_chroot_no_install pkgconf
+
+# Need to install elfutils to build dwz
+chroot_and_install_rpms elfutils
+build_rpm_in_chroot_no_install dwz
+
 # Need to install perl-Text-Template and perl-Test-Warnings
 # to build openssl
 build_rpm_in_chroot_no_install perl-Test-Warnings
@@ -287,6 +293,28 @@ build_rpm_in_chroot_no_install unzip
 chroot_and_install_rpms unzip
 build_rpm_in_chroot_no_install alsa-lib
 chroot_and_install_rpms alsa-lib
+build_rpm_in_chroot_no_install gperf
+chroot_and_install_rpms gperf
+
+# Python2 needs to be installed for RPM and openjdk's dependencies to build
+build_rpm_in_chroot_no_install python2
+rm -vf $FINISHED_RPM_DIR/python2*debuginfo*.rpm
+chroot_and_install_rpms python2
+
+# Python3 needs to be installed for RPM to build
+build_rpm_in_chroot_no_install python3
+rm -vf $FINISHED_RPM_DIR/python3*debuginfo*.rpm
+chroot_and_install_rpms python3
+
+
+# openjdk needs fontconfig to build, which needs libxml
+build_rpm_in_chroot_no_install libxml2
+chroot_and_install_rpms libxml2
+chroot_and_install_rpms expat
+chroot_and_install_rpms freetype
+build_rpm_in_chroot_no_install fontconfig
+chroot_and_install_rpms fontconfig
+
 
 # Build OpenJDK and OpenJRE
 echo Java bootstrap version:
@@ -307,11 +335,6 @@ chroot_and_install_rpms openjdk8
 cp -v $CHROOT_RPMS_DIR_ARCH/openjre8* $FINISHED_RPM_DIR
 chroot_and_install_rpms openjre8
 
-# Python2 needs to be installed for RPM to build
-build_rpm_in_chroot_no_install python2
-rm -vf $FINISHED_RPM_DIR/python2*debuginfo*.rpm
-chroot_and_install_rpms python2
-
 # Lua needs to be installed for RPM to build
 build_rpm_in_chroot_no_install lua
 chroot_and_install_rpms lua
@@ -324,7 +347,6 @@ build_rpm_in_chroot_no_install kmod
 build_rpm_in_chroot_no_install perl-XML-Parser
 build_rpm_in_chroot_no_install libssh2
 build_rpm_in_chroot_no_install perl-libintl-perl
-build_rpm_in_chroot_no_install gperf
 build_rpm_in_chroot_no_install python-setuptools
 build_rpm_in_chroot_no_install libgpg-error
 
@@ -346,7 +368,6 @@ build_rpm_in_chroot_no_install krb5
 # curl needs libssh2
 chroot_and_install_rpms libssh2
 build_rpm_in_chroot_no_install curl
-build_rpm_in_chroot_no_install libxml2
 
 # cracklib needs python-setuptools
 chroot_and_install_rpms python-setuptools
@@ -356,8 +377,7 @@ build_rpm_in_chroot_no_install cmake
 build_rpm_in_chroot_no_install pam
 build_rpm_in_chroot_no_install docbook-dtd-xml
 
-# libxslt needs libxml2, libgcrypt
+# libxslt needs libgcrypt
-chroot_and_install_rpms libxml2
 chroot_and_install_rpms libgcrypt
 build_rpm_in_chroot_no_install libxslt
 
@@ -477,9 +497,8 @@ chroot_and_install_rpms libpwquality
 chroot_and_install_rpms json-c
 build_rpm_in_chroot_no_install cryptsetup
 
-# systemd needs intltool, gperf, util-linux
+# systemd needs intltool, util-linux
 chroot_and_install_rpms intltool
-chroot_and_install_rpms gperf
 chroot_and_install_rpms cryptsetup
 build_rpm_in_chroot_no_install systemd