[main] Adding missing `cgmanifest.json` entries, part 1. (#2877)

* Adding missing `cgmanifest.json` entries. * Updating specs with source URLs. * Adding the '_mariner_sources_url' macro.
2022-04-26 11:42:08 -07:00 · 2022-04-26 11:42:08 -07:00 · 337067ceb4
--- a/.github/workflows/validate-cg-manifest.sh
+++ b/.github/workflows/validate-cg-manifest.sh
@ -11,13 +11,26 @@

 # $@ - Paths to spec files to check

+# List of ignored specs due to no source tarball to scan.
+ignore_no_source_tarball=" \
+  ca-certificates \
+  check-restart \
+  core-packages \
+  ghc-srpm-macros \
+  hunspell-nl \
+  hunspell-ru \
+  hyphen-grc \
+  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 \
-  ca-certificates \
-  check-restart \
-  core-packages \
  Cython \
  dbus-x11 \
  geronimo-specs \
@ -32,9 +45,6 @@ ignore_list=" \
  kernel-signed-x86_64 \
  kf5 \
  lcms2 \
-  lua-rpm-macros \
-  mariner-repos \
-  mariner-rpm-macros \
  moby-buildx \
  moby-containerd \
  multilib-rpm-config \
@ -87,7 +97,7 @@ do
  fi

  # Some specs don't make sense to add, ignore them
-  if echo "$ignore_list" | grep -w "$name" > /dev/null
+  if echo "$ignore_list $ignore_no_source_tarball" | grep -w "$name" > /dev/null
  then
    echo "    $name is being ignored, skipping"
    continue
--- a/SPECS-EXTENDED/aopalliance/aopalliance.spec
+++ b/SPECS-EXTENDED/aopalliance/aopalliance.spec
@ -20,7 +20,7 @@ Distribution:   Mariner

 Name:           aopalliance
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java/J2EE AOP standards
 License:        Public Domain
 Group:          Development/Libraries/Java
@ -28,7 +28,7 @@ URL:            http://aopalliance.sourceforge.net/
 # cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
 # password empty
 # cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
-Source0:        aopalliance-src.tar.gz
+Source0:        %{_mariner_sources_url}/aopalliance-src.tar.gz
 Source1:        http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
 Source2:        %{name}-MANIFEST.MF
 Source3:        %{name}-LICENSE.txt 
@ -87,6 +87,10 @@ cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0-3
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0-2
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/atinject/atinject.spec
+++ b/SPECS-EXTENDED/atinject/atinject.spec
@ -23,14 +23,14 @@ Distribution:   Mariner
 %global git_version 20100611git1f74ea7
 Name:           atinject
 Version:        %{base_version}+%{git_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dependency injection specification for Java (JSR-330)
-License:        Apache-2.0
+License:        ASL 2.0
 Group:          Development/Libraries/Java
 URL:            http://javax-inject.github.io/javax-inject/
 # git clone --bare git@github.com:javax-inject/javax-inject
 # git --git-dir=javax-inject.git archive --prefix %{name}-%{base_version}/ --format tar %{git_tag} | xz >%{name}-%{base_version}.tar.xz
-Source0:        %{name}-%{base_version}.tar.xz
+Source0:        %{_mariner_sources_url}/%{name}-%{base_version}.tar.xz
 # These manifests based on the ones shipped by eclipse.org
 Source1:        MANIFEST.MF
 Source2:        MANIFEST-TCK.MF
@ -117,6 +117,10 @@ cp -pr  build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1+20100611git1f74ea7-3
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1+20100611git1f74ea7-2
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/bcache-tools/bcache-tools.spec
+++ b/SPECS-EXTENDED/bcache-tools/bcache-tools.spec
@ -3,20 +3,20 @@ Distribution:   Mariner
 Summary: Tools for Linux kernel block layer cache
 Name: bcache-tools
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: http://bcache.evilpiepirate.org/
 VCS: git://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git
 # git clone git://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git
 # cd bcache-tools/
 # git archive --format=tar --prefix=bcache-tools-1.1/ bcache-tools-1.1 | gzip > ../bcache-tools-1.1.tar.gz
-Source0: %{name}-%{version}.tar.gz
+Source0: %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 # This part is a prerelease version obtained by https://gist.github.com/djwong/6343451:
 # git clone https://gist.github.com/6343451.git
 # cd 6343451/
 # git archive --format=tar --prefix=bcache-status-20140220/ 6d278f9886ab5f64bd896080b1b543ba7ef6c7a6 | gzip > ../bcache-status-20140220.tar.gz
 # see also http://article.gmane.org/gmane.linux.kernel.bcache.devel/1951
-Source1: bcache-status-20140220.tar.gz
+Source1: %{_mariner_sources_url}/bcache-status-20140220.tar.gz
 # bcache status not provided as a true package, so this is a self maintained
 # man page for it
 # http://article.gmane.org/gmane.linux.kernel.bcache.devel/1946
@ -95,7 +95,8 @@ rm %{buildroot}%{_datarootdir}/initramfs-tools/hooks/bcache
 install -p  -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status

 %files
-%doc README COPYING
+%license COPYING
+%doc README
 %{_udevrulesdir}/*
 %{_mandir}/man8/*
 %{_udevlibdir}/bcache-register
@ -107,6 +108,10 @@ install -p  -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status
 %{dracutlibdir}/modules.d/90bcache

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1-2
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1-1
 - Initial CBL-Mariner import from Fedora 33 (license: MIT).

--- a/SPECS-EXTENDED/bea-stax/bea-stax.spec
+++ b/SPECS-EXTENDED/bea-stax/bea-stax.spec
@ -22,13 +22,13 @@ Distribution:   Mariner
 %global apiver  1.0.1
 Name:           bea-stax
 Version:        1.2.0
-Release:        38%{?dist}
+Release:        39%{?dist}
 Summary:        Streaming API for XML
-License:        Apache-2.0
+License:        ASL 2.0
 Group:          Development/Libraries/Java
 URL:            http://stax.codehaus.org/Home
 # http://dist.codehaus.org/stax/distributions/stax-src-%{version}.zip
-Source0:        stax-src-%{version}.zip
+Source0:        %{_mariner_sources_url}/stax-src-%{version}.zip
 # http://dist.codehaus.org/stax/jars/stax-%{version}.pom
 Source1:        stax-%{version}.pom
 # http://dist.codehaus.org/stax/jars/stax-api-%{apiver}.pom
@ -106,6 +106,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-api-%{version}
 %endif

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.0-39
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.0-38
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/clucene/clucene.spec
+++ b/SPECS-EXTENDED/clucene/clucene.spec
@ -8,12 +8,15 @@ Distribution:   Mariner
 Summary:	A C++ port of Lucene
 Name:		clucene
 Version:	2.3.3.4
-Release:	37%{?dist}
-License:	LGPLv2+ or ASL 2.0
+Release:	38%{?dist}
+# From 'COPYING':
+# - RSA license: src\CLucene\util\MD5Digester.cpp
+# - BSD license: cmake/MacroCheckGccVisibility.cmake, MacroEnsureVersion.cmake, and src/core/util/Compress.cpp
+License:	(ASL 2.0 or LGPLv2+) and BSD and RSA
 URL:		http://www.sourceforge.net/projects/clucene
 %if 0%{?snap}
 #  git archive e8e3d20f20da5ee3e37d347207b01890829a5475 --prefix=clucene-core-2.3.3.4/ | xz -9 > ../clucene-core-2.3.3.4-e8e3d20.tar.xz
-Source0:	clucene-core-2.3.3.4-%{git_short}.tar.xz
+Source0:	%{_mariner_sources_url}/clucene-core-2.3.3.4-%{git_short}.tar.xz

 %else
 Source0:	http://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.gz
@ -142,6 +145,10 @@ time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" |


 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.3.3.4-38
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.3.3.4-37
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
--- a/SPECS-EXTENDED/container-exception-logger/container-exception-logger.spec
+++ b/SPECS-EXTENDED/container-exception-logger/container-exception-logger.spec
@ -4,7 +4,7 @@ Distribution:   Mariner

 Name: container-exception-logger
 Version: 1.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Logging from a container to a host

 License: GPLv3+
@ -12,7 +12,7 @@ URL: https://github.com/abrt/container-exception-logger
 # source is created by:
 # git clone https://github.com/abrt/container-exception-logger
 # cd container-exception-logger; tito build --tgz
-Source0: %{name}-%{version}.tar.gz
+Source0: %{_mariner_sources_url}/%{name}-%{version}.tar.gz

 BuildRequires: gcc
 BuildRequires: asciidoc
@ -42,6 +42,10 @@ cp man/container-exception-logger.1 %{buildroot}/%{_mandir}/man1/container-excep
 %license COPYING

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.3-6
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.3-5
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/device-mapper-persistent-data/device-mapper-persistent-data.spec
+++ b/SPECS-EXTENDED/device-mapper-persistent-data/device-mapper-persistent-data.spec
@ -7,11 +7,12 @@ Distribution:   Mariner
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
 Version: 0.8.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 URL: https://github.com/jthornber/thin-provisioning-tools
-#Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-% {version}.tar.gz
-Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Upstream source's hash is different from the Mariner one.
+# Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
+Source0: %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 Patch0: device-mapper-persistent-data-avoid-strip.patch

 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel, gcc-c++
@ -39,7 +40,8 @@ make %{?_smp_mflags} V=
 make DESTDIR=%{buildroot} MANDIR=%{_mandir} install

 %files
-%doc COPYING README.md
+%license COPYING
+%doc README.md
 %{_mandir}/man8/cache_check.8.gz
 %{_mandir}/man8/cache_dump.8.gz
 %{_mandir}/man8/cache_metadata_size.8.gz
@ -82,6 +84,10 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 #% {_sbindir}/thin_show_duplicates

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

--- a/SPECS-EXTENDED/dotconf/dotconf.spec
+++ b/SPECS-EXTENDED/dotconf/dotconf.spec
@ -2,11 +2,13 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Name:		dotconf
 Version:	1.3
-Release:	24%{?dist}
+Release:	25%{?dist}
 Summary:	Libraries to parse configuration files
-License:	LGPLv2
+License:	LGPLv2.1
 URL:		https://github.com/williamh/dotconf/
-Source:		%{name}-%{version}.tar.gz
+# Upstream source's hash different from the Mariner one.
+# Source: https://github.com/williamh/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:		%{_mariner_sources_url}/%{name}-%{version}.tar.gz
 
 BuildRequires:	findutils
 BuildRequires:	gcc
@ -62,6 +64,10 @@ mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/* __tmp_doc
 %{_libdir}/pkgconfig/dotconf.pc

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3-25
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3-24
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/enscript/enscript.spec
+++ b/SPECS-EXTENDED/enscript/enscript.spec
@ -3,17 +3,17 @@ Distribution:   Mariner
 Summary: A plain ASCII to PostScript converter
 Name: enscript
 Version: 1.6.6
-Release: 23%{?dist}
-License: GPLv3+ and LGPLv2+ and GPLv2+
+Release: 24%{?dist}
+License: GPLv3+
 URL: http://www.gnu.org/software/enscript
 # Tarball exists nowhere. You have to obtain it via:
 # $ git clone git://git.savannah.gnu.org/enscript.git
-# $ git archive --format=tar --prefix=enscript-1.6.4/ v1.6.4 |gzip > enscript-1.6.4.tar.gz
-Source0: enscript-%{version}.tar.gz
-Source1: enscript-ruby-1.6.4.tar.gz
+# $ git archive --format=tar --prefix=%%{name}-%%{version}/ v%%{version} | gzip > %%{name}-%%{version}.tar.gz
+Source0: %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 #http://neugierig.org/software/ruby/ruby-enscript.tar.gz
-Source2: enscript-php-1.6.4.st
+Source1: %{_mariner_sources_url}/%{name}-ruby-1.6.4.tar.gz
 #http://home.raxnet.net/downloads/viewcvs/php.st
+Source2: enscript-php-1.6.4.st

 # RH #61294
 Patch3: enscript-1.6.1-locale.patch
@ -106,7 +106,8 @@ for all in README THANKS; do
 done

 %files -f %{name}.lang -f share.list
-%doc AUTHORS ChangeLog COPYING docs/FAQ.html NEWS README README.ESCAPES THANKS TODO
+%license COPYING
+%doc AUTHORS ChangeLog docs/FAQ.html NEWS README README.ESCAPES THANKS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 %dir %{_datadir}/enscript
@ -114,6 +115,10 @@ done
 %config(noreplace) %{_sysconfdir}/enscript.cfg

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.6.6-24
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.6.6-23
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/fence-virt/fence-virt.spec
+++ b/SPECS-EXTENDED/fence-virt/fence-virt.spec
@ -15,10 +15,10 @@ Distribution:   Mariner
 Name:    fence-virt
 Summary: A pluggable fencing framework for virtual machines
 Version: 1.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL:     https://github.com/ClusterLabs/fence-virt
-Source0: %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.bz2
+Source0: %{_mariner_sources_url}/%{name}-%{version}.tar.bz2

 %if 0%{?suse_version}
 %define nss_devel mozilla-nss-devel
@ -95,7 +95,8 @@ fi
 Fencing agent for virtual machines.

 %files
-%doc COPYING TODO README
+%license COPYING
+%doc TODO README
 %{_sbindir}/fence_virt
 %{_sbindir}/fence_xvm
 %{_mandir}/man8/fence_virt.*
@ -166,6 +167,10 @@ are located on corosync cluster nodes.
 %{_libdir}/%{name}/cpg.so

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.0-3
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.0-2
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
--- a/SPECS-EXTENDED/fxload/fxload.spec
+++ b/SPECS-EXTENDED/fxload/fxload.spec
@ -2,12 +2,12 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Name: fxload
 Version: 2008_10_13
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: A helper program to download firmware into FX and FX2 EZ-USB devices

 License: GPLv2+
 URL: http://linux-hotplug.sourceforge.net/
-Source0: fxload-%{version}-noa3load.tar.gz
+Source0: %{_mariner_sources_url}/fxload-%{version}-noa3load.tar.gz
 # The above file is derived from:
 # http://downloads.sourceforge.net/project/linux-hotplug/fxload/2008_10_13/fxload-2008_10_13.tar.gz
 # This file contains code that is copyright Cypress Semiconductor Inc,
@ -44,12 +44,16 @@ mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/
 install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/

 %files
-%doc COPYING
+%license COPYING
 %doc README.txt
 %attr(0755, root, root) /sbin/fxload
 %{_mandir}/*/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2008_10_13-16
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2008_10_13-15
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/gpm/gpm.spec
+++ b/SPECS-EXTENDED/gpm/gpm.spec
@ -3,8 +3,8 @@ Distribution:   Mariner
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.7
-Release: 22%{?dist}
-License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only
+Release: 23%{?dist}
+License: GPLv2
 URL: http://www.nico.schottelius.org/software/gpm/
 #URL2 : http://freecode.com/projects/gpm

@ -17,7 +17,7 @@ URL: http://www.nico.schottelius.org/software/gpm/
 # 4.] rm -rf %{name}-%{version}/doc/specs
 # 5.] tar cJf %{name}-%{version}.tar.xz %{name}-%{version}

-Source: %{name}-%{version}.tar.xz
+Source: %{_mariner_sources_url}/%{name}-%{version}.tar.xz
 Source1: gpm.service
 Patch0: https://github.com/telmich/gpm/compare/1.20.7...4a938233fbe6de7af05aabc74891b68d4bae40f8.diff
 # https://github.com/telmich/gpm/pull/37/
@ -137,7 +137,8 @@ rm -rf %{buildroot}%{_mandir}
 %ldconfig_scriptlets libs

 %files
-%doc COPYING README TODO
+%license COPYING
+%doc README TODO
 %doc doc/README* doc/FAQ doc/Announce doc/changelog
 %{_infodir}/*
 %ifnarch s390 s390x
@ -159,6 +160,10 @@ rm -rf %{buildroot}%{_mandir}
 %{_libdir}/libgpm.a

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.20.7-23
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.20.7-22
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/hyphen-hu/hyphen-hu.spec
+++ b/SPECS-EXTENDED/hyphen-hu/hyphen-hu.spec
@ -4,10 +4,10 @@ Name: hyphen-hu
 Summary: Hungarian hyphenation rules
 %global upstreamid 20090612
 Version: 0.%{upstreamid}
-Release: 24%{?dist}
+Release: 25%{?dist}
 # Source URL is dead now
 # Source: http://download.github.com/nagybence-huhyphn-aa3fc85.tar.gz
-Source: nagybence-huhyphn-aa3fc85.tar.gz
+Source: %{_mariner_sources_url}/nagybence-huhyphn-aa3fc85.tar.gz
 URL: http://www.tipogral.hu/
 License: GPLv2
 BuildArch: noarch
@ -37,6 +37,10 @@ cp -p hyph_hu.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_hu_HU.dic
 %{_datadir}/hyphen/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20090612-25
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20090612-24
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/hyphen-mi/hyphen-mi.spec
+++ b/SPECS-EXTENDED/hyphen-mi/hyphen-mi.spec
@ -4,10 +4,10 @@ Name: hyphen-mi
 Summary: Maori hyphenation rules
 %global upstreamid 20080630
 Version: 0.%{upstreamid}
-Release: 21%{?dist}
+Release: 22%{?dist}
 # Source is dead now
 # Source: http://packages.papakupu.maori.nz/hunspell-hyphen/hunspell-hyphen-mi-0.1.%%{upstreamid}-beta.tar.gz
-Source: hunspell-hyphen-mi-0.1.%{upstreamid}-beta.tar.gz
+Source: %{_mariner_sources_url}/hunspell-hyphen-mi-0.1.%{upstreamid}-beta.tar.gz
 URL: http://papakupu.maori.nz/
 License: GPLv3+
 BuildArch: noarch
@ -29,10 +29,15 @@ cp -p mi.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_mi_NZ.dic


 %files
-%doc mi.LICENSE mi.README
+%license mi.LICENSE
+%doc mi.README
 %{_datadir}/hyphen/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20080630-22
+- Updating source URLs.
+- License verified.
+
 * Mon Jan 25 2021 Joe Schmitt <joschmit@microsoft.com> - 0.20080630-21
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Fix source macro expansion
--- a/SPECS-EXTENDED/hyphen-sa/hyphen-sa.spec
+++ b/SPECS-EXTENDED/hyphen-sa/hyphen-sa.spec
@ -1,15 +1,15 @@
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+%global upstream_commit cec10c6cad4804d391df31d0be8e429e2231feb5
 %global upstreamid 20110915

 Name: hyphen-sa
 Summary: Sanskrit hyphenation rules
 Version: 0.%{upstreamid}
-Release: 18%{?dist}
-#Source0: http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex?view=co
-Source0: hyph-sa.tex
+Release: 19%{?dist}
+Source0: https://github.com/hyphenation/tex-hyphen/blob/%{upstream_commit}/hyph-utf8/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex
 Source1: %{name}-LICENSE.txt
-URL: http://tug.org/tex-hyphen
+URL: https://github.com/hyphenation/tex-hyphen
 License: LPPL
 BuildArch: noarch
 BuildRequires: hyphen-devel
@ -43,6 +43,10 @@ cp -p hyph_sa_IN.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
 %{_datadir}/hyphen/hyph_sa_IN.dic

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20110915-19
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20110915-18
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/hyphen-tk/hyphen-tk.spec
+++ b/SPECS-EXTENDED/hyphen-tk/hyphen-tk.spec
@ -1,13 +1,13 @@
+%global upstream_commit ee22323218150388abdeb36184ad5861e3669b65
+%global upstreamid 20110620
+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Name: hyphen-tk
 Summary: Turkmen hyphenation rules
-%global upstreamid 20110620
 Version: 0.%{upstreamid}
-Release: 17%{?dist}
-#? in a url causes trouble
-#http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/tex/hyph-tk.tex?view=co
-Source: hyph-tk.tex
+Release: 18%{?dist}
+Source: https://github.com/hyphenation/tex-hyphen/blob/%{upstream_commit}/hyph-utf8/tex/generic/hyph-utf8/patterns/tex/hyph-tk.tex
 URL: http://tug.org/tex-hyphen
 License: Public Domain
 BuildArch: noarch
@ -41,6 +41,10 @@ cp -p hyph_tk_TM.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
 %{_datadir}/hyphen/hyph_tk_TM.dic

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20110620-18
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20110620-17
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/isorelax/isorelax.spec
+++ b/SPECS-EXTENDED/isorelax/isorelax.spec
@ -21,12 +21,12 @@ Distribution:   Mariner
 %define	cvsversion	20041111
 Name:           isorelax
 Version:        0.1
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        Public interfaces useful for applications to support RELAX Core
-License:        Apache-2.0 AND MIT
+License:        MIT
 Group:          Development/Libraries/Java
-URL:            http://iso-relax.sourceforge.net/
-Source0:        %{name}.%{cvsversion}.zip
+URL:            https://iso-relax.sourceforge.net/
+Source0:        https://sourceforge.net/projects/iso-relax/files/package/2004_11_11/%{name}.%{cvsversion}.zip
 Source1:        %{name}-build.xml
 Source2:        isorelax-maven-project.xml
 Source3:        isorelax-maven-project.xsd
@ -94,6 +94,10 @@ install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
 %endif

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1-31
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1-30
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/jakarta-taglibs-standard/jakarta-taglibs-standard.spec
+++ b/SPECS-EXTENDED/jakarta-taglibs-standard/jakarta-taglibs-standard.spec
@ -21,12 +21,14 @@ Distribution:   Mariner
 %define short_name      taglibs-standard
 Name:           jakarta-taglibs-standard
 Version:        1.1.1
-Release:        259%{?dist}
+Release:        260%{?dist}
 Summary:        Open Source Implementation of the JSP Standard Tag Library
-License:        Apache-2.0
+License:        ASL 2.0
 Group:          Development/Libraries/Java
 Url:            http://tomcat.apache.org/taglibs/
-Source0:        jakarta-taglibs-standard-%{version}-src.tar.bz2
+# Need to switch to upstream's source tarball:
+# https://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-1.1.1-src.tar.gz
+Source0:        %{_mariner_sources_url}/jakarta-taglibs-standard-%{version}-src.tar.bz2
 Patch0:         %{name}-%{version}-build.patch
 Patch1:         %{name}-java6-compatibility.patch
 Patch2:         %{name}-%{version}-remove-enums.patch
@ -100,6 +102,10 @@ cp -pr standard/dist/standard/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.1-260
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.1-259
 - Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
--- a/SPECS-EXTENDED/jsoup/jsoup.spec
+++ b/SPECS-EXTENDED/jsoup/jsoup.spec
@ -20,15 +20,15 @@ Distribution:   Mariner

 Name:           jsoup
 Version:        1.11.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java library for working with HTML
 License:        MIT
 Group:          Development/Libraries/Java
 URL:            http://jsoup.org/
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.gz
-Source1:        %{name}-build.xml
 # The sources contain non-free scraped web pages as test data
+Source0:        %{_mariner_sources_url}/%{name}-%{version}.tar.gz
+Source1:        %{name}-build.xml
 Source100:      generate-tarball.sh
 BuildRequires:  ant
 BuildRequires:  fdupes
@ -91,6 +91,10 @@ install -pdm 0755 target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.11.3-3
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.11.3-2
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/jsr-305/jsr-305.spec
+++ b/SPECS-EXTENDED/jsr-305/jsr-305.spec
@ -22,11 +22,11 @@ Distribution:   Mariner
 %global svn_date 20130910
 Name:           jsr-305
 Version:        0.1+%{svn_date}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Correctness annotations for Java code
 # The majority of code is BSD-licensed, but some Java sources
 # are licensed under CC-BY license, see: $ grep -r Creative .
-License:        BSD-3-Clause
+License:        BSD and CC-BY
 Group:          Development/Libraries/Java
 URL:            https://code.google.com/archive/p/jsr-305
 # There has been no official release yet.  This is a snapshot of the Subversion
@ -35,7 +35,7 @@ URL:            https://code.google.com/archive/p/jsr-305
 #   svn export -r %{svn_revision} http://%{name}.googlecode.com/svn/trunk %{name}
 #   tar -czvf %{name}-%{svn_date}svn.tgz %{name}
 # Source0:      https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/jsr-305/source-archive.zip
-Source0:        jsr-305-%{svn_date}svn.tgz
+Source0:        %{_mariner_sources_url}/jsr-305-%{svn_date}svn.tgz
 Source1:        jsr-305-ri-build.xml
 # File containing URL to CC-BY license text
 Source2:        NOTICE-CC-BY.txt
@ -103,6 +103,10 @@ cp -pr ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1+20130910-6
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1+20130910-5
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/jtidy/jtidy.spec
+++ b/SPECS-EXTENDED/jtidy/jtidy.spec
@ -27,15 +27,15 @@ Distribution:   Mariner
 %bcond_with             maven
 Name:           jtidy
 Version:        8.0
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        HTML syntax checker and pretty printer
-License:        BSD-3-Clause
+License:        BSD
 Group:          Development/Libraries/Java
 URL:            http://jtidy.sourceforge.net/
 # svn export -r813 http://svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ jtidy
 # # bnc#501764
 # rm jtidy/src/config/clover.license
-Source0:        jtidy-r813.tar.bz2
+Source0:        %{_mariner_sources_url}/jtidy-r813.tar.bz2
 Source1:        %{name}.jtidy.script
 Source2:        build.xml
 Source3:        maven-build.properties
@ -149,6 +149,10 @@ EOF
 %{_bindir}/*

 %changelog
+* Fri Apr 15 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.0-31
+- Updating source URL.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.0-30
 - Converting the 'Release' tag to the '[number].[distribution]' format.

--- a/SPECS-EXTENDED/librx/librx.spec
+++ b/SPECS-EXTENDED/librx/librx.spec
@ -1,14 +1,14 @@
 Summary: POSIX regexp functions
 Name: librx
 Version: 1.5
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL: http://www.gnu.org/software/rx/rx.html
 # Originally downloaded from ftp://ftp.gnu.org/gnu/rx/rx-1.5.tar.bz2
 # The FSF no longer offers this code.
-Source0: rx-%{version}.tar.bz2
+Source0: %{_mariner_sources_url}/rx-%{version}.tar.bz2
 Patch0: rx-1.5-shared.patch
 Patch1: rx-1.5-texinfo.patch
 Patch2: librx-1.5-libdir64.patch
@ -65,12 +65,17 @@ chmod -x ${RPM_BUILD_ROOT}%{_includedir}/rxposix.h
 %{_libdir}/*.so.*

 %files devel
+%license COPYING
 %doc ANNOUNCE BUILDING COOKOFF rx/ChangeLog
 %{_includedir}/*
 %{_infodir}/*
 %{_libdir}/*.so

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.5-37
+- Updating source URLs.
+- License verified.
+
 * Fri Dec 11 2020 Ruying Chen <v-ruyche@microsoft.com> - 1.5-36
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Update installation directories to Mariner's location.
--- a/SPECS-EXTENDED/libvpx/libvpx.spec
+++ b/SPECS-EXTENDED/libvpx/libvpx.spec
@ -8,9 +8,8 @@ Distribution:   Mariner
 Name:			libvpx
 Summary:		VP8/VP9 Video Codec SDK
 Version:		1.8.2
-Release:		3%{?dist}
+Release:		4%{?dist}
 License:		BSD
-#Source0:		http://downloads.webmproject.org/releases/webm/%{name}-%{version}.tar.bz2
 Source0:		https://github.com/webmproject/libvpx/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:		vpx_config.h
 # Thanks to debian.
@ -233,6 +232,10 @@ rm -rf %{buildroot}%{_prefix}/src
 %{_bindir}/*

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

--- a/SPECS-EXTENDED/lockdev/lockdev.spec
+++ b/SPECS-EXTENDED/lockdev/lockdev.spec
@ -12,13 +12,13 @@ Distribution:   Mariner
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.4
-Release: 1%{?dist}
-License: LGPLv2
+Release: 2%{?dist}
+License: LGPLv2.1
 URL: https://github.com/definesat/lockdev

 # This is a nightly snapshot downloaded via
 # https://github.com/definesat/lockdev
-Source0: lockdev-%{version}.%{checkout}.tar.gz
+Source0: %{_mariner_sources_url}/lockdev-%{version}.%{checkout}.tar.gz

 Patch1: lockdev-euidaccess.patch
 Patch2: 0001-major-and-minor-functions-moved-to-sysmacros.h.patch
@ -98,7 +98,7 @@ if [ $1 -eq 1 ] ; then
 fi

 %files
-%{license} COPYING
+%license COPYING
 %doc AUTHORS
 %ghost %dir %attr(0775,root,lock) %{_lockdir}
 %attr(2711,root,lock)  %{_sbindir}/lockdev
@ -113,6 +113,10 @@ fi
 %{_includedir}/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.4-2
+- Updating source URLs.
+- License verified.
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.4-1
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Converting the 'Release' tag to the '[number].[distribution]' format.
--- a/SPECS-EXTENDED/logwatch/logwatch.spec
+++ b/SPECS-EXTENDED/logwatch/logwatch.spec
@ -4,11 +4,10 @@ Distribution:   Mariner
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 URL: http://www.logwatch.org/
-Source0: logwatch-%{version}.tar.gz
-#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: https://sourceforge.net/projects/%{name}/files/%{name}-%{version}/%{name}-%{version}.tar.gz
 # Temporary fix for update to DNF 4.4
 Source1: dnf-rpm.conf
 BuildRequires: perl-generators
@ -90,7 +89,8 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles

 %files
-%doc README HOWTO-Customize-LogWatch LICENSE
+%license LICENSE
+%doc README HOWTO-Customize-LogWatch
 %dir %{_var}/cache/logwatch
 %dir %{_sysconfdir}/logwatch
 %dir %{_sysconfdir}/logwatch/scripts
@ -127,6 +127,10 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles
 %{_unitdir}/logwatch.timer

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

--- a/SPECS-EXTENDED/mailx/mailx.spec
+++ b/SPECS-EXTENDED/mailx/mailx.spec
@ -6,13 +6,15 @@ Distribution:   Mariner
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.5
-Release: 34%{?dist}
+Release: 35%{?dist}
+# MIT .. base64.c
 # MPLv1.1 .. nss.c, nsserr.c
-License: BSD with advertising and MPLv1.1
+# RSA .. md5.h, md5.c
+License: BSD with advertising and MIT and MPLv1.1 and RSA
 URL: http://heirloom.sourceforge.net/mailx.html
 # Mailx's upstream provides only the CVS method of downloading source code.
 # Use get-upstream-tarball.sh script to download current version of mailx.
-Source0: mailx-%{version}.tar.xz
+Source0: %{_mariner_sources_url}/mailx-%{version}.tar.xz
 Source1: get-upstream-tarball.sh

 Patch0: nail-11.25-config.patch
@ -157,13 +159,18 @@ popd


 %files
-%doc COPYING AUTHORS README
+%license COPYING
+%doc AUTHORS README
 %config(noreplace) %{mailrc}
 %{_bindir}/*
 %{_mandir}/*/*


 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 12.5-35
+- Updating source URLs.
+- License verified.
+
 * Wed Jan 06 2021 Joe Schmitt <joschmit@microsoft.com> - 12.5-34
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Use nss
--- a/SPECS-EXTENDED/meanwhile/meanwhile.spec
+++ b/SPECS-EXTENDED/meanwhile/meanwhile.spec
@ -2,9 +2,9 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Name:           meanwhile
 Version:        1.1.0
-Release:        29%{?dist}
+Release:        30%{?dist}
 Summary:        Lotus Sametime Community Client library
-License:        LGPLv2+
+License:        GPLv2+
 URL:            http://%{name}.sourceforge.net

 # The source for this package was pulled from upstream's vcs.  Use the following commands to generate the tarball:
@ -12,7 +12,7 @@ URL:            http://%{name}.sourceforge.net
 # cvs -d:pserver:anonymous@meanwhile.cvs.sourceforge.net:/cvsroot/meanwhile co -d meanwhile-1.1.0 -r meanwhile_v1_1_0 meanwhile
 # tar -cvzf meanwhile-1.1.0.tar.gz meanwhile-1.1.0

-Source:         %{name}-%{version}.tar.gz
+Source:         %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-crash.patch
 Patch1:         %{name}-fix-glib-headers.patch
 Patch2:         %{name}-file-transfer.patch
@ -79,7 +79,8 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/
 %ldconfig_scriptlets libs

 %files
-%doc AUTHORS ChangeLog COPYING README TODO LICENSE
+%license COPYING LICENSE
+%doc AUTHORS ChangeLog README TODO
 %{_libdir}/lib%{name}.so.*

 %files devel
@ -91,6 +92,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/
 %doc docs/*

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

--- a/SPECS-EXTENDED/mythes-el/mythes-el.spec
+++ b/SPECS-EXTENDED/mythes-el/mythes-el.spec
@ -4,11 +4,11 @@ Name: mythes-el
 Summary: Greek thesaurus
 %global upstreamid 20070412
 Version: 0.%{upstreamid}
-Release: 24%{?dist}
+Release: 25%{?dist}
 # below links are dead and can't find any mirror for it
 # please don't report any FTBFS bugs
 #Source: http://www.ellak.gr/pub/oo_extras/th_el.zip
-Source: th_el.zip
+Source: %{_mariner_sources_url}/th_el.zip
 URL: wiki.services.openoffice.org/wiki/Dictionaries
 License: GPLv2+
 BuildArch: noarch
@ -50,6 +50,10 @@ done
 %{_datadir}/mythes/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20070412-25
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20070412-24
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/mythes-mi/mythes-mi.spec
+++ b/SPECS-EXTENDED/mythes-mi/mythes-mi.spec
@ -4,10 +4,10 @@ Name: mythes-mi
 Summary: Maori thesaurus
 %global upstreamid 20080630
 Version: 0.%{upstreamid}
-Release: 22%{?dist}
+Release: 23%{?dist}
 # Source is dead now
 # Source: http://packages.papakupu.maori.nz/mythes/mythes-mi-0.1.%%{upstreamid}-beta.tar.gz
-Source: mythes-mi-0.1.%{upstreamid}-beta.tar.gz
+Source: %{_mariner_sources_url}/mythes-mi-0.1.%{upstreamid}-beta.tar.gz
 URL: http://papakupu.maori.nz/
 License: Public Domain
 BuildArch: noarch
@ -29,10 +29,15 @@ cp -p mi.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_mi_NZ_v2.idx


 %files
+%license mi.LICENSE
 %doc mi.AUTHORS mi.README mi.LICENSE
 %{_datadir}/mythes/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20080630-23
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20080630-22
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/mythes-ru/mythes-ru.spec
+++ b/SPECS-EXTENDED/mythes-ru/mythes-ru.spec
@ -4,10 +4,10 @@ Name: mythes-ru
 Summary: Russian thesaurus
 %global upstreamid 20070613
 Version: 0.%{upstreamid}
-Release: 22%{?dist}
+Release: 23%{?dist}
 # Below source link is dead now
 # Source: http://download.i-rs.ru/pub/openoffice/dict/thes_ru_RU_v2.zip
-Source: thes_ru_RU_v2.zip
+Source: %{_mariner_sources_url}/thes_ru_RU_v2.zip
 URL: http://wiki.services.openoffice.org/wiki/Dictionaries
 BuildRequires: unzip
 License: LGPLv2+
@ -39,6 +39,10 @@ done
 %{_datadir}/mythes/*

 %changelog
+* Mon Apr 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20070613-23
+- Updating source URLs.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.20070613-22
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).

--- a/SPECS-EXTENDED/netpbm/netpbm.spec
+++ b/SPECS-EXTENDED/netpbm/netpbm.spec
@ -1,7 +1,7 @@
 Summary:         A library for handling different graphics file formats
 Name:            netpbm
 Version:         10.90.00
-Release:         3%{?dist}
+Release:         4%{?dist}
 # See copyright_summary for details
 License:         BSD and GPLv2 and IJG and MIT and Public Domain
 Vendor:         Microsoft Corporation
@ -12,7 +12,7 @@ URL: http://netpbm.sourceforge.net/
 # svn checkout https://svn.code.sf.net/p/netpbm/code/userguide netpbm-%%{version}/userguide
 # svn checkout https://svn.code.sf.net/p/netpbm/code/trunk/test netpbm-%%{version}/test
 # and removing the .svn directories ( find -name "\.svn" -type d -print0 | xargs -0 rm -rf )
-Source0:         https://svn.code.sf.net/p/netpbm/code/advanced#/%{name}-%{version}.tar.xz
+Source0:         %{_mariner_sources_url}/%{name}-%{version}.tar.xz
 Patch0:          netpbm-security-scripts.patch
 Patch1:          netpbm-security-code.patch
 Patch2:          netpbm-ppmfadeusage.patch
@ -224,6 +224,9 @@ popd
 %doc userguide/*

 %changelog
+* Fri Apr 15 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 10.90.00-4
+- Updating source URL.
+
 * Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 10.90.00-3
 - Removing dependency on 'ghostscript'.
 - License verified.
--- a/SPECS/mariner-rpm-macros/macros
+++ b/SPECS/mariner-rpm-macros/macros
@ -230,3 +230,7 @@ end

 # New version of RPM has stricter approach to encoding; turn the errors off temporarily.
 %_invalid_encoding_terminates_build 0
+
+# CBL-Mariner's sources storage URL.
+# NOTE: only allowed to be used for source URLs when original, upstream source cannot be found.
+%_mariner_sources_url https://cblmarinerstorage.blob.core.windows.net/sources/core
--- a/SPECS/mariner-rpm-macros/mariner-rpm-macros.signatures.json
+++ b/SPECS/mariner-rpm-macros/mariner-rpm-macros.signatures.json
@ -10,7 +10,7 @@
  "gen-ld-script.sh": "10dc6b14204ccc373f261dcdc616d5dfe1918ae78e977bdfafa91fc187d64beb",
  "generate-package-note.py": "bd76a8e88a1356fed74863c38e5cf6a20c1c26426ac94ba21dd172578e8ca2a2",
  "gpgverify": "db0e050f56b694497d70603a6f5c17dd60ddbcf7cee670616851cd389f6767c4",
-  "macros": "ff812ac9973ea1f012e1210fb960f4719483a7537634b40f769989c740bafcda",
+  "macros": "2a236e2e0e876bb21dd68ca0018f8dedec1dbe72f266f1f9e5f92f3b79b68b01",
  "macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
  "macros.fonts": "f52edc646414c5dd0f5f4cdd570f2f9dbe6fb97d4f0db360908deb56d96492f8",
  "macros.forge": "8785fe3de4570d6b78dc40aa2f0a4124ce1ddb6282fe3060fb0ae2001178abe6",
--- a/SPECS/mariner-rpm-macros/mariner-rpm-macros.spec
+++ b/SPECS/mariner-rpm-macros/mariner-rpm-macros.spec
@ -6,7 +6,7 @@
 Summary:        Mariner specific rpm macro files
 Name:           mariner-rpm-macros
 Version:        2.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        GPL+ AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -20,7 +20,7 @@ Source5:        macros.check
 Source6:        macros.python
 Source7:        macros.python3
 Source8:        macros.python-srpm
-Source9:       macros.openblas-srpm
+Source9:        macros.openblas-srpm
 Source10:       macros.nodejs-srpm
 Source11:       macros.mono-srpm
 Source12:       macros.ocaml-srpm
@ -121,6 +121,9 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm forge.lua
 %{_rpmconfigdir}/macros.d/macros.check

 %changelog
+* Tue Apr 26 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0-14
+- Adding the "_mariner_sources_url" macro.
+
 * Mon Mar 28 2022 Olivia Crain <oliviacrain@microsoft.com> - 2.0-13
 - Remove python2 RPM macros entirely
 - Remove python2-related SRPM macros
--- a/SPECS/xml-commons-apis/xml-commons-apis.spec
+++ b/SPECS/xml-commons-apis/xml-commons-apis.spec
@ -20,7 +20,7 @@
 Summary:        APIs for DOM, SAX, and JAXP
 Name:           xml-commons-apis
 Version:        1.4.01
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        ASL 2.0 AND W3C AND SUSE-Public-Domain
 Group:          Development/Libraries/Java
 Vendor:         Microsoft Corporation
@ -28,7 +28,7 @@ Distribution:   Mariner
 URL:            https://xml.apache.org/commons/
 # From source control because the published tarball doesn't include some docs:
 #   toolkit/scripts/svn2source.sh https://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-%%{underscore_version}/java/external %%{name}-%%{version}
-Source0:        https://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-%{underscore_version}/java/external#/%{name}-%{version}.tar.gz
+Source0:        %{_mariner_sources_url}/%{name}-%{version}.tar.gz
 Source1:        %{name}-MANIFEST.MF
 Source2:        %{name}-ext-MANIFEST.MF
 Source3:        https://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
@ -114,6 +114,9 @@ rm -rf build/docs/javadoc
 %{_javadir}/*

 %changelog
+* Fri Apr 15 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.4.01-8
+- Updating source URL.
+
 * Tue Apr 12 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.4.01-7
 - Fixing "%%underscore_version" macro definition.

--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -220,6 +220,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "aopalliance",
+          "version": "1.0",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/aopalliance-src.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -550,6 +560,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "atinject",
+          "version": "1+20100611git1f74ea7",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/atinject-1.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -850,6 +870,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "bcache-tools",
+          "version": "1.1",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/bcache-tools-1.1.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -892,6 +922,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "bea-stax",
+          "version": "1.2.0",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/stax-src-1.2.0.zip"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -1512,6 +1552,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "clucene",
+          "version": "2.3.3.4",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/clucene-core-2.3.3.4-e8e3d20.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -1652,6 +1702,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "container-exception-logger",
+          "version": "1.0.3",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/container-exception-logger-1.0.3.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -2143,6 +2203,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "device-mapper-persistent-data",
+          "version": "0.8.5",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/device-mapper-persistent-data-0.8.5.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -2423,6 +2493,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "dotconf",
+          "version": "1.3",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/dotconf-1.3.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -2763,6 +2843,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "enscript",
+          "version": "1.6.6",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/enscript-1.6.6.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -2993,6 +3083,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "fence-virt",
+          "version": "1.0.0",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/fence-virt-1.0.0.tar.bz2"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -3375,6 +3475,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "fxload",
+          "version": "2008_10_13",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/fxload-2008_10_13-noa3load.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -3995,6 +4105,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "gpm",
+          "version": "1.20.7",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/gpm-1.20.7.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -5795,6 +5915,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "hyphen-hu",
+          "version": "0.20090612",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/nagybence-huhyphn-aa3fc85.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -5865,6 +5995,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "hyphen-mi",
+          "version": "0.20080630",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/hunspell-hyphen-mi-0.1.20080630-beta.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -5965,6 +6105,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "hyphen-sa",
+          "version": "0.20110915",
+          "downloadUrl": "https://github.com/hyphenation/tex-hyphen/blob/cec10c6cad4804d391df31d0be8e429e2231feb5/hyph-utf8/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -6015,6 +6165,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "hyphen-tk",
+          "version": "0.20110620",
+          "downloadUrl": "https://github.com/hyphenation/tex-hyphen/blob/ee22323218150388abdeb36184ad5861e3669b65/hyph-utf8/tex/generic/hyph-utf8/patterns/tex/hyph-tk.tex"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -6536,6 +6696,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "isorelax",
+          "version": "0.1",
+          "downloadUrl": "https://sourceforge.net/projects/iso-relax/files/package/2004_11_11/isorelax.20041111.zip"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -6576,6 +6746,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "jakarta-taglibs-standard",
+          "version": "1.1.1",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jakarta-taglibs-standard-1.1.1-src.tar.bz2"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -6886,6 +7066,36 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "jsoup",
+          "version": "1.11.3",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jsoup-1.11.3.tar.gz"
+        }
+      }
+    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "jsr-305",
+          "version": "0.1+20130910",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jsr-305-20130910svn.tgz"
+        }
+      }
+    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "jtidy",
+          "version": "8.0",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jtidy-r813.tar.bz2"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -9296,6 +9506,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "librx",
+          "version": "1.5",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/rx-1.5.tar.bz2"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -10486,6 +10706,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "lockdev",
+          "version": "1.0.4",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/lockdev-1.0.4.20111007git.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -10526,6 +10756,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "logwatch",
+          "version": "7.5.3",
+          "downloadUrl": "https://sourceforge.net/projects/logwatch/files/logwatch-7.5.3/logwatch-7.5.3.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -10836,6 +11076,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "mailx",
+          "version": "12.5",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/mailx-12.5.tar.xz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -11136,6 +11386,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "meanwhile",
+          "version": "1.1.0",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/meanwhile-1.1.0.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -11768,6 +12028,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "mythes-el",
+          "version": "0.20070412",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/th_el.zip"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -11818,6 +12088,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "mythes-mi",
+          "version": "0.20080630",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/mythes-mi-0.1.20080630-beta.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -11868,6 +12148,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "mythes-ru",
+          "version": "0.20070613",
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/thes_ru_RU_v2.zip"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -12044,7 +12334,7 @@
        "other": {
          "name": "netpbm",
          "version": "10.90.00",
-          "downloadUrl": "https://svn.code.sf.net/p/netpbm/code/advanced"
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/netpbm-10.90.00.tar.xz"
        }
      }
    },
@ -26349,7 +26639,7 @@
        "other": {
          "name": "xml-commons-apis",
          "version": "1.4.01",
-          "downloadUrl": "https://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-1_4_01/java/external"
+          "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xml-commons-apis-1.4.01.tar.gz"
        }
      }
    },
--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@ -208,8 +208,8 @@ pcre-8.45-2.cm2.aarch64.rpm
 pcre-libs-8.45-2.cm2.aarch64.rpm
 lua-5.4.3-1.cm2.aarch64.rpm
 lua-libs-5.4.3-1.cm2.aarch64.rpm
-mariner-rpm-macros-2.0-13.cm2.noarch.rpm
-mariner-check-macros-2.0-13.cm2.noarch.rpm
+mariner-rpm-macros-2.0-14.cm2.noarch.rpm
+mariner-check-macros-2.0-14.cm2.noarch.rpm
 libassuan-2.5.5-2.cm2.aarch64.rpm
 libassuan-devel-2.5.5-2.cm2.aarch64.rpm
 libgpg-error-1.43-2.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@ -208,8 +208,8 @@ pcre-8.45-2.cm2.x86_64.rpm
 pcre-libs-8.45-2.cm2.x86_64.rpm
 lua-5.4.3-1.cm2.x86_64.rpm
 lua-libs-5.4.3-1.cm2.x86_64.rpm
-mariner-rpm-macros-2.0-13.cm2.noarch.rpm
-mariner-check-macros-2.0-13.cm2.noarch.rpm
+mariner-rpm-macros-2.0-14.cm2.noarch.rpm
+mariner-check-macros-2.0-14.cm2.noarch.rpm
 libassuan-2.5.5-2.cm2.x86_64.rpm
 libassuan-devel-2.5.5-2.cm2.x86_64.rpm
 libgpg-error-1.43-2.cm2.x86_64.rpm
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@ -225,7 +225,7 @@ m4-1.4.19-1.cm2.aarch64.rpm
 m4-debuginfo-1.4.19-1.cm2.aarch64.rpm
 make-4.3-2.cm2.aarch64.rpm
 make-debuginfo-4.3-2.cm2.aarch64.rpm
-mariner-check-macros-2.0-13.cm2.noarch.rpm
+mariner-check-macros-2.0-14.cm2.noarch.rpm
 mariner-release-2.0-11.cm2.noarch.rpm
 mariner-repos-2.0-7.cm2.noarch.rpm
 mariner-repos-debug-2.0-7.cm2.noarch.rpm
@ -240,7 +240,7 @@ mariner-repos-microsoft-2.0-7.cm2.noarch.rpm
 mariner-repos-microsoft-preview-2.0-7.cm2.noarch.rpm
 mariner-repos-preview-2.0-7.cm2.noarch.rpm
 mariner-repos-shared-2.0-7.cm2.noarch.rpm
-mariner-rpm-macros-2.0-13.cm2.noarch.rpm
+mariner-rpm-macros-2.0-14.cm2.noarch.rpm
 meson-0.60.2-2.cm2.noarch.rpm
 mpfr-4.1.0-1.cm2.aarch64.rpm
 mpfr-debuginfo-4.1.0-1.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@ -225,7 +225,7 @@ m4-1.4.19-1.cm2.x86_64.rpm
 m4-debuginfo-1.4.19-1.cm2.x86_64.rpm
 make-4.3-2.cm2.x86_64.rpm
 make-debuginfo-4.3-2.cm2.x86_64.rpm
-mariner-check-macros-2.0-13.cm2.noarch.rpm
+mariner-check-macros-2.0-14.cm2.noarch.rpm
 mariner-release-2.0-11.cm2.noarch.rpm
 mariner-repos-2.0-7.cm2.noarch.rpm
 mariner-repos-debug-2.0-7.cm2.noarch.rpm
@ -240,7 +240,7 @@ mariner-repos-microsoft-2.0-7.cm2.noarch.rpm
 mariner-repos-microsoft-preview-2.0-7.cm2.noarch.rpm
 mariner-repos-preview-2.0-7.cm2.noarch.rpm
 mariner-repos-shared-2.0-7.cm2.noarch.rpm
-mariner-rpm-macros-2.0-13.cm2.noarch.rpm
+mariner-rpm-macros-2.0-14.cm2.noarch.rpm
 meson-0.60.2-2.cm2.noarch.rpm
 mpfr-4.1.0-1.cm2.x86_64.rpm
 mpfr-debuginfo-4.1.0-1.cm2.x86_64.rpm