[main] Updating CGmanifest verification tools source URLs. (#2914)

* Updating source URLs and cgmanifest.json. Updating 'lcms2' to version 2.13.1. * Updating cgmanifest.json validation script. * Removing cgmanifest.json duplicates. * Updating source URLs. * Making download checks faster (thanks, Olivia!).
2022-05-02 13:29:11 -07:00 · 2022-05-02 13:29:11 -07:00 · 23e3f81574
--- a/.github/workflows/validate-cg-manifest.sh
+++ b/.github/workflows/validate-cg-manifest.sh
@ -5,17 +5,25 @@
 # Best effort validation of the package cgmanifest. It will check, for each spec file passed, that:
 #
 #   - The registration for the package name/version is in the cgmanifest
-#   - The source0 basename (not full url) is a substring of the cgmanifest url
-#     - OR that a #source0 comment is a substring of the cgmanifest url
+#   - The source0 basename (not full URL) is a substring of the cgmanifest URL
+#     - OR that a #source0 comment is a substring of the cgmanifest URL
 #   - The URL listed in the cgmanifets is valid (can be downloaded)

 # $@ - Paths to spec files to check

+# Specs, which contain multiple source files and are split into many entries inside 'cgmanifest.json'.
+ignore_multiple_sources=" \
+  xorg-x11-apps \
+  xorg-x11-font-utils \
+  xorg-x11-server-utils \
+  xorg-x11-xkb-utils"
+
 # List of ignored specs due to no source tarball to scan.
 ignore_no_source_tarball=" \
  ca-certificates \
  check-restart \
  core-packages \
+  dbus-x11 \
  ghc-srpm-macros \
  hunspell-nl \
  hunspell-ru \
@ -23,127 +31,130 @@ ignore_no_source_tarball=" \
  hyphen-hsb \
  hyphen-lt \
  hyphen-mn \
-  lua-rpm-macros \
-  mariner-repos \
-  mariner-rpm-macros"
-
-# Ignore some specs, mostly those with Source0 files that are not from an external source, or have very odd URLs
-ignore_list=" \
-  appstream-data \
-  byacc \
-  Cython \
-  dbus-x11 \
-  geronimo-specs \
-  grub2-efi-binary-signed-aarch64 \
-  grub2-efi-binary-signed-x86_64 \
-  grubby \
  initramfs \
  installkernel \
  javapackages-tools-meta \
  kde-filesystem \
-  kernel-signed-aarch64 \
-  kernel-signed-x86_64 \
  kf5 \
-  lcms2 \
-  moby-buildx \
-  moby-containerd \
+  lua-rpm-macros \
+  mariner-repos \
+  mariner-rpm-macros \
  multilib-rpm-config \
  opencl-filesystem \
-  openjdk8 \
  patterns-ceph-containers \
  pyproject-rpm-macros \
-  python-markupsafe \
-  python-nocasedict \
-  python-pywbem \
-  python-repoze-lru \
-  python-requests \
-  python-sphinxcontrib-websupport \
-  python-yamlloader \
-  python-zope-interface \
  qt5-rpm-macros \
-  rt-setup
-  rtctl
-  runc \
-  sgabios \
-  shim \
  verity-read-only-root \
-  usbip \
  web-assets \
-  xmvn \
-  xorg-x11-apps \
-  xorg-x11-font-utils \
-  xorg-x11-server-utils \
-  xorg-x11-xkb-utils"
+  "
+
+# Specs for signed packages. Their unsigned versions should already be included in the manifest.
+ignore_signed_package=" \
+  grub2-efi-binary-signed-aarch64 \
+  grub2-efi-binary-signed-x86_64 \
+  kernel-signed-aarch64 \
+  kernel-signed-x86_64 \
+  shim"
+
+alt_source_tag="Source9999"
+mariner_sources_url="https://cblmarinerstorage.blob.core.windows.net/sources/core"

 rm -f bad_registrations.txt
 rm -rf ./cgmanifest_test_dir/

 [[ $# -eq 0 ]] && echo "No specs passed to validate"

-for spec in "$@"
+WORK_DIR=$(mktemp -d -t)
+function clean_up {
+    echo "Cleaning up..."
+    rm -rf "$WORK_DIR"
+}
+trap clean_up EXIT SIGINT SIGTERM
+
+echo "Checking $# specs."
+
+i=0
+for original_spec in "$@"
 do
-  echo Checking "$spec"
+  i=$((i+1))
+  echo "[$i/$#] Checking $original_spec"
+
+  # Using a copy of the spec file, because parsing requires some pre-processing.
+  spec="$WORK_DIR/$(basename "$original_spec")"
+  cp "$original_spec" "$spec"
+
+  # Pre-processing alternate sources (commented-out "Source" lines with full URLs), if present. Currently we only care about the first source.
+  # First, we replace "%%" with "%" in the alternate source's line.
+  sed -Ei "/^#\s*Source0?:.*%%.*/s/%%/%/g" "$spec"
+  # Then we uncomment it.
+  sed -Ei "s/^#\s*Source0?:/$alt_source_tag:/" "$spec"
+
+  # Removing trailing comments from "Source" tags.
+  sed -Ei "s/^(\s*Source[0-9]*:.*)#.*/\1/" "$spec"

  # Additional macros required to parse some spec files.
-  spec_dir="$(dirname "$spec")"
-  defines=(-D "forgemeta %{nil}" -D "py3_dist X" -D "with_check 0" -D "dist .cm2" -D "__python3 python3" -D "_sourcedir $spec_dir" -D "fillup_prereq fillup")
+  spec_dir="$(dirname "$original_spec")"
+  defines=(-D "_mariner_sources_url $mariner_sources_url" -D "forgemeta %{nil}" -D "py3_dist X" -D "with_check 0" -D "dist .cm2" -D "__python3 python3" -D "_sourcedir $spec_dir" -D "fillup_prereq fillup")

  name=$(rpmspec --srpm  "${defines[@]}" --qf "%{NAME}" -q "$spec" 2>/dev/null)
  if [[ -z $name ]]
  then
-    echo "Failed to get name from '$spec'. Please update the spec or the macros from the 'defines' variable in this script. Error:" >> bad_registrations.txt
+    echo "Failed to get name from '$original_spec'. Please update the spec or the macros from the 'defines' variable in this script. Error:" >> bad_registrations.txt
    rpmspec --srpm  "${defines[@]}" --qf "%{NAME}" -q "$spec" &>> bad_registrations.txt
    continue
  fi

-  # Some specs don't make sense to add, ignore them
-  if echo "$ignore_list $ignore_no_source_tarball" | grep -w "$name" > /dev/null
+  # Skipping specs from the ignore lists.
+  if echo "$ignore_multiple_sources $ignore_signed_package $ignore_no_source_tarball" | grep -P "(^|\s)$name($|\s)" > /dev/null
  then
    echo "    $name is being ignored, skipping"
    continue
  fi

  version=$(rpmspec --srpm  "${defines[@]}" --qf "%{VERSION}" -q "$spec" 2>/dev/null )
+  if [[ -z $version ]]
+  then
+    echo "Failed to get version from '$original_spec'. Please update the spec or the macros from the 'defines' variable in this script. Error:" >> bad_registrations.txt
+    rpmspec --srpm  "${defines[@]}" --qf "%{VERSION}" -q "$spec" &>> bad_registrations.txt
+    continue
+  fi

-  # Get the source0 for the package, it apears to always occur last in the list of sources
-  source0=$(rpmspec --srpm  "${defines[@]}" --qf "[%{SOURCE}\n]" -q "$spec"  2>/dev/null | tail -1)
+  parsed_spec="$(rpmspec "${defines[@]}" --parse "$spec")"
+
+  # Reading the source0 file/URL.
+  source0=$(echo "$parsed_spec" | grep -P "^\s*Source0?:" | cut -d: -f2- | xargs)
  if [[ -z $source0 ]]
  then
    echo "    No source file listed for $name:$version, skipping"
    continue
  fi

-  # Some source files have been renamed, look for a comment and also try that (while manually substituting the name/version)
-  source0alt=$(grep "^#[[:blank:]]*Source0:" "$spec" | awk '{print $NF}' | sed "s/%\?%{name}/$name/g" | sed "s/%\?%{version}/$version/g" )
-  # Some packages define a %url as well
-  # Use ' ' as delimiter to avoid conflict with URL characters
-  specurl=$(rpmspec --srpm  "${defines[@]}" --qf "%{URL}" -q "$spec" 2>/dev/null )
-  [[ -z $specurl ]] || source0alt=$(echo $source0alt | sed "s %\?%{url} $specurl g" )
+  # Reading the alternate source URL.
+  source0alt=$(echo "$parsed_spec" | grep -P "^\s*$alt_source_tag:" | cut -d: -f2- | xargs)

-  # Pull the current registration from the cgmanifest file. Every registration should have a url, so if we don't find one
+  # Pull the current registration from the cgmanifest file. Every registration should have a URL, so if we don't find one
  # that implies the registration is missing.
  manifesturl=$(jq --raw-output ".Registrations[].component.other | select(.name==\"$name\" and .version==\"$version\") | .downloadUrl" cgmanifest.json)
  if [[ -z $manifesturl ]]
  then
-    echo "Registration for \"$name\":\"$version\" is missing" >> bad_registrations.txt
+    echo "Registration for $name:$version is missing" >> bad_registrations.txt
  else
-    # Check if either attempt at the source url is a substring of the full download path, if so assume the full url is correct.
-    overlap=$(echo "$manifesturl" | grep "$source0")
-    overlapalt=$(echo "$manifesturl" | grep "$source0alt")
-    if [[ -z "$overlap$overlapalt" ]]
+    if [[ "$manifesturl" != "$source0" && "$manifesturl" != "$source0alt" ]]
    then
-      echo "Registration for \"$name\":\"$version\" does not seem to include a URL for \"$source0\" or \"$source0alt\" (Currently $manifesturl)"  >> bad_registrations.txt
+      {
+        echo "Registration URL for $name:$version ($manifesturl) matches neither the first \"Source\" tag nor the alternate source URL."
+        printf '\tFirst "Source" tag:\t%s\n' "$source0"
+        printf '\tAlternate source URL:\t%s\n' "$source0alt"
+      } >> bad_registrations.txt
    else
      # Try a few times to download the source listed in the manifest
-      mkdir -p ./cgmanifest_test_dir
-      for attempt in {1..10}
-      do
-        wget --quiet -P ./cgmanifest_test_dir "$manifesturl" && touch ./cgmanifest_test_dir/WORKED && break
-        echo "Failed attempt number $attempt to download from '$manifesturl'."
-        sleep 5
-      done
-      [[ -f ./cgmanifest_test_dir/WORKED ]] || echo "Registration for \"$name\":\"$version\" has invalid URL '$manifesturl' (could not download)"  >> bad_registrations.txt
-      rm -rf ./cgmanifest_test_dir/
+      # Parsing output instead of using error codes because 'wget' returns code 8 for FTP, even if the file exists.
+      # Sample HTTP(S) output:  Remote file exists.
+      # Sample FTP output:      File ‘time-1.9.tar.gz’ exists.
+      if ! wget --spider --timeout=1 --tries=10 "${manifesturl}" 2>&1 | grep -qP "^(Remote file|File ‘.*’) exists\.$"
+      then
+        echo "Registration for $name:$version has invalid URL '$manifesturl' (could not download)"  >> bad_registrations.txt
+      fi
    fi
  fi
 done
--- a/SPECS-EXTENDED/geronimo-specs/geronimo-specs.spec
+++ b/SPECS-EXTENDED/geronimo-specs/geronimo-specs.spec
@ -21,12 +21,12 @@ Distribution:   Mariner
 %define bname geronimo
 Name:           geronimo-specs
 Version:        1.2
-Release:        38%{?dist}
+Release:        39%{?dist}
 Summary:        Geronimo J2EE server J2EE specifications
 License:        ASL 2.0
 Group:          Development/Languages/Java
 URL:            http://geronimo.apache.org
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 # STEPS TO CREATE THE SOURCE FILE
 # mkdir geronimo-specs-1.2
 # cd geronimo-specs-1.2
@ -732,6 +732,9 @@ install -m 0644 geronimo-ws-metadata_2.0_spec-1.1.1/pom.xml \
 %license geronimo-ws-metadata_2.0_spec-1.1.1/LICENSE.txt

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2-39
+- Updating source URL.
+
 * Wed Feb 23 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2-38
 - Removing following components due to incompatibility with Java 11:
  - commonj;
--- a/SPECS-EXTENDED/jdom2/jdom2.spec
+++ b/SPECS-EXTENDED/jdom2/jdom2.spec
@ -1,14 +1,14 @@
 Summary:        Java manipulation of XML made easy
 Name:           jdom2
 Version:        2.0.6
-Release:        28%{?dist}
+Release:        29%{?dist}
 # Sam as the "Saxpath" license but restricts the use of the name "JDOM" instead of "SAXPath".
 License:        JDOM
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            http://www.jdom.org/
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/hunterhacker/jdom/archive/JDOM-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Remove bundled jars that might not have clear licensing
 Source4:        generate-tarball.sh
 # Use system libraries
@ -85,6 +85,9 @@ cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.6-29
+- Fixing source URL.
+
 * Tue Feb 22 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.6-28
 - Initial CBL-Mariner import from Fedora 36 (license: MIT).
 - License verified.
--- a/SPECS-EXTENDED/libiodbc/libiodbc.spec
+++ b/SPECS-EXTENDED/libiodbc/libiodbc.spec
@ -7,12 +7,9 @@ Distribution:   Mariner
 Summary: iODBC Driver Manager
 Name: libiodbc
 Version: 3.52.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2 or BSD
 URL: http://www.iodbc.org/
-#URL: https://github.com/openlink/iODBC
-#Source0: http://www.iodbc.org/downloads/iODBC/libiodbc-%{version}.tar.gz
-#Source0: http://downloads.sf.net/iodbc/libiodbc-%{version}.tar.gz
 Source0: https://github.com/openlink/iODBC/archive/v%{version}/%{name}-%{version}.tar.gz

 ## upstream patches
@ -113,6 +110,10 @@ rm -rfv %{buildroot}%{_datadir}/libiodbc/samples


 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.52.13-4
+- Updating source URL.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.52.13-3
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/python-pyroute2/python-pyroute2.spec
+++ b/SPECS-EXTENDED/python-pyroute2/python-pyroute2.spec
@ -3,10 +3,10 @@
 Summary:        Pure Python netlink library
 Name:           python-%{srcname}
 Version:        0.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 URL:            https://github.com/svinota/%{srcname}
-Source0:        %{srcname}-%{version}.tar.gz
+Source0:        https://pypi.io/packages/source/p/pyroute2/%{srcname}-%{version}.tar.gz
 Source1:        %{srcname}.core-%{version}.tar.gz
 Source2:        %{srcname}.nslink-%{version}.tar.gz
 Source3:        %{srcname}.nftables-%{version}.tar.gz
@ -85,6 +85,9 @@ cd ../pyroute2.ndb-%{version}


 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.6.5-3
+- Fixing source URL.
+
 * Tue Feb 08 2022 Cameron Baird <cameronbaird@microsoft.com> - 0.6.5-2
 - Initial CBL-Mariner import from Fedora 36 (license: MIT).
 - License verified
--- a/SPECS-EXTENDED/python-templated-dictionary/python-templated-dictionary.spec
+++ b/SPECS-EXTENDED/python-templated-dictionary/python-templated-dictionary.spec
@ -4,14 +4,10 @@
 Summary:        Dictionary with Jinja2 expansion
 Name:           python-%{srcname}
 Version:        1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 URL:            https://github.com/xsuchy/templated-dictionary
-# Source is created by:
-# git clone https://github.com/xsuchy/templated-dictionary && cd templated-dictionary
-# tito build --tgz --tag %%name-%%version-%%release
-# Source tar: https://files.pythonhosted.org/packages/22/4d/cd73de22b8b345e57677c80c26381e25abef19cab9495c91b1627af7621b/templated-dictionary-1.1.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/22/4d/cd73de22b8b345e57677c80c26381e25abef19cab9495c91b1627af7621b/templated-dictionary-1.1.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 Requires:       python%{python3_pkgversion}-jinja2
@ -43,6 +39,9 @@ version="%{version}" python3 setup.py install -O1 --skip-build --root %{buildroo
 %{python3_sitelib}/templated_dictionary*

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1-6
+- Fixing source URL.
+
 * Tue Feb 08 2022 Cameron Baird <cameronbaird@microsoft.com> - 1.1-5
 - Initial CBL-Mariner import from Fedora 33 (license: MIT).
 - License verified
--- a/SPECS-EXTENDED/rpm-mpi-hooks/rpm-mpi-hooks.spec
+++ b/SPECS-EXTENDED/rpm-mpi-hooks/rpm-mpi-hooks.spec
@ -1,14 +1,12 @@
 Name:           rpm-mpi-hooks
 Version:        6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        RPM dependency generator hooks for MPI packages

 License:        MIT
 BuildArch:      noarch
 URL:            https://src.fedoraproject.org/rpms/rpm-mpi-hooks
-# uncompressed sources are available below
-# Source0:      https://src.fedoraproject.org/rpms/rpm-mpi-hooks/tree/rawhide
-Source0:        https://src.fedoraproject.org/rpms/rpm-mpi-hooks/blob/rawhide/f/mpi.attr
+Source0:        https://src.fedoraproject.org/rpms/rpm-mpi-hooks/raw/rawhide/f/mpi.attr
 Source1:        mpilibsymlink.attr
 Source2:        mpi.prov
 Source3:        mpi.req
@ -48,6 +46,9 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req


 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 6-8
+- Fixing source URL.
+
 * Mon Apr 25 2022 Mateusz Malisz <mamalisz@microsoft.com> - 6-7
 - Update Source0
 - License verified.
--- a/SPECS/antlr/antlr.spec
+++ b/SPECS/antlr/antlr.spec
@ -21,13 +21,14 @@
 Summary:        Another Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        123%{?dist}
+Release:        124%{?dist}
 License:        Public Domain
 Group:          Development/Tools/Other
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://www.antlr.org/
-Source0:        antlr-%{version}.tar.bz2
+# Upstream source under https://www.antlr2.org/download/antlr-2.7.7.tar.gz. Needs verification.
+Source0:        %{_mariner_sources_url}/antlr-%{version}.tar.bz2
 Source1:        %{name}-build.xml
 Source2:        %{name}-script
 Source3:        http://repo2.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
@ -208,6 +209,9 @@ find doc -type f | xargs chmod 0644
 %endif

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.7.7-124
+- Fixing source URL.
+
 * Mon Mar 28 2022 Cameron Baird <cameronbaird@microsoft.com> - 2.7.7-123
 - Move to SPECS
 - License verified
--- a/SPECS/grubby/grubby.spec
+++ b/SPECS/grubby/grubby.spec
@ -1,7 +1,7 @@
 Summary:        Command line tool for updating bootloader configs
 Name:           grubby
 Version:        8.40
-Release:        42%{?dist}
+Release:        43%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -9,7 +9,6 @@ URL:            https://github.com/rhinstaller/grubby
 # we only pull git snaps at the moment
 # git clone git@github.com:rhinstaller/grubby.git
 # git archive --format=tar --prefix=grubby-%%{version}/ HEAD |bzip2 > grubby-%%{version}.tar.bz2
-# Source0: %%{name}-%%{version}.tar.bz2
 Source0:        https://github.com/rhboot/grubby/archive/%{version}-1.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        grubby-bls
 Source2:        grubby.in
@ -118,6 +117,9 @@ current boot environment.
 %{_mandir}/man8/*.8*

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.40-43
+- Removing redundant "#Source0" comment.
+
 * Fri Jan 28 2022 Thomas Crain <thcrain@microsoft.com> - 8.40-42
 - Add Fedora patch file (license: MIT) to fix linking with RPM >= 4.16.0
 - Remove git setup steps, apply patches using %%autosetup
--- a/SPECS/java-cup/java-cup-bootstrap.spec
+++ b/SPECS/java-cup/java-cup-bootstrap.spec
@ -21,14 +21,14 @@
 Summary:        LALR Parser Generator in Java
 Name:           java-cup-bootstrap
 Version:        0.11
-Release:        31%{?dist}
+Release:        32%{?dist}
 License:        HPND
 Group:          Development/Libraries/Java
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Url:            http://www2.cs.tum.edu/projects/cup/
 # TODO the version of our 11a source is no longer published
-Source0:        develop.tar.bz2
+Source0:        %{_mariner_sources_url}/develop.tar.bz2
 Source1:        java-cup-generated-files.tar.bz2
 Source2:        java-cup.license
 # From          http://www2.cs.tum.edu/projects/cup/
@ -101,6 +101,9 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name}
 %{_javadir}/*

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.11-32
+- Fixing source URL.
+
 * Thu Mar 24 2022 Cameron Baird <cameronbaird@microsoft.com> - 0.11-31
 - separate into bootstrap and non-bootstrap specs
 - License verified
--- a/SPECS/java-cup/java-cup.spec
+++ b/SPECS/java-cup/java-cup.spec
@ -21,14 +21,14 @@
 Summary:        LALR Parser Generator in Java
 Name:           java-cup
 Version:        0.11
-Release:        31%{?dist}
+Release:        32%{?dist}
 License:        HPND
 Group:          Development/Libraries/Java
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Url:            http://www2.cs.tum.edu/projects/cup/
 # TODO the version of our 11a source is no longer published
-Source0:        develop.tar.bz2
+Source0:        %{_mariner_sources_url}/develop.tar.bz2
 Source1:        java-cup-generated-files.tar.bz2
 Source2:        java-cup.license
 # From          http://www2.cs.tum.edu/projects/cup/
@ -126,6 +126,9 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name}
 %doc manual.html

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.11-32
+- Fixing source URL.
+
 * Thu Mar 24 2022 Cameron Baird <cameronbaird@microsoft.com> - 0.11-31
 - separate into bootstrap and non-bootstrap specs
 - License verified
--- a/SPECS/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch
+++ b/SPECS/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch
@ -1,172 +0,0 @@
-From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001
-From: Marti Maria <info@littlecms.com>
-Date: Wed, 15 Aug 2018 20:07:56 +0200
-Subject: [PATCH 17/18] Upgrade Visual studio 2017 15.8
-
- Upgrade to 15.8
- Add check on CGATS memory allocation (thanks to Quang Nguyen for
-pointing out this)
---
- Projects/VC2017/jpegicc/jpegicc.vcxproj           |  1 +
- Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj       |  2 +-
- Projects/VC2017/lcms2_static/lcms2_static.vcxproj |  2 +-
- Projects/VC2017/linkicc/linkicc.vcxproj           |  2 +-
- Projects/VC2017/psicc/psicc.vcxproj               |  2 +-
- Projects/VC2017/testbed/testbed.vcxproj           |  2 +-
- Projects/VC2017/tiffdiff/tiffdiff.vcxproj         |  2 +-
- Projects/VC2017/tifficc/tifficc.vcxproj           |  2 +-
- Projects/VC2017/transicc/transicc.vcxproj         |  1 +
- src/cmscgats.c                                    | 14 ++++++++++----
- 10 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-index ab26a53..39cfd00 100644
--- a/Projects/VC2017/jpegicc/jpegicc.vcxproj
-+++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-@@ -22,6 +22,7 @@
-     <ProjectGuid>{62812507-F926-4968-96A9-17678460AD90}</ProjectGuid>
-     <RootNamespace>jpegicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-index 4c8aa3f..d1bf3eb 100644
--- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-+++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid>
-     <RootNamespace>lcms2_DLL</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-index 2a9988a..9fc05ce 100644
--- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-+++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{71DEDE59-3F1E-486B-A899-4283000F76B5}</ProjectGuid>
-     <RootNamespace>lcms2_static</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj
-index 30c2b4e..51586dd 100644
--- a/Projects/VC2017/linkicc/linkicc.vcxproj
-+++ b/Projects/VC2017/linkicc/linkicc.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{FBFBE1DC-DB84-4BA1-9552-B4780F457849}</ProjectGuid>
-     <RootNamespace>linkicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj
-index 9dcf89a..8f26e12 100644
--- a/Projects/VC2017/psicc/psicc.vcxproj
-+++ b/Projects/VC2017/psicc/psicc.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{EF6A8851-65FE-46F5-B9EF-14F0B671F693}</ProjectGuid>
-     <RootNamespace>psicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj
-index 0af3762..3f6aea3 100644
--- a/Projects/VC2017/testbed/testbed.vcxproj
-+++ b/Projects/VC2017/testbed/testbed.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{928A3A2B-46EF-4279-959C-513B3652FF0E}</ProjectGuid>
-     <RootNamespace>testbed</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-index 7edfe28..3a6d837 100644
--- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-+++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{75B91835-CCD7-48BE-A606-A9C997D5DBEE}</ProjectGuid>
-     <RootNamespace>tiffdiff</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj
-index cd9f04c..5ef954f 100644
--- a/Projects/VC2017/tifficc/tifficc.vcxproj
-+++ b/Projects/VC2017/tifficc/tifficc.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{2256DE16-ED92-4A6F-9C54-F65BB61E64A2}</ProjectGuid>
-     <RootNamespace>tifficc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj
-index d9b77c6..b3173d8 100644
--- a/Projects/VC2017/transicc/transicc.vcxproj
-+++ b/Projects/VC2017/transicc/transicc.vcxproj
-@@ -22,6 +22,7 @@
-     <ProjectGuid>{9EE22D66-C849-474C-9ED5-C3E141DAB160}</ProjectGuid>
-     <RootNamespace>transicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/src/cmscgats.c b/src/cmscgats.c
-index 1a87613..8c3e96d 100644
--- a/src/cmscgats.c
-+++ b/src/cmscgats.c
-@@ -1,7 +1,7 @@
- //---------------------------------------------------------------------------------
- //
- //  Little Color Management System
-//  Copyright (c) 1998-2017 Marti Maria Saguer
-+//  Copyright (c) 1998-2018 Marti Maria Saguer
- //
- // Permission is hereby granted, free of charge, to any person obtaining
- // a copy of this software and associated documentation files (the "Software"),
-@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8)
-     t-> nSamples   = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
-     t-> nPatches   = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS"));
- 
-    t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*));
-    if (t->Data == NULL) {
-+    if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe)
-+    {
-+        SynError(it8, "AllocateDataSet: too much data");
-+    }
-+    else {
-+        t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*));
-+        if (t->Data == NULL) {
- 
-        SynError(it8, "AllocateDataSet: Unable to allocate data array");
-+            SynError(it8, "AllocateDataSet: Unable to allocate data array");
-+        }
-     }
- 
- }
-- 
-2.17.1
-
--- a/SPECS/lcms2/lcms2.signatures.json
+++ b/SPECS/lcms2/lcms2.signatures.json
@ -1,5 +1,5 @@
 {
 "Signatures": {
-  "lcms2-2.9.tar.gz": "a83cd711db57404e17bc943a4c9742d7a98560918ad3d0a4f511428f96d1ad5b"
+  "Little-CMS-lcms2.13.1.tar.gz": "6f84c942ecde1b4852b5a051894502ac8c98d010acb3400dec958c6db1bc94ef"
 }
 }
--- a/SPECS/lcms2/lcms2.spec
+++ b/SPECS/lcms2/lcms2.spec
@ -1,14 +1,12 @@
 Summary:        Color Management Engine
 Name:           lcms2
-Version:        2.9
-Release:        9%{?dist}
+Version:        2.13.1
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://www.littlecms.com/
-Source0:        https://www.littlecms.com/lcms2-%{version}.tar.gz
-## upstream patches
-Patch17:        0017-Upgrade-Visual-studio-2017-15.8.patch
+Source0:        https://github.com/mm2/Little-CMS/archive/refs/tags/lcms%{version}.tar.gz#/Little-CMS-lcms%{version}.tar.gz
 BuildRequires:  gcc
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@ -35,7 +33,7 @@ Provides:       littlecms-devel = %{version}-%{release}
 Development files for LittleCMS.

 %prep
-%autosetup -p1
+%autosetup -p1 -n Little-CMS-lcms%{version}

 %build
 %configure \
@ -53,11 +51,6 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

 find %{buildroot} -type f -name "*.la" -delete -print

-# rename docs (for use with %%doc below)
-cp -alf doc/LittleCMS2.?\ API.pdf api.pdf
-cp -alf doc/LittleCMS2.?\ Plugin\ API.pdf plugin-api.pdf
-cp -alf doc/LittleCMS2.?\ tutorial.pdf tutorial.pdf
-
 %check
 %make_build check -k ||:

@ -73,12 +66,15 @@ cp -alf doc/LittleCMS2.?\ tutorial.pdf tutorial.pdf
 %{_mandir}/man1/*

 %files devel
-%doc api.pdf plugin-api.pdf tutorial.pdf
 %{_includedir}/lcms2*.h
 %{_libdir}/liblcms2.so
 %{_libdir}/pkgconfig/lcms2.pc

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.13.1-1
+- Updating to 2.13.1.
+- Fixing source URL.
+
 * Wed Dec 08 2021 Thomas Crain <thcrain@microsoft.com> - 2.9-9
 - License verified
 - Lint spec
--- a/SPECS/nss/nss.spec
+++ b/SPECS/nss/nss.spec
@ -14,13 +14,13 @@
 Summary:        Security client
 Name:           nss
 Version:        3.75
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Applications/System
 URL:            https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
-Source0:        https://ftp.mozilla.org/pub/security/%{nss}/releases/NSS_3_75_RTM/src/%{name}-%{version}.tar.gz
+Source0:        https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/%{name}-%{version}.tar.gz
 Source1:        nss-util.pc.in
 Source2:        nss-util-config.in
 Source3:        nss.pc.in
@ -217,6 +217,9 @@ popd
 %{_bindir}/ssltap

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.75-2
+- Fixing source URL.
+
 * Wed Feb 23 2022 Max Brodeur-Urbas <maxbr@microsoft.com> - 3.75-1
 - Upgrading to newest version 3.75
 - Adding nss.pc.in and nss-config.in as sources.
--- a/SPECS/numad/numad.spec
+++ b/SPECS/numad/numad.spec
@ -9,12 +9,12 @@ Name:           numad
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_snapshots
 # Using "+" instead of "^" because our version of RPM errors-out on the "^" symbol.
 Version:        0.5+%{git_short_commit_date}.%{git_short_commit}
-Release:        32%{?dist}
+Release:        33%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://pagure.io/numad
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{_mariner_sources_url}/%{name}-%{version}.tar.xz
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #   git clone -n https://pagure.io/numad.git numad-%%{version}
@ -85,6 +85,9 @@ cp %{SOURCE1} .
 %systemd_postun numad.service

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.5+20150602.aec1497e2b-33
+- Fixing source URL.
+
 * Tue Jul 13 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.5+20150602.aec1497e2b-32
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Changed release to a simple integer.
--- a/SPECS/objectweb-asm/objectweb-asm.spec
+++ b/SPECS/objectweb-asm/objectweb-asm.spec
@ -17,7 +17,7 @@

 Name:           objectweb-asm
 Version:        7.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java bytecode manipulation framework
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
@ -25,7 +25,7 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://asm.ow2.io/
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{_mariner_sources_url}/%{name}-%{version}.tar.xz
 Source1:        %{name}-%{version}-build.tar.xz
 Source2:        http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom
 Source3:        http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom
@ -144,6 +144,9 @@ done
 %{_javadocdir}/%{name}

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 7.2-4
+- Fixing source URL.
+
 * Mon Mar 28 2022 Cameron Baird <cameronbaird@microsoft.com> - 7.2-3
 - Move to SPECS
 - License verified
--- a/SPECS/ocaml-num/ocaml-num.spec
+++ b/SPECS/ocaml-num/ocaml-num.spec
@ -1,12 +1,12 @@
 Summary:        Legacy Num library for arbitrary-precision integer and rational arithmetic
 Name:           ocaml-num
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+ WITH exceptions
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/ocaml/num
-Source0:        https://github.com/ocaml/num/archive/v%%{version}/%%{name}-%%{version}.tar.gz#/num-%{version}.tar.gz
+Source0:        https://github.com/ocaml/num/archive/v%{version}/%{name}-%{version}.tar.gz#/num-%{version}.tar.gz
 # All patches since 1.3 was released.
 Patch1:         0001-Bump-version.patch
 Patch2:         0002-Fix-usage-of-bytes-vs-string.patch
@ -84,6 +84,9 @@ find $OCAMLFIND_DESTDIR -name '*.cmti' -delete
 %{_libdir}/ocaml/*.mli

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3-2
+- Fixing source URL.
+
 * Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3-1
 - Fixing version number to be consistent with the used source.
 - Cleaning-up spec. License verified.
--- a/SPECS/openssl/openssl.spec
+++ b/SPECS/openssl/openssl.spec
@ -4,7 +4,7 @@
 Summary:        Utilities from the general purpose cryptography library with TLS implementation
 Name:           openssl
 Version:        1.1.1k
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        OpenSSL
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -13,7 +13,8 @@ URL:            https://www.openssl.org/
 # We have to remove certain patented algorithms from the openssl source
 # tarball with the hobble-openssl script which is included below.
 # The original openssl upstream tarball cannot be shipped in the .src.rpm.
-Source0:        %{name}-%{version}-hobbled.tar.xz
+# Original source: https://www.openssl.org/source/openssl-1.1.1k.tar.gz
+Source0:        %{_mariner_sources_url}/%{name}-%{version}-hobbled.tar.xz
 Source1:        hobble-openssl
 Source2:        ec_curve.c
 Source3:        ectest.c
@ -332,6 +333,9 @@ rm -f %{buildroot}%{_sysconfdir}/pki/tls/ct_log_list.cnf.dist
 %postun libs -p /sbin/ldconfig

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.1k-14
+- Fixing source URL.
+
 * Wed Mar 23 2022 Jon Slobodzian <joslobo@microsoft.com> - 1.1.1k-13
 - Enable symcrypt detection patch.

--- a/SPECS/python-filelock/python-filelock.spec
+++ b/SPECS/python-filelock/python-filelock.spec
@ -2,13 +2,12 @@
 Summary:        A platform independent file lock
 Name:           python-%{srcname}
 Version:        3.0.12
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        Unlicense
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/benediktschmitt/py-filelock
-#Source0:       https://github.com/benediktschmitt/py-%{srcname}/archive/v%{version}/py-%{srcname}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/benediktschmitt/py-%{srcname}/archive/v%{version}/py-%{srcname}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:      noarch

 %description
@ -72,6 +71,9 @@ python%{python3_version} test.py
 %{_mandir}/man1/py-%{srcname}.1.gz

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.0.12-13
+- Updating source URL.
+
 * Sun Feb 13 2022 Jon Slobodzian <joslobo@microsoft.com> - 3.0.12-12
 - Add python-devel

--- a/SPECS/python-pytest-cov/python-pytest-cov.spec
+++ b/SPECS/python-pytest-cov/python-pytest-cov.spec
@ -2,13 +2,12 @@
 Summary:        Pytest plugin for coverage reporting
 Name:           python-%{srcname}
 Version:        2.12.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://pypi.python.org/pypi/pytest-cov
-#Source0:       https://github.com/pytest-dev/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/pytest-dev/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         0001-skip-tests-that-are-expected-to-fail.patch
 BuildArch:      noarch

@ -51,6 +50,9 @@ tox -e py%{python3_version_nodots} -v
 %{python3_sitelib}/*

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.12.1-3
+- Updating source URL.
+
 * Tue Mar 15 2022 Muhammad Falak <mwani@microsoft.com> - 2.12.1-2
 - Use `py%{python3_version_nodots}` instead of harcoding `py39`

--- a/SPECS/python-pywbem/python-pywbem.spec
+++ b/SPECS/python-pywbem/python-pywbem.spec
@ -3,13 +3,12 @@
 Summary:        Python WBEM client interface and related utilities
 Name:           python-%{pkgname}
 Version:        1.0.1
-Release:        4%{?dist}
-License:        LGPLv2
+Release:        6%{?dist}
+License:        LGPLv2.1
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/pywbem/pywbem
-#Source0:       https://github.com/%{pkgname}/%{pkgname}/archive/%{version}.tar.gz
-Source0:        %{pkgname}-%{version}.tar.gz
+Source0:        https://github.com/%{pkgname}/%{pkgname}/archive/%{version}.tar.gz#/%{pkgname}-%{version}.tar.gz
 BuildArch:      noarch

 %description
@ -74,6 +73,12 @@ rm -rf %{buildroot}%{_bindir}/*.bat
 %doc README.rst

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.1-6
+- License verified.
+
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.1-5
+- Updating source URL.
+
 * Fri Aug 13 2021 Jon Slobodzian <joslobo@microsoft.com> - 1.0.1-4
 - Remove python2

--- a/SPECS/python-repoze-lru/python-repoze-lru.spec
+++ b/SPECS/python-repoze-lru/python-repoze-lru.spec
@ -6,13 +6,12 @@
 Summary:        A tiny LRU cache implementation and decorator
 Name:           python-%{pkgname}
 Version:        0.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        BSD
 URL:            https://github.com/repoze/repoze.lru
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-#Source0:       https://pypi.io/packages/source/r/%{pypiname}/%{pypiname}-%{version}.tar.gz
-Source0:        %{pkgname}-%{version}.tar.gz
+Source0:        https://pypi.io/packages/source/r/%{pypiname}/%{pypiname}-%{version}.tar.gz#/%{pkgname}-%{version}.tar.gz

 BuildArch:      noarch

@ -54,6 +53,9 @@ LANG=en_US.UTF-8 tox -e py%{python3_version_nodots}
 %{python3_sitelib}/*

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.7-5
+- Updating source URL.
+
 * Tue Mar 15 2022 Muhammad Falak <mwani@microsoft.com> - 0.7-4
 - Use `py%{python3_version_nodots}` instead of harcoding `py39`

--- a/SPECS/python-requests/python-requests.spec
+++ b/SPECS/python-requests/python-requests.spec
@ -1,14 +1,13 @@
 Summary:        Awesome Python HTTP Library That's Actually Usable
 Name:           python-requests
 Version:        2.27.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Development/Languages/Python
 URL:            http://python-requests.org
-#Source0:       https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz
-Source0:        requests-%{version}.tar.gz
+Source0:        https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz#/requests-%{version}.tar.gz
 BuildArch:      noarch

 %description
@ -69,6 +68,9 @@ LANG=en_US.UTF-8 tox -e py%{python3_version_nodots}
 %{python3_sitelib}/*

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.27.1-4
+- Updating source URL.
+
 * Tue Mar 15 2022 Muhammad Falak <mwani@microsoft.com> - 2.27.1-3
 - Use `py%{python3_version_nodots}` instead of harcoding `py39`

--- a/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec
+++ b/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec
@ -2,7 +2,7 @@
 Summary:        Python API to integrate Sphinx into a web application
 Name:           python-%{pkgname}
 Version:        1.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -50,6 +50,9 @@ tox
 %{python3_sitelib}/*.pth

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.4-3
+- Updating source URL.
+
 * Sun Mar 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.4-2
 - Adding a dependency on "python3-sphinxcontrib-serializinghtml".

--- a/SPECS/python-yamlloader/python-yamlloader.spec
+++ b/SPECS/python-yamlloader/python-yamlloader.spec
@ -5,13 +5,12 @@
 Summary:        Loaders and dumpers for PyYAML
 Name:           python-%{pkgname}
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/Phynix/yamlloader
-#Source0:       https://github.com/Phynix/%{pkgname}/archive/%{version}.tar.gz
-Source0:        %{pkgname}-%{version}.tar.gz
+Source0:        https://github.com/Phynix/%{pkgname}/archive/%{version}.tar.gz#/%{pkgname}-%{version}.tar.gz
 BuildArch:      noarch

 %description
@ -50,6 +49,9 @@ python3 setup.py install --skip-build --root=%{buildroot}
 %{python3_sitelib}/*.egg-info

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.0-2
+- Updating source URL.
+
 * Fri Mar 25 2022 Andrew Phelps <anphel@microsoft.com> - 1.1.0-1
 - Updated to version 1.1.0

--- a/SPECS/re2/re2.spec
+++ b/SPECS/re2/re2.spec
@ -3,12 +3,12 @@
 Summary:        C++ fast alternative to backtracking RE engines
 Name:           re2
 Version:        %{shortver}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-URL:            http://github.com/google/%{name}/
-Source0:        %{name}-%{longver}.tar.gz
+URL:            https://github.com/google/%{name}/
+Source0:        https://github.com/google/%{name}/archive/%{longver}.tar.gz#/%{name}-%{longver}.tar.gz
 # downstream patch to change soname .0 => .0a
 # This is in response to symbol changes in recent release per
 # https://bugzilla.redhat.com/show_bug.cgi?id=1672014#c10
@ -86,6 +86,9 @@ rm -fv %{buildroot}%{_libdir}/libre2.a
 %{_libdir}/pkgconfig/re2.pc

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 20190801-10
+- Fixing source URL.
+
 * Thu Jun 03 2021 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 1:20190801-9
 - Initial CBL-Mariner import from Fedora 35 (license: MIT)
 - License verified
--- a/SPECS/rt-setup/rt-setup.spec
+++ b/SPECS/rt-setup/rt-setup.spec
@ -1,12 +1,12 @@
 Summary:       Setup RHEL-RT environment details
 Name:          rt-setup
 Version:       2.1
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPL+
 Vendor:        Microsoft Corporation
 Distribution:  Mariner
 Group:         System Environment/Base
-Source:        rt-setup-%{version}.tar.bz2
+Source:        %{_mariner_sources_url}/rt-setup-%{version}.tar.bz2
 Patch0:        no-annobin.patch
 ExclusiveArch: x86_64
 Requires:      /usr/sbin/groupadd
@ -93,6 +93,9 @@ fi
 %attr(0644, root, root) %{_unitdir}/rt-entsk.service

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1-5
+- Updating source URL.
+
 * Thu Jan 20 2022 Cameron Baird <cameronbaird@microsoft.com> 2.1-4
 - Initial CBL-Mariner import from CentOS 8 (license: MIT).
 - Remove %%clean stage
--- a/SPECS/rtctl/rtctl.spec
+++ b/SPECS/rtctl/rtctl.spec
@ -1,11 +1,11 @@
 Name:       rtctl
 Version:    1.13
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Scripts for controlling scheduling priorities of system threads
 Group:      Applications/System
 License:    GPL
 BuildArch:  noarch
-Source0:    rtctl-%{version}.tar.bz2
+Source0:    %{_mariner_sources_url}/rtctl-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

 %description
@ -41,6 +41,9 @@ systemctl disable rtctl
 fi

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.13-5
+- Updating source URL.
+
 * Thu Jan 20 2022 Cameron Baird <cameronbaird@microsoft.com> 1.13-4
 - Initial CBL-Mariner import from CentOS 8 (license: MIT).
 - Remove %%clean stage
--- a/SPECS/selinux-policy/selinux-policy.spec
+++ b/SPECS/selinux-policy/selinux-policy.spec
@ -9,12 +9,12 @@
 Summary:        SELinux policy
 Name:           selinux-policy
 Version:        %{refpolicy_major}.%{refpolicy_minor}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/SELinuxProject/refpolicy
-Source0:        %{url}/releases/download/RELEASE_${refpolicy_major}_${refpolicy_minor}/refpolicy-%{version}.tar.bz2
+Source0:        %{url}/releases/download/RELEASE_%{refpolicy_major}_%{refpolicy_minor}/refpolicy-%{version}.tar.bz2
 Source1:        Makefile.devel
 Source2:        booleans_targeted.conf
 Source3:        modules_targeted.conf
@ -311,6 +311,9 @@ exit 0
 selinuxenabled && semodule -nB
 exit 0
 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.20220106-4
+- Fixing source URL.
+
 * Mon Mar 14 2022 Chris PeBenito <chpebeni@microsoft.com> - 2.20220106-3
 - Additional policy fixes for enforcing core images.

--- a/SPECS/sgabios/sgabios.spec
+++ b/SPECS/sgabios/sgabios.spec
@ -6,7 +6,7 @@
 Summary:        Serial graphics BIOS option rom
 Name:           sgabios
 Version:        0.%{date}git
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -18,7 +18,7 @@ URL:            https://github.com/qemu/sgabios
 # hash=`git log -1 --format='%h'`
 # date=`git log -1 --format='%cd' --date=short | tr -d -`
 # git archive --prefix sgabios-${date}-git${hash}/ ${hash} | xz -7e > ../openbios-${date}-git${hash}.tar.xz
-Source0:        %{name}-%{date}-git%{hash}.tar.xz
+Source0:        %{_mariner_sources_url}/%{name}-%{date}-git%{hash}.tar.xz
 BuildRequires:  gcc
 Requires:       %{name}-bin = %{version}-%{release}
 ExclusiveArch:  x86_64
@ -59,6 +59,9 @@ install -m 0644 sgabios.bin %{buildroot}%{_datadir}/sgabios
 %{_datadir}/sgabios/sgabios.bin

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20180715git-8
+- Updating source URL.
+
 * Tue Dec 14 2021 Thomas Crain <thcrain@microsoft.com> - 0.20180715git-7
 - Lint spec
 - License verified
--- a/SPECS/usbip/usbip.spec
+++ b/SPECS/usbip/usbip.spec
@ -3,12 +3,12 @@
 Name:		   usbip
 Summary:	   USB/IP user-space
 Version:	   5.15.34.1
-Release:	   1%{?dist}
+Release:	   2%{?dist}
 License:	   GPLv2+
 Vendor:            Microsoft Corporation
 Distribution:      Mariner
 Group:             System/Kernel
-#Source:	   https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/%{version}.tar.gz
+# https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/%%{version}.tar.gz
 # In the interests of keeping the source rpm from being ridiculously large,
 # download the Linux kernel from above and run `extract_usbip.sh <version>`
 # in the SOURCE directory.
@ -16,7 +16,7 @@ URL:		   https://github.com/microsoft/CBL-Mariner-Linux-Kernel
 # The kernel modules require working USB and there's no USB for s390x
 # See bug #1483403
 ExcludeArch:       s390x
-Source:		   usbip-%{version}.tar.xz
+Source:		   %{_mariner_sources_url}/usbip-%{version}.tar.xz
 Source1:	   usbip-server.service
 Source2:	   usbip-client.service
 Source99:	   extract_usbip.sh
@ -91,6 +91,9 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
 %{_libdir}/*.so

 %changelog
+* Wed Apr 27 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 5.15.34.1-2
+- Updating source URL.
+
 * Wed Apr 20 2022 Cameron Baird <cameronbaird@microsoft.com> - 5.15.34.1-1
 - Update version to 5.15.34.1

--- a/SPECS/words/words.spec
+++ b/SPECS/words/words.spec
@ -1,15 +1,14 @@
 Summary:       A dictionary of English words for the /usr/share/dict directory
 Name:          words
 Version:       3.0
-Release:       37%{?dist}
+Release:       38%{?dist}
 License:       Public Domain
 # Note that Moby Project officially does not exist any more. The most complete
 # information about the project is in Wikipedia.
 URL:           https://en.wikipedia.org/wiki/Moby_Project
-# Source: http://web.archive.org/web/20060527013227/http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
 Vendor:        Microsoft Corporation
 Distribution:  Mariner
-Source0:       words-3.0.tar.Z
+Source0:       https://web.archive.org/web/20060527013227/http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z#/%{name}-%{version}.tar.Z
 Source1:       LICENSE
 BuildArch:     noarch
 BuildRequires: dos2unix
@ -55,6 +54,9 @@ ln -sf linux.words $RPM_BUILD_ROOT%{_datadir}/dict/words
 %{_datadir}/dict/words

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.0-38
+- Fixing source URL.
+
 * Tue Aug 25 2020 Nicolas Ontiveros <niontive@microsoft.com> - 3.0-37
 - Initial CBL-Mariner import from Fedora 33 (license: MIT)
 - License verified.
--- a/SPECS/yajl/yajl.spec
+++ b/SPECS/yajl/yajl.spec
@ -1,7 +1,7 @@
 Summary:        Yet Another JSON Library (YAJL)
 Name:           yajl
 Version:        2.1.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        ISC
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -10,12 +10,7 @@ URL:            http://lloyd.github.com/yajl/
 # NB, upstream does not provide pre-built tar.gz downloads. Instead
 # they make you use the 'on the fly' generated tar.gz from GITHub's
 # web interface
-#
-# The Source0 for any version is obtained by a URL
-#
-#   https://github.com/lloyd/yajl/releases/tag/2.1.0
-#
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/lloyd/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch1:         %{name}-%{version}-pkgconfig-location.patch
 Patch2:         %{name}-%{version}-pkgconfig-includedir.patch
 Patch3:         %{name}-%{version}-test-location.patch
@ -86,6 +81,9 @@ cd test
 %{_libdir}/pkgconfig/yajl.pc

 %changelog
+* Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.0-18
+- Fixing source URL.
+
 * Thu Jun 03 2021 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 2.1.0-17
 - Initial CBL-Mariner import from Fedora 34 (license: MIT)
 - License verified
--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -216,7 +216,7 @@
        "other": {
          "name": "antlr",
          "version": "2.7.7",
-          "downloadUrl": "https://www.antlr2.org/download/antlr-2.7.7.tar.gz"
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/antlr-2.7.7.tar.bz2"
        }
      }
    },
@ -1902,16 +1902,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "crash-ptdump-command",
-          "version": "1.0.7",
-          "downloadUrl": "https://github.com/crash-utility/crash-extensions/blob/master/ptdump-1.0.7.tar.gz"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -2383,16 +2373,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "docbook-simple",
-          "version": "1.1",
-          "downloadUrl": "http://www.docbook.org/xml/simple/1.1/docbook-simple-1.1.zip"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -3411,7 +3391,7 @@
        "other": {
          "name": "fros",
          "version": "1.1",
-          "downloadUrl": "https://github.com/mozeq/fros/archive/30275a07dab7891b9f31ff115743f67d757c7c1a/fros-1.1-.tar.gz"
+          "downloadUrl": "https://github.com/mozeq/fros/archive/30275a07dab7891b9f31ff115743f67d757c7c1a/fros-1.1-30275a0.tar.gz"
        }
      }
    },
@ -3635,6 +3615,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "geronimo-specs",
+          "version": "1.2",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/geronimo-specs-1.2.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -3691,7 +3681,7 @@
        "other": {
          "name": "gl-manpages",
          "version": "1.1",
-          "downloadUrl": "https://github.com/KhronosGroup/OpenGL-Refpages/archive/4547332f0f27d98601a8f5732ce8e85e09dbdb93/gl-manpages-.tar.gz"
+          "downloadUrl": "https://github.com/KhronosGroup/OpenGL-Refpages/archive/4547332f0f27d98601a8f5732ce8e85e09dbdb93/gl-manpages-4547332.tar.gz"
        }
      }
    },
@ -4225,16 +4215,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "gsl",
-          "version": "2.6",
-          "downloadUrl": "http://ftp.gnu.org/gnu/gsl/gsl-2.6.tar.gz"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -7126,16 +7106,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "junitperf",
-          "version": "1.9.1",
-          "downloadUrl": "https://github.com/clarkware/junitperf/archive/refs/tags/1.9.1.zip"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -7172,7 +7142,7 @@
        "other": {
          "name": "kdump-anaconda-addon",
          "version": "005",
-          "downloadUrl": "https://github.com/daveyoung/kdump-anaconda-addon/archive/80aab11a01382e1c12499c34ad227b895870db70/kdump-anaconda-addon-.tar.gz"
+          "downloadUrl": "https://github.com/daveyoung/kdump-anaconda-addon/archive/80aab11a01382e1c12499c34ad227b895870db70/kdump-anaconda-addon-80aab11.tar.gz"
        }
      }
    },
@ -7471,8 +7441,8 @@
        "type": "other",
        "other": {
          "name": "lcms2",
-          "version": "2.9",
-          "downloadUrl": "https://www.littlecms.com/lcms2-2.9.tar.gz"
+          "version": "2.13.1",
+          "downloadUrl": "https://github.com/mm2/Little-CMS/archive/refs/tags/lcms2.13.1.tar.gz"
        }
      }
    },
@ -8832,7 +8802,7 @@
        "other": {
          "name": "libmetalink",
          "version": "0.1.3",
-          "downloadUrl": "https://launchpad.net/libmetalink/trunk/libmetalink-0.1.3/+download/libmetalink-0.1.3.tar.bz2"
+          "downloadUrl": "https://launchpad.net/libmetalink/trunk/libmetalink-0.1.3/+download/libmetalink-0.1.3.tar.gz"
        }
      }
    },
@ -9412,7 +9382,7 @@
        "other": {
          "name": "librabbitmq",
          "version": "0.10.0",
-          "downloadUrl": "https://github.com/alanxz/rabbitmq-c/archive/ffe918a5fcef72038a88054dca3c56762b1953d4/rabbitmq-c-0.10.0-.tar.gz"
+          "downloadUrl": "https://github.com/alanxz/rabbitmq-c/archive/ffe918a5fcef72038a88054dca3c56762b1953d4/rabbitmq-c-0.10.0-ffe918a.tar.gz"
        }
      }
    },
@ -9946,16 +9916,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "libunwind",
-          "version": "1.6.2",
-          "downloadUrl": "http://download.savannah.gnu.org/releases/libunwind/libunwind-1.6.2.tar.gz"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -10562,7 +10522,7 @@
        "other": {
          "name": "libyami",
          "version": "1.3.2",
-          "downloadUrl": "https://github.com/intel/libyami/archive/edd1ad15e383d32c8d67bdc9198c834b6acebca5/libyami-.tar.gz"
+          "downloadUrl": "https://github.com/intel/libyami/archive/edd1ad15e383d32c8d67bdc9198c834b6acebca5/libyami-edd1ad1.tar.gz"
        }
      }
    },
@ -10622,7 +10582,7 @@
        "other": {
          "name": "linuxptp",
          "version": "2.0",
-          "downloadUrl": "https://github.com/richardcochran/linuxptp/archive//linuxptp-.tar.gz"
+          "downloadUrl": "https://github.com/richardcochran/linuxptp/archive/e05809/linuxptp-e05809.tar.gz"
        }
      }
    },
@ -10902,7 +10862,7 @@
        "other": {
          "name": "lua-json",
          "version": "1.3.2",
-          "downloadUrl": "https://github.com/harningt/luajson/archive/7a86bc22066858afeb23845a191a6ab680b46233/luajson-1.3.2-.tar.gz"
+          "downloadUrl": "https://github.com/harningt/luajson/archive/7a86bc22066858afeb23845a191a6ab680b46233/luajson-1.3.2-7a86bc2.tar.gz"
        }
      }
    },
@ -12774,7 +12734,7 @@
        "other": {
          "name": "objectweb-asm",
          "version": "7.2",
-          "downloadUrl": "https://gitlab.ow2.org/asm/asm/-/archive/ASM_7_2/asm-ASM_7_2.tar.gz"
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/objectweb-asm-7.2.tar.xz"
        }
      }
    },
@ -13104,7 +13064,7 @@
        "other": {
          "name": "ocaml-num",
          "version": "1.3",
-          "downloadUrl": "https://github.com/ocaml/num/archive/v1.3.tar.gz"
+          "downloadUrl": "https://github.com/ocaml/num/archive/v1.3/ocaml-num-1.3.tar.gz"
        }
      }
    },
@ -13555,7 +13515,7 @@
        "other": {
          "name": "openssl",
          "version": "1.1.1k",
-          "downloadUrl": "https://www.openssl.org/source/openssl-1.1.1k.tar.gz"
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/openssl-1.1.1k-hobbled.tar.xz"
        }
      }
    },
@ -18975,7 +18935,7 @@
        "other": {
          "name": "plymouth",
          "version": "0.9.4",
-          "downloadUrl": "https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/e31c81f9849c176d7b293ca79cc4507ba740c2fa/plymouth-.tar.gz"
+          "downloadUrl": "https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/e31c81f9849c176d7b293ca79cc4507ba740c2fa/plymouth-e31c81f.tar.gz"
        }
      }
    },
@ -19335,7 +19295,7 @@
        "other": {
          "name": "pwgen",
          "version": "2.08",
-          "downloadUrl": "http://download.sf.net/pwgen/pwgen-2.08.tar.gz"
+          "downloadUrl": "https://download.sf.net/pwgen/pwgen-2.08.tar.gz"
        }
      }
    },
@ -19555,7 +19515,7 @@
        "other": {
          "name": "python-astroid",
          "version": "2.3.3",
-          "downloadUrl": "https://github.com/PyCQA/astroid/archive/ace7b2967ea762ec43fc7be8ab9c8007564d9be2/astroid-.tar.gz"
+          "downloadUrl": "https://github.com/PyCQA/astroid/archive/ace7b2967ea762ec43fc7be8ab9c8007564d9be2/astroid-ace7b29.tar.gz"
        }
      }
    },
@ -19605,7 +19565,7 @@
        "other": {
          "name": "python-azure-sdk",
          "version": "5.0.0",
-          "downloadUrl": "https://github.com/Azure/azure-sdk-for-python/archive//azure-sdk-.tar.gz"
+          "downloadUrl": "https://github.com/Azure/azure-sdk-for-python/archive/2b2cfd4/azure-sdk-2b2cfd4.tar.gz"
        }
      }
    },
@ -19759,16 +19719,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "python-cliff",
-          "version": "2.16.0",
-          "downloadUrl": "https://pypi.io/packages/source/c/cliff/cliff-2.16.0.tar.gz"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -20145,7 +20095,7 @@
        "other": {
          "name": "python-filelock",
          "version": "3.0.12",
-          "downloadUrl": "https://github.com/benediktschmitt/py-filelock/archive/v3.0.12/python-filelock-3.0.12.tar.gz"
+          "downloadUrl": "https://github.com/benediktschmitt/py-filelock/archive/v3.0.12/py-filelock-3.0.12.tar.gz"
        }
      }
    },
@ -20545,7 +20495,7 @@
        "other": {
          "name": "python-justbytes",
          "version": "0.11",
-          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/python-justbytes-0.11.tar.gz"
+          "downloadUrl": "https://pypi.io/packages/source/j/justbytes/justbytes-0.11.tar.gz"
        }
      }
    },
@ -20995,7 +20945,7 @@
        "other": {
          "name": "python-podman-api",
          "version": "0.0.0",
-          "downloadUrl": "https://github.com/containers/python-podman/archive/d4b8263bf08b72082cfb45e7367ebf4309facc54/python-podman-api-.tar.gz"
+          "downloadUrl": "https://github.com/containers/python-podman/archive/d4b8263bf08b72082cfb45e7367ebf4309facc54/python-podman-api-d4b8263.tar.gz"
        }
      }
    },
@ -21145,7 +21095,7 @@
        "other": {
          "name": "python-pydbus",
          "version": "0.6.0",
-          "downloadUrl": "https://files.pythonhosted.org/packages/source//pydbus/pydbus-0.6.0.tar.gz"
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/p/pydbus/pydbus-0.6.0.tar.gz"
        }
      }
    },
@ -21245,7 +21195,7 @@
        "other": {
          "name": "python-pytest-cov",
          "version": "2.12.1",
-          "downloadUrl": "https://github.com/pytest-dev/pytest-cov/archive/v2.12.1/python-pytest-cov-2.12.1.tar.gz"
+          "downloadUrl": "https://github.com/pytest-dev/pytest-cov/archive/v2.12.1/pytest-cov-2.12.1.tar.gz"
        }
      }
    },
@ -21415,7 +21365,7 @@
        "other": {
          "name": "python-repoze-lru",
          "version": "0.7",
-          "downloadUrl": "https://pypi.io/packages/source/r/remoto/remoto-0.7.tar.gz"
+          "downloadUrl": "https://pypi.io/packages/source/r/repoze.lru/repoze.lru-0.7.tar.gz"
        }
      }
    },
@ -22425,7 +22375,7 @@
        "other": {
          "name": "qr-code-generator",
          "version": "1.5.0",
-          "downloadUrl": "https://github.com/nayuki/QR-Code-generator/archive/67c62461d380352500fc39557fd9f046b7fe1d18/qr-code-generator-.tar.gz"
+          "downloadUrl": "https://github.com/nayuki/QR-Code-generator/archive/67c62461d380352500fc39557fd9f046b7fe1d18/qr-code-generator-67c6246.tar.gz"
        }
      }
    },
@ -22780,16 +22730,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "rhnlib",
-          "version": "2.8.6",
-          "downloadUrl": "https://github.com/spacewalkproject/spacewalk/archive/refs/tags/rhnlib-2.8.6-1.tar.gz"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -22940,6 +22880,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "rt-setup",
+          "version": "2.1",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/rt-setup-2.1.tar.bz2"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -22950,6 +22900,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "rtctl",
+          "version": "1.13",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/rtctl-1.13.tar.bz2"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -24508,17 +24468,7 @@
        "other": {
          "name": "sgabios",
          "version": "0.20180715git",
-          "downloadUrl": "https://gitlab.com/qemu-project/sgabios/-/archive/72f39d48bedf044e202fd51fecf3e2218fc2ae66/sgabios-72f39d48bedf044e202fd51fecf3e2218fc2ae66.tar.gz"
-        }
-      }
-    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "sgpio",
-          "version": "1.2.0.10",
-          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/sgpio-1.2-0.10-src.tar.gz"
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/sgabios-20180715-git72f39d4.tar.xz"
        }
      }
    },
@ -24532,6 +24482,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "sgpio",
+          "version": "1.2.0.10",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/sgpio-1.2-0.10-src.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -24802,16 +24762,6 @@
        }
      }
    },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "spausedd",
-          "version": "20201112",
-          "downloadUrl": "https://github.com/jfriesse/spausedd/releases/download/20201112/spausedd-20201112.tar.gz"
-        }
-      }
-    },
    {
      "component": {
        "type": "other",
@ -25892,6 +25842,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "usbip",
+          "version": "5.15.34.1",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/usbip-5.15.34.1.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -26715,7 +26675,7 @@
    {
      "component": {
        "type": "other",
-          "other": {
+        "other": {
          "name": "xhtml1-dtds",
          "version": "1.0",
          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xhtml1-dtds-20020801.tar.xz"
@ -27261,7 +27221,7 @@
        "other": {
          "name": "yajl",
          "version": "2.1.0",
-          "downloadUrl": "https://github.com/lloyd/yajl/archive/2.1.0.tar.gz"
+          "downloadUrl": "https://github.com/lloyd/yajl/archive/refs/tags/2.1.0.tar.gz"
        }
      }
    },
--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@ -165,12 +165,12 @@ texinfo-6.8-1.cm2.aarch64.rpm
 gtk-doc-1.33.2-1.cm2.noarch.rpm
 autoconf-2.71-3.cm2.noarch.rpm
 automake-1.16.5-1.cm2.noarch.rpm
-openssl-1.1.1k-13.cm2.aarch64.rpm
-openssl-debuginfo-1.1.1k-13.cm2.aarch64.rpm
-openssl-devel-1.1.1k-13.cm2.aarch64.rpm
-openssl-libs-1.1.1k-13.cm2.aarch64.rpm
-openssl-perl-1.1.1k-13.cm2.aarch64.rpm
-openssl-static-1.1.1k-13.cm2.aarch64.rpm
+openssl-1.1.1k-14.cm2.aarch64.rpm
+openssl-debuginfo-1.1.1k-14.cm2.aarch64.rpm
+openssl-devel-1.1.1k-14.cm2.aarch64.rpm
+openssl-libs-1.1.1k-14.cm2.aarch64.rpm
+openssl-perl-1.1.1k-14.cm2.aarch64.rpm
+openssl-static-1.1.1k-14.cm2.aarch64.rpm
 libcap-2.60-1.cm2.aarch64.rpm
 libcap-devel-2.60-1.cm2.aarch64.rpm
 debugedit-5.0-1.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@ -165,12 +165,12 @@ texinfo-6.8-1.cm2.x86_64.rpm
 gtk-doc-1.33.2-1.cm2.noarch.rpm
 autoconf-2.71-3.cm2.noarch.rpm
 automake-1.16.5-1.cm2.noarch.rpm
-openssl-1.1.1k-13.cm2.x86_64.rpm
-openssl-devel-1.1.1k-13.cm2.x86_64.rpm
-openssl-libs-1.1.1k-13.cm2.x86_64.rpm
-openssl-perl-1.1.1k-13.cm2.x86_64.rpm
-openssl-static-1.1.1k-13.cm2.x86_64.rpm
-openssl-debuginfo-1.1.1k-13.cm2.x86_64.rpm
+openssl-1.1.1k-14.cm2.x86_64.rpm
+openssl-devel-1.1.1k-14.cm2.x86_64.rpm
+openssl-libs-1.1.1k-14.cm2.x86_64.rpm
+openssl-perl-1.1.1k-14.cm2.x86_64.rpm
+openssl-static-1.1.1k-14.cm2.x86_64.rpm
+openssl-debuginfo-1.1.1k-14.cm2.x86_64.rpm
 libcap-2.60-1.cm2.x86_64.rpm
 libcap-devel-2.60-1.cm2.x86_64.rpm
 debugedit-5.0-1.cm2.x86_64.rpm
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@ -260,12 +260,12 @@ nspr-4.30-1.cm2.aarch64.rpm
 nspr-debuginfo-4.30-1.cm2.aarch64.rpm
 nspr-devel-4.30-1.cm2.aarch64.rpm
 ntsysv-1.20-3.cm2.aarch64.rpm
-openssl-1.1.1k-13.cm2.aarch64.rpm
-openssl-debuginfo-1.1.1k-13.cm2.aarch64.rpm
-openssl-devel-1.1.1k-13.cm2.aarch64.rpm
-openssl-libs-1.1.1k-13.cm2.aarch64.rpm
-openssl-perl-1.1.1k-13.cm2.aarch64.rpm
-openssl-static-1.1.1k-13.cm2.aarch64.rpm
+openssl-1.1.1k-14.cm2.aarch64.rpm
+openssl-debuginfo-1.1.1k-14.cm2.aarch64.rpm
+openssl-devel-1.1.1k-14.cm2.aarch64.rpm
+openssl-libs-1.1.1k-14.cm2.aarch64.rpm
+openssl-perl-1.1.1k-14.cm2.aarch64.rpm
+openssl-static-1.1.1k-14.cm2.aarch64.rpm
 p11-kit-0.24.1-1.cm2.aarch64.rpm
 p11-kit-debuginfo-0.24.1-1.cm2.aarch64.rpm
 p11-kit-devel-0.24.1-1.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@ -260,12 +260,12 @@ nspr-4.30-1.cm2.x86_64.rpm
 nspr-debuginfo-4.30-1.cm2.x86_64.rpm
 nspr-devel-4.30-1.cm2.x86_64.rpm
 ntsysv-1.20-3.cm2.x86_64.rpm
-openssl-1.1.1k-13.cm2.x86_64.rpm
-openssl-debuginfo-1.1.1k-13.cm2.x86_64.rpm
-openssl-devel-1.1.1k-13.cm2.x86_64.rpm
-openssl-libs-1.1.1k-13.cm2.x86_64.rpm
-openssl-perl-1.1.1k-13.cm2.x86_64.rpm
-openssl-static-1.1.1k-13.cm2.x86_64.rpm
+openssl-1.1.1k-14.cm2.x86_64.rpm
+openssl-debuginfo-1.1.1k-14.cm2.x86_64.rpm
+openssl-devel-1.1.1k-14.cm2.x86_64.rpm
+openssl-libs-1.1.1k-14.cm2.x86_64.rpm
+openssl-perl-1.1.1k-14.cm2.x86_64.rpm
+openssl-static-1.1.1k-14.cm2.x86_64.rpm
 p11-kit-0.24.1-1.cm2.x86_64.rpm
 p11-kit-debuginfo-0.24.1-1.cm2.x86_64.rpm
 p11-kit-devel-0.24.1-1.cm2.x86_64.rpm