[main] Adding missing cgmanifest.json entries (#2883)

Including following package entries in 'cgmanifest.json' file: * nodejs-nodemon * objectweb-anttask * ocaml-xml-light * perl-Class-Data-Inheritable * perl-XML-SAX * plexus-component-api * psutils * publicsuffix * python-curio * python-d2to1 * python-hwdata * python-sniffio * python-trio Sorting 'cgmanifest.json'. Use mariner source url macro Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2022-04-27 09:29:03 -07:00 · 2022-04-27 09:29:03 -07:00 · a95eed7e64
--- a/SPECS-EXTENDED/nodejs-nodemon/nodejs-nodemon.spec
+++ b/SPECS-EXTENDED/nodejs-nodemon/nodejs-nodemon.spec
@ -8,11 +8,11 @@ Distribution:   Mariner

 Name:          nodejs-%{npm_name}
 Version:       2.0.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Simple monitor script for use during development of a node.js app
 License:       MIT
 URL:           https://github.com/remy/nodemon
-Source0:       %{npm_name}-v%{version}-bundled.tar.gz
+Source0:       %{_mariner_sources_url}/%{npm_name}-v%{version}-bundled.tar.gz

 BuildRequires: nodejs-devel
 BuildRequires: nodejs-packaging
@ -79,6 +79,10 @@ npm run test
 %{_bindir}/nodemon

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 2.0.3-3
+- Updated source URL.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.3-2
 - Initial CBL-Mariner import from CentOS 8 (license: MIT).

--- a/SPECS-EXTENDED/objectweb-anttask/objectweb-anttask.spec
+++ b/SPECS-EXTENDED/objectweb-anttask/objectweb-anttask.spec
@ -20,12 +20,12 @@ Distribution:   Mariner

 Name:           objectweb-anttask
 Version:        1.2
-Release:        265%{?dist}
+Release:        266%{?dist}
 Summary:        ObjectWeb Ant task
 License:        LGPLv2+
 Group:          Development/Languages/Java
 Url:            http://forge.objectweb.org/projects/monolog/
-Source0:        ow_util_ant_tasks_1.2.zip
+Source0:        %{_mariner_sources_url}/ow_util_ant_tasks_1.2.zip
 Source1:        %{name}-LICENSE.txt
 Patch1:         objectweb-anttask-ant17.patch
 Patch2:         objectweb-anttask-java5.patch
@ -69,6 +69,9 @@ popd
 %{_javadir}/*

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 1.2-266
+- Updated source URL.
+
 * Fri Dec 10 2021 Thomas Crain <thcrain@microsoft.com> - 1.2-265
 - License verified

--- a/SPECS-EXTENDED/ocaml-xml-light/LICENSE.PTR
+++ b/SPECS-EXTENDED/ocaml-xml-light/LICENSE.PTR
@ -0,0 +1,3 @@
+The license for this package is inferred to be LGPLv2.1 based on the README file located at "ocaml/xml-light."
+The README file specifies that the license being used is LGPLv2.1 (OCaml library licence).
+Refer to https://ocaml.org/docs/license.html for license docs.
--- a/SPECS-EXTENDED/ocaml-xml-light/ocaml-xml-light.signatures.json
+++ b/SPECS-EXTENDED/ocaml-xml-light/ocaml-xml-light.signatures.json
@ -1,5 +1,6 @@
 {
 "Signatures": {
+  "LICENSE.PTR": "f84904cad7e8e037f1c86e5e037d567adb9439bf8f9654be2685d90b6ffc2cf1",
  "xml-light-234.tar.gz": "223683046b0beb5d0a4e87729a72f4abd4646de7bbbb7a8b3c7b748f6a32eb99"
 }
 }
--- a/SPECS-EXTENDED/ocaml-xml-light/ocaml-xml-light.spec
+++ b/SPECS-EXTENDED/ocaml-xml-light/ocaml-xml-light.spec
@ -7,10 +7,10 @@ Distribution:   Mariner

 Name:           ocaml-xml-light
 Version:        2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Minimal XML parser and printer for OCaml

-License:        LGPLv2+
+License:        LGPLv2.1
 URL:            http://tech.motion-twin.com/xmllight.html

 # Upstream does not have releases (or rather, it did up to version 2.2
@ -25,15 +25,14 @@ URL:            http://tech.motion-twin.com/xmllight.html
 #       cd ocamllibs/xml-light/
 #       tar -zcf /tmp/xml-light-NNN.tar.gz --xform='s,^\.,xml-light-NNN,' .
 #         (where NNN is the svnrev above)
-Source0:        xml-light-%{svnrev}.tar.gz
-
+Source0:        %{_mariner_sources_url}/xml-light-%{svnrev}.tar.gz
+Source1:        LICENSE.PTR

 BuildRequires:  ocaml >= 4.00.1
 BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  gawk

-
 %description
 Xml-Light is a minimal XML parser & printer for OCaml. It provides
 functions to parse an XML document into an OCaml data structure, work
@ -41,20 +40,17 @@ with it, and print it back to an XML document. It support also DTD
 parsing and checking, and is entirely written in OCaml, hence it does
 not require additional C library.

-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}

-
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.

-
 %prep
 %setup -n xml-light-%{svnrev}
-
+cp %{SOURCE1} .

 %build
 # Build breaks if parallelized.
@ -66,7 +62,6 @@ make opt
 %endif
 sed -e 's/@VERSION@/%{VERSION}/' < META.in > META

-
 %check
 ./test.exe <<EOF
 <abc><123/></abc>
@ -80,7 +75,6 @@ EOF
 EOF
 %endif

-
 %install
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
@ -91,10 +85,10 @@ ocamlfind install xml-light META *.mli *.cmi *.cma \
 *.a *.cmxa *.cmx
 %endif

-
 %files
 %doc README
 %{_libdir}/ocaml/xml-light
+%license LICENSE.PTR README
 %if %opt
 %exclude %{_libdir}/ocaml/xml-light/*.a
 %exclude %{_libdir}/ocaml/xml-light/*.cmxa
@ -102,9 +96,9 @@ ocamlfind install xml-light META *.mli *.cmi *.cma \
 %endif
 %exclude %{_libdir}/ocaml/xml-light/*.mli

-
 %files devel
 %doc README doc/*
+%license LICENSE.PTR README
 %if %opt
 %{_libdir}/ocaml/xml-light/*.a
 %{_libdir}/ocaml/xml-light/*.cmxa
@ -112,8 +106,13 @@ ocamlfind install xml-light META *.mli *.cmi *.cma \
 %endif
 %{_libdir}/ocaml/xml-light/*.mli

-
 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 2.3-2
+- Updated source URL.
+- Improved formatting.
+- Added LICENSE.PTR to clarify the package's license.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.3-1
 - Switching to using full number for the 'Release' tag.
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
--- a/SPECS-EXTENDED/perl-Class-Data-Inheritable/perl-Class-Data-Inheritable.spec
+++ b/SPECS-EXTENDED/perl-Class-Data-Inheritable/perl-Class-Data-Inheritable.spec
@ -7,7 +7,7 @@

 Name:           perl-Class-Data-Inheritable
 Version:        0.08
-Release:        35%{?dist}
+Release:        36%{?dist}
 Summary:        Inheritable, overridable class data
 License:        GPL+ or Artistic
 Vendor:         Microsoft Corporation
@ -16,7 +16,7 @@ URL:            https://metacpan.org/release/Class-Data-Inheritable
 # has non-free and outdated jp docs
 # rm -rf doc
 # Source0:      https://cpan.metacpan.org/authors/id/T/TM/TMTM/Class-Data-Inheritable-%%{version}.tar.gz
-Source0:        Class-Data-Inheritable-%{version}-clean.tar.gz
+Source0:        %{_mariner_sources_url}/Class-Data-Inheritable-%{version}-clean.tar.gz
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
@ -66,6 +66,10 @@ make test
 %{_mandir}/man3/Class::Data::Inheritable.3pm*

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 0.08-36
+- Updated source URL.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.08-35
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/perl-XML-SAX/perl-XML-SAX.spec
+++ b/SPECS-EXTENDED/perl-XML-SAX/perl-XML-SAX.spec
@ -1,7 +1,7 @@
 Summary:        SAX parser access API for Perl
 Name:           perl-XML-SAX
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}

 License:        GPL+ or Artistic
 Vendor:         Microsoft Corporation
@ -9,7 +9,7 @@ Distribution:   Mariner
 URL:            https://metacpan.org/release/XML-SAX
 # Original source
 # http://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-%%{version}.tar.gz
-Source0:        XML-SAX-%{version}-nopatents.tar.gz
+Source0:        %{_mariner_sources_url}/XML-SAX-%{version}-nopatents.tar.gz
 # XML-SAX contains patented code that we cannot ship. Therefore we use
 # this script to remove the patented code before shipping it.
 # Download the upstream tarball and invoke this script while in the
@ -121,6 +121,10 @@ rm -rf "%{perl_vendorlib}/XML/SAX/ParserDetails.ini.backup" || :


 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 1.02-5
+- Updated source URL.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.02-4
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/plexus-component-api/plexus-component-api.spec
+++ b/SPECS-EXTENDED/plexus-component-api/plexus-component-api.spec
@ -23,14 +23,14 @@ Distribution:   Mariner
 %define project_version %{base_ver}-alpha-%{alpha_ver}
 Name:           plexus-component-api
 Version:        %{base_ver}~alpha%{alpha_ver}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plexus Component API
 License:        ASL 2.0
 Group:          Development/Libraries/Java
 URL:            https://mvnrepository.com/artifact/org.codehaus.plexus/plexus-component-api
 #svn export http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-15/plexus-component-api/ plexus-component-api-1.0-alpha-15
 #tar cJf plexus-component-api-1.0-alpha-15.tar.xz plexus-component-api-1.0-alpha-15/
-Source0:        %{name}-%{project_version}.tar.xz
+Source0:        %{_mariner_sources_url}/%{name}-%{project_version}.tar.xz
 Source1:        %{name}-build.xml
 Source2:        %{name}-LICENSE.txt
 BuildRequires:  ant
@ -86,6 +86,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 1.0~alpha15-4
+- Updated source URL.
+
 * Fri Dec 10 2021 Thomas Crain <thcrain@microsoft.com> - 1.0~alpha15-3
 - License verified

--- a/SPECS-EXTENDED/psutils/psutils.spec
+++ b/SPECS-EXTENDED/psutils/psutils.spec
@ -3,14 +3,14 @@ Distribution:   Mariner
 Summary: PostScript Utilities
 Name:    psutils
 Version: 1.23
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: psutils

 # We can't follow https://fedoraproject.org/wiki/Packaging:SourceURL#Github
 # and use upstream tarball for building because ./bootstrap downloads gnulib.
 # wget https://github.com/rrthomas/psutils/archive/master.zip && unzip master.zip && cd psutils-master/
 # ./bootstrap && autoreconf -vfi && ./configure && make dist-xz
-Source: psutils-%{version}.tar.xz
+Source: %{_mariner_sources_url}/psutils-%{version}.tar.xz
 URL:    https://github.com/rrthomas/psutils

 # BZ#1072371
@ -83,6 +83,10 @@ sed -i -e 's,/usr/bin/env perl,%{__perl},' \


 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 1.23-19
+- Updated source URL.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.23-18
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/publicsuffix/publicsuffix.spec
+++ b/SPECS-EXTENDED/publicsuffix/publicsuffix.spec
@ -21,11 +21,11 @@ Distribution:   Mariner

 Name:           publicsuffix
 Version:        20201026
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-vendor public domain suffix database
 License:        MPL-2.0
 URL:            https://publicsuffix.org/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 BuildRequires:  psl-make-dafsa
 BuildArch:      noarch

@ -61,6 +61,10 @@ install -m 644 -p -D public_suffix_list.dafsa \
 %{_datadir}/%{name}

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 20201026-3
+- Updated source URL.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 20201026-2
 - Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
--- a/SPECS-EXTENDED/python-curio/python-curio.spec
+++ b/SPECS-EXTENDED/python-curio/python-curio.spec
@ -29,11 +29,10 @@ many of its ideas have influenced other libraries with similar functionality.
 Summary:        Building blocks for performing concurrent I/O
 Name:           python-%{pkgname}
 Version:        1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 URL:            https://github.com/dabeaz/curio
-#Source0:       https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-Source0:        https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/c/%{pkgname}/%{pkgname}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:      noarch

 %description %{_description}
@ -71,6 +70,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} --verbose -
 %{python3_sitelib}/%{eggname}-%{version}-py%{python3_version}.egg-info

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 1.4-4
+- Updated source URL.
+- License verified.
 * Tue Jan 12 2021 Steve Laughman <steve.laughman@microsoft.com> - 1.4-3
 - Correction to files declaration
 * Tue Dec 08 2020 Steve Laughman <steve.laughman@microsoft.com> - 1.4-2
--- a/SPECS-EXTENDED/python-d2to1/python-d2to1.spec
+++ b/SPECS-EXTENDED/python-d2to1/python-d2to1.spec
@ -4,13 +4,12 @@ Distribution:   Mariner

 Name: python-%{srcname}
 Version: 0.2.12
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Allows using distutils2-like setup.cfg files with setup.py
 License: BSD

 URL: http://pypi.python.org/pypi/d2to1
-#Source0: http://pypi.python.org/packages/source/d/d2to1/%{srcname}-%{version}.tar.gz
-Source0: https://pypi.python.org/packages/source/d/d2to1/d2to1-0.2.12.post1.tar.gz#/python-d2to1-0.2.12.post1.tar.gz
+Source0: https://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.post1.tar.gz#/%{name}-%{version}.post1.tar.gz

 BuildArch: noarch

@ -50,6 +49,10 @@ find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'


 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 0.2.12-18
+- Updated source URL.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.2.12-17
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
--- a/SPECS-EXTENDED/python-hwdata/python-hwdata.spec
+++ b/SPECS-EXTENDED/python-hwdata/python-hwdata.spec
@ -9,7 +9,7 @@ Distribution:   Mariner

 Name:		python-hwdata
 Version:	2.3.7
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Python bindings to hwdata package
 BuildArch:  noarch
 License:	GPLv2
@ -17,7 +17,7 @@ URL:		https://github.com/xsuchy/python-hwdata
 # git clone https://github.com/xsuchy/python-hwdata.git
 # cd python-hwdata
 # tito build --tgz
-Source0:	%{name}-%{version}.tar.gz
+Source0:	%{_mariner_sources_url}/%{name}-%{version}.tar.gz

 %description
 Provide python interface to database stored in hwdata package.
@ -111,6 +111,10 @@ pylint-3 hwdata.py example.py || :
 %endif # with python3

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 2.3.7-10
+- Updated source URL.
+- License verified.
+
 * Fri Mar 05 2021 Henry Li <lihl@microsoft.com> - 2.3.7-9
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Fix distro checking to enable python3 build and disable python2 build
--- a/SPECS-EXTENDED/python-sniffio/python-sniffio.spec
+++ b/SPECS-EXTENDED/python-sniffio/python-sniffio.spec
@ -21,11 +21,10 @@ detect which async library your code is running under.
 Summary:        Sniff out which async library your code is running under
 Name:           python-%{pkgname}
 Version:        1.1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        MIT or ASL 2.0
 URL:            https://github.com/python-trio/sniffio
-#Source0:       https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-Source0:        https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/s/%{pkgname}/%{pkgname}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:      noarch

 %description %{_description}
@ -60,6 +59,9 @@ py.test-%{python3_version} --verbose
 %{python3_sitelib}/%{eggname}-%{version}-py%{python3_version}.egg-info

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 1.1.0-10
+- Updated source URL
+- License verified
 * Tue Jan 12 2021 Steve Laughman <steve.laughman@microsoft.com> - 1.1.0-9
 - Correction to files declaration
 * Tue Dec 08 2020 Steve Laughman <steve.laughman@microsoft.com> - 1.1.0-8
--- a/SPECS-EXTENDED/python-trio/python-trio.spec
+++ b/SPECS-EXTENDED/python-trio/python-trio.spec
@ -27,12 +27,11 @@ right.}

 Name:           python-%{pkgname}
 Version:        0.16.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A friendly Python library for async concurrency and I/O
 License:        MIT or ASL 2.0
 URL:            https://github.com/python-trio/trio
-#Source0:       https://files.pythonhosted.org/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-Source0:        https://files.pythonhosted.org/packages/source/t/%{pypi_name}/%{name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/t/%{pkgname}/%{pkgname}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:      noarch

 %description %{common_description}
@ -78,6 +77,9 @@ rm -rf %{eggname}.egg-info
 %{python3_sitelib}/%{eggname}-%{version}-py%{python3_version}.egg-info

 %changelog
+* Tue Apr 26 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 0.16.0-3
+- Updated source URL.
+- License verified.
 * Tue Dec 08 2020 Steve Laughman <steve.laughman@microsoft.com> - 0.16.0-2
 - Initial CBL-Mariner import from Fedora 33 (license: MIT)
 - Disable tests by default
--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -12508,6 +12508,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "nodejs-nodemon",
+          "version": "2.0.3",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/nodemon-v2.0.3-bundled.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -12748,6 +12758,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "objectweb-anttask",
+          "version": "1.2",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/ow_util_ant_tasks_1.2.zip"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -13258,6 +13278,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "ocaml-xml-light",
+          "version": "2.3",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xml-light-234.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -14299,6 +14329,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "perl-Class-Data-Inheritable",
+          "version": "0.08",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/Class-Data-Inheritable-0.08-clean.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -18569,6 +18609,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "perl-XML-SAX",
+          "version": "1.02",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/XML-SAX-1.02-nopatents.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -18859,6 +18909,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "plexus-component-api",
+          "version": "1.0~alpha15",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/plexus-component-api-1.0-alpha-15.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -19209,6 +19269,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "psutils",
+          "version": "1.23",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/psutils-1.23.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -19219,6 +19289,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "publicsuffix",
+          "version": "20201026",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/publicsuffix-20201026.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -19799,6 +19879,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-curio",
+          "version": "1.4",
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/c/curio/curio-1.4.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -20229,6 +20319,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-hwdata",
+          "version": "2.3.7",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/python-hwdata-2.3.7.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -21579,6 +21679,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-sniffio",
+          "version": "1.1.0",
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/s/sniffio/sniffio-1.1.0.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -21919,6 +22029,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-trio",
+          "version": "0.16.0",
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/t/trio/trio-0.16.0.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -23304,9 +23424,9 @@
      "component": {
        "type": "other",
        "other": {
-          "name": "rubygem-hoe",
-          "version": "3.18.0",
-          "downloadUrl": "https://github.com/seattlerb/hoe/archive/refs/tags/v3.18.0.tar.gz"
+          "name": "rubygem-hocon",
+          "version": "1.3.1",
+          "downloadUrl": "https://github.com/puppetlabs/ruby-hocon/archive/refs/tags/1.3.1.tar.gz"
        }
      }
    },
@ -23314,9 +23434,9 @@
      "component": {
        "type": "other",
        "other": {
-          "name": "rubygem-hocon",
-          "version": "1.3.1",
-          "downloadUrl": "https://github.com/puppetlabs/ruby-hocon/archive/refs/tags/1.3.1.tar.gz"
+          "name": "rubygem-hoe",
+          "version": "3.18.0",
+          "downloadUrl": "https://github.com/seattlerb/hoe/archive/refs/tags/v3.18.0.tar.gz"
        }
      }
    },