Merge branch 'dev' into jslobodzian/merge-dev-to-main-rpm-upgrade

SPECS/LICENSES-AND-NOTICES/data/licenses.json

@@ -275,6 +275,7 @@
                 "cloud-init-vmware-guestinfo",
                 "coredns-1.6.7",
                 "coredns-1.7.0",
+                "debugedit",
                 "dejavu-fonts",
                 "distroless-packages",
                 "dtc",

SPECS/apr-util/apr-util.spec

@@ -3,7 +3,7 @@
 Summary:        The Apache Portable Runtime Utility Library
 Name:           apr-util
 Version:        1.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -25,7 +25,9 @@ The Apache Portable Runtime Utility Library.
 
 %package bdb
 Summary:        APR utility library Berkeley DB driver
+BuildRequires:  libdb-devel
 Requires:       %{name} = %{version}-%{release}
+Requires:       libdb
 
 %description bdb
 This package provides the Berkeley DB driver for the apr-util
@@ -184,6 +186,9 @@ This package provides the SQLite driver for the apr-util DBD
 %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
 
 %changelog
+* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 1.6.1-6
+- Add libdb dependencies to berkleydb subpackage.
+
 * Tue Aug 24 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.6.1-5
 - Added support for more databases: BDB, ODBC, MySQL.
 - Split out the "*-openssl" subpackage.

SPECS/binutils/binutils.spec

@@ -1,7 +1,7 @@
 Summary:        Contains a linker, an assembler, and other tools
 Name:           binutils
 Version:        2.37
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -12,6 +12,7 @@ Source0:        https://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.xz
 Patch0:         export-demangle-header.patch
 # Patch1 Source https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=6b86da53d5ee2022b9065f445d23356190380746
 Patch1:         linker-script-readonly-keyword-support.patch
+Patch2:         thin_archive_descriptor.patch
 Provides:       bundled(libiberty)
 
 %description
@@ -127,6 +128,9 @@ sed -i 's/testsuite/ /g' gold/Makefile
 %{_libdir}/libopcodes.so
 
 %changelog
+* Fri Dec 03 2021 Andrew Phelps <anphel@microsoft.com> - 2.37-2
+- Add thin_archive_descriptor.patch to fix nodejs build issue
+
 * Thu Nov 04 2021 Andrew Phelps <anphel@microsoft.com> - 2.37-1
 - Update version to 2.37
 - Update export-demangle-header.patch

SPECS/binutils/thin_archive_descriptor.patch

@@ -0,0 +1,32 @@
+Close the thin archive file descriptor since it can't be used directly
+to access archive members.  This avoids running out of file descriptors
+on thin archives with many archive members.
+
+	PR ld/28138
+	* plugin.c (bfd_plugin_close_file_descriptor): Close the thin
+	archive file descriptor.
+---
+ bfd/plugin.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..066c96581a2 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ 	     && !bfd_is_thin_archive (abfd->my_archive))
+ 	abfd = abfd->my_archive;
+ 
++      /* Close the thin archive file descriptor since it can't be used
++         directly to access archive members.  */
++      if (abfd->my_archive && bfd_is_thin_archive (abfd->my_archive))
++	{
++	  close (fd);
++	  return;
++	}
++
+       abfd->archive_plugin_fd_open_count--;
+       /* Dup the archive plugin file descriptor for later use, which
+ 	 will be closed by _bfd_archive_close_and_cleanup.  */
+-- 
+2.31.1

SPECS/bond/bond.spec

@@ -1,7 +1,7 @@
 Summary:        Microsoft Bond Library
 Name:           bond
 Version:        8.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -32,6 +32,7 @@ Development files for %{name}
 
 %prep
 %setup -q
+chmod u+x %{SOURCE1} %{SOURCE2}
 
 %build
 CMAKE_OPTS="\
@@ -50,11 +51,11 @@ CMAKE_OPTS="\
 mkdir -v build
 cd build
 cmake $CMAKE_OPTS ..
-make %{?_smp_mflags}
+%make_build
 
 %install
 cd build
-make DESTDIR=%{buildroot} install
+%make_install
 chmod 0755 %{buildroot}%{_bindir}/gbc
 
 %files
@@ -67,16 +68,19 @@ chmod 0755 %{buildroot}%{_bindir}/gbc
 %{_libdir}/%{name}/*
 
 %changelog
+* Tue Nov 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.0.1-5
+- Updating package build steps.
+
 * Tue Oct 27 2020 Joe Schmitt <joschmit@microsoft.com> - 8.0.1-4
 - Include all sources regardless of architecture.
 
-*   Mon Oct 19 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 8.0.1-3
--   License verified.
--   Added source URL.
--   Added 'Vendor' and 'Distribution' tags.
+* Mon Oct 19 2020 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.0.1-3
+- License verified.
+- Added source URL.
+- Added 'Vendor' and 'Distribution' tags.
 
-*   Tue May 19 2020 Jonathan Chiu <jochi@microsoft.com> 8.0.1-2
--   Add aarch64 support
+* Tue May 19 2020 Jonathan Chiu <jochi@microsoft.com> - 8.0.1-2
+- Add aarch64 support
 
-*   Mon Apr 06 2020 Jonathan Chiu <jochi@microsoft.com> 8.0.1-1
--   Original version for CBL-Mariner.
+* Mon Apr 06 2020 Jonathan Chiu <jochi@microsoft.com> - 8.0.1-1
+- Original version for CBL-Mariner.

SPECS/boringssl/boringssl.spec

@@ -22,7 +22,7 @@
 Summary:        An SSL/TLS protocol implementation
 Name:           boringssl
 Version:        20200921
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        OpenSSL
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -108,7 +108,7 @@ find %{buildroot}%{src_install_dir} -type f \( -name "*.a" -o -name "*.lib" -o -
 find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec chmod +x "{}" +
 # Fix env-script-interpreter error.
 find %{buildroot}%{src_install_dir} -type f -name "*.pl" -exec sed -i 's|#!.*/usr/bin/env perl|#!%{_bindir}/perl|' "{}" +
-find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*/usr/bin/env python.*|#!%[_bindir]/python3|' "{}" +
+find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*/usr/bin/env python.*|#!%{_bindir}/python3|' "{}" +
 find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*/usr/bin/env bash|#!/bin/bash|' "{}" +
 
 # To avoid conflicts with openssl development files, change all includes from
@@ -137,6 +137,10 @@ find src/include/openssl -type f -execdir install -D -m0644 "{}" "%{buildroot}%{
 %{src_install_dir}
 
 %changelog
+
+* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 20200921-3
+- Unify macro syntax used in the spec.
+
 * Tue Oct 12 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 20200921-2
 - Switching to using a single digit for the 'Release' tag.
 
@@ -146,7 +150,7 @@ find src/include/openssl -type f -execdir install -D -m0644 "{}" "%{buildroot}%{
 - Fix Source URL
 - Change build requirement from ninja to ninja-build
 - Modify location of shared library files
-- Add _binaries_in_noarch_packages_terminate_build definition to resolve arch dependent binary error 
+- Add _binaries_in_noarch_packages_terminate_build definition to resolve arch dependent binary error
 - Remove unsupported architectures in CBL-Mariner from ExclusiveArch list
 
 * Mon May 17 2021 mrostecki@suse.com

SPECS/cyrus-sasl/cyrus-sasl.spec

@@ -4,7 +4,7 @@
 Summary:        Cyrus Simple Authentication Service Layer (SASL) library
 Name:           cyrus-sasl
 Version:        2.1.27
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        BSD with advertising
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -25,12 +25,14 @@ BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  postgresql-libs
 BuildRequires:  systemd
+BuildRequires:  libdb-devel
 
 Requires:       %{name}-lib = %{version}-%{release}
 Requires:       krb5 >= 1.12
 Requires:       openssl
 Requires:       pam
 Requires:       systemd
+Requires:       libdb
 
 %description
 The Cyrus SASL package contains a Simple Authentication and Security
@@ -308,6 +310,9 @@ make %{?_smp_mflags} check
 %{_plugindir2}/libsql.so.%{_soversion}*
 
 %changelog
+* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 2.1.27-10
+- Add libdb as an explicit dependency.
+
 * Tue Sep 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.27-9
 - Introduced following subpackages using Fedora 32 (license: MIT) specs as guidance:
   - cyrus-sasl-gs2,

SPECS/debugedit/debugedit.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "debugedit-5.0.tar.xz": "e9ecd7d350bebae1f178ce6776ca19a648b6fe8fa22f5b3044b38d7899aa553e"
+ }
+}

SPECS/debugedit/debugedit.spec

@@ -0,0 +1,36 @@
+Summary:      Debugedit - obtain debug information from binaries.
+Name:         debugedit
+Version:      5.0
+Release:      1%{?dist}
+License:      GPLv3+
+URL:          https://sourceware.org/debugedit/
+Vendor:       Microsoft Corporation
+Distribution: Mariner
+Source0:      https://sourceware.org/ftp/%{name}/%{version}/%{name}-%{version}.tar.xz
+
+%description
+%{summary}
+
+%prep
+%autosetup
+
+%build
+%configure
+%make_build
+
+%install
+%make_install
+
+%check
+%make_build_check
+
+%files
+%defattr(-,root,root)
+%license COPYING3
+%{_bindir}/*
+%{_mandir}/*/*
+
+%changelog
+* Fri Oct 08 2021 Mateusz Malisz <mamalisz@microsoft.com> 5.0-1
+- Original version for CBL-Mariner
+- License verified

SPECS/httpd/httpd.spec

@@ -3,7 +3,7 @@
 Summary:        The Apache HTTP Server
 Name:           httpd
 Version:        2.4.46
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -39,6 +39,7 @@ BuildRequires:  apr
 BuildRequires:  apr-util
 BuildRequires:  apr-util-devel
 BuildRequires:  expat-devel
+BuildRequires:  libdb-devel
 BuildRequires:  lua-devel
 BuildRequires:  openldap
 BuildRequires:  openssl
@@ -47,6 +48,7 @@ BuildRequires:  pcre-devel
 BuildRequires:  systemd-rpm-macros
 
 Requires:       apr-util
+Requires:       libdb
 Requires:       lua
 Requires:       openldap
 Requires:       openssl
@@ -348,6 +350,9 @@ fi
 %{_libexecdir}/httpd-ssl-pass-dialog
 
 %changelog
+* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 2.4.46-10
+- Add explicit requires for libdb.
+
 * Wed Sep 29 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.4.46-9
 - Added missing BR on "systemd-rpm-macros".
 

SPECS/kernel/kernel.spec

@@ -561,7 +561,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %files tools
 %defattr(-,root,root)
 %{_libexecdir}
-%exclude %{_libdir}/debug
 %ifarch x86_64
 %{_lib64dir}/traceevent
 %endif

SPECS/libserf/libserf.spec

@@ -1,7 +1,7 @@
 Summary:        A high performance C-based HTTP client library built upon the Apache Portable Runtime (APR) library
 Name:           libserf
 Version:        1.3.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        ASL 2.0
 URL:            https://serf.apache.org/
 Group:          System Environment/Libraries
@@ -11,9 +11,11 @@ Source0:        https://www.apache.org/dist/serf/serf-%{version}.tar.bz2
 Requires:       openldap
 BuildRequires:  apr-devel
 BuildRequires:  apr-util-devel
+BuildRequires:  libdb-devel
 BuildRequires:  scons
 BuildRequires:  openssl-devel
 BuildRequires:  openldap
+Requires:       libdb
 
 %description
 The Apache Serf library is a C-based HTTP client library built upon the Apache
@@ -70,9 +72,11 @@ scons check
 
 
 %changelog
+*   Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> 1.3.9-7
+-   Add libdb as an explicit requires.
+
 *   Tue May 04 2021 Nicolas Ontiveros <niontive@microsoft.com> 1.3.9-6
 -   Disable test_ssl_handshake
-
 *   Mon Dec 07 2020 Andrew Phelps <anphel@microsoft.com> 1.3.9-5
 -   Fix check tests.
 *   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.3.9-4

SPECS/libsolv/libsolv.spec

@@ -1,7 +1,7 @@
 Summary:        A free package dependency solver
 Name:           libsolv
 Version:        0.7.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 URL:            https://github.com/openSUSE/libsolv
 Source0:        https://github.com/openSUSE/libsolv/archive/%{version}/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@ Distribution:   Mariner
 BuildRequires:  cmake
 BuildRequires:  rpm-devel
 Requires:       expat-libs
-Requires:       libdb
 
 %description
 Libsolv is a free package management library, using SAT technology to solve requests.
@@ -77,49 +76,71 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_mandir}/man1/*
 
 %changelog
-* Tue Aug 14 2021 Thomas Crain <thcrain@microsoft.com> - 0.7.7-5
+* Tue Oct 19 2021 Jon Slobodzian <joslobo@microsoft.com> - 0.7.19-2
+- RPM no longer requires libdb, so remove dependency from libsolv
+
+* Tue Aug 14 2021 Thomas Crain <thcrain@microsoft.com> - 0.7.19-1
 - Upgrade to latest upstream
 - Install files to %%{_libdir} instead of %%{_lib64dir}
 - Lint spec
 
 *   Thu Jun 11 2020 Joe Schmitt <joschmit@microsoft.com> 0.7.7-4
 -   Add "pkgconfig(libsolvext)" to the "devel" subpackage.
+
 *   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 0.7.7-3
 -   Added %%license line automatically
+
 *   Tue May 05 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 0.7.7-2
 -   Separating a "-tools" sub package out of the default "libsolv".
+
 *   Tue May 05 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 0.7.7-1
 -   Update version to 0.7.7.
 -   Moving providing of "pkgconfig(libsolv)" into the "devel" subpackage.
+
 *   Tue Mar 17 2020 Andrew Phelps <anphel@microsoft.com> 0.7.4-1
 -   Update version to 0.7.4. License verified.
+
 *   Wed Sep 25 2019 Saravanan Somasundaram <sarsoma@microsoft.com> 0.6.35-2
 -   Initial CBL-Mariner import from Photon (license: Apache2).
+
 *   Tue Jun 04 2019 Ankit Jain <ankitja@vmware.com> 0.6.35-1
 -   Updated to 0.6.35 and added a patch to fix Index outofBound
+
 *   Thu Feb 14 2019 Keerthana K <keerthanak@vmware.com> 0.6.26-5
 -   Fix for CVE-2018-20532, CVE-2018-20533, CVE-2018-20534.
+
 *   Thu Mar 01 2018 Xiaolin Li <xiaolinl@vmware.com> 0.6.26-4
 -   provides pkgconfig(libsolv).
+
 *   Fri Apr 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.26-3
 -   update libdb make config
+
 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.26-2
 -   Requires expat-libs and expat-devel.
+
 *   Tue Apr 04 2017 Kumar Kaushik <kaushikk@vmware.com>  0.6.26-1
 -   Upgrade to 0.6.26
+
 *   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 0.6.19-4
 -   Added -devel subpackage.
+
 *   Thu Oct 27 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-3
 -   use libdb
+
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-2
 -   GA - Bump release of all rpms
+
 *   Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com>  0.6.19-1
 -   Upgrade to 0.6.19
+
 *   Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 0.6.17-1
 -   Updated to version 0.6.17
+
 *   Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.6.6-3
 -   Updated build-requires after creating devel package for db.
+
 *   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 0.6.6-2
 -   Updated group.
+
 *   Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 0.6.6-1
--   Initial build. First version
+-   Initial build. First version

SPECS/mariner-rpm-macros/generate-package-note.py

@@ -233,7 +233,6 @@ class LinkerScript():
         with open(file_name, "wb") as f:
             f.write(bytearray(self.comment.encode('ascii')))
             f.write(bytearray(self.text.encode('ascii')))
-        print("Linker script, {}, was written successfully.".format(file_name))
 
 
 def generate_cpp_header(module_info, outdir):
@@ -339,9 +338,8 @@ def parse_args():
         sys.exit(0)
 
 if __name__ == '__main__':
-    print("==== ELF note generator v{} ====\n\n".format(VERSION))
+    print("==== ELF note generator v{} ====".format(VERSION))
     args = parse_args()
-    print("Note section memory alignment: {}\n\n".format(args.endian))
     outdir = args.outdir
 
     if outdir:

SPECS/mariner-rpm-macros/macros

@@ -205,4 +205,7 @@ end
 %_smp_mflags "-j%{_smp_build_ncpus}"
 
 # A directory for appdata metainfo.
-%_metainfodir %{_datadir}/metainfo
+%_metainfodir %{_datadir}/metainfo
+
+# New version of RPM has stricter approach to encoding; turn the errors off temporarily.
+%_invalid_encoding_terminates_build 0

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

@@ -8,9 +8,9 @@
   "default-hardened-ld": "4dbb822a27eed292759bc4e9cabb4b84f34fc6701535fcac2fdddac33328678b",
   "forge.lua": "7390af6e81d8d61bc6957127fe9ebdbf5223e96d3810855641bdecc2a03800b4",
   "gen-ld-script.sh": "5d1df54acd8cebd736037f6992b73b407c9ff230e805ac847fef0a2d2f6c07ae",
-  "generate-package-note.py": "cf2dec2cc315581e9eb1c1952f40636f61615a4ac621b983e27513276c28818d",
+  "generate-package-note.py": "bd76a8e88a1356fed74863c38e5cf6a20c1c26426ac94ba21dd172578e8ca2a2",
   "gpgverify": "db0e050f56b694497d70603a6f5c17dd60ddbcf7cee670616851cd389f6767c4",
-  "macros": "5523d2c3f245a746fe103c2063e37272fab7229b58f3de9426fa1ca3f6a37038",
+  "macros": "8b29a0b9e095af46e9e6446660f9e8aa216ca0d1b77a21f2ca19c6a722358ace",
   "macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
   "macros.fonts": "f52edc646414c5dd0f5f4cdd570f2f9dbe6fb97d4f0db360908deb56d96492f8",
   "macros.forge": "8785fe3de4570d6b78dc40aa2f0a4124ce1ddb6282fe3060fb0ae2001178abe6",
@@ -30,5 +30,4 @@
   "rpmrc": "c197369d806430f581de9d5f0e89384d231745712f394ce39497ada47d1f4efe",
   "verify-package-notes.sh": "121715379dcfda33f4e66b3eb5520c80c55c1b0d88348f8895d45d3b89dfe965"
  }
-}
-
+}

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

@@ -6,7 +6,7 @@
 Summary:        Mariner specific rpm macro files
 Name:           mariner-rpm-macros
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPL+ AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -123,6 +123,11 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm forge.lua
 %{_rpmconfigdir}/macros.d/macros.check
 
 %changelog
+* Tue Nov 02 2021 Mateusz Malisz <mamalisz@microsoft.com> - 2.0-8
+- Remove too verbose logs from the linker script
+- Update default mariner macros with invalid_encoding_terminates_build
+- Update linker script to use sed instead of "grep -P" and "tr"
+
 * Tue Nov 02 2021 Andrew Phelps <anphel@microsoft.com> - 2.0-7
 - Update linker script to use sed instead of "grep -P" and "tr"
 - Create linker script output directory as needed

SPECS/nss/nss.spec

@@ -9,11 +9,12 @@
     %{buildroot}%{unsupported_tools_directory}/shlibsign -i %{buildroot}%{_libdir}/libfreeblpriv3.so \
     %{buildroot}%{unsupported_tools_directory}/shlibsign -i %{buildroot}%{_libdir}/libfreebl3.so \
     %{buildroot}%{unsupported_tools_directory}/shlibsign -i %{buildroot}%{_libdir}/libnssdbm3.so \
-%{nil}
+    %{nil}
+
 Summary:        Security client
 Name:           nss
 Version:        3.44
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -26,9 +27,11 @@ Patch0:         nss-3.44-standalone-1.patch
 Patch1:         CVE-2020-12403.patch
 BuildRequires:  nspr-devel
 BuildRequires:  sqlite-devel
+BuildRequires:  libdb-devel
 Provides:       %{name}-tools = %{version}-%{release}
 Provides:       %{name}-softokn = %{version}-%{release}
 Requires:       nspr
+Requires:       libdb
 Requires:       nss-libs = %{version}-%{release}
 
 %description
@@ -125,6 +128,9 @@ install -vm 644 Linux*/lib/pkgconfig/nss.pc %{buildroot}%{_libdir}/pkgconfig
 install -p -m 644 pkgconfig/nss-util.pc %{buildroot}%{_libdir}/pkgconfig/nss-util.pc
 install -p -m 755 pkgconfig/nss-util-config %{buildroot}%{_bindir}/nss-util-config
 
+# The shilibsign script ran after packaging is looking for those files in the lib directory (hardcoded)
+cp -r %{buildroot}%{_libdir}/* /lib
+
 %check
 pushd nss/tests
 export USE_64=1
@@ -158,6 +164,10 @@ popd
 %{unsupported_tools_directory}/shlibsign
 
 %changelog
+
+* Tue Nov 16 2021 Mateusz Malisz <mamalisz@microsoft.com> - 3.44-10
+- Remove libdb from toolchain. Add workaround for the shlibsign script to work.
+
 * Fri Oct 22 2021 Andrew Phelps <anphel@microsoft.com> 3.44-9
 - Fix for gcc 11.2.0
 

SPECS/nvidia-container-runtime/nvidia-container-runtime.spec

@@ -1,7 +1,7 @@
 Summary:        NVIDIA container runtime
 Name:           nvidia-container-runtime
 Version:        3.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -19,20 +19,22 @@ containers.
 %setup -q
 
 %build
-cd src/
-make build
-mkdir -p %{buildroot}%{_bindir}
-cp %{name} %{buildroot}%{_bindir}
+cd src
+%make_build build
 
 %install
-cd src
-install -m 755 %{name} %{buildroot}%{_bindir}/%{name}
+mkdir -p %{buildroot}%{_bindir}
+install -m 755 src/%{name} %{buildroot}%{_bindir}/%{name}
 
 %files
 %license LICENSE
 %{_bindir}/%{name}
 
 %changelog
+* Wed Nov 17 2021 Mateusz Malisz <mateusz.malisz@microsoft.com> 3.4.2-5
+- Move buildroot directory tree creation to install step
+- Use make macros.
+
 * Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 3.4.2-4
 - Increment release to force republishing using golang 1.15.13.
 

SPECS/openscap/openscap.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "openscap-1.3.1.tar.gz": "2a4ea5a5497d387747f19d978e38844af556ad576b74358c69c80e19586e9a45"
+  "openscap-1.3.5.tar.gz": "7c3e540b757fe35de15f21a849f1afa4d3776ee3279276ada4ddd3506c3679c2"
  }
-}
+}

SPECS/openscap/openscap.spec

@@ -1,7 +1,7 @@
 Summary:        Open Source Security Compliance Solution
 Name:           openscap
-Version:        1.3.1
-Release:        8%{?dist}
+Version:        1.3.5
+Release:        2%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -18,14 +18,17 @@ BuildRequires:  libselinux-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  pcre-devel
+BuildRequires:  perl-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  popt-devel
 BuildRequires:  python3-devel
 BuildRequires:  rpm-devel
 BuildRequires:  swig
 BuildRequires:  util-linux-devel
+BuildRequires:  xmlsec1-devel
 Requires:       curl
 Requires:       popt
+Requires:       xmlsec1
 Provides:       %{name}-engine-sce = %{version}-%{release}
 Provides:       %{name}-scanner = %{version}-%{release}
 Provides:       %{name}-utils = %{version}-%{release}
@@ -97,6 +100,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files devel
 %defattr(-,root,root)
+%{_datadir}/perl5/vendor_perl/openscap_pm.so
 %{_includedir}/*
 %{_libdir}/libopenscap_sce.so
 %{_libdir}/libopenscap.so
@@ -105,14 +109,18 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %files perl
 %defattr(-,root,root)
 %{_libdir}/perl5/*
-%{_datadir}/perl5/vendor_perl/openscap_pm.pm
 
 %files -n python3-%{name}
 %defattr(-,root,root)
 %{python3_sitelib}/*
 
 %changelog
-* Tue Dec 07 2021 Chris Co <chrco@microsoft.com> - 1.3.1-8
+* Tue Dec 07 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3.5-2
+- Using "xmlsec1" instead of "libxmlsec1" as dependency.
+- Fixing building Perl binding for new version.
+
+* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 1.3.5-1
+- Update to version 1.3.5
 - License verified
 
 * Fri Jul 23 2021 Thomas Crain <thcrain@microsoft.com> - 1.3.1-7

SPECS/pam/pam.spec

@@ -1,7 +1,7 @@
 Summary:        Linux Pluggable Authentication Modules
 Name:           pam
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD and GPLv2+
 URL:            https://github.com/linux-pam/linux-pam
 Source0:        https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz
@@ -44,7 +44,8 @@ for developing applications that use pam.
     --sysconfdir=/etc   \
     --enable-securedir=/usr/lib/security \
     --enable-selinux \
-    --docdir=%{_docdir}/%{name}-%{version}
+    --docdir=%{_docdir}/%{name}-%{version} \
+    --disable-db
 %make_build
 
 %install
@@ -95,6 +96,9 @@ EOF
 %{_docdir}/%{name}-%{version}/*
 
 %changelog
+* Tue Oct 19 2021 Jon Slobodzian <joslobo@microsoft.com> - 1.5.1-2
+- Remove libdb dependency
+
 * Fri Aug 13 2021 Thomas Crain <thcrain@microsoft.com> - 1.5.1-1
 - Upgrade to latest upstream version
 

SPECS/perl/perl.spec

@@ -24,7 +24,7 @@ License:        GPL+ or Artistic
 Epoch:          %{perl_epoch}
 Version:        %{perl_version} 
 # release number must be even higher, because dual-lived modules will be broken otherwise
-Release:        463%{?dist}
+Release:        464%{?dist}
 Summary:        Practical Extraction and Report Language
 Url:            https://www.perl.org/
 Vendor:         Microsoft Corporation
@@ -158,7 +158,6 @@ Requires:  gdbm-devel
 
 # glibc-common for iconv
 Requires:  glibc-common
-Requires:  libdb-devel
 Requires:  make
 %if !%{defined perl_bootstrap}
 Requires:  perl-interpreter
@@ -6702,6 +6701,8 @@ done
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Oct 26 2021 Pawel Winogrodzki <pawel.winogrodzki@microsoft.com> - 4:5.32.0-464
+- Removing unused dependency on 'libdb-devel'.
 
 * Mon Oct 12 2020 Joe Schmitt <joschmit@microsoft.com> - 4:5.32.0-463
 - Initial CBL-Mariner import from Fedora 34 (license: MIT)

SPECS/qemu-kvm/qemu-kvm.spec

@@ -1,3 +1,5 @@
+# Temporarily disable stripping - strip is trying to strip .img files.
+%global __strip /bin/true
 Summary:        QEMU is a machine emulator and virtualizer
 Name:           qemu-kvm
 Version:        4.2.0

SPECS/rpm/CVE-2021-20266.patch

@@ -1,104 +0,0 @@
-From 8f4b3c3cab8922a2022b9e47c71f1ecf906077ef Mon Sep 17 00:00:00 2001
-From: Demi Marie Obenour <athena@invisiblethingslab.com>
-Date: Mon, 8 Feb 2021 16:05:01 -0500
-Subject: [PATCH] hdrblobInit() needs bounds checks too
-
-Users can pass untrusted data to hdrblobInit() and it must be robust
-against this.
-
-Modified to fit CBL-Mariner.
----
- lib/header.c | 48 +++++++++++++++++++++++++++++++-----------------
- 1 file changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/lib/header.c b/lib/header.c
-index ea39e679f4..ebba9c2b09 100644
---- a/lib/header.c
-+++ b/lib/header.c
-@@ -11,6 +11,7 @@
- #include "system.h"
- #include <netdb.h>
- #include <errno.h>
-+#include <inttypes.h>
- #include <rpm/rpmtypes.h>
- #include <rpm/rpmstring.h>
- #include "lib/header_internal.h"
-@@ -1912,6 +1913,25 @@ hdrblob hdrblobFree(hdrblob blob)
-     return NULL;
- }
- 
-+static rpmRC hdrblobVerifyLengths(rpmTagVal regionTag, uint32_t il, uint32_t dl,
-+				  char **emsg) {
-+    uint32_t il_max = HEADER_TAGS_MAX;
-+    uint32_t dl_max = HEADER_DATA_MAX;
-+    if (regionTag == RPMTAG_HEADERSIGNATURES) {
-+	il_max = 32;
-+	dl_max = 64 * 1024 * 1024;
-+    }
-+    if (hdrchkRange(il_max, il)) {
-+	rasprintf(emsg, _("hdr tags: BAD, no. of tags(%" PRIu32 ") out of range"), il);
-+	return RPMRC_FAIL;
-+    }
-+    if (hdrchkRange(dl_max, dl)) {
-+	rasprintf(emsg, _("hdr data: BAD, no. of bytes(%" PRIu32 ") out of range"), dl);
-+	return RPMRC_FAIL;
-+    }
-+    return RPMRC_OK;
-+}
-+
- rpmRC hdrblobRead(FD_t fd, int magic, int exact_size, rpmTagVal regionTag, hdrblob blob, char **emsg)
- {
-     int32_t block[4];
-@@ -1924,13 +1944,6 @@ rpmRC hdrblobRead(FD_t fd, int magic, int exact_size, rpmTagVal regionTag, hdrbl
-     size_t nb;
-     rpmRC rc = RPMRC_FAIL;		/* assume failure */
-     int xx;
--    int32_t il_max = HEADER_TAGS_MAX;
--    int32_t dl_max = HEADER_DATA_MAX;
--
--    if (regionTag == RPMTAG_HEADERSIGNATURES) {
--	il_max = 32;
--	dl_max = 8192;
--    }
- 
-     memset(block, 0, sizeof(block));
-     if ((xx = Freadall(fd, bs, blen)) != blen) {
-@@ -1943,15 +1956,9 @@ rpmRC hdrblobRead(FD_t fd, int magic, int exact_size, rpmTagVal regionTag, hdrbl
- 	goto exit;
-     }
-     il = ntohl(block[2]);
--    if (hdrchkRange(il_max, il)) {
--	rasprintf(emsg, _("hdr tags: BAD, no. of tags(%d) out of range"), il);
--	goto exit;
--    }
-     dl = ntohl(block[3]);
--    if (hdrchkRange(dl_max, dl)) {
--	rasprintf(emsg, _("hdr data: BAD, no. of bytes(%d) out of range"), dl);
-+    if (hdrblobVerifyLengths(regionTag, il, dl, emsg))
- 	goto exit;
--    }
- 
-     nb = (il * sizeof(struct entryInfo_s)) + dl;
-     uc = sizeof(il) + sizeof(dl) + nb;
-@@ -1995,11 +2002,18 @@ rpmRC hdrblobInit(const void *uh, size_t uc,
- 		struct hdrblob_s *blob, char **emsg)
- {
-     rpmRC rc = RPMRC_FAIL;
--
-     memset(blob, 0, sizeof(*blob));
-+    if (uc && uc < 8) {
-+	rasprintf(emsg, _("hdr length: BAD"));
-+	goto exit;
-+    }
-+
-     blob->ei = (int32_t *) uh; /* discards const */
--    blob->il = ntohl(blob->ei[0]);
--    blob->dl = ntohl(blob->ei[1]);
-+    blob->il = ntohl((uint32_t)(blob->ei[0]));
-+    blob->dl = ntohl((uint32_t)(blob->ei[1]));
-+    if (hdrblobVerifyLengths(regionTag, blob->il, blob->dl, emsg) != RPMRC_OK)
-+	goto exit;
-+
-     blob->pe = (entryInfo) &(blob->ei[2]);
-     blob->pvlen = sizeof(blob->il) + sizeof(blob->dl) +
- 		  (blob->il * sizeof(*blob->pe)) + blob->dl;

SPECS/rpm/CVE-2021-20271.patch

@@ -1,192 +0,0 @@
-From d6a86b5e69e46cc283b1e06c92343319beb42e21 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@redhat.com>
-Date: Thu, 4 Mar 2021 13:21:19 +0200
-Subject: [PATCH] Be much more careful about copying data from the signature
- header
-
-Only look for known tags, and ensure correct type and size where known
-before copying over. Bump the old arbitrary 16k count limit to 16M limit
-though, it's not inconceivable that a package could have that many files.
-While at it, ensure none of these tags exist in the main header,
-which would confuse us greatly.
-
-This is optimized for backporting ease, upstream can remove redundancies
-and further improve checking later.
-
-Reported and initial patches by Demi Marie Obenour.
-
-Fixes: RhBug:1935049, RhBug:1933867, RhBug:1935035, RhBug:1934125, ...
-
-Fixes: CVE-2021-3421, CVE-2021-20271
-
-Modified to apply to version 4.14.2 by: Nicolas Ontiveros <niontive@microsoft.com>
-
-diff --git a/lib/package.c b/lib/package.c
-index 93a06ebfe..96a1737d8 100644
---- a/lib/package.c
-+++ b/lib/package.c
-@@ -20,76 +20,75 @@
- 
- #include "debug.h"
- 
-+struct taglate_s {
-+    rpmTagVal stag;
-+    rpmTagVal xtag;
-+    rpm_count_t count;
-+} const xlateTags[] = {
-+    { RPMSIGTAG_SIZE, RPMTAG_SIGSIZE, 1 },
-+    { RPMSIGTAG_PGP, RPMTAG_SIGPGP, 0 },
-+    { RPMSIGTAG_MD5, RPMTAG_SIGMD5, 16 },
-+    { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
-+    /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */
-+    { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
-+    { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
-+    { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
-+    { RPMSIGTAG_VERITYSIGNATURES, RPMTAG_VERITYSIGNATURES, 0 },
-+    { RPMSIGTAG_VERITYSIGNATUREALGO, RPMTAG_VERITYSIGNATUREALGO, 1 },
-+    { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
-+    { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
-+    { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
-+    { RPMSIGTAG_RSA, RPMTAG_RSAHEADER, 0 },
-+    { RPMSIGTAG_LONGSIZE, RPMTAG_LONGSIGSIZE, 1 },
-+    { RPMSIGTAG_LONGARCHIVESIZE, RPMTAG_LONGARCHIVESIZE, 1 },
-+    { 0 }
-+};
-+
- /** \ingroup header
-  * Translate and merge legacy signature tags into header.
-  * @param h		header (dest)
-  * @param sigh		signature header (src)
-+ * @return		failing tag number, 0 on success
-  */
- static
--void headerMergeLegacySigs(Header h, Header sigh)
-+rpmTagVal headerMergeLegacySigs(Header h, Header sigh, char **msg)
- {
--    HeaderIterator hi;
-+    const struct taglate_s *xl;
-     struct rpmtd_s td;
- 
--    hi = headerInitIterator(sigh);
--    for (; headerNext(hi, &td); rpmtdFreeData(&td))
--    {
--	switch (td.tag) {
--	/* XXX Translate legacy signature tag values. */
--	case RPMSIGTAG_SIZE:
--	    td.tag = RPMTAG_SIGSIZE;
--	    break;
--	case RPMSIGTAG_PGP:
--	    td.tag = RPMTAG_SIGPGP;
--	    break;
--	case RPMSIGTAG_MD5:
--	    td.tag = RPMTAG_SIGMD5;
--	    break;
--	case RPMSIGTAG_GPG:
--	    td.tag = RPMTAG_SIGGPG;
--	    break;
--	case RPMSIGTAG_PGP5:
--	    td.tag = RPMTAG_SIGPGP5;
--	    break;
--	case RPMSIGTAG_PAYLOADSIZE:
--	    td.tag = RPMTAG_ARCHIVESIZE;
--	    break;
--	case RPMSIGTAG_SHA1:
--	case RPMSIGTAG_SHA256:
--	case RPMSIGTAG_DSA:
--	case RPMSIGTAG_RSA:
--	default:
--	    if (!(td.tag >= HEADER_SIGBASE && td.tag < HEADER_TAGBASE))
--		continue;
--	    break;
--	}
--	if (!headerIsEntry(h, td.tag)) {
--	    switch (td.type) {
--	    case RPM_NULL_TYPE:
--		continue;
-+    for (xl = xlateTags; xl->stag; xl++) {
-+	/* There mustn't be one in the main header */
-+	if (headerIsEntry(h, xl->xtag))
-+	    goto exit;
-+    }
-+
-+    rpmtdReset(&td);
-+    for (xl = xlateTags; xl->stag; xl++) {
-+	if (headerGet(sigh, xl->stag, &td, HEADERGET_RAW|HEADERGET_MINMEM)) {
-+	    /* Translate legacy tags */
-+	    if (xl->stag != xl->xtag)
-+		td.tag = xl->xtag;
-+	    /* Ensure type and tag size match expectations */
-+	    if (td.type != rpmTagGetTagType(td.tag))
- 		break;
--	    case RPM_CHAR_TYPE:
--	    case RPM_INT8_TYPE:
--	    case RPM_INT16_TYPE:
--	    case RPM_INT32_TYPE:
--	    case RPM_INT64_TYPE:
--		if (td.count != 1)
--		    continue;
-+	    if (td.count < 1 || td.count > 16*1024*1024)
- 		break;
--	    case RPM_STRING_TYPE:
--	    case RPM_BIN_TYPE:
--		if (td.count >= 16*1024)
--		    continue;
-+	    if (xl->count && td.count != xl->count)
- 		break;
--	    case RPM_STRING_ARRAY_TYPE:
--	    case RPM_I18NSTRING_TYPE:
--		continue;
-+	    if (!headerPut(h, &td, HEADERPUT_DEFAULT))
- 		break;
--	    }
--	    (void) headerPut(h, &td, HEADERPUT_DEFAULT);
-+	    rpmtdFreeData(&td);
- 	}
-     }
--    headerFreeIterator(hi);
-+    rpmtdFreeData(&td);
-+
-+exit:
-+    if (xl->stag) {
-+	rasprintf(msg, "invalid signature tag %s (%d)",
-+			rpmTagGetName(xl->xtag), xl->xtag);
-+    }
-+
-+    return xl->stag;
- }
- 
- /**
-@@ -337,7 +336,8 @@
- 		goto exit;
- 
- 	    /* Append (and remap) signature tags to the metadata. */
--	    headerMergeLegacySigs(h, sigh);
-+	    if (headerMergeLegacySigs(h, sigh, &msg))
-+			goto exit;
- 	    applyRetrofits(h);
- 
- 	    /* Bump reference count for return. */
-
---- a/lib/rpmtag.h
-+++ b/lib/rpmtag.h
-@@ -65,6 +65,10 @@
-     RPMTAG_LONGARCHIVESIZE	= RPMTAG_SIG_BASE+15,	/* l */
-     /* RPMTAG_SIG_BASE+16 reserved */
-     RPMTAG_SHA256HEADER		= RPMTAG_SIG_BASE+17,	/* s */
-+    /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
-+    /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
-+    RPMTAG_VERITYSIGNATURES	= RPMTAG_SIG_BASE+20,	/* s[] */
-+    RPMTAG_VERITYSIGNATUREALGO	= RPMTAG_SIG_BASE+21,	/* i */
- 
-     RPMTAG_NAME  		= 1000,	/* s */
- #define	RPMTAG_N	RPMTAG_NAME	/* s */
-@@ -422,6 +426,10 @@
-     RPMSIGTAG_LONGSIZE	= RPMTAG_LONGSIGSIZE,	/*!< internal Header+Payload size (64bit) in bytes. */
-     RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal uncompressed payload size (64bit) in bytes. */
-     RPMSIGTAG_SHA256	= RPMTAG_SHA256HEADER,
-+    RPMSIGTAG_FILESIGNATURES		= RPMTAG_SIG_BASE + 18,
-+    RPMSIGTAG_FILESIGNATURELENGTH	= RPMTAG_SIG_BASE + 19,
-+    RPMSIGTAG_VERITYSIGNATURES		= RPMTAG_VERITYSIGNATURES,
-+    RPMSIGTAG_VERITYSIGNATUREALGO	= RPMTAG_VERITYSIGNATUREALGO,
- } rpmSigTag;
- 

SPECS/rpm/define-RPM_LD_FLAGS.patch

@@ -1,29 +1,15 @@
-From a0998009aa0cf6c9536338c725adc7f4cdc8e08a Mon Sep 17 00:00:00 2001
-From: Thomas Crain <thcrain@microsoft.com>
-Date: Sun, 6 Jun 2021 13:02:09 -0500
-Subject: [PATCH] Add RPM_LD_FLAGS definition to %%{__build_pre} macro
-
-Adapted from Fedora downstream: https://src.fedoraproject.org/rpms/rpm/blob/rawhide/f/rpm-4.15.x-ldflags.patch
-
----
- macros.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/macros.in b/macros.in
-index a6069ee..5d6855b 100644
---- a/macros.in
-+++ b/macros.in
-@@ -801,9 +801,10 @@ package or when debugging this package.\
+--- orig-rpm-4.17.0-release/macros.in	2021-09-03 02:41:20.000000000 -0700
++++ fixed-rpm-4.17.0-release/macros.in	2021-12-02 21:35:53.475842878 -0800
+@@ -742,10 +742,11 @@
    RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
    RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
    RPM_OPT_FLAGS=\"%{optflags}\"\
 +  RPM_LD_FLAGS=\"%{?build_ldflags}\"\
    RPM_ARCH=\"%{_arch}\"\
    RPM_OS=\"%{_os}\"\
--  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
-+  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS\
+   RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
+-  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
++  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
    RPM_DOC_DIR=\"%{_docdir}\"\
    export RPM_DOC_DIR\
    RPM_PACKAGE_NAME=\"%{NAME}\"\
--- 
-2.30.2

SPECS/rpm/find-debuginfo-do-not-generate-dir-entries.patch

@@ -1,27 +0,0 @@
-diff -Naur a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
---- a/scripts/find-debuginfo.sh	2017-04-19 15:48:24.650406279 -0700
-+++ b/scripts/find-debuginfo.sh	2017-04-19 15:49:16.090962375 -0700
-@@ -292,10 +292,10 @@
- fi
- 
- if [ -d "${RPM_BUILD_ROOT}/usr/lib" -o -d "${RPM_BUILD_ROOT}/usr/src" ]; then
--  ((nout > 0)) ||
--  test ! -d "${RPM_BUILD_ROOT}/usr/lib" ||
--  (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) |
--  sed 's,^,%dir /usr/lib/,' >> "$LISTFILE"
-+#  ((nout > 0)) ||
-+#  test ! -d "${RPM_BUILD_ROOT}/usr/lib" ||
-+#  (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) |
-+#  sed 's,^,%dir /usr/lib/,' >> "$LISTFILE"
- 
-   (cd "${RPM_BUILD_ROOT}/usr"
-    test ! -d lib/debug || find lib/debug ! -type d
-@@ -467,7 +467,7 @@
-   mv "${LISTFILE}.new" "$LISTFILE"
-   ((++i))
- done
--if ((nout > 0)); then
-+if ((0 && nout > 0)); then
-   # Now add the right %dir lines to each output list.
-   (cd "${RPM_BUILD_ROOT}"; find usr/lib/debug -type d) |
-   sed 's#^.*$#\\@^/&/@{h;s@^.*$@%dir /&@p;g;}#' |

SPECS/rpm/python-dist-deps-version-parse.patch

@@ -1,164 +0,0 @@
-# Changes adopted from python3-rpm-generators-10-4.fc32.noarch.rpm
-
-diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
-index ac1cd62..8756fdf 100755
---- a/scripts/pythondistdeps.py
-+++ b/scripts/pythondistdeps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- #
- # Copyright 2010 Per Øyvind Karlsen <proyvind@moondrake.org>
-@@ -32,6 +32,11 @@ PyMajorVer_Deps = False
- legacy_Provides = False
- legacy = False
- 
-+def normalize_name(name):
-+    """https://www.python.org/dev/peps/pep-0503/#normalized-names"""
-+    import re
-+    return re.sub(r'[-_.]+', '-', name).lower()
-+
- for o, a in opts:
-     if o in ('-h', '--help'):
-         print('-h, --help\tPrint help')
-@@ -102,7 +107,7 @@ for f in files:
-             lower.endswith('.egg-info') or \
-             lower.endswith('.dist-info'):
-         # This import is very slow, so only do it if needed
--        from pkg_resources import Distribution, FileMetadata, PathMetadata
-+        from pkg_resources import Distribution, FileMetadata, PathMetadata, Requirement, parse_version
-         dist_name = basename(f)
-         if isdir(f):
-             path_item = dirname(f)
-@@ -116,12 +121,24 @@ for f in files:
-             # Try to parse the Python version from the path the metadata
-             # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
-             import re
--            res = re.search(r"/python(?P<pyver>\d+\.\d)/", path_item)
-+            res = re.search(r"/python(?P<pyver>\d+\.\d+)/", path_item)
-             if res:
-                 dist.py_version = res.group('pyver')
-             else:
-                 warn("Version for {!r} has not been found".format(dist), RuntimeWarning)
-                 continue
-+
-+        # XXX: https://github.com/pypa/setuptools/pull/1275
-+        import platform
-+        platform.python_version = lambda: dist.py_version
-+
-+        # This is the PEP 503 normalized name.
-+        # It does also convert dots to dashes, unlike dist.key.
-+        # In the current code, we only add additional provides with this.
-+        # Later, we can start requiring them.
-+        # See https://bugzilla.redhat.com/show_bug.cgi?id=1791530
-+        normalized_name = normalize_name(dist.project_name)
-+
-         if Provides_PyMajorVer_Variant or PyMajorVer_Deps or legacy_Provides or legacy:
-             # Get the Python major version
-             pyver_major = dist.py_version.split('.')[0]
-@@ -136,21 +153,34 @@ for f in files:
-                 name = 'python{}dist({})'.format(dist.py_version, dist.key)
-                 if name not in py_deps:
-                     py_deps[name] = []
-+                name_ = 'python{}dist({})'.format(dist.py_version, normalized_name)
-+                if name_ not in py_deps:
-+                    py_deps[name_] = []
-             if Provides_PyMajorVer_Variant or PyMajorVer_Deps:
-                 pymajor_name = 'python{}dist({})'.format(pyver_major, dist.key)
-                 if pymajor_name not in py_deps:
-                     py_deps[pymajor_name] = []
-+                pymajor_name_ = 'python{}dist({})'.format(pyver_major, normalized_name)
-+                if pymajor_name_ not in py_deps:
-+                    py_deps[pymajor_name_] = []
-             if legacy or legacy_Provides:
-                 legacy_name = 'pythonegg({})({})'.format(pyver_major, dist.key)
-                 if legacy_name not in py_deps:
-                     py_deps[legacy_name] = []
-             if dist.version:
--                spec = ('==', dist.version)
-+                version = dist.version
-+                while version.endswith('.0'):
-+                    version = version[:-2]
-+                spec = ('==', version)
-                 if spec not in py_deps[name]:
-                     if not legacy:
-                         py_deps[name].append(spec)
-+                        if name != name_:
-+                            py_deps[name_].append(spec)
-                     if Provides_PyMajorVer_Variant:
-                         py_deps[pymajor_name].append(spec)
-+                        if pymajor_name != pymajor_name_:
-+                            py_deps[pymajor_name_].append(spec)
-                     if legacy or legacy_Provides:
-                         py_deps[legacy_name].append(spec)
-         if Requires or (Recommends and dist.extras):
-@@ -174,6 +204,13 @@ for f in files:
-                         if dep in deps:
-                             depsextras.remove(dep)
-                 deps = depsextras
-+            # console_scripts/gui_scripts entry points need pkg_resources from setuptools
-+            if ((dist.get_entry_map('console_scripts') or
-+                     dist.get_entry_map('gui_scripts')) and
-+                    (lower.endswith('.egg') or
-+                     lower.endswith('.egg-info'))):
-+                # stick them first so any more specific requirement overrides it
-+                deps.insert(0, Requirement.parse('setuptools'))
-             # add requires/recommends based on egg/dist metadata
-             for dep in deps:
-                 if legacy:
-@@ -184,11 +221,12 @@ for f in files:
-                     else:
-                         name = 'python{}dist({})'.format(dist.py_version, dep.key)
-                 for spec in dep.specs:
--                    if spec[0] != '!=':
--                        if name not in py_deps:
--                            py_deps[name] = []
--                        if spec not in py_deps[name]:
--                            py_deps[name].append(spec)
-+                    while spec[1].endswith('.0'):
-+                        spec = (spec[0], spec[1][:-2])
-+                    if name not in py_deps:
-+                        py_deps[name] = []
-+                    if spec not in py_deps[name]:
-+                        py_deps[name].append(spec)
-                 if not dep.specs:
-                     py_deps[name] = []
-         # Unused, for automatic sub-package generation based on 'extras' from egg/dist metadata
-@@ -233,8 +271,35 @@ names.sort()
- for name in names:
-     if py_deps[name]:
-         # Print out versioned provides, requires, recommends, conflicts
-+        spec_list = []
-         for spec in py_deps[name]:
--            print('{} {} {}'.format(name, spec[0], spec[1]))
-+            if spec[0] == '!=':
-+                spec_list.append('({n} < {v} or {n} >= {v}.0)'.format(n=name, v=spec[1]))
-+            elif spec[0] == '~=':
-+                # Parse the current version
-+                next_ver = parse_version(spec[1]).base_version.split('.')
-+                # Drop the micro version
-+                next_ver = next_ver[0:-1]
-+                # Increment the minor version
-+                next_ver[-1] = str(int(next_ver[-1]) + 1)
-+                next_ver = '.'.join(next_ver)
-+                spec_list.append('({n} >= {v} with {n} < {vnext})'.format(n=name, v=spec[1], vnext=next_ver))
-+            elif spec[0] == '==' and spec[1].endswith('.*'):
-+                # Parse the current version
-+                next_ver = parse_version(spec[1]).base_version.split('.')
-+                # Drop the micro version from both the version in spec and next_ver
-+                next_ver = next_ver[0:-1]
-+                spec = (spec[0], '.'.join(next_ver))
-+                # Increment the minor version
-+                next_ver[-1] = str(int(next_ver[-1]) + 1)
-+                next_ver = '.'.join(next_ver)
-+                spec_list.append('({n} >= {v} with {n} < {vnext})'.format(n=name, v=spec[1], vnext=next_ver))
-+            else:
-+                spec_list.append('{} {} {}'.format(name, spec[0], spec[1]))
-+        if len(spec_list) == 1:
-+            print(spec_list[0])
-+        else:
-+            print('({})'.format(' with '.join(spec_list)))
-     else:
-         # Print out unversioned provides, requires, recommends, conflicts
-         print(name)

SPECS/rpm/remove-docs-from-makefile.patch

@@ -0,0 +1,45 @@
+--- rpm-rpm-4.17.0-release/Makefile.am	2021-09-03 02:41:20.000000000 -0700
++++ rpm-rpm-4.17.0-release/Makefile2	2021-09-23 15:21:16.362202512 -0700
+@@ -27,7 +27,7 @@
+ 
+ SUBDIRS = po misc
+ SUBDIRS += luaext
+-SUBDIRS += rpmio lib sign build scripts fileattrs docs .
++SUBDIRS += rpmio lib sign build scripts fileattrs .
+ 
+ if ENABLE_PYTHON
+ SUBDIRS += python
+@@ -41,7 +41,7 @@
+ SUBDIRS += tests
+ endif
+ 
+-DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs docs tests plugins
++DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs tests plugins
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+@@ -249,24 +249,6 @@
+ 
+ MAINTAINERCLEANFILES = ChangeLog
+ 
+-# Always build librpm docs
+-if DOXYGEN
+-docs/librpm.doxy: docs/librpm.doxy.in docs/librpm/Doxyheader.h Makefile.am configure.ac $(pkginclude_HEADERS)
+-	files=`echo " $(pkginclude_HEADERS)" | $(SED) -e "s, , \@top_srcdir\@/,g"`; \
+-	$(SED) -e "s,[@]pkginclude_HEADERS[@],$$files," \
+-	  -e "s,\@top_srcdir\@/,$(top_srcdir)/,g" \
+-	  -e "s,[@]HAVE_DOT[@],$(HAVE_DOT)," \
+-	  -e "s,[@]PACKAGE[@],$(PACKAGE)," \
+-	  -e "s,[@]VERSION[@],$(VERSION)," \
+-	< $(top_srcdir)/docs/librpm.doxy.in > docs/librpm.doxy
+-
+-docs/librpm/html: docs/librpm.doxy
+-	@DOXYGEN@ docs/librpm.doxy
+-noinst_DATA += docs/librpm/html
+-endif
+-EXTRA_DIST += docs/librpm.doxy.in docs/librpm/Doxyheader.h
+-EXTRA_DIST += docs/librpm/html
+-
+ .PHONY: ci
+ ci:
+ 	podman build -t rpm -f ci/Dockerfile .

SPECS/rpm/rpm.signatures.json

@@ -2,6 +2,9 @@
  "Signatures": {
   "brp-strip-debug-symbols": "6cd7e01cd3ab55de6a04bd61a2a4f787bbddbfe575d85ec282f8d76563fa1cd4",
   "brp-strip-unneeded": "b7d2323c52322b5f0144fd9de3ca86e4ea8ec24a262c0382490a9ea434dda3bf",
-  "rpm-4.14.2.1-release.tar.gz": "92cab9da7524cf4e4abf33f160cdfb9e63fe021bc7133f97735f70cdec777400"
+  "python.attr": "32eebee98c24edcc9524b4553cf05c0ec6707828fe14f76d250e294568e7091a",
+  "pythondeps.sh": "1cc7665252eb845c7e4741ff3e832c78f54ffb05552f1cdb2d43d2c0cbf7c07d",
+  "pythondistdeps.py": "f73f01bb78daa75d25d6581a6da40cf6f946654c5e9d166676036367307186d1",
+  "rpm-4.17.0-release.tar.gz": "2d8274d212b859b3ac90b276d462467ae2f8165143ef9f9e7ebfab77b1c7e272"
  }
 }

SPECS/rpm/rpm.spec

@@ -1,7 +1,7 @@
 Summary:        Package manager
 Name:           rpm
-Version:        4.14.2.1
-Release:        4%{?dist}
+Version:        4.17.0
+Release:        1%{?dist}
 License:        GPLv2+ AND LGPLv2+ AND BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -10,30 +10,33 @@ URL:            https://rpm.org
 Source0:        https://github.com/rpm-software-management/rpm/archive/%{name}-%{version}-release.tar.gz
 Source1:        brp-strip-debug-symbols
 Source2:        brp-strip-unneeded
-Patch0:         find-debuginfo-do-not-generate-dir-entries.patch
-Patch1:         python-dist-deps-version-parse.patch
-Patch2:         define-RPM_LD_FLAGS.patch
-Patch3:         CVE-2021-20271.patch
-# CVE-2021-20271 patch also patches CVE-2021-3421
-Patch4:         CVE-2021-3421.nopatch
+# The license for the files below is the same as for RPM as they have originally came from rpm.
+# The git repo is hosted by centos. The version below is centos 8 stable.
+Source3:        https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/python.attr
+Source4:        https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/pythondeps.sh
+Source5:        https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/pythondistdeps.py
+BuildRequires:  debugedit
 BuildRequires:  elfutils-devel
+BuildRequires:  openssl-devel
 BuildRequires:  file-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libcap-devel
-BuildRequires:  libdb-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  lua-devel
-BuildRequires:  nss-devel
 BuildRequires:  popt-devel
 BuildRequires:  python3-devel
 BuildRequires:  xz-devel
 BuildRequires:  zstd-devel
 Requires:       bash
+Requires:       debugedit
 Requires:       libarchive
-Requires:       libdb
 Requires:       libselinux
 Requires:       lua
 Requires:       rpm-libs = %{version}-%{release}
+Requires:       rpm-build = %{version}-%{release}
+
+Patch0: remove-docs-from-makefile.patch
+Patch1: define-RPM_LD_FLAGS.patch
 
 %description
 RPM package manager
@@ -53,7 +56,6 @@ Requires:       elfutils-libelf
 Requires:       libcap
 Requires:       libgcc
 Requires:       mariner-rpm-macros
-Requires:       nss-libs
 Requires:       popt
 Requires:       xz-libs
 Requires:       zlib
@@ -107,36 +109,46 @@ Python3 rpm.
 %autosetup -n rpm-%{name}-%{version}-release -p1
 
 %build
-sed -i '/define _GNU_SOURCE/a #include "../config.h"' tools/sepdebugcrcfix.c
 # pass -L opts to gcc as well to prioritize it over standard libs
 sed -i 's/-Wl,-L//g' python/setup.py.in
 sed -i '/library_dirs/d' python/setup.py.in
 sed -i 's/extra_link_args/library_dirs/g' python/setup.py.in
 
 ./autogen.sh --noconfigure
+
 %configure \
-    CPPFLAGS='-I/usr/include/nspr -I/usr/include/nss -DLUA_COMPAT_APIINTCASTS' \
-        --program-prefix= \
-        --disable-dependency-tracking \
-        --disable-static \
-        --with-vendor=mariner \
-        --enable-python \
-        --with-cap \
-        --with-lua \
-        --disable-silent-rules \
-        --with-external-db \
-        --with-selinux
-make %{?_smp_mflags}
+    CPPFLAGS='-DLUA_COMPAT_APIINTCASTS' \
+    --program-prefix= \
+    --with-crypto=openssl \
+    --enable-ndb \
+    --disable-dependency-tracking \
+    --disable-static \
+    --with-vendor=mariner \
+    --enable-python \
+    --with-cap \
+    --disable-silent-rules \
+    --with-selinux
+
+# Remove manpages translations
+rm -r docs/man/{fr,ja,ko,pl,ru,sk}
+
+%make_build
 
 pushd python
-python3 setup.py build
+%py3_build
 popd
 
+# Set provided python versions
+sed -i 's/@MAJORVER-PROVIDES-VERSIONS@/%{python3_version}/' %{SOURCE3}
+
+# Fix the interpreter path for python replacing the first line
+sed -i '1 s:.*:#!/usr/bin/python3:' %{SOURCE5}
+
 %check
-make check
+%make_build_check
 
 %install
-make DESTDIR=%{buildroot} install
+%make_install
 
 find %{buildroot} -type f -name "*.la" -delete -print
 find %{buildroot} -name 'perl*' -delete
@@ -146,6 +158,10 @@ find %{buildroot} -name 'perl*' -delete
 install -dm 755 %{buildroot}%{_sysconfdir}/rpm
 install -vm755 %{SOURCE1} %{buildroot}%{_libdir}/rpm/
 install -vm755 %{SOURCE2} %{buildroot}%{_libdir}/rpm/
+install -vm644 %{SOURCE3} %{buildroot}%{_fileattrsdir}/
+install -vm755 %{SOURCE4} %{buildroot}%{_libdir}/rpm/
+install -vm755 %{SOURCE5} %{buildroot}%{_libdir}/rpm/
+
 
 pushd python
 python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
@@ -178,22 +194,16 @@ popd
 %{_libdir}/rpm/tgpg
 %{_libdir}/rpm/platform
 %{_libdir}/rpm-plugins/*
-%{_libdir}/rpm/python-macro-helper
 %{_libdir}/rpm/pythondistdeps.py
-%{_mandir}/man8/rpm.8.gz
-%{_mandir}/man8/rpm2cpio.8.gz
-%{_mandir}/man8/rpmdb.8.gz
-%{_mandir}/man8/rpmgraph.8.gz
-%{_mandir}/man8/rpmkeys.8.gz
-%{_mandir}/man8/rpm-misc.8.gz
-%{_mandir}/man8/rpm-plugin-systemd-inhibit.8.gz
-%exclude %{_mandir}/fr/man8/*.gz
-%exclude %{_mandir}/ja/man8/*.gz
-%exclude %{_mandir}/ko/man8/*.gz
-%exclude %{_mandir}/pl/man1/*.gz
-%exclude %{_mandir}/pl/man8/*.gz
-%exclude %{_mandir}/ru/man8/*.gz
-%exclude %{_mandir}/sk/man8/*.gz
+%{_fileattrsdir}/python.attr
+# Because of no doxygen dependency, we do not produce manpages that require it.
+# %{_mandir}/man8/rpm.8.gz
+# %{_mandir}/man8/rpm2cpio.8.gz
+# %{_mandir}/man8/rpmdb.8.gz
+# %{_mandir}/man8/rpmgraph.8.gz
+# %{_mandir}/man8/rpmkeys.8.gz
+# %{_mandir}/man8/rpm-misc.8.gz
+# %{_mandir}/man8/rpm-plugin-systemd-inhibit.8.gz
 
 %files libs
 %defattr(-,root,root)
@@ -211,15 +221,10 @@ popd
 %{_bindir}/rpmsign
 %{_bindir}/rpmspec
 %{_libdir}/rpm/macros.*
-%{_libdir}/rpm/find-debuginfo.sh
 %{_libdir}/rpm/find-lang.sh
 %{_libdir}/rpm/find-provides
 %{_libdir}/rpm/find-requires
 %{_libdir}/rpm/brp-*
-%{_libdir}/rpm/mono-find-provides
-%{_libdir}/rpm/mono-find-requires
-%{_libdir}/rpm/ocaml-find-provides.sh
-%{_libdir}/rpm/ocaml-find-requires.sh
 %{_libdir}/rpm/fileattrs/*
 %{_libdir}/rpm/script.req
 %{_libdir}/rpm/check-buildroot
@@ -227,24 +232,20 @@ popd
 %{_libdir}/rpm/check-prereqs
 %{_libdir}/rpm/check-rpaths
 %{_libdir}/rpm/check-rpaths-worker
-%{_libdir}/rpm/config.guess
-%{_libdir}/rpm/config.sub
-%{_libdir}/rpm/debugedit
 %{_libdir}/rpm/elfdeps
-%{_libdir}/rpm/libtooldeps.sh
 %{_libdir}/rpm/mkinstalldirs
 %{_libdir}/rpm/pkgconfigdeps.sh
 %{_libdir}/rpm/*.prov
-%{_libdir}/rpm/sepdebugcrcfix
 
 %{_libdir}/rpm/pythondeps.sh
+%{_libdir}/rpm/ocamldeps.sh
 %{_libdir}/rpm/rpmdeps
-
-%{_mandir}/man1/gendiff.1*
-%{_mandir}/man8/rpmbuild.8*
-%{_mandir}/man8/rpmdeps.8*
-%{_mandir}/man8/rpmspec.8*
-%{_mandir}/man8/rpmsign.8.gz
+# Because of no doxygen dependency, we do not produce manpages that require it.
+# %{_mandir}/man1/gendiff.1*
+# %{_mandir}/man8/rpmbuild.8*
+# %{_mandir}/man8/rpmdeps.8*
+# %{_mandir}/man8/rpmspec.8*
+# %{_mandir}/man8/rpmsign.8.gz
 
 %files devel
 %defattr(-,root,root)
@@ -263,6 +264,10 @@ popd
 %{python3_sitelib}/*
 
 %changelog
+
+* Wed Sep 15 2021 Mateusz Malisz <mamalisz@microsoft.com> - 4.17.0-1
+- Upgrade to version 4.17.0.  Remove libdb dependency.
+
 * Mon Jun 07 2021 Thomas Crain <thcrain@microsoft.com> - 4.14.2.1-4
 - Add patch to define "$RPM_LD_FLAGS" during spec %%build phases
 - Remove %%python3_sitelib redefinition

SPECS/xmlsec1/xmlsec1.spec

@@ -1,7 +1,7 @@
 Summary:        Library providing support for "XML Signature" and "XML Encryption" standards
 Name:           xmlsec1
 Version:        1.2.26
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -12,7 +12,9 @@ BuildRequires:  gnutls-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libltdl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  nss-devel
 Requires:       libltdl
+Requires:       nss
 Requires:       libxml2
 Provides:       %{name}-gcrypt = %{release}-%{version}
 Provides:       %{name}-gnutls = %{release}-%{version}
@@ -32,6 +34,7 @@ Requires:       gnutls-devel
 Requires:       libgcrypt-devel
 Requires:       libltdl-devel
 Requires:       libxml2-devel
+Requires:       nss-devel
 Provides:       %{name}-gcrypt-devel = %{release}-%{version}
 Provides:       %{name}-gnutls-devel = %{release}-%{version}
 Provides:       %{name}-openssl-devel = %{release}-%{version}
@@ -99,6 +102,9 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
 %{_mandir}/man1/xmlsec1-config.1.gz
 
 %changelog
+* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 1.2.26-8
+- Add nss as an explicit requirement.
+
 * Fri Feb 05 2021 Joe Schmitt <joschmit@microsoft.com> - 1.2.26-7
 - Replace incorrect %%{_lib} usage with %%{_libdir}
 

cgmanifest.json

@@ -1131,6 +1131,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "debugedit",
+          "version": "5.0",
+          "downloadUrl": "https://sourceware.org/ftp/debugedit/5.0/debugedit-5.0.tar.xz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -5282,8 +5292,8 @@
         "type": "other",
         "other": {
           "name": "openscap",
-          "version": "1.3.1",
-          "downloadUrl": "https://github.com/OpenSCAP/openscap/releases/download/1.3.1/openscap-1.3.1.tar.gz"
+          "version": "1.3.5",
+          "downloadUrl": "https://github.com/OpenSCAP/openscap/releases/download/1.3.5/openscap-1.3.5.tar.gz"
         }
       }
     },
@@ -7652,8 +7662,8 @@
         "type": "other",
         "other": {
           "name": "rpm",
-          "version": "4.14.2.1",
-          "downloadUrl": "https://github.com/rpm-software-management/rpm/archive/rpm-4.14.2.1-release.tar.gz"
+          "version": "4.17.0",
+          "downloadUrl": "https://github.com/rpm-software-management/rpm/archive/rpm-4.17.0-release.tar.gz"
         }
       }
     },

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -12,8 +12,8 @@ zlib-devel-1.2.11-5.cm2.aarch64.rpm
 file-5.40-1.cm2.aarch64.rpm
 file-devel-5.40-1.cm2.aarch64.rpm
 file-libs-5.40-1.cm2.aarch64.rpm
-binutils-2.37-1.cm2.aarch64.rpm
-binutils-devel-2.37-1.cm2.aarch64.rpm
+binutils-2.37-2.cm2.aarch64.rpm
+binutils-devel-2.37-2.cm2.aarch64.rpm
 gmp-6.2.1-2.cm2.aarch64.rpm
 gmp-devel-6.2.1-2.cm2.aarch64.rpm
 mpfr-4.1.0-1.cm2.aarch64.rpm
@@ -86,9 +86,6 @@ nspr-devel-4.21-2.cm2.aarch64.rpm
 sqlite-3.34.1-1.cm2.aarch64.rpm
 sqlite-devel-3.34.1-1.cm2.aarch64.rpm
 sqlite-libs-3.34.1-1.cm2.aarch64.rpm
-nss-3.44-9.cm2.aarch64.rpm
-nss-devel-3.44-9.cm2.aarch64.rpm
-nss-libs-3.44-9.cm2.aarch64.rpm
 elfutils-0.185-1.cm2.aarch64.rpm
 elfutils-default-yama-scope-0.185-1.cm2.noarch.rpm
 elfutils-devel-0.185-1.cm2.aarch64.rpm
@@ -105,62 +102,64 @@ libpipeline-devel-1.5.0-5.cm2.aarch64.rpm
 gdbm-1.21-1.cm2.aarch64.rpm
 gdbm-devel-1.21-1.cm2.aarch64.rpm
 gdbm-lang-1.21-1.cm2.aarch64.rpm
-perl-B-1.80-463.cm2.aarch64.rpm
-perl-Carp-1.50-463.cm2.noarch.rpm
-perl-Class-Struct-0.66-463.cm2.noarch.rpm
-perl-Data-Dumper-2.174-463.cm2.aarch64.rpm
-perl-DynaLoader-1.47-463.cm2.aarch64.rpm
-perl-Encode-3.06-463.cm2.aarch64.rpm
-perl-Errno-1.30-463.cm2.aarch64.rpm
-perl-Exporter-5.74-463.cm2.noarch.rpm
-perl-Fcntl-1.13-463.cm2.aarch64.rpm
-perl-File-Basename-2.85-463.cm2.noarch.rpm
-perl-File-Compare-1.100.600-463.cm2.noarch.rpm
-perl-File-Copy-2.34-463.cm2.noarch.rpm
-perl-File-Path-2.16-463.cm2.noarch.rpm
-perl-File-Temp-0.230.900-463.cm2.noarch.rpm
-perl-File-stat-1.09-463.cm2.noarch.rpm
-perl-FileHandle-2.03-463.cm2.noarch.rpm
-perl-Getopt-Long-2.51-463.cm2.noarch.rpm
-perl-Getopt-Std-1.12-463.cm2.noarch.rpm
-perl-HTTP-Tiny-0.076-463.cm2.noarch.rpm
-perl-I18N-Langinfo-0.19-463.cm2.aarch64.rpm
-perl-IO-1.43-463.cm2.aarch64.rpm
-perl-IPC-Open3-1.21-463.cm2.noarch.rpm
-perl-MIME-Base64-3.15-463.cm2.aarch64.rpm
-perl-POSIX-1.94-463.cm2.aarch64.rpm
-perl-PathTools-3.78-463.cm2.aarch64.rpm
-perl-Pod-Escapes-1.07-463.cm2.noarch.rpm
-perl-Pod-Perldoc-3.28.01-463.cm2.noarch.rpm
-perl-Pod-Simple-3.40-463.cm2.noarch.rpm
-perl-Pod-Usage-1.69-463.cm2.noarch.rpm
-perl-Scalar-List-Utils-1.55-463.cm2.aarch64.rpm
-perl-SelectSaver-1.02-463.cm2.noarch.rpm
-perl-Socket-2.029-463.cm2.aarch64.rpm
-perl-Storable-3.21-463.cm2.aarch64.rpm
-perl-Symbol-1.08-463.cm2.noarch.rpm
-perl-Term-ANSIColor-5.01-463.cm2.noarch.rpm
-perl-Term-Cap-1.17-463.cm2.noarch.rpm
-perl-Text-ParseWords-3.30-463.cm2.noarch.rpm
-perl-Text-Tabs+Wrap-2013.0523-463.cm2.noarch.rpm
-perl-Thread-Queue-3.14-463.cm2.noarch.rpm
-perl-Time-Local-1.280-463.cm2.noarch.rpm
-perl-Unicode-Normalize-1.27-463.cm2.aarch64.rpm
-perl-base-2.27-463.cm2.noarch.rpm
-perl-constant-1.33-463.cm2.noarch.rpm
-perl-if-0.60.800-463.cm2.noarch.rpm
-perl-interpreter-5.32.0-463.cm2.aarch64.rpm
-perl-libs-5.32.0-463.cm2.aarch64.rpm
-perl-locale-1.09-463.cm2.noarch.rpm
-perl-macros-5.32.0-463.cm2.noarch.rpm
-perl-overload-1.31-463.cm2.noarch.rpm
-perl-overloading-0.02-463.cm2.noarch.rpm
-perl-parent-0.238-463.cm2.noarch.rpm
-perl-podlators-4.14-463.cm2.noarch.rpm
-perl-subs-1.03-463.cm2.noarch.rpm
-perl-threads-2.25-463.cm2.aarch64.rpm
-perl-threads-shared-1.61-463.cm2.aarch64.rpm
-perl-vars-1.05-463.cm2.noarch.rpm
+perl-B-1.80-464.cm2.aarch64.rpm
+perl-Carp-1.50-464.cm2.noarch.rpm
+perl-Class-Struct-0.66-464.cm2.noarch.rpm
+perl-Data-Dumper-2.174-464.cm2.aarch64.rpm
+perl-DynaLoader-1.47-464.cm2.aarch64.rpm
+perl-Encode-3.06-464.cm2.aarch64.rpm
+perl-Errno-1.30-464.cm2.aarch64.rpm
+perl-Exporter-5.74-464.cm2.noarch.rpm
+perl-Fcntl-1.13-464.cm2.aarch64.rpm
+perl-File-Basename-2.85-464.cm2.noarch.rpm
+perl-File-Compare-1.100.600-464.cm2.noarch.rpm
+perl-File-Copy-2.34-464.cm2.noarch.rpm
+perl-File-Path-2.16-464.cm2.noarch.rpm
+perl-File-Temp-0.230.900-464.cm2.noarch.rpm
+perl-File-stat-1.09-464.cm2.noarch.rpm
+perl-FileHandle-2.03-464.cm2.noarch.rpm
+perl-Getopt-Long-2.51-464.cm2.noarch.rpm
+perl-Getopt-Std-1.12-464.cm2.noarch.rpm
+perl-HTTP-Tiny-0.076-464.cm2.noarch.rpm
+perl-I18N-Langinfo-0.19-464.cm2.aarch64.rpm
+perl-IO-1.43-464.cm2.aarch64.rpm
+perl-IPC-Open3-1.21-464.cm2.noarch.rpm
+perl-MIME-Base64-3.15-464.cm2.aarch64.rpm
+perl-POSIX-1.94-464.cm2.aarch64.rpm
+perl-PathTools-3.78-464.cm2.aarch64.rpm
+perl-Pod-Escapes-1.07-464.cm2.noarch.rpm
+perl-Pod-Perldoc-3.28.01-464.cm2.noarch.rpm
+perl-Pod-Simple-3.40-464.cm2.noarch.rpm
+perl-Pod-Usage-1.69-464.cm2.noarch.rpm
+perl-Scalar-List-Utils-1.55-464.cm2.aarch64.rpm
+perl-SelectSaver-1.02-464.cm2.noarch.rpm
+perl-Socket-2.029-464.cm2.aarch64.rpm
+perl-Storable-3.21-464.cm2.aarch64.rpm
+perl-Symbol-1.08-464.cm2.noarch.rpm
+perl-Term-ANSIColor-5.01-464.cm2.noarch.rpm
+perl-Term-Cap-1.17-464.cm2.noarch.rpm
+perl-Text-ParseWords-3.30-464.cm2.noarch.rpm
+perl-Text-Tabs+Wrap-2013.0523-464.cm2.noarch.rpm
+perl-Thread-Queue-3.14-464.cm2.noarch.rpm
+perl-Time-Local-1.280-464.cm2.noarch.rpm
+perl-Unicode-Normalize-1.27-464.cm2.aarch64.rpm
+perl-base-2.27-464.cm2.noarch.rpm
+perl-constant-1.33-464.cm2.noarch.rpm
+perl-if-0.60.800-464.cm2.noarch.rpm
+perl-interpreter-5.32.0-464.cm2.aarch64.rpm
+perl-libs-5.32.0-464.cm2.aarch64.rpm
+perl-locale-1.09-464.cm2.noarch.rpm
+perl-macros-5.32.0-464.cm2.noarch.rpm
+perl-mro-1.23-464.cm2.aarch64.rpm
+perl-overload-1.31-464.cm2.noarch.rpm
+perl-overloading-0.02-464.cm2.noarch.rpm
+perl-parent-0.238-464.cm2.noarch.rpm
+perl-podlators-4.14-464.cm2.noarch.rpm
+perl-subs-1.03-464.cm2.noarch.rpm
+perl-threads-2.25-464.cm2.aarch64.rpm
+perl-threads-shared-1.61-464.cm2.aarch64.rpm
+perl-vars-1.05-464.cm2.noarch.rpm
+perl-5.32.0-464.cm2.aarch64.rpm
 texinfo-6.8-1.cm2.aarch64.rpm
 autoconf-2.69-11.cm2.noarch.rpm
 automake-1.16.5-1.cm2.noarch.rpm
@@ -169,23 +168,22 @@ openssl-devel-1.1.1k-5.cm2.aarch64.rpm
 openssl-libs-1.1.1k-5.cm2.aarch64.rpm
 openssl-perl-1.1.1k-5.cm2.aarch64.rpm
 openssl-static-1.1.1k-5.cm2.aarch64.rpm
-openssl-debuginfo-1.1.1k-5.cm2.aarch64.rpm
 libcap-2.26-2.cm2.aarch64.rpm
 libcap-devel-2.26-2.cm2.aarch64.rpm
-libdb-5.3.28-5.cm2.aarch64.rpm
-libdb-devel-5.3.28-5.cm2.aarch64.rpm
-libdb-docs-5.3.28-5.cm2.aarch64.rpm
-rpm-4.14.2.1-4.cm2.aarch64.rpm
-rpm-build-4.14.2.1-4.cm2.aarch64.rpm
-rpm-build-libs-4.14.2.1-4.cm2.aarch64.rpm
-rpm-devel-4.14.2.1-4.cm2.aarch64.rpm
-rpm-lang-4.14.2.1-4.cm2.aarch64.rpm
-rpm-libs-4.14.2.1-4.cm2.aarch64.rpm
+debugedit-5.0-1.cm2.aarch64.rpm
+libarchive-3.4.2-3.cm2.aarch64.rpm
+libarchive-devel-3.4.2-3.cm2.aarch64.rpm
+rpm-4.17.0-1.cm2.aarch64.rpm
+rpm-build-4.17.0-1.cm2.aarch64.rpm
+rpm-build-libs-4.17.0-1.cm2.aarch64.rpm
+rpm-devel-4.17.0-1.cm2.aarch64.rpm
+rpm-lang-4.17.0-1.cm2.aarch64.rpm
+rpm-libs-4.17.0-1.cm2.aarch64.rpm
 cpio-2.13-3.cm2.aarch64.rpm
 cpio-lang-2.13-3.cm2.aarch64.rpm
 e2fsprogs-libs-1.45.6-1.cm2.aarch64.rpm
-libsolv-0.7.19-1.cm2.aarch64.rpm
-libsolv-devel-0.7.19-1.cm2.aarch64.rpm
+libsolv-0.7.19-2.cm2.aarch64.rpm
+libsolv-devel-0.7.19-2.cm2.aarch64.rpm
 libssh2-1.9.0-1.cm2.aarch64.rpm
 libssh2-devel-1.9.0-1.cm2.aarch64.rpm
 krb5-1.18-1.cm2.aarch64.rpm
@@ -207,8 +205,8 @@ pcre-8.44-3.cm2.aarch64.rpm
 pcre-libs-8.44-3.cm2.aarch64.rpm
 lua-5.3.5-11.cm2.aarch64.rpm
 lua-libs-5.3.5-11.cm2.aarch64.rpm
-mariner-rpm-macros-2.0-7.cm2.noarch.rpm
-mariner-check-macros-2.0-7.cm2.noarch.rpm
+mariner-rpm-macros-2.0-8.cm2.noarch.rpm
+mariner-check-macros-2.0-8.cm2.noarch.rpm
 libassuan-2.5.5-1.cm2.aarch64.rpm
 libassuan-devel-2.5.5-1.cm2.aarch64.rpm
 libgpg-error-1.43-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -12,8 +12,8 @@ zlib-devel-1.2.11-5.cm2.x86_64.rpm
 file-5.40-1.cm2.x86_64.rpm
 file-devel-5.40-1.cm2.x86_64.rpm
 file-libs-5.40-1.cm2.x86_64.rpm
-binutils-2.37-1.cm2.x86_64.rpm
-binutils-devel-2.37-1.cm2.x86_64.rpm
+binutils-2.37-2.cm2.x86_64.rpm
+binutils-devel-2.37-2.cm2.x86_64.rpm
 gmp-6.2.1-2.cm2.x86_64.rpm
 gmp-devel-6.2.1-2.cm2.x86_64.rpm
 mpfr-4.1.0-1.cm2.x86_64.rpm
@@ -86,9 +86,6 @@ nspr-devel-4.21-2.cm2.x86_64.rpm
 sqlite-3.34.1-1.cm2.x86_64.rpm
 sqlite-devel-3.34.1-1.cm2.x86_64.rpm
 sqlite-libs-3.34.1-1.cm2.x86_64.rpm
-nss-3.44-9.cm2.x86_64.rpm
-nss-devel-3.44-9.cm2.x86_64.rpm
-nss-libs-3.44-9.cm2.x86_64.rpm
 elfutils-0.185-1.cm2.x86_64.rpm
 elfutils-default-yama-scope-0.185-1.cm2.noarch.rpm
 elfutils-devel-0.185-1.cm2.x86_64.rpm
@@ -105,62 +102,64 @@ libpipeline-devel-1.5.0-5.cm2.x86_64.rpm
 gdbm-1.21-1.cm2.x86_64.rpm
 gdbm-devel-1.21-1.cm2.x86_64.rpm
 gdbm-lang-1.21-1.cm2.x86_64.rpm
-perl-B-1.80-463.cm2.x86_64.rpm
-perl-Carp-1.50-463.cm2.noarch.rpm
-perl-Class-Struct-0.66-463.cm2.noarch.rpm
-perl-Data-Dumper-2.174-463.cm2.x86_64.rpm
-perl-DynaLoader-1.47-463.cm2.x86_64.rpm
-perl-Encode-3.06-463.cm2.x86_64.rpm
-perl-Errno-1.30-463.cm2.x86_64.rpm
-perl-Exporter-5.74-463.cm2.noarch.rpm
-perl-Fcntl-1.13-463.cm2.x86_64.rpm
-perl-File-Basename-2.85-463.cm2.noarch.rpm
-perl-File-Compare-1.100.600-463.cm2.noarch.rpm
-perl-File-Copy-2.34-463.cm2.noarch.rpm
-perl-File-Path-2.16-463.cm2.noarch.rpm
-perl-File-Temp-0.230.900-463.cm2.noarch.rpm
-perl-File-stat-1.09-463.cm2.noarch.rpm
-perl-FileHandle-2.03-463.cm2.noarch.rpm
-perl-Getopt-Long-2.51-463.cm2.noarch.rpm
-perl-Getopt-Std-1.12-463.cm2.noarch.rpm
-perl-HTTP-Tiny-0.076-463.cm2.noarch.rpm
-perl-I18N-Langinfo-0.19-463.cm2.x86_64.rpm
-perl-IO-1.43-463.cm2.x86_64.rpm
-perl-IPC-Open3-1.21-463.cm2.noarch.rpm
-perl-MIME-Base64-3.15-463.cm2.x86_64.rpm
-perl-POSIX-1.94-463.cm2.x86_64.rpm
-perl-PathTools-3.78-463.cm2.x86_64.rpm
-perl-Pod-Escapes-1.07-463.cm2.noarch.rpm
-perl-Pod-Perldoc-3.28.01-463.cm2.noarch.rpm
-perl-Pod-Simple-3.40-463.cm2.noarch.rpm
-perl-Pod-Usage-1.69-463.cm2.noarch.rpm
-perl-Scalar-List-Utils-1.55-463.cm2.x86_64.rpm
-perl-SelectSaver-1.02-463.cm2.noarch.rpm
-perl-Socket-2.029-463.cm2.x86_64.rpm
-perl-Storable-3.21-463.cm2.x86_64.rpm
-perl-Symbol-1.08-463.cm2.noarch.rpm
-perl-Term-ANSIColor-5.01-463.cm2.noarch.rpm
-perl-Term-Cap-1.17-463.cm2.noarch.rpm
-perl-Text-ParseWords-3.30-463.cm2.noarch.rpm
-perl-Text-Tabs+Wrap-2013.0523-463.cm2.noarch.rpm
-perl-Thread-Queue-3.14-463.cm2.noarch.rpm
-perl-Time-Local-1.280-463.cm2.noarch.rpm
-perl-Unicode-Normalize-1.27-463.cm2.x86_64.rpm
-perl-base-2.27-463.cm2.noarch.rpm
-perl-constant-1.33-463.cm2.noarch.rpm
-perl-if-0.60.800-463.cm2.noarch.rpm
-perl-interpreter-5.32.0-463.cm2.x86_64.rpm
-perl-libs-5.32.0-463.cm2.x86_64.rpm
-perl-locale-1.09-463.cm2.noarch.rpm
-perl-macros-5.32.0-463.cm2.noarch.rpm
-perl-overload-1.31-463.cm2.noarch.rpm
-perl-overloading-0.02-463.cm2.noarch.rpm
-perl-parent-0.238-463.cm2.noarch.rpm
-perl-podlators-4.14-463.cm2.noarch.rpm
-perl-subs-1.03-463.cm2.noarch.rpm
-perl-threads-2.25-463.cm2.x86_64.rpm
-perl-threads-shared-1.61-463.cm2.x86_64.rpm
-perl-vars-1.05-463.cm2.noarch.rpm
+perl-B-1.80-464.cm2.x86_64.rpm
+perl-Carp-1.50-464.cm2.noarch.rpm
+perl-Class-Struct-0.66-464.cm2.noarch.rpm
+perl-Data-Dumper-2.174-464.cm2.x86_64.rpm
+perl-DynaLoader-1.47-464.cm2.x86_64.rpm
+perl-Encode-3.06-464.cm2.x86_64.rpm
+perl-Errno-1.30-464.cm2.x86_64.rpm
+perl-Exporter-5.74-464.cm2.noarch.rpm
+perl-Fcntl-1.13-464.cm2.x86_64.rpm
+perl-File-Basename-2.85-464.cm2.noarch.rpm
+perl-File-Compare-1.100.600-464.cm2.noarch.rpm
+perl-File-Copy-2.34-464.cm2.noarch.rpm
+perl-File-Path-2.16-464.cm2.noarch.rpm
+perl-File-Temp-0.230.900-464.cm2.noarch.rpm
+perl-File-stat-1.09-464.cm2.noarch.rpm
+perl-FileHandle-2.03-464.cm2.noarch.rpm
+perl-Getopt-Long-2.51-464.cm2.noarch.rpm
+perl-Getopt-Std-1.12-464.cm2.noarch.rpm
+perl-HTTP-Tiny-0.076-464.cm2.noarch.rpm
+perl-I18N-Langinfo-0.19-464.cm2.x86_64.rpm
+perl-IO-1.43-464.cm2.x86_64.rpm
+perl-IPC-Open3-1.21-464.cm2.noarch.rpm
+perl-MIME-Base64-3.15-464.cm2.x86_64.rpm
+perl-POSIX-1.94-464.cm2.x86_64.rpm
+perl-PathTools-3.78-464.cm2.x86_64.rpm
+perl-Pod-Escapes-1.07-464.cm2.noarch.rpm
+perl-Pod-Perldoc-3.28.01-464.cm2.noarch.rpm
+perl-Pod-Simple-3.40-464.cm2.noarch.rpm
+perl-Pod-Usage-1.69-464.cm2.noarch.rpm
+perl-Scalar-List-Utils-1.55-464.cm2.x86_64.rpm
+perl-SelectSaver-1.02-464.cm2.noarch.rpm
+perl-Socket-2.029-464.cm2.x86_64.rpm
+perl-Storable-3.21-464.cm2.x86_64.rpm
+perl-Symbol-1.08-464.cm2.noarch.rpm
+perl-Term-ANSIColor-5.01-464.cm2.noarch.rpm
+perl-Term-Cap-1.17-464.cm2.noarch.rpm
+perl-Text-ParseWords-3.30-464.cm2.noarch.rpm
+perl-Text-Tabs+Wrap-2013.0523-464.cm2.noarch.rpm
+perl-Thread-Queue-3.14-464.cm2.noarch.rpm
+perl-Time-Local-1.280-464.cm2.noarch.rpm
+perl-Unicode-Normalize-1.27-464.cm2.x86_64.rpm
+perl-base-2.27-464.cm2.noarch.rpm
+perl-constant-1.33-464.cm2.noarch.rpm
+perl-if-0.60.800-464.cm2.noarch.rpm
+perl-interpreter-5.32.0-464.cm2.x86_64.rpm
+perl-libs-5.32.0-464.cm2.x86_64.rpm
+perl-locale-1.09-464.cm2.noarch.rpm
+perl-macros-5.32.0-464.cm2.noarch.rpm
+perl-mro-1.23-464.cm2.x86_64.rpm
+perl-overload-1.31-464.cm2.noarch.rpm
+perl-overloading-0.02-464.cm2.noarch.rpm
+perl-parent-0.238-464.cm2.noarch.rpm
+perl-podlators-4.14-464.cm2.noarch.rpm
+perl-subs-1.03-464.cm2.noarch.rpm
+perl-threads-2.25-464.cm2.x86_64.rpm
+perl-threads-shared-1.61-464.cm2.x86_64.rpm
+perl-vars-1.05-464.cm2.noarch.rpm
+perl-5.32.0-464.cm2.x86_64.rpm
 texinfo-6.8-1.cm2.x86_64.rpm
 autoconf-2.69-11.cm2.noarch.rpm
 automake-1.16.5-1.cm2.noarch.rpm
@@ -169,23 +168,22 @@ openssl-devel-1.1.1k-5.cm2.x86_64.rpm
 openssl-libs-1.1.1k-5.cm2.x86_64.rpm
 openssl-perl-1.1.1k-5.cm2.x86_64.rpm
 openssl-static-1.1.1k-5.cm2.x86_64.rpm
-openssl-debuginfo-1.1.1k-5.cm2.x86_64.rpm
 libcap-2.26-2.cm2.x86_64.rpm
 libcap-devel-2.26-2.cm2.x86_64.rpm
-libdb-5.3.28-5.cm2.x86_64.rpm
-libdb-devel-5.3.28-5.cm2.x86_64.rpm
-libdb-docs-5.3.28-5.cm2.x86_64.rpm
-rpm-4.14.2.1-4.cm2.x86_64.rpm
-rpm-build-4.14.2.1-4.cm2.x86_64.rpm
-rpm-build-libs-4.14.2.1-4.cm2.x86_64.rpm
-rpm-devel-4.14.2.1-4.cm2.x86_64.rpm
-rpm-lang-4.14.2.1-4.cm2.x86_64.rpm
-rpm-libs-4.14.2.1-4.cm2.x86_64.rpm
+debugedit-5.0-1.cm2.x86_64.rpm
+libarchive-3.4.2-3.cm2.x86_64.rpm
+libarchive-devel-3.4.2-3.cm2.x86_64.rpm
+rpm-4.17.0-1.cm2.x86_64.rpm
+rpm-build-4.17.0-1.cm2.x86_64.rpm
+rpm-build-libs-4.17.0-1.cm2.x86_64.rpm
+rpm-devel-4.17.0-1.cm2.x86_64.rpm
+rpm-lang-4.17.0-1.cm2.x86_64.rpm
+rpm-libs-4.17.0-1.cm2.x86_64.rpm
 cpio-2.13-3.cm2.x86_64.rpm
 cpio-lang-2.13-3.cm2.x86_64.rpm
 e2fsprogs-libs-1.45.6-1.cm2.x86_64.rpm
-libsolv-0.7.19-1.cm2.x86_64.rpm
-libsolv-devel-0.7.19-1.cm2.x86_64.rpm
+libsolv-0.7.19-2.cm2.x86_64.rpm
+libsolv-devel-0.7.19-2.cm2.x86_64.rpm
 libssh2-1.9.0-1.cm2.x86_64.rpm
 libssh2-devel-1.9.0-1.cm2.x86_64.rpm
 krb5-1.18-1.cm2.x86_64.rpm
@@ -207,8 +205,8 @@ pcre-8.44-3.cm2.x86_64.rpm
 pcre-libs-8.44-3.cm2.x86_64.rpm
 lua-5.3.5-11.cm2.x86_64.rpm
 lua-libs-5.3.5-11.cm2.x86_64.rpm
-mariner-rpm-macros-2.0-7.cm2.noarch.rpm
-mariner-check-macros-2.0-7.cm2.noarch.rpm
+mariner-rpm-macros-2.0-8.cm2.noarch.rpm
+mariner-check-macros-2.0-8.cm2.noarch.rpm
 libassuan-2.5.5-1.cm2.x86_64.rpm
 libassuan-devel-2.5.5-1.cm2.x86_64.rpm
 libgpg-error-1.43-1.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -8,9 +8,9 @@ bash-5.1.8-1.cm2.aarch64.rpm
 bash-debuginfo-5.1.8-1.cm2.aarch64.rpm
 bash-devel-5.1.8-1.cm2.aarch64.rpm
 bash-lang-5.1.8-1.cm2.aarch64.rpm
-binutils-2.37-1.cm2.aarch64.rpm
-binutils-debuginfo-2.37-1.cm2.aarch64.rpm
-binutils-devel-2.37-1.cm2.aarch64.rpm
+binutils-2.37-2.cm2.aarch64.rpm
+binutils-debuginfo-2.37-2.cm2.aarch64.rpm
+binutils-devel-2.37-2.cm2.aarch64.rpm
 bison-3.7.6-1.cm2.aarch64.rpm
 bison-debuginfo-3.7.6-1.cm2.aarch64.rpm
 bzip2-1.0.8-1.cm2.aarch64.rpm
@@ -44,6 +44,8 @@ curl-7.76.0-5.cm2.aarch64.rpm
 curl-debuginfo-7.76.0-5.cm2.aarch64.rpm
 curl-devel-7.76.0-5.cm2.aarch64.rpm
 curl-libs-7.76.0-5.cm2.aarch64.rpm
+debugedit-5.0-1.cm2.aarch64.rpm
+debugedit-debuginfo-5.0-1.cm2.aarch64.rpm
 diffutils-3.8-1.cm2.aarch64.rpm
 diffutils-debuginfo-3.8-1.cm2.aarch64.rpm
 docbook-dtd-xml-4.5-11.cm2.noarch.rpm
@@ -151,11 +153,6 @@ libassuan-devel-2.5.5-1.cm2.aarch64.rpm
 libcap-2.26-2.cm2.aarch64.rpm
 libcap-debuginfo-2.26-2.cm2.aarch64.rpm
 libcap-devel-2.26-2.cm2.aarch64.rpm
-libdb-5.3.28-5.cm2.aarch64.rpm
-libdb-debuginfo-5.3.28-5.cm2.aarch64.rpm
-libdb-devel-5.3.28-5.cm2.aarch64.rpm
-libdb-docs-5.3.28-5.cm2.aarch64.rpm
-libdb-utils-5.3.28-5.cm2.aarch64.rpm
 libffi-3.2.1-12.cm2.aarch64.rpm
 libffi-debuginfo-3.2.1-12.cm2.aarch64.rpm
 libffi-devel-3.2.1-12.cm2.aarch64.rpm
@@ -191,10 +188,10 @@ libselinux-utils-3.2-1.cm2.aarch64.rpm
 libsepol-3.2-2.cm2.aarch64.rpm
 libsepol-debuginfo-3.2-2.cm2.aarch64.rpm
 libsepol-devel-3.2-2.cm2.aarch64.rpm
-libsolv-0.7.19-1.cm2.aarch64.rpm
-libsolv-debuginfo-0.7.19-1.cm2.aarch64.rpm
-libsolv-devel-0.7.19-1.cm2.aarch64.rpm
-libsolv-tools-0.7.19-1.cm2.aarch64.rpm
+libsolv-0.7.19-2.cm2.aarch64.rpm
+libsolv-debuginfo-0.7.19-2.cm2.aarch64.rpm
+libsolv-devel-0.7.19-2.cm2.aarch64.rpm
+libsolv-tools-0.7.19-2.cm2.aarch64.rpm
 libssh2-1.9.0-1.cm2.aarch64.rpm
 libssh2-debuginfo-1.9.0-1.cm2.aarch64.rpm
 libssh2-devel-1.9.0-1.cm2.aarch64.rpm
@@ -223,7 +220,7 @@ m4-1.4.18-5.cm2.aarch64.rpm
 m4-debuginfo-1.4.18-5.cm2.aarch64.rpm
 make-4.3-1.cm2.aarch64.rpm
 make-debuginfo-4.3-1.cm2.aarch64.rpm
-mariner-check-macros-2.0-7.cm2.noarch.rpm
+mariner-check-macros-2.0-8.cm2.noarch.rpm
 mariner-release-2.0-1.cm2.noarch.rpm
 mariner-repos-2.0-1.cm2.noarch.rpm
 mariner-repos-extras-2.0-1.cm2.noarch.rpm
@@ -233,7 +230,7 @@ mariner-repos-microsoft-preview-2.0-1.cm2.noarch.rpm
 mariner-repos-preview-2.0-1.cm2.noarch.rpm
 mariner-repos-ui-2.0-1.cm2.noarch.rpm
 mariner-repos-ui-preview-2.0-1.cm2.noarch.rpm
-mariner-rpm-macros-2.0-7.cm2.noarch.rpm
+mariner-rpm-macros-2.0-8.cm2.noarch.rpm
 meson-0.57.1-2.cm2.noarch.rpm
 mpfr-4.1.0-1.cm2.aarch64.rpm
 mpfr-debuginfo-4.1.0-1.cm2.aarch64.rpm
@@ -252,10 +249,6 @@ npth-devel-1.6-4.cm2.aarch64.rpm
 nspr-4.21-2.cm2.aarch64.rpm
 nspr-debuginfo-4.21-2.cm2.aarch64.rpm
 nspr-devel-4.21-2.cm2.aarch64.rpm
-nss-3.44-9.cm2.aarch64.rpm
-nss-debuginfo-3.44-9.cm2.aarch64.rpm
-nss-devel-3.44-9.cm2.aarch64.rpm
-nss-libs-3.44-9.cm2.aarch64.rpm
 openjdk8-1.8.0.292-2.cm2.aarch64.rpm
 openjdk8-debuginfo-1.8.0.292-2.cm2.aarch64.rpm
 openjdk8-doc-1.8.0.292-2.cm2.aarch64.rpm
@@ -273,212 +266,218 @@ p11-kit-debuginfo-0.23.22-3.cm2.aarch64.rpm
 p11-kit-devel-0.23.22-3.cm2.aarch64.rpm
 p11-kit-server-0.23.22-3.cm2.aarch64.rpm
 p11-kit-trust-0.23.22-3.cm2.aarch64.rpm
-pam-1.5.1-1.cm2.aarch64.rpm
-pam-debuginfo-1.5.1-1.cm2.aarch64.rpm
-pam-devel-1.5.1-1.cm2.aarch64.rpm
-pam-lang-1.5.1-1.cm2.aarch64.rpm
+pam-1.5.1-2.cm2.aarch64.rpm
+pam-debuginfo-1.5.1-2.cm2.aarch64.rpm
+pam-devel-1.5.1-2.cm2.aarch64.rpm
+pam-lang-1.5.1-2.cm2.aarch64.rpm
 patch-2.7.6-7.cm2.aarch64.rpm
 patch-debuginfo-2.7.6-7.cm2.aarch64.rpm
 pcre-8.44-3.cm2.aarch64.rpm
 pcre-debuginfo-8.44-3.cm2.aarch64.rpm
 pcre-devel-8.44-3.cm2.aarch64.rpm
 pcre-libs-8.44-3.cm2.aarch64.rpm
-perl-5.32.0-463.cm2.aarch64.rpm
-perl-Archive-Tar-2.36-463.cm2.noarch.rpm
-perl-Attribute-Handlers-1.01-463.cm2.noarch.rpm
-perl-AutoLoader-5.74-463.cm2.noarch.rpm
-perl-AutoSplit-5.74-463.cm2.noarch.rpm
-perl-B-1.80-463.cm2.aarch64.rpm
-perl-Benchmark-1.23-463.cm2.noarch.rpm
-perl-CPAN-2.27-463.cm2.noarch.rpm
-perl-CPAN-Meta-2.150010-463.cm2.noarch.rpm
-perl-CPAN-Meta-Requirements-2.140-463.cm2.noarch.rpm
-perl-CPAN-Meta-YAML-0.018-463.cm2.noarch.rpm
-perl-Carp-1.50-463.cm2.noarch.rpm
-perl-Class-Struct-0.66-463.cm2.noarch.rpm
-perl-Compress-Raw-Bzip2-2.093-463.cm2.aarch64.rpm
-perl-Compress-Raw-Zlib-2.093-463.cm2.aarch64.rpm
-perl-Config-Extensions-0.03-463.cm2.noarch.rpm
-perl-Config-Perl-V-0.32-463.cm2.noarch.rpm
-perl-DBM_Filter-0.06-463.cm2.noarch.rpm
-perl-DB_File-1.853-463.cm2.aarch64.rpm
-perl-Data-Dumper-2.174-463.cm2.aarch64.rpm
-perl-Devel-PPPort-3.57-463.cm2.aarch64.rpm
-perl-Devel-Peek-1.28-463.cm2.aarch64.rpm
-perl-Devel-SelfStubber-1.06-463.cm2.noarch.rpm
-perl-Digest-1.17-463.cm2.noarch.rpm
-perl-Digest-MD5-2.55-463.cm2.aarch64.rpm
-perl-Digest-SHA-6.02-463.cm2.aarch64.rpm
-perl-DirHandle-1.05-463.cm2.noarch.rpm
-perl-Dumpvalue-2.27-463.cm2.noarch.rpm
-perl-DynaLoader-1.47-463.cm2.aarch64.rpm
-perl-Encode-3.06-463.cm2.aarch64.rpm
-perl-Encode-devel-3.06-463.cm2.noarch.rpm
-perl-English-1.11-463.cm2.noarch.rpm
-perl-Env-1.04-463.cm2.noarch.rpm
-perl-Errno-1.30-463.cm2.aarch64.rpm
-perl-Exporter-5.74-463.cm2.noarch.rpm
-perl-ExtUtils-CBuilder-0.280234-463.cm2.noarch.rpm
-perl-ExtUtils-Command-7.44-463.cm2.noarch.rpm
-perl-ExtUtils-Constant-0.25-463.cm2.noarch.rpm
-perl-ExtUtils-Embed-1.35-463.cm2.noarch.rpm
-perl-ExtUtils-Install-2.14-463.cm2.noarch.rpm
-perl-ExtUtils-MM-Utils-7.44-463.cm2.noarch.rpm
-perl-ExtUtils-MakeMaker-7.44-463.cm2.noarch.rpm
-perl-ExtUtils-Manifest-1.72-463.cm2.noarch.rpm
-perl-ExtUtils-Miniperl-1.09-463.cm2.noarch.rpm
-perl-ExtUtils-ParseXS-3.40-463.cm2.noarch.rpm
-perl-Fcntl-1.13-463.cm2.aarch64.rpm
-perl-File-Basename-2.85-463.cm2.noarch.rpm
-perl-File-Compare-1.100.600-463.cm2.noarch.rpm
-perl-File-Copy-2.34-463.cm2.noarch.rpm
-perl-File-DosGlob-1.12-463.cm2.aarch64.rpm
-perl-File-Fetch-0.56-463.cm2.noarch.rpm
-perl-File-Find-1.37-463.cm2.noarch.rpm
-perl-File-Path-2.16-463.cm2.noarch.rpm
-perl-File-Temp-0.230.900-463.cm2.noarch.rpm
-perl-File-stat-1.09-463.cm2.noarch.rpm
-perl-FileCache-1.10-463.cm2.noarch.rpm
-perl-FileHandle-2.03-463.cm2.noarch.rpm
-perl-Filter-1.59-463.cm2.aarch64.rpm
-perl-Filter-Simple-0.96-463.cm2.noarch.rpm
-perl-FindBin-1.51-463.cm2.noarch.rpm
-perl-GDBM_File-1.18-463.cm2.aarch64.rpm
-perl-Getopt-Long-2.51-463.cm2.noarch.rpm
-perl-Getopt-Std-1.12-463.cm2.noarch.rpm
-perl-HTTP-Tiny-0.076-463.cm2.noarch.rpm
-perl-Hash-Util-0.23-463.cm2.aarch64.rpm
-perl-Hash-Util-FieldHash-1.20-463.cm2.aarch64.rpm
-perl-I18N-Collate-1.02-463.cm2.noarch.rpm
-perl-I18N-LangTags-0.44-463.cm2.noarch.rpm
-perl-I18N-Langinfo-0.19-463.cm2.aarch64.rpm
-perl-IO-1.43-463.cm2.aarch64.rpm
-perl-IO-Compress-2.093-463.cm2.noarch.rpm
-perl-IO-Socket-IP-0.39-463.cm2.noarch.rpm
-perl-IO-Zlib-1.10-463.cm2.noarch.rpm
-perl-IPC-Cmd-1.04-463.cm2.noarch.rpm
-perl-IPC-Open3-1.21-463.cm2.noarch.rpm
-perl-IPC-SysV-2.07-463.cm2.aarch64.rpm
-perl-JSON-PP-4.04-463.cm2.noarch.rpm
-perl-Locale-Maketext-1.29-463.cm2.noarch.rpm
-perl-Locale-Maketext-Simple-0.21-463.cm2.noarch.rpm
-perl-MIME-Base64-3.15-463.cm2.aarch64.rpm
-perl-Math-BigInt-1.9998.18-463.cm2.noarch.rpm
-perl-Math-BigInt-FastCalc-0.500.900-463.cm2.aarch64.rpm
-perl-Math-BigRat-0.2614-463.cm2.noarch.rpm
-perl-Math-Complex-1.59-463.cm2.noarch.rpm
-perl-Memoize-1.03-463.cm2.noarch.rpm
-perl-Module-CoreList-5.20200620-463.cm2.noarch.rpm
-perl-Module-CoreList-tools-5.20200620-463.cm2.noarch.rpm
-perl-Module-Load-0.34-463.cm2.noarch.rpm
-perl-Module-Load-Conditional-0.70-463.cm2.noarch.rpm
-perl-Module-Loaded-0.08-463.cm2.noarch.rpm
-perl-Module-Metadata-1.000037-463.cm2.noarch.rpm
-perl-NDBM_File-1.15-463.cm2.aarch64.rpm
-perl-NEXT-0.67-463.cm2.noarch.rpm
-perl-Net-1.02-463.cm2.noarch.rpm
-perl-Net-Ping-2.72-463.cm2.noarch.rpm
-perl-ODBM_File-1.16-463.cm2.aarch64.rpm
-perl-Opcode-1.47-463.cm2.aarch64.rpm
-perl-POSIX-1.94-463.cm2.aarch64.rpm
-perl-Params-Check-0.38-463.cm2.noarch.rpm
-perl-PathTools-3.78-463.cm2.aarch64.rpm
-perl-Perl-OSType-1.010-463.cm2.noarch.rpm
-perl-PerlIO-via-QuotedPrint-0.08-463.cm2.noarch.rpm
-perl-Pod-Checker-1.73-463.cm2.noarch.rpm
-perl-Pod-Escapes-1.07-463.cm2.noarch.rpm
-perl-Pod-Functions-1.13-463.cm2.noarch.rpm
-perl-Pod-Html-1.25-463.cm2.noarch.rpm
-perl-Pod-Perldoc-3.28.01-463.cm2.noarch.rpm
-perl-Pod-Simple-3.40-463.cm2.noarch.rpm
-perl-Pod-Usage-1.69-463.cm2.noarch.rpm
-perl-Safe-2.41-463.cm2.noarch.rpm
-perl-Scalar-List-Utils-1.55-463.cm2.aarch64.rpm
-perl-Search-Dict-1.07-463.cm2.noarch.rpm
-perl-SelectSaver-1.02-463.cm2.noarch.rpm
-perl-SelfLoader-1.26-463.cm2.noarch.rpm
-perl-Socket-2.029-463.cm2.aarch64.rpm
-perl-Storable-3.21-463.cm2.aarch64.rpm
-perl-Symbol-1.08-463.cm2.noarch.rpm
-perl-Sys-Hostname-1.23-463.cm2.aarch64.rpm
-perl-Sys-Syslog-0.36-463.cm2.aarch64.rpm
-perl-Term-ANSIColor-5.01-463.cm2.noarch.rpm
-perl-Term-Cap-1.17-463.cm2.noarch.rpm
-perl-Term-Complete-1.403-463.cm2.noarch.rpm
-perl-Term-ReadLine-1.17-463.cm2.noarch.rpm
-perl-Test-1.31-463.cm2.noarch.rpm
-perl-Test-Harness-3.42-463.cm2.noarch.rpm
-perl-Test-Simple-1.302175-463.cm2.noarch.rpm
+perl-5.32.0-464.cm2.aarch64.rpm
+perl-Archive-Tar-2.36-464.cm2.noarch.rpm
+perl-Attribute-Handlers-1.01-464.cm2.noarch.rpm
+perl-AutoLoader-5.74-464.cm2.noarch.rpm
+perl-AutoSplit-5.74-464.cm2.noarch.rpm
+perl-B-1.80-464.cm2.aarch64.rpm
+perl-Benchmark-1.23-464.cm2.noarch.rpm
+perl-CPAN-2.27-464.cm2.noarch.rpm
+perl-CPAN-Meta-2.150010-464.cm2.noarch.rpm
+perl-CPAN-Meta-Requirements-2.140-464.cm2.noarch.rpm
+perl-CPAN-Meta-YAML-0.018-464.cm2.noarch.rpm
+perl-Carp-1.50-464.cm2.noarch.rpm
+perl-Class-Struct-0.66-464.cm2.noarch.rpm
+perl-Compress-Raw-Bzip2-2.093-464.cm2.aarch64.rpm
+perl-Compress-Raw-Zlib-2.093-464.cm2.aarch64.rpm
+perl-Config-Extensions-0.03-464.cm2.noarch.rpm
+perl-Config-Perl-V-0.32-464.cm2.noarch.rpm
+perl-DBD-SQLite-1.62-4.cm2.aarch64.rpm
+perl-DBD-SQLite-debuginfo-1.62-4.cm2.aarch64.rpm
+perl-DBI-1.641-4.cm2.aarch64.rpm
+perl-DBI-debuginfo-1.641-4.cm2.aarch64.rpm
+perl-DBIx-Simple-1.37-3.cm2.noarch.rpm
+perl-DBM_Filter-0.06-464.cm2.noarch.rpm
+perl-DB_File-1.853-464.cm2.aarch64.rpm
+perl-Data-Dumper-2.174-464.cm2.aarch64.rpm
+perl-Devel-PPPort-3.57-464.cm2.aarch64.rpm
+perl-Devel-Peek-1.28-464.cm2.aarch64.rpm
+perl-Devel-SelfStubber-1.06-464.cm2.noarch.rpm
+perl-Digest-1.17-464.cm2.noarch.rpm
+perl-Digest-MD5-2.55-464.cm2.aarch64.rpm
+perl-Digest-SHA-6.02-464.cm2.aarch64.rpm
+perl-DirHandle-1.05-464.cm2.noarch.rpm
+perl-Dumpvalue-2.27-464.cm2.noarch.rpm
+perl-DynaLoader-1.47-464.cm2.aarch64.rpm
+perl-Encode-3.06-464.cm2.aarch64.rpm
+perl-Encode-devel-3.06-464.cm2.noarch.rpm
+perl-English-1.11-464.cm2.noarch.rpm
+perl-Env-1.04-464.cm2.noarch.rpm
+perl-Errno-1.30-464.cm2.aarch64.rpm
+perl-Exporter-5.74-464.cm2.noarch.rpm
+perl-ExtUtils-CBuilder-0.280234-464.cm2.noarch.rpm
+perl-ExtUtils-Command-7.44-464.cm2.noarch.rpm
+perl-ExtUtils-Constant-0.25-464.cm2.noarch.rpm
+perl-ExtUtils-Embed-1.35-464.cm2.noarch.rpm
+perl-ExtUtils-Install-2.14-464.cm2.noarch.rpm
+perl-ExtUtils-MM-Utils-7.44-464.cm2.noarch.rpm
+perl-ExtUtils-MakeMaker-7.44-464.cm2.noarch.rpm
+perl-ExtUtils-Manifest-1.72-464.cm2.noarch.rpm
+perl-ExtUtils-Miniperl-1.09-464.cm2.noarch.rpm
+perl-ExtUtils-ParseXS-3.40-464.cm2.noarch.rpm
+perl-Fcntl-1.13-464.cm2.aarch64.rpm
+perl-File-Basename-2.85-464.cm2.noarch.rpm
+perl-File-Compare-1.100.600-464.cm2.noarch.rpm
+perl-File-Copy-2.34-464.cm2.noarch.rpm
+perl-File-DosGlob-1.12-464.cm2.aarch64.rpm
+perl-File-Fetch-0.56-464.cm2.noarch.rpm
+perl-File-Find-1.37-464.cm2.noarch.rpm
+perl-File-Path-2.16-464.cm2.noarch.rpm
+perl-File-Temp-0.230.900-464.cm2.noarch.rpm
+perl-File-stat-1.09-464.cm2.noarch.rpm
+perl-FileCache-1.10-464.cm2.noarch.rpm
+perl-FileHandle-2.03-464.cm2.noarch.rpm
+perl-Filter-1.59-464.cm2.aarch64.rpm
+perl-Filter-Simple-0.96-464.cm2.noarch.rpm
+perl-FindBin-1.51-464.cm2.noarch.rpm
+perl-GDBM_File-1.18-464.cm2.aarch64.rpm
+perl-Getopt-Long-2.51-464.cm2.noarch.rpm
+perl-Getopt-Std-1.12-464.cm2.noarch.rpm
+perl-HTTP-Tiny-0.076-464.cm2.noarch.rpm
+perl-Hash-Util-0.23-464.cm2.aarch64.rpm
+perl-Hash-Util-FieldHash-1.20-464.cm2.aarch64.rpm
+perl-I18N-Collate-1.02-464.cm2.noarch.rpm
+perl-I18N-LangTags-0.44-464.cm2.noarch.rpm
+perl-I18N-Langinfo-0.19-464.cm2.aarch64.rpm
+perl-IO-1.43-464.cm2.aarch64.rpm
+perl-IO-Compress-2.093-464.cm2.noarch.rpm
+perl-IO-Socket-IP-0.39-464.cm2.noarch.rpm
+perl-IO-Zlib-1.10-464.cm2.noarch.rpm
+perl-IPC-Cmd-1.04-464.cm2.noarch.rpm
+perl-IPC-Open3-1.21-464.cm2.noarch.rpm
+perl-IPC-SysV-2.07-464.cm2.aarch64.rpm
+perl-JSON-PP-4.04-464.cm2.noarch.rpm
+perl-Locale-Maketext-1.29-464.cm2.noarch.rpm
+perl-Locale-Maketext-Simple-0.21-464.cm2.noarch.rpm
+perl-MIME-Base64-3.15-464.cm2.aarch64.rpm
+perl-Math-BigInt-1.9998.18-464.cm2.noarch.rpm
+perl-Math-BigInt-FastCalc-0.500.900-464.cm2.aarch64.rpm
+perl-Math-BigRat-0.2614-464.cm2.noarch.rpm
+perl-Math-Complex-1.59-464.cm2.noarch.rpm
+perl-Memoize-1.03-464.cm2.noarch.rpm
+perl-Module-CoreList-5.20200620-464.cm2.noarch.rpm
+perl-Module-CoreList-tools-5.20200620-464.cm2.noarch.rpm
+perl-Module-Load-0.34-464.cm2.noarch.rpm
+perl-Module-Load-Conditional-0.70-464.cm2.noarch.rpm
+perl-Module-Loaded-0.08-464.cm2.noarch.rpm
+perl-Module-Metadata-1.000037-464.cm2.noarch.rpm
+perl-NDBM_File-1.15-464.cm2.aarch64.rpm
+perl-NEXT-0.67-464.cm2.noarch.rpm
+perl-Net-1.02-464.cm2.noarch.rpm
+perl-Net-Ping-2.72-464.cm2.noarch.rpm
+perl-ODBM_File-1.16-464.cm2.aarch64.rpm
+perl-Object-Accessor-0.48-7.cm2.noarch.rpm
+perl-Opcode-1.47-464.cm2.aarch64.rpm
+perl-POSIX-1.94-464.cm2.aarch64.rpm
+perl-Params-Check-0.38-464.cm2.noarch.rpm
+perl-PathTools-3.78-464.cm2.aarch64.rpm
+perl-Perl-OSType-1.010-464.cm2.noarch.rpm
+perl-PerlIO-via-QuotedPrint-0.08-464.cm2.noarch.rpm
+perl-Pod-Checker-1.73-464.cm2.noarch.rpm
+perl-Pod-Escapes-1.07-464.cm2.noarch.rpm
+perl-Pod-Functions-1.13-464.cm2.noarch.rpm
+perl-Pod-Html-1.25-464.cm2.noarch.rpm
+perl-Pod-Perldoc-3.28.01-464.cm2.noarch.rpm
+perl-Pod-Simple-3.40-464.cm2.noarch.rpm
+perl-Pod-Usage-1.69-464.cm2.noarch.rpm
+perl-Safe-2.41-464.cm2.noarch.rpm
+perl-Scalar-List-Utils-1.55-464.cm2.aarch64.rpm
+perl-Search-Dict-1.07-464.cm2.noarch.rpm
+perl-SelectSaver-1.02-464.cm2.noarch.rpm
+perl-SelfLoader-1.26-464.cm2.noarch.rpm
+perl-Socket-2.029-464.cm2.aarch64.rpm
+perl-Storable-3.21-464.cm2.aarch64.rpm
+perl-Symbol-1.08-464.cm2.noarch.rpm
+perl-Sys-Hostname-1.23-464.cm2.aarch64.rpm
+perl-Sys-Syslog-0.36-464.cm2.aarch64.rpm
+perl-Term-ANSIColor-5.01-464.cm2.noarch.rpm
+perl-Term-Cap-1.17-464.cm2.noarch.rpm
+perl-Term-Complete-1.403-464.cm2.noarch.rpm
+perl-Term-ReadLine-1.17-464.cm2.noarch.rpm
+perl-Test-1.31-464.cm2.noarch.rpm
+perl-Test-Harness-3.42-464.cm2.noarch.rpm
+perl-Test-Simple-1.302175-464.cm2.noarch.rpm
 perl-Test-Warnings-0.028-4.cm2.noarch.rpm
-perl-Text-Abbrev-1.02-463.cm2.noarch.rpm
-perl-Text-Balanced-2.03-463.cm2.noarch.rpm
-perl-Text-ParseWords-3.30-463.cm2.noarch.rpm
-perl-Text-Tabs+Wrap-2013.0523-463.cm2.noarch.rpm
+perl-Text-Abbrev-1.02-464.cm2.noarch.rpm
+perl-Text-Balanced-2.03-464.cm2.noarch.rpm
+perl-Text-ParseWords-3.30-464.cm2.noarch.rpm
+perl-Text-Tabs+Wrap-2013.0523-464.cm2.noarch.rpm
 perl-Text-Template-1.51-3.cm2.noarch.rpm
-perl-Thread-3.05-463.cm2.noarch.rpm
-perl-Thread-Queue-3.14-463.cm2.noarch.rpm
-perl-Thread-Semaphore-2.13-463.cm2.noarch.rpm
-perl-Tie-4.6-463.cm2.noarch.rpm
-perl-Tie-File-1.06-463.cm2.noarch.rpm
-perl-Tie-Memoize-1.1-463.cm2.noarch.rpm
-perl-Tie-RefHash-1.39-463.cm2.noarch.rpm
-perl-Time-1.03-463.cm2.noarch.rpm
-perl-Time-HiRes-1.9764-463.cm2.aarch64.rpm
-perl-Time-Local-1.280-463.cm2.noarch.rpm
-perl-Time-Piece-1.3401-463.cm2.aarch64.rpm
-perl-Unicode-Collate-1.27-463.cm2.aarch64.rpm
-perl-Unicode-Normalize-1.27-463.cm2.aarch64.rpm
-perl-Unicode-UCD-0.75-463.cm2.noarch.rpm
-perl-User-pwent-1.03-463.cm2.noarch.rpm
+perl-Thread-3.05-464.cm2.noarch.rpm
+perl-Thread-Queue-3.14-464.cm2.noarch.rpm
+perl-Thread-Semaphore-2.13-464.cm2.noarch.rpm
+perl-Tie-4.6-464.cm2.noarch.rpm
+perl-Tie-File-1.06-464.cm2.noarch.rpm
+perl-Tie-Memoize-1.1-464.cm2.noarch.rpm
+perl-Tie-RefHash-1.39-464.cm2.noarch.rpm
+perl-Time-1.03-464.cm2.noarch.rpm
+perl-Time-HiRes-1.9764-464.cm2.aarch64.rpm
+perl-Time-Local-1.280-464.cm2.noarch.rpm
+perl-Time-Piece-1.3401-464.cm2.aarch64.rpm
+perl-Unicode-Collate-1.27-464.cm2.aarch64.rpm
+perl-Unicode-Normalize-1.27-464.cm2.aarch64.rpm
+perl-Unicode-UCD-0.75-464.cm2.noarch.rpm
+perl-User-pwent-1.03-464.cm2.noarch.rpm
 perl-XML-Parser-2.44-11.cm2.aarch64.rpm
 perl-XML-Parser-debuginfo-2.44-11.cm2.aarch64.rpm
-perl-autodie-2.32-463.cm2.noarch.rpm
-perl-autouse-1.11-463.cm2.noarch.rpm
-perl-base-2.27-463.cm2.noarch.rpm
-perl-bignum-0.51-463.cm2.noarch.rpm
-perl-blib-1.07-463.cm2.noarch.rpm
-perl-constant-1.33-463.cm2.noarch.rpm
-perl-debugger-1.56-463.cm2.noarch.rpm
-perl-debuginfo-5.32.0-463.cm2.aarch64.rpm
-perl-deprecate-0.04-463.cm2.noarch.rpm
-perl-devel-5.32.0-463.cm2.aarch64.rpm
-perl-diagnostics-1.37-463.cm2.noarch.rpm
-perl-doc-5.32.0-463.cm2.noarch.rpm
-perl-encoding-3.00-463.cm2.aarch64.rpm
-perl-encoding-warnings-0.13-463.cm2.noarch.rpm
-perl-experimental-0.020-463.cm2.noarch.rpm
-perl-fields-2.27-463.cm2.noarch.rpm
-perl-filetest-1.03-463.cm2.noarch.rpm
-perl-if-0.60.800-463.cm2.noarch.rpm
-perl-interpreter-5.32.0-463.cm2.aarch64.rpm
-perl-less-0.03-463.cm2.noarch.rpm
-perl-lib-0.65-463.cm2.aarch64.rpm
+perl-autodie-2.32-464.cm2.noarch.rpm
+perl-autouse-1.11-464.cm2.noarch.rpm
+perl-base-2.27-464.cm2.noarch.rpm
+perl-bignum-0.51-464.cm2.noarch.rpm
+perl-blib-1.07-464.cm2.noarch.rpm
+perl-constant-1.33-464.cm2.noarch.rpm
+perl-debugger-1.56-464.cm2.noarch.rpm
+perl-debuginfo-5.32.0-464.cm2.aarch64.rpm
+perl-deprecate-0.04-464.cm2.noarch.rpm
+perl-devel-5.32.0-464.cm2.aarch64.rpm
+perl-diagnostics-1.37-464.cm2.noarch.rpm
+perl-doc-5.32.0-464.cm2.noarch.rpm
+perl-encoding-3.00-464.cm2.aarch64.rpm
+perl-encoding-warnings-0.13-464.cm2.noarch.rpm
+perl-experimental-0.020-464.cm2.noarch.rpm
+perl-fields-2.27-464.cm2.noarch.rpm
+perl-filetest-1.03-464.cm2.noarch.rpm
+perl-if-0.60.800-464.cm2.noarch.rpm
+perl-interpreter-5.32.0-464.cm2.aarch64.rpm
+perl-less-0.03-464.cm2.noarch.rpm
+perl-lib-0.65-464.cm2.aarch64.rpm
 perl-libintl-perl-1.29-5.cm2.aarch64.rpm
 perl-libintl-perl-debuginfo-1.29-5.cm2.aarch64.rpm
-perl-libnet-3.11-463.cm2.noarch.rpm
-perl-libnetcfg-5.32.0-463.cm2.noarch.rpm
-perl-libs-5.32.0-463.cm2.aarch64.rpm
-perl-locale-1.09-463.cm2.noarch.rpm
-perl-macros-5.32.0-463.cm2.noarch.rpm
-perl-meta-notation-5.32.0-463.cm2.noarch.rpm
-perl-mro-1.23-463.cm2.aarch64.rpm
-perl-open-1.12-463.cm2.noarch.rpm
-perl-overload-1.31-463.cm2.noarch.rpm
-perl-overloading-0.02-463.cm2.noarch.rpm
-perl-parent-0.238-463.cm2.noarch.rpm
-perl-perlfaq-5.20200523-463.cm2.noarch.rpm
-perl-ph-5.32.0-463.cm2.aarch64.rpm
-perl-podlators-4.14-463.cm2.noarch.rpm
-perl-sigtrap-1.09-463.cm2.noarch.rpm
-perl-sort-2.04-463.cm2.noarch.rpm
-perl-subs-1.03-463.cm2.noarch.rpm
-perl-tests-5.32.0-463.cm2.aarch64.rpm
-perl-threads-2.25-463.cm2.aarch64.rpm
-perl-threads-shared-1.61-463.cm2.aarch64.rpm
-perl-utils-5.32.0-463.cm2.noarch.rpm
-perl-vars-1.05-463.cm2.noarch.rpm
-perl-version-0.99.24-463.cm2.noarch.rpm
-perl-vmsish-1.04-463.cm2.noarch.rpm
+perl-libnet-3.11-464.cm2.noarch.rpm
+perl-libnetcfg-5.32.0-464.cm2.noarch.rpm
+perl-libs-5.32.0-464.cm2.aarch64.rpm
+perl-locale-1.09-464.cm2.noarch.rpm
+perl-macros-5.32.0-464.cm2.noarch.rpm
+perl-meta-notation-5.32.0-464.cm2.noarch.rpm
+perl-mro-1.23-464.cm2.aarch64.rpm
+perl-open-1.12-464.cm2.noarch.rpm
+perl-overload-1.31-464.cm2.noarch.rpm
+perl-overloading-0.02-464.cm2.noarch.rpm
+perl-parent-0.238-464.cm2.noarch.rpm
+perl-perlfaq-5.20200523-464.cm2.noarch.rpm
+perl-ph-5.32.0-464.cm2.aarch64.rpm
+perl-podlators-4.14-464.cm2.noarch.rpm
+perl-sigtrap-1.09-464.cm2.noarch.rpm
+perl-sort-2.04-464.cm2.noarch.rpm
+perl-subs-1.03-464.cm2.noarch.rpm
+perl-tests-5.32.0-464.cm2.aarch64.rpm
+perl-threads-2.25-464.cm2.aarch64.rpm
+perl-threads-shared-1.61-464.cm2.aarch64.rpm
+perl-utils-5.32.0-464.cm2.noarch.rpm
+perl-vars-1.05-464.cm2.noarch.rpm
+perl-version-0.99.24-464.cm2.noarch.rpm
+perl-vmsish-1.04-464.cm2.noarch.rpm
 pinentry-1.2.0-1.cm2.aarch64.rpm
 pinentry-debuginfo-1.2.0-1.cm2.aarch64.rpm
 pkgconf-1.7.0-3.cm2.aarch64.rpm
@@ -505,7 +504,7 @@ python3-libxml2-2.9.12-2.cm2.aarch64.rpm
 python3-magic-5.40-1.cm2.noarch.rpm
 python3-markupsafe-1.1.1-3.cm2.aarch64.rpm
 python3-pip-3.7.10-3.cm2.noarch.rpm
-python3-rpm-4.14.2.1-4.cm2.aarch64.rpm
+python3-rpm-4.17.0-1.cm2.aarch64.rpm
 python3-setuptools-3.7.10-3.cm2.noarch.rpm
 python3-test-3.7.10-3.cm2.aarch64.rpm
 python3-tools-3.7.10-3.cm2.aarch64.rpm
@@ -514,13 +513,13 @@ python-markupsafe-debuginfo-1.1.1-3.cm2.aarch64.rpm
 readline-7.0-5.cm2.aarch64.rpm
 readline-debuginfo-7.0-5.cm2.aarch64.rpm
 readline-devel-7.0-5.cm2.aarch64.rpm
-rpm-4.14.2.1-4.cm2.aarch64.rpm
-rpm-build-4.14.2.1-4.cm2.aarch64.rpm
-rpm-build-libs-4.14.2.1-4.cm2.aarch64.rpm
-rpm-debuginfo-4.14.2.1-4.cm2.aarch64.rpm
-rpm-devel-4.14.2.1-4.cm2.aarch64.rpm
-rpm-lang-4.14.2.1-4.cm2.aarch64.rpm
-rpm-libs-4.14.2.1-4.cm2.aarch64.rpm
+rpm-4.17.0-1.cm2.aarch64.rpm
+rpm-build-4.17.0-1.cm2.aarch64.rpm
+rpm-build-libs-4.17.0-1.cm2.aarch64.rpm
+rpm-debuginfo-4.17.0-1.cm2.aarch64.rpm
+rpm-devel-4.17.0-1.cm2.aarch64.rpm
+rpm-lang-4.17.0-1.cm2.aarch64.rpm
+rpm-libs-4.17.0-1.cm2.aarch64.rpm
 sed-4.8-1.cm2.aarch64.rpm
 sed-debuginfo-4.8-1.cm2.aarch64.rpm
 sed-lang-4.8-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -8,9 +8,9 @@ bash-5.1.8-1.cm2.x86_64.rpm
 bash-debuginfo-5.1.8-1.cm2.x86_64.rpm
 bash-devel-5.1.8-1.cm2.x86_64.rpm
 bash-lang-5.1.8-1.cm2.x86_64.rpm
-binutils-2.37-1.cm2.x86_64.rpm
-binutils-debuginfo-2.37-1.cm2.x86_64.rpm
-binutils-devel-2.37-1.cm2.x86_64.rpm
+binutils-2.37-2.cm2.x86_64.rpm
+binutils-debuginfo-2.37-2.cm2.x86_64.rpm
+binutils-devel-2.37-2.cm2.x86_64.rpm
 bison-3.7.6-1.cm2.x86_64.rpm
 bison-debuginfo-3.7.6-1.cm2.x86_64.rpm
 bzip2-1.0.8-1.cm2.x86_64.rpm
@@ -44,6 +44,8 @@ curl-7.76.0-5.cm2.x86_64.rpm
 curl-debuginfo-7.76.0-5.cm2.x86_64.rpm
 curl-devel-7.76.0-5.cm2.x86_64.rpm
 curl-libs-7.76.0-5.cm2.x86_64.rpm
+debugedit-5.0-1.cm2.x86_64.rpm
+debugedit-debuginfo-5.0-1.cm2.x86_64.rpm
 diffutils-3.8-1.cm2.x86_64.rpm
 diffutils-debuginfo-3.8-1.cm2.x86_64.rpm
 docbook-dtd-xml-4.5-11.cm2.noarch.rpm
@@ -151,11 +153,6 @@ libassuan-devel-2.5.5-1.cm2.x86_64.rpm
 libcap-2.26-2.cm2.x86_64.rpm
 libcap-debuginfo-2.26-2.cm2.x86_64.rpm
 libcap-devel-2.26-2.cm2.x86_64.rpm
-libdb-5.3.28-5.cm2.x86_64.rpm
-libdb-debuginfo-5.3.28-5.cm2.x86_64.rpm
-libdb-devel-5.3.28-5.cm2.x86_64.rpm
-libdb-docs-5.3.28-5.cm2.x86_64.rpm
-libdb-utils-5.3.28-5.cm2.x86_64.rpm
 libffi-3.2.1-12.cm2.x86_64.rpm
 libffi-debuginfo-3.2.1-12.cm2.x86_64.rpm
 libffi-devel-3.2.1-12.cm2.x86_64.rpm
@@ -191,10 +188,10 @@ libselinux-utils-3.2-1.cm2.x86_64.rpm
 libsepol-3.2-2.cm2.x86_64.rpm
 libsepol-debuginfo-3.2-2.cm2.x86_64.rpm
 libsepol-devel-3.2-2.cm2.x86_64.rpm
-libsolv-0.7.19-1.cm2.x86_64.rpm
-libsolv-debuginfo-0.7.19-1.cm2.x86_64.rpm
-libsolv-devel-0.7.19-1.cm2.x86_64.rpm
-libsolv-tools-0.7.19-1.cm2.x86_64.rpm
+libsolv-0.7.19-2.cm2.x86_64.rpm
+libsolv-debuginfo-0.7.19-2.cm2.x86_64.rpm
+libsolv-devel-0.7.19-2.cm2.x86_64.rpm
+libsolv-tools-0.7.19-2.cm2.x86_64.rpm
 libssh2-1.9.0-1.cm2.x86_64.rpm
 libssh2-debuginfo-1.9.0-1.cm2.x86_64.rpm
 libssh2-devel-1.9.0-1.cm2.x86_64.rpm
@@ -223,7 +220,7 @@ m4-1.4.18-5.cm2.x86_64.rpm
 m4-debuginfo-1.4.18-5.cm2.x86_64.rpm
 make-4.3-1.cm2.x86_64.rpm
 make-debuginfo-4.3-1.cm2.x86_64.rpm
-mariner-check-macros-2.0-7.cm2.noarch.rpm
+mariner-check-macros-2.0-8.cm2.noarch.rpm
 mariner-release-2.0-1.cm2.noarch.rpm
 mariner-repos-2.0-1.cm2.noarch.rpm
 mariner-repos-extras-2.0-1.cm2.noarch.rpm
@@ -233,7 +230,7 @@ mariner-repos-microsoft-preview-2.0-1.cm2.noarch.rpm
 mariner-repos-preview-2.0-1.cm2.noarch.rpm
 mariner-repos-ui-2.0-1.cm2.noarch.rpm
 mariner-repos-ui-preview-2.0-1.cm2.noarch.rpm
-mariner-rpm-macros-2.0-7.cm2.noarch.rpm
+mariner-rpm-macros-2.0-8.cm2.noarch.rpm
 meson-0.57.1-2.cm2.noarch.rpm
 mpfr-4.1.0-1.cm2.x86_64.rpm
 mpfr-debuginfo-4.1.0-1.cm2.x86_64.rpm
@@ -252,10 +249,6 @@ npth-devel-1.6-4.cm2.x86_64.rpm
 nspr-4.21-2.cm2.x86_64.rpm
 nspr-debuginfo-4.21-2.cm2.x86_64.rpm
 nspr-devel-4.21-2.cm2.x86_64.rpm
-nss-3.44-9.cm2.x86_64.rpm
-nss-debuginfo-3.44-9.cm2.x86_64.rpm
-nss-devel-3.44-9.cm2.x86_64.rpm
-nss-libs-3.44-9.cm2.x86_64.rpm
 openjdk8-1.8.0.302-1.cm2.x86_64.rpm
 openjdk8-debuginfo-1.8.0.302-1.cm2.x86_64.rpm
 openjdk8-doc-1.8.0.302-1.cm2.x86_64.rpm
@@ -273,212 +266,218 @@ p11-kit-debuginfo-0.23.22-3.cm2.x86_64.rpm
 p11-kit-devel-0.23.22-3.cm2.x86_64.rpm
 p11-kit-server-0.23.22-3.cm2.x86_64.rpm
 p11-kit-trust-0.23.22-3.cm2.x86_64.rpm
-pam-1.5.1-1.cm2.x86_64.rpm
-pam-debuginfo-1.5.1-1.cm2.x86_64.rpm
-pam-devel-1.5.1-1.cm2.x86_64.rpm
-pam-lang-1.5.1-1.cm2.x86_64.rpm
+pam-1.5.1-2.cm2.x86_64.rpm
+pam-debuginfo-1.5.1-2.cm2.x86_64.rpm
+pam-devel-1.5.1-2.cm2.x86_64.rpm
+pam-lang-1.5.1-2.cm2.x86_64.rpm
 patch-2.7.6-7.cm2.x86_64.rpm
 patch-debuginfo-2.7.6-7.cm2.x86_64.rpm
 pcre-8.44-3.cm2.x86_64.rpm
 pcre-debuginfo-8.44-3.cm2.x86_64.rpm
 pcre-devel-8.44-3.cm2.x86_64.rpm
 pcre-libs-8.44-3.cm2.x86_64.rpm
-perl-5.32.0-463.cm2.x86_64.rpm
-perl-Archive-Tar-2.36-463.cm2.noarch.rpm
-perl-Attribute-Handlers-1.01-463.cm2.noarch.rpm
-perl-AutoLoader-5.74-463.cm2.noarch.rpm
-perl-AutoSplit-5.74-463.cm2.noarch.rpm
-perl-B-1.80-463.cm2.x86_64.rpm
-perl-Benchmark-1.23-463.cm2.noarch.rpm
-perl-CPAN-2.27-463.cm2.noarch.rpm
-perl-CPAN-Meta-2.150010-463.cm2.noarch.rpm
-perl-CPAN-Meta-Requirements-2.140-463.cm2.noarch.rpm
-perl-CPAN-Meta-YAML-0.018-463.cm2.noarch.rpm
-perl-Carp-1.50-463.cm2.noarch.rpm
-perl-Class-Struct-0.66-463.cm2.noarch.rpm
-perl-Compress-Raw-Bzip2-2.093-463.cm2.x86_64.rpm
-perl-Compress-Raw-Zlib-2.093-463.cm2.x86_64.rpm
-perl-Config-Extensions-0.03-463.cm2.noarch.rpm
-perl-Config-Perl-V-0.32-463.cm2.noarch.rpm
-perl-DBM_Filter-0.06-463.cm2.noarch.rpm
-perl-DB_File-1.853-463.cm2.x86_64.rpm
-perl-Data-Dumper-2.174-463.cm2.x86_64.rpm
-perl-Devel-PPPort-3.57-463.cm2.x86_64.rpm
-perl-Devel-Peek-1.28-463.cm2.x86_64.rpm
-perl-Devel-SelfStubber-1.06-463.cm2.noarch.rpm
-perl-Digest-1.17-463.cm2.noarch.rpm
-perl-Digest-MD5-2.55-463.cm2.x86_64.rpm
-perl-Digest-SHA-6.02-463.cm2.x86_64.rpm
-perl-DirHandle-1.05-463.cm2.noarch.rpm
-perl-Dumpvalue-2.27-463.cm2.noarch.rpm
-perl-DynaLoader-1.47-463.cm2.x86_64.rpm
-perl-Encode-3.06-463.cm2.x86_64.rpm
-perl-Encode-devel-3.06-463.cm2.noarch.rpm
-perl-English-1.11-463.cm2.noarch.rpm
-perl-Env-1.04-463.cm2.noarch.rpm
-perl-Errno-1.30-463.cm2.x86_64.rpm
-perl-Exporter-5.74-463.cm2.noarch.rpm
-perl-ExtUtils-CBuilder-0.280234-463.cm2.noarch.rpm
-perl-ExtUtils-Command-7.44-463.cm2.noarch.rpm
-perl-ExtUtils-Constant-0.25-463.cm2.noarch.rpm
-perl-ExtUtils-Embed-1.35-463.cm2.noarch.rpm
-perl-ExtUtils-Install-2.14-463.cm2.noarch.rpm
-perl-ExtUtils-MM-Utils-7.44-463.cm2.noarch.rpm
-perl-ExtUtils-MakeMaker-7.44-463.cm2.noarch.rpm
-perl-ExtUtils-Manifest-1.72-463.cm2.noarch.rpm
-perl-ExtUtils-Miniperl-1.09-463.cm2.noarch.rpm
-perl-ExtUtils-ParseXS-3.40-463.cm2.noarch.rpm
-perl-Fcntl-1.13-463.cm2.x86_64.rpm
-perl-File-Basename-2.85-463.cm2.noarch.rpm
-perl-File-Compare-1.100.600-463.cm2.noarch.rpm
-perl-File-Copy-2.34-463.cm2.noarch.rpm
-perl-File-DosGlob-1.12-463.cm2.x86_64.rpm
-perl-File-Fetch-0.56-463.cm2.noarch.rpm
-perl-File-Find-1.37-463.cm2.noarch.rpm
-perl-File-Path-2.16-463.cm2.noarch.rpm
-perl-File-Temp-0.230.900-463.cm2.noarch.rpm
-perl-File-stat-1.09-463.cm2.noarch.rpm
-perl-FileCache-1.10-463.cm2.noarch.rpm
-perl-FileHandle-2.03-463.cm2.noarch.rpm
-perl-Filter-1.59-463.cm2.x86_64.rpm
-perl-Filter-Simple-0.96-463.cm2.noarch.rpm
-perl-FindBin-1.51-463.cm2.noarch.rpm
-perl-GDBM_File-1.18-463.cm2.x86_64.rpm
-perl-Getopt-Long-2.51-463.cm2.noarch.rpm
-perl-Getopt-Std-1.12-463.cm2.noarch.rpm
-perl-HTTP-Tiny-0.076-463.cm2.noarch.rpm
-perl-Hash-Util-0.23-463.cm2.x86_64.rpm
-perl-Hash-Util-FieldHash-1.20-463.cm2.x86_64.rpm
-perl-I18N-Collate-1.02-463.cm2.noarch.rpm
-perl-I18N-LangTags-0.44-463.cm2.noarch.rpm
-perl-I18N-Langinfo-0.19-463.cm2.x86_64.rpm
-perl-IO-1.43-463.cm2.x86_64.rpm
-perl-IO-Compress-2.093-463.cm2.noarch.rpm
-perl-IO-Socket-IP-0.39-463.cm2.noarch.rpm
-perl-IO-Zlib-1.10-463.cm2.noarch.rpm
-perl-IPC-Cmd-1.04-463.cm2.noarch.rpm
-perl-IPC-Open3-1.21-463.cm2.noarch.rpm
-perl-IPC-SysV-2.07-463.cm2.x86_64.rpm
-perl-JSON-PP-4.04-463.cm2.noarch.rpm
-perl-Locale-Maketext-1.29-463.cm2.noarch.rpm
-perl-Locale-Maketext-Simple-0.21-463.cm2.noarch.rpm
-perl-MIME-Base64-3.15-463.cm2.x86_64.rpm
-perl-Math-BigInt-1.9998.18-463.cm2.noarch.rpm
-perl-Math-BigInt-FastCalc-0.500.900-463.cm2.x86_64.rpm
-perl-Math-BigRat-0.2614-463.cm2.noarch.rpm
-perl-Math-Complex-1.59-463.cm2.noarch.rpm
-perl-Memoize-1.03-463.cm2.noarch.rpm
-perl-Module-CoreList-5.20200620-463.cm2.noarch.rpm
-perl-Module-CoreList-tools-5.20200620-463.cm2.noarch.rpm
-perl-Module-Load-0.34-463.cm2.noarch.rpm
-perl-Module-Load-Conditional-0.70-463.cm2.noarch.rpm
-perl-Module-Loaded-0.08-463.cm2.noarch.rpm
-perl-Module-Metadata-1.000037-463.cm2.noarch.rpm
-perl-NDBM_File-1.15-463.cm2.x86_64.rpm
-perl-NEXT-0.67-463.cm2.noarch.rpm
-perl-Net-1.02-463.cm2.noarch.rpm
-perl-Net-Ping-2.72-463.cm2.noarch.rpm
-perl-ODBM_File-1.16-463.cm2.x86_64.rpm
-perl-Opcode-1.47-463.cm2.x86_64.rpm
-perl-POSIX-1.94-463.cm2.x86_64.rpm
-perl-Params-Check-0.38-463.cm2.noarch.rpm
-perl-PathTools-3.78-463.cm2.x86_64.rpm
-perl-Perl-OSType-1.010-463.cm2.noarch.rpm
-perl-PerlIO-via-QuotedPrint-0.08-463.cm2.noarch.rpm
-perl-Pod-Checker-1.73-463.cm2.noarch.rpm
-perl-Pod-Escapes-1.07-463.cm2.noarch.rpm
-perl-Pod-Functions-1.13-463.cm2.noarch.rpm
-perl-Pod-Html-1.25-463.cm2.noarch.rpm
-perl-Pod-Perldoc-3.28.01-463.cm2.noarch.rpm
-perl-Pod-Simple-3.40-463.cm2.noarch.rpm
-perl-Pod-Usage-1.69-463.cm2.noarch.rpm
-perl-Safe-2.41-463.cm2.noarch.rpm
-perl-Scalar-List-Utils-1.55-463.cm2.x86_64.rpm
-perl-Search-Dict-1.07-463.cm2.noarch.rpm
-perl-SelectSaver-1.02-463.cm2.noarch.rpm
-perl-SelfLoader-1.26-463.cm2.noarch.rpm
-perl-Socket-2.029-463.cm2.x86_64.rpm
-perl-Storable-3.21-463.cm2.x86_64.rpm
-perl-Symbol-1.08-463.cm2.noarch.rpm
-perl-Sys-Hostname-1.23-463.cm2.x86_64.rpm
-perl-Sys-Syslog-0.36-463.cm2.x86_64.rpm
-perl-Term-ANSIColor-5.01-463.cm2.noarch.rpm
-perl-Term-Cap-1.17-463.cm2.noarch.rpm
-perl-Term-Complete-1.403-463.cm2.noarch.rpm
-perl-Term-ReadLine-1.17-463.cm2.noarch.rpm
-perl-Test-1.31-463.cm2.noarch.rpm
-perl-Test-Harness-3.42-463.cm2.noarch.rpm
-perl-Test-Simple-1.302175-463.cm2.noarch.rpm
+perl-5.32.0-464.cm2.x86_64.rpm
+perl-Archive-Tar-2.36-464.cm2.noarch.rpm
+perl-Attribute-Handlers-1.01-464.cm2.noarch.rpm
+perl-AutoLoader-5.74-464.cm2.noarch.rpm
+perl-AutoSplit-5.74-464.cm2.noarch.rpm
+perl-B-1.80-464.cm2.x86_64.rpm
+perl-Benchmark-1.23-464.cm2.noarch.rpm
+perl-CPAN-2.27-464.cm2.noarch.rpm
+perl-CPAN-Meta-2.150010-464.cm2.noarch.rpm
+perl-CPAN-Meta-Requirements-2.140-464.cm2.noarch.rpm
+perl-CPAN-Meta-YAML-0.018-464.cm2.noarch.rpm
+perl-Carp-1.50-464.cm2.noarch.rpm
+perl-Class-Struct-0.66-464.cm2.noarch.rpm
+perl-Compress-Raw-Bzip2-2.093-464.cm2.x86_64.rpm
+perl-Compress-Raw-Zlib-2.093-464.cm2.x86_64.rpm
+perl-Config-Extensions-0.03-464.cm2.noarch.rpm
+perl-Config-Perl-V-0.32-464.cm2.noarch.rpm
+perl-DBD-SQLite-1.62-4.cm2.x86_64.rpm
+perl-DBD-SQLite-debuginfo-1.62-4.cm2.x86_64.rpm
+perl-DBI-1.641-4.cm2.x86_64.rpm
+perl-DBI-debuginfo-1.641-4.cm2.x86_64.rpm
+perl-DBIx-Simple-1.37-3.cm2.noarch.rpm
+perl-DBM_Filter-0.06-464.cm2.noarch.rpm
+perl-DB_File-1.853-464.cm2.x86_64.rpm
+perl-Data-Dumper-2.174-464.cm2.x86_64.rpm
+perl-Devel-PPPort-3.57-464.cm2.x86_64.rpm
+perl-Devel-Peek-1.28-464.cm2.x86_64.rpm
+perl-Devel-SelfStubber-1.06-464.cm2.noarch.rpm
+perl-Digest-1.17-464.cm2.noarch.rpm
+perl-Digest-MD5-2.55-464.cm2.x86_64.rpm
+perl-Digest-SHA-6.02-464.cm2.x86_64.rpm
+perl-DirHandle-1.05-464.cm2.noarch.rpm
+perl-Dumpvalue-2.27-464.cm2.noarch.rpm
+perl-DynaLoader-1.47-464.cm2.x86_64.rpm
+perl-Encode-3.06-464.cm2.x86_64.rpm
+perl-Encode-devel-3.06-464.cm2.noarch.rpm
+perl-English-1.11-464.cm2.noarch.rpm
+perl-Env-1.04-464.cm2.noarch.rpm
+perl-Errno-1.30-464.cm2.x86_64.rpm
+perl-Exporter-5.74-464.cm2.noarch.rpm
+perl-ExtUtils-CBuilder-0.280234-464.cm2.noarch.rpm
+perl-ExtUtils-Command-7.44-464.cm2.noarch.rpm
+perl-ExtUtils-Constant-0.25-464.cm2.noarch.rpm
+perl-ExtUtils-Embed-1.35-464.cm2.noarch.rpm
+perl-ExtUtils-Install-2.14-464.cm2.noarch.rpm
+perl-ExtUtils-MM-Utils-7.44-464.cm2.noarch.rpm
+perl-ExtUtils-MakeMaker-7.44-464.cm2.noarch.rpm
+perl-ExtUtils-Manifest-1.72-464.cm2.noarch.rpm
+perl-ExtUtils-Miniperl-1.09-464.cm2.noarch.rpm
+perl-ExtUtils-ParseXS-3.40-464.cm2.noarch.rpm
+perl-Fcntl-1.13-464.cm2.x86_64.rpm
+perl-File-Basename-2.85-464.cm2.noarch.rpm
+perl-File-Compare-1.100.600-464.cm2.noarch.rpm
+perl-File-Copy-2.34-464.cm2.noarch.rpm
+perl-File-DosGlob-1.12-464.cm2.x86_64.rpm
+perl-File-Fetch-0.56-464.cm2.noarch.rpm
+perl-File-Find-1.37-464.cm2.noarch.rpm
+perl-File-Path-2.16-464.cm2.noarch.rpm
+perl-File-Temp-0.230.900-464.cm2.noarch.rpm
+perl-File-stat-1.09-464.cm2.noarch.rpm
+perl-FileCache-1.10-464.cm2.noarch.rpm
+perl-FileHandle-2.03-464.cm2.noarch.rpm
+perl-Filter-1.59-464.cm2.x86_64.rpm
+perl-Filter-Simple-0.96-464.cm2.noarch.rpm
+perl-FindBin-1.51-464.cm2.noarch.rpm
+perl-GDBM_File-1.18-464.cm2.x86_64.rpm
+perl-Getopt-Long-2.51-464.cm2.noarch.rpm
+perl-Getopt-Std-1.12-464.cm2.noarch.rpm
+perl-HTTP-Tiny-0.076-464.cm2.noarch.rpm
+perl-Hash-Util-0.23-464.cm2.x86_64.rpm
+perl-Hash-Util-FieldHash-1.20-464.cm2.x86_64.rpm
+perl-I18N-Collate-1.02-464.cm2.noarch.rpm
+perl-I18N-LangTags-0.44-464.cm2.noarch.rpm
+perl-I18N-Langinfo-0.19-464.cm2.x86_64.rpm
+perl-IO-1.43-464.cm2.x86_64.rpm
+perl-IO-Compress-2.093-464.cm2.noarch.rpm
+perl-IO-Socket-IP-0.39-464.cm2.noarch.rpm
+perl-IO-Zlib-1.10-464.cm2.noarch.rpm
+perl-IPC-Cmd-1.04-464.cm2.noarch.rpm
+perl-IPC-Open3-1.21-464.cm2.noarch.rpm
+perl-IPC-SysV-2.07-464.cm2.x86_64.rpm
+perl-JSON-PP-4.04-464.cm2.noarch.rpm
+perl-Locale-Maketext-1.29-464.cm2.noarch.rpm
+perl-Locale-Maketext-Simple-0.21-464.cm2.noarch.rpm
+perl-MIME-Base64-3.15-464.cm2.x86_64.rpm
+perl-Math-BigInt-1.9998.18-464.cm2.noarch.rpm
+perl-Math-BigInt-FastCalc-0.500.900-464.cm2.x86_64.rpm
+perl-Math-BigRat-0.2614-464.cm2.noarch.rpm
+perl-Math-Complex-1.59-464.cm2.noarch.rpm
+perl-Memoize-1.03-464.cm2.noarch.rpm
+perl-Module-CoreList-5.20200620-464.cm2.noarch.rpm
+perl-Module-CoreList-tools-5.20200620-464.cm2.noarch.rpm
+perl-Module-Load-0.34-464.cm2.noarch.rpm
+perl-Module-Load-Conditional-0.70-464.cm2.noarch.rpm
+perl-Module-Loaded-0.08-464.cm2.noarch.rpm
+perl-Module-Metadata-1.000037-464.cm2.noarch.rpm
+perl-NDBM_File-1.15-464.cm2.x86_64.rpm
+perl-NEXT-0.67-464.cm2.noarch.rpm
+perl-Net-1.02-464.cm2.noarch.rpm
+perl-Net-Ping-2.72-464.cm2.noarch.rpm
+perl-ODBM_File-1.16-464.cm2.x86_64.rpm
+perl-Object-Accessor-0.48-7.cm2.noarch.rpm
+perl-Opcode-1.47-464.cm2.x86_64.rpm
+perl-POSIX-1.94-464.cm2.x86_64.rpm
+perl-Params-Check-0.38-464.cm2.noarch.rpm
+perl-PathTools-3.78-464.cm2.x86_64.rpm
+perl-Perl-OSType-1.010-464.cm2.noarch.rpm
+perl-PerlIO-via-QuotedPrint-0.08-464.cm2.noarch.rpm
+perl-Pod-Checker-1.73-464.cm2.noarch.rpm
+perl-Pod-Escapes-1.07-464.cm2.noarch.rpm
+perl-Pod-Functions-1.13-464.cm2.noarch.rpm
+perl-Pod-Html-1.25-464.cm2.noarch.rpm
+perl-Pod-Perldoc-3.28.01-464.cm2.noarch.rpm
+perl-Pod-Simple-3.40-464.cm2.noarch.rpm
+perl-Pod-Usage-1.69-464.cm2.noarch.rpm
+perl-Safe-2.41-464.cm2.noarch.rpm
+perl-Scalar-List-Utils-1.55-464.cm2.x86_64.rpm
+perl-Search-Dict-1.07-464.cm2.noarch.rpm
+perl-SelectSaver-1.02-464.cm2.noarch.rpm
+perl-SelfLoader-1.26-464.cm2.noarch.rpm
+perl-Socket-2.029-464.cm2.x86_64.rpm
+perl-Storable-3.21-464.cm2.x86_64.rpm
+perl-Symbol-1.08-464.cm2.noarch.rpm
+perl-Sys-Hostname-1.23-464.cm2.x86_64.rpm
+perl-Sys-Syslog-0.36-464.cm2.x86_64.rpm
+perl-Term-ANSIColor-5.01-464.cm2.noarch.rpm
+perl-Term-Cap-1.17-464.cm2.noarch.rpm
+perl-Term-Complete-1.403-464.cm2.noarch.rpm
+perl-Term-ReadLine-1.17-464.cm2.noarch.rpm
+perl-Test-1.31-464.cm2.noarch.rpm
+perl-Test-Harness-3.42-464.cm2.noarch.rpm
+perl-Test-Simple-1.302175-464.cm2.noarch.rpm
 perl-Test-Warnings-0.028-4.cm2.noarch.rpm
-perl-Text-Abbrev-1.02-463.cm2.noarch.rpm
-perl-Text-Balanced-2.03-463.cm2.noarch.rpm
-perl-Text-ParseWords-3.30-463.cm2.noarch.rpm
-perl-Text-Tabs+Wrap-2013.0523-463.cm2.noarch.rpm
+perl-Text-Abbrev-1.02-464.cm2.noarch.rpm
+perl-Text-Balanced-2.03-464.cm2.noarch.rpm
+perl-Text-ParseWords-3.30-464.cm2.noarch.rpm
+perl-Text-Tabs+Wrap-2013.0523-464.cm2.noarch.rpm
 perl-Text-Template-1.51-3.cm2.noarch.rpm
-perl-Thread-3.05-463.cm2.noarch.rpm
-perl-Thread-Queue-3.14-463.cm2.noarch.rpm
-perl-Thread-Semaphore-2.13-463.cm2.noarch.rpm
-perl-Tie-4.6-463.cm2.noarch.rpm
-perl-Tie-File-1.06-463.cm2.noarch.rpm
-perl-Tie-Memoize-1.1-463.cm2.noarch.rpm
-perl-Tie-RefHash-1.39-463.cm2.noarch.rpm
-perl-Time-1.03-463.cm2.noarch.rpm
-perl-Time-HiRes-1.9764-463.cm2.x86_64.rpm
-perl-Time-Local-1.280-463.cm2.noarch.rpm
-perl-Time-Piece-1.3401-463.cm2.x86_64.rpm
-perl-Unicode-Collate-1.27-463.cm2.x86_64.rpm
-perl-Unicode-Normalize-1.27-463.cm2.x86_64.rpm
-perl-Unicode-UCD-0.75-463.cm2.noarch.rpm
-perl-User-pwent-1.03-463.cm2.noarch.rpm
+perl-Thread-3.05-464.cm2.noarch.rpm
+perl-Thread-Queue-3.14-464.cm2.noarch.rpm
+perl-Thread-Semaphore-2.13-464.cm2.noarch.rpm
+perl-Tie-4.6-464.cm2.noarch.rpm
+perl-Tie-File-1.06-464.cm2.noarch.rpm
+perl-Tie-Memoize-1.1-464.cm2.noarch.rpm
+perl-Tie-RefHash-1.39-464.cm2.noarch.rpm
+perl-Time-1.03-464.cm2.noarch.rpm
+perl-Time-HiRes-1.9764-464.cm2.x86_64.rpm
+perl-Time-Local-1.280-464.cm2.noarch.rpm
+perl-Time-Piece-1.3401-464.cm2.x86_64.rpm
+perl-Unicode-Collate-1.27-464.cm2.x86_64.rpm
+perl-Unicode-Normalize-1.27-464.cm2.x86_64.rpm
+perl-Unicode-UCD-0.75-464.cm2.noarch.rpm
+perl-User-pwent-1.03-464.cm2.noarch.rpm
 perl-XML-Parser-2.44-11.cm2.x86_64.rpm
 perl-XML-Parser-debuginfo-2.44-11.cm2.x86_64.rpm
-perl-autodie-2.32-463.cm2.noarch.rpm
-perl-autouse-1.11-463.cm2.noarch.rpm
-perl-base-2.27-463.cm2.noarch.rpm
-perl-bignum-0.51-463.cm2.noarch.rpm
-perl-blib-1.07-463.cm2.noarch.rpm
-perl-constant-1.33-463.cm2.noarch.rpm
-perl-debugger-1.56-463.cm2.noarch.rpm
-perl-debuginfo-5.32.0-463.cm2.x86_64.rpm
-perl-deprecate-0.04-463.cm2.noarch.rpm
-perl-devel-5.32.0-463.cm2.x86_64.rpm
-perl-diagnostics-1.37-463.cm2.noarch.rpm
-perl-doc-5.32.0-463.cm2.noarch.rpm
-perl-encoding-3.00-463.cm2.x86_64.rpm
-perl-encoding-warnings-0.13-463.cm2.noarch.rpm
-perl-experimental-0.020-463.cm2.noarch.rpm
-perl-fields-2.27-463.cm2.noarch.rpm
-perl-filetest-1.03-463.cm2.noarch.rpm
-perl-if-0.60.800-463.cm2.noarch.rpm
-perl-interpreter-5.32.0-463.cm2.x86_64.rpm
-perl-less-0.03-463.cm2.noarch.rpm
-perl-lib-0.65-463.cm2.x86_64.rpm
+perl-autodie-2.32-464.cm2.noarch.rpm
+perl-autouse-1.11-464.cm2.noarch.rpm
+perl-base-2.27-464.cm2.noarch.rpm
+perl-bignum-0.51-464.cm2.noarch.rpm
+perl-blib-1.07-464.cm2.noarch.rpm
+perl-constant-1.33-464.cm2.noarch.rpm
+perl-debugger-1.56-464.cm2.noarch.rpm
+perl-debuginfo-5.32.0-464.cm2.x86_64.rpm
+perl-deprecate-0.04-464.cm2.noarch.rpm
+perl-devel-5.32.0-464.cm2.x86_64.rpm
+perl-diagnostics-1.37-464.cm2.noarch.rpm
+perl-doc-5.32.0-464.cm2.noarch.rpm
+perl-encoding-3.00-464.cm2.x86_64.rpm
+perl-encoding-warnings-0.13-464.cm2.noarch.rpm
+perl-experimental-0.020-464.cm2.noarch.rpm
+perl-fields-2.27-464.cm2.noarch.rpm
+perl-filetest-1.03-464.cm2.noarch.rpm
+perl-if-0.60.800-464.cm2.noarch.rpm
+perl-interpreter-5.32.0-464.cm2.x86_64.rpm
+perl-less-0.03-464.cm2.noarch.rpm
+perl-lib-0.65-464.cm2.x86_64.rpm
 perl-libintl-perl-1.29-5.cm2.x86_64.rpm
 perl-libintl-perl-debuginfo-1.29-5.cm2.x86_64.rpm
-perl-libnet-3.11-463.cm2.noarch.rpm
-perl-libnetcfg-5.32.0-463.cm2.noarch.rpm
-perl-libs-5.32.0-463.cm2.x86_64.rpm
-perl-locale-1.09-463.cm2.noarch.rpm
-perl-macros-5.32.0-463.cm2.noarch.rpm
-perl-meta-notation-5.32.0-463.cm2.noarch.rpm
-perl-mro-1.23-463.cm2.x86_64.rpm
-perl-open-1.12-463.cm2.noarch.rpm
-perl-overload-1.31-463.cm2.noarch.rpm
-perl-overloading-0.02-463.cm2.noarch.rpm
-perl-parent-0.238-463.cm2.noarch.rpm
-perl-perlfaq-5.20200523-463.cm2.noarch.rpm
-perl-ph-5.32.0-463.cm2.x86_64.rpm
-perl-podlators-4.14-463.cm2.noarch.rpm
-perl-sigtrap-1.09-463.cm2.noarch.rpm
-perl-sort-2.04-463.cm2.noarch.rpm
-perl-subs-1.03-463.cm2.noarch.rpm
-perl-tests-5.32.0-463.cm2.x86_64.rpm
-perl-threads-2.25-463.cm2.x86_64.rpm
-perl-threads-shared-1.61-463.cm2.x86_64.rpm
-perl-utils-5.32.0-463.cm2.noarch.rpm
-perl-vars-1.05-463.cm2.noarch.rpm
-perl-version-0.99.24-463.cm2.noarch.rpm
-perl-vmsish-1.04-463.cm2.noarch.rpm
+perl-libnet-3.11-464.cm2.noarch.rpm
+perl-libnetcfg-5.32.0-464.cm2.noarch.rpm
+perl-libs-5.32.0-464.cm2.x86_64.rpm
+perl-locale-1.09-464.cm2.noarch.rpm
+perl-macros-5.32.0-464.cm2.noarch.rpm
+perl-meta-notation-5.32.0-464.cm2.noarch.rpm
+perl-mro-1.23-464.cm2.x86_64.rpm
+perl-open-1.12-464.cm2.noarch.rpm
+perl-overload-1.31-464.cm2.noarch.rpm
+perl-overloading-0.02-464.cm2.noarch.rpm
+perl-parent-0.238-464.cm2.noarch.rpm
+perl-perlfaq-5.20200523-464.cm2.noarch.rpm
+perl-ph-5.32.0-464.cm2.x86_64.rpm
+perl-podlators-4.14-464.cm2.noarch.rpm
+perl-sigtrap-1.09-464.cm2.noarch.rpm
+perl-sort-2.04-464.cm2.noarch.rpm
+perl-subs-1.03-464.cm2.noarch.rpm
+perl-tests-5.32.0-464.cm2.x86_64.rpm
+perl-threads-2.25-464.cm2.x86_64.rpm
+perl-threads-shared-1.61-464.cm2.x86_64.rpm
+perl-utils-5.32.0-464.cm2.noarch.rpm
+perl-vars-1.05-464.cm2.noarch.rpm
+perl-version-0.99.24-464.cm2.noarch.rpm
+perl-vmsish-1.04-464.cm2.noarch.rpm
 pinentry-1.2.0-1.cm2.x86_64.rpm
 pinentry-debuginfo-1.2.0-1.cm2.x86_64.rpm
 pkgconf-1.7.0-3.cm2.x86_64.rpm
@@ -505,7 +504,7 @@ python3-libxml2-2.9.12-2.cm2.x86_64.rpm
 python3-magic-5.40-1.cm2.noarch.rpm
 python3-markupsafe-1.1.1-3.cm2.x86_64.rpm
 python3-pip-3.7.10-3.cm2.noarch.rpm
-python3-rpm-4.14.2.1-4.cm2.x86_64.rpm
+python3-rpm-4.17.0-1.cm2.x86_64.rpm
 python3-setuptools-3.7.10-3.cm2.noarch.rpm
 python3-test-3.7.10-3.cm2.x86_64.rpm
 python3-tools-3.7.10-3.cm2.x86_64.rpm
@@ -514,13 +513,13 @@ python-markupsafe-debuginfo-1.1.1-3.cm2.x86_64.rpm
 readline-7.0-5.cm2.x86_64.rpm
 readline-debuginfo-7.0-5.cm2.x86_64.rpm
 readline-devel-7.0-5.cm2.x86_64.rpm
-rpm-4.14.2.1-4.cm2.x86_64.rpm
-rpm-build-4.14.2.1-4.cm2.x86_64.rpm
-rpm-build-libs-4.14.2.1-4.cm2.x86_64.rpm
-rpm-debuginfo-4.14.2.1-4.cm2.x86_64.rpm
-rpm-devel-4.14.2.1-4.cm2.x86_64.rpm
-rpm-lang-4.14.2.1-4.cm2.x86_64.rpm
-rpm-libs-4.14.2.1-4.cm2.x86_64.rpm
+rpm-4.17.0-1.cm2.x86_64.rpm
+rpm-build-4.17.0-1.cm2.x86_64.rpm
+rpm-build-libs-4.17.0-1.cm2.x86_64.rpm
+rpm-debuginfo-4.17.0-1.cm2.x86_64.rpm
+rpm-devel-4.17.0-1.cm2.x86_64.rpm
+rpm-lang-4.17.0-1.cm2.x86_64.rpm
+rpm-libs-4.17.0-1.cm2.x86_64.rpm
 sed-4.8-1.cm2.x86_64.rpm
 sed-debuginfo-4.8-1.cm2.x86_64.rpm
 sed-lang-4.8-1.cm2.x86_64.rpm

toolkit/resources/manifests/package/update_manifests.sh

@@ -258,6 +258,7 @@ generate_pkggen_core () {
         grep "^openssl-" $TmpPkgGen
         grep "^libcap-" $TmpPkgGen
         grep "^libdb-" $TmpPkgGen
+        grep "^debugedit-" $TmpPkgGen
         grep "^rpm-" $TmpPkgGen
         grep "^cpio-" $TmpPkgGen
         grep "^e2fsprogs-" $TmpPkgGen

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

@@ -262,14 +262,21 @@ chroot_and_install_rpms zlib
 build_rpm_in_chroot_no_install perl
 chroot_and_install_rpms perl
 
-build_rpm_in_chroot_no_install nss
 build_rpm_in_chroot_no_install flex
 build_rpm_in_chroot_no_install libarchive
 build_rpm_in_chroot_no_install diffutils
+build_rpm_in_chroot_no_install mariner-release
 
+# Need to install perl-DBI in order for perl-DBD-SQLite to build
+build_rpm_in_chroot_no_install perl-DBI
+chroot_and_install_rpms perl-DBI
+
+build_rpm_in_chroot_no_install perl-Object-Accessor
 build_rpm_in_chroot_no_install bison
 build_rpm_in_chroot_no_install autoconf
 build_rpm_in_chroot_no_install texinfo
+build_rpm_in_chroot_no_install perl-DBD-SQLite
+build_rpm_in_chroot_no_install perl-DBIx-Simple
 build_rpm_in_chroot_no_install elfutils
 build_rpm_in_chroot_no_install automake
 
@@ -481,6 +488,9 @@ build_rpm_in_chroot_no_install libselinux
 # util-linux and rpm require libselinux
 chroot_and_install_rpms libselinux
 build_rpm_in_chroot_no_install util-linux
+# rpm requires debugedit
+build_rpm_in_chroot_no_install debugedit
+chroot_and_install_rpms debugedit
 build_rpm_in_chroot_no_install rpm
 
 # rebuild pam with selinux support

toolkit/scripts/toolchain/container/Dockerfile

@@ -105,10 +105,11 @@ COPY [ "./toolchain_initial_chroot_setup.sh", \
        "./toolchain-jdk8-build.sh", \
        "./Awt_build_headless_only.patch", \
        "./check-system-ca-certs.patch", \
+       "./go14_bootstrap_aarch64.patch", \
        "./rpm-define-RPM-LD-FLAGS.patch", \
        "./cpio_extern_nocommon.patch", \
        "$LFS/tools/" ]
 
 USER root
 
-ENTRYPOINT [ "/tools/mount_chroot_start_build.sh" ]
+ENTRYPOINT [ "/tools/mount_chroot_start_build.sh" ]

toolkit/scripts/toolchain/container/toolchain-remote-wget-list

@@ -1,6 +1,8 @@
 http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz
 http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz
 https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz
+https://sourceware.org/ftp/debugedit/5.0/debugedit-5.0.tar.xz
+http://ftp.gnu.org/gnu/dejagnu/dejagnu-1.6.2.tar.gz
 https://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.45.6.tar.gz
 https://sourceware.org/ftp/elfutils/0.185/elfutils-0.185.tar.bz2
 https://ftp.gnu.org/gnu/findutils/findutils-4.8.0.tar.xz
@@ -27,7 +29,10 @@ http://anduin.linuxfromscratch.org/BLFS/bdb/db-5.3.28.tar.gz
 https://github.com/libarchive/libarchive/releases/download/v3.4.2/libarchive-3.4.2.tar.gz
 http://www.lua.org/ftp/lua-5.3.5.tar.gz
 ftp://anduin.linuxfromscratch.org/BLFS/popt/popt-1.16.tar.gz
-http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.1.tar.bz2
+https://github.com/rpm-software-management/rpm/archive/rpm-4.17.0-release.tar.gz
+https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/python.attr
+https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/pythondeps.sh
+https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/pythondistdeps.py
 http://www.linuxfromscratch.org/patches/blfs/9.0/lua-5.3.5-shared_library-1.patch
 https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz
 https://ftp.gnu.org/gnu/glibc/glibc-2.34.tar.xz
@@ -53,8 +58,6 @@ https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.26.t
 http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.0.tar.gz
 http://download.savannah.gnu.org/releases/man-db/man-db-2.8.4.tar.xz
 https://archive.mozilla.org/pub/nspr/releases/v4.21/src/nspr-4.21.tar.gz
-http://www.linuxfromscratch.org/patches/downloads/nss/nss-3.44-standalone-1.patch
-https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_44_RTM/src/nss-3.44.tar.gz
 https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz
 https://cpan.metacpan.org/authors/id/M/MS/MSCHOUT/Text-Template-1.51.tar.gz
 https://www.openssl.org/source/openssl-1.1.1g.tar.gz

toolkit/scripts/toolchain/container/toolchain-sha256sums

@@ -19,7 +19,8 @@ fc82a5c5b9694fc904b07ff9970628e3d36d77663324dc18e30a1ab7ff944bee  coreutils-8.32
 eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d  cpio-2.13.tar.bz2
 596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc  cups-2.2.4-source.tar.gz
 5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b  damageproto-1.2.1.tar.bz2
-e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628  db-5.3.28.tar.gz
+e9ecd7d350bebae1f178ce6776ca19a648b6fe8fa22f5b3044b38d7899aa553e  debugedit-5.0.tar.xz
+0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261  dejagnu-1.6.2.tar.gz
 a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec  diffutils-3.8.tar.xz
 e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509  dmxproto-2.3.1.tar.bz2
 f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04  dri2proto-2.8.tar.bz2
@@ -106,8 +107,6 @@ c2faa85e625cd7567dc1dec9f23d1af1f73e2ca6468bce1bdc13387ec56f97e8  man-pages-5.02
 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f  mpfr-4.1.0.tar.xz
 30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d  ncurses-6.2.tar.gz
 15ea32c7b100217b6e3193bc03e77f485d9bf7504051443ba9ce86d1c17c6b5a  nspr-4.21.tar.gz
-7b365cdfe968977296ed7b32a2cb196d05f364661dca856487717ee5dcb54b28  nss-3.44-standalone-1.patch
-a5620e59b6eeedfd5a12c9298b50ad92e9898b223e214eb675e36f4ffb5b6aff  nss-3.44.tar.gz
 ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46  openssl-1.1.1g.tar.gz
 ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd  patch-2.7.6.tar.xz
 6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b  perl-5.32.0.tar.xz
@@ -121,7 +120,10 @@ fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f  Python-3.7.4.t
 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370  recordproto-1.14.2.tar.bz2
 06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537  renderproto-0.11.1.tar.bz2
 3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818  resourceproto-1.2.0.tar.bz2
-1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda  rpm-4.14.2.1.tar.bz2
+2d8274d212b859b3ac90b276d462467ae2f8165143ef9f9e7ebfab77b1c7e272  rpm-4.17.0-release.tar.gz
+32eebee98c24edcc9524b4553cf05c0ec6707828fe14f76d250e294568e7091a  python.attr
+1cc7665252eb845c7e4741ff3e832c78f54ffb05552f1cdb2d43d2c0cbf7c07d  pythondeps.sh
+f73f01bb78daa75d25d6581a6da40cf6f946654c5e9d166676036367307186d1  pythondistdeps.py
 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65  scrnsaverproto-1.2.2.tar.bz2
 f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633  sed-4.8.tar.xz
 486748abfb16abd8af664e3a5f03b228e5f124682b0c942e157644bf6fff7d10  sqlite-autoconf-3320100.tar.gz

toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh

@@ -1066,32 +1066,6 @@ popd
 rm -rf db-5.3.28
 touch /logs/status_libdb_complete
 
-echo nss-3.44
-tar xf nss-3.44.tar.gz
-pushd nss-3.44
-patch -Np1 -i ../nss-3.44-standalone-1.patch
-cd nss
-export NSS_DISABLE_GTESTS=1
-# Build with single processor due to errors seen with parallel make
-make -j1 BUILD_OPT=1                    \
-    NSPR_INCLUDE_DIR=/usr/include/nspr  \
-    USE_SYSTEM_ZLIB=1                   \
-    ZLIB_LIBS=-lz                       \
-    NSS_ENABLE_WERROR=0                 \
-    USE_64=1                            \
-    $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)
-cd ../dist
-install -v -m755 Linux*/lib/*.so              /usr/lib
-install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib
-install -v -m755 -d                           /usr/include/nss
-cp -v -RL {public,private}/nss/*              /usr/include/nss
-chmod -v 644                                  /usr/include/nss/*
-install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} /usr/bin
-install -v -m644 Linux*/lib/pkgconfig/nss.pc  /usr/lib/pkgconfig
-popd
-rm -rf nss-3.44
-touch /logs/status_nss_complete
-
 echo cpio-2.13
 tar xjf cpio-2.13.tar.bz2
 pushd cpio-2.13
@@ -1163,28 +1137,57 @@ popd
 rm -rf lua-5.3.5
 touch /logs/status_lua_complete
 
-echo rpm-4.14.2.1
-tar xjf rpm-4.14.2.1.tar.bz2
-pushd rpm-4.14.2.1
+DEBUGEDIT_WITH_VERSION=debugedit-5.0
+echo $DEBUGEDIT_WITH_VERSION
+tar xf "$DEBUGEDIT_WITH_VERSION".tar.xz
+pushd "$DEBUGEDIT_WITH_VERSION"
+./configure --prefix=/usr
+make
+make install
+popd
+rm -rf "$DEBUGEDIT_WITH_VERSION"
+touch /logs/status_debugedit_complete
+
+RPM_WITH_VERSION=rpm-4.17.0
+RPM_FOLDER="$RPM_WITH_VERSION"-release
+echo $RPM_WITH_VERSION
+tar xf "$RPM_WITH_VERSION"-release.tar.gz
+mv rpm-"$RPM_WITH_VERSION"-release "$RPM_FOLDER"
+pushd "$RPM_FOLDER"
+
+# Still not in the upstream
 patch -Np1 -i /tools/rpm-define-RPM-LD-FLAGS.patch
+
+# Do not build docs - pandoc dependency is not supplied in the toolchain.
+sed -iE '/SUBDIRS/ s/docs //' Makefile.am
+sed -iE '/Always build/,+16 d' Makefile.am
+
+./autogen.sh --noconfigure
 ./configure --prefix=/usr \
-    --enable-posixmutexes \
-    --without-selinux \
-    --with-vendor=mariner \
-    --without-python \
-    --with-lua \
-    --without-javaglue
+        --enable-ndb \
+        --without-selinux \
+        --with-crypto=openssl \
+        --with-vendor=mariner
+
 make -j$(nproc)
 make install
 install -d /var/lib/rpm
+
 rpm --initdb --root=/ --dbpath /var/lib/rpm
 popd
-rm -rf rpm-4.14.2.1
+
+rm -rf "$RPM_FOLDER"
+
+# Fix the interpreter path for python replacing the first line
+sed -i '1 s:.*:#!/usr/bin/python3:' pythondistdeps.py
+install -p pythondistdeps.py /usr/lib/rpm/pythondistdeps.py
+install -p pythondeps.sh /usr/lib/rpm/pythondeps.sh
+install -p python.attr /usr/lib/rpm/fileattrs/python.attr
+
 touch /logs/status_rpm_complete
 
 # Cleanup
 rm -rf /tmp/*
-unset BUILD_TARGET
 
 echo sanity check - raw toolchain - after build complete - gcc -v
 gcc -v

toolkit/scripts/toolchain/create_toolchain_in_container.sh

@@ -24,14 +24,15 @@ cp -v $MARINER_SPECS_DIR/openjdk8/check-system-ca-certs.patch ./container
 # M4 patch
 cp -v $MARINER_SPECS_DIR/m4/04-fix-sigstksz.patch ./container
 cp -v $MARINER_SPECS_DIR/m4/m4-1.4.18-glibc-change-work-around.patch ./container
-# RPM patch
-cp -v $MARINER_SPECS_DIR/rpm/define-RPM_LD_FLAGS.patch ./container/rpm-define-RPM-LD-FLAGS.patch
 # CPIO patch
 cp -v $MARINER_SPECS_DIR/cpio/cpio_extern_nocommon.patch ./container
 # Coreutils aarch64 patch
 cp -v $MARINER_SPECS_DIR/coreutils/coreutils-fix-get-sys_getdents-aarch64.patch ./container
 # Binutils readonly patch
 cp -v $MARINER_SPECS_DIR/binutils/linker-script-readonly-keyword-support.patch ./container/linker-script-readonly-keyword-support.patch
+# RPM LD_FLAGS patch
+cp -v $MARINER_SPECS_DIR/rpm/define-RPM_LD_FLAGS.patch ./container/rpm-define-RPM-LD-FLAGS.patch
+
 # Create .bashrc file for lfs user in the container
 cat > ./container/.bashrc << EOF
 umask 022

toolkit/tools/pkggen/worker/create_worker_chroot.sh

@@ -54,6 +54,26 @@ while read -r package || [ -n "$package" ]; do
     install_one_toolchain_rpm "$package"
 done < "$packages"
 
+TEMP_DB_PATH=/temp_db
+echo "Setting up a clean RPM database before the Berkeley DB -> SQLite conversion under '$TEMP_DB_PATH'."  | tee -a "$chroot_log"
+chroot "$chroot_builder_folder" mkdir -p "$TEMP_DB_PATH"
+chroot "$chroot_builder_folder" rpm --initdb --dbpath="$TEMP_DB_PATH"
+
+# Popularing the SQLite database with package info.
+while read -r package || [ -n "$package" ]; do
+    full_rpm_path=$(find "$rpm_path" -name "$package" -type f 2>>"$chroot_log")
+    cp $full_rpm_path $chroot_builder_folder/$package
+
+    echo "Adding RPM DB entry to worker chroot: $package."  | tee -a "$chroot_log"
+
+    chroot "$chroot_builder_folder" rpm -i -v --nodeps --noorder --force --dbpath="$TEMP_DB_PATH" --justdb "$package" &>> "$chroot_log"
+    chroot "$chroot_builder_folder" rm $package
+done < "$packages"
+
+echo "Overwriting old RPM database with the results of the conversion."  | tee -a "$chroot_log"
+chroot "$chroot_builder_folder" rm -rf /var/lib/rpm
+chroot "$chroot_builder_folder" mv "$TEMP_DB_PATH" /var/lib/rpm
+
 HOME=$ORIGINAL_HOME
 
 # In case of Docker based build do not add the below folders into chroot tarball