August release merge of main commits up until commit 81ef215

Self-approved, since this is a release merge.

SPECS-EXTENDED/perl-File-Find-Object-Rule/perl-File-Find-Object-Rule.spec

@@ -8,7 +8,7 @@ Distribution:   Mariner
 
 Name:           perl-File-Find-Object-Rule
 Version:        0.0312
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Alternative interface to File::Find::Object
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/File-Find-Object-Rule
@@ -40,6 +40,7 @@ BuildRequires:  perl(File::Path)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(IPC::Open3)
 BuildRequires:  perl(lib)
+BuildRequires:  perl(blib)
 BuildRequires:  perl(Test::More)
 # Dependencies
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -76,6 +77,10 @@ perl Build.PL --installdirs=vendor
 %{_mandir}/man3/File::Find::Object::Rule::Procedural.3*
 
 %changelog
+* Tue Jul 26 2022 Muhammad Falak <[email protected]> - 0.0312-3
+- Add an explicit BR on `perl(blib)` to enable ptest
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.0312-2
 - Initial CBL-Mariner import from Fedora 31 (license: MIT).
 

SPECS-EXTENDED/perl-Object-Deadly/perl-Object-Deadly.spec

@@ -2,7 +2,7 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Name:           perl-Object-Deadly
 Version:        0.09
-Release:        34%{?dist}
+Release:        35%{?dist}
 Summary:        Perl module providing an object that dies whenever examined
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/Object-Deadly
@@ -17,6 +17,7 @@ BuildRequires:  perl(Devel::Symdump)
 BuildRequires:  perl(Scalar::Util)
 # Tests:
 BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(English)
 BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +48,10 @@ make test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jul 26 2022 Muhammad Falak <[email protected]> - 0.09-35
+- Add an explicit BR on `perl(English)` to enable ptest
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.09-34
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 

SPECS-EXTENDED/python-requests-mock/0001-tox-add-py39-environment.patch

@@ -0,0 +1,24 @@
+From 7028523bd06796ca0afdc7d0abf4f6e0b41cf6a0 Mon Sep 17 00:00:00 2001
+From: Muhammad Falak R Wani <[email protected]>
+Date: Tue, 26 Jul 2022 09:32:32 +0530
+Subject: [PATCH] tox: add py39 environment
+
+Signed-off-by: Muhammad Falak R Wani <[email protected]>
+---
+ tox.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tox.ini b/tox.ini
+index 352bcac..edf9e55 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = py37,py36,py35,py34,py27,pypy3,pypy,pep8
++envlist = py39,py37,py36,py35,py34,py27,pypy3,pypy,pep8
+
+ [testenv]
+ setenv =
+-- 
+2.17.1
+

SPECS-EXTENDED/python-requests-mock/python-requests-mock.spec

@@ -14,7 +14,7 @@ Distribution:   Mariner
 
 Name:           python-requests-mock
 Version:        1.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A requests mocking tool for python
 
 License:        ASL 2.0
@@ -23,9 +23,14 @@ Source0:        https://pypi.io/packages/source/r/requests-mock/requests-mock-%{
 
 Patch0:         0002-Use-system-urllib3-package.patch
 Patch1:         0003-Allow-skipping-purl-tests-if-it-is-not-present.patch
+Patch2:         0001-tox-add-py39-environment.patch
 
 BuildArch:      noarch
 
+%if %{with_check}
+BuildRequires:  python3-pip
+%endif
+
 %description
 requests-mock provides a simple way to do HTTP mocking at the
 python-requests layer.
@@ -106,6 +111,7 @@ python-requests layer.
 %setup -q -n requests-mock-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Remove bundled egg-info
 rm -rf requests_mock.egg-info
@@ -139,8 +145,8 @@ rm -rf requests_mock.egg-info
 %endif
 
 %if %{with python3}
-%{__python3} -m testtools.run discover
-%{__python3} -m pytest tests/pytest
+%{__python3} -m pip install tox==3.25.1
+tox -e py%{python3_version_nodots}
 %endif
 %endif
 
@@ -164,6 +170,10 @@ rm -rf requests_mock.egg-info
 
 
 %changelog
+* Tue Jul 26 2022 Muhammad Falak <[email protected]> - 1.7.0-4
+- Introduce patch to test using tox
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1.7.0-3
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 

SPECS-EXTENDED/python-testscenarios/python-testscenarios.spec

@@ -5,7 +5,7 @@
 
 Name:           python-%{pypi_name}
 Version:        0.5.0
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Testscenarios, a pyunit extension for dependency injection
 License:        ASL 2.0 and BSD
 URL:            https://launchpad.net/testscenarios
@@ -18,6 +18,9 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-pbr
 BuildRequires:  python3-testtools
 BuildRequires:  python3-xml
+%if %{with_check}
+BuildRequires:  python3-pip
+%endif
 
 %global _description\
 testscenarios provides clean dependency injection for python unittest style\
@@ -68,6 +71,10 @@ CFLAGS="%{optflags}" %{__python3} setup.py build
 %{python3_sitelib}/*
 
 %changelog
+* Fri Apr 29 2022 Muhammad Falak <[email protected]> - 0.5.0-22
+- Add BR on `pip` to enable ptest
+- License verified
+
 * Tue Oct 13 2020 Steve Laughman <[email protected]> - 0.5.0-21
 - Initial CBL-Mariner import from Fedora 33 (license: MIT)
 

SPECS-EXTENDED/python-whoosh/python-whoosh.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "python-Whoosh-2.7.4.tar.gz": "7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83"
+  "python-whoosh-2.7.4.tar.gz": "2e7b6ae0e7f17eafcdb4eedb33a490ff3157f8cb9cb5553d1ed8da0914c1d5b1"
  }
 }

SPECS-EXTENDED/python-whoosh/python-whoosh.spec

@@ -1,18 +1,16 @@
 # For bootstrapping sphinxcontrib-websupport
 %bcond_without docs
 
-%global mod_name Whoosh
-
 Name:           python-whoosh
 Version:        2.7.4
-Release:        20%{?dist}
-Summary:        Fast, pure-Python full text indexing, search, and spell checking library 
+Release:        21%{?dist}
+Summary:        Fast, pure-Python full text indexing, search, and spell checking library
 
-License:        BSD 
+License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-URL:            http://pythonhosted.org/Whoosh/
-Source0:        https://pypi.python.org/packages/source/W/%{mod_name}/%{mod_name}-%{version}.tar.gz#/python-%{mod_name}-%{version}.tar.gz
+URL:            https://github.com/mchaput/whoosh
+Source0:        https://github.com/mchaput/whoosh/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -45,7 +43,7 @@ functionality to their applications and websites. Every part of how Whoosh
 works can be extended or replaced to meet your needs exactly.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n whoosh-%{version}
 # pytest 4
 sed -i 's/\[pytest\]/\[tool:pytest\]/' setup.cfg
 
@@ -62,6 +60,7 @@ rm -rf docs/html/.doctrees
 %py3_install
 
 %check
+%{__python3} -m pip install wheel
 %{__python3} setup.py test
 
 %files -n python%{python3_pkgversion}-whoosh
@@ -74,6 +73,10 @@ rm -rf docs/html/.doctrees
 %{python3_sitelib}/*.egg-info/
 
 %changelog
+* Fri Jul 22 2022 Muhammad Falak <[email protected]> - 2.7.4-21
+- Install `wheel` package in %check section to enable build
+- Switch to github tarball
+
 * Thu Apr 21 2022 Muhammad Falak <[email protected]> - 2.7.4-20
 - Add an explicit BR on `pip` to enable ptest
 - License verified

SPECS-EXTENDED/umoci/umoci.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "umoci-0.4.7.tar.gz": "c01b36de6fdc513eb65add57bc882d72f94fc3b4b65a8f9ef59826fb754af93e"
+ }
+}

SPECS-EXTENDED/umoci/umoci.spec

@@ -0,0 +1,44 @@
+Summary:        Open Container Image manipulation tool
+Name:           umoci
+Version:        0.4.7
+Release:        1%{?dist}
+License:        Apache-2.0
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+Group:          Applications/Tools
+URL:            https://github.com/opencontainers/umoci
+Source0:        https://github.com/opencontainers/umoci/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+%global debug_package %{nil}
+%define our_gopath %{_topdir}/.gopath
+BuildRequires:  golang >= 1.17.9
+
+%description
+umoci modifies Open Container images.
+umoci is a manipulation tool for OCI images. In particular, it is an
+alternative to oci-image-tools provided by the OCI.
+
+%prep
+%setup -q
+
+%build
+tar --no-same-owner -xf %{SOURCE0}
+export GOPATH=%{our_gopath}
+make BUILD_FLAGS="-mod=vendor" VERSION="%{version}" umoci
+
+%install
+install -D -m 0755 ./umoci %{buildroot}%{_bindir}/umoci
+
+%check
+go test -mod=vendor
+./umoci --version
+
+%files
+%defattr(-,root,root)
+%license COPYING
+%doc README.md
+%{_bindir}/umoci
+
+%changelog
+* Mon Jul 25 2022 Tom Fay <[email protected]> - 0.4.7-1
+- Original version for CBL-Mariner.
+- License verified.

SPECS-SIGNED/kernel-signed/kernel-signed.spec

@@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
-Version:        5.15.55.1
+Version:        5.15.57.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Tue Jul 26 2022 CBL-Mariner Servicing Account <[email protected]> - 5.15.57.1-1
+- Upgrade to 5.15.57.1
+
 * Fri Jul 22 2022 CBL-Mariner Servicing Account <[email protected]> - 5.15.55.1-1
 - Upgrade to 5.15.55.1
 

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

@@ -130,6 +130,7 @@
                 "crontabs",
                 "cryptsetup",
                 "cscope",
+                "ctags",
                 "CUnit",
                 "cups",
                 "custodia",
@@ -959,6 +960,7 @@
                 "p7zip",
                 "pacrunner",
                 "pakchois",
+                "pam_krb5",
                 "pam_wrapper",
                 "papi",
                 "paps",
@@ -1601,6 +1603,7 @@
                 "python-requests-toolbelt",
                 "python-requests_ntlm",
                 "python-responses",
+                "python-retrying",
                 "python-rfc3986",
                 "python-rpm-generators",
                 "python-rpmfluff",
@@ -1914,6 +1917,7 @@
                 "xorg-x11-xtrans-devel",
                 "xrestop",
                 "xterm",
+                "xxhash",
                 "yajl",
                 "yaml-cpp",
                 "yasm",
@@ -2071,6 +2075,7 @@
                 "shim-unsigned",
                 "shim-unsigned-aarch64",
                 "shim-unsigned-x64",
+                "skopeo",
                 "span-lite",
                 "swupdate",
                 "SymCrypt",
@@ -2079,6 +2084,7 @@
                 "tinyxml2",
                 "toml11",
                 "tracelogging",
+                "umoci",
                 "usrsctp",
                 "vala",
                 "verity-read-only-root",
@@ -2099,12 +2105,18 @@
             ]
         },
         "NVIDIA": {
-            "license": "[ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)",
+            "license": "[ASL 2.0 License and spec specific licenses](http://www.apache.org/licenses/LICENSE-2.0)",
             "specs": [
+                "knem",
                 "libnvidia-container",
+                "mlnx-ofa_kernel",
+                "mlnx-tools",
+                "mlx-bootctl",
                 "nvidia-container-runtime",
                 "nvidia-container-toolkit",
-                "nvidia-docker2"
+                "nvidia-docker2",
+                "ofed-scripts",
+                "perftest"
             ]
         },
         "OpenMamba": {

SPECS/blobfuse/blobfuse.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "blobfuse-1.4.2.tar.gz": "252d0562c0403bc85cfd9f98fb66211180cf961b09f6f180752ea07c6694b10f"
+  "blobfuse-1.4.4.tar.gz": "abc87a2c06fcc7fad714df4accbfc346e7759560e8b4cd64318ad499bdc7c221"
  }
 }

SPECS/blobfuse/blobfuse.spec

@@ -1,7 +1,7 @@
 Summary:        FUSE adapter - Azure Storage Blobs
 Name:           blobfuse
-Version:        1.4.2
-Release:        3%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -46,6 +46,9 @@ install -p -m 755 build/blobfuse %{buildroot}%{_bindir}/
 %{_bindir}/blobfuse
 
 %changelog
+* Mon Jul 25 2022 Betty Lakes <[email protected]> - 1.4.4-1
+- Upgrade to latest upstream version
+
 * Tue Jun 14 2022 Muhammad Falak <[email protected]> - 1.4.2-3
 - Bump release to rebuild with golang 1.18.3
 

SPECS/ctags/ctags.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "ctags-p5.9.20220619.0.tar.gz": "89221e3ba481a7aa7152348bb96862ce5ec0d6b4756352900d74b0f514aaa5ad"
+ }
+}