From 19db64a71a721b9a14a970697ac5696be5db5e3f Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 27 Mar 2024 17:35:38 +0100
Subject: [PATCH] More CPEs and anitya IDs

---
 bc/PKGBUILD                       | 4 ++++
 cmake/PKGBUILD                    | 4 ++++
 diffutils/PKGBUILD                | 4 ++++
 dtc/PKGBUILD                      | 4 ++++
 flex/PKGBUILD                     | 4 ++++
 iperf/PKGBUILD                    | 4 ++++
 iperf3/PKGBUILD                   | 5 +++++
 jsoncpp/PKGBUILD                  | 4 ++++
 libatomic_ops/PKGBUILD            | 4 ++++
 python-mallard-ducktype/PKGBUILD  | 4 +---
 python-pyalpm/PKGBUILD            | 4 +---
 python-pyparsing/PKGBUILD         | 1 +
 python-pyproject-hooks/PKGBUILD   | 3 +++
 python-pytest/PKGBUILD            | 1 +
 python-setuptools-scm/PKGBUILD    | 1 +
 python-setuptools/PKGBUILD        | 1 +
 python-six/PKGBUILD               | 1 +
 python-trove-classifiers/PKGBUILD | 1 +
 python-typing_extensions/PKGBUILD | 3 ---
 python-urllib3/PKGBUILD           | 1 +
 python-wcwidth/PKGBUILD           | 1 +
 python-wheel/PKGBUILD             | 1 +
 python-yaml/PKGBUILD              | 1 +
 python-zstandard/PKGBUILD         | 1 +
 quilt/PKGBUILD                    | 3 +++
 rcs/PKGBUILD                      | 3 +++
 re2c/PKGBUILD                     | 1 +
 readline/PKGBUILD                 | 1 +
 rhash/PKGBUILD                    | 4 ++++
 rlwrap/PKGBUILD                   | 3 +++
 rpcsvc-proto/PKGBUILD             | 3 +++
 rsync/PKGBUILD                    | 9 ++++++---
 ruby/PKGBUILD                     | 1 +
 scons/PKGBUILD                    | 1 +
 screenfetch/PKGBUILD              | 3 +++
 sed/PKGBUILD                      | 1 +
 serf/PKGBUILD                     | 1 +
 setconf/PKGBUILD                  | 3 +++
 sgml-common/PKGBUILD              | 3 +++
 sharutils/PKGBUILD                | 1 +
 socat/PKGBUILD                    | 4 +++-
 sqlite/PKGBUILD                   | 1 +
 sshpass/PKGBUILD                  | 3 +++
 stow/PKGBUILD                     | 3 +++
 subversion/PKGBUILD               | 1 +
 swig/PKGBUILD                     | 3 +++
 tar/PKGBUILD                      | 1 +
 task/PKGBUILD                     | 3 +++
 tcl/PKGBUILD                      | 1 +
 tcsh/PKGBUILD                     | 3 +++
 texinfo/PKGBUILD                  | 1 +
 tftp-hpa/PKGBUILD                 | 4 ++++
 tig/PKGBUILD                      | 3 +++
 time/PKGBUILD                     | 3 +++
 tio/PKGBUILD                      | 3 +++
 tmate/PKGBUILD                    | 3 +++
 tmux/PKGBUILD                     | 1 +
 tree/PKGBUILD                     | 3 +++
 txt2html/PKGBUILD                 | 3 +++
 txt2tags/PKGBUILD                 | 1 +
 tzcode/PKGBUILD                   | 7 ++++---
 u-boot-tools/PKGBUILD             | 1 +
 ucl/PKGBUILD                      | 3 +++
 unrar/PKGBUILD                    | 1 +
 unzip/PKGBUILD                    | 1 +
 upx/PKGBUILD                      | 1 +
 util-linux/PKGBUILD               | 1 +
 vifm/PKGBUILD                     | 3 +++
 vim/PKGBUILD                      | 1 +
 vimpager/PKGBUILD                 | 3 +++
 w3m/PKGBUILD                      | 1 +
 wcd/PKGBUILD                      | 3 +++
 wget/PKGBUILD                     | 4 +++-
 which/PKGBUILD                    | 3 +++
 xdelta3/PKGBUILD                  | 3 +++
 xmlto/PKGBUILD                    | 3 +++
 xorg-util-macros/PKGBUILD         | 3 +++
 xorgproto/PKGBUILD                | 3 +++
 xorriso/PKGBUILD                  | 3 +++
 xxhash/PKGBUILD                   | 3 +++
 xz/PKGBUILD                       | 1 +
 yasm/PKGBUILD                     | 5 +++--
 yelp-tools/PKGBUILD               | 3 +++
 yelp-xsl/PKGBUILD                 | 3 +++
 zip/PKGBUILD                      | 5 +++++
 zsh/PKGBUILD                      | 5 +++--
 zstd/PKGBUILD                     | 3 ++-
 87 files changed, 205 insertions(+), 22 deletions(-)

diff --git a/bc/PKGBUILD b/bc/PKGBUILD
index f65535d3..b7123fcc 100644
--- a/bc/PKGBUILD
+++ b/bc/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=3
 pkgdesc="An arbitrary precision calculator language"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/bc"
+msys2_references=(
+  "anitya: 170"
+  "cpe: cpe:2.3:a:gnu:bc"
+)
 license=('GPL')
 depends=('libreadline' 'ncurses')
 makedepends=('ed' 'gcc' 'libreadline-devel' 'ncurses-devel' 'autotools')
diff --git a/cmake/PKGBUILD b/cmake/PKGBUILD
index 1a40e081..11a7ec23 100644
--- a/cmake/PKGBUILD
+++ b/cmake/PKGBUILD
@@ -9,6 +9,10 @@ pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="https://www.cmake.org/"
 msys2_repository_url="https://gitlab.kitware.com/cmake/cmake"
+msys2_references=(
+  "anitya: 306"
+  "cpe: cpe:2.3:a:cmake_project:cmake"
+)
 license=(spdx:MIT)
 makedepends=('gcc'
              'emacs'
diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD
index 2c367b1f..063ba6b0 100644
--- a/diffutils/PKGBUILD
+++ b/diffutils/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=1
 pkgdesc="Utility programs used for creating patch files"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/diffutils"
+msys2_references=(
+  "anitya: 436"
+  "cpe: cpe:2.3:a:gnu:diffutils"
+)
 license=('spdx:GPL-3.0-or-later')
 depends=('sh' 'libiconv' 'libintl')
 makedepends=('autotools' 'gcc' 'gettext-devel' 'libiconv-devel')
diff --git a/dtc/PKGBUILD b/dtc/PKGBUILD
index 0138a275..e30a81de 100644
--- a/dtc/PKGBUILD
+++ b/dtc/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=3
 pkgdesc="Device Tree Compiler"
 arch=('i686' 'x86_64')
 url="https://git.kernel.org/pub/scm/utils/dtc/dtc/git"
+msys2_references=(
+  "anitya: 16911"
+  "cpe: cpe:2.3:a:dtc_project:dtc"
+)
 license=('GPL2')
 depends=('libyaml')
 makedepends=('python-devel' 'swig' 'libyaml-devel' 'gcc')
diff --git a/flex/PKGBUILD b/flex/PKGBUILD
index 25cd79ce..34aa3b56 100644
--- a/flex/PKGBUILD
+++ b/flex/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=3
 pkgdesc="A tool for generating text-scanning programs"
 arch=('i686' 'x86_64')
 url="https://github.com/westes/flex"
+msys2_references=(
+  "anitya: 819"
+  "cpe: cpe:2.3:a:westes:flex"
+)
 license=('custom')
 depends=('m4' 'sh' 'libiconv' 'libintl')
 makedepends=('libiconv-devel' 'gettext-devel' 'autotools' 'gcc')
diff --git a/iperf/PKGBUILD b/iperf/PKGBUILD
index dc70379f..053acf74 100644
--- a/iperf/PKGBUILD
+++ b/iperf/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=2
 pkgdesc='A tool to measure maximum TCP bandwidth'
 arch=('i686' 'x86_64')
 url="https://sourceforge.net/projects/iperf2/"
+msys2_references=(
+  "anitya: 1388"
+  "cpe: cpe:2.3:a:iperf2_project:iperf2"
+)
 license=('custom')
 depends=('gcc-libs')
 makedepends=('autotools' 'gcc')
diff --git a/iperf3/PKGBUILD b/iperf3/PKGBUILD
index ec5dd2e9..b8009a3f 100644
--- a/iperf3/PKGBUILD
+++ b/iperf3/PKGBUILD
@@ -6,6 +6,11 @@ pkgrel=1
 pkgdesc='TCP, UDP, and SCTP network bandwidth measurement tool'
 arch=('i686' 'x86_64')
 url="https://github.com/esnet/iperf"
+msys2_references=(
+  "anitya: 1389"
+  "cpe: cpe:2.3:a:es:iperf3"
+  "cpe: cpe:2.3:a:iperf3_project:iperf3"
+)
 license=('BSD')
 depends=('gcc-libs' 'openssl')
 makedepends=('openssl-devel' 'autotools' 'gcc')
diff --git a/jsoncpp/PKGBUILD b/jsoncpp/PKGBUILD
index 42e6815c..5dab254f 100644
--- a/jsoncpp/PKGBUILD
+++ b/jsoncpp/PKGBUILD
@@ -7,6 +7,10 @@ pkgrel=3
 pkgdesc="A C++ library for interacting with JSON"
 arch=('any')
 url="https://github.com/open-source-parsers/jsoncpp"
+msys2_references=(
+  "anitya: 7483"
+  "cpe: cpe:2.3:a:jsoncpp_project:jsoncpp"
+)
 license=('MIT')
 depends=("gcc-libs")
 makedepends=("gcc"
diff --git a/libatomic_ops/PKGBUILD b/libatomic_ops/PKGBUILD
index a876c095..df6b9a46 100644
--- a/libatomic_ops/PKGBUILD
+++ b/libatomic_ops/PKGBUILD
@@ -7,6 +7,10 @@ pkgrel=1
 pkgdesc="Provides semi-portable access to hardware provided atomic memory operations"
 arch=('any')
 url="https://github.com/ivmai/libatomic_ops"
+msys2_references=(
+  "anitya: 1561"
+  "cpe: cpe:2.3:a:libatomic_ops_project:libatomic_ops"
+)
 makedepends=('autotools' 'gcc')
 license=('spdx:GPL-2.0-or-later AND MIT')
 source=("https://github.com/ivmai/${pkgbase}/releases/download/v${pkgver}/${pkgbase}-${pkgver}.tar.gz")
diff --git a/python-mallard-ducktype/PKGBUILD b/python-mallard-ducktype/PKGBUILD
index b49955e4..c106ed2e 100644
--- a/python-mallard-ducktype/PKGBUILD
+++ b/python-mallard-ducktype/PKGBUILD
@@ -11,6 +11,7 @@ url="http://projectmallard.org/"
 msys2_repository_url="https://github.com/projectmallard/mallard-ducktype"
 msys2_references=(
   "pypi:mallard-ducktype"
+  'archlinux: mallard-ducktype'
 )
 license=('spdx:MIT')
 depends=("python")
@@ -22,9 +23,6 @@ makedepends=(
 )
 source=("${_realname}-$pkgver.tar.gz"::"https://github.com/projectmallard/mallard-ducktype/archive/${pkgver}.tar.gz")
 sha256sums=('73ac416376dd65c737594ab4b1037b0823390239f33672f1ee1e30725dcef4e9')
-msys2_references=(
-  'archlinux: mallard-ducktype'
-)
 
 build() {
   cd "${_realname}-${pkgver}"
diff --git a/python-pyalpm/PKGBUILD b/python-pyalpm/PKGBUILD
index a59d13d0..c5059429 100644
--- a/python-pyalpm/PKGBUILD
+++ b/python-pyalpm/PKGBUILD
@@ -10,6 +10,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 url="https://gitlab.archlinux.org/archlinux/pyalpm"
 msys2_references=(
+  'archlinux: pyalpm'
   "pypi:pyalpm"
 )
 depends=("python" "libarchive")
@@ -33,9 +34,6 @@ source=("git+https://gitlab.archlinux.org/archlinux/pyalpm.git#tag=${pkgver}"
         "0005-Use-pkg-config-add-LIBALPM_STATIC-env.-var.patch")
 sha256sums=('SKIP'
             'e26201c95cf6511cc884a38a8ca17cd61154542c390bcd8f7484bdc8e560cee9')
-msys2_references=(
-  'archlinux: pyalpm'
-)
 
 prepare() {
   cd "${srcdir}/${_realname}"
diff --git a/python-pyparsing/PKGBUILD b/python-pyparsing/PKGBUILD
index cea4991f..e6a5329e 100644
--- a/python-pyparsing/PKGBUILD
+++ b/python-pyparsing/PKGBUILD
@@ -9,6 +9,7 @@ pkgdesc='General parsing module for Python'
 arch=('any')
 url='https://github.com/pyparsing/pyparsing/'
 msys2_references=(
+  "anitya: 3756"
   "pypi:pyparsing"
 )
 license=('spdx:MIT')
diff --git a/python-pyproject-hooks/PKGBUILD b/python-pyproject-hooks/PKGBUILD
index a6f6d65f..1663c438 100644
--- a/python-pyproject-hooks/PKGBUILD
+++ b/python-pyproject-hooks/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=3
 pkgdesc="A low-level library for calling build-backends in pyproject.toml-based project"
 arch=(any)
 url="https://github.com/pypa/pyproject-hooks"
+msys2_references=(
+  "anitya: 320474"
+)
 license=('spdx:MIT')
 depends=(python)
 makedepends=(python-installer python-flit-core)
diff --git a/python-pytest/PKGBUILD b/python-pytest/PKGBUILD
index 6775211c..01123fd5 100644
--- a/python-pytest/PKGBUILD
+++ b/python-pytest/PKGBUILD
@@ -13,6 +13,7 @@ license=('MIT')
 url="https://pytest.org/"
 msys2_repository_url="https://github.com/pytest-dev/pytest"
 msys2_references=(
+  "anitya: 3765"
   "pypi:pytest"
 )
 depends=('python'
diff --git a/python-setuptools-scm/PKGBUILD b/python-setuptools-scm/PKGBUILD
index fc863ad2..8afedea1 100644
--- a/python-setuptools-scm/PKGBUILD
+++ b/python-setuptools-scm/PKGBUILD
@@ -10,6 +10,7 @@ arch=('any')
 license=('spdx:MIT')
 url='https://github.com/pypa/setuptools_scm'
 msys2_references=(
+  "anitya: 65053"
   "pypi:setuptools-scm"
 )
 depends=(
diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD
index 3e8aedb4..c05af7d1 100644
--- a/python-setuptools/PKGBUILD
+++ b/python-setuptools/PKGBUILD
@@ -11,6 +11,7 @@ license=('PSF')
 url="https://pypi.python.org/pypi/setuptools"
 msys2_repository_url="https://github.com/pypa/setuptools"
 msys2_references=(
+  "anitya: 4021"
   "pypi:setuptools"
   "cpe: cpe:/a:python:setuptools"
 )
diff --git a/python-six/PKGBUILD b/python-six/PKGBUILD
index 7304b8e8..77a08af2 100644
--- a/python-six/PKGBUILD
+++ b/python-six/PKGBUILD
@@ -11,6 +11,7 @@ pkgdesc="Python compatibility utilities"
 arch=('any')
 url="https://pypi.python.org/pypi/six/"
 msys2_references=(
+  "anitya: 4027"
   "pypi:six"
 )
 license=('spdx:MIT')
diff --git a/python-trove-classifiers/PKGBUILD b/python-trove-classifiers/PKGBUILD
index 7a69aa8e..4cab4745 100644
--- a/python-trove-classifiers/PKGBUILD
+++ b/python-trove-classifiers/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc="Canonical source for classifiers on PyPI (pypi.org)"
 arch=('any')
 url="https://github.com/pypa/trove-classifiers"
 msys2_references=(
+  "anitya: 88298"
   "pypi:trove-classifiers"
 )
 license=('spdx:Apache-2.0')
diff --git a/python-typing_extensions/PKGBUILD b/python-typing_extensions/PKGBUILD
index 4f00c644..f79ec8f2 100644
--- a/python-typing_extensions/PKGBUILD
+++ b/python-typing_extensions/PKGBUILD
@@ -7,9 +7,6 @@ pkgrel=1
 pkgdesc='Backported and Experimental Type Hints for Python 3.8+'
 arch=(any)
 url=https://github.com/python/typing_extensions
-msys2_references=(
-  "pypi:six"
-)
 msys2_references=(
   'pypi:typing-extensions'
 )
diff --git a/python-urllib3/PKGBUILD b/python-urllib3/PKGBUILD
index 88792dea..2c3df8bb 100644
--- a/python-urllib3/PKGBUILD
+++ b/python-urllib3/PKGBUILD
@@ -7,6 +7,7 @@ pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling and file post support"
 url='https://github.com/urllib3/urllib3'
 msys2_references=(
+  "anitya: 4078"
   "pypi:urllib3"
   "cpe: cpe:/a:python:urllib3"
 )
diff --git a/python-wcwidth/PKGBUILD b/python-wcwidth/PKGBUILD
index 69e87a27..751ea44a 100644
--- a/python-wcwidth/PKGBUILD
+++ b/python-wcwidth/PKGBUILD
@@ -8,6 +8,7 @@ pkgrel=1
 pkgdesc='Measures number of Terminal column cells of wide-character codes'
 url='https://github.com/jquast/wcwidth'
 msys2_references=(
+  "anitya: 88052"
   "pypi:wcwidth"
 )
 arch=('any')
diff --git a/python-wheel/PKGBUILD b/python-wheel/PKGBUILD
index 7ce1f06d..51c85a2c 100644
--- a/python-wheel/PKGBUILD
+++ b/python-wheel/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc="A built-package format for Python"
 arch=('any')
 url="https://pypi.python.org/pypi/wheel"
 msys2_references=(
+  "anitya: 11428"
   "pypi:wheel"
   "cpe: cpe:/a:wheel_project:wheel"
 )
diff --git a/python-yaml/PKGBUILD b/python-yaml/PKGBUILD
index 40ed1ce8..4461e20a 100644
--- a/python-yaml/PKGBUILD
+++ b/python-yaml/PKGBUILD
@@ -10,6 +10,7 @@ pkgdesc='Python bindings for YAML, using fast libYAML library'
 arch=('i686' 'x86_64')
 url='https://pyyaml.org/'
 msys2_references=(
+  "anitya: 4123"
   "pypi:PyYAML"
   "cpe: cpe:/a:pyyaml:pyyaml"
 )
diff --git a/python-zstandard/PKGBUILD b/python-zstandard/PKGBUILD
index e78c80dc..e2e299dc 100644
--- a/python-zstandard/PKGBUILD
+++ b/python-zstandard/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc='Python bindings to the Zstandard (zstd) compression library'
 arch=('i686' 'x86_64')
 url="https://github.com/indygreg/python-zstandard"
 msys2_references=(
+  "anitya: 147738"
   "pypi:zstandard"
 )
 license=('spdx:BSD-3-Clause')
diff --git a/quilt/PKGBUILD b/quilt/PKGBUILD
index a75b9a2d..456ac7e2 100644
--- a/quilt/PKGBUILD
+++ b/quilt/PKGBUILD
@@ -5,6 +5,9 @@ pkgver=0.67
 pkgrel=1
 pkgdesc='Manage large numbers of patches'
 url='https://savannah.nongnu.org/projects/quilt'
+msys2_references=(
+  "anitya: 4143"
+)
 makedepends=('autotools')
 license=('GPL2+')
 arch=('any')
diff --git a/rcs/PKGBUILD b/rcs/PKGBUILD
index 83e8aac9..02e2f6a7 100644
--- a/rcs/PKGBUILD
+++ b/rcs/PKGBUILD
@@ -5,6 +5,9 @@ pkgver=5.10.1
 pkgrel=2
 pkgdesc='Revision Control System: manages multiple revisions of files'
 url='https://www.gnu.org/software/rcs/'
+msys2_references=(
+  "anitya: 4167"
+)
 license=('GPL3')
 arch=('i686' 'x86_64')
 makedepends=('groff' 'ed' 'autotools' 'gcc')
diff --git a/re2c/PKGBUILD b/re2c/PKGBUILD
index a649e300..2adc48b7 100644
--- a/re2c/PKGBUILD
+++ b/re2c/PKGBUILD
@@ -9,6 +9,7 @@ pkgdesc='A tool for generating C-based recognizers from regular expressions'
 url='https://re2c.org/'
 msys2_repository_url="https://github.com/skvadrik/re2c"
 msys2_references=(
+  "anitya: 7664"
   "cpe: cpe:/a:re2c:re2c"
 )
 license=('public domain')
diff --git a/readline/PKGBUILD b/readline/PKGBUILD
index a2fab1dc..39edc640 100644
--- a/readline/PKGBUILD
+++ b/readline/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 url="https://tiswww.case.edu/php/chet/readline/rltop.html"
 msys2_repository_url="https://git.savannah.gnu.org/cgit/readline.git"
 msys2_references=(
+  "anitya: 4173"
   "cpe: cpe:/a:gnu:readline"
 )
 license=('GPL')
diff --git a/rhash/PKGBUILD b/rhash/PKGBUILD
index 61e82df7..6273379f 100644
--- a/rhash/PKGBUILD
+++ b/rhash/PKGBUILD
@@ -7,6 +7,10 @@ pkgrel=1
 pkgdesc='Utility for verifying hash sums of files'
 url='https://sourceforge.net/projects/rhash/'
 msys2_repository_url="https://github.com/rhash/RHash"
+msys2_references=(
+  "anitya: 13843"
+  "cpe: cpe:2.3:a:rhash_project:rhash"
+)
 license=('custom' 'MIT')
 arch=('i686' 'x86_64')
 source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/rhash/RHash/archive/v${pkgver}.tar.gz
diff --git a/rlwrap/PKGBUILD b/rlwrap/PKGBUILD
index cdde3f1c..d94fe6b9 100644
--- a/rlwrap/PKGBUILD
+++ b/rlwrap/PKGBUILD
@@ -9,6 +9,9 @@ arch=('i686' 'x86_64')
 groups=('utilities')
 license=('GPL')
 url='https://github.com/hanslub42/rlwrap'
+msys2_references=(
+  "anitya: 4199"
+)
 depends=('libreadline')
 makedepends=('gcc' 'libreadline-devel' 'autotools')
 install=rlwrap.install
diff --git a/rpcsvc-proto/PKGBUILD b/rpcsvc-proto/PKGBUILD
index 98989571..8337bf73 100644
--- a/rpcsvc-proto/PKGBUILD
+++ b/rpcsvc-proto/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=1
 pkgdesc="rpcsvc protocol definitions from glibc."
 arch=('i686' 'x86_64')
 url="https://github.com/thkukuk/rpcsvc-proto"
+msys2_references=(
+  "anitya: 155452"
+)
 license=('BSD')
 depends=('libintl' 'libiconv')
 makedepends=('autotools' 'gcc' 'gettext-devel' 'libiconv-devel')
diff --git a/rsync/PKGBUILD b/rsync/PKGBUILD
index fa7d6a3f..515893a9 100644
--- a/rsync/PKGBUILD
+++ b/rsync/PKGBUILD
@@ -7,9 +7,12 @@ pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64')
 url="https://rsync.samba.org"
 msys2_references=(
-  "cpe: cpe:/a:andrew_tridgell:rsync"
-  "cpe: cpe:/a:rsync:rsync"
-  "cpe: cpe:/a:samba:rsync"
+  "anitya: 4217"
+  "cpe: cpe:2.3:a:andrew_tridgell:rsync"
+  "cpe: cpe:2.3:a:gnu:rsync"
+  "cpe: cpe:2.3:a:redhat:rsync"
+  "cpe: cpe:2.3:a:rsync:rsync"
+  "cpe: cpe:2.3:a:samba:rsync"
 )
 groups=('net-utils')
 license=('GPL3')
diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD
index 4c5b6ce6..147803d2 100644
--- a/ruby/PKGBUILD
+++ b/ruby/PKGBUILD
@@ -6,6 +6,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url='https://www.ruby-lang.org/en/'
 msys2_references=(
+  "anitya: 4223"
   "cpe: cpe:/a:ruby-lang:ruby"
   "cpe: cpe:/a:yukihiro_matsumoto:ruby"
 )
diff --git a/scons/PKGBUILD b/scons/PKGBUILD
index a907ee76..20ce3783 100644
--- a/scons/PKGBUILD
+++ b/scons/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc="Extensible Python-based build utility"
 arch=('any')
 url="https://scons.org/"
 msys2_references=(
+  "anitya: 4770"
   "pypi:SCons"
 )
 license=('MIT')
diff --git a/screenfetch/PKGBUILD b/screenfetch/PKGBUILD
index 4aaf3130..21977ce9 100644
--- a/screenfetch/PKGBUILD
+++ b/screenfetch/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=2
 pkgdesc="Bash screenshot information tool"
 arch=('any')
 url="https://github.com/KittyKatt/screenFetch"
+msys2_references=(
+  "anitya: 5733"
+)
 license=('GPL')
 depends=('bash')
 optdepends=('curl: screenshot uploading')
diff --git a/sed/PKGBUILD b/sed/PKGBUILD
index 0ca941fb..f35b5dc4 100644
--- a/sed/PKGBUILD
+++ b/sed/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc="GNU stream editor"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/sed"
 msys2_references=(
+  "anitya: 4789"
   "cpe: cpe:/a:gnu:sed"
 )
 license=('GPL3')
diff --git a/serf/PKGBUILD b/serf/PKGBUILD
index 9d26cc0d..36c2e2c5 100644
--- a/serf/PKGBUILD
+++ b/serf/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc="High-performance asynchronous HTTP client library"
 arch=('i686' 'x86_64')
 url="https://serf.apache.org/"
 msys2_references=(
+  "anitya: 1720"
   "cpe: cpe:/a:serf_project:serf"
 )
 license=('Apache')
diff --git a/setconf/PKGBUILD b/setconf/PKGBUILD
index d4f786b1..607fb28d 100644
--- a/setconf/PKGBUILD
+++ b/setconf/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=2
 pkgdesc='Utility to easily change settings in configuration files'
 arch=('any')
 url='https://setconf.roboticoverlords.org/'
+msys2_references=(
+  "anitya: 13746"
+)
 license=('GPL2')
 depends=('python3')
 source=("https://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz")
diff --git a/sgml-common/PKGBUILD b/sgml-common/PKGBUILD
index cc1eef40..bee92ec6 100644
--- a/sgml-common/PKGBUILD
+++ b/sgml-common/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=2
 pkgdesc='Tools for maintaining centralized SGML catalogs.'
 arch=('any')
 url='https://www.docbook.org/xml/'
+msys2_references=(
+  "anitya: 227355"
+)
 license=('GPL')
 install='sgml-common.install'
 depends=('sh')
diff --git a/sharutils/PKGBUILD b/sharutils/PKGBUILD
index 55750d36..f96aac3d 100644
--- a/sharutils/PKGBUILD
+++ b/sharutils/PKGBUILD
@@ -5,6 +5,7 @@ pkgdesc='Makes so-called shell archives out of many files'
 url='https://www.gnu.org/software/sharutils'
 msys2_references=(
   "cpe: cpe:/a:gnu:sharutils"
+  "anitya: 4805"
 )
 license=(GPL3+)
 arch=(i686 x86_64)
diff --git a/socat/PKGBUILD b/socat/PKGBUILD
index ca4ac7b1..d9927916 100644
--- a/socat/PKGBUILD
+++ b/socat/PKGBUILD
@@ -9,7 +9,9 @@ pkgrel=2
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
 msys2_references=(
-  "cpe: cpe:/a:dest-unreach:socat"
+  "anitya: 4848"
+  "cpe: cpe:2.3:a:dest-unreach:socat"
+  "cpe: cpe:2.3:a:socat:socat"
 )
 license=('GPL2')
 arch=('i686' 'x86_64')
diff --git a/sqlite/PKGBUILD b/sqlite/PKGBUILD
index adb4d0be..124c448b 100644
--- a/sqlite/PKGBUILD
+++ b/sqlite/PKGBUILD
@@ -16,6 +16,7 @@ arch=('i686' 'x86_64')
 license=(PublicDomain)
 url="https://www.sqlite.org/"
 msys2_references=(
+  "anitya: 4877"
   "cpe: cpe:/a:sqlite:sqlite"
 )
 depends=('libreadline' 'zlib' 'tcl')
diff --git a/sshpass/PKGBUILD b/sshpass/PKGBUILD
index af55e7e7..961fff35 100644
--- a/sshpass/PKGBUILD
+++ b/sshpass/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=1
 pkgdesc='Fool ssh into accepting an interactive password non-interactively'
 arch=('i686' 'x86_64')
 url='https://sourceforge.net/projects/sshpass/'
+msys2_references=(
+  "anitya: 12961"
+)
 groups=('net-utils')
 license=('GPL')
 depends=('openssh')
diff --git a/stow/PKGBUILD b/stow/PKGBUILD
index f7086c97..49f410bb 100644
--- a/stow/PKGBUILD
+++ b/stow/PKGBUILD
@@ -7,6 +7,9 @@ pkgdesc="GNU Stow is a symlink farm manager which takes distinct packages of sof
 arch=("any")
 license=("GPL")
 url="https://ftp.gnu.org/gnu/stow/"
+msys2_references=(
+  "anitya: 4900"
+)
 depends=("perl")
 makedepends=('autotools')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/${pkgname}-${pkgver}.tar.gz")
diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD
index d00251fd..04a1d917 100644
--- a/subversion/PKGBUILD
+++ b/subversion/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 url="https://subversion.apache.org/"
 msys2_references=(
+  "anitya: 4905"
   "cpe: cpe:/a:apache:subversion"
   "cpe: cpe:/a:subversion:subversion"
 )
diff --git a/swig/PKGBUILD b/swig/PKGBUILD
index 4a6c9689..2615083a 100644
--- a/swig/PKGBUILD
+++ b/swig/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=2
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
 url="https://www.swig.org/"
+msys2_references=(
+  "anitya: 4919"
+)
 license=('custom')
 depends=('zlib' 'libpcre2_8')
 makedepends=('zlib-devel' 'pcre2-devel' 'autotools' 'gcc')
diff --git a/tar/PKGBUILD b/tar/PKGBUILD
index 14094e45..ea9c6fbd 100644
--- a/tar/PKGBUILD
+++ b/tar/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/tar/tar.html"
 msys2_references=(
+  "anitya: 4939"
   "cpe: cpe:/a:gnu:tar"
 )
 license=('GPL3')
diff --git a/task/PKGBUILD b/task/PKGBUILD
index 3d7165f2..1e78c1b9 100644
--- a/task/PKGBUILD
+++ b/task/PKGBUILD
@@ -7,6 +7,9 @@ pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64')
 url="https://taskwarrior.org/"
 msys2_repository_url="https://github.com/GothenburgBitFactory/taskwarrior"
+msys2_references=(
+  "anitya: 5841"
+)
 license=("MIT")
 depends=("gcc-libs"
          "libgnutls"
diff --git a/tcl/PKGBUILD b/tcl/PKGBUILD
index d211ce18..b7f73a99 100644
--- a/tcl/PKGBUILD
+++ b/tcl/PKGBUILD
@@ -9,6 +9,7 @@ pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
 url="https://tcl.sourceforge.io/"
 msys2_references=(
+  "anitya: 4941"
   "cpe: cpe:/a:tcl:tcl"
 )
 license=('custom')
diff --git a/tcsh/PKGBUILD b/tcsh/PKGBUILD
index 570fed71..90ef66ac 100644
--- a/tcsh/PKGBUILD
+++ b/tcsh/PKGBUILD
@@ -7,6 +7,9 @@ epoch=
 pkgdesc="C shell with file name completion and command line editing"
 arch=("i686" "x86_64")
 url="https://www.tcsh.org/"
+msys2_references=(
+  "anitya: 4945"
+)
 license=('BSD')
 groups=()
 depends=('gcc-libs' 'libxcrypt' 'libiconv' 'ncurses')
diff --git a/texinfo/PKGBUILD b/texinfo/PKGBUILD
index 2609b306..6dbe75a4 100644
--- a/texinfo/PKGBUILD
+++ b/texinfo/PKGBUILD
@@ -8,6 +8,7 @@ arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/texinfo/"
 msys2_repository_url="https://git.savannah.gnu.org/cgit/texinfo.git"
 msys2_references=(
+  "anitya: 4958"
   "cpe: cpe:/a:gnu:texinfo"
 )
 license=('spdx:GPL-3.0-or-later')
diff --git a/tftp-hpa/PKGBUILD b/tftp-hpa/PKGBUILD
index 53d7fcc3..e1bc07ea 100644
--- a/tftp-hpa/PKGBUILD
+++ b/tftp-hpa/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=4
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
 url="https://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
+msys2_references=(
+  "anitya: 4962"
+  "cpe: cpe:2.3:a:tftpd-hpa_project:tftpd-hpa"
+)
 license=('BSD')
 depends=('libreadline>=6.0.00')
 makedepends=('libreadline-devel' 'gcc' 'autotools')
diff --git a/tig/PKGBUILD b/tig/PKGBUILD
index c3e251f3..73b6c444 100644
--- a/tig/PKGBUILD
+++ b/tig/PKGBUILD
@@ -8,6 +8,9 @@ depends=('git' 'libreadline' 'ncurses')
 makedepends=('asciidoc' 'xmlto' 'libreadline-devel' 'ncurses-devel' 'libiconv-devel' 'autotools' 'gcc')
 url='https://jonas.github.io/tig/'
 msys2_repository_url="https://github.com/jonas/tig"
+msys2_references=(
+  "anitya: 4969"
+)
 license=('GPL')
 arch=('i686' 'x86_64')
 backup=('etc/tigrc')
diff --git a/time/PKGBUILD b/time/PKGBUILD
index d920e647..b9c04156 100644
--- a/time/PKGBUILD
+++ b/time/PKGBUILD
@@ -5,6 +5,9 @@ pkgver=1.9
 pkgrel=3
 pkgdesc="Utility for monitoring a program's use of system resources"
 url='https://www.gnu.org/directory/time.html'
+msys2_references=(
+  "anitya: 4971"
+)
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('autotools' 'gcc')
diff --git a/tio/PKGBUILD b/tio/PKGBUILD
index 976c08e6..f8b6ad74 100644
--- a/tio/PKGBUILD
+++ b/tio/PKGBUILD
@@ -7,6 +7,9 @@ pkgdesc="A simple TTY terminal I/O application"
 arch=('i686' 'x86_64')
 url="https://tio.github.io/"
 msys2_repository_url="https://github.com/tio/tio"
+msys2_references=(
+  "anitya: 20587"
+)
 license=('spdx:GPL-2.0-or-later')
 depends=('libinih')
 makedepends=('gcc' 'pkgconf' 'python' 'meson' 'ninja' 'libinih-devel')
diff --git a/tmate/PKGBUILD b/tmate/PKGBUILD
index 486f5c9c..474b2720 100644
--- a/tmate/PKGBUILD
+++ b/tmate/PKGBUILD
@@ -5,6 +5,9 @@ pkgdesc="Instant Terminal Sharing http://tmate.io/"
 arch=('i686' 'x86_64')
 license=('ISC')
 url="http://tmate.io/"
+msys2_references=(
+  "anitya: 10245"
+)
 msys2_repository_url="https://github.com/tmate-io/tmate"
 depends=('libevent' 'ncurses' 'libopenssl' 'libssh' 'zlib' 'msgpack-c')
 makedepends=('libevent-devel' 'ncurses-devel' 'openssl-devel' 'libssh-devel' 'zlib-devel' 'msgpack-c-devel' 'autotools' 'gcc' 'git')
diff --git a/tmux/PKGBUILD b/tmux/PKGBUILD
index 336ec687..72e8ce78 100644
--- a/tmux/PKGBUILD
+++ b/tmux/PKGBUILD
@@ -9,6 +9,7 @@ pkgdesc='A terminal multiplexer'
 url='https://tmux.github.io/'
 msys2_repository_url="https://github.com/tmux/tmux"
 msys2_references=(
+  "anitya: 4980"
   "cpe: cpe:/a:nicholas_marriott:tmux"
   "cpe: cpe:/a:tmux_project:tmux"
 )
diff --git a/tree/PKGBUILD b/tree/PKGBUILD
index 4c76dcff..ea8b5ca6 100644
--- a/tree/PKGBUILD
+++ b/tree/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=1
 pkgdesc="A directory listing program displaying a depth indented list of files"
 arch=('i686' 'x86_64')
 url="http://mama.indstate.edu/users/ice/tree/"
+msys2_references=(
+  "anitya: 5006"
+)
 license=('GPL')
 makedepends=('make' 'gcc')
 source=("https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${pkgver}/unix-tree-${pkgver}.tar.gz"
diff --git a/txt2html/PKGBUILD b/txt2html/PKGBUILD
index 1307a4c1..dae2b93b 100644
--- a/txt2html/PKGBUILD
+++ b/txt2html/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=2
 pkgdesc="Convert plain text files to HTML"
 arch=('i686' 'x86_64')
 url="https://txt2html.sourceforge.net/"
+msys2_references=(
+  "anitya: 14410"
+)
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0' 'perl-Getopt-ArgvFile')
 makedepends=('perl-Module-Build')
diff --git a/txt2tags/PKGBUILD b/txt2tags/PKGBUILD
index b6952ed8..4f3a2e4c 100644
--- a/txt2tags/PKGBUILD
+++ b/txt2tags/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc='A text formatting and conversion tool.'
 arch=('any')
 url='https://www.txt2tags.org/'
 msys2_references=(
+  "anitya: 10473"
   "pypi:txt2tags"
 )
 license=('spdx:GPL-2.0-or-later')
diff --git a/tzcode/PKGBUILD b/tzcode/PKGBUILD
index 231d5bbe..7c516eeb 100644
--- a/tzcode/PKGBUILD
+++ b/tzcode/PKGBUILD
@@ -6,6 +6,10 @@ pkgrel=1
 pkgdesc="Sources for time zone and daylight saving time data"
 arch=('i686' 'x86_64')
 url="https://www.iana.org/time-zones"
+msys2_references=(
+  "anitya: 16905"
+  'archlinux: tzdata'
+)
 license=('GPL')
 options=('!emptydirs')
 depends=('coreutils' 'gawk' 'sed')
@@ -22,9 +26,6 @@ sha256sums=('0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3'
             '19fbb941fa73ec1bc4f2caa24ac848e9fbf42ac187621bfef40f4a50d5198cdc'
             'faf73eb5f07c56b019b540005f4262f33927a4ff2acf3752a055e8530decd749')
 validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') # Paul Eggert <eggert@cs.ucla.edu>
-msys2_references=(
-  'archlinux: tzdata'
-)
 
 _timezones=('africa' 'antarctica' 'asia' 'australasia'
            'europe' 'northamerica' 'southamerica'
diff --git a/u-boot-tools/PKGBUILD b/u-boot-tools/PKGBUILD
index 2a73cd98..9396ed89 100644
--- a/u-boot-tools/PKGBUILD
+++ b/u-boot-tools/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc="U-Boot Tools"
 arch=('i686' 'x86_64')
 url="https://github.com/u-boot/u-boot"
 msys2_references=(
+  "anitya: 5022"s
   "cpe: cpe:/a:denx:u-boot"
 )
 license=('GPL2')
diff --git a/ucl/PKGBUILD b/ucl/PKGBUILD
index a13a86f1..7856559b 100644
--- a/ucl/PKGBUILD
+++ b/ucl/PKGBUILD
@@ -14,6 +14,9 @@ arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('autotools' 'gcc')
 url="https://www.oberhumer.com/opensource/ucl/"
+msys2_references=(
+  "anitya: 13446"
+)
 source=("https://www.oberhumer.com/opensource/${_realname}/download/${_realname}-${pkgver}.tar.gz"
         "001-autoconf-compat.patch"
         "002-missing-macros.patch"
diff --git a/unrar/PKGBUILD b/unrar/PKGBUILD
index 782cb2c6..2f78298f 100644
--- a/unrar/PKGBUILD
+++ b/unrar/PKGBUILD
@@ -7,6 +7,7 @@ pkgrel=1
 arch=('i686' 'x86_64')
 url="https://www.rarlab.com/rar_add.htm"
 msys2_references=(
+  "anitya: 13306"
   "cpe: cpe:/a:rarlab:unrar"
 )
 license=('custom')
diff --git a/unzip/PKGBUILD b/unzip/PKGBUILD
index 87dd2a10..18f3dd1b 100644
--- a/unzip/PKGBUILD
+++ b/unzip/PKGBUILD
@@ -7,6 +7,7 @@ pkgdesc="Unpacks .zip archives such as those made by PKZIP"
 arch=('i686' 'x86_64')
 url="http://www.info-zip.org/"
 msys2_references=(
+  "anitya: 8684"
   "cpe: cpe:/a:unzip_project:unzip"
   "cpe: cpe:/a:info-zip:unzip"
 )
diff --git a/upx/PKGBUILD b/upx/PKGBUILD
index be80d30b..a3e3d0aa 100644
--- a/upx/PKGBUILD
+++ b/upx/PKGBUILD
@@ -12,6 +12,7 @@ arch=('i686' 'x86_64')
 url='https://upx.github.io/'
 msys2_repository_url="https://github.com/upx/upx"
 msys2_references=(
+  "anitya: 13737"
   "cpe: cpe:/a:upx_project:upx"
 )
 license=('GPL')
diff --git a/util-linux/PKGBUILD b/util-linux/PKGBUILD
index 07b59cde..8b0bb8df 100644
--- a/util-linux/PKGBUILD
+++ b/util-linux/PKGBUILD
@@ -9,6 +9,7 @@ arch=('i686' 'x86_64')
 license=('GPL3')
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
 msys2_references=(
+  "anitya: 8179"
   "cpe: cpe:/a:andries_brouwer:util-linux"
   "cpe: cpe:/a:kernel:util-linux"
   "cpe: cpe:/a:linux:util-linux"
diff --git a/vifm/PKGBUILD b/vifm/PKGBUILD
index 4a355b37..0db96990 100644
--- a/vifm/PKGBUILD
+++ b/vifm/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=1
 pkgdesc="Ncurses based file manager with vi like keybindings"
 arch=('i686' 'x86_64')
 url="https://vifm.info/"
+msys2_references=(
+  "anitya: 5090"
+)
 license=('GPL')
 depends=('ncurses')
 makedepends=('ncurses-devel' 'autotools' 'gcc')
diff --git a/vim/PKGBUILD b/vim/PKGBUILD
index c393c5e4..dba056fd 100644
--- a/vim/PKGBUILD
+++ b/vim/PKGBUILD
@@ -13,6 +13,7 @@ license=('custom:vim')
 url="https://www.vim.org"
 msys2_repository_url="https://github.com/vim/vim"
 msys2_references=(
+  "anitya: 5092"
   "cpe: cpe:/a:vim:vim"
   "cpe: cpe:/a:vim_development_group:vim"
 )
diff --git a/vimpager/PKGBUILD b/vimpager/PKGBUILD
index eabc8cf4..ed880789 100644
--- a/vimpager/PKGBUILD
+++ b/vimpager/PKGBUILD
@@ -4,6 +4,9 @@ pkgname='vimpager'
 pkgdesc='Use ViM as PAGER'
 url='https://www.vim.org/scripts/script.php?script_id=1723'
 msys2_repository_url="https://github.com/rkitover/vimpager"
+msys2_references=(
+  "anitya: 15644"
+)
 license=(BSD)
 arch=(any)
 pkgver=2.06
diff --git a/w3m/PKGBUILD b/w3m/PKGBUILD
index 2e524946..d2302255 100644
--- a/w3m/PKGBUILD
+++ b/w3m/PKGBUILD
@@ -9,6 +9,7 @@ pkgdesc="w3m is a pager with WWW capability (net-utils)"
 arch=('i686' 'x86_64')
 url="https://w3m.sourceforge.io/"
 msys2_references=(
+  "anitya: 5115"
   "cpe: cpe:/a:w3m:w3m"
 )
 license=('BSD')
diff --git a/wcd/PKGBUILD b/wcd/PKGBUILD
index 0cf8c190..8916c624 100644
--- a/wcd/PKGBUILD
+++ b/wcd/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=1
 pkgdesc='Wherever Change Directory'
 arch=('i686' 'x86_64')
 url='https://waterlan.home.xs4all.nl/'
+msys2_references=(
+  "anitya: 341689"
+)
 license=('GPL')
 depends=('libintl' 'libunistring' 'ncurses')
 groups=('sys-utils')
diff --git a/wget/PKGBUILD b/wget/PKGBUILD
index a2e001a6..2176296f 100644
--- a/wget/PKGBUILD
+++ b/wget/PKGBUILD
@@ -7,7 +7,9 @@ pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/wget/"
 msys2_references=(
-  "cpe: cpe:/a:gnu:wget"
+  "anitya: 5124"
+  "cpe: cpe:2.3:a:gnu:wget"
+  "cpe: cpe:2.3:a:wget:wget"
 )
 license=('GPL3')
 depends=('gcc-libs' 'libiconv' 'libidn2' 'libintl' 'libgpgme' 'libpcre2_8' 'libpsl' 'libuuid' 'libgnutls' 'zlib')
diff --git a/which/PKGBUILD b/which/PKGBUILD
index 1be0e9d1..a6f09840 100644
--- a/which/PKGBUILD
+++ b/which/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=4
 pkgdesc="A utility to show the full path of commands"
 arch=('i686' 'x86_64')
 url="https://savannah.gnu.org/projects/which/"
+msys2_references=(
+  "anitya: 5127"
+)
 license=('GPL3')
 source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         am-1.14.all.patch
diff --git a/xdelta3/PKGBUILD b/xdelta3/PKGBUILD
index 78494481..d77cf49a 100644
--- a/xdelta3/PKGBUILD
+++ b/xdelta3/PKGBUILD
@@ -7,6 +7,9 @@ pkgdesc='Diff utility which works with binary files'
 arch=('x86_64' 'i686')
 url='http://xdelta.org/'
 msys2_repository_url="https://github.com/jmacd/xdelta"
+msys2_references=(
+  "anitya: 5177"
+)
 license=('GPL')
 depends=('xz' 'liblzma')
 makedepends=('liblzma-devel' 'autotools' 'gcc')
diff --git a/xmlto/PKGBUILD b/xmlto/PKGBUILD
index a4a8e373..d4bd2425 100644
--- a/xmlto/PKGBUILD
+++ b/xmlto/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=4
 pkgdesc="Convert xml to many other formats"
 arch=('i686' 'x86_64')
 url="https://pagure.io/xmlto/"
+msys2_references=(
+  "anitya: 13307"
+)
 license=('GPL')
 depends=('libxslt' 'perl-YAML-Syck' 'perl-Test-Pod')
 makedepends=('docbook-xsl' 'autotools' 'gcc')
diff --git a/xorg-util-macros/PKGBUILD b/xorg-util-macros/PKGBUILD
index 505436cb..9a656ab2 100644
--- a/xorg-util-macros/PKGBUILD
+++ b/xorg-util-macros/PKGBUILD
@@ -11,6 +11,9 @@ provides=('util-macros')
 replaces=('util-macros')
 conflicts=('util-macros')
 url="https://xorg.freedesktop.org/"
+msys2_references=(
+  "anitya: 15037"
+)
 depends=()
 makedepends=('autotools')
 source=("https://xorg.freedesktop.org/releases/individual/util/util-macros-${pkgver}.tar.xz")
diff --git a/xorgproto/PKGBUILD b/xorgproto/PKGBUILD
index af6d8d2b..9f79cc48 100644
--- a/xorgproto/PKGBUILD
+++ b/xorgproto/PKGBUILD
@@ -11,6 +11,9 @@ conflicts=('xproto')
 provides=('xproto')
 replaces=('xproto')
 url="https://xorg.freedesktop.org/"
+msys2_references=(
+  "anitya: 17190"
+)
 makedepends=('meson' 'ninja' 'gcc')
 source=("https://xorg.freedesktop.org/archive/individual/proto/${pkgname}-${pkgver}.tar.xz")
 sha256sums=('b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c')
diff --git a/xorriso/PKGBUILD b/xorriso/PKGBUILD
index 074e83a1..e0631356 100644
--- a/xorriso/PKGBUILD
+++ b/xorriso/PKGBUILD
@@ -6,6 +6,9 @@ pkgrel=1
 pkgdesc="xorriso copies files from POSIX filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows manipulation of such filesystems"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/xorriso/"
+msys2_references=(
+  "anitya: 13270"
+)
 license=('spdx:GPL-3.0-or-later')
 depends=('libbz2' 'libreadline' 'zlib' 'libiconv')
 makedepends=('libbz2-devel' 'libreadline-devel' 'zlib-devel' 'autotools' 'gcc' 'libiconv-devel')
diff --git a/xxhash/PKGBUILD b/xxhash/PKGBUILD
index a3f5b891..af9610cd 100644
--- a/xxhash/PKGBUILD
+++ b/xxhash/PKGBUILD
@@ -7,6 +7,9 @@ pkgrel=1
 pkgdesc="Extremely fast non-cryptographic hash algorithm"
 arch=('i686' 'x86_64')
 url="https://github.com/Cyan4973/xxHash"
+msys2_references=(
+  "anitya: 17583"
+)
 license=('BSD')
 makedepends=("gcc"
              "cmake")
diff --git a/xz/PKGBUILD b/xz/PKGBUILD
index 129bbab9..f909cae8 100644
--- a/xz/PKGBUILD
+++ b/xz/PKGBUILD
@@ -8,6 +8,7 @@ arch=('i686' 'x86_64')
 url='https://tukaani.org/xz/'
 msys2_repository_url="https://github.com/tukaani-project/xz/"
 msys2_references=(
+  "anitya: 5277"
   "cpe: cpe:/a:tukaani:xz"
 )
 license=('GPL' 'LGPL' 'custom')
diff --git a/yasm/PKGBUILD b/yasm/PKGBUILD
index d44dc9be..507304aa 100644
--- a/yasm/PKGBUILD
+++ b/yasm/PKGBUILD
@@ -7,8 +7,9 @@ pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, G
 arch=('i686' 'x86_64')
 url="https://www.tortall.net/projects/yasm/"
 msys2_references=(
-  "cpe: cpe:/a:yasm_project:yasm"
-  "cpe: cpe:/a:tortall:yasm"
+  "anitya: 5286"
+  "cpe: cpe:2.3:a:tortall:yasm"
+  "cpe: cpe:2.3:a:yasm_project:yasm"
 )
 license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic')
 options=('staticlibs')
diff --git a/yelp-tools/PKGBUILD b/yelp-tools/PKGBUILD
index 29b77173..98891bad 100644
--- a/yelp-tools/PKGBUILD
+++ b/yelp-tools/PKGBUILD
@@ -7,6 +7,9 @@ pkgdesc="Tools for creating Yelp documentation"
 arch=('any')
 license=('GPL')
 url="https://www.gnome.org"
+msys2_references=(
+  "anitya: 8420"
+)
 depends=("yelp-xsl" "python-lxml" "itstool" "libxml2-python" "docbook-xsl" "python-mallard-ducktype")
 options=('strip' '!libtool' 'staticlibs')
 makedepends=("intltool" "meson")
diff --git a/yelp-xsl/PKGBUILD b/yelp-xsl/PKGBUILD
index 46e56136..19a2eebd 100644
--- a/yelp-xsl/PKGBUILD
+++ b/yelp-xsl/PKGBUILD
@@ -7,6 +7,9 @@ pkgdesc="Stylesheets for Yelp"
 arch=('any')
 license=('GPL')
 url="https://www.gnome.org"
+msys2_references=(
+  "anitya: 13164"
+)
 options=('strip' '!libtool' 'staticlibs')
 makedepends=("libxml2-python" "intltool" "itstool" 'autotools' 'gettext-devel' 'gcc')
 source=(https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/zip/PKGBUILD b/zip/PKGBUILD
index 70e36b6d..f77eb462 100644
--- a/zip/PKGBUILD
+++ b/zip/PKGBUILD
@@ -6,6 +6,11 @@ pkgrel=4
 pkgdesc="Creates PKZIP-compatible .zip files"
 arch=('i686' 'x86_64')
 url="http://www.info-zip.org/Zip.html"
+msys2_references=(
+  "anitya: 10080"
+  "cpe: cpe:2.3:a:info-zip_project:zip"
+  "cpe: cpe:2.3:a:zip_project:zip"
+)
 license=('BSD')
 depends=('libbz2')
 makedepends=('make' 'gcc')
diff --git a/zsh/PKGBUILD b/zsh/PKGBUILD
index 97817236..7356cb0e 100644
--- a/zsh/PKGBUILD
+++ b/zsh/PKGBUILD
@@ -7,8 +7,9 @@ pkgrel=2
 arch=('i686' 'x86_64')
 url='https://www.zsh.org/'
 msys2_references=(
-  "cpe: cpe:/a:zsh_project:zsh"
-  "cpe: cpe:/a:zsh:zsh"
+  "anitya: 5307"
+  "cpe: cpe:2.3:a:zsh:zsh"
+  "cpe: cpe:2.3:a:zsh_project:zsh"
 )
 license=('custom')
 makedepends=('ncurses-devel' 'pcre-devel' 'libiconv-devel' 'libgdbm-devel' 'autotools' 'gcc' 'groff')
diff --git a/zstd/PKGBUILD b/zstd/PKGBUILD
index 7ed2c205..3285ea00 100644
--- a/zstd/PKGBUILD
+++ b/zstd/PKGBUILD
@@ -9,7 +9,8 @@ arch=('i686' 'x86_64')
 url='https://facebook.github.io/zstd/'
 msys2_repository_url="https://github.com/facebook/zstd"
 msys2_references=(
-  "cpe: cpe:/a:facebook:zstandard"
+  "anitya: 12083"
+  "cpe: cpe:2.3:a:facebook:zstandard"
 )
 license=('BSD')
 makedepends=('gcc' 'ninja' 'cmake')