diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
index 981ef57607c..fca0fa08019 100644
--- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
+++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
@@ -3,8 +3,8 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic
| Origin | License | Specs |
| --- | --- | --- |
| Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | abseil-cpp
aide
archivemount
at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
byacc
calamares
catch
checkpolicy
checksec
chrony
cmocka
collectd
colm
conntrack-tools
cpprest
cryptsetup
CUnit
dbus-python
dnf
docbook5-schemas
dos2unix
dpdk
dwarves
ebtables
extra-cmake-modules
fipscheck
fuse-zip
gnu-efi
graphviz
hardening-check
heimdal
hyperscan
hyperv-daemons
ipmitool
ipv6calc
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
leveldb
libatasmart
libburn
libcgroup
libcomps
libdnf
libisoburn
libisofs
libkcapi
libpwquality
libsemanage
libssh
libstoragemgmt
libxcrypt
libzip
mailcap
mcstrans
mokutil
mozjs60
nss_wrapper
oath-toolkit
open-vm-tools
opensc
openssl
p11-kit
p7zip
pam_wrapper
pcsc-lite
pcsc-lite-ccid
perl-App-cpanminus
perl-CPAN-DistnameInfo
perl-CPAN-Meta-Check
perl-Fedora-VSP
perl-File-pushd
perl-generators
perl-JSON
perl-local-lib
perl-Module-CPANfile
perl-Parse-PMFile
perl-String-ShellQuote
policycoreutils
pugixml
pwgen
pyelftools
python-google-auth
python-jwt
python-kubernetes
python-pexpect
python-ptyprocess
python-pywbem
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
ragel
rdma-core
re2
secilc
selinux-policy
setools
sgml-common
socket_wrapper
softhsm
sos
squashfs-tools
tini
uclibc-ng
uid_wrapper
uuid
websocketpp
words
xmlstarlet
yajl
yaml-cpp
yasm
zipper |
-| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
bazel
blobfuse
bmon
bond
bpftrace
cassandra-cpp-driver
ccache
check-restart
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
cockpit
coredns-1.7.0
coredns-1.8.0
distroless-packages
doxygen
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
helm
installkernel
ivykis
jsonbuilder
kubernetes-1.18.14
kubernetes-1.18.17
kubernetes-1.19.7
kubernetes-1.19.9
kubernetes-1.20.2
kubernetes-1.20.5
libacvp
libconfini
libconfuse
libdivsufsort
libiothsm-std
libmaxminddb
libuv
libxml++
lld
lsb-release
lttng-consume
mariner-release
mariner-repos
mariner-rpm-macros
mm-common
moby-buildx
moby-cli
moby-containerd
moby-engine
moby-runc
msgpack
nlohmann-json
nmap
node-problem-detector
ntopng
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates
prebuilt-ca-certificates-base
python-cachetools
python-cherrypy
python-execnet
python-logutils
python-nocasedict
python-pecan
python-remoto
python-repoze-lru
python-routes
python-rsa
python-sphinxcontrib-websupport
python-yamlloader
qemu-kvm
rocksdb
rubygem-addressable
rubygem-async
rubygem-async-http
rubygem-async-io
rubygem-async-pool
rubygem-aws-eventstream
rubygem-aws-partitions
rubygem-aws-sdk-core
rubygem-aws-sdk-kms
rubygem-aws-sdk-s3
rubygem-aws-sdk-sqs
rubygem-aws-sigv4
rubygem-concurrent-ruby
rubygem-console
rubygem-cool.io
rubygem-digest-crc
rubygem-elasticsearch
rubygem-elasticsearch-api
rubygem-elasticsearch-transport
rubygem-excon
rubygem-faraday
rubygem-ffi
rubygem-fiber-local
rubygem-fluent-config-regexp-type
rubygem-fluent-logger
rubygem-fluent-plugin-elasticsearch
rubygem-fluent-plugin-kafka
rubygem-fluent-plugin-prometheus
rubygem-fluent-plugin-prometheus_pushgateway
rubygem-fluent-plugin-record-modifier
rubygem-fluent-plugin-rewrite-tag-filter
rubygem-fluent-plugin-s3
rubygem-fluent-plugin-systemd
rubygem-fluent-plugin-td
rubygem-fluent-plugin-webhdfs
rubygem-fluentd
rubygem-hirb
rubygem-http_parser.rb
rubygem-httpclient
rubygem-jmespath
rubygem-ltsv
rubygem-mini_portile2
rubygem-msgpack
rubygem-multi_json
rubygem-multipart-post
rubygem-nio4r
rubygem-nokogiri
rubygem-oj
rubygem-parallel
rubygem-prometheus-client
rubygem-protocol-hpack
rubygem-protocol-http
rubygem-protocol-http1
rubygem-protocol-http2
rubygem-public_suffix
rubygem-quantile
rubygem-rake
rubygem-rdkafka
rubygem-ruby-kafka
rubygem-ruby-progressbar
rubygem-ruby2_keywords
rubygem-rubyzip
rubygem-serverengine
rubygem-sigdump
rubygem-strptime
rubygem-systemd-journal
rubygem-td
rubygem-td-client
rubygem-td-logger
rubygem-timers
rubygem-tzinfo
rubygem-tzinfo-data
rubygem-webhdfs
rubygem-yajl-ruby
rubygem-zip-zip
shim
shim-unsigned
shim-unsigned-aarch64
shim-unsigned-x64
span-lite
swupdate
tinyxml2
toml11
tracelogging
vala
verity-read-only-root
vnstat
zstd |
-| Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
ant
ant-contrib
apparmor
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
bridge-utils
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
ca-certificates
cairo
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
ctags
curl
cyrus-sasl
Cython
dbus
dbus-glib
dejagnu
device-mapper-multipath
dhcp
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
ethtool
expat
expect
fcgi
file
filesystem
findutils
finger
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
glib
glib-networking
glibc
glibmm24
glide
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.16
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
grub2-efi-binary-signed
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
ipmitool
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jna
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-headers
kernel-hyperv
kernel-signed
kexec-tools
keyutils
kmod
krb5
lapack
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libev
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgsystem
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++20
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lua
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
numpy
nvme-cli
oniguruma
OpenIPMI
openjdk8
openjdk8_aarch64
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
pcre
perl
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
pixman
pkg-config
polkit
popt
postgresql
powershell
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pygobject3
pyOpenSSL
PyPAM
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-backports-ssl_match_hostname
python-bcrypt
python-boto3
python-botocore
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-enum34
python-futures
python-gevent
python-greenlet
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-ipaddress
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-m2r
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-pip
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-pyvmomi
python-requests
python-setuptools
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx
python-sphinx-theme-alabaster
python-sqlalchemy
python-twisted
python-typing
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-interface
python2
python3
pytz
PyYAML
rapidjson
readline
redis
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rubygem-bundler
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd
systemd-bootstrap
systemtap
tar
tboot
tcl
tcp_wrappers
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-tools
tpm2-tss
traceroute
tree
trousers
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
wget
which
wpa_supplicant
xerces-c
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh |
+| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
bazel
blobfuse
bmon
bond
bpftrace
cassandra-cpp-driver
ccache
check-restart
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
cockpit
coredns-1.7.0
coredns-1.8.0
coredns-1.8.4
distroless-packages
doxygen
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
helm
installkernel
ivykis
jsonbuilder
kubernetes-1.18.14
kubernetes-1.18.17
kubernetes-1.19.7
kubernetes-1.19.9
kubernetes-1.20.2
kubernetes-1.20.5
libacvp
libconfini
libconfuse
libdivsufsort
libiothsm-std
libmaxminddb
libuv
libxml++
lld
lsb-release
lttng-consume
mariner-release
mariner-repos
mariner-rpm-macros
mm-common
moby-buildx
moby-cli
moby-containerd
moby-engine
moby-runc
msgpack
nlohmann-json
nmap
node-problem-detector
ntopng
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates
prebuilt-ca-certificates-base
python-cachetools
python-cherrypy
python-execnet
python-logutils
python-nocasedict
python-pecan
python-remoto
python-repoze-lru
python-routes
python-rsa
python-sphinxcontrib-websupport
python-yamlloader
qemu-kvm
rocksdb
rubygem-addressable
rubygem-async
rubygem-async-http
rubygem-async-io
rubygem-async-pool
rubygem-aws-eventstream
rubygem-aws-partitions
rubygem-aws-sdk-core
rubygem-aws-sdk-kms
rubygem-aws-sdk-s3
rubygem-aws-sdk-sqs
rubygem-aws-sigv4
rubygem-concurrent-ruby
rubygem-console
rubygem-cool.io
rubygem-digest-crc
rubygem-elasticsearch
rubygem-elasticsearch-api
rubygem-elasticsearch-transport
rubygem-excon
rubygem-faraday
rubygem-ffi
rubygem-fiber-local
rubygem-fluent-config-regexp-type
rubygem-fluent-logger
rubygem-fluent-plugin-elasticsearch
rubygem-fluent-plugin-kafka
rubygem-fluent-plugin-prometheus
rubygem-fluent-plugin-prometheus_pushgateway
rubygem-fluent-plugin-record-modifier
rubygem-fluent-plugin-rewrite-tag-filter
rubygem-fluent-plugin-s3
rubygem-fluent-plugin-systemd
rubygem-fluent-plugin-td
rubygem-fluent-plugin-webhdfs
rubygem-fluentd
rubygem-hirb
rubygem-http_parser.rb
rubygem-httpclient
rubygem-jmespath
rubygem-ltsv
rubygem-mini_portile2
rubygem-msgpack
rubygem-multi_json
rubygem-multipart-post
rubygem-nio4r
rubygem-nokogiri
rubygem-oj
rubygem-parallel
rubygem-prometheus-client
rubygem-protocol-hpack
rubygem-protocol-http
rubygem-protocol-http1
rubygem-protocol-http2
rubygem-public_suffix
rubygem-quantile
rubygem-rake
rubygem-rdkafka
rubygem-ruby-kafka
rubygem-ruby-progressbar
rubygem-ruby2_keywords
rubygem-rubyzip
rubygem-serverengine
rubygem-sigdump
rubygem-strptime
rubygem-systemd-journal
rubygem-td
rubygem-td-client
rubygem-td-logger
rubygem-timers
rubygem-tzinfo
rubygem-tzinfo-data
rubygem-webhdfs
rubygem-yajl-ruby
rubygem-zip-zip
shim
shim-unsigned
shim-unsigned-aarch64
shim-unsigned-x64
span-lite
swupdate
tinyxml2
toml11
tracelogging
vala
verity-read-only-root
vnstat
zstd |
+| Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
ant
ant-contrib
apparmor
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
bridge-utils
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
ca-certificates
cairo
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
ctags
curl
cyrus-sasl
Cython
dbus
dbus-glib
dejagnu
device-mapper-multipath
dhcp
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.5.0
ethtool
expat
expect
fcgi
file
filesystem
findutils
finger
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
glib
glib-networking
glibc
glibmm24
glide
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.16
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
grub2-efi-binary-signed
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
ipmitool
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jna
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-headers
kernel-hyperv
kernel-signed
kexec-tools
keyutils
kmod
krb5
lapack
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libev
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgsystem
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++20
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lua
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
numpy
nvme-cli
oniguruma
OpenIPMI
openjdk8
openjdk8_aarch64
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
pcre
perl
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
pixman
pkg-config
polkit
popt
postgresql
powershell
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pygobject3
pyOpenSSL
PyPAM
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-backports-ssl_match_hostname
python-bcrypt
python-boto3
python-botocore
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-enum34
python-futures
python-gevent
python-greenlet
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-ipaddress
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-m2r
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-pip
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-pyvmomi
python-requests
python-setuptools
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx
python-sphinx-theme-alabaster
python-sqlalchemy
python-twisted
python-typing
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-interface
python2
python3
pytz
PyYAML
rapidjson
readline
redis
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rubygem-bundler
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd
systemd-bootstrap
systemtap
tar
tboot
tcl
tcp_wrappers
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-tools
tpm2-tss
traceroute
tree
trousers
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
wget
which
wpa_supplicant
xerces-c
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh |
| OpenMamba | [Openmamba GPLv2 License](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt) | bash-completion |
| TreasureData | [ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | td-agent |
| Nvidia | [ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | libnvidia-container
nvidia-container-runtime
nvidia-container-toolkit
nvidia-docker2 |
diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json
index 2aed2297e5a..16be7b91337 100644
--- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json
+++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json
@@ -161,6 +161,7 @@
"cockpit",
"coredns-1.7.0",
"coredns-1.8.0",
+ "coredns-1.8.4",
"distroless-packages",
"doxygen",
"dtc",
@@ -403,6 +404,7 @@
"elfutils",
"erlang",
"etcd-3.4.13",
+ "etcd-3.5.0",
"ethtool",
"expat",
"expect",
diff --git a/SPECS/coredns/coredns-1.8.4.signatures.json b/SPECS/coredns/coredns-1.8.4.signatures.json
new file mode 100644
index 00000000000..e464b55631e
--- /dev/null
+++ b/SPECS/coredns/coredns-1.8.4.signatures.json
@@ -0,0 +1,6 @@
+{
+ "Signatures": {
+ "coredns-1.8.4-vendor.tar.gz": "ef3f29b6604ab42793ef09ad7dbe49edce9fd81729995ec18f42335aa733f42e",
+ "coredns-1.8.4.tar.gz": "d85c8c52f4d38ab1915eb60523b4e5241ffa19d20e4f7bbce8b0f4fb59171f2a"
+ }
+}
\ No newline at end of file
diff --git a/SPECS/coredns/coredns-1.8.4.spec b/SPECS/coredns/coredns-1.8.4.spec
new file mode 100644
index 00000000000..7ccb85cc7a2
--- /dev/null
+++ b/SPECS/coredns/coredns-1.8.4.spec
@@ -0,0 +1,78 @@
+%global debug_package %{nil}
+
+Summary: Fast and flexible DNS server
+Name: coredns
+Version: 1.8.4
+Release: 1%{?dist}
+License: Apache License 2.0
+Vendor: Microsoft Corporation
+Distribution: Mariner
+Group: System Environment/Libraries
+URL: https://github.com/coredns/coredns
+#Source0: https://github.com/coredns/coredns/archive/v%%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+# Below is a manually created tarball, no download link.
+# We're using pre-populated Go modules from this tarball, since network is disabled during build time.
+# How to re-build this file:
+# 1. wget https://github.com/coredns/coredns/archive/v%%{version}.tar.gz -O %%{name}-%%{version}.tar.gz
+# 2. tar -xf %%{name}-%%{version}.tar.gz
+# 3. cd %%{name}-%%{version}
+# 4. go mod vendor
+# 5. tar --sort=name \
+# --mtime="2021-04-26 00:00Z" \
+# --owner=0 --group=0 --numeric-owner \
+# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+# -cf %%{name}-%%{version}-vendor.tar.gz vendor
+#
+# NOTES:
+# - You require GNU tar version 1.28+.
+# - The additional options enable generation of a tarball with the same hash every time regardless of the environment.
+# See: https://reproducible-builds.org/docs/archives/
+# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
+Source1: %{name}-%{version}-vendor.tar.gz
+Patch0: makefile-buildoption-commitnb.patch
+
+BuildRequires: golang >= 1.12
+
+%description
+CoreDNS is a fast and flexible DNS server.
+
+%prep
+%autosetup -p1
+
+%build
+# create vendor folder from the vendor tarball and set vendor mode
+tar -xf %{SOURCE1} --no-same-owner
+export BUILDOPTS="-mod=vendor -v"
+# set commit number that correspond to the github tag for that version
+export GITCOMMIT="053c4d5ca1772517746a854e87ffa971249df14b"
+make
+
+%install
+install -m 755 -d %{buildroot}%{_bindir}
+install -p -m 755 -t %{buildroot}%{_bindir} %{name}
+
+%clean
+rm -rf %{buildroot}/*
+
+%files
+%defattr(-,root,root)
+%license LICENSE
+%{_bindir}/%{name}
+
+%changelog
+* Tue Dec 28 2021 Nicolas Guibourge - 1.8.4-1
+- Update to version "1.8.4".
+
+* Tue Nov 02 2021 Thomas Crain - 1.8.0-2
+- Increment release for force republishing using golang 1.16.9
+
+* Fri Aug 20 2021 CBL-Mariner Service Account - 1.8.0-1
+- Update to version "1.8.0".
+
+* Tue Jun 08 2021 Henry Beberman 1.7.0-3
+- Increment release to force republishing using golang 1.15.13.
+* Mon Apr 26 2021 Nicolas Guibourge 1.7.0-2
+- Increment release to force republishing using golang 1.15.11.
+* Wed Jan 20 2021 Nicolas Guibourge 1.7.0-1
+- Original version for CBL-Mariner.
diff --git a/SPECS/etcd/etcd-3.5.0.signatures.json b/SPECS/etcd/etcd-3.5.0.signatures.json
new file mode 100644
index 00000000000..6afba5b4a16
--- /dev/null
+++ b/SPECS/etcd/etcd-3.5.0.signatures.json
@@ -0,0 +1,7 @@
+{
+ "Signatures": {
+ "etcd-3.5.0-vendor.tar.gz": "3561ca71f2a29f405115088ca355399b23a6c63d47c398e621322bc98f7b28b9",
+ "etcd-3.5.0.tar.gz": "f30f68c52a7547af08be7d166884c94885ea8a593c1c1e814c89b24148ee1921",
+ "etcd.service": "4550a4967ba35670051cbfd9b4edf1fc57c0f1d7a07e51f88351ac44c76d8066"
+ }
+}
\ No newline at end of file
diff --git a/SPECS/etcd/etcd-3.5.0.spec b/SPECS/etcd/etcd-3.5.0.spec
new file mode 100644
index 00000000000..acc5c84db4b
--- /dev/null
+++ b/SPECS/etcd/etcd-3.5.0.spec
@@ -0,0 +1,226 @@
+Summary: A highly-available key value store for shared configuration
+Name: etcd
+Version: 3.5.0
+Release: 1%{?dist}
+License: ASL 2.0
+Vendor: Microsoft Corporation
+Distribution: Mariner
+Group: System Environment/Security
+URL: https://github.com/etcd-io/etcd/
+Source0: https://github.com/etcd-io/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1: etcd.service
+# Below is a manually created tarball, no download link.
+# We're using vendored Go modules from this tarball, since network is disabled during build time.
+#
+# How to re-build this file:
+# 1. either download etcd source tarball or git clone etcd repo from github and checkout relevant tag
+# 2. execute 'go mod vendor' in 'server', 'etcdctl' and 'etcdutl' folders
+# and create tarball containting 'vendor' folder for each
+# (naming rule for tarball is 'vendor-[component].tar.gz', e.g.: 'vendor-server.tar.gz')
+# 3. create 'vendor' tarballs for dump tools
+# a. cd 'etcd-dump-db' folder, create 'go.mod' file ('go mod init go.etcd.io/etcd/tools/etcd-dump-db/v3')
+# b. populate 'go.mod' file ('go mod tidy')
+# c. add replace rules in 'go.mod' making sure that each etcd dependency is taken locally, e.g.:
+# replace (
+# go.etcd.io/etcd/api/v3 => ../../api
+# go.etcd.io/etcd/server/v3 => ../../server
+# )
+# d. create vendor folder ('go mod vendor')
+# e. create tarball containing 'vendor' folder and 'go.mod' and 'go.sum' files
+# (same naming rules than described above)
+# f. repeat above operations for 'etcd-dump-logs' folder
+# 4. create 'etcd-%{version}-vendor.tar.gz' tarball containing all tarballs created above
+#
+# NOTES:
+# - You require GNU tar version 1.28+.
+# - The additional options enable generation of a tarball with the same hash every time regardless of the environment.
+# See: https://reproducible-builds.org/docs/archives/
+# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
+Source2: %{name}-%{version}-vendor.tar.gz
+BuildRequires: golang >= 1.16
+
+%description
+A highly-available key value store for shared configuration and service discovery.
+
+%package tools
+Summary: Diagnostic tools for etcd
+Group: System Environment/Security
+Requires: %{name} = %{version}-%{release}
+
+%description tools
+A highly-available key value store for shared configuration and service discovery.
+The etcd-tools package contains the etcd-dump-db and etcd-dump-logs diagnostic
+tools.
+
+%prep
+%setup -q
+tar --no-same-owner -xf %{SOURCE2}
+
+%build
+%define ETCD_OUT_DIR %{_builddir}/%{name}-%{version}/bin
+mkdir -p %{ETCD_OUT_DIR}
+
+# build etcd
+for component in server etcdctl etcdutl; do
+ pushd $component
+ tar --no-same-owner -xf %{_builddir}/%{name}-%{version}/vendor-$component.tar.gz
+ go build \
+ -o %{ETCD_OUT_DIR} \
+ -ldflags=-X=go.etcd.io/etcd/api/v3/version.GitSHA=v%{version}
+ popd
+done
+
+# build tools
+%define ETCD_TOOLS_OUT_DIR %{_builddir}/%{name}-%{version}/bin/tools
+mkdir -p %{ETCD_TOOLS_OUT_DIR}
+
+for component in etcd-dump-db etcd-dump-logs; do
+ pushd tools/$component
+ tar --no-same-owner -xf %{_builddir}/%{name}-%{version}/vendor-$component.tar.gz
+ go build \
+ -o %{ETCD_TOOLS_OUT_DIR}
+ popd
+done
+
+%install
+install -vdm755 %{buildroot}%{_bindir}
+install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}
+install -vdm755 %{buildroot}/lib/systemd/system
+install -vdm 0755 %{buildroot}%{_sysconfdir}/etcd
+install -vpm 0755 -T etcd.conf.yml.sample %{buildroot}%{_sysconfdir}/etcd/etcd-default-conf.yml
+
+chown -R root:root %{buildroot}%{_bindir}
+chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}
+
+# note that 'server' should be renamed 'etcd'
+mv %{_builddir}/%{name}-%{version}/bin/server %{buildroot}%{_bindir}/etcd
+mv %{_builddir}/%{name}-%{version}/bin/etcdctl %{buildroot}%{_bindir}/
+mv %{_builddir}/%{name}-%{version}/bin/etcdutl %{buildroot}%{_bindir}/
+
+mv %{_builddir}/%{name}-%{version}/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/
+mv %{_builddir}/%{name}-%{version}/etcdctl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdctl.md
+mv %{_builddir}/%{name}-%{version}/etcdctl/READMEv2.md %{buildroot}/%{_docdir}/%{name}-%{version}/READMEv2-etcdctl.md
+mv %{_builddir}/%{name}-%{version}/etcdutl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdutl.md
+
+# tools
+install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}-tools
+chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}-tools
+
+mv %{_builddir}/%{name}-%{version}/bin/tools/etcd-dump-logs %{buildroot}%{_bindir}/
+mv %{_builddir}/%{name}-%{version}/bin/tools/etcd-dump-db %{buildroot}%{_bindir}/
+
+mv %{_builddir}/%{name}-%{version}/tools/etcd-dump-db/README.md %{buildroot}/%{_docdir}/%{name}-%{version}-tools/README-etcd-dump-db.md
+mv %{_builddir}/%{name}-%{version}/tools/etcd-dump-logs/README.md %{buildroot}/%{_docdir}/%{name}-%{version}-tools/README-etcd-dump-logs.md
+
+install -vdm755 %{buildroot}/lib/systemd/system-preset
+echo "disable etcd.service" > %{buildroot}/lib/systemd/system-preset/50-etcd.preset
+
+cp %{SOURCE1} %{buildroot}/lib/systemd/system
+install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+rm -rf %{buildroot}/*
+
+%files
+%license LICENSE
+%{_bindir}/etcd
+%{_bindir}/etcdctl
+%{_bindir}/etcdutl
+/%{_docdir}/%{name}-%{version}/*
+/lib/systemd/system/etcd.service
+/lib/systemd/system-preset/50-etcd.preset
+%dir %{_sharedstatedir}/etcd
+%config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml
+
+%files tools
+%license LICENSE
+%{_bindir}/etcd-dump-*
+/%{_docdir}/%{name}-%{version}-tools/*
+
+%changelog
+* Tue Dec 28 2021 Nicolas Guibourge - 3.5.0-1
+- Upgrade to version 3.5.0
+
+* Tue Nov 02 2021 Thomas Crain - 3.4.13-6
+- Increment release for force republishing using golang 1.16.9
+
+* Fri Aug 06 2021 Nicolas Guibourge 3.4.13-5
+- Increment release to force republishing using golang 1.16.7.
+
+* Thu Aug 05 2021 Tom Fay - 3.4.13-4
+- Add etcd-tools package.
+
+* Tue Jun 08 2021 Henry Beberman 3.4.13-3
+- Increment release to force republishing using golang 1.15.13.
+
+* Mon Apr 26 2021 Nicolas Guibourge 3.4.13-2
+- Increment release to force republishing using golang 1.15.11.
+
+* Mon Jan 25 2021 Nicolas Guibourge 3.4.13-1
+- Update to version 3.4.13.
+
+* Thu Dec 10 2020 Andrew Phelps 3.3.25-2
+- Increment release to force republishing using golang 1.15.
+
+* Thu Sep 03 2020 Joe Schmitt 3.3.25-1
+- Update to version 3.3.25 which fixes CVE-2020-15106, CVE-2020-15112, CVE-2020-15114, and CVE-2020-15115.
+
+* Sat May 09 2020 Nick Samson 3.3.11-2
+- Added %%license line automatically
+
+* Thu May 07 2020 Nicolas Ontiveros 3.3.11-1
+- Upgrade to version 3.3.11, which fixes CVE-2018-16886.
+- Update summary.
+
+* Thu Apr 30 2020 Emre Girgin 3.3.9-4
+- Renaming go to golang
+
+* Wed Apr 08 2020 Pawel Winogrodzki 3.3.9-3
+- Fixed "Source0" tag.
+- License verified and "License" tag updated.
+- Removed "%%define sha1".
+
+* Tue Sep 03 2019 Mateusz Malisz 3.3.9-2
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Fri Sep 21 2018 Sujay G 3.3.9-1
+- Bump etcd version to 3.3.9
+
+* Mon Sep 18 2017 Alexey Makhalov 3.1.5-4
+- Remove shadow requires
+
+* Sun Aug 27 2017 Vinay Kulkarni 3.1.5-3
+- File based configuration for etcd service.
+
+* Wed May 31 2017 Harish Udaiya Kumar 3.1.5-2
+- Provide preset file to disable service by default
+
+* Thu Apr 06 2017 Anish Swaminathan 3.1.5-1
+- Upgraded to version 3.1.5, build from sources
+
+* Fri Sep 2 2016 Xiaolin Li 3.0.9-1
+- Upgraded to version 3.0.9
+
+* Fri Jun 24 2016 Xiaolin Li 2.3.7-1
+- Upgraded to version 2.3.7
+
+* Wed May 25 2016 Nick Shi 2.2.5-3
+- Changing etcd service type from simple to notify
+
+* Tue May 24 2016 Priyesh Padmavilasom 2.2.5-2
+- GA - Bump release of all rpms
+
+* Tue Feb 23 2016 Harish Udaiya Kumar 2.2.5-1
+- Upgraded to version 2.2.5
+
+* Tue Jul 28 2015 Divya Thaluru 2.1.1-2
+- Adding etcd service file
+
+* Tue Jul 21 2015 Vinay Kulkarni 2.1.1-1
+- Update to version etcd v2.1.1
+
+* Tue Mar 10 2015 Divya Thaluru 2.0.4-1
+- Initial build. First version
diff --git a/cgmanifest.json b/cgmanifest.json
index a483f0b2f48..0af892df828 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -840,6 +840,16 @@
}
}
},
+ {
+ "component": {
+ "type": "other",
+ "other": {
+ "name": "coredns",
+ "version": "1.8.4",
+ "downloadUrl": "https://github.com/coredns/coredns/archive/v1.8.4.tar.gz"
+ }
+ }
+ },
{
"component": {
"type": "other",
@@ -1396,7 +1406,17 @@
"other": {
"name": "etcd",
"version": "3.4.13",
- "downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.4.13.tar.gz"
+ "downloadUrl": "https://github.com/etcd-io/etcd/archive/refs/tags/v3.4.13.tar.gz"
+ }
+ }
+ },
+ {
+ "component": {
+ "type": "other",
+ "other": {
+ "name": "etcd",
+ "version": "3.5.0",
+ "downloadUrl": "https://github.com/etcd-io/etcd/archive/refs/tags/v3.5.0.tar.gz"
}
}
},