Merge commit '86cfbeb1c' into 2.0. Moving the August release to that …

…commit.

SPECS-EXTENDED/authd/authd.spec → SPECS/authd/authd.spec

@@ -5,7 +5,7 @@ Distribution:   Mariner
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: https://github.com/InfrastructureServices/authd
 Obsoletes: pidentd < 3.2
@@ -14,8 +14,11 @@ Requires(post): openssl
 Source0: https://github.com/InfrastructureServices/authd/releases/download/v1.4.4/authd-1.4.4.tar.gz
 Source1: auth.socket
 Source2: [email protected]
-BuildRequires:  gcc
-BuildRequires: openssl-devel gettext help2man systemd-units
+BuildRequires: gcc
+BuildRequires: openssl-devel 
+BuildRequires: gettext 
+BuildRequires: help2man 
+BuildRequires: systemd-units
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -74,6 +77,10 @@ chmod o-rw %{_sysconfdir}/ident.key
 %{_unitdir}/*
 
 %changelog
+* Thu Jul 28 2022 Henry Li <[email protected]> - 1.4.4-6
+- Fix spec formatting
+- License Verified
+
 * Fri Apr 30 2021 Pawel Winogrodzki <[email protected]> - 1.4.4-5
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Making binaries paths compatible with CBL-Mariner's paths.

SPECS/ca-certificates/ca-certificates.signatures.json

@@ -11,7 +11,7 @@
   "README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
   "bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
   "certdata.base.txt": "76c4cd1860b9a6f6ee9c2a0dcddcef46f65950b7ec12d2a7eeabeedca4e379f9",
-  "certdata.microsoft.txt": "32789389efd31aa04d9f482bd1132a0661c249fcd5eb9ec92b02ddca6ed35a7d",
+  "certdata.microsoft.txt": "18075612875845029e53c423799e48f974a4e95aaa7b0e4a909ee25094120708",
   "certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
   "pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",
   "trust-fixes": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",

SPECS/ca-certificates/ca-certificates.spec

@@ -45,7 +45,7 @@ Name:           ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
 Epoch:          1
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -318,6 +318,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
 %{_bindir}/bundle2pem.sh
 
 %changelog
+* Wed Aug 03 2022 CBL-Mariner Service Account <[email protected]> - 2.0.0-7
+- Updating Microsoft trusted root CAs.
+
 * Wed Jun 29 2022 Pawel Winogrodzki <[email protected]> - 2.0.0-6
 - Bumping release to match with "prebuilt-*" packages.
 

SPECS/fluent-bit/fluent-bit.signatures.json

@@ -1,5 +1,5 @@
 {
     "Signatures": {
-        "fluent-bit-1.8.12.tar.gz" : "50f2a4e9eb6c2a2df58b78ef562e23c1ef9871c389c7bd0320f6b381d2b491c8"
+        "fluent-bit-1.9.6.tar.gz" : "7f4de8d561695d9153dbe39b7f6d919dc849daf57cb7c402a2beb0ebe35a42e0"
     }
 }

SPECS/fluent-bit/fluent-bit.spec

@@ -1,7 +1,7 @@
 Summary:        Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
 Name:           fluent-bit
-Version:        1.8.12
-Release:        2%{?dist}
+Version:        1.9.6
+Release:        1%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -16,6 +16,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gnutls-devel
 BuildRequires:  graphviz
 BuildRequires:  libpq-devel
+BuildRequires:  libyaml-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
@@ -25,7 +26,7 @@ BuildRequires:  zlib-devel
 
 %description
 
-Fluent Bit is a fast Log Processor and Forwarder for Linux, Embedded Linux, MacOS and BSD 
+Fluent Bit is a fast Log Processor and Forwarder for Linux, Embedded Linux, MacOS and BSD
 family operating systems. It's part of the Fluentd Ecosystem and a CNCF sub-project.
 
 %package devel
@@ -39,7 +40,7 @@ Development files for %{name}
 %setup -q
 
 %build
-	
+
 %cmake\
     -DCMAKE_BUILD_TYPE=RelWithDebInfo\
     -DFLB_EXAMPLES=Off\
@@ -54,7 +55,7 @@ Development files for %{name}
     -DFLB_DEBUG=Off\
     -DFLB_TLS=On \
     -DFLB_JEMALLOC=on
- 
+
 %cmake_build
 
 %install
@@ -73,6 +74,10 @@ Development files for %{name}
 %{_libdir}/fluent-bit/*.so
 
 %changelog
+* Wed Aug 03 2022 Suresh Babu Chalamalasetty <[email protected]> - 1.9.6-1
+- Upgrade version to 1.9.6
+- Add build time dependency libyaml-devel
+
 * Thu Feb 19 2022 Sriram Nambakam <[email protected]> - 1.8.12-2
 - Compile with -DFLB_JEMALLOC=on.
 
@@ -89,4 +94,3 @@ Development files for %{name}
 
 * Mon Mar 30 2020 Jonathan Chiu <[email protected]> - 1.4.1-1
 - Original version for CBL-Mariner.
-

SPECS-EXTENDED/freeipmi/freeipmi.spec → SPECS/freeipmi/freeipmi.spec

@@ -5,15 +5,17 @@ Distribution:   Mariner
 
 Name:             freeipmi
 Version:          1.6.6
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          IPMI remote console and system management software
 License:          GPLv3+
 URL:              http://www.gnu.org/software/freeipmi/
 Source0:          http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:          bmc-watchdog.service
 Source2:          ipmidetectd.service
 Source3:          ipmiseld.service
-BuildRequires:    libgcrypt-devel texinfo systemd 
+BuildRequires:    libgcrypt-devel 
+BuildRequires:    texinfo 
+BuildRequires:    systemd 
 %{?systemd_requires}
 BuildRequires:    gcc
 
@@ -343,6 +345,10 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
 %dir %{_localstatedir}/cache/ipmiseld
 
 %changelog
+* Thu Jul 28 2022 Henry Li <[email protected]> - 1.6.6-3
+- Fix spec formatting
+- License Verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1.6.6-2
 - Initial CBL-Mariner import from Fedora 33 (license: MIT).
 

SPECS/ldns/CVE-2017-1000231.nopatch

@@ -0,0 +1 @@
+CVE-2017-1000231 - Already addressed in ldns-1.7.0-realloc.patch

SPECS/ldns/CVE-2017-1000232.nopatch

@@ -0,0 +1 @@
+CVE-2017-1000232 - Already addressed in ldns-1.7.0-parse-limit.patch

SPECS-EXTENDED/lldpd/lldpd.spec → SPECS/lldpd/lldpd.spec

@@ -1,18 +1,13 @@
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-%if 0%{?el6}
-%bcond_with systemd
-%global rundir /var/run/
-%else
 %bcond_without systemd
 %global rundir /run/
-%endif
 
 %global gh_owner vincentbernat
 
 Name:     lldpd
 Version:  1.0.4
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  ISC-licensed implementation of LLDP
 
 License:  ISC
@@ -29,12 +24,7 @@ BuildRequires: readline-devel
 BuildRequires: check-devel
 BuildRequires: net-snmp-devel
 BuildRequires: libxml2-devel
-# EL6 needs libevent2 as the package
-%if 0%{?el6}
-BuildRequires: libevent2-devel
-%else
 BuildRequires: libevent-devel
-%endif
 
 %if 0%{?with_systemd}
 # For systemd stuff
@@ -174,6 +164,10 @@ fi
 
 
 %changelog
+* Thu Jul 28 2022 Henry Li <[email protected]> - 1.0.4-4
+- License Verified
+- Remove usage of macros that do not apply for CBL-Mariner
+
 * Fri Apr 30 2021 Pawel Winogrodzki <[email protected]> - 1.0.4-3
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Making binaries paths compatible with CBL-Mariner's paths.

SPECS/perl-CGI/perl-CGI.spec

@@ -3,7 +3,7 @@
 Summary:        Handle Common Gateway Interface requests and responses
 Name:           perl-CGI
 Version:        4.54
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-%{version}.tar.gz
@@ -17,6 +17,14 @@ BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
 BuildRequires:  sed
+BuildRequires:  perl(ExtUtils::MakeMaker)
+%if %{with_check}
+BuildRequires:  perl(CPAN)
+BuildRequires:  perl(CPAN::Meta)
+BuildRequires:  perl(Test)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(blib)
+%endif
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(File::Spec) >= 0.82
@@ -84,6 +92,9 @@ make %{?_smp_mflags} test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 01 2022 Muhammad Falak <[email protected]> - 4.54-2
+- Add BR on `cpan` & `perl(Test::*)` to enable ptest
+
 *   Tue Apr 26 2022 Mateusz Malisz <[email protected]> - 4.54-1
 -   Update to 4.54
 

SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec

@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates-base
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Wed Aug 03 2022 CBL-Mariner Service Account <[email protected]> - 2.0.0-7
+- Making 'Release' match with 'ca-certificates'.
+
 * Wed Jun 29 2022 Pawel Winogrodzki <[email protected]> - 2.0.0-6
 - Adding conflict information with "ca-certificates-shared".
 

SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec

@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Wed Aug 03 2022 CBL-Mariner Service Account <[email protected]> - 2.0.0-7
+- Making 'Release' match with 'ca-certificates'.
+
 * Wed Jun 29 2022 Pawel Winogrodzki <[email protected]> - 2.0.0-6
 - Adding conflict information with "ca-certificates-shared".
 

cgmanifest.json

@@ -3278,8 +3278,8 @@
         "type": "other",
         "other": {
           "name": "fluent-bit",
-          "version": "1.8.12",
-          "downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v1.8.12.tar.gz"
+          "version": "1.9.6",
+          "downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.6.tar.gz"
         }
       }
     },

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -227,10 +227,10 @@ libffi-devel-3.4.2-2.cm2.aarch64.rpm
 libtasn1-4.18.0-2.cm2.aarch64.rpm
 p11-kit-0.24.1-1.cm2.aarch64.rpm
 p11-kit-trust-0.24.1-1.cm2.aarch64.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
 dwz-0.14-1.cm2.aarch64.rpm
 unzip-6.0-19.cm2.aarch64.rpm
 python3-3.9.13-3.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -227,10 +227,10 @@ libffi-devel-3.4.2-2.cm2.x86_64.rpm
 libtasn1-4.18.0-2.cm2.x86_64.rpm
 p11-kit-0.24.1-1.cm2.x86_64.rpm
 p11-kit-trust-0.24.1-1.cm2.x86_64.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
 dwz-0.14-1.cm2.x86_64.rpm
 unzip-6.0-19.cm2.x86_64.rpm
 python3-3.9.13-3.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.aarch64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.aarch64.rpm
 bzip2-devel-1.0.8-1.cm2.aarch64.rpm
 bzip2-libs-1.0.8-1.cm2.aarch64.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-6.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-7.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
 check-0.15.2-1.cm2.aarch64.rpm
 check-debuginfo-0.15.2-1.cm2.aarch64.rpm
 chkconfig-1.20-3.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.x86_64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.x86_64.rpm
 bzip2-devel-1.0.8-1.cm2.x86_64.rpm
 bzip2-libs-1.0.8-1.cm2.x86_64.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-6.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-7.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
 check-0.15.2-1.cm2.x86_64.rpm
 check-debuginfo-0.15.2-1.cm2.x86_64.rpm
 chkconfig-1.20-3.cm2.x86_64.rpm