From cec60c587b32b5d856dfcf0cfa6aac4d816f0d2f Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Fri, 23 Apr 2021 16:02:33 -0400 Subject: [PATCH 01/83] added first part of libnvidia-container --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 1 + SPECS/LICENSES-AND-NOTICES/data/licenses.json | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 5fb19903fe7..5b821bf8617 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -7,4 +7,5 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | 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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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
runc
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 | [TreasureData ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | td-agent | +| Nvidia | [Nvidia ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | libnvidia-container | | Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 4c8af6736e5..977c976a4ee 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -771,6 +771,13 @@ "td-agent" ] }, + { + "origin": "Nvidia", + "license": "[Nvidia ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", + "specs": [ + "libnvidia-container" + ] + }, { "origin": "Magnus Edenhill Open Source", "license": "[Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING)", From 65ac6013d1f1624d720211e1d885c27ddeb97bb8 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Fri, 23 Apr 2021 16:36:53 -0400 Subject: [PATCH 02/83] added the content of libnvidia-container --- SPECS/libnvidia-container/common.mk.patch | 12 + .../libnvidia-container.signatures.json | 6 + .../libnvidia-container.spec | 264 ++++++++++++++++++ SPECS/libnvidia-container/libtirpc.patch | 13 + .../libnvidia-container/nvidia-modprobe.patch | 29 ++ cgmanifest.json | 20 ++ 6 files changed, 344 insertions(+) create mode 100644 SPECS/libnvidia-container/common.mk.patch create mode 100644 SPECS/libnvidia-container/libnvidia-container.signatures.json create mode 100644 SPECS/libnvidia-container/libnvidia-container.spec create mode 100644 SPECS/libnvidia-container/libtirpc.patch create mode 100644 SPECS/libnvidia-container/nvidia-modprobe.patch diff --git a/SPECS/libnvidia-container/common.mk.patch b/SPECS/libnvidia-container/common.mk.patch new file mode 100644 index 00000000000..55570a4bfcf --- /dev/null +++ b/SPECS/libnvidia-container/common.mk.patch @@ -0,0 +1,12 @@ +diff -urN libnvidia-container-1.3.3-orig/mk/common.mk libnvidia-container-1.3.3/mk/common.mk +--- libnvidia-container-1.3.3-orig/mk/common.mk 2021-02-05 05:26:41.000000000 -0800 ++++ libnvidia-container-1.3.3/mk/common.mk 2021-04-16 23:53:31.110955932 -0700 +@@ -22,7 +22,7 @@ + UID := $(shell id -u) + GID := $(shell id -g) + DATE := $(shell date -u --iso-8601=minutes) +-REVISION := $(shell git rev-parse HEAD) ++REVISION = 0 + COMPILER := $(realpath $(shell which $(CC))) + PLATFORM ?= $(shell uname -m) + diff --git a/SPECS/libnvidia-container/libnvidia-container.signatures.json b/SPECS/libnvidia-container/libnvidia-container.signatures.json new file mode 100644 index 00000000000..c9f052b80d8 --- /dev/null +++ b/SPECS/libnvidia-container/libnvidia-container.signatures.json @@ -0,0 +1,6 @@ +{ + "Signatures": { + "libnvidia-container-1.3.3.tar.gz": "99ff64baeb3b7c3fa9938bd91637deda8982146f166f52e99fabe956aa04eb53", + "nvidia-modprobe-450.57.tar.gz": "396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1" + } +} \ No newline at end of file diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec new file mode 100644 index 00000000000..b3f09130b4c --- /dev/null +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -0,0 +1,264 @@ +%define modprobe_version 450.57 +%define _major 1 + +Summary: NVIDIA container runtime library +Name: libnvidia-container +Version: 1.3.3 +License: BSD-3-Clause AND Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND GPL-2.0-only +URL: https://github.com/NVIDIA/libnvidia-container +Release: 2%{?dist} +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +#Source1: https://github.com/NVIDIA/nvidia-modprobe/archive/%%{modprobe_version}.tar.gz +Source1: nvidia-modprobe-%{modprobe_version}.tar.gz +Patch0: common.mk.patch +Patch1: libtirpc.patch +Patch2: nvidia-modprobe.patch + +BuildRequires: make +BuildRequires: which +BuildRequires: rpcsvc-proto +BuildRequires: libseccomp-devel +BuildRequires: libtirpc-devel + +%description +The nvidia-container library provides an interface to configure GNU/Linux +containers leveraging NVIDIA hardware. The implementation relies on several +kernel subsystems and is designed to be agnostic of the container runtime. + +%prep +%setup +%patch0 -p1 +%patch1 -p1 + +mkdir -p deps/src/nvidia-modprobe-%{modprobe_version} +tar -C deps/src/nvidia-modprobe-%{modprobe_version} --strip-components=1 -xzf %{SOURCE1} +%patch2 -p1 -d deps/src/nvidia-modprobe-%{modprobe_version} +touch deps/src/nvidia-modprobe-%{modprobe_version}/.download_stamp + + +%build +%make_build WITH_LIBELF=yes + +%install +DESTDIR=%{buildroot} %{__make} install prefix=%{_prefix} exec_prefix=%{_exec_prefix} bindir=%{_bindir} libdir=%{_libdir} includedir=%{_includedir} docdir=%{_licensedir} WITH_LIBELF=yes + +%package -n %{name}%{_major} +Summary: NVIDIA container runtime library +%description -n %{name}%{_major} +The nvidia-container library provides an interface to configure GNU/Linux +containers leveraging NVIDIA hardware. The implementation relies on several +kernel subsystems and is designed to be agnostic of the container runtime. + +This package requires the NVIDIA driver (>= 340.29) to be installed separately. +%post -n %{name}%{_major} -p /sbin/ldconfig +%postun -n %{name}%{_major} -p /sbin/ldconfig +%files -n %{name}%{_major} +%license %{_licensedir}/* +%{_libdir}/lib*.so.* + +%package devel +Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} +Summary: NVIDIA container runtime library (development files) +%description devel +The nvidia-container library provides an interface to configure GNU/Linux +containers leveraging NVIDIA hardware. The implementation relies on several +kernel subsystems and is designed to be agnostic of the container runtime. + +This package contains the files required to compile programs with the library. +%files devel +%license %{_licensedir}/* +%{_includedir}/*.h +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc + +%package static +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Summary: NVIDIA container runtime library (static library) +%description static +The nvidia-container library provides an interface to configure GNU/Linux +containers leveraging NVIDIA hardware. The implementation relies on several +kernel subsystems and is designed to be agnostic of the container runtime. + +This package requires the NVIDIA driver (>= 340.29) to be installed separately. +%files static +%license %{_licensedir}/* +%{_libdir}/lib*.a + +%define debug_package %{nil} +%package -n %{name}%{_major}-debuginfo +Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} +Summary: NVIDIA container runtime library (debugging symbols) +%description -n %{name}%{_major}-debuginfo +The nvidia-container library provides an interface to configure GNU/Linux +containers leveraging NVIDIA hardware. The implementation relies on several +kernel subsystems and is designed to be agnostic of the container runtime. + +This package contains the debugging symbols for the library. +%files -n %{name}%{_major}-debuginfo +%license %{_licensedir}/* +%{_prefix}/lib/debug%{_libdir}/lib*.so.* + +%package tools +Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release} +Summary: NVIDIA container runtime library (command-line tools) +%description tools +The nvidia-container library provides an interface to configure GNU/Linux +containers leveraging NVIDIA hardware. The implementation relies on several +kernel subsystems and is designed to be agnostic of the container runtime. + +This package contains command-line tools that facilitate using the library. +%files tools +%license %{_licensedir}/* +%{_bindir}/* + +%changelog +* Fri Apr 23 2021 joseph knierman 1.3.3-2 +- License verified +- Initial CBL-Mariner import from NVIDIA (license: ASL 2.0). + +* Fri Feb 05 2021 NVIDIA CORPORATION 1.3.3-1 +- Promote 1.3.3-0.1.rc.2 to 1.3.3-1 + +* Wed Feb 03 2021 NVIDIA CORPORATION 1.3.3-0.1.rc.2 +- Remove path_join() with already chrooted directory + +* Wed Feb 03 2021 NVIDIA CORPORATION 1.3.3-0.1.rc.1 +- Pre-create MIG related nvcaps at startup +- Add more logging around device node creation with --load-kmods + +* Mon Jan 25 2021 NVIDIA CORPORATION 1.3.2-1 +- Fix handling of /proc/PID/cgroups entries with colons in paths +- Add pread64 as allowed syscall for ldconfig + +* Mon Dec 07 2020 NVIDIA CORPORATION 1.3.1-1 +- Honor OPT_NO_CGROUPS in nvc_device_mig_caps_mount +- Fix bug in resolving absolute symlinks in find_library_paths() + +* Wed Sep 16 2020 NVIDIA CORPORATION 1.3.0-1 +- Promote 1.3.0-0.1.rc.1 to 1.3.0-1 + +* Fri Aug 21 2020 NVIDIA CORPORATION 1.3.0-0.1.rc.1 +- 2bda067f Add support to "list" command to print /dev based capabilities +- 3c2ad6aa Add logic to conditionally mount /dev based nvidia-capabilities +- 4d432175 Change default "list" command to set mig-config / mig-monitor = NULL +- 3ec7f3ba Fix minor bug that would not unmount paths on failure +- b5c0a394 Update nvidia-modprobe dependency to 450.57 + +* Wed Jul 08 2020 NVIDIA CORPORATION 1.2.0-1 +- Promote 1.2.0-0.1.rc.3 to 1.2.0-1 + +* Wed Jul 01 2020 NVIDIA CORPORATION 1.2.0-0.1.rc.3 +- 7deea6b8 WSL2 Support - Remove unnecessary umount and free +- 53739009 WSL2 Support - Fix error path when mounting the driver +- 38198a81 WSL2 Support - Fix error path in dxcore +- 31f5ea35 Changed email for travis.ci to kklues@nvidia.com +- abdd5175 Update license and copyright in packages +- 65827fe7 Update license clause to reflect actual licensing +- 77499d88 Transition Travis CI build to Ubuntu 18.04 + +* Thu Jun 18 2020 NVIDIA CORPORATION 1.2.0-0.1.rc.2 +- 4ea9b59f Update debian based dockerfiles to set distribution in changelog +- a57fcea5 Add 'ngx' as a new capability for a container +- 6f16ccd3 Allow --mig-monitor and --mig-config on machines without MIG capable GPUs + +* Thu Jun 11 2020 NVIDIA CORPORATION 1.2.0-0.1.rc.1 +- 4263e684 Add support for Windows Subsystem for Linux (WSL2) +- e768f8bc Fix ability to build RC packages via TAG=rc. + +* Tue May 19 2020 NVIDIA CORPORATION 1.1.1-1 +- deeb499 Fixup deb packaging files to remove warnings +- 6003504 nvmlSystemGetCudaDriverVersion_v2 to nvmlSystemGetCudaDriverVersion +- 1ee8b60 Update centos8/rhel8 to conditionally set appropriate CFLAGS and LDLIBS +- d746370 Add smoke test to verify functioning build for all OSs on amd64/x86_64 + +* Fri May 15 2020 NVIDIA CORPORATION 1.1.0-1 +- b217c6ad Update build system to support multi-arch builds +- 1ddcdfc1 Add support for MIG (Milti-Instance-GPUs) +- ddae363a Add libnvidia-allocator.so as a compute-lib +- 6ed0f129 Add option to not use pivot_root +- e18e9b7a Allow devices to be identified by PCI bus ID + +* Mon Nov 11 2019 NVIDIA CORPORATION 1.0.7-1 +- 8d90918a Add Raytracing library + +* Fri Sep 013 2019 NVIDIA CORPORATION 1.0.6-1 +- b6aff41 Update error messages for CUDA version requirements + +* Wed Sep 04 2019 NVIDIA CORPORATION 1.0.5-1 +- 688495e Add Opensuse15.1 support + +* Wed Aug 21 2019 NVIDIA CORPORATION 1.0.4-1 +- 61bfaf38 Update DSL to output the first element instead of the last in case of failure +- 5ce32c6c Add initial support for Optix +- acc38a22 Fix execveat typo +- b5e491b1 arm64: Add support for AARCH64 architecture + +* Thu Jul 18 2019 NVIDIA CORPORATION 1.0.3-1 +- b9545d7 Add support for Vulkan + +* Tue Feb 05 2019 NVIDIA CORPORATION 1.0.2-1 +- 4045013 Adds support for libnvidia-opticalflow + +* Mon Jan 14 2019 NVIDIA CORPORATION 1.0.1-1 +- deccb28 Allow yet more syscalls in ldconfig + +* Thu Sep 20 2018 NVIDIA CORPORATION 1.0.0-1 +- 35a9f27 Add support for CUDA forward compatibility +- ebed710 Add device brand to the device informations and requirements +- a141a7a Handle 32-bit PCI domains in procfs +- 391c4b6 Preload glibc libraries before switching root +- bcf69c6 Bump libtirpc to 1.1.4 +- 30aec17 Bump nvidia-modprobe-utils to 396.51 +- d05745f Bump the address space limits for ldconfig + +* Mon Jun 11 2018 NVIDIA CORPORATION 1.0.0-0.1.rc.2 +- 7ea554a Rework capabilities to support more unprivileged use-cases +- f06cbbb Fix driver process DEATHSIG teardown +- 931bd4f Allow more syscalls in ldconfig +- a0644ea Fix off-by-one error + +* Thu Apr 26 2018 NVIDIA CORPORATION 1.0.0-0.1.rc.1 +- 4d43665 Bump nvidia-modprobe-utils to 396.18 +- d8338a6 Bump libtirpc to 1.0.3 +- cef6c8f Add execveat to the list of allowed syscalls + +* Mon Mar 05 2018 NVIDIA CORPORATION 1.0.0-0.1.beta.1 +- 6822b13 Bump nvidia-modprobe-utils to 390.25 +- 8245f6c Slightly improve RPC error messages +- 9398d41 Add support for display capability +- 57a0dd5 Increase driver service timeout from 1s to 10s +- e48a0d4 Add device minor to the CLI info command +- 019fdc1 Add support for custom driver root directory +- b78a28c Add ppc64le support +- 41656bf Add --ldcache option to the CLI + +* Wed Jan 10 2018 NVIDIA CORPORATION 1.0.0-0.1.alpha.3 +- d268f8f Improve error message if driver installed in the container +- 3fdac29 Add optional support for libelf from the elfutils project +- 584bca5 Remove top directory bind mounts to prevent EXDEV errors +- c6dc820 Add info command to nvidia-container-cli +- 44b74ee Add device model to the device informations +- cbdd58f Strip RPC prefix from error messages +- d4ee216 Rework the CLI list command +- b0c4865 Improve the --userspec CLI option and rename it to --user +- e6fa331 Refactor the CLI and split it into multiple files +- fa9853b Bump nvidia-modprobe-utils to 387.34 +- 7888296 Move the driver capabilities to the container options +- ea2f780 Add support for EGL device isolation +- b5bffa3 Fix driver procfs remount to work with unpatched kernels + +* Mon Oct 30 2017 NVIDIA CORPORATION 1.0.0-0.1.alpha.2 +- b80e4b6 Relax some requirement constraints +- 3cd1bb6 Handle 32-bit PCI domains +- 6c67a19 Add support for device architecture requirement +- 7584e96 Filter NVRM proc filesystem based on visible devices +- 93c46e1 Prevent the driver process from triggering MPS +- fe4925e Reject invalid device identifier "GPU-" +- dabef1c Do not change bind mount attributes on top-level directories + +* Tue Sep 05 2017 NVIDIA CORPORATION 1.0.0-0.1.alpha.1 +- Initial release + diff --git a/SPECS/libnvidia-container/libtirpc.patch b/SPECS/libnvidia-container/libtirpc.patch new file mode 100644 index 00000000000..adb4ec10957 --- /dev/null +++ b/SPECS/libnvidia-container/libtirpc.patch @@ -0,0 +1,13 @@ +diff -urN libnvidia-container-1.3.3.orig/Makefile libnvidia-container-1.3.3/Makefile +--- libnvidia-container-1.3.3.orig/Makefile 2021-02-05 05:26:41.000000000 -0800 ++++ libnvidia-container-1.3.3/Makefile 2021-04-18 13:32:26.857212545 -0700 +@@ -133,6 +133,9 @@ + LIB_CPPFLAGS += -isystem $(DEPS_DIR)$(includedir)/tirpc -DWITH_TIRPC + LIB_LDLIBS_STATIC += -l:libtirpc.a + LIB_LDLIBS_SHARED += -lpthread ++else ++CPPFLAGS += -I/usr/include/tirpc ++LIB_LDLIBS_SHARED += -lpthread -ltirpc + endif + ifeq ($(WITH_SECCOMP), yes) + LIB_CPPFLAGS += -DWITH_SECCOMP $(shell pkg-config --cflags libseccomp) diff --git a/SPECS/libnvidia-container/nvidia-modprobe.patch b/SPECS/libnvidia-container/nvidia-modprobe.patch new file mode 100644 index 00000000000..c66373a239e --- /dev/null +++ b/SPECS/libnvidia-container/nvidia-modprobe.patch @@ -0,0 +1,29 @@ +diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.c +--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 +@@ -840,10 +840,10 @@ + return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); + } + +-static int nvidia_cap_get_device_file_attrs(const char* cap_file_path, +- int *major, +- int *minor, +- char *name) ++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, ++ int *major, ++ int *minor, ++ char *name) + { + char field[32]; + FILE *fp; +diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.h +--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 +@@ -81,6 +81,7 @@ + int nvidia_nvswitch_get_file_state(int minor); + int nvidia_cap_mknod(const char* cap_file_path, int *minor); + int nvidia_cap_get_file_state(const char* cap_file_path); ++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name); + int nvidia_get_chardev_major(const char *name); + + #endif /* NV_LINUX */ diff --git a/cgmanifest.json b/cgmanifest.json index 476e90f6284..ad86298dcff 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2760,6 +2760,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "libnvidia-container", + "version": "1.3.3", + "downloadUrl": "https://github.com/NVIDIA/libnvidia-container/archive/v1.3.3.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3810,6 +3820,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "nvidia-modprobe", + "version": "450.57", + "downloadUrl": "https://github.com/NVIDIA/nvidia-modprobe/archive/450.57.tar.gz" + } + } + }, { "component": { "type": "other", From 511725d84906159ec78c14ecfa6a95eee3e7a6ab Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Sun, 25 Apr 2021 23:52:40 -0400 Subject: [PATCH 03/83] fixed license --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 4 ++-- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 5b821bf8617..c9a7f3d4986 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -6,6 +6,6 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.5
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
installkernel
ivykis
jsonbuilder
kubernetes-1.17.13
kubernetes-1.17.16
kubernetes-1.18.10
kubernetes-1.18.14
kubernetes-1.19.6
kubernetes-1.19.7
libacvp
libconfini
libconfuse
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates-base
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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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
runc
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 | [TreasureData ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | td-agent | -| Nvidia | [Nvidia ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | libnvidia-container | +| 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 | | Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 977c976a4ee..222bc822b8d 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -766,14 +766,14 @@ }, { "origin": "TreasureData", - "license": "[TreasureData ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", + "license": "[ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", "specs": [ "td-agent" ] }, { "origin": "Nvidia", - "license": "[Nvidia ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", + "license": "[2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", "specs": [ "libnvidia-container" ] From ebe4f475b83d316a56ba8706808040b8a389c25a Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Mon, 26 Apr 2021 00:05:24 -0400 Subject: [PATCH 04/83] linted spec file --- .../libnvidia-container.spec | 77 +++++++++++-------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec index b3f09130b4c..714d157d6bd 100644 --- a/SPECS/libnvidia-container/libnvidia-container.spec +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -1,27 +1,25 @@ %define modprobe_version 450.57 %define _major 1 - -Summary: NVIDIA container runtime library -Name: libnvidia-container -Version: 1.3.3 -License: BSD-3-Clause AND Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND GPL-2.0-only -URL: https://github.com/NVIDIA/libnvidia-container -Release: 2%{?dist} -Vendor: Microsoft Corporation -Distribution: Mariner +Summary: NVIDIA container runtime library +Name: libnvidia-container +Version: 1.3.3 +Release: 2%{?dist} +License: BSD-3-Clause AND Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND GPL-2.0-only +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/NVIDIA/libnvidia-container #Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz #Source1: https://github.com/NVIDIA/nvidia-modprobe/archive/%%{modprobe_version}.tar.gz -Source1: nvidia-modprobe-%{modprobe_version}.tar.gz -Patch0: common.mk.patch -Patch1: libtirpc.patch -Patch2: nvidia-modprobe.patch - -BuildRequires: make -BuildRequires: which -BuildRequires: rpcsvc-proto -BuildRequires: libseccomp-devel -BuildRequires: libtirpc-devel +Source1: nvidia-modprobe-%{modprobe_version}.tar.gz +Patch0: common.mk.patch +Patch1: libtirpc.patch +Patch2: nvidia-modprobe.patch +BuildRequires: libseccomp-devel +BuildRequires: libtirpc-devel +BuildRequires: make +BuildRequires: rpcsvc-proto +BuildRequires: which %description The nvidia-container library provides an interface to configure GNU/Linux @@ -29,7 +27,7 @@ containers leveraging NVIDIA hardware. The implementation relies on several kernel subsystems and is designed to be agnostic of the container runtime. %prep -%setup +%setup -q %patch0 -p1 %patch1 -p1 @@ -43,31 +41,36 @@ touch deps/src/nvidia-modprobe-%{modprobe_version}/.download_stamp %make_build WITH_LIBELF=yes %install -DESTDIR=%{buildroot} %{__make} install prefix=%{_prefix} exec_prefix=%{_exec_prefix} bindir=%{_bindir} libdir=%{_libdir} includedir=%{_includedir} docdir=%{_licensedir} WITH_LIBELF=yes +DESTDIR=%{buildroot} make install prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} includedir=%{_includedir} docdir=%{_licensedir} WITH_LIBELF=yes %package -n %{name}%{_major} -Summary: NVIDIA container runtime library +Summary: NVIDIA container runtime library + %description -n %{name}%{_major} The nvidia-container library provides an interface to configure GNU/Linux containers leveraging NVIDIA hardware. The implementation relies on several kernel subsystems and is designed to be agnostic of the container runtime. This package requires the NVIDIA driver (>= 340.29) to be installed separately. + %post -n %{name}%{_major} -p /sbin/ldconfig %postun -n %{name}%{_major} -p /sbin/ldconfig + %files -n %{name}%{_major} %license %{_licensedir}/* %{_libdir}/lib*.so.* %package devel -Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} -Summary: NVIDIA container runtime library (development files) +Summary: NVIDIA container runtime library (development files) +Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} + %description devel The nvidia-container library provides an interface to configure GNU/Linux containers leveraging NVIDIA hardware. The implementation relies on several kernel subsystems and is designed to be agnostic of the container runtime. This package contains the files required to compile programs with the library. + %files devel %license %{_licensedir}/* %{_includedir}/*.h @@ -75,47 +78,54 @@ This package contains the files required to compile programs with the library. %{_libdir}/pkgconfig/*.pc %package static -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Summary: NVIDIA container runtime library (static library) +Summary: NVIDIA container runtime library (static library) +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + %description static The nvidia-container library provides an interface to configure GNU/Linux containers leveraging NVIDIA hardware. The implementation relies on several kernel subsystems and is designed to be agnostic of the container runtime. This package requires the NVIDIA driver (>= 340.29) to be installed separately. + %files static %license %{_licensedir}/* %{_libdir}/lib*.a %define debug_package %{nil} + %package -n %{name}%{_major}-debuginfo -Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} -Summary: NVIDIA container runtime library (debugging symbols) +Summary: NVIDIA container runtime library (debugging symbols) +Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} + %description -n %{name}%{_major}-debuginfo The nvidia-container library provides an interface to configure GNU/Linux containers leveraging NVIDIA hardware. The implementation relies on several kernel subsystems and is designed to be agnostic of the container runtime. This package contains the debugging symbols for the library. + %files -n %{name}%{_major}-debuginfo %license %{_licensedir}/* -%{_prefix}/lib/debug%{_libdir}/lib*.so.* +%{_lib}/debug%{_libdir}/lib*.so.* %package tools -Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release} -Summary: NVIDIA container runtime library (command-line tools) +Summary: NVIDIA container runtime library (command-line tools) +Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release} + %description tools The nvidia-container library provides an interface to configure GNU/Linux containers leveraging NVIDIA hardware. The implementation relies on several kernel subsystems and is designed to be agnostic of the container runtime. This package contains command-line tools that facilitate using the library. + %files tools %license %{_licensedir}/* %{_bindir}/* %changelog -* Fri Apr 23 2021 joseph knierman 1.3.3-2 +* Fri Apr 23 2021 joseph knierman - 1.3.3-2 - License verified - Initial CBL-Mariner import from NVIDIA (license: ASL 2.0). @@ -261,4 +271,3 @@ This package contains command-line tools that facilitate using the library. * Tue Sep 05 2017 NVIDIA CORPORATION 1.0.0-0.1.alpha.1 - Initial release - From 88392398f04f2da490bbfedbe456694d9f992838 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Mon, 26 Apr 2021 13:15:12 -0400 Subject: [PATCH 05/83] added nvidia-container-toolkit --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 3 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 9 +- .../nvidia-container-toolkit-1.4.2.patch | 12 ++ .../nvidia-container-toolkit.signatures.json | 6 + .../nvidia-container-toolkit.spec | 108 ++++++++++++++++++ SPECS/nvidia-container-toolkit/vendor.tar.gz | Bin 0 -> 30757 bytes cgmanifest.json | 10 ++ 7 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 SPECS/nvidia-container-toolkit/nvidia-container-toolkit-1.4.2.patch create mode 100644 SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json create mode 100644 SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec create mode 100644 SPECS/nvidia-container-toolkit/vendor.tar.gz diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 5fb19903fe7..1cec6d1b40e 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -6,5 +6,6 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.5
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
installkernel
ivykis
jsonbuilder
kubernetes-1.17.13
kubernetes-1.17.16
kubernetes-1.18.10
kubernetes-1.18.14
kubernetes-1.19.6
kubernetes-1.19.7
libacvp
libconfini
libconfuse
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates-base
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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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
runc
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 | [TreasureData ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | td-agent | +| 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) | nvidia-container-toolkit | | Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 4c8af6736e5..a8ef93d6dbc 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -766,11 +766,18 @@ }, { "origin": "TreasureData", - "license": "[TreasureData ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", + "license": "[ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", "specs": [ "td-agent" ] }, + { + "origin": "Nvidia", + "license": "[ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", + "specs": [ + "nvidia-container-toolkit" + ] + }, { "origin": "Magnus Edenhill Open Source", "license": "[Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING)", diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit-1.4.2.patch b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit-1.4.2.patch new file mode 100644 index 00000000000..48f3a09cb00 --- /dev/null +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit-1.4.2.patch @@ -0,0 +1,12 @@ +diff -ru nvidia-container-toolkit-1.4.2-orig/go.mod nvidia-container-toolkit-1.4.2/go.mod +--- nvidia-container-toolkit-1.4.2-orig/go.mod 2021-02-05 07:47:01.000000000 -0500 ++++ nvidia-container-toolkit-1.4.2/go.mod 2021-04-20 03:38:02.000000000 -0400 +@@ -4,6 +4,5 @@ + + require ( + github.com/BurntSushi/toml v0.3.1 +- github.com/stretchr/testify v1.6.0 + golang.org/x/mod v0.3.0 + ) +Only in nvidia-container-toolkit-1.4.2: nvidia-container-toolkit +Only in nvidia-container-toolkit-1.4.2: vendor diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json new file mode 100644 index 00000000000..ed441dc60b7 --- /dev/null +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json @@ -0,0 +1,6 @@ +{ + "Signatures": { + "nvidia-container-toolkit-1.4.2.tar.gz": "8c3ff8dd96812dcc2c09b203d2749fcba51941e33387aba1bca4da2f87065a0c", + "vendor.tar.gz": "3dd5518fc26db657ddcc686c0f26213fcd071d9161dfd27923c6330f9c55eaeb" + } +} \ No newline at end of file diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec new file mode 100644 index 00000000000..d7f0cbc35ba --- /dev/null +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -0,0 +1,108 @@ +%global debug_package %{nil} +Summary: NVIDIA container runtime hook +Name: nvidia-container-toolkit +Version: 1.4.2 +Release: 2%{?dist} +License: Apache-2.0 +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/NVIDIA/nvidia-container-runtime +#Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz +Source0: nvidia-container-toolkit-1.4.2.tar.gz +Source1: vendor.tar.gz +Patch0: nvidia-container-toolkit-1.4.2.patch +BuildRequires: golang +Provides: nvidia-container-runtime-hook + +%description +Provides a OCI hook to enable GPU support in containers. + +%prep +%setup -q +%patch0 -p1 +tar -xvf %{SOURCE1} + +%build +go build -ldflags "-s -w " -o "nvidia-container-toolkit" ./pkg + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 755 -t %{buildroot}%{_bindir} nvidia-container-toolkit + +cp config/config.toml.centos config.toml +mkdir -p %{buildroot}%{_sysconfdir}/nvidia-container-runtime +install -m 644 -t %{buildroot}%{_sysconfdir}/nvidia-container-runtime config.toml + +mkdir -p %{buildroot}%{_libexecdir}/oci/hooks.d +install -m 755 -t %{buildroot}%{_libexecdir}/oci/hooks.d oci-nvidia-hook + +mkdir -p %{buildroot}%{_datadir}/containers/oci/hooks.d +install -m 644 -t %{buildroot}%{_datadir}/containers/oci/hooks.d oci-nvidia-hook.json + +%posttrans +ln -sf %{_bindir}/nvidia-container-toolkit %{_bindir}/nvidia-container-runtime-hook + +%postun +rm -f %{_bindir}/nvidia-container-runtime-hook + +%files +%license LICENSE +%{_bindir}/nvidia-container-toolkit +%config %{_sysconfdir}/nvidia-container-runtime/config.toml +%{_libexecdir}/oci/hooks.d/oci-nvidia-hook +%{_datadir}/containers/oci/hooks.d/oci-nvidia-hook.json + +%changelog +* Mon Apr 26 2021 Joseph Knierman - 1.4.2-2 +- License verified +- Initial CBL-Mariner import from NVIDIA (license: ASL 2.0). + +* Fri Feb 05 2021 NVIDIA CORPORATION 1.4.2-1 +- Add dependence on libnvidia-container-tools >= 1.3.3 + +* Mon Jan 25 2021 NVIDIA CORPORATION 1.4.1-1 +- Ignore NVIDIA_VISIBLE_DEVICES for containers with insufficent privileges +- Add dependence on libnvidia-container-tools >= 1.3.2 + +* Fri Dec 11 2020 NVIDIA CORPORATION 1.4.0-1 +- Add 'compute' capability to list of defaults +- Add dependence on libnvidia-container-tools >= 1.3.1 + +* Wed Sep 16 2020 NVIDIA CORPORATION 1.3.0-1 +- Promote 1.3.0-0.1.rc.2 to 1.3.0-1 +- Add dependence on libnvidia-container-tools >= 1.3.0 + +* Mon Aug 10 2020 NVIDIA CORPORATION 1.3.0-0.1.rc.2 +- 2c180947 Add more tests for new semantics with device list from volume mounts +- 7c003857 Refactor accepting device lists from volume mounts as a boolean + +* Fri Jul 24 2020 NVIDIA CORPORATION 1.3.0-0.1.rc.1 +- b50d86c1 Update build system to accept a TAG variable for things like rc.x +- fe65573b Add common CI tests for things like golint, gofmt, unit tests, etc. +- da6fbb34 Revert "Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_*" +- a7fb3330 Flip build-all targets to run automatically on merge requests +- 8b248b66 Rename github.com/NVIDIA/container-toolkit to nvidia-container-toolkit +- da36874e Add new config options to pull device list from mounted files instead of ENVVAR + +* Wed Jul 22 2020 NVIDIA CORPORATION 1.2.1-1 +- 4e6e0ed4 Add 'ngx' to list of *all* driver capabilities +- 2f4af743 List config.toml as a config file in the RPM SPEC + +* Wed Jul 08 2020 NVIDIA CORPORATION 1.2.0-1 +- 8e0aab46 Fix repo listed in changelog for debian distributions +- 320bb6e4 Update dependence on libnvidia-container to 1.2.0 +- 6cfc8097 Update package license to match source license +- e7dc3cbb Fix debian copyright file +- d3aee3e0 Add the 'ngx' driver capability + +* Wed Jun 03 2020 NVIDIA CORPORATION 1.1.2-1 +- c32237f3 Add support for parsing Linux Capabilities for older OCI specs + +* Tue May 19 2020 NVIDIA CORPORATION 1.1.1-1 +- d202aded Update dependence to libnvidia-container 1.1.1 + +* Fri May 15 2020 NVIDIA CORPORATION 1.1.0-1 +- 4e4de762 Update build system to support multi-arch builds +- fcc1d116 Add support for MIG (Multi-Instance GPUs) +- d4ff0416 Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_* +- 60f165ad Add no-pivot option to toolkit diff --git a/SPECS/nvidia-container-toolkit/vendor.tar.gz b/SPECS/nvidia-container-toolkit/vendor.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..965ccc00f6412b8158a46f63a1bea545d8dfeb66 GIT binary patch literal 30757 zcmV(%K;pk2iwFQKWrkn?1MFP?bK5qS@2}BcfvA&)N)`IMlXaW!ByrO9ZJcBp=l142 znTir2i8V!N2~v(O>;L`U7XSn)%9hhMH#-+ir;!QZ;o;$Z`MgI!3z@|#-}>gy{A|PL z(ZK=!yYuK^+yB>ozS-H|-h*ccd-!~3_u$dqH{#$=<;r|YT|~JM-~6U7vP9;yb^UH? z|2O?Cc>gC!F)fGTNX`BPRk+3e?;Y;%!T#?b?j3yH|1a@b-T!B0o)zy(Jx%^7Rk;2B zA3oauYX4v4bM5{YYL@;1N^txAfAnbQ@az76iO^;r{-b{omW) z+1an}|L)E{#{cadg&rhvWdp8MKY7!POsA$m)S_jV61W&Ah<_gMEOLEFbtEdkoh-dzKd30BwFWLU6aG0!6f{WIVVrX0)%K$*EQ(gSKrL}IRptQaf? zAQ)Ek?0Td#GX+d(t0#0(7q$zfeWg0DIj6C4*r!|_q4pai_ z$=p{=R$ZCPib+fE40@GWEc0}UgK{~~rG_nxtmZ^5^MM?7Nm_`D7)_&W!ZJEmB2xuW zNkL6BSdX3Nb@(jwHiF2&X5G*a4kzKi&D#RnTku?w52LVtZ1jBzwtgE{>DpR^CIWxch`Vzd-H(P^q+c<*a8G zhh>(Gm(^sUTW(+Ew12^(*K3-XU4Rz9K|~U1av^!k;D33$t;mlfIS1cRAR+5aTFq2M zX%1ppvaPbpgaWurVli*%77{~Mc!28j05w7lizvxpx5l}eSq&V6hOt*gE_wFc;||Fr z*(fbzR!UgdOcqlG^9D&M!#+AOv}|&HKwr#MUNd{7z>|Tq=e@_>U|j>hxWYLKkEbNf zBF1KJ1n&>AY|WuXs$eB6%kaUqx5A5Vkd+g(L!yfn}3jCJu)+J;M+J4X|W z*U=12y-$9O`b?8JmKnRbX#y@S@=V8iG!T_eK+fo@GDqvhM>&GnTo*HqL2~6Bme0CW z*&R*U6cOyqJIOu4#4&V&;K`5zFop-#6nekcu0m_*Pef%T=2_=XEXPKXf}Z#!YTYyN zFIPeDbB)c|7)g_Rt;Svy#0}vWNl^qgfdD&#kxfAZM=FOXFjugDFan|=J3SzsgRajt zi1=6{bhrc!-AS(is5F73F!fByJ06T$xoS!qSDixL<8Nv7Qr}G2-hs`gBA4!`bvt|w1l2F z37Mo~k2hQpK7cuil$$22Y|{3Ph7i&qG3rv-amY`*sFg812+u&5T0vYWPBJ#3 zQKTi?X60ilw~EwwdD^Z|(*os0=9*V2Bk(1-QYX=#Z^aOY5t9}QX+;8Yo1sL59L!<7 z1apGERQM8&!8%i8u}vs!44C{RSht*k=O}W(FD_}%z?u~FEZZ|>)3Eq|V+7PkkYt~`+4`hWV3c8jV zEJXcH;3Py0atBA`Lq#J_Xe%x;2v_RFdSVeX>2a!*CeMJrhf#4(Ta1#C9}@rw{&<_u zAcBOs=P4+&f#QJR@&+~~#B4%fF0HTu6tD+u8DZs15VhtQoN5@404!Vf-HHvaoJBF~ z_y{u?2%;6(KGDZ=j0l6QA&a*_fn0bsny!W7aAm`g3&@p}6YYQq?G>^MJ~Re97%fNO z_l!dkC+H`%X|AHv?nYjfZ&rHRu|+=yznwf8@QaGdjOmj zB`U#_fx(QTln@}~S;jN_2m^I^j3mLN2IF~DOa~k&Oaf4l&ju^3sTwj7Q14sm+fcjB z;rdPZ3$RrYyX`)irh5HgsJVdP3k|2?ip-5-Lr`0Sn~u=CLLj6Jgi;L@RnCNNmJrVv zz?>@N@4rVxfN6sKPmm7jotOhpfGjav(^zjqwLmw7t)M>SbB7UzKjZW`4wX3>IKdWRIK5-E9|u78D@#*;5N@yT#hLCurNaL5^Vqx2zNDEi&p?ZN>i)@ zDC<^zDkW^=9Lt9owUGdmZOtIq{K$QJJA{zE?i{PUp>qc&e`g>A2JBG0QtHA0oRvyT zXgwV|D{ypAo;2N8@W74f1+cljUibnaqj8EjS+r=TO~f#&qQw_BHKACG4;@})8kQGV z+W;*i#{~$BomG|JpgV^l-~SzN^~G5pj#2(oTLPgk=~X zU(tj{XF&j{!YxwvQRRuNcbctsVtyWFPvbZ@(t~GqIR z`mY;08$Q)KnPiyaovFYivyLSAGt;jY#cgOiHfaZm4(+P9Ms%JLam|QXU0Q6mK3nQE zx4E{zjd9f;HyFi!hDqiTS$y{X=U|Ahp)|gR>KU0!ER95v9Oi$`AS(Lnr-WH4}EB*-TO2QQ^C&KZ4kB`5Z$ zPFeu1wX6IQF%YaNX4oY{GGA5ln#G4+2wG(|fZ;2vSsMKhKzgl7O)kVwl>-Jn5#N0W z&wi|)y@xd(?zbrj^sX!M9SsRAL@-h(O5HrHd;|m}xN#q5zm}IlWmW9t(VLj4@6e!` z#c^o>A(Es1t60E)WkTM``e+){@UAsh-%&t6T3s$T_$#iBJB{WogW&1f5l?Z$TE@`x zwWHo)m8gw9e7=4ZL7w(iAr@LU?ipbBmQnb4?HK26jyTkU_a+;&K3mS_#j@^QjeC7v z&Q2+(glP4X*skwn&|SeXocve?>e-!ch%;M)wO+Hvmsl{`+eL22V6nwCSLI~d*6DD+ zMHZ%|VG0{?%{EE+b1f1xN@p|n4I$Z`0tQ(BZ^njxO6G%aasziw3`oYVI`CxGn#fvw z8N>4G;1%Q5J$(e31jI60G5R9%-BfrH_s+V6d@8dy8VFe2%xnT8lDa@J27)cwZD7?^ z;M$0*MU;!NctDjV+&iu~LBCNnn#vf-zochDO+}DyQjs&mXqn?NKL3s%ohKjg8AxP2 z4yjxP5zKbK1KdpNpVt%6gZ1 zQXsAXjb|I@0_!~;qMaMoTa=w=?|EBZc@4C)>%0O+l`rWM$mBNh2g4{ve-LzGK(}tt zZS}2s+H?x(7p|080j|F5ns+ZPm~l^%Efy@P%f6Dl)O=)f za{WjHbv*3iTfzc25(u`K!3wOor2*L0q2P^tE~*R`q0R!1qUr6qQL&pfmEO8_Dau3!#p07!kahx3OcVYHm=o7_mtZwD z_}CZ-y3j{}95-Q7OvSzU2Qg8F_nr`ux@&Ynktp`vJiU5_)Ps7Jq!)}ju7wc}9RB-m zOY44k9_3&E;&R6vzW*q)bsmOA;Y_hFGWgGU8t#tNv(;DGpDFb^nqMpKrqbCpI<&I= z1N{4=Qw;d)`|lYBxgl)3Nv)m(9cYO0PhK(Ibzkp=?8prq(dI6qRsh*p9f84LZTORHy>G|PyBo&>-G$|9EIs7xt4zcY`rWE6CV<)qul{MLzz z*xpD|wzToPq(p_2N=CK!h^s}Hs_n;Go2k9Di+CmR?$?JNSyT&Hc8K{G9&VAN3j~g? zJ{qIr(ADD8pUl(fBRy^4^q|XS%X=}_164^cQ%tI&sId1K z_QGte!ShWnb`ICGv2)nU2RyztBRhvTa$;1sm6N^QR!-pYtvT7-UE$=avISI2(^#c3 ztxAPeyR};7mGthE8Rym|J+ss|(YE)AuWn59GxZGzHx+IhWm?vSO8ssr)beIUd!Mvu z+Pe8~tzYE^3idu}(Xe$K+*+^78x;%524!8fK6y^I%yJoxrdT7`)Y+O-R~xxoS5CZ* zza7@SEuHplgi)e9+#raWgJBynTdOB-%iyak(9;5B5Z=GD7-aZ1zSl@i7~JR5bRNo)dd zI%-$Lc3n)%&{V1MIgy(~&te>O?=4_UwaFpOVKU>UR{O@yzT*mvto9yzy**gc)U4_? zl7V^;@x(>1mf2L`+kd@^qUDPtfCE<%xG&xn@C_cAUrU;^Sa_bHrh0T*VKE5lh^RT8 z#FrOxsa3j=_N2Z&s#`y=QKwa14_YahR0pZ-ISbpxapq1^8b0V`;c!`<>ZNNKZ+#xe zDoxcTowde`4HX6Oepr*M4}C2!{o5G;KGi6qN*!1Tx;2uiH=_MaE6~Q{tmZUpHD~oQ zlV0c9*OhAAvG0(jrb{KI76Bc%S@*KDXJqcAxZ+M$dV3%6WH+@;`6mY)qtJe0IfYs}I!LRNEu_V?~5xZKiO|Gi8@Lrqv_3Kp!Ob44k zd50k?QJ7h{Gm|Q+!3+&6jz#MYTxrOj6l=Qj)eCo3p&6V}>|Y_VN0aWI zd3U?$-4YiY>|`jZ|LePqUq841+vLhos94@a!_mV-dwMU)#i!P--?;8eg!P3n#o#D~Q@HUu?37(c)c(9N0pyUqv*+ zkj`Q&F3mL-I+EkiNM1@4-P=T77aSkWoXMli7$VQYV zDH*PG=!q7|d#u>gwv=R4*-aav^+c%mia;>831H`e$O)&LLe!amBD$uf%l)XFC`3y? zYB9ZRje510Z8060n>KRXV!B}>Dq3g77So9~qO}vXm|nP3?WC~9Cq+G5Npa7fGmbao z>PBOgFgP>AE7P?bR|ahJU74_cA-zJ{N5Y7{FJAJMGb_Bl*=e#olz>IuZzHYwpmQoe z;^{y1H++K)ybhnZX7KN>lk?S??2(OTQO@{EEFvc(|iRBmQo211lWiVbIgC&syDx~%>@onojQktJgY#FGa!ow&HdSHBk0=`esVA_V`~ z=S z&xN2pO@=vMwHW-SRmRum1|MhXpkpZ83#fJ?I>>L%#c~O7u&ydb)H?O%)2gvLM~uI; zLOBrrI11ivjp^64RoX z>!U5-B+(8ZrXbHPPSc)4!UCl6%q#5<*K1_1aevMi+u?q={UNxK(AF?j!>w5a`BuJV zhU+bvaW^Idb`P8#t5G?#>+x7ru^NRcpIqZVI-QdYHZV%6%;cYO`otZdmE1I37GL`1=96)YXh17RTFT)!0R=gbCMJO*{V5019C|C=@YA9Pi8L|2jM2e0V9y}7d%8Qvy} z6Z7XP8z+G=`jBt9j;0n$u|@Jj@iLB&|E zB=cw{-~F!Ven>KgB$K%_H=b#*rTtuc?X}llPeu|OPz>pt86Dol0scc7VS{DqqSd0U zD89FHF^RgtU$J~yuN4I3#zjtp8k>!}|4nE*9URj{K8AuLxUnZV!i0*ZBrb;d zilKQg-(gvwFuHP30I}ySlz6+j_Ogdp<_i=H&>)2 z?+1JHFpDLR(1QzYq#Yy!G1#tiG7|?to2t26cNg1&eUg%Vkeo=O^AxT4b1pm^dGS;R z#5Lus*gHy(!)Jirqc*%?X&2vRa>r3atA{ictcI%PZPhI2LHnD$^9HRE@^F(pMRK!d z9d|zh(zh_Y0qzMBzDB{jfmvKD6!!fsZ-Q(-_+4a@NO2w_S*hM2_*M&d{J1!z^Os17 zCG!M?A#e7DfoYQ$;4zb^ZA5B)qyGEqn(akLG@I*XN;gv6CYL}kP%Kolf#5I@zj;!x zIU#6lpo4TcOvo>nMB@`^$=NV}QI}&CwGV_L3sJCj1_xG=6eHeB_*za?+&Ae3T*RH7 z2HkC=t~ebpzK*joiY$R;fSc@}X6rmpiWk$vX5%nP?N6Y&fNk-YK*>J3HjN8B%8|JT0FsOJUUW##u=#}i z2z3FF;2%X<96}S?UKougC(!{sNhUPzr4auIgARhh5k86k7#uAxH5+cF!?>u{S*fYB z&p{qw*u>5t2=<%D(b-vqjKd%v6;bn`8|(u(Rt|y#m>IJqV-p1~rSJoAC(2^E^5w>3 zGARJ3gAKgQkgpkwTef~-@A!n+9udSePSTv$00!BlNjJOr6^^0fsM$F1PIE_Hgh$bH zqY=qU6aaC(%zP~D5oW7t(H5d}KuFym57WlN(tzio%M?x?V+w7|kCPO+Bu5B6Qxt;WI&T7Sa_3Ps#Z z3*{DO1=X4pM9W0bYDfgF#v0uP5Z2zkS!2J+q0Vlfz|OvVE5+a<+bHY5z&GYzYx}i?2qTK#K(Bvi{*gd zWql8gI=EavI;Ui5d=!`o1&lWzpBF50MlWBf<$wNXKK&0_gc)9)jXtuEIrM+&{>pOM z{tJ$Puk`;*d`6j|IzmMo|kxUv1OZmBh<1~=p zL3l3=Lw$I?pq`}14Nkwn?Qpn*V0&%v#pC9G;h)w2da?DgckejG@P+pdlW~&@(yfN7 z|EmG|Z}z!C{+IOVQ*8iYVHglfR=lY2XcS+q1LbOdo$tuU}Z*gwqW93ehyx8i~A3Q2S7Y2~OVX{%}oD#)C$x%tA-w z!kQMb5|H{Cl0M8T=s1KoTlXe;Lu_A2qeNn&*0*o5HV}?hz!-s0n&uJ#(Qxy?s7}X8 zL0#dXhFNqL- zx}}wpytFW!OGxp8&;+Hr1BBZ62%w$%=FA3}{Gp#<7*Wc*0XwQlGgUr9-Gr`84cKy+ z5vCUJYEMX-Mixi8M2EF7q6N?6Nra|Xfiz56XXIi~_?ccP8wOfk`t#JhE>?Y-P%FwT z1kv$0MX-mBZ}0gx#(y-~&%Sy5|I(wf{THwV%U{p`FY$?{ z!ISCmHEIgCVM_t%FlmY{<_WoQ$9D%|M(Wu z1byT^V9x%3v{Lo|dhp#>`R^C`)aHM*`5ZOt7IDw$(|nPWds9w+Uz9p38FQ8-lnYnQ&Ml$LXwek|K6y?`|xlwj>l29b{AP$eiF1rd)%x76p zZ4&!yMIn%b7M3uBYd1;He2D)XH8m%d9XsjvT<0^@?~w_=nMH_T5nF!JfU1hHK39P4 z9$N^*P=Z;x&T!}nKygmXegMV?j%`3FboZ>4#{%goYfnw-t?bumq)r5< z*6>Dyx5BWn0rK^JY}=X{4)aG73$rwM4b*CyaGKmdJ-D`><1&DT4~%W%-l+~JqROsj zur$dyQ;UZNr%c)%Ea0v@S+~%NOT#d9@m_IJA=Qnoj-F^lM?NKlW=CUe2#;VtsuMf$QjpuV!eEl{7FPsmFp)_);zXr;a5nGsQr&lO#S;1C$P}G;}+TFMeUH_H&Ay zcJ3}?bQ#Pg!euDttd!s9A{eihTD4JK=(WY&+@%qkOAxaLT&Zx$JA`JSGd9*U0;wFG z%;M2do1{}dbA82QmP440lTL*Ekdjl*u`6@*kD}a^J;Mu(ielX4Yh;m4H0nf?y5wlk z!+LF2H?tHGaWu+o{!n|wI>`?Ge4t38F#8sfwtDJ>z=T~xT!XXsfXa}KxF&{HcEW&N z`;t7a=W)O(-n@j%Y&}Rbfgh9;NV2Ck%BQ9q|Dzq%@C?ILSV_P_b2?6N&pKc4 zO^f08WN5`ytBB7uVoC#bLOC^sk9+JFt_3jH9>&$f2b=wk!1>q|$ed7({ZfmR;&fp| zH6+>v-Nvcmt!MmYkFrPG@B{qaL=E7drN98DOzm@y0pNsD;2#nf!3~MPzt|02a*HEY z70mIo&9qadHy+5CQ4F$+C7s{qEtM@7u@6l-pzBV7_4Evn8RtoVj58}Yw zD)9V6%WN}r{*0fEIY;{FGWeFFm~`~Hl;Y4PR_>LIC)2`4=%oJ0w0x4HNQ=H=xAK)5 zGffi4V3b{Sl7O$A;%g1%f$Z!VarE8k1piOk%`C>m++#|-WK-rj`SO&7R2u>go^XE= zD?t;dz-R^SCS0f}c0#Mwfrfw^I)9xEiW9hT-e=4BF+SskKs~sms64}qHlVRnLG+{3 zoO8kThiGyd18+*~V>%=gR8)=T1#yEgC728cY+&^#vTIwv;Pg=6Os$Mj$`>8O&|!2@ z0n~`)M+_f?AGAU#*b$t#V&oC-w5k&(7trkR^u6FEy8 z>Egx1FiA>rvZ_aqhDB_%3Z6uqUXCsih?snhQef=+;G8e6bJ!K^ zemzo95-~EKdW^}4ALcUcY!qBHjLrfKGd201nP3uB#3+rnf#vBvu*E+ujxIym1gnmq zjkbaxFCL09P#y>R6}mPIunuR0IT4&4*^$9v&oENV4@JL;0mpKy0sX-Q9@Hr2UAf## zC-?v-yBY+`_?^edEWg>V-C%jCBUO)1SM@?5@TE%u7qA@q=&}}c6W|Nm9&PCGkV9TH za{b zCc{51(u?;bu!N_kU;2gE@Ij|VhYEK!v!^|{q2IJO6>VXiUG#@*yZwK}0LB#CIcR5e zSacK#E<+}!xbzZ1iAXIHUPD}(ztb!8eVA)?ekSW?nf>+*?N+FCv#QpLa_ET_Q`=STZ8EV2Pc0Tah z;v&2Qpz4q17G4_n>OrU6_Y(Gf!A}81cj<>fAk%=!$76J5%}PQ$24if2FEW5aejbb2Zt|pTJPfML}1D4FIY#u!PX1{TWVtg z=ISlzIxcro9vcD`E44FCodH~AGM=i^&>K5ZblIIA;`3biScOfQPIxXbGTi!yS9C}e zZ2K!N^){9%Il+#T(K`-;ZXH0!8vKHOl2t44BUyA*u%lC)A4L;(0VV8;SaKhYupL_x z6&Q%F7^5yagn#4WDD2cgP}l;tMKGbSh3gH&(2IZVupE_hPM9c?SRl{j2IS|~wOMGD zxGLFE-TDyu%%|DSB?^wbhW{SA`Ud3_p>oYFuMSly&F1S94EjJvb4H<9lYDbS5k$F> z_;ME!Zgkm|9=y!TnTa9k-i=pzro;i7N=}Qu;DM@J(ZH%#)Rje0K{$t38J+bQ56t1= zYPKErk8)vhoO9s=6y=F~64}s<6!&X>Zf#PI;8DXwiI{#dl8snXo2Pg?lsh3O%7!g4 ziVLF{XZC%-M!^_hAuQ1jA9irDxAX)a86l2~GGQ_$`Hvf0rSPE6*L-bX*xkGpFlPx#e__# zsT^0qW-0$;nlNZY3^64W6V#?(d6?a!tHMo?TX0h`Gs82ajGnkG`cO4M(SSqp$dEZz z4P}GAB{G+`RtckNDyAguxYZdnSHbB_MDTwu^49DFn+URu6fo_0%yDk){JR`{vMEsN zB5u&i;X#V2Bft5BT(9;KzWXAo+sg zdf|ZC6}SU*O=XEWWLG>wy)>ZQH-E^USZLPn0k1pS62hd`EZ6*r`#_!zP+|yOlGAaH zXSs9`ZvE(!L?d;_M5PXCx%L3{fJESF1`Lt5eMYiFwm)EPd#Bl{^t>BS=Jv)-ikAwI zpO5IvmCfr!effKp_?CA7E&{KYvtXR^hQicMO)@B9h3hgf!5cIkG7VaOy8OnWoCIN) zXqE{a{2yZv6?iX};LgC7SXw!h=!6Wg3Ms^|mQs16xD6-i+C)|O$I7fL%#I}qoQA80 z(8%6!&KG$~Q^+M;NpQ?6uiygqI-1Bt&@7!YulAC|rk#Z7 zs1q^?wAjWA&86)6Si}y??GXUk%Cn=8tAqYIf>T zz`1#?mQMQmOPEgObI>`n^_)gs`Uj6cp7PzSH=k0FwS0*(qNS22aUzR(+TVw$t3yMh zV9h0q7J&@LV0&${c~b?QMUxIuMtpV^7iA{VrH(L?83;6Y+xs-KdN9z$XOW1Cc&1D; z{rh2wd|1T&n0BtE5DI^D42yb}@xHqGkz#vGX^1v%8#2|*lC#`do1m?FV(Yh{yQ|~v z@7bh!&f?72-TtoQ{B1X(;-$UH`{!nKwoE(fFIz}$dAJo2^WK!369?2oU{BOgU$v~! z_=?SGBWrA_qX@mWW)W7Djd+S%O0#sS#+p^7FNs-6k}^SQo)rwbn~eILv5J^3iqj=t zxcEVi?Qq}^%w!m9n_GK&l@%>_U$1WY6(H$l*GW<#8bL`oIYHx2Jm1Jf9p|1)H-q8Kmb(5=5QY| z#b&GNP0?wMX4$&i>ISXF)@lu+y8J8fovYZi2>eB-fUmlE;X6&(gnEk6Noy%9MI4vB zDY-C;Bu*OOR_oH451m-$u-Gex{d^-XfV}B_1_tp2wVc^mlILinj@0uq3MdQIfa;>V=o*mbEcrr?t6Qvqk`7t<5FQ+_2P<> zIh<0rMcx`@+FmQ9BR>j<+#}6XO3ap8gm%suVn_9H0^{rX^Lj#V`|MmNb}q~2w8r)F zWYbhM_wqrddTU4C>q6woz+0Y+rR`VNb!iQy~s6JeQGs%2`-Te&fx?? zB5};!;W`4Mit2*{fa4jRpkkwZN)Stlx|LZP4-1#Fh>WR!4f1(RCAl5(wopR=m(Nrd zK-r*yc)&1w!cW^GG*MxfatWPPGVc>D?hKq%pAlXX7*8Uu$$;vtUTL|~VQ&`y3VdZK z-x6gjcfz??J4Z zKg(ngk#LxdlU!B#q7`?Lu2w}s_(1p1-#NKg?d4Oum@SL4(5*0Q{zg*Kj~RZM!SZQ2 zTr}=UI`k;Xgs3xrCql_u#mjpo@7L0Hi@4alQ{KGkHme!NKl6O>ZODD-luZBYgtxOsJzs5IQ{xt7+=VSRSi)2F`XmxU zPim+-RfctCed7$mehnf2(3*{_pNpK|99wXZumByFxI(M!gdcY(YV#_Wcmfg`H7 z0CCo~1_E$5o~^K_?N~V^jB)G7+J@Xj?CZn0bB* zp|EnkDy{g$Wu|-ebq9&J%&mC~Z9N(42+6!f|7^6Rygv1!+!-{Y=KUv;iK=_^znD^7 zhfXf3buemd@W$E-%wjuOZA8Zoko4;e1!tTz-1}^G)eBA>S!fXHXvDUKq?%q8;~CiM z28dFPNMax!%6%x*B188pu7j#`IwA`am;QJiGy^!P+y6tiB8XT2EC zdXdd~(VX?7bWj^CX2mO(|9eMx>s6`bMmjz&6|B8rBxAP6iUmuJS=Kjy z{3sqvXsD3l9gOG}-7dGf&Zp|gAbc% zzj^gH`MlFBiCOr{d}k~_M($#-J11z@(vR@>r{DqnxqDZ9PAV=Zcar=?d>IV@_s^n{ zaXzU)>YX8uLkwnfV(YM?CKo@x)|+Xo8@wZXqZ!w*k?UnxAui4hM!`^7%#VP=_n#RG zadLc8TnC0%pA8I5Rx3JUM-n4)56-)O90Q_7oXM9=!Uq!B!V<|!TemSKR26uM5V~#F ztFK#cYqg2`Hb#YGuT(?=bQo3RXHX$tD`lV>j(EAGPID)DE&ORn^MU_m;9l0^+E6Dq zS(gyk<+{bG(-k?A3WCUWA_^Uj%XR9rE<1d%rC2nXWa(vcCIPf0xPnBLk#zFPKqS^{ z4`t-4BqFwqb0EO$+^&jt_!(Bjf_KJh04VqHpH=*a!25Un=kCm9x)#D(>^cxTdi!h8 zmSv`dx;1vpK@N-~tAcB6lvyW3CBGe~-zqh<852C8j?$1wH&2=+Q7h3(PqGBJnKL-v zRcr}V-cZ-kF}6#3`D%BMJf&othd~crIfZ&~G{LlnfYewM@sZ)JKY2Jjrg%29+}v(K zr-%vv2ukI%>9UbaXyEbU)uopc3;>l#Y8Kvo0t+ANpN)Wh)RFN|Cr#8$$sAH$K1pom zY!(TqJx2S$Kc<*g1d3ogREF$69FCE6@q!TKlS}zK95*}UD2V|T>PNS0mjDv;c*Y`T zL;Xx6Ocm{N(M&$WY8k-RE|$`>MW$z;vN}}ey0syz9_Pp)=X91ntX52N93x>Ub{+qS z@oy~)Im=V~&MYgW^7Y*bG`o;Fk#i9PWWVM%mN7iGm$%$Nwu!UBfU`80X4$#+<~;K8)6wwMK7YdC)x@`&T(|Cw)5kd5!$MA|2Xxw!~{+p5kD1KIudtPsco0g zZSJ<36SuB+0hbq*S<`l8vBkJZve=ucuTlR?tHya(M4ki_o%Xk6F#WCTMIj!o1{!=f zM1UwXG}?xqku!oeRlsyZe+rd!uz89KMXR2OB`b6n*PK0a4P1B2ffn-7G-EL$23#Pj z2CP6{wlblyJ4z+iv&z)ERA$!?X5`M6$1@|$n$EH+MK!Hj8*W$oTM6<1E_=uE5$arG zko`Xqn40ui&*c$4<>RnOjvT{;b+RLxrUl zh9t>?pWyosZe8#8T;D>wt_egofVRAgoOi?0yEW(CvsTCH+wKqUsn6VUYE0vn(`RluGXHW5(Su5fQjhw~Ew^5>{?M}S za}H3?fsou-C>VfkHFz~X9b?{aLdVuOgH}jJ69uDkr_*tf8-4BJpX>4wcs;bgfdl@V zywhZy!Hf$g_Ov_#hNSZ~i1f#Q=Er~5WS?&-BgWh1aQU|3py%a(`|i8@rTEYA=WG1u zFY*DV;_l%z84ZFv$0_D}_R~3vz$}k#X#G66pj@uVU=F57tjnc@^D7!BCmN8M-Wi5r zolPIQ7dTK}nw0d!59L?mbbNJ2MZFyLrW`TUlu>{)5TW}9 z`4URHOYT5*&ysc)8Ehg~r7lhG0H8+lcu%4el56Vz!QoXAchL!i9YOTEgQZ@L&u%z) zr(|jPBq&4J-hB98x9$YY3z~v6euu@YnDE`wy2Z`+xc2^4I+DU*t10 z{`=u{n4}o%ozR5>z)MJYek_UGC`NpmX{>m-cb=ER#uvmnY4B?7r$-pYA>lck?|bpA zg8hU76^uciWyG+&OfKU=kL723l$z}^m(9b?_<}qDu*p?5oMCJg4*(LCo?#0ntqdJv zC@s|vHj|Mwf9saV$w=Fk7B^Fg%6Y@KFc+D$m5vvM8KR_EFiagKyyA8-?(xmqML{1@ zAB+e+OybeNMByXrV1c>^hLqzw&1j$E((%+4k|j$eiOOLBf$se?8nbb#Bs`x=B%fnI zY>Ypucwts*ELP)Qi_K=oOBWzHq&tj6l$~iHIhas?tFddLsy;MFLnw;Va(1{{G!hAlB*^i;tXZZq@(ilm7^vhJ);9GNkhuX znz?C=lJUT#XJh!u$spa0#NwNJ?Nec1eK|06bT))G2PucKjcQsCgD044n>^el0y-uN zCs6~sOG^)$aBP9qJUHwk9%E^BHoJ&fQ*t4%C^q}Fpir5>FJO2EXwIq2DfljIX#a1C z8VN|`)P-f#38_Ry04n*u8Rz*&?n9m|T1|VY@tiJgBH942G@BbiX+F_%Z7?l_Ls#ku4*92~;k{Lur% zy(4N)AT5p^>~=LaZPRfUYAVjx*om0|)x;!`P?sE!yEO#1)71=E#Ysw{R1U^5JzSKk zs8mu6Ai=XqiG?zJZjqx@+N@p}SWj|@Ma0h%c%#weB!Z<+j_6JR>qmJXWA?^KFrmEA zg)n%TW`?e5Jn97H^?z2_ z4vdF;b{G!^e0h+8AaUp6u?s8ZZjct_xK20&u8Rqzb!cx-@iF~L7q->>7U(=OlVY|dv zcTB?41>~PF@ICxteV${(YfN`pyqBp>8LBgIzOk7KL8=_xxDEpG+}ShVvFn)5h5?FK zi7Mu@Pk^86?{0nnXlYsOZo-;coWli~Ai3-YCf6z+ctG`q8bK+}xN@QmJ&AHALtTjk zoWaRHE*y?c;_OifQ8^IuSoalYGdYgOaRx+7b`UuuUO*SI#?QCst&^U*Ea||+HmVpu z5BrMs?M~P(G#dj4FGZWMJ+g4}+Ca%It`@+&_lI0&oHa9Rjk8RifO7yIG!ncOc(>63I+I`wcRBUTV zm#o}f94C6~wTt+nx;~62GAcx!94@nM&kj|r2&#KI#4gB))NA!+G`VqmG?!WM+b*)t zIxxQeuFmS)3B<*uEJo)H%h}QH!|hDD&A-W8tHC!p$MD14xE&`BzDfi1;!uiYuW`Z0 zrR#8eqKQs(^+e&b+XSmG(Met7S^_EC@?3W7O^AX-0&yv%eMvE-0yD%gco7k$Jp$%a z@_KM}pEw=H81h3ib=lSu%qc|-2-m8Y&a!>qMQqsJXmkMpA+Gn;-g+pDc>#xZ2)|)& z&xq8wn=4C8j~17f7nfG{mLIMzJy>0O`1fYVrDZg|3KguJ5SUAw0SGwv$Aq7bm{b!E zoJYWaX*@7G1SEYep>5t(7UDegq`?(-0VlD|NS9@GTbiy0lB!y4c5*e}c8Ifc2rzZ7 z&}5g00n|j^CQu_IC8$e(JCzOesq}nizkR}CEQCtA<)uo`H=+I|YVVSErv5X#$Jf|D z{jDE>oEABXPV-Iko16rVzWmZ8lg~RdFCR0oq2_oQ#p7du9v?0n z@mTqN9Kb%xT+6O7T*3Oo;HhWMrU53i>y%Loi-_f8g5;8$SX_4KBJ>78wT>+M@Sr(w zjt(Pr%{4>P$zcX+n@P^4)+DB8L$vaY6)<+rMRs1DGMm5wcLQ(hlkm{C=nwnsHHH^Z z$%u`!6&t>G#}W@%|NZ@M@`D3_4L)M=BWyXUM=VQt7F`_*7Ojm&>6RhJDu#&OJb8qoR!R8c1Y?Y)HIy zi9u>sgou$Hg~Of4r8BLD2#k$$t>g#VMJ*_aFI5$PG&KT$>(vXwb}g^A@)sqL=*+?^fx{&hs@rFHy(;m<-b^ZW zbb_bmT;TZ=d}SIKQxnByQpG@kM}*>LnO3evu(27?(MEV|hRB=gmL-fjeG$Yl`9Cw{ zAJ_b8s?>_4^-QU-d%QD{N{)z}cUG_<&c6_c(Lmt>B>8+0i0}^iKLaC3S_?Yhj$!jNVOw-b6pyb6MeQWg?}&Vmu1 zs-W^P+&(?tMoI-#v)M!g<~zf1&6pCrugBS;*)wiu)LywR!G0KW#%B1)Syniw*22Q9 z6NzWAhlt|XH;BSRP!Vqhrf3lzOF9{pb`VQ|$ZqP(iD#9Hqx_ zo|3%D)Fy&yRazyJ7Fm)HjE1TenQ?p#tvGhU?rwARm`7cGLi^6l7c)I_oD=65TX2a+ zxh*9nbDA^c+yWlUA;Q2>(Q%JHpL7Vi3w^Sr;jK_F>c^gOQk=$}4-1zzJh|dy&Q|Mi zDR)oLC}fVmeE8|7AO4$83UY08uo#9*cr5*42};p3iyFaELHU-@K@O^Nej;0ycEcTK zH)#3C_PuFKE2Wq!4D(PSNlfw{es$(t8G~Ez&p1oD+TY>Z%vv)Je;FNYJ*em({(>(q zzIEze>A_F_L%b(w!p09t#V#Zy*W^^L`A93LcVe#EP@5~*(8>^Rd(Zq+*<8tHGZ7^4|z#@#yGtg{h%lBx38*tGY_a%ZtGNZZ)Nkuw@x)bC50~+ zaEkF@XYgS26xB6KDYtDKpJIjvr*6Ei(4jg|glbhP;mDwM5;qY<2#qvr>JdrThFDbj z#w^yM4@zUOF`*TB@R8ohv8pqqbD&l?5tSoD9geL)M+eJI$tY`-{0UbW=qbsKwHtLo z$xdnJ(#;U2hj%Hqg%G_ZcT5!W5-pp=Zk8s|=Aest$-3wS2brRs1M*$0(4-JGD&atq z#|B3FQWL0l95Uzbk&mZy=z}U!Su4&h5k9(dQgd+rm-hgJ&7EvnWyertp0HeY627b*FUik;w0p`F)o-0%gnfITI;+Bo2`T9@Hff%Ia!Pe%+Z&qI<$(;z*k51yF z)7%(VCZj7K=fZ|hpPgwMNreWB+u7^ckSJY}zsZ%~3uyWVXr&7Q6WvR=W zrDThI3wYHo>Clm0@&1mEg;{n?yNN|+<6`t{23R&1n~eox@93j4L(AK;*|p(W`L{}p z9F82X)&9wV{JA>}=$`=?9f!~3qD_YXP2P3|-9;Ch?(Vf!-{ZJfi8td} z;4zKUD~ymUl_g-BqTX6!8OJM~E(lc$sgCJ$nY!DuYk|kCIc$LH^NGxUggU>>$JHqF zZBMMZuj}dtjGR@YQv>0Ww^cCoi34B0w|xSD>)6At%Sx3E(EO3wqw9KZ{Eji>m_3`4 z1lOpa)@~Prx>kFwY^%$PG|O>Q_Z<~?qaj@kDo$Bc_1@3wl`{XL39Ww%T((I$~)K@Z0(-l zHGXf-t5bVk;af2fr*(C9or7j=j2b~!j@ILk-F9q#=MZ}l;doO*j+Sz+hs_xpZ^M#U znExu{ryS$fuB8-G1;?C|N_OdM%!dCrKJ)#**SEHR>u)~)gg)lPe^^<1^j*pSd+ED} zkG}eUe~AxDEnfEbf(@W!W1xa<_|a)J*3-#VM&XLvN1b40Y5Bg$I;O=*n&pkgw&cuA z$7lwHq1)BuszKsr%6&O3E+{Pa z7$vlMdX!LnLUlA`-^O7wLXS4eNV+REnw>6-qoYwH;mBtC%J_I?F_I+`nqY{UqtTQ! zPx^XkAi<^&rx+e0$A<(=5hFJQJ4#U*r@2G+j1)GgL zeuUm^bY)s?G;pOUjWErH7Z=EVA_=kB3&yUhyh6#G=-LrrBr$446qk;tLv|{#hsFh3 zU87c+Zh)m}hS2|uUa-6MZ145jPA};12HQJZzxJQ@o(9deUHA=$&FlW&i>+6C0hHKT z+uZvt*m@SMZT=Sg(%*dA4SIju-s$b`23tFg{>$x+eh;4YH`g~_Jq79%Jb`+c8+xM; z2n>zxZ3Wn&G}Z6zVq-6RJL@mt=h~D0Mt|?OZsS>hZxh>mwzU(i1>0*od;RrS8*4kk z_N$%kt=%4U{}h_t>~B8XfnItqdz*V9^a{^{-mmZ@*nP3Kv4LGR)?UHrcW`_GlFXg{ z^A~%;i>-~PJ$U$}2P0d1veDzNU{dQFYyFqq;OW}SwdXymwFRy0G_V+tE_nT-hmWwo zHTeJfUVm#7r?I}Zxwiv9yD-b0JyZ2{f4A2S)^_^42#{wxTQ9o}1SizkqDG+JW{+Dz zPzTjZSG7rEwERka5c^a%S z>ktN%`Ttc3rvyNp2rWwY;q<-??82w+{T6AH>N9%sv^NQ_^p-4vfx#2?)=dl z#g4|EYqj6ua=at^B|UfH(uF@ooEz9CRPnAWh9k7~8w&|pf{>YrQ_GnU_B)6t#ffIM z_3dn+-z$_PyOwG?bk&5Jp^FafkWDHOq8fnakZ+safTA0dM{J@V?bN%CB2iPKNkBTn ze+d6@emK1*YaFQ0YAv3+hSrvak+JO`@PI|;aw*R{0SoC6TJHnr-g?;yK2!_uUPP02 z(hYtO*a|1O+)oa=@bB*j!DITgrt??)F&27^+|+{KFBL+Y&$70ZkUpxZC~Q@OAz1P=BqC!0ggP{*0H@OX zrw3knEbx>6zN}`Lzr>>Y22hKcnGLA}H=F|ZxR{U;nPo364$*=^3XaFgpRozZLh)m? zJywiIqvJG#EqR8-9CzxVI9cQ{)_ELdM<*KN1BgaU-Kimbky5A{rh>sDlbv)D7^A>} zhMu{?q!MuBL=jinJXGWK*crBc+uM$!mWD+t85`o|D!!bI&|Y6unUaY|Vgk9TiNnT% zz64B=hTp?_P*7^;(R&!rYEXO-w}W*!OK9?d`%^gVSUiVdy}mE1#uoki?xc|BYq#rj z3bDGCqZ>$~j`Ji>NXyE;J5e?Q21sH-R*+?bZYp1I(=A4sT*9@rCWqxZ>+Re#!KP?w#`e2WHQi;) z-C83|V}n^|gjv^0q86xV1<)q`gS8PuAv$-LI|9?mRhu56fox)oOSy%8w+aF{X|VBa z!4{s@mK;qw*xr+sYz%^7QDZc{U1U0P#848L1e28XK4R%TL{u886|~GtEnIhE49YIN zACnDAGg>;jTxdCVr)b#XEet%c!@N_m?Us?k(R$4Lt<)gD9*fbdXT?hW*BF3{ZX8Cj zX-bOO_E7DNJ$q&`D}K*B91o=%=&BVTI;J<;k-8s#7B4`78(VjxOb-7!!{AyIim-+P zB#w79z(h59jH0Wqt*CBTl;~$XPEL{$i|RNO8v27smY(SZE(8?y-}YK?R+OWN(gz%- zQ*H=v1<usW0L(O0-t|o(E*le3%lOO)+00@+iS0=Zxc2p)5>$ycU2t<1>BjEG{2( zJlL1EQ3>79F{a}8;G9bd=N#MmSZXP^{`{ffw6RNhjJXC& zfiC7lxz8}JnitfDvP(h{*n}?(Hd0_*h|!^w{YM@-@GR2QfTqro6nUyL5Sa1NNt)&w zm=3+01}Ubn*AS09$$Xlfi}4g9xh`eShb8tF4bE|=b>+zEIu72t4*1~iV=ZZ%c*hhn zKI3gSkvWK~?z2QV5+{w32XX(Ni{^{O`$=?4+%wK#6Fk_JoDCBtX3p>fHnqE}KTG46 z$Ho=vcein^bRg&a@OMK>%`MC3;8DcIlBRRoF987s$OqL=>WLtcj-tlBvrh~b%r`KtD$Z8(0EhBQF|e$#^XEimWvW3gnP{DE^bWb92loi#CxyIeVI=JQr+Yl#Vec9B|NCf(xJy z9zfsntJUCl>LG(!V!9n_6a{yo8;ip3;r%5me6VcK;xg_z76hbXzbmYWp(Mmjdwjj) z`XsUuc&74}&xZrKY_aC}OLck}hbb^erUi)hX=56PFetXarqeQmqC9!OLCaPH( zw7*+*<#o@%&Laj0w&@sAhL2rq8?5sS+88-ln#3(X2%3LuRw2@nZ9>gt6`IDTW-ZuV+?6z;r!IW6ML#==?k3aPhNCW%K_eXwT*CxG$f zLh8s;FbdW*C*Ni&PU`UUG$FBaOd9TsG}A0x_0DznZ< z)L6s{;zP@Lm|gZ3vJ2 zReeYWhzVFcheH`KW08KDZ;Jzp!=1S=7fmR3Q%asR8pE@KdWFBi;zjUn2Q_{c8%m4D|0emm-|3}|_ z-TzA#h*iL?w;*jtjkD@QHGRE+y%0!_^$a5ZN5(q(rQXF01D2mV;+s&lGmuf$G zGt7}HNV}U@Mz;g!GYoUp=1k9w~wKj35hrI7Mm0rC;cmy!E)H00Y!98j*?<@ zg?zUB$lYa7Z!o*ACW8-+n$@JhktuRKVsBM81qID8tn>k*yudl0U3 z29R=5#d#_>x?EMu4M2Q?5Iq;vHC+)3cY`H*Y1VMH(l`kax+dx&L9bvJ)rps}T9Ym! zGc74X87}UfcoG)rWCL$+l;KgmWO!}xi7uh+dSMhRFAAi{B_?{t& zAZhmW75Ty7eH07e5A5V4kC2|S$~ z*)#IXo*tJrXQ|oKV{Wv;WKNujL}vaYzQ%FhdF-X5MeV5n2KF}=4s2Jv-A^f(m&leW z7UTru)JyP$(_<6N+Fx_Gv#xZ76ccBjqbpL9pRDuw$*q#$hNqXuk-L%$ME2eO=Rwl8|E0j`^>`zgqQI*jq}Budws8H$NmP8QikfR+N}3{r^$y4L z*q=F;>oDj?q+sNBDF9Df+c%T>RUX^+$W7IstpA#+&z#9Z6$T&$U~(IfzP$;c`rQpb z!qn%L4L?Hs67r$xM8&>B;+cFnp+}y_Y+uUE66w1L12L}%x~g-~5qx43?h%h^att`c z%fdA&gm%?r5w8%iQlf7@h-M`EE@$=@MxvDeyFS%--VNTm%bSp%O1Z;O0_At+0QXdK zB^sE9y2Kg=#@K{49Y9Myhb$WBBaS*bwr2^yWHZwf6ii=o(y-JC2Nhgoh&TgDMTXTW zB7iw{YZgT3DT~o|PH3Auq;vi1RJ_V3Va9>Md-+iW>||Rw2Snq7LWyi^NDT(DX{u&T z;LF(=>sk=}lV_-5*%T*gdcwU7UY}s@IZS}3{dKMxk~DjRF&WIMVBn4F&dw-boz9Kn zq`vufQP3COhKN7{+w?*cWz%?Ovr>spI9mEXdL!1v6x*G__;$< zde4SSE&?&k)g@g3KyH=_ghvk+4}ms{FZx0=Pmag2fp6|1bSVyJd0%)-e9gYF#vQ6^ zL`<7U4=CISM;a>ypgry{_ZZu@88bJ!U8LF_Uk70s!*-k{>7YVuP;f<@ zkCVKoEBi+DsjcOe`(X>M^IFScywd7QJ!@pbBge#`5n=rE^q!z5y~ePNq4)f2y42F3DSfks$QN-cb`rjEq4 zpb;4k*}4dmL!z3!2Ed<@oN^o;sxp(9{_|)A^?oY~(eL$oi{Cwbz`%s5FOmhXqRsUb zqkch%VgN7s$ETACjdZvwH_5^VMQoIXk@(AqH|>TNv5wi&CUGT>sWwN}(s!#%OMK+k zy|28X2Ok(H1!Kiy9;Y0z8|e|ro{elwk%|i8TZWLJilcO2SRl!&60cf=x;rXot*!^{ zK?6frk+6dHN*?F01>JOUAvolmXOnJO@Fi@R^$)g$^5yhemL@5jEB%kkrn@o$xSap! z7c<+(7XZ5AB7>V%vCu+YwBWi+GBb-ZPjk7I*nEo4JV*1Eeww?n16ir2(50DiX`iV? ze%hC^AVOop_XX0H=;!gZ67dEbF~*sQF9>*Y6F2Yh&dp7^*Kl|(GLR!v*WBynQP-<6 z<07xiyE=P)o$1bBWvQd`k{SHUDd~P9F`GesdmO2A!8d4oEpISu2A(EWP)y-n2i{w=_R5Z8S@Wg}~ z=76^tORXXZ5s5~PD5O>r!eWpzQ>c+PRZU2y>6QT`wI`m=9@|G&a3>M6NXV=iV|~1| zILxC6L@In}HCR-1L<&+=_%N3%$6;nqLSxQJM^5W)%QCuB+g0C{3?`+-WBa&djBN@S z>qsSt^uhwqaI+P_p}H51QCD-ja)x(Oo*Uh{j2eR^rKqx}{L(doz&b%aM_J_g8v}2bOB54bN}$Sz zg^bh4mC1H?km0}vXl{>Kl1?+7DcnSGe7bx@L`7NMK$V2^f{tm?C3DBGV|JmUOs?hm zN?zUlrPak{8)nrHTerUytU9p>*`M;QsNbD&vG=kw99L1Yu17f^A26=X6dV8V0F4w$ zEaMK10CI*Ak1*;(nd1Zk-j~u&+lGqU@yzF2KFDY!c>(q9U^-C7DWZah;T$Ae0wx1m za|@N~64QzF+Zumd(jH0RajM9*w{S;YBzSjD@IpzlAChQEKBYWC7YOoDdHHI0kKZBo zk)cS?KD^?F&XcU*O_flPC@84=raTg=PckXZ<%8?)L$DGbe*d5zn5!k|BMl~pxuQd; z#kFrp?s0AlkV={t_`QP=2~mG`_Q)LI znY6=h=xo4~lnkjU4;Htg22PAJlJ^23PFoB&m$R`L&)@1L-Cu|w?FOjF@mUMgMOU$h zF0QYUqo&E#6$VeHe!y?0pwJDGPysO|X~g6q4U^#~Pk~UIRF1MwndhmSLO64bj@?dW zazaD6+3R*QP06j0KA3Y?#03D12yC zX!JfjKQIK0Lvb(z*;Q4P-Iym11)_zAtzc6x;LL=ZNC7W_9k9NL%m7$-9kQ8?NVJ?s zd_4(+7x3pCS$ArrMybU-1Jc1s7M~~SGzaEJ7uB&O4fT?b!=}VF~!PQzS zYwjeh+}@4p9O2sU(0d@iN7BK2+Q%Z$-9>bN=O064_$BleyDM@eEb=^fN7;atRl?Is z{nU!oC0Z%a5@4xOwMO2Pg(PaIe(c_$@zAYEi+672tps>1X%wqBrK=bLFEkmU6c z+^VCELECU6oi2`;f)Q{t7wG*B<3)Q{&bEf5gTW!!e~8|(aZbDk)X{@=5+->a+pCl& zi;-cT#TXlNSmgp7j??q{;{;fAh-6p9I`S~HWPl|UZMYG#Q!@Ud-$r!F`8K%7((!TF zs6B&cfvZCHJ~S50_F{<)`~UILN3qPz$!GKWpnfMgnvNn-B2ow(y8-pQlL$zM7@2G| zBHTZV2N<&!_QTqKYS8E~7S znNrL8n~`GXoJgv@Z(o|kPzUUvC@ACH8Osb4qGm+?vN#UH$vWHms*cvC{@a_-q-A@Q5u~c6(JLkwPt`-ig2Sbnrsz#gcy=z^J!(%SPwRP z0p$=pd@NjEN~YC7DPn(QIha3*-K>*xI^zQ2dmhLBJ6A+NON}n56%2v z{WItP!B9((3H3DDRm$YSIn3 z5NALiy8$LpyT8KcSjhm(h=TCmfpQ-j9^Z-hq8MLBgZL=H6zgmV)iuVTEXrt#S?MTB z&T_upZ~Y=lpO@Qfd;KRHy^rlcN0s;=D_`^fe3=gh_=ySf`9OW}iX z>7ad56q9`Qo{J_VR~x~Np0VU`lpfyW;`gL_elH$#F@7GN0crh@-AMnYpZWVgM6ZG4 zahiQ}1fY5Qf9YX4|Htxo%S&JP|CjhsY#fY}(+Ix}^NUFX*PN`G?wN1&EJPXl*WLS{ z_L2R6mJTp(W>{PnpTCcJ`+sHGoc|B+{Qn}KzXY>Me*ow9{cyQ4yF}wJ ze+g9m)_|r`WC+4EJHB^`D8&sdHOkNL!{pk5`SLpNifqVSBhYx3; z|4XI#U&{|3-M{~Tf`^}fDAmvZ=lj39{+FK}18%?m50{r#zOMh5_|&aGQs~dw$49LH zqeshM*Z)g=X08AB+FoySZ}+qGF)#n~gO$?#Z~4)8D_`S3ev!}GfFssNqoBVX>~L1b z=P02M+S^fq2?9HfMw7zZquM++d6=8QSsaOa++-9cdlL+1ojW;^$xG;YnqpXgv>B5~ zHj=|*lBMW>9X7Oxn@pOrCH)f;365Ik9ay>j4zKy(>ytkyNz+W zs5z&z^eP$^SBsd7x*H@}7N4g_G`_ZkV2sFnKBwa z)ba82v@0$(`Sj?-43aH`a(2`pGods`HymuP!Q%cdWwBAS1k7D=fi`9-JBef|88HFu zb+IrF_t78IB;&l#Yza|JF>N*XO7OH5tn*iV6z6%AB_oW9GejY}=3c^$P2YNyW`L<2 zfIdMR{MpMxaODZ(*3K~BxS|bi@)Z5u7}a!D&M0>qCBPU=kJ#tIg269kQus+5k{(tP z$|FE=UC5n~XQ%n%Gn0k5>73pLys1cjf%g%a0y?_u%XK|0O;)S9ANQ6Ra#P{ZPr*T$`@Bu@k#VmFcKJ zML#;ba_VM$atPZlqZrC~_K<=J_N!!(Xt*@F%c;0UHJzCMk;SP@p>^ z$LMHUI|As*0fLSIW``uv4x(WO5q!!Z8Zxm#dNj4P5Ng~*Ur;^>f$(KXG|DZAHP27O zPm@ja*%Vu1H-VQN_Wkiu2&1*{a&{QZ8_ubKA*8R2PZTDrLwb{wQL-dn3m6)JUO?U9 zjO7&L4M_t&EG`f;H1h~W2m++RY;1^18KTRW5hu?%z4zXW{%)|l^=$9;+D%Z(h4WW1FG3fmYH@0B+#oES(Kg-6}>&@N{4&9w%@T3=P z^w*wj^spnEAZ@mv+02V!%%i7LwU1@W-_rI^85WEbY zuDx7)4pVE-fe0+g`m3GZOB^zQVfWRO-M#+atG! z-NII0_jh|8SgQUm7U)yAu=vpDE1EJc5sa!qUmb+)(n1FPXTjRjU;8+0DGW=$+ZQw; zkgdNEaDM{7GVA zU*5~q66bN zC-DD;^OtM?v$eAyzU*(}pY651^%wh#z=iDeHhOEjy@UO`PhRymo*o<=$OuFx^v4t# zro#*xL>DEveY3A;IuSu1hlZ4kaDD}B;^mK6pE~RY)FA~r38+){4;7nIjmK#iviP#d zEQtP$voxp1>_Dj{8Y;C!L4^=7S;8D6iSQ_T@*pi1^B7~dkWg-bGLa!{Itu;5**;m& zGn$-4W8iQz0IU;x2s=8tnw$WJ{iuOjqS0tki#lU+8s`;9VG~LBys6m5b(V-Z?>yMm zwf&XX7Hh2_P6Ta~5DD!Bn%d!rG00_Kq>=yzdHFCP-x_j?&0>kNf?9$y0NYUZ zI>r!!`(%_+;!1>+Mo^=M_Ab&&A4-T}Z)2hY-lOc>mt?i0CH%z-ybbZCORV?2NouI& z%G4yP3eye`=mu^M*sV*|qzZT^G?3%`!&dNUbB}PigE0c#BIo<7=+boFS!Aa?D%Lr$ z^%x(k^@6+l(lvuWmqmX`=6NWhp{*0v75uTM@Zn51wUkTyJYLc5C{Ae;} z3Que3!s`9ugRgnjGj&&CFxZ_U-A-g*QvU%{M3X~B&fmiNp?6vbFy!(lL_0BsONA8?_A}KnY{Jguo z`a3<+N~KNl`$1_1p@F+WGi)N>OBGqfZA+fL6U3p~bYR_P?QEO6c8k#7T_j_&i1_>V zi#TJfHH+ws;B)N*fSU!10PhKrC3h_D8Gjp)QA-Lf7gGHF)}X46tOiQl>1PBG&0bGV zIgxY>G-?hDFSiEtkB7s|oM9M)C>wCB3JwoZn%o2<*$hyzXbvgh*QTSw#AsN;Q|}xB zcY)Ei`PWbQ1Au*3e*YX?C|9{Q7nA{KmCq9nNjk!S9+YfbnGcHWA<4Vvv{gQ)Q5cK7 zILU?e;N%i*Sbz(&Fc?(Ztje;#EEAmE>56@LVb*GyqEO;XXVI37Zy6SFUMwyDq4!cXs5#a>@8uI_@D=m zU6u+~_`-W4YwjYCgz0e31s4bxrKFFR2(%}1ALwdaF3t5u`wAGTfBXZE6bUbI-V#Sd zj$GbUw)R|({HEz&;(Q3YoJ*{&iAf`Zu?T!BV;Vh-20jN?YSkGV*W)u09xOG*OA>D? z_BXSI@SEfZ)y8yoVXI~!)V7@+O+!Pv`cq}hzWr2P)@j~UubJ8{C&n$^WMZ=AZap#X zVdlhy<3Y3~HfM>so<$w2yGOmg-P2wox;dfS+yR(^%~CL>>xXbxhd>8hsdqU=ukD!X z&FJ&oxu2LyzfZ@f7+*IY53XAaC&Irx^|m!Firv{o7tc$ZrgFyqeqWC_KLxF&7HQjj<=St^VF3G)iqw!D-Purxgn(R9jDReBJA{m;q(QSWicfH^D+uWjXw8STd!KO&;lDcAQ6Xr_l;yi55JSG-fvrvU2DbGS1!jn682jT`xavJ*j zNdz}Ec<&b!%I57eMk{-X(op5xH#(i;V3YhwG=OPCqx51Gn|7m^H#B~^)Z^=$c40C2 zhRxm{oy+|CO*gc=5_dmlCH|?P|3nbq8kFuNjslJyQ3`6%S|e(8gws1BI`wy^d{O!N zpZt8O{QL)cek2E&)3+i+MHrbl@q<2!c51dh?9*0GDE^Xrm@T=(`C?-+eLCFxWjDAg z-*I4ZFR|8D?VSbNy6nh^uH1d(TwkQn&ozbYP396BxvJE+k$}AlrLjB5O5GIj40(-2 zS9o3F1If~u=(@Q9b~zGb<*Yf0a%u)cbY{-AS8twUN}1=M4?PwotOleMTcnc!=19M| z#I|jRj5aUQy3TWBjTGc)ZsbjZ54UlNl{2BtO^Q4^AMG`tZn@q$NDbMug_C`b;vt38 zWL@YK-i;_v1Dbf#uqlTFswyK*=8&(JTFNymn26-*aOAXIl7x(wa1h8TDPiHu0}?2V zD1v*A(gRUz`HhU?OKBn*^ASw#T2c)Dol!*5>yQ8&PO`_6)u;4AI1d~ zq1ybIA2>h4760e5Z6Z6e?FqYa4YjzeFtiQj374vN- Date: Mon, 3 May 2021 11:27:45 -0700 Subject: [PATCH 06/83] golang: update to version 1.15.11 to address CVE-2021-27918 (#890) * golang: update to version 1.15.11 to address CVE-2021-27918 * golang: update to version 1.15.11 to address CVE-2021-27918 * fix licenses.json for golang * fix licenses.json for golang * address PR comments Co-authored-by: Nicolas Guibourge --- SPECS/audit/audit.spec | 4 +++- SPECS/blobfuse/blobfuse.spec | 4 +++- SPECS/cni/cni.spec | 4 +++- SPECS/coredns/coredns-1.6.7.spec | 6 ++++-- SPECS/coredns/coredns-1.7.0.spec | 6 ++++-- SPECS/cri-tools/cri-tools.spec | 4 +++- SPECS/etcd/etcd-3.4.13.spec | 4 +++- SPECS/etcd/etcd-3.4.3.spec | 4 +++- SPECS/flannel/flannel.spec | 4 +++- SPECS/gobject-introspection/gobject-introspection.spec | 4 +++- SPECS/golang/golang-1.15.signatures.json | 2 +- SPECS/golang/golang-1.15.spec | 5 ++++- SPECS/kubernetes/kubernetes-1.18.14.spec | 3 +++ SPECS/kubernetes/kubernetes-1.18.17.spec | 3 +++ SPECS/kubernetes/kubernetes-1.19.7.spec | 3 +++ SPECS/kubernetes/kubernetes-1.19.9.spec | 3 +++ SPECS/kubernetes/kubernetes-1.20.2.spec | 3 +++ SPECS/kubernetes/kubernetes-1.20.5.spec | 3 +++ SPECS/moby-runc/moby-runc.spec | 4 +++- .../nvidia-container-runtime/nvidia-container-runtime.spec | 5 ++++- SPECS/runc/runc.spec | 4 +++- SPECS/telegraf/telegraf.spec | 4 +++- cgmanifest.json | 4 ++-- 23 files changed, 70 insertions(+), 20 deletions(-) diff --git a/SPECS/audit/audit.spec b/SPECS/audit/audit.spec index ef96e339bb6..6541183e9e6 100644 --- a/SPECS/audit/audit.spec +++ b/SPECS/audit/audit.spec @@ -4,7 +4,7 @@ Summary: Kernel Audit Tool Name: audit Version: 3.0 -Release: 5%{?dist} +Release: 6%{?dist} Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha8.tar.gz Patch0: refuse-manual-stop.patch License: GPLv2+ @@ -173,6 +173,8 @@ make %{?_smp_mflags} check %{python3_sitelib}/* %changelog +* Mon Apr 26 2021 Nicolas Guibourge 3.0-6 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 3.0-5 - Increment release to force republishing using golang 1.15. * Thu May 14 2020 Nicolas Ontiveros 3.0-4 diff --git a/SPECS/blobfuse/blobfuse.spec b/SPECS/blobfuse/blobfuse.spec index 9f4dc250169..3f409818f0b 100644 --- a/SPECS/blobfuse/blobfuse.spec +++ b/SPECS/blobfuse/blobfuse.spec @@ -1,7 +1,7 @@ Summary: FUSE adapter - Azure Storage Blobs Name: blobfuse Version: 1.3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -47,6 +47,8 @@ rm -rf %{buildroot} %{_bindir}/blobfuse %changelog +* Mon Apr 26 2021 Nicolas Guibourge 1.3.6-2 +- Increment release to force republishing using golang 1.15.11. * Tue Feb 02 2021 Henry Beberman 1.3.6-1 - Add blobfuse spec - License verified diff --git a/SPECS/cni/cni.spec b/SPECS/cni/cni.spec index 5a4f9eab901..12b9a78a5b3 100644 --- a/SPECS/cni/cni.spec +++ b/SPECS/cni/cni.spec @@ -1,7 +1,7 @@ Summary: Container Network Interface (CNI) plugins Name: cni Version: 0.7.5 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 # cni moved to https://github.com/containernetworking/cni/issues/667#issuecomment-491693752 URL: https://github.com/containernetworking/plugins @@ -39,6 +39,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_default_cni_plugins_dir}/* %changelog +* Mon Apr 26 2021 Nicolas Guibourge 0.7.5-6 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 0.7.5-5 - Increment release to force republishing using golang 1.15. * Sat May 09 2020 Nick Samson 0.7.5-4 diff --git a/SPECS/coredns/coredns-1.6.7.spec b/SPECS/coredns/coredns-1.6.7.spec index 6e51a3c428b..43660525caa 100644 --- a/SPECS/coredns/coredns-1.6.7.spec +++ b/SPECS/coredns/coredns-1.6.7.spec @@ -3,7 +3,7 @@ Summary: Fast and flexible DNS server Name: coredns Version: 1.6.7 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache License 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -51,5 +51,7 @@ rm -rf %{buildroot}/* %{_bindir}/%{name} %changelog -* Wed Jan 20 2021 Nicolas Guibourge - 1.6.7-1 +* Mon Apr 26 2021 Nicolas Guibourge 1.6.7-2 +- Increment release to force republishing using golang 1.15.11. +* Wed Jan 20 2021 Nicolas Guibourge 1.6.7-1 - Original version for CBL-Mariner. diff --git a/SPECS/coredns/coredns-1.7.0.spec b/SPECS/coredns/coredns-1.7.0.spec index 0c78b0fd495..2df9781a596 100644 --- a/SPECS/coredns/coredns-1.7.0.spec +++ b/SPECS/coredns/coredns-1.7.0.spec @@ -3,7 +3,7 @@ Summary: Fast and flexible DNS server Name: coredns Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache License 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -51,5 +51,7 @@ rm -rf %{buildroot}/* %{_bindir}/%{name} %changelog -* Wed Jan 20 2021 Nicolas Guibourge - 1.7.0-1 +* 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/cri-tools/cri-tools.spec b/SPECS/cri-tools/cri-tools.spec index 42ad174de79..94e08634d5c 100644 --- a/SPECS/cri-tools/cri-tools.spec +++ b/SPECS/cri-tools/cri-tools.spec @@ -3,7 +3,7 @@ Summary: CRI tools Name: cri-tools Version: 1.11.1 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: https://github.com/kubernetes-sigs/cri-tools #Source0: https://github.com/kubernetes-sigs/cri-tools/archive/v%{version}.tar.gz @@ -61,6 +61,8 @@ cp docs/roadmap.md %{buildroot}/usr/share/doc/cri-tools rm -rf %{buildroot}/* %changelog +* Mon Apr 26 2021 Nicolas Guibourge 1.11.1-7 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 1.11.1-6 - Increment release to force republishing using golang 1.15. * Sat May 09 2020 Nick Samson 1.11.1-5 diff --git a/SPECS/etcd/etcd-3.4.13.spec b/SPECS/etcd/etcd-3.4.13.spec index 86f741ad570..57777215e20 100644 --- a/SPECS/etcd/etcd-3.4.13.spec +++ b/SPECS/etcd/etcd-3.4.13.spec @@ -1,7 +1,7 @@ Summary: A highly-available key value store for shared configuration Name: etcd Version: 3.4.13 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://github.com/etcd-io/etcd/ Group: System Environment/Security @@ -74,6 +74,8 @@ rm -rf %{buildroot}/* %config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml %changelog +* 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 diff --git a/SPECS/etcd/etcd-3.4.3.spec b/SPECS/etcd/etcd-3.4.3.spec index 457fce3f123..506a4bb6de6 100644 --- a/SPECS/etcd/etcd-3.4.3.spec +++ b/SPECS/etcd/etcd-3.4.3.spec @@ -1,7 +1,7 @@ Summary: A highly-available key value store for shared configuration Name: etcd Version: 3.4.3 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://github.com/etcd-io/etcd/ Group: System Environment/Security @@ -74,6 +74,8 @@ rm -rf %{buildroot}/* %config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml %changelog +* Mon Apr 26 2021 Nicolas Guibourge 3.4.3-2 +- Increment release to force republishing using golang 1.15.11. * Mon Jan 25 2021 Nicolas Guibourge 3.4.3-1 - Update to version 3.4.3. * Thu Dec 10 2020 Andrew Phelps 3.3.25-2 diff --git a/SPECS/flannel/flannel.spec b/SPECS/flannel/flannel.spec index bf3e4ee8848..57e026542ab 100644 --- a/SPECS/flannel/flannel.spec +++ b/SPECS/flannel/flannel.spec @@ -5,7 +5,7 @@ Summary: Simple and easy way to configure a layer 3 network fabric designed for Kubernetes Name: flannel Version: 0.12.0 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache License 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -58,5 +58,7 @@ rm -rf %{gopath_flannel_folder}/* %{_bindir}/flanneld %changelog +* Mon Apr 26 2021 Nicolas Guibourge 0.12.0-2 +- Increment release to force republishing using golang 1.15.11. * Wed Jan 20 2021 Nicolas Guibourge - 0.12.0-1 - Original version for CBL-Mariner. diff --git a/SPECS/gobject-introspection/gobject-introspection.spec b/SPECS/gobject-introspection/gobject-introspection.spec index e31eb087f47..15cf17a57ae 100644 --- a/SPECS/gobject-introspection/gobject-introspection.spec +++ b/SPECS/gobject-introspection/gobject-introspection.spec @@ -5,7 +5,7 @@ Name: gobject-introspection Summary: Introspection system for GObject-based libraries %define BaseVersion 1.58 Version: %{BaseVersion}.0 -Release: 8%{?dist} +Release: 9%{?dist} Group: Development/Libraries License: GPLv2+ and LGPLv2+ and MIT URL: https://github.com/GNOME/gobject-introspection @@ -139,6 +139,8 @@ make %{?_smp_mflags} check %doc %{_mandir}/man1/*.gz %changelog +* Mon Apr 26 2021 Nicolas Guibourge 1.58.0-9 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 1.58.0-8 - Increment release to force republishing using golang 1.15. * Wed Jul 01 2020 Pawel Winogrodzki 1.58.0-7 diff --git a/SPECS/golang/golang-1.15.signatures.json b/SPECS/golang/golang-1.15.signatures.json index 9abb07948e2..78b62b62498 100644 --- a/SPECS/golang/golang-1.15.signatures.json +++ b/SPECS/golang/golang-1.15.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "go1.15.7.src.tar.gz": "8631b3aafd8ecb9244ec2ffb8a2a8b4983cf4ad15572b9801f7c5b167c1a2abc", + "go1.15.11.src.tar.gz": "f25b2441d4c76cf63cde94d59bab237cc33e8a2a139040d904c8630f46d061e5", "go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" } } \ No newline at end of file diff --git a/SPECS/golang/golang-1.15.spec b/SPECS/golang/golang-1.15.spec index da8397f4afd..36cd6040736 100644 --- a/SPECS/golang/golang-1.15.spec +++ b/SPECS/golang/golang-1.15.spec @@ -12,7 +12,7 @@ %define __find_requires %{nil} Summary: Go Name: golang -Version: 1.15.7 +Version: 1.15.11 Release: 1%{?dist} License: BSD Vendor: Microsoft Corporation @@ -115,6 +115,9 @@ fi %{_bindir}/* %changelog +* Mon Apr 26 2021 Nicolas Guibourge - 1.15.11-1 +- Updated to version 1.15.11 to fix CVE-2021-27918 + * Wed Feb 03 2021 Andrew Phelps - 1.15.7-1 - Updated to version 1.15.7 to fix CVE-2021-3114 diff --git a/SPECS/kubernetes/kubernetes-1.18.14.spec b/SPECS/kubernetes/kubernetes-1.18.14.spec index 29904427ab1..58082954e34 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.spec +++ b/SPECS/kubernetes/kubernetes-1.18.14.spec @@ -270,6 +270,9 @@ fi %{_bindir}/pause %changelog +* Mon May 03 2021 Nicolas Guibourge 1.18.14-4 +- Increment release to force republishing using golang 1.15.11. + * Thu Apr 29 2021 CBL-Mariner Service Account - 1.18.14-4 - Update to version "1.18.14-hotfix.20210428". diff --git a/SPECS/kubernetes/kubernetes-1.18.17.spec b/SPECS/kubernetes/kubernetes-1.18.17.spec index 350c7847977..8d5b5f134e1 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.spec +++ b/SPECS/kubernetes/kubernetes-1.18.17.spec @@ -270,6 +270,9 @@ fi %{_bindir}/pause %changelog +* Mon May 03 2021 Nicolas Guibourge 1.18.17-2 +- Increment release to force republishing using golang 1.15.11. + * Thu Apr 29 2021 CBL-Mariner Service Account - 1.18.17-2 - Update to version "1.18.17-hotfix.20210428". diff --git a/SPECS/kubernetes/kubernetes-1.19.7.spec b/SPECS/kubernetes/kubernetes-1.19.7.spec index a84f6a8e866..d60098b9a0d 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.spec +++ b/SPECS/kubernetes/kubernetes-1.19.7.spec @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Mon May 03 2021 Nicolas Guibourge 1.19.7-2 +- Increment release to force republishing using golang 1.15.11. + * Thu Apr 29 2021 CBL-Mariner Service Account - 1.19.7-2 - Update to version "1.19.7-hotfix.20210428". diff --git a/SPECS/kubernetes/kubernetes-1.19.9.spec b/SPECS/kubernetes/kubernetes-1.19.9.spec index d7bb07918c8..6dba91c9aa0 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.spec +++ b/SPECS/kubernetes/kubernetes-1.19.9.spec @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Mon May 03 2021 Nicolas Guibourge 1.19.9-2 +- Increment release to force republishing using golang 1.15.11. + * Thu Apr 29 2021 CBL-Mariner Service Account - 1.19.9-2 - Update to version "1.19.9-hotfix.20210428". diff --git a/SPECS/kubernetes/kubernetes-1.20.2.spec b/SPECS/kubernetes/kubernetes-1.20.2.spec index fa4a0b2c148..edd9227d265 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.spec +++ b/SPECS/kubernetes/kubernetes-1.20.2.spec @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Mon May 03 2021 Nicolas Guibourge 1.20.2-2 +- Increment release to force republishing using golang 1.15.11. + * Thu Apr 29 2021 CBL-Mariner Service Account - 1.20.2-2 - Update to version "1.20.2-hotfix.20210428". diff --git a/SPECS/kubernetes/kubernetes-1.20.5.spec b/SPECS/kubernetes/kubernetes-1.20.5.spec index 799b1aae8b9..04948020a81 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.spec +++ b/SPECS/kubernetes/kubernetes-1.20.5.spec @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Mon May 03 2021 Nicolas Guibourge 1.20.5-2 +- Increment release to force republishing using golang 1.15.11. + * Thu Apr 29 2021 CBL-Mariner Service Account - 1.20.5-2 - Update to version "1.20.5-hotfix.20210428". diff --git a/SPECS/moby-runc/moby-runc.spec b/SPECS/moby-runc/moby-runc.spec index 8a19fda5ed6..ba202debaa2 100644 --- a/SPECS/moby-runc/moby-runc.spec +++ b/SPECS/moby-runc/moby-runc.spec @@ -1,7 +1,7 @@ Summary: CLI tool for spawning and running containers per OCI spec. Name: moby-runc Version: 1.0.0~rc10+azure -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: https://runc.io/ @@ -113,6 +113,8 @@ cp %{SOURCE7} %{buildroot}/usr/share/doc/%{name}-%{version}/LICENSE %{_mandir}/*/* %changelog +* Mon Apr 26 2021 Nicolas Guibourge 1.0.0~rc10+azure-6 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 1.0.0~rc10+azure-5 - Increment release to force republishing using golang 1.15. * Wed May 20 2020 Joe Schmitt 1.0.0~rc10+azure-4 diff --git a/SPECS/nvidia-container-runtime/nvidia-container-runtime.spec b/SPECS/nvidia-container-runtime/nvidia-container-runtime.spec index 2a47b782e9e..8986e9a4f6f 100644 --- a/SPECS/nvidia-container-runtime/nvidia-container-runtime.spec +++ b/SPECS/nvidia-container-runtime/nvidia-container-runtime.spec @@ -1,7 +1,7 @@ Summary: NVIDIA container runtime Name: nvidia-container-runtime Version: 3.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -33,6 +33,9 @@ install -m 755 %{name} %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} %changelog +* Mon Apr 26 2021 Nicolas Guibourge 3.4.2-3 +- Increment release to force republishing using golang 1.15.11. + * Wed Apr 21 2021 Joseph Knierman - 3.4.2-2 - License verified - Initial CBL-Mariner import from NVIDIA (license: ASL 2.0). diff --git a/SPECS/runc/runc.spec b/SPECS/runc/runc.spec index c5c42bbdc66..a0a182b98da 100644 --- a/SPECS/runc/runc.spec +++ b/SPECS/runc/runc.spec @@ -6,7 +6,7 @@ Summary: CLI tool for spawning and running containers per OCI spec. Name: runc Version: %{spec_version} -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 URL: https://runc.io/ #Source0: https://github.com/opencontainers/runc/archive/v%{url_version}.tar.gz @@ -84,6 +84,8 @@ make install BINDIR=%{buildroot}%{_sbindir} %{_sbindir}/runc %changelog +* Mon Apr 26 2021 Nicolas Guibourge 1.0.0.rc8-8 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 1.0.0.rc8-7 - Increment release to force republishing using golang 1.15. * Wed May 20 2020 Joe Schmitt 1.0.0.rc8-6 diff --git a/SPECS/telegraf/telegraf.spec b/SPECS/telegraf/telegraf.spec index 71c8a7de42d..2cd4426b591 100644 --- a/SPECS/telegraf/telegraf.spec +++ b/SPECS/telegraf/telegraf.spec @@ -1,7 +1,7 @@ Summary: agent for collecting, processing, aggregating, and writing metrics. Name: telegraf Version: 1.14.5 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: Development/Tools Vendor: Microsoft Corporation @@ -80,6 +80,8 @@ fi %dir %{_sysconfdir}/%{name}/telegraf.d %changelog +* Mon Apr 26 2021 Nicolas Guibourge 1.14.5-6 +- Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 1.14.5-5 - Increment release to force republishing using golang 1.15. * Thu Oct 15 2020 Pawel Winogrodzki 1.14.5-4 diff --git a/cgmanifest.json b/cgmanifest.json index b0d83af4db9..b814030152c 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1505,8 +1505,8 @@ "type": "other", "other": { "name": "golang", - "version": "1.15.7", - "downloadUrl": "https://dl.google.com/go/go1.15.7.src.tar.gz" + "version": "1.15.11", + "downloadUrl": "https://dl.google.com/go/go1.15.11.src.tar.gz" } } }, From 2512ad0f79168ff87c4fa5212b79c88d6d04c15f Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Mon, 3 May 2021 15:03:53 -0700 Subject: [PATCH 07/83] Patching CVE-2021-20208 in `cifs-utils`. (#910) --- SPECS/cifs-utils/CVE-2021-20208.patch | 263 ++++++++++++++++++++++++++ SPECS/cifs-utils/cifs-utils.spec | 68 ++++--- 2 files changed, 301 insertions(+), 30 deletions(-) create mode 100644 SPECS/cifs-utils/CVE-2021-20208.patch diff --git a/SPECS/cifs-utils/CVE-2021-20208.patch b/SPECS/cifs-utils/CVE-2021-20208.patch new file mode 100644 index 00000000000..ca28b230eb2 --- /dev/null +++ b/SPECS/cifs-utils/CVE-2021-20208.patch @@ -0,0 +1,263 @@ +From cb8b6a8b8ea983844584d8ada4d9aa4c88c997fb Mon Sep 17 00:00:00 2001 +From: Alastair Houghton +Date: Tue, 29 Dec 2020 14:02:39 +0000 +Subject: [PATCH] cifs.upcall: try to use container ipc/uts/net/pid/mnt/user + namespaces + +In certain scenarios (e.g. kerberos multimount), when a process does +syscalls, the kernel sometimes has to query information or trigger +some actions in userspace. To do so it calls the cifs.upcall binary +with information on the process that triggered the syscall in the +first place. + +ls(pid=10) ====> open("foo") ====> kernel + + that user doesn't have an SMB + session, lets create one using his + kerberos credential cache + + call cifs.upcall and ask for krb info + for whoever owns pid=10 + | + cifs.upcall --pid 10 <=================+ + + ...gather info... + return binary blob used + when establishing SMB session + ===================> kernel + open SMB session, handle + open() syscall +ls <=================================== return open() result to ls + +On a system using containers, the kernel is still calling the host +cifs.upcall and using the host configuration (for network, pid, etc). + +This patch changes the behaviour of cifs.upcall so that it uses the +calling process namespaces (ls in the example) when doing its +job. + +Note that the kernel still calls the binary in the host, but the +binary will place itself the contexts of the calling process +namespaces. + +This code makes use of (but shouldn't require) the following kernel +config options and syscall flags: + +approx. year | +introduced | config/flags +---------------+---------------- +2008 | CONFIG_NAMESPACES=y +2007 | CONFIG_UTS_NS=y +2020 | CONFIG_TIME_NS=y +2006 | CONFIG_IPC_NS=y +2007 | CONFIG_USER_NS +2008 | CONFIG_PID_NS=y +2007 | CONFIG_NET_NS=y +2007 | CONFIG_CGROUPS +2016 | CLONE_NEWCGROUP setns() flag + +Signed-off-by: Aurelien Aptel +Signed-off-by: Alastair Houghton +--- + cifs.upcall.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 172 insertions(+) + +diff --git a/cifs.upcall.c b/cifs.upcall.c +index 89563fd..9718d00 100644 +--- a/cifs.upcall.c ++++ b/cifs.upcall.c +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + + #include "data_blob.h" + #include "spnego.h" +@@ -227,6 +228,164 @@ err_cache: + return credtime; + } + ++static struct namespace_file { ++ int nstype; ++ const char *name; ++ int fd; ++} namespace_files[] = { ++ ++#ifdef CLONE_NEWCGROUP ++ { CLONE_NEWCGROUP, "cgroup", -1 }, ++#endif ++ ++#ifdef CLONE_NEWIPC ++ { CLONE_NEWIPC, "ipc", -1 }, ++#endif ++ ++#ifdef CLONE_NEWUTS ++ { CLONE_NEWUTS, "uts", -1 }, ++#endif ++ ++#ifdef CLONE_NEWNET ++ { CLONE_NEWNET, "net", -1 }, ++#endif ++ ++#ifdef CLONE_NEWPID ++ { CLONE_NEWPID, "pid", -1 }, ++#endif ++ ++#ifdef CLONE_NEWTIME ++ { CLONE_NEWTIME, "time", -1 }, ++#endif ++ ++#ifdef CLONE_NEWNS ++ { CLONE_NEWNS, "mnt", -1 }, ++#endif ++ ++#ifdef CLONE_NEWUSER ++ { CLONE_NEWUSER, "user", -1 }, ++#endif ++}; ++ ++#define NS_PATH_FMT "/proc/%d/ns/%s" ++#define NS_PATH_MAXLEN (6 + 10 + 4 + 6 + 1) ++ ++/** ++ * in_same_user_ns - return true if two processes are in the same user ++ * namespace. ++ * @pid_a: the pid of the first process ++ * @pid_b: the pid of the second process ++ * ++ * Works by comparing the inode numbers for /proc//user. ++ */ ++static int ++in_same_user_ns(pid_t pid_a, pid_t pid_b) ++{ ++ char path[NS_PATH_MAXLEN]; ++ ino_t a_ino, b_ino; ++ struct stat st; ++ ++ snprintf(path, sizeof(path), NS_PATH_FMT, pid_a, "user"); ++ if (stat(path, &st) != 0) ++ return 0; ++ a_ino = st.st_ino; ++ ++ snprintf(path, sizeof(path), NS_PATH_FMT, pid_b, "user"); ++ if (stat(path, &st) != 0) ++ return 0; ++ b_ino = st.st_ino; ++ ++ return a_ino == b_ino; ++} ++ ++/** ++ * switch_to_process_ns - change the namespace to the one for the specified ++ * process. ++ * @pid: initiating pid value from the upcall string ++ * ++ * Uses setns() to switch process namespace. ++ * This ensures that we have the same access and configuration as the ++ * process that triggered the lookup. ++ */ ++static int ++switch_to_process_ns(pid_t pid) ++{ ++ int count = sizeof(namespace_files) / sizeof(struct namespace_file); ++ int n, err = 0; ++ int rc = 0; ++ ++ /* First, open all the namespace fds. We do this first because ++ the namespace changes might prohibit us from opening them. */ ++ for (n = 0; n < count; ++n) { ++ char nspath[NS_PATH_MAXLEN]; ++ int ret, fd; ++ ++#ifdef CLONE_NEWUSER ++ if (namespace_files[n].nstype == CLONE_NEWUSER ++ && in_same_user_ns(getpid(), pid)) { ++ /* Switching to the same user namespace is forbidden, ++ because switching to a user namespace grants all ++ capabilities in that namespace regardless of uid. */ ++ namespace_files[n].fd = -1; ++ continue; ++ } ++#endif ++ ++ ret = snprintf(nspath, NS_PATH_MAXLEN, NS_PATH_FMT, ++ pid, namespace_files[n].name); ++ if (ret >= NS_PATH_MAXLEN) { ++ syslog(LOG_DEBUG, "%s: unterminated path!\n", __func__); ++ err = ENAMETOOLONG; ++ rc = -1; ++ goto out; ++ } ++ ++ fd = open(nspath, O_RDONLY); ++ if (fd < 0 && errno != ENOENT) { ++ /* ++ * don't stop on non-existing ns ++ * but stop for other errors ++ */ ++ err = errno; ++ rc = -1; ++ goto out; ++ } ++ ++ namespace_files[n].fd = fd; ++ } ++ ++ /* Next, call setns for each of them */ ++ for (n = 0; n < count; ++n) { ++ /* skip non-existing ns */ ++ if (namespace_files[n].fd < 0) ++ continue; ++ ++ rc = setns(namespace_files[n].fd, namespace_files[n].nstype); ++ ++ if (rc < 0) { ++ syslog(LOG_DEBUG, "%s: setns() failed for %s\n", ++ __func__, namespace_files[n].name); ++ err = errno; ++ goto out; ++ } ++ } ++ ++out: ++ /* Finally, close all the fds */ ++ for (n = 0; n < count; ++n) { ++ if (namespace_files[n].fd != -1) { ++ close(namespace_files[n].fd); ++ namespace_files[n].fd = -1; ++ } ++ } ++ ++ if (rc != 0) { ++ errno = err; ++ } ++ ++ return rc; ++} ++ + #define ENV_PATH_FMT "/proc/%d/environ" + #define ENV_PATH_MAXLEN (6 + 10 + 8 + 1) + +@@ -1052,6 +1211,19 @@ int main(const int argc, char *const argv[]) + env_cachename = + get_cachename_from_process_env(env_probe ? arg.pid : 0); + ++ /* ++ * Change to the process's namespace. This means that things will work ++ * acceptably in containers, because we'll be looking at the correct ++ * filesystem and have the correct network configuration. ++ */ ++ rc = switch_to_process_ns(arg.pid); ++ if (rc == -1) { ++ syslog(LOG_ERR, "unable to switch to process namespace: %s", ++ strerror(errno)); ++ rc = 1; ++ goto out; ++ } ++ + rc = setuid(uid); + if (rc == -1) { + syslog(LOG_ERR, "setuid: %s", strerror(errno)); +-- +2.17.1 diff --git a/SPECS/cifs-utils/cifs-utils.spec b/SPECS/cifs-utils/cifs-utils.spec index b9711a83738..32ebca02c1a 100755 --- a/SPECS/cifs-utils/cifs-utils.spec +++ b/SPECS/cifs-utils/cifs-utils.spec @@ -1,18 +1,16 @@ -Summary: cifs client utils -Name: cifs-utils -Version: 6.8 -Release: 4%{?dist} -License: GPLv3 -URL: http://wiki.samba.org/index.php/LinuxCIFS_utils -Group: Applications/Nfs-utils-client +Summary: cifs client utils +Name: cifs-utils +Version: 6.8 +Release: 5%{?dist} +License: GPLv3 +Vendor: Microsoft Corporation +Distribution: Mariner +Group: Applications/Nfs-utils-client +URL: https://wiki.samba.org/index.php/LinuxCIFS_utils Source0: https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-%{version}.tar.bz2 - Patch0: CVE-2020-14342.patch Patch1: CVE-2020-14342-fix.patch - - -Vendor: Microsoft Corporation -Distribution: Mariner +Patch2: CVE-2021-20208.patch BuildRequires: libcap-ng-devel BuildRequires: libtalloc-devel Requires: libcap-ng @@ -20,11 +18,10 @@ Requires: libcap-ng %description Cifs-utils, a package of utilities for doing and managing mounts of the Linux CIFS filesystem. - %package devel -Summary: The libraries and header files needed for Cifs-Utils development. -Group: Development/Libraries -Requires: cifs-utils = %{version}-%{release} +Summary: The libraries and header files needed for Cifs-Utils development. +Group: Development/Libraries +Requires: cifs-utils = %{version}-%{release} %description devel Provides header files needed for Cifs-Utils development. @@ -52,17 +49,28 @@ make %{?_smp_mflags} check %{_includedir}/cifsidmap.h %changelog -* Wed Sep 30 2020 Henry Beberman 6.8-4 -- Add patch for CVE-2020-14342 -* Sat May 09 2020 Nick Samson 6.8-3 -- Added %%license line automatically -* Tue Sep 03 2019 Mateusz Malisz 6.8-2 -- Initial CBL-Mariner import from Photon (license: Apache2). -* Fri Sep 07 2017 Ajay Kaher 6.8-1 -- Upgraded to version 6.8 -* Thu Apr 06 2017 Anish Swaminathan 6.7-1 -- Upgraded to version 6.7 -* Tue May 24 2016 Priyesh Padmavilasom 6.4-2 -- GA - Bump release of all rpms -* Mon Jan 25 2016 Divya Thaluru 6.4-1 -- Initial build. First version +* Mon May 03 2021 Pawel Winogrodzki - 6.8-5 +- Adding a patch fo CVE-2021-20208. +- Updated "URL" tag to use HTTPS. +- License verified. + +* Wed Sep 30 2020 Henry Beberman - 6.8-4 +- Add patch for CVE-2020-14342 + +* Sat May 09 2020 Nick Samson - 6.8-3 +- Added %%license line automatically + +* Tue Sep 03 2019 Mateusz Malisz - 6.8-2 +- Initial CBL-Mariner import from Photon (license: Apache2). + +* Fri Sep 07 2017 Ajay Kaher - 6.8-1 +- Upgraded to version 6.8 + +* Thu Apr 06 2017 Anish Swaminathan - 6.7-1 +- Upgraded to version 6.7 + +* Tue May 24 2016 Priyesh Padmavilasom - 6.4-2 +- GA - Bump release of all rpms + +* Mon Jan 25 2016 Divya Thaluru - 6.4-1 +- Initial build. First version From 29c8a6fdbde36e24cbb184c2c763011fcbc26eb3 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Tue, 4 May 2021 10:43:13 -0700 Subject: [PATCH 08/83] Updating 'ruby' to version 2.6.7 to fix CVE-2021-28965. (#911) --- SPECS/ruby/CVE-2020-25613.patch | 35 --------------------------------- SPECS/ruby/ruby.signatures.json | 2 +- SPECS/ruby/ruby.spec | 12 +++++++---- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 SPECS/ruby/CVE-2020-25613.patch diff --git a/SPECS/ruby/CVE-2020-25613.patch b/SPECS/ruby/CVE-2020-25613.patch deleted file mode 100644 index d1b52ed33ba..00000000000 --- a/SPECS/ruby/CVE-2020-25613.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8946bb38b4d87549f0d99ed73c62c41933f97cc7 Mon Sep 17 00:00:00 2001 -From: Yusuke Endoh -Date: Tue, 29 Sep 2020 13:15:58 +0900 -Subject: [PATCH] Make it more strict to interpret some headers - -Some regexps were too tolerant. ---- - lib/webrick/httprequest.rb | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb -index 294bd91..d34eac7 100644 ---- a/lib/webrick/httprequest.rb -+++ b/lib/webrick/httprequest.rb -@@ -226,9 +226,9 @@ def parse(socket=nil) - raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'." - end - -- if /close/io =~ self["connection"] -+ if /\Aclose\z/io =~ self["connection"] - @keep_alive = false -- elsif /keep-alive/io =~ self["connection"] -+ elsif /\Akeep-alive\z/io =~ self["connection"] - @keep_alive = true - elsif @http_version < "1.1" - @keep_alive = false -@@ -503,7 +503,7 @@ def read_body(socket, block) - return unless socket - if tc = self['transfer-encoding'] - case tc -- when /chunked/io then read_chunked(socket, block) -+ when /\Achunked\z/io then read_chunked(socket, block) - else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}." - end - elsif self['content-length'] || @remaining_size diff --git a/SPECS/ruby/ruby.signatures.json b/SPECS/ruby/ruby.signatures.json index 23d561aed19..166b36d1c1b 100644 --- a/SPECS/ruby/ruby.signatures.json +++ b/SPECS/ruby/ruby.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ruby-2.6.6.tar.xz": "5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f" + "ruby-2.6.7.tar.xz": "f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611" } } \ No newline at end of file diff --git a/SPECS/ruby/ruby.spec b/SPECS/ruby/ruby.spec index 64096fb37d8..3a70ef3c277 100644 --- a/SPECS/ruby/ruby.spec +++ b/SPECS/ruby/ruby.spec @@ -1,14 +1,13 @@ Summary: Ruby Name: ruby -Version: 2.6.6 -Release: 4%{?dist} +Version: 2.6.7 +Release: 1%{?dist} License: (Ruby OR BSD) AND Public Domain AND MIT AND CC0 AND zlib AND UCD Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/Security URL: https://www.ruby-lang.org/en/ Source0: https://cache.ruby-lang.org/pub/ruby/2.6/%{name}-%{version}.tar.xz -Patch0: CVE-2020-25613.patch BuildRequires: openssl-devel BuildRequires: readline BuildRequires: readline-devel @@ -53,7 +52,7 @@ sudo -u test make test TESTS="-v" %{_bindir}/* %{_includedir}/* %{_libdir}/*.so -%{_libdir}/*.so.* +%{_libdir}/*.so.2.6* %{_libdir}/pkgconfig/*.pc %{_libdir}/ruby/* %{_datadir}/ri/* @@ -62,6 +61,11 @@ sudo -u test make test TESTS="-v" %{_mandir}/man5/* %changelog +* Mon May 03 2021 Pawel Winogrodzki - 2.6.7-1 +- Updating to version 2.6.7 to fix CVE-2021-28965. +- Updated the "%%files" section to display shared lib's version. +- License verified. + * Thu Jan 14 2021 Andrew Phelps - 2.6.6-4 - Run "make test" instead of "make check" to avoid unstable tests. From d69e6c2ac1ef2e481da4c7ca5f549cbb53b6edad Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Tue, 4 May 2021 11:20:13 -0700 Subject: [PATCH 09/83] Update device-mapper-multipath package (#904) * update device-mapper-multipath * delete tarball --- .../device-mapper-multipath.signatures.json | 2 +- .../device-mapper-multipath.spec | 13 ++++---- .../libdmmp-jsonc.patch | 30 ------------------- .../libmpathpersist.patch | 30 ------------------- cgmanifest.json | 10 +++++++ 5 files changed, 17 insertions(+), 68 deletions(-) delete mode 100644 SPECS/device-mapper-multipath/libdmmp-jsonc.patch delete mode 100644 SPECS/device-mapper-multipath/libmpathpersist.patch diff --git a/SPECS/device-mapper-multipath/device-mapper-multipath.signatures.json b/SPECS/device-mapper-multipath/device-mapper-multipath.signatures.json index 64660640293..4ddac24b004 100644 --- a/SPECS/device-mapper-multipath/device-mapper-multipath.signatures.json +++ b/SPECS/device-mapper-multipath/device-mapper-multipath.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "multipath-tools-0.8.4.tar.gz": "ccd73bf67621161d9e42d1a770c3a7efff6e252433e8b8ed5f64a88cb5e7151d" + "multipath-tools-0.8.6.tar.gz": "ba781d981bd6e8efa5f9f3af6727f85520af6395958e852c1907f59f6124f08e" } } \ No newline at end of file diff --git a/SPECS/device-mapper-multipath/device-mapper-multipath.spec b/SPECS/device-mapper-multipath/device-mapper-multipath.spec index d7b6d4c06d3..b2a7c6fa6af 100644 --- a/SPECS/device-mapper-multipath/device-mapper-multipath.spec +++ b/SPECS/device-mapper-multipath/device-mapper-multipath.spec @@ -1,16 +1,14 @@ Summary: Provide tools to manage multipath devices Name: device-mapper-multipath -Version: 0.8.4 -Release: 2%{?dist} +Version: 0.8.6 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base Vendor: Microsoft Corporation Distribution: Mariner URL: http://christophe.varoqui.free.fr/ -#Source0: https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=refs/tags/%{version};sf=tgz" +#Source0: https://github.com/opensvc/multipath-tools/archive/refs/tags/%{version}.tar.gz Source0: multipath-tools-%{version}.tar.gz -Patch0: libdmmp-jsonc.patch -Patch1: libmpathpersist.patch BuildRequires: userspace-rcu-devel BuildRequires: libaio-devel @@ -47,8 +45,6 @@ It contains the libraries and header files to create applications %prep %setup -qn multipath-tools-%{version} -%patch0 -p1 -%patch1 -p1 %build make %{?_smp_mflags} @@ -101,6 +97,9 @@ rm -rf %{buildroot} %{_mandir}/man8/kpartx.8.gz %changelog +* Thu Apr 29 2021 Andrew Phelps 0.8.6-1 +- Update to version 0.8.6 for parallel build fix. +- Update Source0 URL. * Wed Jun 17 2020 Joe Schmitt 0.8.4-2 - Update Source0 URL. - Use release tag instead of commit. diff --git a/SPECS/device-mapper-multipath/libdmmp-jsonc.patch b/SPECS/device-mapper-multipath/libdmmp-jsonc.patch deleted file mode 100644 index 7c03c347bda..00000000000 --- a/SPECS/device-mapper-multipath/libdmmp-jsonc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 13 Apr 2020 19:22:02 +0200 -Subject: [PATCH] libdmmp: Add support for upcoming json-c 0.14.0. - -TRUE/FALSE are not defined anymore. 1 and 0 are used instead. -This is backwards compatible, as earlier versions of json-c are -using the same integer values in their present definitions. - -Signed-off-by: Benjamin Marzinski ---- - libdmmp/libdmmp_private.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h -index ac85b63f..4378962b 100644 ---- a/libdmmp/libdmmp_private.h -+++ b/libdmmp/libdmmp_private.h -@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ - do { \ - json_type j_type = json_type_null; \ - json_object *j_obj_tmp = NULL; \ -- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ -+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \ - _error(ctx, "Invalid JSON output from multipathd IPC: " \ - "key '%s' not found", key); \ - rc = DMMP_ERR_IPC_ERROR; \ --- -2.17.2 - diff --git a/SPECS/device-mapper-multipath/libmpathpersist.patch b/SPECS/device-mapper-multipath/libmpathpersist.patch deleted file mode 100644 index 8f0a687ae90..00000000000 --- a/SPECS/device-mapper-multipath/libmpathpersist.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Wed, 6 May 2020 09:35:47 +0200 -Subject: [PATCH] libmpathpersist: depend on libmultipath - -Without this the build fails with: - -/usr/bin/ld: cannot find -lmultipath - -Signed-off-by: Christian Hesse -Signed-off-by: Benjamin Marzinski ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1dee3680..ba1d73ba 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ all: $(BUILDDIRS) - $(BUILDDIRS): - $(MAKE) -C $@ - --multipath multipathd mpathpersist: libmultipath -+libmpathpersist multipath multipathd mpathpersist: libmultipath - mpathpersist: libmpathpersist - - $(BUILDDIRS.clean): --- -2.17.2 diff --git a/cgmanifest.json b/cgmanifest.json index b814030152c..173e55a1a11 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -880,6 +880,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "device-mapper-multipath", + "version": "0.8.6", + "downloadUrl": "https://github.com/opensvc/multipath-tools/archive/refs/tags/0.8.6.tar.gz" + } + } + }, { "component": { "type": "other", From 24f53228ba126f17756cd7c8ce1a8357107fe63f Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Tue, 4 May 2021 11:46:51 -0700 Subject: [PATCH 10/83] Updating cgmanifest.json to match version of `ruby`. (#914) --- cgmanifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 173e55a1a11..ea0a926e2b3 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6415,8 +6415,8 @@ "type": "other", "other": { "name": "ruby", - "version": "2.6.6", - "downloadUrl": "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.6.tar.xz" + "version": "2.6.7", + "downloadUrl": "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.7.tar.xz" } } }, From a6cbb2d860ef95dc59fca19653f2f588384dc1b6 Mon Sep 17 00:00:00 2001 From: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com> Date: Wed, 5 May 2021 08:14:04 -0700 Subject: [PATCH 11/83] Disable test_ssl_handshake in libserf (#916) --- SPECS/libserf/libserf.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/SPECS/libserf/libserf.spec b/SPECS/libserf/libserf.spec index da49d91d88d..2637c8d9415 100644 --- a/SPECS/libserf/libserf.spec +++ b/SPECS/libserf/libserf.spec @@ -1,7 +1,7 @@ Summary: A high performance C-based HTTP client library built upon the Apache Portable Runtime (APR) library Name: libserf Version: 1.3.9 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: https://serf.apache.org/ Group: System Environment/Libraries @@ -52,6 +52,9 @@ sed -i '/SUITE_ADD_TEST(suite, test_ssltunnel_basic_auth_server_has_keepalive_of sed -i '/SUITE_ADD_TEST(suite, test_ssltunnel_basic_auth_proxy_has_keepalive_off);/d' ./test/test_context.c sed -i '/SUITE_ADD_TEST(suite, test_ssltunnel_basic_auth_proxy_close_conn_on_200resp);/d' ./test/test_context.c sed -i '/SUITE_ADD_TEST(suite, test_ssltunnel_digest_auth);/d' ./test/test_context.c + +# OpenSSL 1.1.1i+ breaks test_ssl_handshake, so disable test_ssl_handshake +sed -i '/SUITE_ADD_TEST(suite, test_ssl_handshake);/d' ./test/test_context.c scons check %files @@ -67,6 +70,9 @@ scons check %changelog +* Tue May 04 2021 Nicolas Ontiveros 1.3.9-6 +- Disable test_ssl_handshake + * Mon Dec 07 2020 Andrew Phelps 1.3.9-5 - Fix check tests. * Sat May 09 2020 Nick Samson 1.3.9-4 From 79c6b3ecf283e1cc0218a6247b8771f0c0b913ab Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Wed, 5 May 2021 11:30:11 -0700 Subject: [PATCH 12/83] Adding heartbeat log to package builds. (#915) --- toolkit/tools/pkgworker/pkgworker.go | 33 ++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/toolkit/tools/pkgworker/pkgworker.go b/toolkit/tools/pkgworker/pkgworker.go index d9c48040027..a55375798db 100644 --- a/toolkit/tools/pkgworker/pkgworker.go +++ b/toolkit/tools/pkgworker/pkgworker.go @@ -112,6 +112,8 @@ func copySRPMToOutput(srpmFilePath, srpmOutputDirPath string) (err error) { func buildSRPMInChroot(chrootDir, rpmDirPath, workerTar, srpmFile, repoFile, rpmmacrosFile string, defines map[string]string, noCleanup bool, runCheck bool) (err error) { const ( + buildHeartbeatTimeout = 30 * time.Minute + existingChrootDir = false squashErrors = false @@ -120,8 +122,29 @@ func buildSRPMInChroot(chrootDir, rpmDirPath, workerTar, srpmFile, repoFile, rpm rpmDirName = "RPMS" ) + var builtRPMs []string + srpmBaseName := filepath.Base(srpmFile) - logger.Log.Infof("Building (%s)", srpmBaseName) + + quit := make(chan bool) + go func() { + logger.Log.Infof("Building (%s).", srpmBaseName) + + for { + select { + case <-quit: + if err == nil { + logger.Log.Infof("Built (%s) -> %v.", srpmBaseName, builtRPMs) + } + return + case <-time.After(buildHeartbeatTimeout): + logger.Log.Infof("Heartbeat: still building (%s).", srpmBaseName) + } + } + }() + defer func() { + quit <- true + }() // Create the chroot used to build the SRPM chroot := safechroot.NewChroot(chrootDir, existingChrootDir) @@ -143,23 +166,15 @@ func buildSRPMInChroot(chrootDir, rpmDirPath, workerTar, srpmFile, repoFile, rpm return } - var builtRPMs []string - err = chroot.Run(func() (err error) { return buildRPMFromSRPMInChroot(srpmFileInChroot, runCheck, defines) }) - if err != nil { return } rpmBuildOutputDir := filepath.Join(chroot.RootDir(), chrootRpmBuildRoot, rpmDirName) builtRPMs, err = moveBuiltRPMs(rpmBuildOutputDir, rpmDirPath) - if err != nil { - return - } - - logger.Log.Infof("Built (%s) -> %v", srpmBaseName, builtRPMs) return } From aa7cad27258d39943861d2c1aa65dbec313b6497 Mon Sep 17 00:00:00 2001 From: Henry Li <69694695+henryli001@users.noreply.github.com> Date: Wed, 5 May 2021 12:31:00 -0700 Subject: [PATCH 13/83] Fix td-agent build break (#918) * fix td-agent * fix date in changelog Co-authored-by: Henry Li --- SPECS/td-agent/td-agent.patch | 4 ++-- SPECS/td-agent/td-agent.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SPECS/td-agent/td-agent.patch b/SPECS/td-agent/td-agent.patch index a403b5f4a69..0bb083855b6 100644 --- a/SPECS/td-agent/td-agent.patch +++ b/SPECS/td-agent/td-agent.patch @@ -157,7 +157,7 @@ index 24f56f5..4a5bb85 100755 + ensure_directory(staging_libdir) do + cp("/usr/lib/libruby.so", ".") + cp("/usr/lib/libruby.so.2.6", ".") -+ cp("/usr/lib/libruby.so.2.6.6", ".") ++ cp("/usr/lib/libruby.so.2.6.7", ".") + cp_r("/usr/lib/ruby", ".") + cp("/usr/lib/pkgconfig/ruby-2.6.pc", "./pkgconfig") + end @@ -284,7 +284,7 @@ index dc53f99..8fd1bd9 100644 #BUNDLED_RUBY_VERSION = "2.6.6" #BUNDLED_RUBY_SOURCE_SHA256SUM = "364b143def360bac1b74eb56ed60b1a0dca6439b00157ae11ff77d5cd2e92291" -BUNDLED_RUBY_VERSION = "2.7.1" -+BUNDLED_RUBY_VERSION = "2.6.6" ++BUNDLED_RUBY_VERSION = "2.6.7" +RUBYGEM_VERSION= "2.6.0" BUNDLED_RUBY_SOURCE_SHA256SUM = "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418" diff --git a/SPECS/td-agent/td-agent.spec b/SPECS/td-agent/td-agent.spec index 7433b424d7c..c9c2d4ed8ae 100644 --- a/SPECS/td-agent/td-agent.spec +++ b/SPECS/td-agent/td-agent.spec @@ -5,7 +5,7 @@ Summary: The stable distribution of Fluentd Name: td-agent Version: 4.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -200,6 +200,9 @@ sudo systemctl start td-agent %attr(0755,td-agent,td-agent) %dir /tmp/td-agent %changelog +* Wed May 05 2021 Henry Li - 4.0.1-3 +- Update patch to use ruby 2.6.7 + * Mon Mar 01 2021 Henry Li - 4.0.1-2 - Add shadow-utils as BuildRequires and remove creating the sym link for adduser From bfd7ac97ba753e6a6be45599f1727a2e1998abf6 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Wed, 5 May 2021 12:41:24 -0700 Subject: [PATCH 14/83] Updating `uclibc-ng` to version 1.0.37 to fix CVE-2021-27419. (#917) * Removing a duplicate from cgmanifest.json. * Updating `uclibc-ng` to version 1.0.37 to fix CVE-2021-27419. --- SPECS/uclibc-ng/uclibc-ng.signatures.json | 2 +- SPECS/uclibc-ng/uclibc-ng.spec | 5 ++++- cgmanifest.json | 14 ++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/SPECS/uclibc-ng/uclibc-ng.signatures.json b/SPECS/uclibc-ng/uclibc-ng.signatures.json index 5c996e4fd8c..f735db64599 100644 --- a/SPECS/uclibc-ng/uclibc-ng.signatures.json +++ b/SPECS/uclibc-ng/uclibc-ng.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "uClibc-ng-1.0.36.tar.xz": "010f40841669809422e01b47e7169d49c61bf3382f493c2571a8a96634ed300c", + "uClibc-ng-1.0.37.tar.xz": "b2b815d20645cf604b99728202bf3ecb62507ce39dfa647884b4453caf86212c", "uClibc.config": "5cd0bebdcc29597e6abdcfcbb0d7309633dd843b273b0baca718e6d5f2fb0f1f" } } \ No newline at end of file diff --git a/SPECS/uclibc-ng/uclibc-ng.spec b/SPECS/uclibc-ng/uclibc-ng.spec index cf08d097db8..811eb624ce3 100644 --- a/SPECS/uclibc-ng/uclibc-ng.spec +++ b/SPECS/uclibc-ng/uclibc-ng.spec @@ -3,7 +3,7 @@ %global debug_package %{nil} Summary: C library for embedded Linux Name: uclibc-ng -Version: 1.0.36 +Version: 1.0.37 Release: 1%{?dist} License: LGPLv2 Vendor: Microsoft Corporation @@ -81,6 +81,9 @@ rm -rf %{buildroot}/include/ %{_libdir}/uClibc %changelog +* Wed May 05 2021 Pawel Winogrodzki - 1.0.37-1 +- Updating to version 1.0.37 to fix CVE-2021-27419. + * Thu Oct 15 2020 Mateusz Malisz - 1.0.36-1 - Initial CBL-Mariner import from Fedora 32 (license: MIT) - License Verified diff --git a/cgmanifest.json b/cgmanifest.json index ea0a926e2b3..45c3737d1e7 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2000,16 +2000,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "jsonbuilder", - "version": "0.2.1", - "downloadUrl": "https://github.com/microsoft/jsonbuilder/archive/v0.2.1.tar.gz" - } - } - }, { "component": { "type": "other", @@ -6905,8 +6895,8 @@ "type": "other", "other": { "name": "uclibc-ng", - "version": "1.0.36", - "downloadUrl": "https://downloads.uclibc-ng.org/releases/1.0.36/uClibc-ng-1.0.36.tar.xz" + "version": "1.0.37", + "downloadUrl": "https://downloads.uclibc-ng.org/releases/1.0.37/uClibc-ng-1.0.37.tar.xz" } } }, From aa3b987b6ebd43bc3c87c17ce20e3ffe6a769930 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Wed, 5 May 2021 16:30:24 -0700 Subject: [PATCH 15/83] Updating `maven` to version 3.8.1 to fix CVE-2021-26291. (#920) --- SPECS/maven/maven.signatures.json | 8 +- SPECS/maven/maven.spec | 252 ++++++++++++++++++++---------- cgmanifest.json | 4 +- 3 files changed, 175 insertions(+), 89 deletions(-) diff --git a/SPECS/maven/maven.signatures.json b/SPECS/maven/maven.signatures.json index 00e9ca87278..3cb81561d4d 100644 --- a/SPECS/maven/maven.signatures.json +++ b/SPECS/maven/maven.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { - "apache-maven-3.5.4-bin.tar.gz": "ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d", - "apache-maven-3.5.4-licenses.tar.gz": "233c7d392a6267d586e81970ebd4d792b24e743d728e419fc8c4854b3a80e4da", - "apache-maven-3.5.4-m2.tar.gz": "da84471232c52c29edd7b2056de9be415f3605a01ebdc6f41529ec6eca82df95", - "apache-maven-3.5.4-src.tar.gz": "f3ba1f1b24bbd4c345174ac616d40e26e72dad6022d56317d3ff6f7dd003e2f5" + "apache-maven-3.8.1-bin.tar.gz": "b98a1905eb554d07427b2e5509ff09bd53e2f1dd7a0afa38384968b113abef02", + "apache-maven-3.8.1-licenses.tar.gz": "0159eb2952ee4e971664566630063b5492aa15d6b797a1b5588116822be18885", + "apache-maven-3.8.1-m2.tar.gz": "638929d4a6bc97d526a733e610b9231c6bb76ff5f29d45ca094ba5941b4bed4e", + "apache-maven-3.8.1-src.tar.gz": "86dc0df5950bb22dedcab326499531ee9c155016c9a7a3d3f33315becb0c71b1" } } \ No newline at end of file diff --git a/SPECS/maven/maven.spec b/SPECS/maven/maven.spec index eda27be63ca..4503dbb7505 100644 --- a/SPECS/maven/maven.spec +++ b/SPECS/maven/maven.spec @@ -1,45 +1,76 @@ +# Switch "sources_generation" to 1 when running a package build to generate cached sources for regular builds. +%define sources_generation 0 +%define m2_cache_tarball_name apache-%{name}-%{version}-m2.tar.gz +%define licenses_tarball_name apache-%{name}-%{version}-licenses.tar.gz + +%if ! 0%{?sources_generation} +%define offline_build -o +%endif + Summary: Apache Maven Name: maven -Version: 3.5.4 -Release: 13%{?dist} +Version: 3.8.1 +Release: 1%{?dist} License: ASL 2.0 -URL: https://maven.apache.org/ -Group: Applications/System Vendor: Microsoft Corporation Distribution: Mariner +Group: Applications/System +URL: https://maven.apache.org/ Source0: https://archive.apache.org/dist/maven/maven-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz +# Using pre-compiled binaries because 'maven' requires itself during build-time. Source1: https://archive.apache.org/dist/maven/maven-3/%{version}/binaries/apache-%{name}-%{version}-bin.tar.gz -Source2: apache-%{name}-%{version}-m2.tar.gz -Source3: apache-%{name}-%{version}-licenses.tar.gz -# Note: this license tarball will need to be regenerated if this package is upgraded by running: apache-maven/src/main/appended-resources/META-INF/LICENSE.vm - +# In order to re-generate these sources after a version update, switch "sources_generation" to 1 +# and make sure network is enabled during the build. The tarballs will be inside the built 'maven-cached-sources' subpackage. +%if ! 0%{?sources_generation} +Source2: %{m2_cache_tarball_name} +Source3: %{licenses_tarball_name} +%endif BuildRequires: ant -BuildRequires: openjre8 BuildRequires: openjdk8 +BuildRequires: openjre8 BuildRequires: wget >= 1.15 +Requires: %{_bindir}/which Requires: openjre8 -Requires: /usr/bin/which -%define _prefix /var/opt/apache-%{name} +%define _prefix %{_var}/opt/apache-%{name} %define _bindir %{_prefix}/bin %define _libdir %{_prefix}/lib %description The Maven package contains binaries for a build system +%if 0%{?sources_generation} + +%package cached-sources +Summary: NOT TO BE USED AS REGULAR PACKAGE! REQUIRES NETWORK ACCESS! + +%description cached-sources +%{summary} +This is an artificial package to ease generation of cached sources for +the regular builds of "maven" when the "sources_generation" macro is set to 0. + +%endif + %prep # Setup mvn binary tar xf %{SOURCE1} --no-same-owner -mv ./apache-maven-3.5.4 /var/opt/ -ln -sfvn apache-maven-3.5.4 /var/opt/apache-maven +mv ./apache-maven-%{version} /var/opt/ +ln -sfvn apache-maven-%{version} /var/opt/apache-maven ln -sfv /var/opt/apache-maven/bin/mvn /usr/bin/mvn + +%if ! 0%{?sources_generation} + # Setup maven .m2 cache directory mkdir /root/.m2 pushd /root/.m2 tar xf %{SOURCE2} --no-same-owner popd +%endif + %setup -q -n apache-%{name}-%{version} +%if ! 0%{?sources_generation} + # Setup licenses. Remove LICENSE.vm script, which downloads all subproject license files, and replace with prepopulated license tarball. rm -v apache-maven/src/main/appended-resources/META-INF/LICENSE.vm pushd apache-maven @@ -47,19 +78,32 @@ tar xf %{SOURCE3} --no-same-owner cp -v ./target/licenses/lib/* /var/opt/apache-maven/lib popd -%clean -rm -rf %{buildroot} +%endif %build MAVEN_DIST_DIR=%{buildroot}%{_prefix} -export JAVA_HOME=$(find /usr/lib/jvm -name "OpenJDK*") +export JAVA_HOME=$(find %{_lib}/jvm -name "OpenJDK*") export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(find $JAVA_HOME/lib -name "jli") sed -i 's/www.opensource/opensource/g' DEPENDENCIES -mvn -DdistributionTargetDir=$MAVEN_DIST_DIR -DskipTests clean package -o +mvn -DdistributionTargetDir=$MAVEN_DIST_DIR -DskipTests clean package %{?offline_build} %install +%if 0%{?sources_generation} + +echo "Compressing cached repositories." +tar -C /root/.m2 -cpvz -f %{m2_cache_tarball_name} repository +mv %{m2_cache_tarball_name} %{buildroot}%{_prefix} + +echo "Compressing cached licenses." +tar -C apache-maven -cpvz -f %{licenses_tarball_name} target/licenses/lib +mv %{licenses_tarball_name} %{buildroot}%{_prefix} + +rm %{buildroot}%{_prefix}/boot/plexus-classworlds.license + +%endif + mkdir -p %{buildroot}%{_datadir}/java/maven for jar in %{buildroot}/%{_libdir}/*.jar @@ -87,7 +131,7 @@ done %{_bindir}/* /bin/* %{_datadir}/java/maven/*.jar -%{_prefix}/boot/plexus-classworlds-2.5.2.jar +%{_prefix}/boot/plexus-classworlds-2.6.0.jar %{_prefix}/conf/logging/simplelogger.properties %{_prefix}/conf/settings.xml %{_prefix}/conf/toolchains.xml @@ -96,71 +140,113 @@ done %{_prefix}/README.txt %exclude %{_libdir}/jansi-native +%if 0%{?sources_generation} + +%files cached-sources +%{_prefix}/%{m2_cache_tarball_name} +%{_prefix}/%{licenses_tarball_name} + +%endif + %changelog -* Sat May 09 00:21:30 PST 2020 Nick Samson - 3.5.4-13 +* Wed May 05 2021 Pawel Winogrodzki - 3.8.1-1 +- Updated to version 3.8.1 to fix CVE-2021-26291. +- Added an artificial 'cached-sources' subpackage. + +* Sat May 09 2020 Nick Samson - 3.5.4-13 - Added %%license line automatically -* Thu Apr 30 2020 Emre Girgin 3.5.4-12 -- Renaming apache-ant to ant -* Thu Apr 30 2020 Emre Girgin 3.5.4-11 -- Renaming apache-maven to maven -* Wed Apr 29 2020 Nicolas Guibourge 3.5.4-10 -- Add path to libjli.so in LD_LIBRARY_PATH and skip test while building -* Thu Apr 23 2020 Andrew Phelps 3.5.4-9 -- Replace downloaded license files with new source tarball. -* Thu Apr 16 2020 Nick Samson 3.5.4-8 -- Updated Source0, License info to use Fedora guidelines. Signature verified. -* Fri Apr 10 2020 Andrew Phelps 3.5.4-7 -- Support building offline for CDPX. -* Wed Apr 01 2020 Andrew Phelps 3.5.4-6 -- Support building standalone by adding mvn binary. License verified. -* Wed Feb 12 2020 Andrew Phelps 3.5.4-5 -- Remove ExtraBuildRequires -* Tue Sep 03 2019 Mateusz Malisz 3.5.4-4 -- Initial CBL-Mariner import from Photon (license: Apache2). -* Mon Nov 05 2018 Alexey Makhalov 3.5.4-3 -- Removed dependency on JAVA8_VERSION macro -* Mon Oct 29 2018 Alexey Makhalov 3.5.4-2 -- Use ExtraBuildRequires -* Tue Sep 18 2018 Ankit Jain 3.5.4-1 -- Updated apache-maven to version 3.5.4 -* Fri Oct 13 2017 Alexey Makhalov 3.5.0-5 -- Remove BuildArch -* Mon Sep 18 2017 Alexey Makhalov 3.5.0-4 -- Requires /usr/bin/which -* Mon Jun 19 2017 Divya Thaluru 3.5.0-3 -- Removed dependency on ANT_HOME -- Removed apache-maven profile file -- Removed version from directory path -* Thu May 18 2017 Harish Udaiya Kumar 3.5.0-2 -- Renamed openjdk to openjdk8 -* Mon Apr 24 2017 Harish Udaiya Kumar 3.5.0-1 -- Updated apache-maven to version 3.5.0 -* Fri Mar 31 2017 Priyesh Padmavilasom 3.3.9-8 -- use java rpm macros to determine versions -* Wed Dec 21 2016 Priyesh Padmavilasom 3.3.9-7 -- Updated JAVA_HOME path to point to latest JDK. -* Thu Oct 27 2016 Alexey Makhalov 3.3.9-6 -- Fix build issue - unable to fetch opensource.org/.../mit-license.php -* Tue Oct 04 2016 Priyesh Padmavilasom 3.3.9-5 -- Updated JAVA_HOME path to point to latest JDK. -* Tue May 24 2016 Priyesh Padmavilasom 3.3.9-4 -- GA - Bump release of all rpms -* Fri May 20 2016 Divya Thaluru 3.3.9-3 -- Updated JAVA_HOME path to point to latest JDK. -* Tue Mar 01 2016 Harish Udaiya Kumar 3.3.9-2 -- Updated the apache-ant version to 1.9.6 -* Fri Feb 26 2016 Kumar Kaushik 3.3.9-2 -- Updated JAVA_HOME path to point to latest JDK. -* Thu Jan 21 2016 Xiaolin Li 3.3.9-1 -- Updated to version 3.3.9 -* Tue Jan 5 2016 Xiaolin Li 3.3.3-4 -- Increase build timeout from 600000 to 1200000 -* Mon Nov 16 2015 Sharath George 3.3.3-3 -- Change path to /var/opt. -* Wed Sep 16 2015 Harish Udaiya Kumar 3.3.3-2 -- Updated dependencies after repackaging openjdk. -* Thu Jul 9 2015 Sarah Choi 3.3.3-1 -- Add a script to set environment variables for MAVEN -* Fri May 22 2015 Sriram Nambakam 1.9.4 -- Initial build. First version +* Thu Apr 30 2020 Emre Girgin - 3.5.4-12 +- Renaming apache-ant to ant + +* Thu Apr 30 2020 Emre Girgin - 3.5.4-11 +- Renaming apache-maven to maven + +* Wed Apr 29 2020 Nicolas Guibourge - 3.5.4-10 +- Add path to libjli.so in LD_LIBRARY_PATH and skip test while building + +* Thu Apr 23 2020 Andrew Phelps - 3.5.4-9 +- Replace downloaded license files with new source tarball. + +* Thu Apr 16 2020 Nick Samson - 3.5.4-8 +- Updated Source0, License info to use Fedora guidelines. Signature verified. + +* Fri Apr 10 2020 Andrew Phelps - 3.5.4-7 +- Support building offline for CDPX. + +* Wed Apr 01 2020 Andrew Phelps - 3.5.4-6 +- Support building standalone by adding mvn binary. License verified. + +* Wed Feb 12 2020 Andrew Phelps - 3.5.4-5 +- Remove ExtraBuildRequires + +* Tue Sep 03 2019 Mateusz Malisz - 3.5.4-4 +- Initial CBL-Mariner import from Photon (license: Apache2). + +* Mon Nov 05 2018 Alexey Makhalov - 3.5.4-3 +- Removed dependency on JAVA8_VERSION macro + +* Mon Oct 29 2018 Alexey Makhalov - 3.5.4-2 +- Use ExtraBuildRequires + +* Tue Sep 18 2018 Ankit Jain - 3.5.4-1 +- Updated apache-maven to version 3.5.4 + +* Fri Oct 13 2017 Alexey Makhalov - 3.5.0-5 +- Remove BuildArch + +* Mon Sep 18 2017 Alexey Makhalov - 3.5.0-4 +- Requires /usr/bin/which + +* Mon Jun 19 2017 Divya Thaluru - 3.5.0-3 +- Removed dependency on ANT_HOME +- Removed apache-maven profile file +- Removed version from directory path + +* Thu May 18 2017 Harish Udaiya Kumar - 3.5.0-2 +- Renamed openjdk to openjdk8 + +* Mon Apr 24 2017 Harish Udaiya Kumar - 3.5.0-1 +- Updated apache-maven to version 3.5.0 + +* Fri Mar 31 2017 Priyesh Padmavilasom - 3.3.9-8 +- use java rpm macros to determine versions + +* Wed Dec 21 2016 Priyesh Padmavilasom - 3.3.9-7 +- Updated JAVA_HOME path to point to latest JDK. + +* Thu Oct 27 2016 Alexey Makhalov - 3.3.9-6 +- Fix build issue - unable to fetch opensource.org/.../mit-license.php + +* Tue Oct 04 2016 Priyesh Padmavilasom - 3.3.9-5 +- Updated JAVA_HOME path to point to latest JDK. + +* Tue May 24 2016 Priyesh Padmavilasom - 3.3.9-4 +- GA - Bump release of all rpms + +* Fri May 20 2016 Divya Thaluru - 3.3.9-3 +- Updated JAVA_HOME path to point to latest JDK. + +* Tue Mar 01 2016 Harish Udaiya Kumar - 3.3.9-2 +- Updated the apache-ant version to 1.9.6 + +* Fri Feb 26 2016 Kumar Kaushik - 3.3.9-2 +- Updated JAVA_HOME path to point to latest JDK. + +* Thu Jan 21 2016 Xiaolin Li - 3.3.9-1 +- Updated to version 3.3.9 + +* Tue Jan 5 2016 Xiaolin Li - 3.3.3-4 +- Increase build timeout from 600000 to 1200000 + +* Mon Nov 16 2015 Sharath George - 3.3.3-3 +- Change path to /var/opt. + +* Wed Sep 16 2015 Harish Udaiya Kumar - 3.3.3-2 +- Updated dependencies after repackaging openjdk. + +* Thu Jul 9 2015 Sarah Choi - 3.3.3-1 +- Add a script to set environment variables for MAVEN + +* Fri May 22 2015 Sriram Nambakam - 1.9.4 +- Initial build. First version diff --git a/cgmanifest.json b/cgmanifest.json index 45c3737d1e7..ece2d33d37e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3365,8 +3365,8 @@ "type": "other", "other": { "name": "maven", - "version": "3.5.4", - "downloadUrl": "https://archive.apache.org/dist/maven/maven-3/3.5.4/source/apache-maven-3.5.4-src.tar.gz" + "version": "3.8.1", + "downloadUrl": "https://archive.apache.org/dist/maven/maven-3/3.8.1/source/apache-maven-3.8.1-src.tar.gz" } } }, From d597c0c38a31da50f62699a567aa44f760dda4cd Mon Sep 17 00:00:00 2001 From: Chris Co Date: Thu, 6 May 2021 00:07:43 +0000 Subject: [PATCH 16/83] quickstart: add Secure Boot instructions on HyperV We now support secure boot out of the box, so update the instructions to keep Secure Boot enabled in Hyper-V and to utilize the "Microsoft UEFI Certificate Authority" for verification. Signed-off-by: Chris Co --- toolkit/docs/quick_start/quickstart.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/docs/quick_start/quickstart.md b/toolkit/docs/quick_start/quickstart.md index 19f44a22bfe..67e8918782a 100644 --- a/toolkit/docs/quick_start/quickstart.md +++ b/toolkit/docs/quick_start/quickstart.md @@ -67,7 +67,7 @@ Copy your binary image(s) to your VM Host Machine using your preferred technique **[Gen2/VHDX Only] Fix Boot Options** 1. Right click your virtual machine from Hyper-V Manager 1. Select _Settings..._. -1. Select Security and disable _Enable Secure Boot_. +1. Select Security and under _Template:_, select _Microsoft UEFI Certificate Authority_. 1. Select the SCSI Controller from the Hardware panel. 1. Select DVD Drive and press Add. @@ -120,7 +120,7 @@ Copy your binary image(s) to your VM Host Machine using your preferred technique 1. Right click your virtual machine from Hyper-V Manager 1. Select _Settings..._ -1. Select Security and disable _Enable Secure Boot_. +1. Select Security and under _Template:_, select _Microsoft UEFI Certificate Authority_. 1. Select Firmware and adjust the boot order so DVD is first and Hard Drive is second. 1. Select _Apply_ to apply all changes. From 76cc7584d81822117d06e6a05a40e35155c17fd2 Mon Sep 17 00:00:00 2001 From: Chris Co Date: Thu, 6 May 2021 00:12:19 +0000 Subject: [PATCH 17/83] quickstart: comma Didn't like that comma so it's gone now. Signed-off-by: Chris Co --- toolkit/docs/quick_start/quickstart.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/docs/quick_start/quickstart.md b/toolkit/docs/quick_start/quickstart.md index 67e8918782a..6908c341df6 100644 --- a/toolkit/docs/quick_start/quickstart.md +++ b/toolkit/docs/quick_start/quickstart.md @@ -67,7 +67,7 @@ Copy your binary image(s) to your VM Host Machine using your preferred technique **[Gen2/VHDX Only] Fix Boot Options** 1. Right click your virtual machine from Hyper-V Manager 1. Select _Settings..._. -1. Select Security and under _Template:_, select _Microsoft UEFI Certificate Authority_. +1. Select Security and under _Template:_ select _Microsoft UEFI Certificate Authority_. 1. Select the SCSI Controller from the Hardware panel. 1. Select DVD Drive and press Add. @@ -120,7 +120,7 @@ Copy your binary image(s) to your VM Host Machine using your preferred technique 1. Right click your virtual machine from Hyper-V Manager 1. Select _Settings..._ -1. Select Security and under _Template:_, select _Microsoft UEFI Certificate Authority_. +1. Select Security and under _Template:_ select _Microsoft UEFI Certificate Authority_. 1. Select Firmware and adjust the boot order so DVD is first and Hard Drive is second. 1. Select _Apply_ to apply all changes. From 689d2904e529f76ca22256a4e96e0663e7dca5ba Mon Sep 17 00:00:00 2001 From: rlmenge Date: Thu, 6 May 2021 14:44:21 -0400 Subject: [PATCH 18/83] kernel: Update to 5.10.32.1 (#913) * Update kernel to 5.10.32 * Add kernel no patches * Update config for hyper-v and fix formatting --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 7 +++++-- .../hyperv-daemons.signatures.json | 2 +- SPECS/hyperv-daemons/hyperv-daemons.spec | 7 +++++-- .../kernel-headers.signatures.json | 2 +- SPECS/kernel-headers/kernel-headers.spec | 7 +++++-- SPECS/kernel-hyperv/config | 2 +- .../kernel-hyperv/kernel-hyperv.signatures.json | 4 ++-- SPECS/kernel-hyperv/kernel-hyperv.spec | 7 +++++-- SPECS/kernel/CVE-2021-23133.nopatch | 3 +++ SPECS/kernel/CVE-2021-29154.nopatch | 6 ++++++ SPECS/kernel/CVE-2021-30178.nopatch | 3 +++ SPECS/kernel/config | 2 +- SPECS/kernel/config_aarch64 | 2 +- SPECS/kernel/kernel.signatures.json | 6 +++--- SPECS/kernel/kernel.spec | 12 ++++++++++-- cgmanifest.json | 16 ++++++++-------- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- toolkit/scripts/toolchain/container/Dockerfile | 2 +- .../toolchain/container/toolchain-md5sums | 2 +- .../container/toolchain_build_in_chroot.sh | 8 ++++---- .../container/toolchain_build_temp_tools.sh | 8 ++++---- 24 files changed, 74 insertions(+), 42 deletions(-) create mode 100644 SPECS/kernel/CVE-2021-23133.nopatch create mode 100644 SPECS/kernel/CVE-2021-29154.nopatch create mode 100644 SPECS/kernel/CVE-2021-30178.nopatch diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index b33594be4b0..a62f728927f 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -8,8 +8,8 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} -Version: 5.10.28.1 -Release: 4%{?dist} +Version: 5.10.32.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -139,6 +139,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Mon May 03 2021 Rachel Menge - 5.10.32.1-1 +- Update source to 5.10.32.1 + * Thu Apr 22 2021 Chris Co - 5.10.28.1-4 - Bump release number to match kernel release diff --git a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json index c1f8622a0c0..c7bb3a418df 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json +++ b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json @@ -7,6 +7,6 @@ "hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", - "kernel-5.10.28.1.tar.gz": "51118e54227410d15c20246e4905d897a8b6b3ebe1326ebe44e1080d0d17c27d" + "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79" } } \ No newline at end of file diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index 09b5b3713ea..cdd89c783d8 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons/hyperv-daemons.spec @@ -8,8 +8,8 @@ %global udev_prefix 70 Summary: Hyper-V daemons suite Name: hyperv-daemons -Version: 5.10.28.1 -Release: 2%{?dist} +Version: 5.10.32.1 +Release: 1%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner @@ -219,6 +219,9 @@ fi %{_sbindir}/lsvmbus %changelog +* Mon May 03 2021 Rachel Menge - 5.10.32.1-1 +- Update source to 5.10.32.1 + * Thu Apr 15 2021 Rachel Menge - 5.10.28.1-2 - Update to kernel release 5.10.28.1-2 diff --git a/SPECS/kernel-headers/kernel-headers.signatures.json b/SPECS/kernel-headers/kernel-headers.signatures.json index dd269727900..bd791135ed4 100644 --- a/SPECS/kernel-headers/kernel-headers.signatures.json +++ b/SPECS/kernel-headers/kernel-headers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "kernel-5.10.28.1.tar.gz": "51118e54227410d15c20246e4905d897a8b6b3ebe1326ebe44e1080d0d17c27d" + "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79" } } \ No newline at end of file diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index f3cc67bf228..9c025404ed0 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers -Version: 5.10.28.1 -Release: 4%{?dist} +Version: 5.10.32.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Mon May 03 2021 Rachel Menge - 5.10.32.1-1 +- Update source to 5.10.32.1 + * Thu Apr 22 2021 Chris Co - 5.10.28.1-4 - Bump release number to match kernel release diff --git a/SPECS/kernel-hyperv/config b/SPECS/kernel-hyperv/config index b5f02fd2cba..cc68f923400 100644 --- a/SPECS/kernel-hyperv/config +++ b/SPECS/kernel-hyperv/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.28.1 Kernel Configuration +# Linux/x86_64 5.10.32.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json index 62db6fa6d68..f52f149a5be 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json +++ b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { - "config": "409a59c15de0b9a2417df76b89dfe9796449a2e1b45ea0d48ea09013a012c947", - "kernel-5.10.28.1.tar.gz": "51118e54227410d15c20246e4905d897a8b6b3ebe1326ebe44e1080d0d17c27d", + "config": "fb6e6d4ca0e02061b4df0f6790d15852f0f54d544c8766c7b35e0b0a0ec89c27", + "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } } \ No newline at end of file diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index 4294a17b6b4..e0efe1592c1 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -3,8 +3,8 @@ %define uname_r %{version}-%{release} Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv -Version: 5.10.28.1 -Release: 4%{?dist} +Version: 5.10.32.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -274,6 +274,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Mon May 03 2021 Rachel Menge - 5.10.32.1-1 +- Update source to 5.10.32.1 + * Thu Apr 22 2021 Chris Co - 5.10.28.1-4 - Bump release number to match kernel release diff --git a/SPECS/kernel/CVE-2021-23133.nopatch b/SPECS/kernel/CVE-2021-23133.nopatch new file mode 100644 index 00000000000..65e9c8e531c --- /dev/null +++ b/SPECS/kernel/CVE-2021-23133.nopatch @@ -0,0 +1,3 @@ +CVE-2021-23133 - already patched in 5.10.32.1 stable kernel +Upstream: b166a20b07382b8bc1dcee2a448715c9c2c81b5b +Stable: 5a627026be4a17e5b9db23558cd28e62b2cbc66e \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-29154.nopatch b/SPECS/kernel/CVE-2021-29154.nopatch new file mode 100644 index 00000000000..2133e696446 --- /dev/null +++ b/SPECS/kernel/CVE-2021-29154.nopatch @@ -0,0 +1,6 @@ +CVE-2021-23133 - already patched in 5.10.32.1 stable kernel +Upstream: 26f55a59dc65ff77cd1c4b37991e26497fc68049 +Stable: faa30969f66e74910e9424214a4a426c2dc249d8 + +Upstream: e4d4d456436bfb2fe412ee2cd489f7658449b098 +Stable: 3edb8967d91ecbc4c5eee34a65d4124267327574 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-30178.nopatch b/SPECS/kernel/CVE-2021-30178.nopatch new file mode 100644 index 00000000000..3cb9f48da51 --- /dev/null +++ b/SPECS/kernel/CVE-2021-30178.nopatch @@ -0,0 +1,3 @@ +CVE-2021-30178 - Introducing commit not in stable tree. No fix necessary at this time. +Upstream introducing commit - 8f014550dfb114cc7f42a517d20d2cf887a0b771 +Upstream fix commit - 919f4ebc598701670e80e31573a58f1f2d2bf918 \ No newline at end of file diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 463985418e9..feef1da7e9d 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.28.1 Kernel Configuration +# Linux/x86_64 5.10.32.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index bc104136432..581ed14f77d 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.28.1 Kernel Configuration +# Linux/arm64 5.10.32.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index ba127067562..05853801234 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { - "config": "37dacc87cdac3d733618dea2733d5e4d98caed2bcf9c0cdc30c46691ccd695ef", - "config_aarch64": "cd6fd817674f65a2c12ef6069835762fa0f41d8bff1d05655604dcbd25e03f14", - "kernel-5.10.28.1.tar.gz": "51118e54227410d15c20246e4905d897a8b6b3ebe1326ebe44e1080d0d17c27d", + "config": "774cfaea0547b798d8a0653d27010728497a97726df372b1f258ff592799d653", + "config_aarch64": "c7fe9d289fe79f083a316b84d72b0068bbe5a0c93bc4ed4e5aff22a986e270fc", + "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } } \ No newline at end of file diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index dbe5daa8005..b01a4ef7ed1 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -3,8 +3,8 @@ %define uname_r %{version}-%{release} Summary: Linux Kernel Name: kernel -Version: 5.10.28.1 -Release: 4%{?dist} +Version: 5.10.32.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -158,6 +158,10 @@ Patch1129: CVE-2021-29650.nopatch Patch1130: CVE-2021-30002.nopatch # CVE-2021-29648 - Introducing commit not in stable tree. No fix necessary at this time. Patch1131: CVE-2021-29648.nopatch +Patch1132: CVE-2021-23133.nopatch +Patch1133: CVE-2021-29154.nopatch +# CVE-2021-30178 - Introducing commit not in stable tree. No fix necessary at this time. +Patch1134: CVE-2021-30178.nopatch BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc @@ -496,6 +500,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Mon May 03 2021 Rachel Menge - 5.10.32.1-1 +- Update source to 5.10.32.1 +- Address CVE-2021-23133, CVE-2021-29154, CVE-2021-30178 + * Thu Apr 22 2021 Chris Co - 5.10.28.1-4 - Disable CONFIG_EFI_DISABLE_PCI_DMA. It can cause boot issues on some hardware. diff --git a/cgmanifest.json b/cgmanifest.json index ece2d33d37e..06d854f111f 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1755,8 +1755,8 @@ "type": "other", "other": { "name": "hyperv-daemons", - "version": "5.10.28.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.28.1.tar.gz" + "version": "5.10.32.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" } } }, @@ -2055,8 +2055,8 @@ "type": "other", "other": { "name": "kernel-headers", - "version": "5.10.28.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.28.1.tar.gz" + "version": "5.10.32.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" } } }, @@ -2065,8 +2065,8 @@ "type": "other", "other": { "name": "kernel-hyperv", - "version": "5.10.28.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.28.1.tar.gz" + "version": "5.10.32.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" } } }, @@ -2075,8 +2075,8 @@ "type": "other", "other": { "name": "kernel", - "version": "5.10.28.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.28.1.tar.gz" + "version": "5.10.32.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 5cfc6ddfdd7..f5834b69951 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.28.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-1.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index cc97ddeb86a..6659eca01d6 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.28.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-1.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 87ed99f8337..222fef22ac7 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.28.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-1.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 96e6687be1a..d918b5801ff 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.28.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-1.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/Dockerfile b/toolkit/scripts/toolchain/container/Dockerfile index abf4b36d3dd..e8b53b8ffee 100644 --- a/toolkit/scripts/toolchain/container/Dockerfile +++ b/toolkit/scripts/toolchain/container/Dockerfile @@ -68,7 +68,7 @@ COPY [ "./toolchain-md5sums", \ WORKDIR $LFS/sources RUN wget -nv --no-clobber --timeout=30 --no-check-certificate --continue --input-file=$LFS/tools/toolchain-local-wget-list --directory-prefix=$LFS/sources; exit 0 RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0 -RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.28.1.tar.gz -O kernel-5.10.28.1.tar.gz --directory-prefix=$LFS/sources; exit 0 +RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz -O kernel-5.10.32.1.tar.gz --directory-prefix=$LFS/sources; exit 0 USER root RUN /tools/toolchain-jdk8-wget.sh; exit 0 RUN md5sum -c $LFS/tools/toolchain-md5sums && \ diff --git a/toolkit/scripts/toolchain/container/toolchain-md5sums b/toolkit/scripts/toolchain/container/toolchain-md5sums index cc08717a8f3..ad4446c0f59 100644 --- a/toolkit/scripts/toolchain/container/toolchain-md5sums +++ b/toolkit/scripts/toolchain/container/toolchain-md5sums @@ -59,7 +59,7 @@ bc62e7df6f75357b6dd1ec34600dbeaf jdk8u212-b04-langtools.tar.bz2 d0272e7a6107c64dae62b80ca7ec65e2 jdk8u212-b04-nashorn.tar.bz2 befd51c2b53a442e1fa6644bba89a95a jdk8u212-b04.tar.bz2 94afc90c1f7bef4a27fdd59ece39c878 kbproto-1.0.7.tar.bz2 -e0c6f0946012317df6dc4a56b82410e3 kernel-5.10.28.1.tar.gz +e3db9895e82f899524c607e4586f1d0d kernel-5.10.32.1.tar.gz d953ed6b47694dadf0e6042f8f9ff451 libarchive-3.4.2.tar.gz 968ac4d42a1a71754313527be2ab5df3 libcap-2.26.tar.xz ba983eba5a9f05d152a0725b8e863151 libdmx-1.1.3.tar.bz2 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index bd2bab8f47b..9110d0df55a 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -57,14 +57,14 @@ set -e # cd /sources -echo Linux-5.10.28.1 API Headers -tar xf kernel-5.10.28.1.tar.gz -pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.28.1 +echo Linux-5.10.32.1 API Headers +tar xf kernel-5.10.32.1.tar.gz +pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 make mrproper make headers cp -rv usr/include/* /usr/include popd -rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.28.1 +rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 touch /logs/status_kernel_headers_complete echo 6.8. Man-pages-5.02 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh index 8df1b2accbd..053cc7e3919 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh @@ -113,14 +113,14 @@ rm -rf gcc-9.1.0 touch $LFS/logs/temptoolchain/status_gcc_pass1_complete -echo Linux-5.10.28.1 API Headers -tar xf kernel-5.10.28.1.tar.gz -pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.28.1 +echo Linux-5.10.32.1 API Headers +tar xf kernel-5.10.32.1.tar.gz +pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 make mrproper make headers cp -rv usr/include/* /tools/include popd -rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.28.1 +rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 touch $LFS/logs/temptoolchain/status_kernel_headers_complete From 63c881ddb117143629e852e41db5b2a93bdf87d0 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Thu, 6 May 2021 16:49:33 -0700 Subject: [PATCH 19/83] Add python3-Cython subpackage (#924) Co-authored-by: Andrew Phelps --- SPECS/Cython/Cython.spec | 50 +++++++++++++++---- .../cython_testfix_with_outer_raising.patch | 50 +++++++++++++++++++ 2 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 SPECS/Cython/cython_testfix_with_outer_raising.patch diff --git a/SPECS/Cython/Cython.spec b/SPECS/Cython/Cython.spec index 66b105d7f1e..4e1ec721136 100644 --- a/SPECS/Cython/Cython.spec +++ b/SPECS/Cython/Cython.spec @@ -1,53 +1,85 @@ %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} -Summary: C extensions for Python +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +Summary: C extensions for Python 2 Name: Cython Version: 0.28.5 -Release: 7%{?dist} +Release: 8%{?dist} Group: Development/Libraries License: ASL 2.0 URL: https://cython.org #Source0: https://github.com/cython/cython/archive/%{version}.tar.gz Source0: %{name}-%{version}.tar.gz Patch0: fix_abc_tests.patch +Patch1: cython_testfix_with_outer_raising.patch Vendor: Microsoft Corporation Distribution: Mariner BuildRequires: python2-devel BuildRequires: python2-libs BuildRequires: python-xml Requires: python2 +Provides: python2-%{name} +Provides: cython %description Cython is an optimising static compiler for both the Python programming language and the extended Cython programming language (based on Pyrex). It makes writing C extensions for Python as easy as Python itself. +%package -n python3-%{name} +Summary: C extensions for Python 3 +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-libs +BuildRequires: python3-xml +Requires: python3 + +%description -n python3-%{name} +Cython is an optimising static compiler for both the Python programming language and the extended Cython programming language (based on Pyrex). It makes writing C extensions for Python as easy as Python itself. + %prep -%setup -q -n cython-%{version} -%patch0 -p1 +%autosetup -p1 -n cython-%{version} %build python2 setup.py build +python3 setup.py build %install +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +mv %{buildroot}/%{_bindir}/cygdb %{buildroot}/%{_bindir}/cygdb3 +mv %{buildroot}/%{_bindir}/cython %{buildroot}/%{_bindir}/cython3 +mv %{buildroot}/%{_bindir}/cythonize %{buildroot}/%{_bindir}/cythonize3 python2 setup.py install --skip-build --root %{buildroot} %check # Skip lvalue_refs test which was fixed in a later release: https://github.com/cython/cython/pull/2783 echo "lvalue_refs" >> tests/bugs.txt -make %{?_smp_mflags} test - -%clean -rm -rf %{buildroot} +python2 runtests.py -vv +python3 runtests.py -vv %files %defattr(-,root,root,-) %license LICENSE.txt -%{_bindir}/* +%{_bindir}/cygdb +%{_bindir}/cython +%{_bindir}/cythonize %{python2_sitelib}/Cython-%{version}-*.egg-info %{python2_sitelib}/Cython/* %{python2_sitelib}/cython.py* %{python2_sitelib}/pyximport/* +%files -n python3-%{name} +%license LICENSE.txt +%{_bindir}/cygdb3 +%{_bindir}/cython3 +%{_bindir}/cythonize3 +%{python3_sitelib}/Cython-%{version}-*.egg-info +%{python3_sitelib}/Cython/* +%{python3_sitelib}/cython.py* +%{python3_sitelib}/pyximport/* +%{python3_sitelib}/__pycache__/* %changelog +* Wed Apr 28 2021 Andrew Phelps 0.28.5-8 +- Build for python3. +- Add patch to fix python3.7 test failure. * Mon Dec 07 2020 Andrew Phelps 0.28.5-7 - Fix check tests. * Sat May 09 2020 Nick Samson 0.28.5-6 diff --git a/SPECS/Cython/cython_testfix_with_outer_raising.patch b/SPECS/Cython/cython_testfix_with_outer_raising.patch new file mode 100644 index 00000000000..568414e83a7 --- /dev/null +++ b/SPECS/Cython/cython_testfix_with_outer_raising.patch @@ -0,0 +1,50 @@ +diff -ruN a/tests/run/generators_py35.py b/tests/run/generators_py35.py +--- a/tests/run/generators_py35.py 1969-12-31 16:00:00.000000000 -0800 ++++ b/tests/run/generators_py35.py 2021-04-30 00:40:03.333141340 -0700 +@@ -0,0 +1,24 @@ ++# mode: run ++# tag: generators, pure3.5 ++ ++from __future__ import generator_stop ++ ++# "generator_stop" was only added in Py3.5. ++ ++ ++def with_outer_raising(*args): ++ """ ++ >>> x = with_outer_raising(1, 2, 3) ++ >>> try: ++ ... list(x()) ++ ... except RuntimeError: ++ ... print("OK!") ++ ... else: ++ ... print("NOT RAISED!") ++ OK! ++ """ ++ def generator(): ++ for i in args: ++ yield i ++ raise StopIteration ++ return generator +\ No newline at end of file +diff -ruN a/tests/run/generators_py.py b/tests/run/generators_py.py +--- a/tests/run/generators_py.py 2021-04-30 00:38:33.905610251 -0700 ++++ b/tests/run/generators_py.py 2021-04-30 00:40:43.292935879 -0700 +@@ -81,17 +81,6 @@ + yield i + return generator + +-def with_outer_raising(*args): +- """ +- >>> x = with_outer_raising(1, 2, 3) +- >>> list(x()) +- [1, 2, 3] +- """ +- def generator(): +- for i in args: +- yield i +- raise StopIteration +- return generator + + def test_close(): + """ From e6c8f959a801e74afea39c3f07079d002e8932c3 Mon Sep 17 00:00:00 2001 From: nicolas guibourge Date: Fri, 7 May 2021 11:21:03 -0700 Subject: [PATCH 20/83] Update dotnet-runtime and aspnetcore-runtime to 3.1.14 and dotnet-sdk to 3.1.114 (#926) * update dotnet runtine to 3.1.14 and dotnet sdk 3.1.114 * update aspnetcore to 3.1.14 Co-authored-by: Nicolas Guibourge --- .../aspnetcore-runtime-3.1.signatures.json | 2 +- .../aspnetcore-runtime-3.1.spec | 8 +++++--- .../dotnet-runtime-3.1.signatures.json | 2 +- SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec | 13 ++++++++----- SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json | 2 +- SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec | 6 ++++-- cgmanifest.json | 12 ++++++------ 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json index 78738445087..50cc243189d 100644 --- a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json +++ b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "aspnetcore-runtime-3.1.5-linux-x64.tar.gz": "bf202e612374eecf089b08db2085f36e54c09d6e93db0ff4244580ee47b9c61f" + "aspnetcore-runtime-3.1.14-linux-x64.tar.gz": "96a66d44b6aaf71da50a6709912aab36f007cd974dd3766b55c67a8aab5748a8" } } \ No newline at end of file diff --git a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec index 5f86b8844de..3de9efede3e 100644 --- a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec +++ b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec @@ -1,14 +1,14 @@ %define debug_package %{nil} Summary: Microsoft aspnetcore runtime Name: aspnetcore-runtime-3.1 -Version: 3.1.5 +Version: 3.1.14 Release: 1%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Tools URL: https://github.com/dotnet/aspnetcore -Source0: https://download.visualstudio.microsoft.com/download/pr/6827d794-a218-4352-b3b3-a19ec773c975/e3e53bc2f20df220a29c6e09f74d8a00/aspnetcore-runtime-3.1.5-linux-x64.tar.gz +Source0: https://download.visualstudio.microsoft.com/download/pr/516b337a-83f9-4946-b2a6-b2f686e09a76/d0e82549e890c5d852c461319ffd5b31/aspnetcore-runtime-3.1.14-linux-x64.tar.gz Requires: dotnet-runtime-3.1 ExclusiveArch: x86_64 @@ -18,7 +18,7 @@ modern cloud based internet connected applications, such as web apps, IoT apps and mobile backends %prep -%setup -qc -T -a 0 dotnet-runtime-%{version} +%setup -qc -T -a 0 aspnetcore-runtime-%{version} %build @@ -35,6 +35,8 @@ cp -r shared/Microsoft.AspNetCore.App %{buildroot}%{_libdir}/dotnet/shared %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App %changelog +* Fri May 7 2021 Nicolas Guibourge - 3.1.14-1 +- Update version to 3.1.14 * Thu Nov 12 2020 Henry Beberman - 3.1.5-1 - Add aspnetcore-runtime spec. - License verified diff --git a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json index 87126fbb89c..7f0745279d5 100644 --- a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json +++ b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dotnet-runtime-3.1.5-linux-x64.tar.gz": "ae0a4e9a1e875b46d3201cdad2779572de1c12c0aae36688ae3c3978db319ff5" + "dotnet-runtime-3.1.14-linux-x64.tar.gz": "666cb2148c1096d95339d1732f4420b633d1bb5532b9f3b1d2f8cfc15930e670" } } \ No newline at end of file diff --git a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec index aecd4117aea..5255bff2d86 100644 --- a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec +++ b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec @@ -1,13 +1,13 @@ Summary: Microsoft .NET Core Runtime Name: dotnet-runtime-3.1 -Version: 3.1.5 -Release: 2%{?dist} +Version: 3.1.14 +Release: 1%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Tools URL: https://github.com/dotnet/core -Source0: https://download.visualstudio.microsoft.com/download/pr/d00eaeea-6d7b-4e73-9d96-c0234ed3b665/0d25d9d1aeaebdeef01d15370d5cd22b/dotnet-runtime-3.1.5-linux-x64.tar.gz +Source0: https://download.visualstudio.microsoft.com/download/pr/4e5f17fa-fa56-40bc-bf3d-fd6abc91d0ad/08bd80f3751c0ac602dd41dc2534265e/dotnet-runtime-3.1.14-linux-x64.tar.gz Requires: glibc Requires: icu Requires: krb5 @@ -48,8 +48,11 @@ ln -sf %{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/dotnet %{_libdir}/* %changelog -* Thu Nov 12 2020 Henry Beberman - 3.1.5-2 -- Fix scriptlets and move licenses to the correct folder +* Fri May 7 2021 Nicolas Guibourge - 3.1.14-1 +- Update version to 3.1.14 + +* Thu Nov 12 2020 Henry Beberman - 3.1.5-2 +- Fix scriptlets and move licenses to the correct folder * Fri Jun 19 2020 Andrew Phelps 3.1.5-1 - Update version to 3.1.5. Fix runtime requirements. diff --git a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json index ea751ffbc17..166934b6081 100644 --- a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json +++ b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dotnet-sdk-3.1.105-linux-x64.tar.gz": "a389763ee658aff89ab725d7c24db3b74aac10b666df7c61265fb80c41c76e79" + "dotnet-sdk-3.1.114-linux-x64.tar.gz": "7a3cd46f9c3f52ce165e8484651ad409e6ba9fe3ec489e7d25fcb4db22080249" } } \ No newline at end of file diff --git a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec index eb6383791e3..05ebb693d5f 100644 --- a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec +++ b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec @@ -1,14 +1,14 @@ %define debug_package %{nil} Summary: Microsoft .NET Core SDK Name: dotnet-sdk-3.1 -Version: 3.1.105 +Version: 3.1.114 Release: 1%{?dist} Vendor: Microsoft Corporation Distribution: Mariner License: MIT Url: https://github.com/dotnet/core Group: Development/Tools -Source0: https://download.visualstudio.microsoft.com/download/pr/37268c18-226d-436b-b13c-4b77b7f42140/17e8a85360206006a557d634d16713cd/dotnet-sdk-3.1.105-linux-x64.tar.gz +Source0: https://download.visualstudio.microsoft.com/download/pr/79c30043-e62b-49e5-ba42-0aea2af1499a/f853a4f12fb4376532826272cdbbdd66/dotnet-sdk-3.1.114-linux-x64.tar.gz ExclusiveArch: x86_64 Requires: dotnet-runtime-3.1 @@ -36,6 +36,8 @@ cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/dotnet-sdk-%{version %{_docdir}/* %changelog +* Fri May 07 2021 Nicolas Guibourge 3.1.114-1 +- Update version to 3.1.114 * Fri Jun 19 2020 Andrew Phelps 3.1.105-1 - Update version to 3.1.105 * Sat May 09 2020 Nick Samson 3.1.102-5 diff --git a/cgmanifest.json b/cgmanifest.json index 06d854f111f..cc68f64ef1a 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -105,8 +105,8 @@ "type": "other", "other": { "name": "aspnetcore-runtime-3.1", - "version": "3.1.5", - "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/6827d794-a218-4352-b3b3-a19ec773c975/e3e53bc2f20df220a29c6e09f74d8a00/aspnetcore-runtime-3.1.5-linux-x64.tar.gz" + "version": "3.1.14", + "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/516b337a-83f9-4946-b2a6-b2f686e09a76/d0e82549e890c5d852c461319ffd5b31/aspnetcore-runtime-3.1.14-linux-x64.tar.gz" } } }, @@ -1005,8 +1005,8 @@ "type": "other", "other": { "name": "dotnet-runtime-3.1", - "version": "3.1.5", - "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/d00eaeea-6d7b-4e73-9d96-c0234ed3b665/0d25d9d1aeaebdeef01d15370d5cd22b/dotnet-runtime-3.1.5-linux-x64.tar.gz" + "version": "3.1.14", + "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/4e5f17fa-fa56-40bc-bf3d-fd6abc91d0ad/08bd80f3751c0ac602dd41dc2534265e/dotnet-runtime-3.1.14-linux-x64.tar.gz" } } }, @@ -1015,8 +1015,8 @@ "type": "other", "other": { "name": "dotnet-sdk-3.1", - "version": "3.1.105", - "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/37268c18-226d-436b-b13c-4b77b7f42140/17e8a85360206006a557d634d16713cd/dotnet-sdk-3.1.105-linux-x64.tar.gz" + "version": "3.1.114", + "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/79c30043-e62b-49e5-ba42-0aea2af1499a/f853a4f12fb4376532826272cdbbdd66/dotnet-sdk-3.1.114-linux-x64.tar.gz" } } }, From 7076e52bbbb7a1c9bae829f3a38415b0a6cd8b19 Mon Sep 17 00:00:00 2001 From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com> Date: Fri, 7 May 2021 15:17:00 -0700 Subject: [PATCH 21/83] Automatic update of the `kubernetes` packages. (#925) --- SPECS/kubernetes/kubernetes-1.18.17.signatures.json | 2 +- SPECS/kubernetes/kubernetes-1.18.17.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.19.9.signatures.json | 2 +- SPECS/kubernetes/kubernetes-1.19.9.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.20.5.signatures.json | 2 +- SPECS/kubernetes/kubernetes-1.20.5.spec | 9 ++++++--- cgmanifest.json | 6 +++--- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json index fc4468c8bf9..985c0b7e2c3 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json @@ -2,6 +2,6 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.17-hotfix.20210428.tar.gz": "fa07d9d5e0c0d45b449bb5e422c9ccd01c4890a48a648673f6a503386985aa0a" + "kubernetes-node-linux-amd64-1.18.17-hotfix.20210505.tar.gz": "0dae63a4ae89894f417b4370a9f5531cd2c0ae8aaed4393720d7e32dc87f54c4" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.17.spec b/SPECS/kubernetes/kubernetes-1.18.17.spec index 8d5b5f134e1..464757cb8df 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.spec +++ b/SPECS/kubernetes/kubernetes-1.18.17.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.17 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210428.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz Source1: kubelet.service Source2: golang-1.15-k8s-1.18-test.patch # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -270,6 +270,9 @@ fi %{_bindir}/pause %changelog +* Fri May 07 2021 CBL-Mariner Service Account - 1.18.17-3 +- Update to version "1.18.17-hotfix.20210505". + * Mon May 03 2021 Nicolas Guibourge 1.18.17-2 - Increment release to force republishing using golang 1.15.11. diff --git a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json index 9eb87a8313e..242211eb54b 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.9-hotfix.20210428.tar.gz": "e41b5aaea5615bf845616115df39a62908cde47145c6a77e449abfe1d8c3f7cf" + "kubernetes-node-linux-amd64-1.19.9-hotfix.20210505.tar.gz": "c3113cdecf5ae317fac264c67571bfda3eeb58d7ba3780ec5fddfbe83238b052" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.9.spec b/SPECS/kubernetes/kubernetes-1.19.9.spec index 6dba91c9aa0..36abb7f82bf 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.spec +++ b/SPECS/kubernetes/kubernetes-1.19.9.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.9 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210428.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz Source1: kubelet.service # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Fri May 07 2021 CBL-Mariner Service Account - 1.19.9-3 +- Update to version "1.19.9-hotfix.20210505". + * Mon May 03 2021 Nicolas Guibourge 1.19.9-2 - Increment release to force republishing using golang 1.15.11. diff --git a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json index 12685f1632f..2d6d1a78d41 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.5-hotfix.20210428.tar.gz": "e2e5accaa10b02cea9fa5d31ec1c648f791810bb5c672d1e002bfcad5e58a11a" + "kubernetes-node-linux-amd64-1.20.5-hotfix.20210505.tar.gz": "718342c353ab6aa430a0f4be2e6e5eb122da74beb5815dfaf3b0fd4c9dee57f4" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.5.spec b/SPECS/kubernetes/kubernetes-1.20.5.spec index 04948020a81..c9f99e5e9df 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.spec +++ b/SPECS/kubernetes/kubernetes-1.20.5.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.5 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210428.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz Source1: kubelet.service # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Fri May 07 2021 CBL-Mariner Service Account - 1.20.5-3 +- Update to version "1.20.5-hotfix.20210505". + * Mon May 03 2021 Nicolas Guibourge 1.20.5-2 - Increment release to force republishing using golang 1.15.11. diff --git a/cgmanifest.json b/cgmanifest.json index cc68f64ef1a..9a682ba35a2 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2186,7 +2186,7 @@ "other": { "name": "kubernetes", "version": "1.18.17", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2206,7 +2206,7 @@ "other": { "name": "kubernetes", "version": "1.19.9", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2226,7 +2226,7 @@ "other": { "name": "kubernetes", "version": "1.20.5", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, From 1a57b2b8b5995c3c085ef77909318452cc5fbef9 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Mon, 10 May 2021 15:35:56 -0700 Subject: [PATCH 22/83] Add sos, python-pexpect, python-ptyprocess (#929) --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 3 + .../python-pexpect.signatures.json | 5 + SPECS/python-pexpect/python-pexpect.spec | 338 ++++++++++ .../python-ptyprocess.signatures.json | 5 + .../python-ptyprocess/python-ptyprocess.spec | 142 ++++ SPECS/sos/sos.signatures.json | 5 + SPECS/sos/sos.spec | 635 ++++++++++++++++++ cgmanifest.json | 30 + 9 files changed, 1164 insertions(+), 1 deletion(-) create mode 100644 SPECS/python-pexpect/python-pexpect.signatures.json create mode 100644 SPECS/python-pexpect/python-pexpect.spec create mode 100644 SPECS/python-ptyprocess/python-ptyprocess.signatures.json create mode 100644 SPECS/python-ptyprocess/python-ptyprocess.spec create mode 100644 SPECS/sos/sos.signatures.json create mode 100644 SPECS/sos/sos.spec diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 5ca0b6216b6..e10b9a9ba00 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -2,7 +2,7 @@ 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) | at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
dnf
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
hyperv-daemons
ipmitool
ipv6calc
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
libatasmart
libburn
libcgroup
libcomps
libdnf
libisoburn
libisofs
libkcapi
libpwquality
libxcrypt
mokutil
mozjs60
open-vm-tools
openssl
p11-kit
perl-JSON
pugixml
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
squashfs-tools
uclibc-ng
uuid
websocketpp
words
yaml-cpp
zipper | +| Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
dnf
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
hyperv-daemons
ipmitool
ipv6calc
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
libatasmart
libburn
libcgroup
libcomps
libdnf
libisoburn
libisofs
libkcapi
libpwquality
libxcrypt
mokutil
mozjs60
open-vm-tools
openssl
p11-kit
perl-JSON
pugixml
python-pexpect
python-ptyprocess
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
sos
squashfs-tools
uclibc-ng
uuid
websocketpp
words
yaml-cpp
zipper | | Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
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
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates-base
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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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
runc
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 | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 651806dc983..44ac3fb114c 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -59,11 +59,14 @@ "p11-kit", "perl-JSON", "pugixml", + "python-pexpect", + "python-ptyprocess", "qt5-qtbase", "qt5-qtdeclarative", "qt5-qtsvg", "qt5-qttools", "qt5-rpm-macros", + "sos", "squashfs-tools", "uclibc-ng", "uuid", diff --git a/SPECS/python-pexpect/python-pexpect.signatures.json b/SPECS/python-pexpect/python-pexpect.signatures.json new file mode 100644 index 00000000000..71b6f7085ac --- /dev/null +++ b/SPECS/python-pexpect/python-pexpect.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "pexpect-4.8.0.tar.gz": "f2ea54a12cc893636a60421e8da0a36c40caad7825eb674697f1e25f5f91245e" + } +} diff --git a/SPECS/python-pexpect/python-pexpect.spec b/SPECS/python-pexpect/python-pexpect.spec new file mode 100644 index 00000000000..594aab11617 --- /dev/null +++ b/SPECS/python-pexpect/python-pexpect.spec @@ -0,0 +1,338 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +%global modname pexpect +Summary: Unicode-aware Pure Python Expect-like module +Name: python-%{modname} +Version: 4.8.0 +Release: 8%{?dist} +License: ISC +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/pexpect/pexpect +Source0: %{url}/archive/%{version}/%{modname}-%{version}.tar.gz +BuildRequires: %{_bindir}/man +BuildArch: noarch +%if %{with_check} +BuildRequires: openssl +%endif + +%description +Pexpect is a pure Python module for spawning child applications; controlling +them; and responding to expected patterns in their output. Pexpect works like +Don Libes' Expect. Pexpect allows your script to spawn a child application and +control it as if a human were typing commands. + +Pexpect can be used for automating interactive applications such as ssh, ftp, +passwd, telnet, etc. It can be used to automate setup scripts for duplicating +software package installations on different servers. And it can be used for +automated software testing. Pexpect is in the spirit of Don Libes' Expect, but +Pexpect is pure Python. Unlike other Expect-like modules for Python, Pexpect +does not require TCL or Expect nor does it require C extensions to be +compiled. It should work on any platform that supports the standard Python +pty module. + +%package -n python3-%{modname} +Summary: %{summary} +BuildRequires: python3-devel +BuildRequires: python3-ptyprocess +BuildRequires: python3-pytest +BuildRequires: python3-setuptools +Requires: python3-ptyprocess + +%description -n python3-%{modname} +Pexpect is a pure Python module for spawning child applications; controlling +them; and responding to expected patterns in their output. Pexpect works like +Don Libes' Expect. Pexpect allows your script to spawn a child application and +control it as if a human were typing commands. This package contains the +python3 version of this module. + +Pexpect can be used for automating interactive applications such as ssh, ftp, +passwd, telnet, etc. It can be used to automate setup scripts for duplicating +software package installations on different servers. And it can be used for +automated software testing. Pexpect is in the spirit of Don Libes' Expect, but +Pexpect is pure Python. Unlike other Expect-like modules for Python, Pexpect +does not require TCL or Expect nor does it require C extensions to be +compiled. It should work on any platform that supports the standard Python +pty module. + +%prep +%autosetup -n %{modname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} + +%check +export PYTHONIOENCODING=UTF-8 +# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1914843 +# upstream: https://github.com/pexpect/pexpect/issues/669 +# There's a patch upstream that we can presumable remove this after +# it merges and is released. +# Thx for the suggestion Miro: https://www.spinics.net/lists/fedora-devel/msg283026.html +echo "set enable-bracketed-paste off" > .inputrc +export INPUTRC=$PWD/.inputrc + +python3 ./tools/display-sighandlers.py +python3 ./tools/display-terminalinfo.py +TRAVIS=true py.test-3 --verbose + +%files -n python3-%{modname} +%license LICENSE +%doc doc examples +%{python3_sitelib}/%{modname}/ +%{python3_sitelib}/%{modname}-*.egg-info + +%changelog +* Mon May 10 2021 Thomas Crain - 4.8.0-8 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- License verified + +* Wed Jan 27 2021 Fedora Release Engineering - 4.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 19 2021 Dan Radez - 4.8.0-6 +- adding workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1914843 +- while we wait for upstream fix: https://github.com/pexpect/pexpect/issues/669 + +* Wed Sep 16 2020 Kalev Lember - 4.8.0-5 +- Avoid using bindir macro in BuildRequires + +* Wed Jul 29 2020 Fedora Release Engineering - 4.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro HronÄok - 4.8.0-3 +- Rebuilt for Python 3.9 + +* Wed Apr 08 2020 Scott Talbert - 4.8.0-2 +- Fix tests when building under COPR (#1822060) + +* Tue Apr 07 2020 Scott Talbert - 4.8.0-1 +- Update to new upstream release 4.8.0 and re-enable tests (#1793613) + +* Thu Jan 30 2020 Fedora Release Engineering - 4.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Sep 24 2019 Dan Radez - 4.7.0-4 +- Remove Python2 packaging + +* Fri Aug 16 2019 Miro HronÄok - 4.7.0-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 4.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Apr 11 2019 Dan Radez - 4.7.0-1 +- update to 4.7.0 + +* Sat Feb 02 2019 Fedora Release Engineering - 4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew JÄ™drzejewski-Szmek - 4.6-2 +- Drop explicit locale setting + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Wed Jul 25 2018 Dan Radez - 4.6-1 +- update to 4.6 + +* Sat Jul 14 2018 Fedora Release Engineering - 4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 15 2018 Miro HronÄok - 4.5-2 +- Rebuilt for Python 3.7 + +* Wed May 23 2018 Igor Gnatenko - 4.5.0-1 +- Update to 4.5.0 + +* Mon Mar 12 2018 Igor Gnatenko - 4.4.0-1 +- Update to 4.4.0 + +* Fri Feb 09 2018 Fedora Release Engineering - 4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Dec 22 2017 Igor Gnatenko - 4.3.1-1 +- Update to 4.3.1 + +* Fri Nov 10 2017 Igor Gnatenko - 4.3-1 +- Update to 4.3 + +* Thu Jul 27 2017 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 14 2017 Igor Gnatenko - 4.2.1-1 +- Update to 4.2.1 + +* Sat Feb 11 2017 Fedora Release Engineering - 4.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Stratakis Charalampos - 4.1.0-3 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 4.1.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Jun 30 2016 Igor Gnatenko - 4.1.0-1 +- Update to 4.1.0 +- Improve packaging + +* Thu Feb 04 2016 Fedora Release Engineering - 4.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 4.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Sun Oct 18 2015 Kalev Lember - 4.0.1-4 +- Move pexpect provides to the right subpackage + +* Tue Oct 13 2015 Igor Gnatenko - 4.0.1-3 +- Fix asyncio issue (3.4.3+) + +* Thu Oct 08 2015 Igor Gnatenko - 4.0.1-2 +- Fix RPM macroses + +* Tue Oct 06 2015 Igor Gnatenko - 4.0.1-1 +- Update to 4.0.1 + +* Mon Oct 05 2015 Igor Gnatenko - 4.0-1 +- Update to 4.0 +- Follow modern RPM Packaging guidelines + +* Thu Jun 18 2015 Fedora Release Engineering - 3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 14 2014 Bohuslav Kabrda - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Tue Apr 08 2014 Fabian Deutsch - 3.1-1 +- Update to 3.1 + +* Tue Nov 12 2013 Thomas Spura - 3.0-1 +- update to 3.0 + +* Wed Oct 30 2013 Thomas Spura - 3.0-0.1 +- new upstream is github/pexpect/pexpect +- update to rc3 +- build on noarch again +- consistently use %%{buildroot} everywhere +- be more explicit in %%files +- remove CFLAGS + +* Thu Sep 05 2013 Andrew McNabb - 2.5.1-11 +- Fix the name of the arm architecture in ExcludeArch + +* Thu Sep 05 2013 Andrew McNabb - 2.5.1-10 +- Remove noarch because of arm build problems (bug #999174) + +* Tue Aug 20 2013 Andrew McNabb - 2.5.1-9 +- Exclude the arm architecture (bug #999174) + +* Tue Aug 20 2013 Andrew McNabb - 2.5.1-8 +- Bump the obsoletes version + +* Sun Aug 04 2013 Fedora Release Engineering - 2.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 20 2012 Andrew McNabb - 2.5.1-5 +- Exclude test scripts from the files list + +* Tue Nov 20 2012 Andrew McNabb - 2.5.1-4 +- Moved unit tests to a check section + +* Tue Nov 20 2012 Andrew McNabb - 2.5.1-3 +- Added unit tests and fixed metadata fields + +* Tue Nov 20 2012 Andrew McNabb - 2.5.1-2 +- Added versions to the obsoletes and provides fields + +* Tue Nov 20 2012 Andrew McNabb - 2.5.1-1 +- Updated to version 2.5.1 (pexpect-u fork) and added support for Python 3 + +* Wed Feb 09 2011 Fedora Release Engineering - 2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Sun Jul 26 2009 Fedora Release Engineering - 2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Robert Scheck 2.3-3 +- Rebuild for gcc 4.4 and rpm 4.6 + +* Fri Dec 5 2008 Jeremy Katz - 2.3-2 +- Rebuild for python 2.6 + +* Tue Jan 08 2008 Robert Scheck 2.3-1 +- Upgrade to 2.3 +- Updated the source URL to match with the guidelines + +* Wed Aug 29 2007 Robert Scheck 2.1-5 +- Rebuilt (and some minor spec file tweaks) + +* Sat Dec 09 2006 Toshio Kuratomi - 2.1-4 +- Bump and rebuild because I forgot to cvs up before the last build. + +* Sat Dec 09 2006 Toshio Kuratomi - 2.1-3 +- Bump and rebuild for python 2.5 on devel. +- Add BR: python-devel as it provides a header necessary for python modules + on python 2.5. + +* Fri Sep 01 2006 Toshio Kuratomi - 2.1-2 +- Remove pyver define as it's not needed with the automatic python(abi). +- Stop ghosting .pyos. +- Let automatic python compilation take care of creating pyos. +- Rebuild for FC6. + +* Mon Jul 17 2006 Toshio Kuratomi - 2.1-1 +- Update to 2.1. + +* Thu Feb 16 2006 Toshio Kuratomi - 2.0-2 +- Bump and rebuild for FC5. +- Convert from python-abi to python(abi) requires. + +* Thu Nov 17 2005 Toshio Kuratomi - 2.0-1 +- Update to 2.0. + +* Sat Sep 3 2005 Toshio Kuratomi 0.99999b-2 +- Add LICENSE File. +- Make noarch. +- Remove executable permissions from the modules copied to examples. + +* Fri Sep 2 2005 Toshio Kuratomi 0.99999b +- Update to version 0.99999b. +- Add dist tag. + +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + +* Thu Feb 03 2005 Toshio Kuratomi 0.999-2 +- Use python_sitelib macro to resolve build issues on x86_64. +- %%ghost *.pyo +- Install ANSI.py, screen.py, and FSM.py into the examples. These are intended + to suplement pexpect eventually but they are currently much less robust and + not installed to by default. But they are needed by some examples. +- Use __python macro in build/install for consistency. +- Add --skip-build to the invocation of setup.py in install. + +* Mon May 31 2004 Panu Matilainen 0.999-0.fdr.1 +- get rid of distrel munging, buildsys does that... +- update to 0.999 +- update doc and example tarballs +- fix build on python <> 2.2 +- use -O1 in install to generate .pyo files instead of manually creating the files +- require python-abi = pyver to get dependencies right + +* Sun Jul 27 2003 Panu Matilainen 0.98-0.fdr.3 +- own .pyo files too as suggested by Ville (#517) + +* Sat Jul 26 2003 Panu Matilainen 0.98-0.fdr.2 +- fixes by Ville (bug #517) applied + +* Sat Jul 26 2003 Panu Matilainen +- Initial Fedora packaging diff --git a/SPECS/python-ptyprocess/python-ptyprocess.signatures.json b/SPECS/python-ptyprocess/python-ptyprocess.signatures.json new file mode 100644 index 00000000000..e0e60e43e8d --- /dev/null +++ b/SPECS/python-ptyprocess/python-ptyprocess.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "ptyprocess-0.7.0.tar.gz": "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220" + } +} diff --git a/SPECS/python-ptyprocess/python-ptyprocess.spec b/SPECS/python-ptyprocess/python-ptyprocess.spec new file mode 100644 index 00000000000..a8c67e4856d --- /dev/null +++ b/SPECS/python-ptyprocess/python-ptyprocess.spec @@ -0,0 +1,142 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +%global srcname ptyprocess +Summary: Run a subprocess in a pseudo terminal +Name: python-%{srcname} +Version: 0.7.0 +Release: 1%{?dist} +License: ISC +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/pexpect/ptyprocess +Source0: https://pypi.io/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz +BuildArch: noarch +%if %{with_check} +BuildRequires: python3-pytest +%endif + +%description +Launch a subprocess in a pseudo terminal (pty), and interact with both the +process and its pty. + +%package -n python3-ptyprocess +Summary: Run a subprocess in a pseudo terminal +BuildRequires: python3-devel + +%description -n python3-ptyprocess +Launch a subprocess in a pseudo terminal (pty), and interact with both the +process and its pty. + +%prep +%autosetup -n %{srcname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} + +%check +python3 -m pytest -v + +%files -n python3-ptyprocess +%license LICENSE +%doc README.rst +%{python3_sitelib}/ptyprocess/ +%{python3_sitelib}/ptyprocess-*.egg-info + +%changelog +* Mon May 10 2021 Thomas Crain - 0.7.0-1 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- Updated to latest package version +- License verified + +* Wed Jan 27 2021 Fedora Release Engineering - 0.6.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 22 2020 Miro HronÄok - 0.6.0-10 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 01 2019 Miro HronÄok - 0.6.0-8 +- Subpackage python2-ptyprocess has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Fri Aug 16 2019 Miro HronÄok - 0.6.0-7 +- Rebuilt for Python 3.8 + +* Mon Jul 29 07:16:43 CEST 2019 Igor Gnatenko - 0.6.0-6 +- Fix FTBFS + +* Fri Jul 26 2019 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew JÄ™drzejewski-Szmek - 0.6.0-3 +- Drop explicit locale setting + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Sat Jul 14 2018 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 22 2018 Orion Poplawski - 0.6.0-1 +- Update to 0.6.0 + +* Fri Jun 15 2018 Miro HronÄok - 0.5.2-4 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jul 03 2017 Charalampos Stratakis - 0.5.2-1 +- Update to 0.5.2 (#1467330) + +* Thu Feb 23 2017 Orion Poplawski - 0.5.1-6 +- Really build python3 on EPEL + +* Thu Feb 23 2017 Orion Poplawski - 0.5.1-5 +- Build python3 on EPEL +- Run tests verbosely + +* Sat Feb 11 2017 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Stratakis Charalampos - 0.5.1-3 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.5.1-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Apr 04 2016 Thomas Spura - 0.5.1-1 +- update to 0.5.1 (#1304136) + +* Thu Feb 04 2016 Fedora Release Engineering - 0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 14 2015 Thomas Spura - 0.5-3 +- Use new python macros + +* Thu Jun 18 2015 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 21 2015 Thomas Spura - 0.5-1 +- update to 0.5 (#1223718) + +* Wed Jan 07 2015 Thomas Spura - 0.4-1 +- update to 0.4 + +* Wed Dec 03 2014 Thomas Spura - 0.3.1-2 +- Generalize with_python3 macro +- Add comment to tests section + +* Tue Nov 25 2014 Thomas Spura - 0.3.1-1 +- initial spec for ptyprocess (#1167830) diff --git a/SPECS/sos/sos.signatures.json b/SPECS/sos/sos.signatures.json new file mode 100644 index 00000000000..b3d926b1c61 --- /dev/null +++ b/SPECS/sos/sos.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "sos-4.1.tar.gz": "5edc75a655a43a1b21d8d1cec3371d4d188157501ccf60984a9e189e205444ec" + } +} \ No newline at end of file diff --git a/SPECS/sos/sos.spec b/SPECS/sos/sos.spec new file mode 100644 index 00000000000..146a4ccf60e --- /dev/null +++ b/SPECS/sos/sos.spec @@ -0,0 +1,635 @@ +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +Summary: A set of tools to gather troubleshooting information from a system +Name: sos +Version: 4.1 +Release: 2%{?dist} +License: GPLv2+ +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/sosreport/sos +#Source0: https://github.com/sosreport/sos/archive/%%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +BuildRequires: gettext +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: bzip2 +Requires: python3-libxml2 +Requires: python3-pexpect +Requires: python3-rpm +Requires: tar +Requires: xz +BuildArch: noarch + +%description +Sos is a set of tools that gathers information about system +hardware and configuration. The information can then be used for +diagnostic purposes and debugging. Sos is commonly used to help +support technicians and developers. + +%prep +%autosetup -n %{name}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_sbindir} + +install -d -m 755 %{buildroot}%{_sysconfdir}/%{name} +install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/cleaner +install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/presets.d +install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/groups.d +install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/extras.d +install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf + +rm -rf %{buildroot}%{_prefix}/config/ + +%find_lang %{name} || echo 0 + +%files -f %{name}.lang +%license LICENSE +%doc AUTHORS README.md +%{_sbindir}/sos +%{_sbindir}/sosreport +%{_sbindir}/sos-collector +%dir %{_sysconfdir}/sos/cleaner +%dir %{_sysconfdir}/sos/presets.d +%dir %{_sysconfdir}/sos/extras.d +%dir %{_sysconfdir}/sos/groups.d +%{python3_sitelib}/* +%{_mandir}/man1/* +%{_mandir}/man5/* + +%config(noreplace) %{_sysconfdir}/sos/sos.conf + +%changelog +* Mon May 10 2021 Thomas Crain - 4.1-2 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- Linted spec to Mariner style +- License verified + +* Wed Mar 10 2021 Sandro Bonazzola - 4.1-1 +- Update to 4.1 (#1933183) + +* Wed Jan 27 2021 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 24 2020 Sandro Bonazzola - 4.0-2 +- Fixes BZ#1882015 + +* Mon Sep 14 2020 Sandro Bonazzola - 4.0-1 +- Update to 4.0 (#1869464) + +* Wed Jul 29 2020 Fedora Release Engineering - 3.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro HronÄok - 3.9.1-2 +- Rebuilt for Python 3.9 + +* Fri Mar 27 2020 Sandro Bonazzola - 3.9.1-1 +- Update to 3.9.1 (#1803339) + +* Thu Jan 30 2020 Fedora Release Engineering - 3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Aug 29 2019 Sandro Bonazzola - 3.8-1 +- Update to 3.8 (#1747060) +- Conflicts with vdsm <= 4.30.17 (#1706060) + +* Mon Aug 19 2019 Miro HronÄok - 3.7-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Mar 28 2019 Sandro Bonazzola - 3.7-1 +- Rebase on upstream 3.7 +- Resolves: BZ#1693419 + +* Sun Feb 03 2019 Fedora Release Engineering - 3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 25 2018 Sandro Bonazzola - 3.6-3 +- Rebuilt for Python 3.7 + +* Mon Jun 25 2018 Sandro Bonazzola - 3.6-2 +- Upstream re-tagged the source package + +* Mon Jun 25 2018 Sandro Bonazzola - 3.6-1 +- Rebase on upstream 3.6 +- Added python3-six build requirement +- Resolves: BZ#1594443 + +* Tue Jun 19 2018 Miro HronÄok - 3.5.1-2 +- Rebuilt for Python 3.7 + +* Tue May 29 2018 Sandro Bonazzola - 3.5.1-1 +- Rebase on upstream 3.5.1 +- Resolves: BZ#1583580 + +* Fri Feb 09 2018 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Nov 14 2017 Sandro Bonazzola - 3.5-1 +- Rebase on upstream 3.5 +- Resolves: BZ#1513030 + +* Thu Jul 27 2017 Fedora Release Engineering - 3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 29 2017 Sandro Bonazzola - 3.4-1 +- Rebase on upstream 3.4 +- Resolves: BZ#1436969 +- Resolves: BZ#1427445 + +* Thu Feb 23 2017 Sandro Bonazzola - 3.3-1 +- Rebase on upstream 3.3 +- Resolves: BZ#1411314 + +* Sat Feb 11 2017 Fedora Release Engineering - 3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro HronÄok - 3.2-5 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 3.2-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Feb 05 2016 Fedora Release Engineering - 3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Dec 16 2015 Bryn M. Reeves = 3.2-2 +- [sosreport] ensure private temporary directory is removed +- [global] sync rawhide package with upstream +- [ceph] collect /var/lib/ceph and /var/run/ceph +- [sosreport] prepare report in a private subdirectory (CVE-2015-7529) +- [docker] collect journald logs for docker unit +- [sosreport] fix command-line report defaults +- [openstack_neutron] obfuscate server_auth in restproxy.ini +- [memory] collect swapon --show output in bytes +- [sosreport] fix command-line report defaults (proper patch ordering) +- [sapnw] call self methods properly +- [openvswitch] capture the logs, db and OVS bridges details +- [logs] fix reference to missing 'rsyslog_conf' variable +- [sapnw] Add check if saphostctrl is not present, dont use Set +- [Plugin] fix handling of symlinks in non-sysroot environments +- [openstack] Ensure openstack passwords and secrets are obfuscated +- [plugin] pass stderr through _collect_cmd_output +- [kubernetes,plugin] Support running sos inside a container +- [openstack] New Openstack Trove (DBaaS) plugin +- [services] Add more diagnostics to applications +- [openstack_neutron] Obscure passwords and secrets +- [ceph] add calamari and ragos logs and configs +- [iprconfig] enable plugin for ppc64* architectures +- [general] verify --profile contains valid plugins only +- [kernel,mpt,memory] additional kernel-related diagnostics +- [cluster] enable crm_report password scrubbing +- [sosreport] fix command-line report defaults +- [virsh] add new plugin, add listing of qemu +- [sap*,vhostmd] new plugins for SAP +- [cluster] crm_report fails to run because dir already exists +- [foreman] Skip collection of generic resources +- [apache] Added collection of conf.modules.d dir for httpd 2.4 +- [pcp] collect /etc/pcp.conf +- [puppet] adding new plugin for puppet +- [block] Don't use parted human readable output +- [general] Better handling --name and --ticket-number in +- [networking] additional ip, firewall and traffic shaping +- [infiniband] add opensm and infiniband-diags support +- [plugins/rabbitmq] Added cluster_status command output +- [networking] re-add 'ip addr' with a root symlink +- [kimchi] add new plugin +- [iprconfig] add plugin for IBM Power RAID adapters +- [ovirt] Collect engine tunables and domain information. +- [activemq] Honour all_logs and get config on RHEL +- [cluster] Add luci to packages for standalone luci servers +- [hpasm] hpasmcli commands hang under timeout +- [mysql] Collect log file +- [chrony] add chrony plugin +- [openstack_sahara] redact secrets from sahara configuration +- [openstack_sahara] add new openstack_sahara plugin +- [openstack_neutron] neutron configuration and logs files not captured +- [ovirt] remove ovirt-engine setup answer file password leak +- [networking] network plugin fails if NetworkManager is disabled +- [cluster] crm_report fails to run because dir already exists +- [mysql] improve handling of dbuser, dbpass and MYSQL_PWD +- [mysql] test for boolean values in dbuser and dbpass +- [plugin] limit path names to PC_NAME_MAX +- [squid] collect files from /var/log/squid +- [sosreport] log plugin exceptions to a file +- [ctdb] fix collection of /etc/sysconfig/ctdb +- [sosreport] fix silent exception handling +- [sosreport] do not make logging calls after OSError +- [sosreport] catch OSError exceptions in SoSReport.execute() +- [anaconda] make useradd password regex tolerant of whitespace +- [mysql] fix handling of mysql.dbpass option +- [navicli] catch exceptions if stdin is unreadable +- [docs] update man page for new options +- [sosreport] make all utf-8 handling user errors=ignore +- [kpatch] do not attempt to collect data if kpatch is not installed +- [archive] drop support for Zip archives +- [sosreport] fix archive permissions regression +- [tomcat] add support for tomcat7 and default log size limits +- [mysql] obtain database password from the environment +- [corosync] add postprocessing for corosync-objctl output +- [ovirt_hosted_engine] fix exception when force-enabled +- [yum] call rhsm-debug with --no-subscriptions +- [powerpc] allow PowerPC plugin to run on ppc64le +- [package] add Obsoletes for sos-plugins-openstack +- [pam] add pam_tally2 and faillock support +- [postgresql] obtain db password from the environment +- [pcp] add Performance Co-Pilot plugin +- [nfsserver] collect /etc/exports.d +- [sosreport] handle --compression-type correctly +- [anaconda] redact passwords in kickstart configurations +- [haproxy] add new plugin +- [keepalived] add new plugin +- [lvm2] set locking_type=0 when calling lvm commands +- [tuned] add new plugin +- [cgroups] collect /etc/sysconfig/cgred +- [plugins] ensure doc text is always displayed for plugins +- [sosreport] fix the distribution version API call +- [docker] add new plugin +- [openstack_*] include broken-out openstack plugins +- [mysql] support MariaDB +- [openstack] do not collect /var/lib/nova +- [grub2] collect grub.cfg on UEFI systems +- [sosreport] handle out-of-space errors gracefully +- [firewalld] new plugin +- [networking] collect NetworkManager status +- [kpatch] new plugin +- [global] update to upstream 3.2 release +- [foreman] add new plugin + +* Tue Nov 10 2015 Fedora Release Engineering - 3.2-0.4.a +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Jul 17 2015 Miro HronÄok - 3.2-0.3.a +- Use Python 3 (#1014595) +- Use setup.py instead of make +- Remove some deprecated statements + +* Fri Jun 19 2015 Fedora Release Engineering - 3.2-0.2.a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 17 2014 Bryn M. Reeves = 3.2-0.1.a +- Make source URL handling compliant with packaging guidelines +- Update to new upstream pre-release sos-3.2-alpha1 + +* Sun Jun 08 2014 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Apr 01 2014 Bryn M. Reeves = 3.1-1 +- Update to new upstream release sos-3.1 +- Add collection of grub configuration for UEFI systems +- Raise a TypeError if add_copy_specs() is called with a string +- Add tests for Plugin.add_copy_spec()/add_copy_specs() +- Update Plugin tests to treat copy_paths as a set +- Use a set for Plugin.copy_paths +- Remove references to 'sub' parameter from plugin tests +- Remove 'sub' parameter from Plugin.add_copy_spec*() +- Drop RedHatPlugin from procenv +- Update plugin_tests.py to match new method names +- Remove obsolete checksum reference from utilities_tests.py +- Refactor Plugin.collect() pathway +- Fix x86 arch detection in processor plugin +- Pythonify Plugin._path_in_pathlist() +- Clean up package checks in processor plugin +- Replace self.policy().pkg_by_name() us in Logs plugin +- Convert infiniband to package list +- Dead code removal: PluginException +- Dead code removal: sos.plugins.common_prefix() +- Add vim tags to all python source files +- Dead code removal: utilities.checksum() +- Dead code removal: DirTree +- Dead code removal: sos_relative_path() +- Remove --profile support +- Fix plugin_test exception on six.PY2 +- Call rhsm-debug with the --sos switch +- Do not collect isos in cobbler plugin +- Match plugins against policies +- Update policy_tests.py for validate_plugin change +- Rename validatePlugin to validate_plugin +- Fix broken binary detection in satellite plugin +- Clean up get_cmd_path/make_cmd_path/make_cmd_dirs mess +- Add tuned plugin +- Update systemd support +- Fix remaining use of obsolete 'get_cmd_dir()' in plugins +- Add PowerNV specific debug data +- powerpc: Move VPD related tool under common code +- Remove the rhevm plugin. +- Replace package check with file check in anacron +- Scrub ldap_default_authtok password in sssd plugin +- Eliminate hard-coded /var/log/sa paths in sar plugin +- Remove useless check_enabled() from sar plugin +- Improve error message when cluster.crm_from is invalid +- Fix command output substitution exception +- Add distupgrade plugin +- Fix gluster volume name extraction +- Ensure unused fds are closed when calling subprocesses via Popen +- Pass --no-archive to rhsm-debug script +- postgresql: allow use TCP socket +- postgresql: added license and copyright +- postgresql: add logs about errors / warnings +- postgresql: minor fixes +- Include geo-replication status in gluster plugin +- Make get_cmd_output_now() behaviour match 2.2 +- Add rhsm-debug collection to yum plugin +- Always treat rhevm vdsmlogs option as string +- Fix verbose file logging +- Fix get_option() use in cluster plugin +- Fix cluster postproc regression +- Ensure superclass postproc method is called in ldap plugin +- Remove obsolete diagnostics code from ldap plugin +- Fix cluster module crm_report support + +* Thu Mar 20 2014 Bryn M. Reeves = 3.0-23 +- Call rhsm-debug with the --sos switch + +* Mon Mar 03 2014 Bryn M. Reeves +- Fix package check in anacron plugin + +* Wed Feb 12 2014 Bryn M. Reeves +- Remove obsolete rhel_version() usage from yum plugin + +* Tue Feb 11 2014 Bryn M. Reeves +- Prevent unhandled exception during command output substitution + +* Mon Feb 10 2014 Bryn M. Reeves +- Fix generation of volume names in gluster plugin +- Add distupgrade plugin + +* Tue Feb 04 2014 Bryn M. Reeves +- Prevent file descriptor leaks when using Popen +- Disable zip archive creation when running rhsm-debug +- Include volume geo-replication status in gluster plugin + +* Mon Feb 03 2014 Bryn M. Reeves +- Fix get_option use in cluster plugin +- Fix debug logging to file when given '-v' +- Always treat rhevm plugin's vdsmlogs option as a string +- Run the rhsm-debug script from yum plugin + +* Fri Jan 31 2014 Bryn M. Reeves +- Add new plugin to collect OpenHPI configuration +- Fix cluster plugin crm_report support +- Fix file postprocessing in ldap plugin +- Remove collection of anaconda-ks.cfg from general plugin + +* Fri Jan 24 2014 Bryn M. Reeves +- Remove debug statements from logs plugin +- Make ethernet interface detection more robust +- Fix specifying multiple plugin options on the command line +- Make log and message levels match previous versions +- Log a warning message when external commands time out +- Remove --upload command line option +- Update sos UI text to match upstream + +* Fri Dec 27 2013 Daniel Mach +- Mass rebuild 2013-12-27 + +* Thu Nov 14 2013 Bryn M. Reeves +- Fix regressions introduced with --build option + +* Tue Nov 12 2013 Bryn M. Reeves +- Fix typo in yum plug-in add_forbidden_paths +- Add krb5 plug-in and drop collection of krb5.keytab + +* Fri Nov 8 2013 Bryn M. Reeves +- Add nfs client plug-in +- Fix traceback when sar module force-enabled + +* Thu Nov 7 2013 Bryn M. Reeves +- Restore --build command line option +- Collect saved vmcore-dmesg.txt files +- Normalize temporary directory paths + +* Tue Nov 5 2013 Bryn M. Reeves +- Add domainname output to NIS plug-in +- Collect /var/log/squid in squid plug-in +- Collect mountstats and mountinfo in filesys plug-in +- Add PowerPC plug-in from upstream + +* Thu Oct 31 2013 Bryn M. Reeves +- Remove version checks in gluster plug-in +- Check for usable temporary directory +- Fix --alloptions command line option +- Fix configuration fail regression + +* Wed Oct 30 2013 Bryn M. Reeves +- Include /etc/yaboot.conf in boot plug-in +- Fix collection of brctl output in networking plug-in +- Verify limited set of RPM packages by default +- Do not strip newlines from command output +- Limit default sar data collection + +* Thu Oct 3 2013 Bryn M. Reeves +- Do not attempt to read RPC pseudo files in networking plug-in +- Restrict wbinfo collection to the current domain +- Add obfuscation of luci secrets to cluster plug-in +- Add XFS plug-in +- Fix policy class handling of --tmp-dir +- Do not set batch mode if stdin is not a TTY +- Attempt to continue when reading bad input in interactive mode + +* Wed Aug 14 2013 Bryn M. Reeves +- Add crm_report support to cluster plug-in +- Fix rhel_version() usage in cluster and s390 plug-ins +- Strip trailing newline from command output + +* Mon Jun 10 2013 Bryn M. Reeves +- Silence 'could not run' messages at default verbosity +- New upstream release + +* Thu May 23 2013 Bryn M. Reeves +- Always invoke tar with '-f-' option + +* Mon Jan 21 2013 Bryn M. Reeves +- Fix interactive mode regression when --ticket unspecified + +* Fri Jan 18 2013 Bryn M. Reeves +- Fix propagation of --ticket parameter in interactive mode + +* Thu Jan 17 2013 Bryn M. Reeves +- Revert OpenStack patch + +* Wed Jan 9 2013 Bryn M. Reeves +- Report --name and --ticket values as defaults +- Fix device-mapper command execution logging +- Fix data collection and rename PostreSQL module to pgsql + +* Fri Oct 19 2012 Bryn M. Reeves +- Add support for content delivery hosts to RHUI module + +* Thu Oct 18 2012 Bryn M. Reeves +- Add Red Hat Update Infrastructure module +- Collect /proc/iomem in hardware module +- Collect subscription-manager output in general module +- Collect rhsm log files in general module +- Fix exception in gluster module on non-gluster systems +- Fix exception in psql module when dbname is not given + +* Wed Oct 17 2012 Bryn M. Reeves +- Collect /proc/pagetypeinfo in memory module +- Strip trailing newline from command output +- Add sanlock module +- Do not collect archived accounting files in psacct module +- Call spacewalk-debug from rhn module to collect satellite data + +* Mon Oct 15 2012 Bryn M. Reeves +- Avoid calling volume status when collecting gluster statedumps +- Use a default report name if --name is empty +- Quote tilde characters passed to shell in RPM module +- Collect KDC and named configuration in ipa module +- Sanitize hostname characters before using as report path +- Collect /etc/multipath in device-mapper module +- New plug-in for PostgreSQL +- Add OpenStack module +- Avoid deprecated sysctls in /proc/sys/net +- Fix error logging when calling external programs +- Use ip instead of ifconfig to generate network interface lists + +* Wed May 23 2012 Bryn M. Reeves +- Collect the swift configuration directory in gluster module +- Update IPA module and related plug-ins + +* Fri May 18 2012 Bryn M. Reeves +- Collect mcelog files in the hardware module + +* Wed May 02 2012 Bryn M. Reeves +- Add nfs statedump collection to gluster module + +* Tue May 01 2012 Bryn M. Reeves +- Use wildcard to match possible libvirt log paths + +* Mon Apr 23 2012 Bryn M. Reeves +- Add forbidden paths for new location of gluster private keys + +* Fri Mar 9 2012 Bryn M. Reeves +- Fix katello and aeolus command string syntax +- Remove stray hunk from gluster module patch + +* Thu Mar 8 2012 Bryn M. Reeves +- Correct aeolus debug invocation in CloudForms module +- Update gluster module for gluster-3.3 +- Add additional command output to gluster module +- Add support for collecting gluster configuration and logs + +* Wed Mar 7 2012 Bryn M. Reeves +- Collect additional diagnostic information for realtime systems +- Improve sanitization of RHN user and case number in report name +- Fix verbose output and debug logging +- Add basic support for CloudForms data collection +- Add support for Subscription Asset Manager diagnostics + +* Tue Mar 6 2012 Bryn M. Reeves +- Collect fence_virt.conf in cluster module +- Fix collection of /proc/net directory tree +- Gather output of cpufreq-info when present +- Fix brctl showstp output when bridges contain multiple interfaces +- Add /etc/modprobe.d to kernel module +- Ensure relative symlink targets are correctly handled when copying +- Fix satellite and proxy package detection in rhn plugin +- Collect stderr output from external commands +- Collect /proc/cgroups in the cgroups module + Resolve: bz784874 +- Collect /proc/irq in the kernel module +- Fix installed-rpms formatting for long package names +- Add symbolic links for truncated log files +- Collect non-standard syslog and rsyslog log files +- Use correct paths for tomcat6 in RHN module +- Obscure root password if present in anacond-ks.cfg +- Do not accept embedded forward slashes in RHN usernames +- Add new sunrpc module to collect rpcinfo for gluster systems + +* Tue Nov 1 2011 Bryn M. Reeves +- Do not collect subscription manager keys in general plugin + +* Fri Sep 23 2011 Bryn M. Reeves +- Fix execution of RHN hardware.py from hardware plugin +- Fix hardware plugin to support new lsusb path + +* Fri Sep 09 2011 Bryn M. Reeves +- Fix brctl collection when a bridge contains no interfaces +- Fix up2dateclient path in hardware plugin + +* Mon Aug 15 2011 Bryn M. Reeves +- Collect brctl show and showstp output +- Collect nslcd.conf in ldap plugin + +* Sun Aug 14 2011 Bryn M. Reeves +- Truncate files that exceed specified size limit +- Add support for collecting Red Hat Subscrition Manager configuration +- Collect /etc/init on systems using upstart +- Don't strip whitespace from output of external programs +- Collect ipv6 neighbour table in network module +- Collect basic cgroups configuration data + +* Sat Aug 13 2011 Bryn M. Reeves +- Fix collection of data from LVM2 reporting tools in devicemapper plugin +- Add /proc/vmmemctl collection to vmware plugin + +* Fri Aug 12 2011 Bryn M. Reeves +- Collect yum repository list by default +- Add basic Infiniband plugin +- Add plugin for scsi-target-utils iSCSI target +- Fix autofs plugin LC_ALL usage +- Fix collection of lsusb and add collection of -t and -v outputs +- Extend data collection by qpidd plugin +- Add ethtool pause, coalesce and ring (-a, -c, -g) options to network plugin + +* Thu Apr 07 2011 Bryn M. Reeves +- Use sha256 for report digest when operating in FIPS mode + +* Tue Apr 05 2011 Bryn M. Reeves +- Fix parted and dumpe2fs output on s390 + +* Fri Feb 25 2011 Bryn M. Reeves +- Fix collection of chkconfig output in startup.py +- Collect /etc/dhcp in dhcp.py plugin +- Collect dmsetup ls --tree output in devicemapper.py +- Collect lsblk output in filesys.py + +* Thu Feb 24 2011 Bryn M. Reeves +- Fix collection of logs and config files in sssd.py +- Add support for collecting entitlement certificates in rhn.py + +* Thu Feb 03 2011 Bryn M. Reeves +- Fix cluster plugin dlm lockdump for el6 +- Add sssd plugin to collect configuration and logs +- Collect /etc/anacrontab in system plugin +- Correct handling of redhat-release for el6 + +* Thu Jul 29 2010 Adam Stokes + +* Thu Jun 10 2010 Adam Stokes + +* Wed Apr 28 2010 Adam Stokes + +* Mon Apr 12 2010 Adam Stokes + +* Tue Mar 30 2010 Adam Stokes +- fix setup.py to autocompile translations and man pages +- rebase 1.9 + +* Fri Mar 19 2010 Adam Stokes +- updated translations + +* Thu Mar 04 2010 Adam Stokes +- version bump 1.9 +- replaced compression utility with xz +- strip threading/multiprocessing +- simplified progress indicator +- pylint update +- put global vars in class container +- unittests +- simple profiling +- make use of xgettext as pygettext is deprecated + +* Mon Jan 18 2010 Adam Stokes +- more sanitizing options for log files +- rhbz fixes from RHEL version merged into trunk +- progressbar update diff --git a/cgmanifest.json b/cgmanifest.json index 9a682ba35a2..07e7672f3b6 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5120,6 +5120,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-pexpect", + "version": "4.8.0", + "downloadUrl": "https://github.com/pexpect/pexpect/archive/4.8.0/pexpect-4.8.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5170,6 +5180,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-ptyprocess", + "version": "0.7.0", + "downloadUrl": "https://pypi.io/packages/source/p/ptyprocess/ptyprocess-0.7.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -6520,6 +6540,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "sos", + "version": "4.1", + "downloadUrl": "https://github.com/sosreport/sos/archive/4.1.tar.gz" + } + } + }, { "component": { "type": "other", From 1d74d9e35545a10637bf173c51aad063d0a45c2d Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 11 May 2021 10:29:30 -0700 Subject: [PATCH 23/83] Fix "Mr serious" voice name in espeak-ng (#927) --- SPECS/espeak-ng/espeak-ng.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/SPECS/espeak-ng/espeak-ng.spec b/SPECS/espeak-ng/espeak-ng.spec index 875f433707d..e0a3cd1c65e 100644 --- a/SPECS/espeak-ng/espeak-ng.spec +++ b/SPECS/espeak-ng/espeak-ng.spec @@ -1,7 +1,7 @@ Summary: Compact text-to-speech synthesizer Name: espeak-ng Version: 1.50 -Release: 2%{?dist} +Release: 3%{?dist} # Apache2 license applies only to Android APK code- does not apply here # BSD license applies only to Windows code- does not apply here License: GPLv3 AND Unicode @@ -47,6 +47,12 @@ find %{buildroot} -type f -name "*.la" -delete -print ln -s libespeak-ng.so %{buildroot}%{_libdir}/libespeak.so rm %{buildroot}%{_libdir}/libespeak.la +# Rename problematic file with space in name +# This file does not work well with our GNU Make build system when placed in the ISO initrd +# GNU Make hacks to allow spaces in filenames are hacky and likely to make things worse +# Sample error: "make[1]: *** No rule to make target 'serious', needed by 'image'. Stop." +mv "%{buildroot}%{_datadir}/espeak-ng-data/voices/!v/Mr serious" "%{buildroot}%{_datadir}/espeak-ng-data/voices/!v/Mr_serious" + %check make check @@ -74,6 +80,9 @@ make check %{_libdir}/*.so %changelog +* Mon May 10 2021 Thomas Crain - 1.50-3 +- Rename "Mr serious" voice to "Mr_serious" + * Fri Mar 05 2021 Thomas Crain - 1.50-2 - Add tests-fix-greek-letter-variants.patch to address failing test - Adjust tests-newline-fixes.patch to account for new patch From 6d8645b60d9648cfdc3248f8e8eb32070b6cd70d Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 11 May 2021 16:59:17 -0700 Subject: [PATCH 24/83] Fix build break due to file dependency in python-pexpect (#933) --- SPECS/python-pexpect/python-pexpect.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SPECS/python-pexpect/python-pexpect.spec b/SPECS/python-pexpect/python-pexpect.spec index 594aab11617..c40350d0254 100644 --- a/SPECS/python-pexpect/python-pexpect.spec +++ b/SPECS/python-pexpect/python-pexpect.spec @@ -3,15 +3,15 @@ Summary: Unicode-aware Pure Python Expect-like module Name: python-%{modname} Version: 4.8.0 -Release: 8%{?dist} +Release: 9%{?dist} License: ISC Vendor: Microsoft Corporation Distribution: Mariner URL: https://github.com/pexpect/pexpect Source0: %{url}/archive/%{version}/%{modname}-%{version}.tar.gz -BuildRequires: %{_bindir}/man BuildArch: noarch %if %{with_check} +BuildRequires: man-db BuildRequires: openssl %endif @@ -84,6 +84,9 @@ TRAVIS=true py.test-3 --verbose %{python3_sitelib}/%{modname}-*.egg-info %changelog +* Tue May 11 2021 Thomas Crain - 4.8.0-9 +- Remove /usr/bin/man dependency, replace with check-time man-db dependency + * Mon May 10 2021 Thomas Crain - 4.8.0-8 - Initial CBL-Mariner import from Fedora 34 (license: MIT) - License verified From 95df6da7430054e2ec4efdd2a13ec98cd4196f1a Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Wed, 12 May 2021 09:25:47 -0700 Subject: [PATCH 25/83] Fixing parsing the packages JSON. (#931) --- .../imagegen/installutils/installutils.go | 16 ++- toolkit/tools/internal/pkgjson/pkgjson.go | 44 ++++++- .../tools/internal/pkgjson/pkgjson_test.go | 113 ++++++++++++++++++ 3 files changed, 165 insertions(+), 8 deletions(-) diff --git a/toolkit/tools/imagegen/installutils/installutils.go b/toolkit/tools/imagegen/installutils/installutils.go index 1a828c685ab..ea4c3a280d9 100644 --- a/toolkit/tools/imagegen/installutils/installutils.go +++ b/toolkit/tools/imagegen/installutils/installutils.go @@ -286,7 +286,9 @@ func umount(path string) (err error) { } // PackageNamesFromSingleSystemConfig goes through the packageslist field in the systemconfig and extracts the list of packages -// from each of the packagelists +// from each of the packagelists. +// NOTE: the package list contains the versions restrictions for the packages, if present, in the form "[package][condition][version]". +// Example: gcc=9.1.0 // - systemConfig is the systemconfig field from the config file // Since kernel is not part of the packagelist, it is added separately from KernelOptions. func PackageNamesFromSingleSystemConfig(systemConfig configuration.SystemConfig) (finalPkgList []string, err error) { @@ -354,9 +356,15 @@ func PackageNamesFromConfig(config configuration.Config) (packageList []*pkgjson packages := make([]*pkgjson.PackageVer, 0, len(packagesToInstall)) for _, pkg := range packagesToInstall { - packages = append(packages, &pkgjson.PackageVer{ - Name: pkg, - }) + var packageVer *pkgjson.PackageVer + + packageVer, err = pkgjson.PackagesListEntryToPackageVer(pkg) + if err != nil { + logger.Log.Errorf("Failed to parse packages list from system config \"%s\".", systemCfg.Name) + return + } + + packages = append(packages, packageVer) } packageList = append(packageList, packages...) diff --git a/toolkit/tools/internal/pkgjson/pkgjson.go b/toolkit/tools/internal/pkgjson/pkgjson.go index 42011a485c1..0d02afa2fed 100644 --- a/toolkit/tools/internal/pkgjson/pkgjson.go +++ b/toolkit/tools/internal/pkgjson/pkgjson.go @@ -5,6 +5,7 @@ package pkgjson import ( "fmt" + "regexp" "microsoft.com/pkggen/internal/versioncompare" @@ -12,6 +13,21 @@ import ( "microsoft.com/pkggen/internal/logger" ) +const ( + packageWithVersionNameIndex = 1 + packageWithVersionConditionIndex = 2 + packageWithVersionVersionIndex = 3 + packageWithVersionExpectedMatches = 4 +) + +var ( + // Regular expression to correctly split a string with the package name and an optional version constraint. + // Examples: + // gcc -> "gcc" "" "" + // gcc=9.1.0 -> "gcc" "=" "1.9.0" + packageWithVersionRegex = regexp.MustCompile(`^\s*([^><=\s]+)\s*(?:((?:[<>]=)|(?:[<>=]))\s*([^<>=\s]+))?\s*$`) +) + // PackageRepo contains an array of SRPMs and relational dependencies type PackageRepo struct { Repo []*Package `json:"Repo"` @@ -34,10 +50,6 @@ type PackageVerInterval struct { UpperInclusive bool // Does the upper bound actually include the indicated version (< vs <=) } -func (pkgVer *PackageVer) String() string { - return fmt.Sprintf("%s:C:'%s'V:'%s',C2:'%s'V2:'%s'", pkgVer.Name, pkgVer.Condition, pkgVer.Version, pkgVer.SCondition, pkgVer.SVersion) -} - // Package is a representation of a package with name and version information type Package struct { Provides *PackageVer `json:"Provides"` // Version information and name of package @@ -159,6 +171,30 @@ func (pkgVer *PackageVer) Interval() (interval PackageVerInterval, err error) { return } +// String prints the contents of the given PackageVer struct. +func (pkgVer *PackageVer) String() string { + return fmt.Sprintf("%s:C:'%s'V:'%s',C2:'%s'V2:'%s'", pkgVer.Name, pkgVer.Condition, pkgVer.Version, pkgVer.SCondition, pkgVer.SVersion) +} + +// PackagesListEntryToPackageVer converts an entry from the packages list JSON into an instance of PackageVer. +// The entries may contain only the name of the package or also include a single package version constraint. +// Examples: +// - "gcc" +// - "gcc=9.1.0" +func PackagesListEntryToPackageVer(packageString string) (pkgVer *PackageVer, err error) { + matches := packageWithVersionRegex.FindStringSubmatch(packageString) + if len(matches) != packageWithVersionExpectedMatches { + err = fmt.Errorf("packages list entry \"%s\" does not match the '[name][optional_condition][optional_version]' format", packageString) + return + } + + return &PackageVer{ + Name: matches[packageWithVersionNameIndex], + Condition: matches[packageWithVersionConditionIndex], + Version: matches[packageWithVersionVersionIndex], + }, err +} + // String outputs an interval in interval notation func (interval *PackageVerInterval) String() (s string) { var ( diff --git a/toolkit/tools/internal/pkgjson/pkgjson_test.go b/toolkit/tools/internal/pkgjson/pkgjson_test.go index 0c7637eb72e..98440b2ac3e 100644 --- a/toolkit/tools/internal/pkgjson/pkgjson_test.go +++ b/toolkit/tools/internal/pkgjson/pkgjson_test.go @@ -367,3 +367,116 @@ func TestIntervalCompareWithHigherExclusion(t *testing.T) { assert.Equal(t, -1, intervalLow.Compare(&intervalHigh)) assert.Equal(t, 1, intervalHigh.Compare(&intervalLow)) } + +func TestShouldCorrectlyConvertPackageNameWithoutVersionConstraints(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer("gcc-devel") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, "", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "", packageVer.Version) +} + +func TestShouldCorrectlyConvertPackageNameWithEqualsVersionConstraint(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer("gcc-devel=9.1.0") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, "=", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "9.1.0", packageVer.Version) +} + +func TestShouldCorrectlyConvertPackageNameWithGreaterEqualsVersionConstraint(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer("gcc-devel>=9.1.0") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, ">=", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "9.1.0", packageVer.Version) +} + +func TestShouldCorrectlyConvertPackageNameWithGreaterVersionConstraint(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer("gcc-devel>9.1.0") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, ">", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "9.1.0", packageVer.Version) +} + +func TestShouldCorrectlyConvertPackageNameWithLesserEqualsVersionConstraint(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer("gcc-devel<=9.1.0") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, "<=", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "9.1.0", packageVer.Version) +} + +func TestShouldCorrectlyConvertPackageNameWithLesserVersionConstraint(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer("gcc-devel<9.1.0") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, "<", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "9.1.0", packageVer.Version) +} + +func TestShouldCorrectlyConvertPackageNameWithAllowedWhitespaces(t *testing.T) { + packageVer, err := PackagesListEntryToPackageVer(" gcc-devel\t\t< 9.1.0 ") + + assert.NoError(t, err) + assert.Equal(t, "gcc-devel", packageVer.Name) + assert.Equal(t, "<", packageVer.Condition) + assert.Equal(t, "", packageVer.SCondition) + assert.Equal(t, "", packageVer.SVersion) + assert.Equal(t, "9.1.0", packageVer.Version) +} + +func TestShouldFailToConvertPackageListEntryStartingWithInvalidCharacter(t *testing.T) { + _, err := PackagesListEntryToPackageVer("=gcc-devel") + + assert.Error(t, err) +} + +func TestShouldFailToConvertPackageListEntryWithIncompleteComparison(t *testing.T) { + _, err := PackagesListEntryToPackageVer("gcc-devel=") + + assert.Error(t, err) +} + +func TestShouldFailToConvertPackageListEntryWithInvalidComparison(t *testing.T) { + _, err := PackagesListEntryToPackageVer("gcc-devel=>9.1.0") + + assert.Error(t, err) +} + +func TestShouldFailToConvertPackageListEntryWithWhitespacesInComparison(t *testing.T) { + _, err := PackagesListEntryToPackageVer("gcc-devel< =9.1.0") + + assert.Error(t, err) +} + +func TestShouldFailToConvertPackageListEntryWithWhitespacesInName(t *testing.T) { + _, err := PackagesListEntryToPackageVer("gcc devel") + + assert.Error(t, err) +} + +func TestShouldFailToConvertPackageListEntryWithWhitespacesInVersion(t *testing.T) { + _, err := PackagesListEntryToPackageVer("gcc-devel<9 1.0") + + assert.Error(t, err) +} From 9fd8cb58459dc2d030b70e07c0b82ebeb2f760ee Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Wed, 12 May 2021 15:02:42 -0700 Subject: [PATCH 26/83] Fix doubly packaged file in sos package (#936) --- SPECS/sos/sos.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SPECS/sos/sos.spec b/SPECS/sos/sos.spec index 146a4ccf60e..006750ee750 100644 --- a/SPECS/sos/sos.spec +++ b/SPECS/sos/sos.spec @@ -2,7 +2,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner @@ -13,6 +13,7 @@ BuildRequires: gettext BuildRequires: python3-devel BuildRequires: python3-setuptools Requires: bzip2 +Requires: python3 Requires: python3-libxml2 Requires: python3-pexpect Requires: python3-rpm @@ -35,6 +36,10 @@ python3 setup.py build %install python3 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_sbindir} +# Remove doubly-packaged documentation files +rm -rf %{buildroot}%{_datadir}/licenses/sos +rm -rf %{buildroot}%{_datadir}/doc/sos + install -d -m 755 %{buildroot}%{_sysconfdir}/%{name} install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/cleaner install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/presets.d @@ -63,6 +68,9 @@ rm -rf %{buildroot}%{_prefix}/config/ %config(noreplace) %{_sysconfdir}/sos/sos.conf %changelog +* Wed May 12 2021 Thomas Crain - 4.1-3 +- Fix build break due to doubly-packaged license/doc files + * Mon May 10 2021 Thomas Crain - 4.1-2 - Initial CBL-Mariner import from Fedora 34 (license: MIT) - Linted spec to Mariner style From 04ddd4277548eca93ddc5e9ad31bc9f4a0a02ee5 Mon Sep 17 00:00:00 2001 From: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com> Date: Wed, 12 May 2021 15:03:38 -0700 Subject: [PATCH 27/83] Remove FIPS DRBG rewire patch from OpenSSL (#934) --- .../openssl-1.1.1-rewire-fips-drbg.patch | 170 ------------------ SPECS/openssl/openssl.spec | 13 +- .../manifests/package/pkggen_core_aarch64.txt | 12 +- .../manifests/package/pkggen_core_x86_64.txt | 12 +- .../manifests/package/toolchain_aarch64.txt | 12 +- .../manifests/package/toolchain_x86_64.txt | 12 +- 6 files changed, 31 insertions(+), 200 deletions(-) delete mode 100644 SPECS/openssl/openssl-1.1.1-rewire-fips-drbg.patch diff --git a/SPECS/openssl/openssl-1.1.1-rewire-fips-drbg.patch b/SPECS/openssl/openssl-1.1.1-rewire-fips-drbg.patch deleted file mode 100644 index 4d04d37d59e..00000000000 --- a/SPECS/openssl/openssl-1.1.1-rewire-fips-drbg.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -up openssl-1.1.1g/crypto/fips/fips_drbg_lib.c.rewire-fips-drbg openssl-1.1.1g/crypto/fips/fips_drbg_lib.c ---- openssl-1.1.1g/crypto/fips/fips_drbg_lib.c.rewire-fips-drbg 2020-06-22 13:32:47.611852927 +0200 -+++ openssl-1.1.1g/crypto/fips/fips_drbg_lib.c 2020-06-22 13:32:47.675852917 +0200 -@@ -337,6 +337,19 @@ static int drbg_reseed(DRBG_CTX *dctx, - int FIPS_drbg_reseed(DRBG_CTX *dctx, - const unsigned char *adin, size_t adinlen) - { -+ int len = (int)adinlen; -+ -+ if (len < 0 || (size_t)len != adinlen) { -+ FIPSerr(FIPS_F_DRBG_RESEED, FIPS_R_ADDITIONAL_INPUT_TOO_LONG); -+ return 0; -+ } -+ RAND_seed(adin, len); -+ return 1; -+} -+ -+int FIPS_drbg_reseed_internal(DRBG_CTX *dctx, -+ const unsigned char *adin, size_t adinlen) -+{ - return drbg_reseed(dctx, adin, adinlen, 1); - } - -@@ -358,6 +371,19 @@ int FIPS_drbg_generate(DRBG_CTX *dctx, u - int prediction_resistance, - const unsigned char *adin, size_t adinlen) - { -+ int len = (int)outlen; -+ -+ if (len < 0 || (size_t)len != outlen) { -+ FIPSerr(FIPS_F_FIPS_DRBG_GENERATE, FIPS_R_REQUEST_TOO_LARGE_FOR_DRBG); -+ return 0; -+ } -+ return RAND_bytes(out, len); -+} -+ -+int FIPS_drbg_generate_internal(DRBG_CTX *dctx, unsigned char *out, size_t outlen, -+ int prediction_resistance, -+ const unsigned char *adin, size_t adinlen) -+{ - int r = 0; - - if (FIPS_selftest_failed()) { -diff -up openssl-1.1.1g/crypto/fips/fips_drbg_rand.c.rewire-fips-drbg openssl-1.1.1g/crypto/fips/fips_drbg_rand.c ---- openssl-1.1.1g/crypto/fips/fips_drbg_rand.c.rewire-fips-drbg 2020-06-22 13:32:47.611852927 +0200 -+++ openssl-1.1.1g/crypto/fips/fips_drbg_rand.c 2020-06-22 13:32:47.675852917 +0200 -@@ -57,6 +57,8 @@ - #include - #include - #include -+#define FIPS_DRBG_generate FIPS_DRBG_generate_internal -+#define FIPS_DRBG_reseed FIPS_DRBG_reseed_internal - #include - #include "fips_rand_lcl.h" - -diff -up openssl-1.1.1g/crypto/fips/fips_drbg_selftest.c.rewire-fips-drbg openssl-1.1.1g/crypto/fips/fips_drbg_selftest.c ---- openssl-1.1.1g/crypto/fips/fips_drbg_selftest.c.rewire-fips-drbg 2020-06-22 13:32:47.612852927 +0200 -+++ openssl-1.1.1g/crypto/fips/fips_drbg_selftest.c 2020-06-22 13:32:47.675852917 +0200 -@@ -55,6 +55,8 @@ - #include - #include - #include -+#define FIPS_DRBG_generate FIPS_DRBG_generate_internal -+#define FIPS_DRBG_reseed FIPS_DRBG_reseed_internal - #include - #include "fips_rand_lcl.h" - #include "fips_locl.h" -diff -up openssl-1.1.1g/crypto/fips/fips_post.c.rewire-fips-drbg openssl-1.1.1g/crypto/fips/fips_post.c ---- openssl-1.1.1g/crypto/fips/fips_post.c.rewire-fips-drbg 2020-06-22 13:32:47.672852918 +0200 -+++ openssl-1.1.1g/crypto/fips/fips_post.c 2020-06-22 13:32:47.675852917 +0200 -@@ -79,8 +79,6 @@ int FIPS_selftest(void) - ERR_add_error_data(2, "Type=", "rand_drbg_selftest"); - rv = 0; - } -- if (!FIPS_selftest_drbg()) -- rv = 0; - if (!FIPS_selftest_sha1()) - rv = 0; - if (!FIPS_selftest_sha2()) -diff -up openssl-1.1.1g/crypto/fips/fips_rand_lib.c.rewire-fips-drbg openssl-1.1.1g/crypto/fips/fips_rand_lib.c ---- openssl-1.1.1g/crypto/fips/fips_rand_lib.c.rewire-fips-drbg 2020-06-22 13:32:47.613852927 +0200 -+++ openssl-1.1.1g/crypto/fips/fips_rand_lib.c 2020-06-22 13:36:28.722817967 +0200 -@@ -120,6 +120,7 @@ void FIPS_rand_reset(void) - - int FIPS_rand_seed(const void *buf, int num) - { -+#if 0 - if (!fips_approved_rand_meth && FIPS_module_mode()) { - FIPSerr(FIPS_F_FIPS_RAND_SEED, FIPS_R_NON_FIPS_METHOD); - return 0; -@@ -127,10 +128,15 @@ int FIPS_rand_seed(const void *buf, int - if (fips_rand_meth && fips_rand_meth->seed) - fips_rand_meth->seed(buf, num); - return 1; -+#else -+ RAND_seed(buf, num); -+ return 1; -+#endif - } - - int FIPS_rand_bytes(unsigned char *buf, int num) - { -+#if 0 - if (!fips_approved_rand_meth && FIPS_module_mode()) { - FIPSerr(FIPS_F_FIPS_RAND_BYTES, FIPS_R_NON_FIPS_METHOD); - return 0; -@@ -138,10 +144,14 @@ int FIPS_rand_bytes(unsigned char *buf, - if (fips_rand_meth && fips_rand_meth->bytes) - return fips_rand_meth->bytes(buf, num); - return 0; -+#else -+ return RAND_bytes(buf, num); -+#endif - } - - int FIPS_rand_status(void) - { -+#if 0 - if (!fips_approved_rand_meth && FIPS_module_mode()) { - FIPSerr(FIPS_F_FIPS_RAND_STATUS, FIPS_R_NON_FIPS_METHOD); - return 0; -@@ -149,6 +159,9 @@ int FIPS_rand_status(void) - if (fips_rand_meth && fips_rand_meth->status) - return fips_rand_meth->status(); - return 0; -+#else -+ return RAND_status(); -+#endif - } - - /* Return instantiated strength of PRNG. For DRBG this is an internal -diff -up openssl-1.1.1g/include/openssl/fips.h.rewire-fips-drbg openssl-1.1.1g/include/openssl/fips.h ---- openssl-1.1.1g/include/openssl/fips.h.rewire-fips-drbg 2020-06-22 13:32:47.672852918 +0200 -+++ openssl-1.1.1g/include/openssl/fips.h 2020-06-22 13:32:47.675852917 +0200 -@@ -64,6 +64,11 @@ extern "C" { - - int FIPS_selftest(void); - int FIPS_selftest_failed(void); -+ -+ /* -+ * This function is deprecated as it performs selftest of the old FIPS drbg -+ * implementation that is not validated. -+ */ - int FIPS_selftest_drbg_all(void); - - int FIPS_dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N, -diff -up openssl-1.1.1g/include/openssl/fips_rand.h.rewire-fips-drbg openssl-1.1.1g/include/openssl/fips_rand.h ---- openssl-1.1.1g/include/openssl/fips_rand.h.rewire-fips-drbg 2020-06-22 13:32:47.617852926 +0200 -+++ openssl-1.1.1g/include/openssl/fips_rand.h 2020-06-22 13:32:47.675852917 +0200 -@@ -60,6 +60,20 @@ - # ifdef __cplusplus - extern "C" { - # endif -+ -+/* -+ * IMPORTANT NOTE: -+ * All functions in this header file are deprecated and should not be used -+ * as they use the old FIPS_drbg implementation that is not FIPS validated -+ * anymore. -+ * To provide backwards compatibility for applications that need FIPS compliant -+ * RNG number generation and use FIPS_drbg_generate, this function was -+ * re-wired to call the FIPS validated DRBG instance instead through -+ * the RAND_bytes() call. -+ * -+ * All these functions will be removed in future. -+ */ -+ - typedef struct drbg_ctx_st DRBG_CTX; - /* DRBG external flags */ - /* Flag for CTR mode only: use derivation function ctr_df */ diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index b17a8b524f5..267c1b0082c 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -4,7 +4,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.1k -Release: 1%{?dist} +Release: 2%{?dist} License: OpenSSL Vendor: Microsoft Corporation Distribution: Mariner @@ -28,7 +28,7 @@ Patch5: openssl-1.1.1-fips.patch Patch6: openssl-1.1.1-version-override.patch Patch7: openssl-1.1.1-seclevel.patch Patch8: openssl-1.1.1-fips-post-rand.patch -Patch9: openssl-1.1.1-evp-kdf.patch +Patch9: openssl-1.1.1-evp-kdf.patch Patch10: openssl-1.1.1-ssh-kdf.patch Patch11: openssl-1.1.1-krb5-kdf.patch Patch12: openssl-1.1.1-edk2-build.patch @@ -37,9 +37,8 @@ Patch14: openssl-1.1.1-fips-drbg-selftest.patch Patch15: openssl-1.1.1-fips-dh.patch Patch16: openssl-1.1.1-s390x-ecc.patch Patch17: openssl-1.1.1-kdf-selftest.patch -Patch18: openssl-1.1.1-rewire-fips-drbg.patch -Patch19: openssl-1.1.1-fips-curves.patch -Patch20: openssl-1.1.1-sp80056arev3.patch +Patch18: openssl-1.1.1-fips-curves.patch +Patch19: openssl-1.1.1-sp80056arev3.patch BuildRequires: perl-Test-Warnings BuildRequires: perl-Text-Template Requires: %{name}-libs = %{version}-%{release} @@ -125,7 +124,6 @@ cp %{SOURCE4} test/ %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %build # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be @@ -320,6 +318,9 @@ rm -rf %{buildroot} %changelog +* Tue May 11 2021 Nicolas Ontiveros - 1.1.1k-2 +- Remove FIPS DRBG rewire patch + * Mon Mar 29 2021 Nicolas Ontiveros - 1.1.1k-1 - Update to version 1.1.1k diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index f5834b69951..3d0e619b9aa 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.aarch64.rpm texinfo-6.5-7.cm1.aarch64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-1.cm1.aarch64.rpm -openssl-devel-1.1.1k-1.cm1.aarch64.rpm -openssl-libs-1.1.1k-1.cm1.aarch64.rpm -openssl-perl-1.1.1k-1.cm1.aarch64.rpm -openssl-static-1.1.1k-1.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-1.cm1.aarch64.rpm +openssl-1.1.1k-2.cm1.aarch64.rpm +openssl-devel-1.1.1k-2.cm1.aarch64.rpm +openssl-libs-1.1.1k-2.cm1.aarch64.rpm +openssl-perl-1.1.1k-2.cm1.aarch64.rpm +openssl-static-1.1.1k-2.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm libcap-2.26-2.cm1.aarch64.rpm libcap-devel-2.26-2.cm1.aarch64.rpm libdb-5.3.28-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 6659eca01d6..0daae12bae2 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.x86_64.rpm texinfo-6.5-7.cm1.x86_64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-1.cm1.x86_64.rpm -openssl-devel-1.1.1k-1.cm1.x86_64.rpm -openssl-libs-1.1.1k-1.cm1.x86_64.rpm -openssl-perl-1.1.1k-1.cm1.x86_64.rpm -openssl-static-1.1.1k-1.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-1.cm1.x86_64.rpm +openssl-1.1.1k-2.cm1.x86_64.rpm +openssl-devel-1.1.1k-2.cm1.x86_64.rpm +openssl-libs-1.1.1k-2.cm1.x86_64.rpm +openssl-perl-1.1.1k-2.cm1.x86_64.rpm +openssl-static-1.1.1k-2.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm libcap-2.26-2.cm1.x86_64.rpm libcap-devel-2.26-2.cm1.x86_64.rpm libdb-5.3.28-4.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 222fef22ac7..0f0208a6d45 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.aarch64.rpm openjdk8-sample-1.8.0.292-1.cm1.aarch64.rpm openjdk8-src-1.8.0.292-1.cm1.aarch64.rpm openjre8-1.8.0.292-1.cm1.aarch64.rpm -openssl-1.1.1k-1.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-1.cm1.aarch64.rpm -openssl-devel-1.1.1k-1.cm1.aarch64.rpm -openssl-libs-1.1.1k-1.cm1.aarch64.rpm -openssl-perl-1.1.1k-1.cm1.aarch64.rpm -openssl-static-1.1.1k-1.cm1.aarch64.rpm +openssl-1.1.1k-2.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm +openssl-devel-1.1.1k-2.cm1.aarch64.rpm +openssl-libs-1.1.1k-2.cm1.aarch64.rpm +openssl-perl-1.1.1k-2.cm1.aarch64.rpm +openssl-static-1.1.1k-2.cm1.aarch64.rpm p11-kit-0.23.22-1.cm1.aarch64.rpm p11-kit-debuginfo-0.23.22-1.cm1.aarch64.rpm p11-kit-devel-0.23.22-1.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index d918b5801ff..2494d3660bb 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.x86_64.rpm openjdk8-sample-1.8.0.292-1.cm1.x86_64.rpm openjdk8-src-1.8.0.292-1.cm1.x86_64.rpm openjre8-1.8.0.292-1.cm1.x86_64.rpm -openssl-1.1.1k-1.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-1.cm1.x86_64.rpm -openssl-devel-1.1.1k-1.cm1.x86_64.rpm -openssl-libs-1.1.1k-1.cm1.x86_64.rpm -openssl-perl-1.1.1k-1.cm1.x86_64.rpm -openssl-static-1.1.1k-1.cm1.x86_64.rpm +openssl-1.1.1k-2.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm +openssl-devel-1.1.1k-2.cm1.x86_64.rpm +openssl-libs-1.1.1k-2.cm1.x86_64.rpm +openssl-perl-1.1.1k-2.cm1.x86_64.rpm +openssl-static-1.1.1k-2.cm1.x86_64.rpm p11-kit-0.23.22-1.cm1.x86_64.rpm p11-kit-debuginfo-0.23.22-1.cm1.x86_64.rpm p11-kit-devel-0.23.22-1.cm1.x86_64.rpm From 04b9087884f791f0d2d6683ffe8bffa96ab10156 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Wed, 12 May 2021 15:47:12 -0700 Subject: [PATCH 28/83] Update dotnet runtime and aspnetcore to 3.1.15 and sdk to 3.1.115 (#935) * update to 3.1.15 * fix typo * linting fixes * more linting --- .../aspnetcore-runtime-3.1.signatures.json | 2 +- .../aspnetcore-runtime-3.1.spec | 10 +++++-- .../dotnet-runtime-3.1.signatures.json | 2 +- .../dotnet-runtime-3.1.spec | 11 ++++--- .../dotnet-sdk-3.1.signatures.json | 2 +- SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec | 29 +++++++++++++------ cgmanifest.json | 12 ++++---- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json index 50cc243189d..41f609e154e 100644 --- a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json +++ b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "aspnetcore-runtime-3.1.14-linux-x64.tar.gz": "96a66d44b6aaf71da50a6709912aab36f007cd974dd3766b55c67a8aab5748a8" + "aspnetcore-runtime-3.1.15-linux-x64.tar.gz": "5e10cf25ff900aeac5b4d56eda6388ef95bbd1f5085504fd435b99e7118de94e" } } \ No newline at end of file diff --git a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec index 3de9efede3e..0373025513b 100644 --- a/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec +++ b/SPECS/aspnetcore-runtime-3.1/aspnetcore-runtime-3.1.spec @@ -1,14 +1,14 @@ %define debug_package %{nil} Summary: Microsoft aspnetcore runtime Name: aspnetcore-runtime-3.1 -Version: 3.1.14 +Version: 3.1.15 Release: 1%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Tools URL: https://github.com/dotnet/aspnetcore -Source0: https://download.visualstudio.microsoft.com/download/pr/516b337a-83f9-4946-b2a6-b2f686e09a76/d0e82549e890c5d852c461319ffd5b31/aspnetcore-runtime-3.1.14-linux-x64.tar.gz +Source0: https://download.visualstudio.microsoft.com/download/pr/8aaf94dc-ce57-4d00-9d2d-70e8b760619e/2979ffe47a37c1aa5d931ee1953613f3/aspnetcore-runtime-3.1.15-linux-x64.tar.gz Requires: dotnet-runtime-3.1 ExclusiveArch: x86_64 @@ -35,9 +35,13 @@ cp -r shared/Microsoft.AspNetCore.App %{buildroot}%{_libdir}/dotnet/shared %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App %changelog +* Wed May 12 2021 Andrew Phelps - 3.1.15-1 +- Update version to 3.1.15 + * Fri May 7 2021 Nicolas Guibourge - 3.1.14-1 - Update version to 3.1.14 + * Thu Nov 12 2020 Henry Beberman - 3.1.5-1 - Add aspnetcore-runtime spec. - License verified -- Original version for CBL-Mariner \ No newline at end of file +- Original version for CBL-Mariner diff --git a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json index 7f0745279d5..09f29b0aa63 100644 --- a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json +++ b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dotnet-runtime-3.1.14-linux-x64.tar.gz": "666cb2148c1096d95339d1732f4420b633d1bb5532b9f3b1d2f8cfc15930e670" + "dotnet-runtime-3.1.15-linux-x64.tar.gz": "cf8017acab943d8ad048b5891bdd4acd041440ecfc5b468707cc7d987740098a" } } \ No newline at end of file diff --git a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec index 5255bff2d86..66b0ec5afdd 100644 --- a/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec +++ b/SPECS/dotnet-runtime-3.1/dotnet-runtime-3.1.spec @@ -1,13 +1,13 @@ Summary: Microsoft .NET Core Runtime Name: dotnet-runtime-3.1 -Version: 3.1.14 +Version: 3.1.15 Release: 1%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Tools URL: https://github.com/dotnet/core -Source0: https://download.visualstudio.microsoft.com/download/pr/4e5f17fa-fa56-40bc-bf3d-fd6abc91d0ad/08bd80f3751c0ac602dd41dc2534265e/dotnet-runtime-3.1.14-linux-x64.tar.gz +Source0: https://download.visualstudio.microsoft.com/download/pr/692284f9-e1e7-4b31-9191-cd8043441024/ac45c17d4327b1f992b7fe3956a99129/dotnet-runtime-3.1.15-linux-x64.tar.gz Requires: glibc Requires: icu Requires: krb5 @@ -48,10 +48,13 @@ ln -sf %{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/dotnet %{_libdir}/* %changelog -* Fri May 7 2021 Nicolas Guibourge - 3.1.14-1 +* Wed May 12 2021 Andrew Phelps 3.1.15-1 +- Update version to 3.1.15 + +* Fri May 7 2021 Nicolas Guibourge 3.1.14-1 - Update version to 3.1.14 -* Thu Nov 12 2020 Henry Beberman - 3.1.5-2 +* Thu Nov 12 2020 Henry Beberman 3.1.5-2 - Fix scriptlets and move licenses to the correct folder * Fri Jun 19 2020 Andrew Phelps 3.1.5-1 diff --git a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json index 166934b6081..58752b8eb8c 100644 --- a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json +++ b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "dotnet-sdk-3.1.114-linux-x64.tar.gz": "7a3cd46f9c3f52ce165e8484651ad409e6ba9fe3ec489e7d25fcb4db22080249" + "dotnet-sdk-3.1.115-linux-x64.tar.gz": "f32ead2cf19d07d13ea212e29e3a7df5872d2cd5f0b14810d010c6696820b597" } } \ No newline at end of file diff --git a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec index 05ebb693d5f..d126570225d 100644 --- a/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec +++ b/SPECS/dotnet-sdk-3.1/dotnet-sdk-3.1.spec @@ -1,18 +1,17 @@ %define debug_package %{nil} Summary: Microsoft .NET Core SDK Name: dotnet-sdk-3.1 -Version: 3.1.114 +Version: 3.1.115 Release: 1%{?dist} +License: MIT Vendor: Microsoft Corporation Distribution: Mariner -License: MIT -Url: https://github.com/dotnet/core Group: Development/Tools -Source0: https://download.visualstudio.microsoft.com/download/pr/79c30043-e62b-49e5-ba42-0aea2af1499a/f853a4f12fb4376532826272cdbbdd66/dotnet-sdk-3.1.114-linux-x64.tar.gz -ExclusiveArch: x86_64 - +URL: https://github.com/dotnet/core +Source0: https://download.visualstudio.microsoft.com/download/pr/cc86b0c8-9e72-4410-b3b0-2c5a8f90d8a4/426913359d4c524560e42c4f2ee18fa1/dotnet-sdk-3.1.115-linux-x64.tar.gz Requires: dotnet-runtime-3.1 Requires: icu +ExclusiveArch: x86_64 %description .NET Core is a development platform that you can use to build command-line @@ -31,28 +30,40 @@ cp LICENSE.txt ThirdPartyNotices.txt %{buildroot}%{_docdir}/dotnet-sdk-%{version %files %license LICENSE.txt - %defattr(-,root,root,0755) - %{_libdir}/* - %{_docdir}/* +%defattr(-,root,root,0755) +%{_libdir}/* +%{_docdir}/* %changelog +* Wed May 12 2021 Andrew Phelps 3.1.115-1 +- Update version to 3.1.115 + * Fri May 07 2021 Nicolas Guibourge 3.1.114-1 - Update version to 3.1.114 + * Fri Jun 19 2020 Andrew Phelps 3.1.105-1 - Update version to 3.1.105 + * Sat May 09 2020 Nick Samson 3.1.102-5 - Added %%license line automatically + * Tue May 05 2020 Emre Girgin 3.1.102-4 - Renaming dotnet-runtime to dotnet-runtime-3.1 + * Mon May 04 2020 Emre Girgin 3.1.102-3 - Renaming dotnet-sdk to dotnet-sdk-3.1 + * Mon May 04 2020 Emre Girgin 3.1.102-2 - Replace BuildArch with ExclusiveArch + * Mon Mar 30 2020 Andrew Phelps 3.1.102-1 - Update to dotnet 3.1.102. License verified. + * Tue Sep 03 2019 Mateusz Malisz 2.1.403-2 - Initial CBL-Mariner import from Photon (license: Apache2). + * Wed Dec 05 2018 Ajay Kaher 2.1.403-1 - upgraded to version 2.1.403 + * Wed Jan 31 2018 Priyesh Padmavilasom 2.1.4-1 - Initial build for photon diff --git a/cgmanifest.json b/cgmanifest.json index 07e7672f3b6..9f63eab7a94 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -105,8 +105,8 @@ "type": "other", "other": { "name": "aspnetcore-runtime-3.1", - "version": "3.1.14", - "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/516b337a-83f9-4946-b2a6-b2f686e09a76/d0e82549e890c5d852c461319ffd5b31/aspnetcore-runtime-3.1.14-linux-x64.tar.gz" + "version": "3.1.15", + "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/8aaf94dc-ce57-4d00-9d2d-70e8b760619e/2979ffe47a37c1aa5d931ee1953613f3/aspnetcore-runtime-3.1.15-linux-x64.tar.gz" } } }, @@ -1005,8 +1005,8 @@ "type": "other", "other": { "name": "dotnet-runtime-3.1", - "version": "3.1.14", - "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/4e5f17fa-fa56-40bc-bf3d-fd6abc91d0ad/08bd80f3751c0ac602dd41dc2534265e/dotnet-runtime-3.1.14-linux-x64.tar.gz" + "version": "3.1.15", + "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/692284f9-e1e7-4b31-9191-cd8043441024/ac45c17d4327b1f992b7fe3956a99129/dotnet-runtime-3.1.15-linux-x64.tar.gz" } } }, @@ -1015,8 +1015,8 @@ "type": "other", "other": { "name": "dotnet-sdk-3.1", - "version": "3.1.114", - "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/79c30043-e62b-49e5-ba42-0aea2af1499a/f853a4f12fb4376532826272cdbbdd66/dotnet-sdk-3.1.114-linux-x64.tar.gz" + "version": "3.1.115", + "downloadUrl": "https://download.visualstudio.microsoft.com/download/pr/cc86b0c8-9e72-4410-b3b0-2c5a8f90d8a4/426913359d4c524560e42c4f2ee18fa1/dotnet-sdk-3.1.115-linux-x64.tar.gz" } } }, From bd0d2cbeeeeda5d0551a0516c9ebf0d0f71e087c Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Thu, 13 May 2021 09:36:32 -0700 Subject: [PATCH 29/83] update bind (#937) --- SPECS/bind/CVE-2020-8618.patch | 191 ------------ SPECS/bind/CVE-2020-8619.patch | 530 -------------------------------- SPECS/bind/CVE-2020-8620.patch | 148 --------- SPECS/bind/CVE-2020-8621.patch | 20 -- SPECS/bind/CVE-2020-8622.patch | 37 --- SPECS/bind/CVE-2020-8624.patch | 14 - SPECS/bind/CVE-2020-8625.patch | 12 - SPECS/bind/bind.signatures.json | 2 +- SPECS/bind/bind.spec | 16 +- cgmanifest.json | 4 +- 10 files changed, 8 insertions(+), 966 deletions(-) delete mode 100644 SPECS/bind/CVE-2020-8618.patch delete mode 100644 SPECS/bind/CVE-2020-8619.patch delete mode 100644 SPECS/bind/CVE-2020-8620.patch delete mode 100644 SPECS/bind/CVE-2020-8621.patch delete mode 100644 SPECS/bind/CVE-2020-8622.patch delete mode 100644 SPECS/bind/CVE-2020-8624.patch delete mode 100644 SPECS/bind/CVE-2020-8625.patch diff --git a/SPECS/bind/CVE-2020-8618.patch b/SPECS/bind/CVE-2020-8618.patch deleted file mode 100644 index 5467af0361a..00000000000 --- a/SPECS/bind/CVE-2020-8618.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff --git a/lib/ns/client.c b/lib/ns/client.c -index 04a8da7d3e..2d568e30c4 100644 ---- a/lib/ns/client.c -+++ b/lib/ns/client.c -@@ -286,45 +286,20 @@ client_senddone(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { - isc_nmhandle_unref(handle); - } - --/*% -- * We only want to fail with ISC_R_NOSPACE when called from -- * ns_client_sendraw() and not when called from ns_client_send(), -- * tcpbuffer is NULL when called from ns_client_sendraw() and -- * length != 0. tcpbuffer != NULL when called from ns_client_send() -- * and length == 0. -- */ -- --static isc_result_t -+static void - client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, -- isc_buffer_t *tcpbuffer, uint32_t length, - unsigned char **datap) { - unsigned char *data; - uint32_t bufsize; -- isc_result_t result; - - REQUIRE(datap != NULL); -- REQUIRE((tcpbuffer == NULL && length != 0) || -- (tcpbuffer != NULL && length == 0)); - - if (TCP_CLIENT(client)) { - INSIST(client->tcpbuf == NULL); -- if (length + 2 > NS_CLIENT_TCP_BUFFER_SIZE) { -- result = ISC_R_NOSPACE; -- goto done; -- } - client->tcpbuf = isc_mem_get(client->mctx, - NS_CLIENT_TCP_BUFFER_SIZE); - data = client->tcpbuf; -- if (tcpbuffer != NULL) { -- isc_buffer_init(tcpbuffer, data, -- NS_CLIENT_TCP_BUFFER_SIZE); -- isc_buffer_init(buffer, data, -- NS_CLIENT_TCP_BUFFER_SIZE); -- } else { -- isc_buffer_init(buffer, data, -- NS_CLIENT_TCP_BUFFER_SIZE); -- INSIST(length <= 0xffff); -- } -+ isc_buffer_init(buffer, data, NS_CLIENT_TCP_BUFFER_SIZE); - } else { - data = client->sendbuf; - if ((client->attributes & NS_CLIENTATTR_HAVECOOKIE) == 0) { -@@ -342,17 +317,9 @@ client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, - if (bufsize > NS_CLIENT_SEND_BUFFER_SIZE) { - bufsize = NS_CLIENT_SEND_BUFFER_SIZE; - } -- if (length > bufsize) { -- result = ISC_R_NOSPACE; -- goto done; -- } - isc_buffer_init(buffer, data, bufsize); - } - *datap = data; -- result = ISC_R_SUCCESS; -- --done: -- return (result); - } - - static isc_result_t -@@ -384,8 +351,10 @@ ns_client_sendraw(ns_client_t *client, dns_message_t *message) { - goto done; - } - -- result = client_allocsendbuf(client, &buffer, NULL, mr->length, &data); -- if (result != ISC_R_SUCCESS) { -+ client_allocsendbuf(client, &buffer, &data); -+ -+ if (mr->length > isc_buffer_length(&buffer)) { -+ result = ISC_R_NOSPACE; - goto done; - } - -@@ -421,7 +390,6 @@ ns_client_send(ns_client_t *client) { - isc_result_t result; - unsigned char *data; - isc_buffer_t buffer = { .magic = 0 }; -- isc_buffer_t tcpbuffer = { .magic = 0 }; - isc_region_t r; - dns_compress_t cctx; - bool cleanup_cctx = false; -@@ -490,13 +458,7 @@ ns_client_send(ns_client_t *client) { - } - } - -- /* -- * XXXRTH The following doesn't deal with TCP buffer resizing. -- */ -- result = client_allocsendbuf(client, &buffer, &tcpbuffer, 0, &data); -- if (result != ISC_R_SUCCESS) { -- goto done; -- } -+ client_allocsendbuf(client, &buffer, &data); - - result = dns_compress_init(&cctx, -1, client->mctx); - if (result != ISC_R_SUCCESS) { -@@ -618,7 +580,6 @@ renderend: - client->sendcb(&buffer); - } else if (TCP_CLIENT(client)) { - isc_buffer_usedregion(&buffer, &r); -- isc_buffer_add(&tcpbuffer, r.length); - #ifdef HAVE_DNSTAP - if (client->view != NULL) { - dns_dt_send(client->view, dtmsgtype, &client->peeraddr, -@@ -627,11 +588,10 @@ renderend: - } - #endif /* HAVE_DNSTAP */ - -- /* don't count the 2-octet length header */ -- respsize = isc_buffer_usedlength(&tcpbuffer) - 2; -+ respsize = isc_buffer_usedlength(&buffer); - - isc_nmhandle_ref(client->handle); -- result = client_sendpkg(client, &tcpbuffer); -+ result = client_sendpkg(client, &buffer); - if (result != ISC_R_SUCCESS) { - /* We won't get a callback to clean it up */ - isc_nmhandle_unref(client->handle); -diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h -index 61612a32ea..74c435b0c6 100644 ---- a/lib/ns/include/ns/client.h -+++ b/lib/ns/include/ns/client.h -@@ -81,7 +81,7 @@ - *** Types - ***/ - --#define NS_CLIENT_TCP_BUFFER_SIZE (65535 + 2) -+#define NS_CLIENT_TCP_BUFFER_SIZE 65535 - #define NS_CLIENT_SEND_BUFFER_SIZE 4096 - - /*! -diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c -index a92783cf1b..717d142ce2 100644 ---- a/lib/ns/xfrout.c -+++ b/lib/ns/xfrout.c -@@ -648,14 +648,13 @@ typedef struct { - dns_db_t *db; - dns_dbversion_t *ver; - isc_quota_t *quota; -- rrstream_t *stream; /* The XFR RR stream */ -- bool question_added; /* QUESTION section sent? */ -- bool end_of_stream; /* EOS has been reached */ -- isc_buffer_t buf; /* Buffer for message owner -- * names and rdatas */ -- isc_buffer_t txlenbuf; /* Transmit length buffer */ -- isc_buffer_t txbuf; /* Transmit message buffer */ -- size_t cbytes; /* Length of current message */ -+ rrstream_t *stream; /* The XFR RR stream */ -+ bool question_added; /* QUESTION section sent? */ -+ bool end_of_stream; /* EOS has been reached */ -+ isc_buffer_t buf; /* Buffer for message owner -+ * names and rdatas */ -+ isc_buffer_t txbuf; /* Transmit message buffer */ -+ size_t cbytes; /* Length of current message */ - void *txmem; - unsigned int txmemlen; - dns_tsigkey_t *tsigkey; /* Key used to create TSIG */ -@@ -1231,12 +1230,11 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, - - /* - * Allocate another temporary buffer for the compressed -- * response message and its TCP length prefix. -+ * response message. - */ -- len = 2 + 65535; -+ len = NS_CLIENT_TCP_BUFFER_SIZE; - mem = isc_mem_get(mctx, len); -- isc_buffer_init(&xfr->txlenbuf, mem, 2); -- isc_buffer_init(&xfr->txbuf, (char *)mem + 2, len - 2); -+ isc_buffer_init(&xfr->txbuf, (char *)mem, len); - xfr->txmem = mem; - xfr->txmemlen = len; - -@@ -1286,7 +1284,6 @@ sendstream(xfrout_ctx_t *xfr) { - int n_rrs; - - isc_buffer_clear(&xfr->buf); -- isc_buffer_clear(&xfr->txlenbuf); - isc_buffer_clear(&xfr->txbuf); - - is_tcp = ((xfr->client->attributes & NS_CLIENTATTR_TCP) != 0); diff --git a/SPECS/bind/CVE-2020-8619.patch b/SPECS/bind/CVE-2020-8619.patch deleted file mode 100644 index a388534355d..00000000000 --- a/SPECS/bind/CVE-2020-8619.patch +++ /dev/null @@ -1,530 +0,0 @@ -diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c -index d6d0e87a80..6d8f4e0d63 100644 ---- a/lib/dns/rbtdb.c -+++ b/lib/dns/rbtdb.c -@@ -1857,8 +1857,13 @@ delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { - * Caller must be holding the node lock. - */ - static inline void --new_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -+new_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, -+ isc_rwlocktype_t locktype) { -+ if (locktype == isc_rwlocktype_write && ISC_LINK_LINKED(node, deadlink)) -+ { -+ ISC_LIST_UNLINK(rbtdb->deadnodes[node->locknum], node, -+ deadlink); -+ } - if (isc_refcount_increment0(&node->references) == 0) { - /* this is the first reference to the node */ - isc_refcount_increment0( -@@ -1876,13 +1881,14 @@ is_leaf(dns_rbtnode_t *node) { - } - - static inline void --send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { -+send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, -+ isc_rwlocktype_t locktype) { - isc_event_t *ev; - dns_db_t *db; - - ev = isc_event_allocate(rbtdb->common.mctx, NULL, DNS_EVENT_RBTPRUNE, - prune_tree, node, sizeof(isc_event_t)); -- new_reference(rbtdb, node); -+ new_reference(rbtdb, node, locktype); - db = NULL; - attach((dns_db_t *)rbtdb, &db); - ev->ev_sender = db; -@@ -1918,7 +1924,7 @@ cleanup_dead_nodes(dns_rbtdb_t *rbtdb, int bucketnum) { - node->data == NULL); - - if (is_leaf(node) && rbtdb->task != NULL) { -- send_to_prune_tree(rbtdb, node); -+ send_to_prune_tree(rbtdb, node, isc_rwlocktype_write); - } else if (node->down == NULL && node->data == NULL) { - /* - * Not a interior node and not needing to be -@@ -1986,7 +1992,7 @@ reactivate_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, - } - } - -- new_reference(rbtdb, node); -+ new_reference(rbtdb, node, locktype); - - NODE_UNLOCK(nodelock, locktype); - } -@@ -2121,15 +2127,17 @@ decrement_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, - * periodic walk-through). - */ - if (!pruning && is_leaf(node) && rbtdb->task != NULL) { -- send_to_prune_tree(rbtdb, node); -+ send_to_prune_tree(rbtdb, node, isc_rwlocktype_write); - no_reference = false; - } else { - delete_node(rbtdb, node); - } - } else { - INSIST(node->data == NULL); -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -- ISC_LIST_APPEND(rbtdb->deadnodes[bucket], node, deadlink); -+ if (!ISC_LINK_LINKED(node, deadlink)) { -+ ISC_LIST_APPEND(rbtdb->deadnodes[bucket], node, -+ deadlink); -+ } - } - - restore_locks: -@@ -2199,16 +2207,13 @@ prune_tree(isc_task_t *task, isc_event_t *event) { - - /* - * We need to gain a reference to the node before -- * decrementing it in the next iteration. In addition, -- * if the node is in the dead-nodes list, extract it -- * from the list beforehand as we do in -- * reactivate_node(). -+ * decrementing it in the next iteration. - */ - if (ISC_LINK_LINKED(parent, deadlink)) { - ISC_LIST_UNLINK(rbtdb->deadnodes[locknum], - parent, deadlink); - } -- new_reference(rbtdb, parent); -+ new_reference(rbtdb, parent, isc_rwlocktype_write); - } else { - parent = NULL; - } -@@ -2975,7 +2980,7 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { - * We increment the reference count on node to ensure that - * search->zonecut_rdataset will still be valid later. - */ -- new_reference(search->rbtdb, node); -+ new_reference(search->rbtdb, node, isc_rwlocktype_read); - search->zonecut = node; - search->zonecut_rdataset = found; - search->need_cleanup = true; -@@ -3027,7 +3032,8 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { - - static inline void - bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rdatasetheader_t *header, -- isc_stdtime_t now, dns_rdataset_t *rdataset) { -+ isc_stdtime_t now, isc_rwlocktype_t locktype, -+ dns_rdataset_t *rdataset) { - unsigned char *raw; /* RDATASLAB */ - - /* -@@ -3042,7 +3048,7 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rdatasetheader_t *header, - return; - } - -- new_reference(rbtdb, node); -+ new_reference(rbtdb, node, locktype); - - INSIST(rdataset->methods == NULL); /* We must be disassociated. */ - -@@ -3147,12 +3153,12 @@ setup_delegation(rbtdb_search_t *search, dns_dbnode_t **nodep, - NODE_LOCK(&(search->rbtdb->node_locks[node->locknum].lock), - isc_rwlocktype_read); - bind_rdataset(search->rbtdb, node, search->zonecut_rdataset, -- search->now, rdataset); -+ search->now, isc_rwlocktype_read, rdataset); - if (sigrdataset != NULL && search->zonecut_sigrdataset != NULL) - { - bind_rdataset(search->rbtdb, node, - search->zonecut_sigrdataset, search->now, -- sigrdataset); -+ isc_rwlocktype_read, sigrdataset); - } - NODE_UNLOCK(&(search->rbtdb->node_locks[node->locknum].lock), - isc_rwlocktype_read); -@@ -3817,18 +3823,21 @@ again: - foundname, NULL); - if (result == ISC_R_SUCCESS) { - if (nodep != NULL) { -- new_reference(search->rbtdb, -- node); -+ new_reference( -+ search->rbtdb, node, -+ isc_rwlocktype_read); - *nodep = node; - } - bind_rdataset(search->rbtdb, node, - found, search->now, -+ isc_rwlocktype_read, - rdataset); - if (foundsig != NULL) { -- bind_rdataset(search->rbtdb, -- node, foundsig, -- search->now, -- sigrdataset); -+ bind_rdataset( -+ search->rbtdb, node, -+ foundsig, search->now, -+ isc_rwlocktype_read, -+ sigrdataset); - } - } - } else if (found == NULL && foundsig == NULL) { -@@ -4107,7 +4116,8 @@ found: - * ensure that search->zonecut_rdataset will - * still be valid later. - */ -- new_reference(search.rbtdb, node); -+ new_reference(search.rbtdb, node, -+ isc_rwlocktype_read); - search.zonecut = node; - search.zonecut_rdataset = header; - search.zonecut_sigrdataset = NULL; -@@ -4285,7 +4295,7 @@ found: - goto node_exit; - } - if (nodep != NULL) { -- new_reference(search.rbtdb, node); -+ new_reference(search.rbtdb, node, isc_rwlocktype_read); - *nodep = node; - } - if ((search.rbtversion->secure == dns_db_secure && -@@ -4293,10 +4303,10 @@ found: - (search.options & DNS_DBFIND_FORCENSEC) != 0) - { - bind_rdataset(search.rbtdb, node, nsecheader, 0, -- rdataset); -+ isc_rwlocktype_read, rdataset); - if (nsecsig != NULL) { - bind_rdataset(search.rbtdb, node, nsecsig, 0, -- sigrdataset); -+ isc_rwlocktype_read, sigrdataset); - } - } - if (wild) { -@@ -4369,7 +4379,7 @@ found: - - if (nodep != NULL) { - if (!at_zonecut) { -- new_reference(search.rbtdb, node); -+ new_reference(search.rbtdb, node, isc_rwlocktype_read); - } else { - search.need_cleanup = false; - } -@@ -4377,10 +4387,11 @@ found: - } - - if (type != dns_rdatatype_any) { -- bind_rdataset(search.rbtdb, node, found, 0, rdataset); -+ bind_rdataset(search.rbtdb, node, found, 0, isc_rwlocktype_read, -+ rdataset); - if (foundsig != NULL) { - bind_rdataset(search.rbtdb, node, foundsig, 0, -- sigrdataset); -+ isc_rwlocktype_read, sigrdataset); - } - } - -@@ -4563,8 +4574,7 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { - * We increment the reference count on node to ensure that - * search->zonecut_rdataset will still be valid later. - */ -- new_reference(search->rbtdb, node); -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -+ new_reference(search->rbtdb, node, locktype); - search->zonecut = node; - search->zonecut_rdataset = dname_header; - search->zonecut_sigrdataset = sigdname_header; -@@ -4672,14 +4682,15 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, - } - result = DNS_R_DELEGATION; - if (nodep != NULL) { -- new_reference(search->rbtdb, node); -+ new_reference(search->rbtdb, node, locktype); - *nodep = node; - } - bind_rdataset(search->rbtdb, node, found, search->now, -- rdataset); -+ locktype, rdataset); - if (foundsig != NULL) { - bind_rdataset(search->rbtdb, node, foundsig, -- search->now, sigrdataset); -+ search->now, locktype, -+ sigrdataset); - } - if (need_headerupdate(found, search->now) || - (foundsig != NULL && -@@ -4788,13 +4799,13 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep, - if (result != ISC_R_SUCCESS) { - goto unlock_node; - } -- bind_rdataset(search->rbtdb, node, found, now, -+ bind_rdataset(search->rbtdb, node, found, now, locktype, - rdataset); - if (foundsig != NULL) { - bind_rdataset(search->rbtdb, node, foundsig, -- now, sigrdataset); -+ now, locktype, sigrdataset); - } -- new_reference(search->rbtdb, node); -+ new_reference(search->rbtdb, node, locktype); - *nodep = node; - result = DNS_R_COVERINGNSEC; - } else if (!empty_node) { -@@ -5019,18 +5030,18 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, - if ((search.options & DNS_DBFIND_COVERINGNSEC) != 0 && - nsecheader != NULL) { - if (nodep != NULL) { -- new_reference(search.rbtdb, node); -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -+ new_reference(search.rbtdb, node, locktype); - *nodep = node; - } - bind_rdataset(search.rbtdb, node, nsecheader, -- search.now, rdataset); -+ search.now, locktype, rdataset); - if (need_headerupdate(nsecheader, search.now)) { - update = nsecheader; - } - if (nsecsig != NULL) { - bind_rdataset(search.rbtdb, node, nsecsig, -- search.now, sigrdataset); -+ search.now, locktype, -+ sigrdataset); - if (need_headerupdate(nsecsig, search.now)) { - updatesig = nsecsig; - } -@@ -5045,18 +5056,18 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, - */ - if (nsheader != NULL) { - if (nodep != NULL) { -- new_reference(search.rbtdb, node); -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -+ new_reference(search.rbtdb, node, locktype); - *nodep = node; - } - bind_rdataset(search.rbtdb, node, nsheader, search.now, -- rdataset); -+ locktype, rdataset); - if (need_headerupdate(nsheader, search.now)) { - update = nsheader; - } - if (nssig != NULL) { - bind_rdataset(search.rbtdb, node, nssig, -- search.now, sigrdataset); -+ search.now, locktype, -+ sigrdataset); - if (need_headerupdate(nssig, search.now)) { - updatesig = nssig; - } -@@ -5077,8 +5088,7 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, - */ - - if (nodep != NULL) { -- new_reference(search.rbtdb, node); -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -+ new_reference(search.rbtdb, node, locktype); - *nodep = node; - } - -@@ -5110,13 +5120,14 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, - if (type != dns_rdatatype_any || result == DNS_R_NCACHENXDOMAIN || - result == DNS_R_NCACHENXRRSET) - { -- bind_rdataset(search.rbtdb, node, found, search.now, rdataset); -+ bind_rdataset(search.rbtdb, node, found, search.now, locktype, -+ rdataset); - if (need_headerupdate(found, search.now)) { - update = found; - } - if (!NEGATIVE(found) && foundsig != NULL) { - bind_rdataset(search.rbtdb, node, foundsig, search.now, -- sigrdataset); -+ locktype, sigrdataset); - if (need_headerupdate(foundsig, search.now)) { - updatesig = foundsig; - } -@@ -5275,15 +5286,15 @@ cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, - } - - if (nodep != NULL) { -- new_reference(search.rbtdb, node); -- INSIST(!ISC_LINK_LINKED(node, deadlink)); -+ new_reference(search.rbtdb, node, locktype); - *nodep = node; - } - -- bind_rdataset(search.rbtdb, node, found, search.now, rdataset); -+ bind_rdataset(search.rbtdb, node, found, search.now, locktype, -+ rdataset); - if (foundsig != NULL) { - bind_rdataset(search.rbtdb, node, foundsig, search.now, -- sigrdataset); -+ locktype, sigrdataset); - } - - if (need_headerupdate(found, search.now) || -@@ -5646,10 +5657,11 @@ zone_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - } - } - if (found != NULL) { -- bind_rdataset(rbtdb, rbtnode, found, now, rdataset); -+ bind_rdataset(rbtdb, rbtnode, found, now, isc_rwlocktype_read, -+ rdataset); - if (foundsig != NULL) { - bind_rdataset(rbtdb, rbtnode, foundsig, now, -- sigrdataset); -+ isc_rwlocktype_read, sigrdataset); - } - } - -@@ -5740,9 +5752,9 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - } - } - if (found != NULL) { -- bind_rdataset(rbtdb, rbtnode, found, now, rdataset); -+ bind_rdataset(rbtdb, rbtnode, found, now, locktype, rdataset); - if (!NEGATIVE(found) && foundsig != NULL) { -- bind_rdataset(rbtdb, rbtnode, foundsig, now, -+ bind_rdataset(rbtdb, rbtnode, foundsig, now, locktype, - sigrdataset); - } - } -@@ -5910,6 +5922,9 @@ resign_insert(dns_rbtdb_t *rbtdb, int idx, rdatasetheader_t *newheader) { - return (result); - } - -+/* -+ * node write lock must be held. -+ */ - static void - resign_delete(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, - rdatasetheader_t *header) { -@@ -5921,7 +5936,8 @@ resign_delete(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, - header->heap_index); - header->heap_index = 0; - if (version != NULL) { -- new_reference(rbtdb, header->node); -+ new_reference(rbtdb, header->node, -+ isc_rwlocktype_write); - ISC_LIST_APPEND(version->resigned_list, header, link); - } - } -@@ -5952,6 +5968,9 @@ update_recordsandbytes(bool add, rbtdb_version_t *rbtversion, - RWUNLOCK(&rbtversion->rwlock, isc_rwlocktype_write); - } - -+/* -+ * write lock on rbtnode must be held. -+ */ - static isc_result_t - add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, - rdatasetheader_t *newheader, unsigned int options, bool loading, -@@ -6080,9 +6099,11 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, - free_rdataset(rbtdb, rbtdb->common.mctx, - newheader); - if (addedrdataset != NULL) { -- bind_rdataset(rbtdb, rbtnode, -- topheader, now, -- addedrdataset); -+ bind_rdataset( -+ rbtdb, rbtnode, -+ topheader, now, -+ isc_rwlocktype_write, -+ addedrdataset); - } - return (DNS_R_UNCHANGED); - } -@@ -6142,6 +6163,7 @@ find_header: - free_rdataset(rbtdb, rbtdb->common.mctx, newheader); - if (addedrdataset != NULL) { - bind_rdataset(rbtdb, rbtnode, header, now, -+ isc_rwlocktype_write, - addedrdataset); - } - return (DNS_R_UNCHANGED); -@@ -6253,6 +6275,7 @@ find_header: - free_rdataset(rbtdb, rbtdb->common.mctx, newheader); - if (addedrdataset != NULL) { - bind_rdataset(rbtdb, rbtnode, header, now, -+ isc_rwlocktype_write, - addedrdataset); - } - return (ISC_R_SUCCESS); -@@ -6302,6 +6325,7 @@ find_header: - free_rdataset(rbtdb, rbtdb->common.mctx, newheader); - if (addedrdataset != NULL) { - bind_rdataset(rbtdb, rbtnode, header, now, -+ isc_rwlocktype_write, - addedrdataset); - } - return (ISC_R_SUCCESS); -@@ -6499,7 +6523,8 @@ find_header: - } - - if (addedrdataset != NULL) { -- bind_rdataset(rbtdb, rbtnode, newheader, now, addedrdataset); -+ bind_rdataset(rbtdb, rbtnode, newheader, now, -+ isc_rwlocktype_write, addedrdataset); - } - - return (ISC_R_SUCCESS); -@@ -7042,13 +7067,15 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - } - - if (result == ISC_R_SUCCESS && newrdataset != NULL) { -- bind_rdataset(rbtdb, rbtnode, newheader, 0, newrdataset); -+ bind_rdataset(rbtdb, rbtnode, newheader, 0, -+ isc_rwlocktype_write, newrdataset); - } - - if (result == DNS_R_NXRRSET && newrdataset != NULL && - (options & DNS_DBSUB_WANTOLD) != 0) - { -- bind_rdataset(rbtdb, rbtnode, header, 0, newrdataset); -+ bind_rdataset(rbtdb, rbtnode, header, 0, isc_rwlocktype_write, -+ newrdataset); - } - - unlock: -@@ -7935,8 +7962,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { - /* Note that the access to origin_node doesn't require a DB lock */ - onode = (dns_rbtnode_t *)rbtdb->origin_node; - if (onode != NULL) { -- new_reference(rbtdb, onode); -- -+ new_reference(rbtdb, onode, isc_rwlocktype_none); - *nodep = rbtdb->origin_node; - } else { - INSIST(IS_CACHE(rbtdb)); -@@ -8129,7 +8155,8 @@ getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *foundname) { - * Found something; pass back the answer and unlock - * the bucket. - */ -- bind_rdataset(rbtdb, header->node, header, 0, rdataset); -+ bind_rdataset(rbtdb, header->node, header, 0, -+ isc_rwlocktype_read, rdataset); - - if (foundname != NULL) { - dns_rbt_fullnamefromnode(header->node, foundname); -@@ -9136,7 +9163,7 @@ rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) { - isc_rwlocktype_read); - - bind_rdataset(rbtdb, rbtnode, header, rbtiterator->common.now, -- rdataset); -+ isc_rwlocktype_read, rdataset); - - NODE_UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock, - isc_rwlocktype_read); -@@ -9591,7 +9618,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, - result = ISC_R_SUCCESS; - } - -- new_reference(rbtdb, node); -+ new_reference(rbtdb, node, isc_rwlocktype_none); - - *nodep = rbtdbiter->node; - -@@ -10504,7 +10531,7 @@ expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, bool tree_locked, - * We first need to gain a new reference to the node to meet a - * requirement of decrement_reference(). - */ -- new_reference(rbtdb, header->node); -+ new_reference(rbtdb, header->node, isc_rwlocktype_write); - decrement_reference(rbtdb, header->node, 0, - isc_rwlocktype_write, - tree_locked ? isc_rwlocktype_write diff --git a/SPECS/bind/CVE-2020-8620.patch b/SPECS/bind/CVE-2020-8620.patch deleted file mode 100644 index 741756aa088..00000000000 --- a/SPECS/bind/CVE-2020-8620.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h -index cb3da7fc71..a0c3ce1b4b 100644 ---- a/lib/isc/netmgr/netmgr-int.h -+++ b/lib/isc/netmgr/netmgr-int.h -@@ -560,16 +560,6 @@ isc__nm_enqueue_ievent(isc__networker_t *worker, isc__netievent_t *event); - * way to use an isc__networker_t from another thread.) - */ - --void --isc__nm_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf); --/*%< -- * Allocator for recv operations. -- * -- * Note that as currently implemented, this doesn't actually -- * allocate anything, it just assigns the the isc__networker's UDP -- * receive buffer to a socket, and marks it as "in use". -- */ -- - void - isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf); - /*%< -diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c -index 8ac42822c2..6606d076d3 100644 ---- a/lib/isc/netmgr/netmgr.c -+++ b/lib/isc/netmgr/netmgr.c -@@ -976,23 +976,6 @@ isc__nmsocket_init(isc_nmsocket_t *sock, isc_nm_t *mgr, isc_nmsocket_type type, - sock->magic = NMSOCK_MAGIC; - } - --void --isc__nm_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) { -- isc_nmsocket_t *sock = uv_handle_get_data(handle); -- isc__networker_t *worker = NULL; -- -- REQUIRE(VALID_NMSOCK(sock)); -- REQUIRE(isc__nm_in_netthread()); -- REQUIRE(size <= ISC_NETMGR_RECVBUF_SIZE); -- -- worker = &sock->mgr->workers[sock->tid]; -- INSIST(!worker->recvbuf_inuse); -- -- buf->base = worker->recvbuf; -- worker->recvbuf_inuse = true; -- buf->len = ISC_NETMGR_RECVBUF_SIZE; --} -- - void - isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf) { - isc__networker_t *worker = NULL; -@@ -1005,7 +988,7 @@ isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf) { - worker = &sock->mgr->workers[sock->tid]; - - REQUIRE(worker->recvbuf_inuse); -- if (buf->base > worker->recvbuf && -+ if (sock->type == isc_nm_udpsocket && buf->base > worker->recvbuf && - buf->base <= worker->recvbuf + ISC_NETMGR_RECVBUF_SIZE) - { - /* Can happen in case of out-of-order recvmmsg in libuv1.36 */ -diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c -index c572777662..d34461950c 100644 ---- a/lib/isc/netmgr/tcp.c -+++ b/lib/isc/netmgr/tcp.c -@@ -519,6 +519,30 @@ isc__nm_tcp_read(isc_nmhandle_t *handle, isc_nm_recv_cb_t cb, void *cbarg) { - return (ISC_R_SUCCESS); - } - -+/*%< -+ * Allocator for TCP read operations. Limited to size 2^16. -+ * -+ * Note this doesn't actually allocate anything, it just assigns the -+ * worker's receive buffer to a socket, and marks it as "in use". -+ */ -+static void -+tcp_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) { -+ isc_nmsocket_t *sock = uv_handle_get_data(handle); -+ isc__networker_t *worker = NULL; -+ -+ REQUIRE(VALID_NMSOCK(sock)); -+ REQUIRE(sock->type == isc_nm_tcpsocket); -+ REQUIRE(isc__nm_in_netthread()); -+ REQUIRE(size <= 65536); -+ -+ worker = &sock->mgr->workers[sock->tid]; -+ INSIST(!worker->recvbuf_inuse); -+ -+ buf->base = worker->recvbuf; -+ buf->len = size; -+ worker->recvbuf_inuse = true; -+} -+ - void - isc__nm_async_tcp_startread(isc__networker_t *worker, isc__netievent_t *ev0) { - isc__netievent_startread_t *ievent = (isc__netievent_startread_t *)ev0; -@@ -536,7 +560,7 @@ isc__nm_async_tcp_startread(isc__networker_t *worker, isc__netievent_t *ev0) { - 0); - } - -- r = uv_read_start(&sock->uv_handle.stream, isc__nm_alloc_cb, read_cb); -+ r = uv_read_start(&sock->uv_handle.stream, tcp_alloc_cb, read_cb); - if (r != 0) { - isc__nm_incstats(sock->mgr, sock->statsindex[STATID_RECVFAIL]); - } -diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c -index 6e2d2098cf..c1e69027fb 100644 ---- a/lib/isc/netmgr/udp.c -+++ b/lib/isc/netmgr/udp.c -@@ -132,6 +132,32 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, - return (ISC_R_SUCCESS); - } - -+/*%< -+ * Allocator for UDP recv operations. Limited to size 20 * (2^16 + 2), -+ * which allows enough space for recvmmsg() to get multiple messages at -+ * a time. -+ * -+ * Note this doesn't actually allocate anything, it just assigns the -+ * worker's receive buffer to a socket, and marks it as "in use". -+ */ -+static void -+udp_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) { -+ isc_nmsocket_t *sock = uv_handle_get_data(handle); -+ isc__networker_t *worker = NULL; -+ -+ REQUIRE(VALID_NMSOCK(sock)); -+ REQUIRE(sock->type == isc_nm_udpsocket); -+ REQUIRE(isc__nm_in_netthread()); -+ REQUIRE(size <= ISC_NETMGR_RECVBUF_SIZE); -+ -+ worker = &sock->mgr->workers[sock->tid]; -+ INSIST(!worker->recvbuf_inuse); -+ -+ buf->base = worker->recvbuf; -+ buf->len = ISC_NETMGR_RECVBUF_SIZE; -+ worker->recvbuf_inuse = true; -+} -+ - /* - * handle 'udplisten' async call - start listening on a socket. - */ -@@ -178,7 +204,7 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) { - uv_send_buffer_size(&sock->uv_handle.handle, - &(int){ ISC_SEND_BUFFER_SIZE }); - #endif -- uv_udp_recv_start(&sock->uv_handle.udp, isc__nm_alloc_cb, udp_recv_cb); -+ uv_udp_recv_start(&sock->uv_handle.udp, udp_alloc_cb, udp_recv_cb); - } - - static void diff --git a/SPECS/bind/CVE-2020-8621.patch b/SPECS/bind/CVE-2020-8621.patch deleted file mode 100644 index f401fc46fdf..00000000000 --- a/SPECS/bind/CVE-2020-8621.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c -index 7d443fd55b..3c0e3013aa 100644 ---- a/lib/dns/resolver.c -+++ b/lib/dns/resolver.c -@@ -4020,6 +4020,15 @@ fctx_nextaddress(fetchctx_t *fctx) { - addrinfo->flags |= FCTX_ADDRINFO_MARK; - fctx->find = NULL; - fctx->forwarding = true; -+ -+ /* -+ * QNAME minimization is disabled when -+ * forwarding, and has to remain disabled if -+ * we switch back to normal recursion; otherwise -+ * forwarding could leave us in an inconsistent -+ * state. -+ */ -+ fctx->minimized = false; - return (addrinfo); - } - } diff --git a/SPECS/bind/CVE-2020-8622.patch b/SPECS/bind/CVE-2020-8622.patch deleted file mode 100644 index 2562bed31df..00000000000 --- a/SPECS/bind/CVE-2020-8622.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/lib/dns/message.c b/lib/dns/message.c -index dd9dd23a12..97425c753b 100644 ---- a/lib/dns/message.c -+++ b/lib/dns/message.c -@@ -1709,6 +1709,16 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, - msg->header_ok = 0; - msg->question_ok = 0; - -+ if ((options & DNS_MESSAGEPARSE_CLONEBUFFER) == 0) { -+ isc_buffer_usedregion(&origsource, &msg->saved); -+ } else { -+ msg->saved.length = isc_buffer_usedlength(&origsource); -+ msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length); -+ memmove(msg->saved.base, isc_buffer_base(&origsource), -+ msg->saved.length); -+ msg->free_saved = 1; -+ } -+ - isc_buffer_remainingregion(source, &r); - if (r.length < DNS_MESSAGE_HEADERLEN) { - return (ISC_R_UNEXPECTEDEND); -@@ -1793,15 +1803,6 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, - } - - truncated: -- if ((options & DNS_MESSAGEPARSE_CLONEBUFFER) == 0) { -- isc_buffer_usedregion(&origsource, &msg->saved); -- } else { -- msg->saved.length = isc_buffer_usedlength(&origsource); -- msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length); -- memmove(msg->saved.base, isc_buffer_base(&origsource), -- msg->saved.length); -- msg->free_saved = 1; -- } - - if (ret == ISC_R_UNEXPECTEDEND && ignore_tc) { - return (DNS_R_RECOVERABLE); diff --git a/SPECS/bind/CVE-2020-8624.patch b/SPECS/bind/CVE-2020-8624.patch deleted file mode 100644 index 83687a98428..00000000000 --- a/SPECS/bind/CVE-2020-8624.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c -index 41c1a598db..752c0d2770 100644 ---- a/bin/named/zoneconf.c -+++ b/bin/named/zoneconf.c -@@ -252,7 +252,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, - - str = cfg_obj_asstring(matchtype); - CHECK(dns_ssu_mtypefromstring(str, &mtype)); -- if (mtype == dns_ssumatchtype_subdomain) { -+ if (mtype == dns_ssumatchtype_subdomain && -+ strcasecmp(str, "zonesub") == 0) { - usezone = true; - } - diff --git a/SPECS/bind/CVE-2020-8625.patch b/SPECS/bind/CVE-2020-8625.patch deleted file mode 100644 index 7e63939c145..00000000000 --- a/SPECS/bind/CVE-2020-8625.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN bind-9.16.3-original/lib/dns/spnego.c bind-9.16.3/lib/dns/spnego.c ---- bind-9.16.3-original/lib/dns/spnego.c 2021-03-01 08:56:47.639826977 -0800 -+++ bind-9.16.3/lib/dns/spnego.c 2021-03-01 08:58:57.223786168 -0800 -@@ -842,7 +842,7 @@ - return (ASN1_OVERRUN); - } - -- data->components = malloc(len * sizeof(*data->components)); -+ data->components = malloc((len + 1) * sizeof(*data->components)); - if (data->components == NULL) { - return (ENOMEM); - } diff --git a/SPECS/bind/bind.signatures.json b/SPECS/bind/bind.signatures.json index 4603d020423..7220062eb98 100644 --- a/SPECS/bind/bind.signatures.json +++ b/SPECS/bind/bind.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "bind-9.16.3.tar.xz": "27ac6513de5f8d0db34b9f241da53baa15a14b2ad21338d0cde0826eaf564f7e" + "bind-9.16.15.tar.xz": "98b6f432d878a7bf8f57eb7b3c28be27278cf6b9989154bfe6c81104b38e7839" } } \ No newline at end of file diff --git a/SPECS/bind/bind.spec b/SPECS/bind/bind.spec index 1b2ca9cb535..295a4b017ce 100644 --- a/SPECS/bind/bind.spec +++ b/SPECS/bind/bind.spec @@ -1,21 +1,14 @@ Summary: Domain Name System software Name: bind -Version: 9.16.3 -Release: 3%{?dist} +Version: 9.16.15 +Release: 1%{?dist} License: ISC URL: https://www.isc.org/downloads/bind/ Source0: https://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.xz # CVE-2019-6470 is fixed by updating the dhcp package to 4.4.1 or greater Patch0: CVE-2019-6470.nopatch -Patch1: CVE-2020-8618.patch -Patch2: CVE-2020-8619.patch -Patch3: CVE-2020-8620.patch -Patch4: CVE-2020-8621.patch -Patch5: CVE-2020-8622.patch # CVE-2020-8623 only impacts package built with "--enable-native-pkcs11" -Patch6: CVE-2020-8623.nopatch -Patch7: CVE-2020-8624.patch -Patch8: CVE-2020-8625.patch +Patch1: CVE-2020-8623.nopatch Group: Development/Tools Vendor: Microsoft Corporation Distribution: Mariner @@ -89,11 +82,12 @@ fi %defattr(-,root,root) %license LICENSE %{_bindir}/* -%{_mandir}/man1/* %{_sysconfdir}/* %{_prefix}/lib/tmpfiles.d/named.conf %changelog +* Wed May 12 2021 Andrew Phelps - 9.16.15-1 +- Update version to 9.16.15 to fix CVE-2021-25215 * Mon Mar 01 2021 Nicolas Guibourge - 9.16.3-3 - Fixes CVE-2020-8625 * Fri Sep 11 2020 Ruying Chen - 9.16.3-2 diff --git a/cgmanifest.json b/cgmanifest.json index 9f63eab7a94..2fb699b608a 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -315,8 +315,8 @@ "type": "other", "other": { "name": "bind", - "version": "9.16.3", - "downloadUrl": "https://ftp.isc.org/isc/bind9/9.16.3/bind-9.16.3.tar.xz" + "version": "9.16.15", + "downloadUrl": "https://ftp.isc.org/isc/bind9/9.16.15/bind-9.16.15.tar.xz" } } }, From dbc754b938d76b850ee28e6adf346553b1e4c87a Mon Sep 17 00:00:00 2001 From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com> Date: Thu, 13 May 2021 14:36:26 -0700 Subject: [PATCH 30/83] Automatic `kubernetes` package update. (#939) --- SPECS/kubernetes/kubernetes-1.18.14.signatures.json | 2 +- SPECS/kubernetes/kubernetes-1.18.14.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.19.7.signatures.json | 2 +- SPECS/kubernetes/kubernetes-1.19.7.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.20.2.signatures.json | 2 +- SPECS/kubernetes/kubernetes-1.20.2.spec | 9 ++++++--- cgmanifest.json | 6 +++--- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/SPECS/kubernetes/kubernetes-1.18.14.signatures.json b/SPECS/kubernetes/kubernetes-1.18.14.signatures.json index 442de6abd62..47a92160d18 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.14.signatures.json @@ -2,6 +2,6 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.14-hotfix.20210428.tar.gz": "ccbba2aa26f2ebf589ccf5d52a88b7347e663d6fc53d1fbbf8b1e0b93d3db5b6" + "kubernetes-node-linux-amd64-1.18.14-hotfix.20210511.tar.gz": "ad232264bc80f2df182c805c03472ae94ec2e623c3bb1620475371c41e31db6e" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.14.spec b/SPECS/kubernetes/kubernetes-1.18.14.spec index 58082954e34..ee997fed988 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.spec +++ b/SPECS/kubernetes/kubernetes-1.18.14.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.14 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210428.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz Source1: kubelet.service Source2: golang-1.15-k8s-1.18-test.patch # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -270,6 +270,9 @@ fi %{_bindir}/pause %changelog +* Thu May 13 2021 CBL-Mariner Service Account - 1.18.14-5 +- Update to version "1.18.14-hotfix.20210511". + * Mon May 03 2021 Nicolas Guibourge 1.18.14-4 - Increment release to force republishing using golang 1.15.11. diff --git a/SPECS/kubernetes/kubernetes-1.19.7.signatures.json b/SPECS/kubernetes/kubernetes-1.19.7.signatures.json index 29ee44fa799..dc8ebe4aae6 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.7.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.7-hotfix.20210428.tar.gz": "78626dd33b75c33eae4b03802bbc075d86369a881d729d61dccb5a86b4da0f60" + "kubernetes-node-linux-amd64-1.19.7-hotfix.20210511.tar.gz": "12cb563ec25222662e9a3f615ab30f28abed7dbb50d3cc165b642db0d89c7078" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.7.spec b/SPECS/kubernetes/kubernetes-1.19.7.spec index d60098b9a0d..55bb3f395aa 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.spec +++ b/SPECS/kubernetes/kubernetes-1.19.7.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.7 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210428.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz Source1: kubelet.service # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Thu May 13 2021 CBL-Mariner Service Account - 1.19.7-3 +- Update to version "1.19.7-hotfix.20210511". + * Mon May 03 2021 Nicolas Guibourge 1.19.7-2 - Increment release to force republishing using golang 1.15.11. diff --git a/SPECS/kubernetes/kubernetes-1.20.2.signatures.json b/SPECS/kubernetes/kubernetes-1.20.2.signatures.json index e3fc52221e0..525aad59fbe 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.2.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.2-hotfix.20210428.tar.gz": "b07034861e5c1d532b9bdcf6a4564bdc710e1bb42d402923426b8327fc5c79e1" + "kubernetes-node-linux-amd64-1.20.2-hotfix.20210511.tar.gz": "ac2e7737d9deee2b9a10cff9ccc8e50010d9b896d909be1369685963932c9151" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.2.spec b/SPECS/kubernetes/kubernetes-1.20.2.spec index edd9227d265..7c59dfd9ed0 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.spec +++ b/SPECS/kubernetes/kubernetes-1.20.2.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.2 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210428.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz Source1: kubelet.service # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch @@ -266,6 +266,9 @@ fi %{_bindir}/pause %changelog +* Thu May 13 2021 CBL-Mariner Service Account - 1.20.2-3 +- Update to version "1.20.2-hotfix.20210511". + * Mon May 03 2021 Nicolas Guibourge 1.20.2-2 - Increment release to force republishing using golang 1.15.11. diff --git a/cgmanifest.json b/cgmanifest.json index 2fb699b608a..56038fdb23d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2176,7 +2176,7 @@ "other": { "name": "kubernetes", "version": "1.18.14", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2196,7 +2196,7 @@ "other": { "name": "kubernetes", "version": "1.19.7", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2216,7 +2216,7 @@ "other": { "name": "kubernetes", "version": "1.20.2", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210428/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, From 76f5268fcffd63536a18cb52a3918eea5b4db8e8 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Fri, 14 May 2021 12:36:40 -0700 Subject: [PATCH 31/83] update moby-runc to rc94 (#942) --- SPECS/moby-runc/generate-sources.sh | 21 +++++++++ SPECS/moby-runc/getgosyssources.sh | 4 +- SPECS/moby-runc/moby-runc.signatures.json | 10 ++--- SPECS/moby-runc/moby-runc.spec | 29 ++++++------ cgmanifest.json | 54 ++++++++++++++++++++++- 5 files changed, 96 insertions(+), 22 deletions(-) create mode 100755 SPECS/moby-runc/generate-sources.sh diff --git a/SPECS/moby-runc/generate-sources.sh b/SPECS/moby-runc/generate-sources.sh new file mode 100755 index 00000000000..e0764d8398f --- /dev/null +++ b/SPECS/moby-runc/generate-sources.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. +# This script generates the sources for moby-buildx package. +# Git clone is a standard practice of producing source files for moby-* packages. + +RUNC_REPO=https://github.com/opencontainers/runc.git +RUNC_COMMIT=2c7861bc5e1b3e756392236553ec14a78a09f8bf +VERSION=v1.0.0-rc94 + +mkdir -p /build/runc-src +cd /build/runc-src +git clone ${RUNC_REPO} +cd runc +git fetch --tags origin ${RUNC_COMMIT} +git checkout ${RUNC_COMMIT} +cd /build/ +tar -C /build/runc-src -czf ./runc-${VERSION}.tar.gz . +rm -rf /build/runc-src + +echo "sources generated successfully @ /build/runc-${VERSION}.tar.gz" diff --git a/SPECS/moby-runc/getgosyssources.sh b/SPECS/moby-runc/getgosyssources.sh index 049e9487e9a..f2109c28151 100755 --- a/SPECS/moby-runc/getgosyssources.sh +++ b/SPECS/moby-runc/getgosyssources.sh @@ -5,7 +5,7 @@ # golang sys sources are git cloned to latest commit. GOLANG_SYS=https://github.com/golang/sys.git -GOLANG_SYS_COMMIT=669c56c373c468cbe0f0c12b7939832b26088d33 +GOLANG_SYS_COMMIT=b0526f3d87448f0401ea3f7f3a81aa9e6ab4804d mkdir -p /build/work/sys-master cd /build/work/sys-master @@ -18,7 +18,7 @@ rm -rf /build/work # golang crypto sources are git cloned to latest commit. GOLANG_CRYPO=https://github.com/golang/crypto.git -GOLANG_CRYPTO_COMMIT=0848c9571904fcbcb24543358ca8b5a7dbfde875 +GOLANG_CRYPTO_COMMIT=c07d793c2f9aacf728fe68cbd7acd73adbd04159 mkdir -p /build/work/crypto-master cd /build/work/crypto-master diff --git a/SPECS/moby-runc/moby-runc.signatures.json b/SPECS/moby-runc/moby-runc.signatures.json index 1e2fe608917..d6014a21b72 100644 --- a/SPECS/moby-runc/moby-runc.signatures.json +++ b/SPECS/moby-runc/moby-runc.signatures.json @@ -2,11 +2,11 @@ "Signatures": { "LICENSE": "a382e75d3b80971ffb0c863fd8922da48564cfdf8dd30e5c918334a0b6521c05", "NOTICE": "cc96602ba377f696d7b92b09e67a4ae74d81985f6c22501acc41267e8aa5c302", - "golang-crypto-0848c9571904fcbcb24543358ca8b5a7dbfde875.tar.gz": "250b757fddd894b62ba13f6aaef4c955e966912de51cee0eddd2a36522c3abb7", - "golang-sys-669c56c373c468cbe0f0c12b7939832b26088d33.tar.gz": "df0a725a833f571b2f64fbec89e15b137d8656125a868c5aa232bb2905e6b5b7", - "logrus-v1.4.1.tar.gz": "aecd75cfc00edfc8d8bdb013d2cee2a5da686fce31c5cf2ae314ce4642c8e139", - "runc-v1.0.0-rc10.tar.xz": "c823307ce8695af05381c5c25a92daacd6219c674d8bebaa0e1bff801c2b1f24", + "golang-crypto-c07d793c2f9aacf728fe68cbd7acd73adbd04159.tar.gz": "b7e8935189ea46c67eedafe6a97aefbdc2bf71dd9097fb7ee8a2a8ebc7556e7e", + "golang-sys-b0526f3d87448f0401ea3f7f3a81aa9e6ab4804d.tar.gz": "23703a84893a1cb53d3efbb46143451431b95b78d29ef1e02132cd580bb3a445", + "logrus-v1.8.1.tar.gz": "e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74", + "runc-v1.0.0-rc94.tar.gz": "2e0d448363174a77c109053a593518a5aa2a6166f691a29edb33a6cb0850ba9a", "runtime-spec-v1.0.2.tar.gz": "0933a1ba6e418fe020993e80426107da8de3572f3f20b4cd1ef296de6e62bb61", - "urfave-cli-v1.22.4.tar.gz": "83d628fdd261accd4dc0b232bfc8ff06e734ec5137e134a8cee916693a8bb117" + "urfave-cli-v2.3.0.tar.gz": "b17376246f1477157daab86d4a1562d6b004f5be0d15dfc61ebd8bb129384e6b" } } \ No newline at end of file diff --git a/SPECS/moby-runc/moby-runc.spec b/SPECS/moby-runc/moby-runc.spec index ba202debaa2..cd06d266619 100644 --- a/SPECS/moby-runc/moby-runc.spec +++ b/SPECS/moby-runc/moby-runc.spec @@ -1,22 +1,23 @@ Summary: CLI tool for spawning and running containers per OCI spec. Name: moby-runc -Version: 1.0.0~rc10+azure -Release: 6%{?dist} +Version: 1.0.0~rc94+azure +Release: 1%{?dist} License: ASL 2.0 URL: https://runc.io/ -#Source0: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc10/runc.tar.xz -Source0: runc-v1.0.0-rc10.tar.xz -#Source1: https://github.com/sirupsen/logrus/archive/v1.4.1.tar.gz -Source1: logrus-v1.4.1.tar.gz +# See generate-sources.sh for creating runc source tarball +#Source0: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc94/runc.tar.xz +Source0: runc-v1.0.0-rc94.tar.gz +#Source1: https://github.com/sirupsen/logrus/archive/v1.8.1.tar.gz +Source1: logrus-v1.8.1.tar.gz #Source2: https://github.com/opencontainers/runtime-spec/archive/v1.0.2.tar.gz Source2: runtime-spec-v1.0.2.tar.gz -#Source3: https://github.com/urfave/cli/archive/v1.22.4.tar.gz -Source3: urfave-cli-v1.22.4.tar.gz +#Source3: https://github.com/urfave/cli/archive/v2.3.0.tar.gz +Source3: urfave-cli-v2.3.0.tar.gz # golang sys and crypto sources are git cloned to latest commit. # Please look for ./getgosources.sh for more details. -Source4: https://github.com/golang/sys/archive/golang-sys-669c56c373c468cbe0f0c12b7939832b26088d33.tar.gz -Source5: https://github.com/golang/crypto/archive/golang-crypto-0848c9571904fcbcb24543358ca8b5a7dbfde875.tar.gz +Source4: https://github.com/golang/sys/archive/golang-sys-b0526f3d87448f0401ea3f7f3a81aa9e6ab4804d.tar.gz +Source5: https://github.com/golang/crypto/archive/golang-crypto-c07d793c2f9aacf728fe68cbd7acd73adbd04159.tar.gz Source6: NOTICE Source7: LICENSE @@ -60,7 +61,7 @@ runC is a CLI tool for spawning and running containers according to the OCI spec %prep %setup -q -n %{name}-%{version} -c mkdir -p %{OUR_GOPATH}/src/github.com/opencontainers -ln -sfT %{_topdir}/BUILD/%{name}-%{version}/runc-1.0.0-rc10 %{OUR_GOPATH}/src/github.com/opencontainers/runc +ln -svfT %{_topdir}/BUILD/%{name}-%{version}/runc %{OUR_GOPATH}/src/github.com/opencontainers/runc pushd .. @@ -76,8 +77,8 @@ mkdir -p %{OUR_GOPATH}/src/github.com/urfave/ mkdir -p %{OUR_GOPATH}/src/golang.org/x/ ln -sfT %{_topdir}/BUILD/%{name}-%{version}/runtime-spec-1.0.2 %{OUR_GOPATH}/src/github.com/opencontainers/runtime-spec -ln -sfT %{_topdir}/BUILD/%{name}-%{version}/logrus-1.4.1 %{OUR_GOPATH}/src/github.com/sirupsen/logrus -ln -sfT %{_topdir}/BUILD/%{name}-%{version}/cli-1.22.4 %{OUR_GOPATH}/src/github.com/urfave/cli +ln -sfT %{_topdir}/BUILD/%{name}-%{version}/logrus-1.8.1 %{OUR_GOPATH}/src/github.com/sirupsen/logrus +ln -sfT %{_topdir}/BUILD/%{name}-%{version}/cli-2.3.0 %{OUR_GOPATH}/src/github.com/urfave/cli ln -sfT %{_topdir}/BUILD/%{name}-%{version}/sys-master %{OUR_GOPATH}/src/golang.org/x/sys ln -sfT %{_topdir}/BUILD/%{name}-%{version}/crypto-master %{OUR_GOPATH}/src/golang.org/x/crypto @@ -113,6 +114,8 @@ cp %{SOURCE7} %{buildroot}/usr/share/doc/%{name}-%{version}/LICENSE %{_mandir}/*/* %changelog +* Thu May 13 2021 Andrew Phelps 1.0.0~rc94+azure-1 +- Update to version 1.0.0~rc94+azure * Mon Apr 26 2021 Nicolas Guibourge 1.0.0~rc10+azure-6 - Increment release to force republishing using golang 1.15.11. * Thu Dec 10 2020 Andrew Phelps 1.0.0~rc10+azure-5 diff --git a/cgmanifest.json b/cgmanifest.json index 56038fdb23d..b7103f26f57 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1520,6 +1520,26 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "golang-crypto", + "version": "c07d793c2f9aacf728fe68cbd7acd73adbd04159", + "downloadUrl": "https://github.com/golang/crypto/archive/golang-crypto-c07d793c2f9aacf728fe68cbd7acd73adbd04159.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "golang-sys", + "version": "b0526f3d87448f0401ea3f7f3a81aa9e6ab4804d", + "downloadUrl": "https://github.com/golang/sys/archive/golang-sys-b0526f3d87448f0401ea3f7f3a81aa9e6ab4804d.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3180,6 +3200,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "logrus", + "version": "1.8.1", + "downloadUrl": "https://github.com/sirupsen/logrus/archive/v1.8.1.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3465,8 +3495,8 @@ "type": "other", "other": { "name": "moby-runc", - "version": "1.0.0~rc10+azure", - "downloadUrl": "https://github.com/opencontainers/runc/releases/download/v1.0.0-rc10/runc.tar.xz" + "version": "1.0.0~rc94+azure", + "downloadUrl": "https://github.com/opencontainers/runc/releases/download/v1.0.0-rc94/runc.tar.xz" } } }, @@ -6440,6 +6470,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "runtime-spec", + "version": "1.0.2", + "downloadUrl": "https://github.com/opencontainers/runtime-spec/archive/v1.0.2.tar.gz" + } + } + }, { "component": { "type": "other", @@ -6960,6 +7000,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "urfave-cli", + "version": "2.3.0", + "downloadUrl": "https://github.com/urfave/cli/archive/v2.3.0.tar.gz" + } + } + }, { "component": { "type": "other", From df8150ef2a88d77e34a12fde5e8c13a3ab3391e5 Mon Sep 17 00:00:00 2001 From: rlmenge Date: Fri, 14 May 2021 18:40:18 -0400 Subject: [PATCH 32/83] Kernel: Add CONFIG_AS_HAS_LSE_ATOMICS=y (#940) --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 ++++- SPECS/kernel-headers/kernel-headers.spec | 5 ++++- SPECS/kernel-hyperv/kernel-hyperv.spec | 5 ++++- SPECS/kernel/config_aarch64 | 1 + SPECS/kernel/kernel.signatures.json | 2 +- SPECS/kernel/kernel.spec | 5 ++++- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 2 +- toolkit/resources/manifests/package/toolchain_x86_64.txt | 2 +- 10 files changed, 22 insertions(+), 9 deletions(-) diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index a62f728927f..8640b99065c 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -9,7 +9,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.10.32.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -139,6 +139,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Thu May 13 2021 Rachel Menge - 5.10.32.1-2 +- Bump release number to match kernel release + * Mon May 03 2021 Rachel Menge - 5.10.32.1-1 - Update source to 5.10.32.1 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 9c025404ed0..b12846beeae 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.10.32.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Thu May 13 2021 Rachel Menge - 5.10.32.1-2 +- Bump release number to match kernel release + * Mon May 03 2021 Rachel Menge - 5.10.32.1-1 - Update source to 5.10.32.1 diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index e0efe1592c1..7cce642e566 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.10.32.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -274,6 +274,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Thu May 13 2021 Rachel Menge - 5.10.32.1-2 +- Bump release number to match kernel release + * Mon May 03 2021 Rachel Menge - 5.10.32.1-1 - Update source to 5.10.32.1 diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index 581ed14f77d..048aceafa9e 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -432,6 +432,7 @@ CONFIG_SETEND_EMULATION=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 05853801234..dd12a345023 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "config": "774cfaea0547b798d8a0653d27010728497a97726df372b1f258ff592799d653", - "config_aarch64": "c7fe9d289fe79f083a316b84d72b0068bbe5a0c93bc4ed4e5aff22a986e270fc", + "config_aarch64": "d08c55887bcd542ba63b7722dddd8d0734d419b812af4f1ed77b08a0c93e3b72", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index b01a4ef7ed1..06fdba6e6be 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel Name: kernel Version: 5.10.32.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -500,6 +500,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Thu May 13 2021 Rachel Menge - 5.10.32.1-2 +- Add CONFIG_AS_HAS_LSE_ATOMICS=y + * Mon May 03 2021 Rachel Menge - 5.10.32.1-1 - Update source to 5.10.32.1 - Address CVE-2021-23133, CVE-2021-29154, CVE-2021-30178 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 3d0e619b9aa..79a1752f27a 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-1.cm1.noarch.rpm +kernel-headers-5.10.32.1-2.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 0daae12bae2..87960703bef 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-1.cm1.noarch.rpm +kernel-headers-5.10.32.1-2.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 0f0208a6d45..116d41540e1 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-1.cm1.noarch.rpm +kernel-headers-5.10.32.1-2.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 2494d3660bb..7fea459bcef 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-1.cm1.noarch.rpm +kernel-headers-5.10.32.1-2.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm From 4d859523618679cdb3ef1bcf79bd30b243f4691a Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Mon, 17 May 2021 10:19:25 -0700 Subject: [PATCH 33/83] Update azure-iotedge and libiothsm-std to version 1.1.2 (#946) * update azure-iotedge to 1.1.2 * update entangled specs * add comma --- .github/workflows/check_entangled_specs.py | 4 ++++ SPECS/azure-iotedge/azure-iotedge.signatures.json | 4 ++-- SPECS/azure-iotedge/azure-iotedge.spec | 7 +++++-- SPECS/libiothsm-std/libiothsm-std.signatures.json | 2 +- SPECS/libiothsm-std/libiothsm-std.spec | 4 +++- cgmanifest.json | 8 ++++---- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check_entangled_specs.py b/.github/workflows/check_entangled_specs.py index 43fbbfc7558..76de5a965c1 100644 --- a/.github/workflows/check_entangled_specs.py +++ b/.github/workflows/check_entangled_specs.py @@ -28,6 +28,10 @@ "SPECS/hyperv-daemons/hyperv-daemons.spec", "SPECS/kernel/kernel.spec", "SPECS/kernel-hyperv/kernel-hyperv.spec" + ]), + frozenset([ + "SPECS/azure-iotedge/azure-iotedge.spec", + "SPECS/libiothsm-std/libiothsm-std.spec" ]) ] diff --git a/SPECS/azure-iotedge/azure-iotedge.signatures.json b/SPECS/azure-iotedge/azure-iotedge.signatures.json index eac5e83c637..d785e09c477 100644 --- a/SPECS/azure-iotedge/azure-iotedge.signatures.json +++ b/SPECS/azure-iotedge/azure-iotedge.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "azure-iotedge-1.1.0-cargo.tar.gz": "94d8d7a8d2834eb4d5ec47f76c37a0a1e7a90979f8fabca556db808a60d7b310", - "azure-iotedge-1.1.0.tar.gz": "c8cd6b70786057a3e599a7649478dcd478726a4125d9e69ddea6314916fe060b" + "azure-iotedge-1.1.2-cargo.tar.gz": "eec1a83f6d30bb88679f6ef73e9ceaf2f3ca3d6cfe7cec02fc94c383997dd8ea", + "azure-iotedge-1.1.2.tar.gz": "23c0efe1f720ed3a27060cab0cae83fecfe73f017063b1bdb94a4bbce34c87b5" } } \ No newline at end of file diff --git a/SPECS/azure-iotedge/azure-iotedge.spec b/SPECS/azure-iotedge/azure-iotedge.spec index 089bb8c797f..654ca869544 100644 --- a/SPECS/azure-iotedge/azure-iotedge.spec +++ b/SPECS/azure-iotedge/azure-iotedge.spec @@ -1,7 +1,7 @@ Summary: Azure IoT Edge Security Daemon Name: azure-iotedge -Version: 1.1.0 -Release: 4%{?dist} +Version: 1.1.2 +Release: 1%{?dist} # A buildable azure-iotedge environments needs functioning submodules that do not work from the archive download # To recreate the tar.gz run the following @@ -166,6 +166,9 @@ echo "========================================================================== %doc %{_docdir}/iotedge-%{version}/trademark %changelog +* Fri May 14 2021 Andrew Phelps - 1.1.2-1 +- Update to version 1.1.2 + * Mon Apr 26 2021 Thomas Crain - 1.1.0-4 - Bump release to rebuild with rust 1.47.0-3 (security update) diff --git a/SPECS/libiothsm-std/libiothsm-std.signatures.json b/SPECS/libiothsm-std/libiothsm-std.signatures.json index da981d4ec95..fc33e8ec160 100644 --- a/SPECS/libiothsm-std/libiothsm-std.signatures.json +++ b/SPECS/libiothsm-std/libiothsm-std.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "azure-iotedge-1.1.0.tar.gz": "c8cd6b70786057a3e599a7649478dcd478726a4125d9e69ddea6314916fe060b" + "azure-iotedge-1.1.2.tar.gz": "23c0efe1f720ed3a27060cab0cae83fecfe73f017063b1bdb94a4bbce34c87b5" } } \ No newline at end of file diff --git a/SPECS/libiothsm-std/libiothsm-std.spec b/SPECS/libiothsm-std/libiothsm-std.spec index abb0838630d..6ab033251f7 100644 --- a/SPECS/libiothsm-std/libiothsm-std.spec +++ b/SPECS/libiothsm-std/libiothsm-std.spec @@ -1,6 +1,6 @@ Summary: Azure IoT standard mode HSM lib Name: libiothsm-std -Version: 1.1.0 +Version: 1.1.2 Release: 1%{?dist} # A buildable azure-iotedge environments needs functioning submodules that do not work from the archive download @@ -51,6 +51,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libiothsm.so* %changelog +* Fri May 14 2021 Andrew Phelps 1.1.2-1 +- Update to version 1.1.2 * Tue Feb 23 2021 Andrew Phelps 1.1.0-1 - Update to version 1.1.0 * Wed May 27 2020 Andrew Phelps 1.0.9.1-1 diff --git a/cgmanifest.json b/cgmanifest.json index b7103f26f57..8edc5a3460c 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -225,8 +225,8 @@ "type": "other", "other": { "name": "azure-iotedge", - "version": "1.1.0", - "downloadUrl": "https://github.com/Azure/iotedge/archive/1.1.0.tar.gz" + "version": "1.1.2", + "downloadUrl": "https://github.com/Azure/iotedge/archive/1.1.2.tar.gz" } } }, @@ -2555,8 +2555,8 @@ "type": "other", "other": { "name": "libiothsm-std", - "version": "1.1.0", - "downloadUrl": "https://github.com/Azure/iotedge/archive/1.1.0.tar.gz" + "version": "1.1.2", + "downloadUrl": "https://github.com/Azure/iotedge/archive/1.1.2.tar.gz" } } }, From 8a3f481f61875899484f291bfb4343fea2d01b3a Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Mon, 17 May 2021 15:33:26 -0700 Subject: [PATCH 34/83] Adding more details for reproducing builds with summary files. (#938) --- toolkit/docs/building/building.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/toolkit/docs/building/building.md b/toolkit/docs/building/building.md index 389d1f6f3f8..d22e7cb058e 100644 --- a/toolkit/docs/building/building.md +++ b/toolkit/docs/building/building.md @@ -526,15 +526,17 @@ By default the build system will pull the highest possible version of external p ### Build Summaries -The build system supports this behavior through summary files, a JSON representation of packages consumed during a build. By referencing these summary files, the build system can consume the exact same version of external packages later on. +The build system supports this behavior through summary files, a JSON representation of packages consumed during a build. By referencing these summary files, the build system can consume the exact same version of packages later on. Since the summary files are regenerated every build, if you wish to reproduce a build, you should save the summary files to another location for future use. | Type of Build | Summary File Location | Description |:------------------------------|:-------------------------------------------------------------------------------------------------------|:--- -| Package Build | `$(PKGBUILD_DIR)/graph_external_deps.json` | Generated every package build. Can be saved and used later with the `$(PACKAGE_CACHE_SUMMARY)` variable to reproduce a package build. -| Image Build | `$(IMAGEGEN_DIR)/{imagename}/image_deps.json` | Generated every image build. Can be saved and used later with the `$(IMAGE_CACHE_SUMMARY)` variable to reproduce an image build. -| Initrd Build | `$(IMAGEGEN_DIR)/iso_initrd/image_deps.json` | Generated every initrd and ISO build. Can be saved and used later with the `$(INITRD_CACHE_SUMMARY)` variable to reproduce an initrd build. +| Package Build | `$(PKGBUILD_DIR)/graph_external_deps.json` | Generated every package build. Can be saved and used later with the `PACKAGE_CACHE_SUMMARY` variable to reproduce a package build. Contains **only the external** packages required to build the local packages. +| Image Build | `$(IMAGEGEN_DIR)/{imagename}/image_deps.json` | Generated every image build. Can be saved and used later with the `IMAGE_CACHE_SUMMARY` variable to reproduce an image build. Contains **all (both external and local)** packages required to build the image. +| Initrd Build | `$(IMAGEGEN_DIR)/iso_initrd/image_deps.json` | Generated every initrd and ISO build. Can be saved and used later with the `INITRD_CACHE_SUMMARY` variable to reproduce an initrd build. Contains **all (both external and local)** packages required to build the image. However, unless you modified the initrd image packages JSON or have your own version of its PMC packages locally, all the required packages are external. + +**WARNING**: the `graph_external_deps.json` contains **ALL** external packages required to build your local spec files. If you depend on any external packages outside the core Mariner's PMC repository, you **MUST** make sure you still have access to them when attempting to reproduce a build. ### Building From Summaries @@ -543,7 +545,7 @@ To reproduce a build, there are four constraints: 1. The local SPEC files must be the same. That is, you cannot reproduce a build having modified any of the local SPEC files since when the summary files were generated. 2. What is being built must be the same. That is, if the summary files were generated from an image build then the reproduced build must be building the exact same image configuration. 3. The toolkit version must be the same. That is, if the summary files were generated from a `1.0` toolkit, then the reproduced build must be done using the `1.0` toolkit. -4. The builds must be from clean. Both the build that generated the summary files and the reproduced build must be done from a clean state, otherwise there may be leftover files that affect the summary files. +4. The builds must be from clean. Both the build that generated the summary files and the reproduced build must be done from a clean state, otherwise there may be leftover files that affect the summary files. The only exception is the mentioned case of using external packages not present in the PMC repository - in this case you'll need to pre-populate the local cache with these packages after cleaning your repository, but before running the build. If the above constraints are met then a build can be reproduced from summary files. @@ -576,7 +578,7 @@ To reproduce an ISO build, run the same make invocation as before, but set: | Variable | Default | Description |:------------------------------|:-------------------------------------------------------------------------------------------------------|:--- -| CONFIG_FILE | `$(RESOURCES_DIR)`/imageconfigs/core-efi/core-efi.json | Image config file to build. +| CONFIG_FILE | `$(RESOURCES_DIR)`/imageconfigs/core-efi/core-efi.json | [Image config file](https://github.com/microsoft/CBL-MarinerDemo#image-config-file) to build. | CONFIG_BASE_DIR | `$(dir $(CONFIG_FILE))` | Base directory on the **build machine** to search for any **relative** file paths mentioned inside the [image config file](https://github.com/microsoft/CBL-MarinerDemo#image-config-file). This has no effect on **absolute** file paths or file paths on the **built image**. | UNATTENDED_INSTALLER | | Create unattended ISO installer if set. Overrides all other installer options. | PACKAGE_BUILD_LIST | | Additional packages to build. From 8d4a7ec9eb4424c361575c8e3f20dce834d6307c Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Mon, 17 May 2021 16:56:36 -0700 Subject: [PATCH 35/83] Remove runc package (#947) * remove runc package * update LICENSES-AND-NOTICES --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 1 - SPECS/runc/runc.signatures.json | 10 -- SPECS/runc/runc.spec | 106 ------------------ cgmanifest.json | 10 -- 5 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 SPECS/runc/runc.signatures.json delete mode 100644 SPECS/runc/runc.spec diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index e10b9a9ba00..69731ee71cd 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -4,7 +4,7 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | --- | --- | --- | | Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
dnf
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
hyperv-daemons
ipmitool
ipv6calc
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
libatasmart
libburn
libcgroup
libcomps
libdnf
libisoburn
libisofs
libkcapi
libpwquality
libxcrypt
mokutil
mozjs60
open-vm-tools
openssl
p11-kit
perl-JSON
pugixml
python-pexpect
python-ptyprocess
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
sos
squashfs-tools
uclibc-ng
uuid
websocketpp
words
yaml-cpp
zipper | | Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
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
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates-base
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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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
runc
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 | +| 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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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) | nvidia-container-runtime | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 44ac3fb114c..06a1d2daa08 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -693,7 +693,6 @@ "rsyslog", "ruby", "rubygem-bundler", - "runc", "rust", "scons", "sed", diff --git a/SPECS/runc/runc.signatures.json b/SPECS/runc/runc.signatures.json deleted file mode 100644 index 8c1c98c59c4..00000000000 --- a/SPECS/runc/runc.signatures.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Signatures": { - "golang-crypto-eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035.zip": "831c3f55bb9e043a07a50b183c8bbdefed361c540f4d51fbc003522cdc46c1e0", - "golang-sys-07c182904dbd53199946ba614a412c61d3c548f5.zip": "3be56632d092bec2ae24fea024fbf24c5bc02cc25fc1c6104678f7e4ee5cc84c", - "logrus-1.0.3.tar.gz": "c1a29d4e1cd0af9ca75e6258eaac720b18c366c7e32502900494f9a77dfd9cb0", - "runc-v1.0.0-rc8.tar.gz": "efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700", - "runtime-spec-1.0.0.tar.gz": "857c0f6128deec6453994abb776d4e937b34b174954718f989375d3fc08db6c5", - "urfave-cli-1.19.1.tar.gz": "2b026d3d9e4caad3dd403139c5daada848494f36e5d46ddfb3e3a7f8466d0c96" - } -} \ No newline at end of file diff --git a/SPECS/runc/runc.spec b/SPECS/runc/runc.spec deleted file mode 100644 index a0a182b98da..00000000000 --- a/SPECS/runc/runc.spec +++ /dev/null @@ -1,106 +0,0 @@ -%define version_num 1.0.0 -%define version_suffix rc8 -%define url_version %{version_num}-%{version_suffix} -%define spec_version %{version_num}.%{version_suffix} - -Summary: CLI tool for spawning and running containers per OCI spec. -Name: runc -Version: %{spec_version} -Release: 8%{?dist} -License: ASL 2.0 -URL: https://runc.io/ -#Source0: https://github.com/opencontainers/runc/archive/v%{url_version}.tar.gz -Source0: %{name}-v%{url_version}.tar.gz -Source1: https://github.com/sirupsen/logrus/archive/logrus-1.0.3.tar.gz -%define sha1 logrus=9edcef15ac3860d431b162102533911788885b5f -Source2: https://github.com/opencontainers/runtime-spec/archive/runtime-spec-1.0.0.tar.gz -%define sha1 runtime-spec=7cd96a1bebe4cdb55d2b5f5df1e52374b016a0bd -Source3: https://github.com/urfave/cli/archive/urfave-cli-1.19.1.tar.gz -%define sha1 urfave-cli=9044d4e160ebb954c17856785cf8fde02858d9ac -Source4: https://github.com/golang/sys/archive/golang-sys-07c182904dbd53199946ba614a412c61d3c548f5.zip -%define sha1 golang-sys=940b297797b1defc11d67820a92becefeaa88f59 -Source5: https://github.com/golang/crypto/archive/golang-crypto-eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035.zip -%define sha1 golang-crypto=775ab62e664ee2c89f624d5be6c55775360653ee -Group: Virtualization/Libraries -Vendor: Microsoft Corporation -Distribution: Mariner -BuildRequires: curl -BuildRequires: gawk -BuildRequires: golang -BuildRequires: iptables-devel -BuildRequires: pkg-config -BuildRequires: libaio-devel -BuildRequires: libcap-ng-devel -BuildRequires: libseccomp -BuildRequires: libseccomp-devel -BuildRequires: protobuf-devel -BuildRequires: protobuf-c-devel -BuildRequires: python2-devel -BuildRequires: unzip -Requires: glibc -Requires: libgcc -Requires: libseccomp - -%description -runC is a CLI tool for spawning and running containers according to the OCI specification. Containers are started as a child process of runC and can be embedded into various other systems without having to run a daemon. - -%prep -%setup -q -n %{name}-1.0.0-rc8 - -%build -export GOPATH="/go" - -pushd .. -tar -xvf %{SOURCE1} -tar -xvf %{SOURCE2} -tar -xvf %{SOURCE3} -unzip %{SOURCE4} -unzip %{SOURCE5} -mkdir -p $GOPATH/src/github.com/opencontainers/runtime-spec/ -mkdir -p $GOPATH/src/github.com/sirupsen/logrus -mkdir -p $GOPATH/src/github.com/urfave/cli -mkdir -p $GOPATH/src/golang.org/x/sys/ -mkdir -p $GOPATH/src/golang.org/x/crypto/ -mkdir -p build/src/github.com/opencontainers/runc -cp -r runtime-spec-1.0.0/* $GOPATH/src/github.com/opencontainers/runtime-spec/ -cp -r logrus-1.0.3/* $GOPATH/src/github.com/sirupsen/logrus -cp -r cli-1.19.1/* $GOPATH/src/github.com/urfave/cli -cp -r sys-master/* $GOPATH/src/golang.org/x/sys -cp -r crypto-master/* $GOPATH/src/golang.org/x/crypto -popd -cp -r . ../build/src/github.com/opencontainers/runc -cd ../build -export GOPATH=$GOPATH:`pwd` -cd src/github.com/opencontainers/runc -make %{?_smp_mflags} - -%install -cd ../build/src/github.com/opencontainers/runc -make install BINDIR=%{buildroot}%{_sbindir} - -%files -%defattr(-,root,root) -%license LICENSE -%{_sbindir}/runc - -%changelog -* Mon Apr 26 2021 Nicolas Guibourge 1.0.0.rc8-8 -- Increment release to force republishing using golang 1.15.11. -* Thu Dec 10 2020 Andrew Phelps 1.0.0.rc8-7 -- Increment release to force republishing using golang 1.15. -* Wed May 20 2020 Joe Schmitt 1.0.0.rc8-6 -- Remove reliance on existing GOPATH environment variable. -* Sat May 09 2020 Nick Samson 1.0.0.rc8-5 -- Added %%license line automatically -* Thu Apr 30 2020 Emre Girgin 1.0.0.rc8-4 -- Renaming go to golang -* Mon Apr 20 2020 Eric Li 1.0.0.rc8-3 -- Update Source0:, delete sha1, add #Source0:. Verified license. -* Tue Sep 03 2019 Mateusz Malisz 1.0.0.rc8-2 -- Initial CBL-Mariner import from Photon (license: Apache2). -* Thu Jun 13 2019 Tapas Kundu 1.0.0.rc8-1 -- Update to release 1.0.0-rc8 -* Fri Jun 23 2017 Xiaolin Li 0.1.1-2 -- Add iptables-devel to BuildRequires -* Tue Apr 25 2017 Vinay Kulkarni 0.1.1-1 -- Initial runc package for PhotonOS. diff --git a/cgmanifest.json b/cgmanifest.json index 8edc5a3460c..84c74d6c70e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6460,16 +6460,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "runc", - "version": "1.0.0.rc8", - "downloadUrl": "https://github.com/opencontainers/runc/archive/v1.0.0-rc8.tar.gz" - } - } - }, { "component": { "type": "other", From 4b3835d94f93f2b8b88934f8a53e69148367ad69 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Tue, 18 May 2021 11:24:57 -0700 Subject: [PATCH 36/83] Upgrade binutils to version 2.36.1 (#932) * update binutils to 2.36.1 * fix changelog dates * fix toolchain manifest typos * fix changelog date and use eu-readelf in kernel-hyperv * update changelog dates * pull in python-expect fix * update per pr comment * update binutils files section * remove build-id check * remove build-id check in kernel-hyperv * pull in fix for sos * update changelog dates and config hash * update manifests * update changelog date for kernel-signed --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 +- SPECS/binutils/CVE-2019-12972.patch | 12 -- SPECS/binutils/CVE-2019-14250.patch | 17 -- SPECS/binutils/CVE-2019-14444.patch | 11 - SPECS/binutils/CVE-2019-17450.patch | 72 ------- SPECS/binutils/CVE-2019-17451.patch | 20 -- SPECS/binutils/CVE-2019-9070.nopatch | 0 SPECS/binutils/CVE-2019-9071.patch | 110 ---------- SPECS/binutils/CVE-2019-9072.nopatch | 0 SPECS/binutils/CVE-2019-9073.patch | 13 -- SPECS/binutils/CVE-2019-9074.patch | 33 --- SPECS/binutils/CVE-2019-9075.patch | 89 -------- SPECS/binutils/CVE-2019-9076.nopatch | 0 SPECS/binutils/CVE-2019-9077.patch | 29 --- SPECS/binutils/CVE-2020-35493.patch | 30 --- SPECS/binutils/CVE-2020-35494-helper.patch | 27 --- SPECS/binutils/CVE-2020-35494.patch | 27 --- SPECS/binutils/CVE-2020-35495.patch | 203 ------------------ SPECS/binutils/CVE-2020-35496.nopatch | 0 SPECS/binutils/CVE-2020-35507.nopatch | 0 SPECS/binutils/binutils.signatures.json | 2 +- SPECS/binutils/binutils.spec | 55 ++--- SPECS/kernel-headers/kernel-headers.spec | 7 +- SPECS/kernel-hyperv/config | 2 +- .../kernel-hyperv.signatures.json | 2 +- SPECS/kernel-hyperv/kernel-hyperv.spec | 18 +- SPECS/kernel/config | 2 +- SPECS/kernel/config_aarch64 | 2 +- SPECS/kernel/kernel.signatures.json | 4 +- SPECS/kernel/kernel.spec | 18 +- SPECS/kexec-tools/kexec-tools.signatures.json | 2 +- SPECS/kexec-tools/kexec-tools.spec | 13 +- SPECS/qemu-kvm/qemu-kvm.spec | 8 +- SPECS/tboot/no_error_packed_member.patch | 11 - SPECS/tboot/tboot.signatures.json | 2 +- SPECS/tboot/tboot.spec | 33 ++- cgmanifest.json | 18 +- .../manifests/package/pkggen_core_aarch64.txt | 6 +- .../manifests/package/pkggen_core_x86_64.txt | 6 +- .../manifests/package/toolchain_aarch64.txt | 8 +- .../manifests/package/toolchain_x86_64.txt | 8 +- .../toolchain/container/toolchain-md5sums | 2 +- .../container/toolchain-remote-wget-list | 2 +- .../container/toolchain_build_in_chroot.sh | 9 +- .../container/toolchain_build_temp_tools.sh | 16 +- 45 files changed, 125 insertions(+), 829 deletions(-) delete mode 100644 SPECS/binutils/CVE-2019-12972.patch delete mode 100644 SPECS/binutils/CVE-2019-14250.patch delete mode 100644 SPECS/binutils/CVE-2019-14444.patch delete mode 100644 SPECS/binutils/CVE-2019-17450.patch delete mode 100644 SPECS/binutils/CVE-2019-17451.patch delete mode 100644 SPECS/binutils/CVE-2019-9070.nopatch delete mode 100644 SPECS/binutils/CVE-2019-9071.patch delete mode 100644 SPECS/binutils/CVE-2019-9072.nopatch delete mode 100644 SPECS/binutils/CVE-2019-9073.patch delete mode 100644 SPECS/binutils/CVE-2019-9074.patch delete mode 100644 SPECS/binutils/CVE-2019-9075.patch delete mode 100644 SPECS/binutils/CVE-2019-9076.nopatch delete mode 100644 SPECS/binutils/CVE-2019-9077.patch delete mode 100644 SPECS/binutils/CVE-2020-35493.patch delete mode 100644 SPECS/binutils/CVE-2020-35494-helper.patch delete mode 100644 SPECS/binutils/CVE-2020-35494.patch delete mode 100644 SPECS/binutils/CVE-2020-35495.patch delete mode 100644 SPECS/binutils/CVE-2020-35496.nopatch delete mode 100644 SPECS/binutils/CVE-2020-35507.nopatch delete mode 100644 SPECS/tboot/no_error_packed_member.patch diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 8640b99065c..ee9d9b6dae6 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -9,7 +9,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.10.32.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -139,6 +139,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 +- Update to kernel release 5.10.32.1-3 + * Thu May 13 2021 Rachel Menge - 5.10.32.1-2 - Bump release number to match kernel release diff --git a/SPECS/binutils/CVE-2019-12972.patch b/SPECS/binutils/CVE-2019-12972.patch deleted file mode 100644 index fe0993efd29..00000000000 --- a/SPECS/binutils/CVE-2019-12972.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/bfd/elfcode.h -+++ b/bfd/elfcode.h -@@ -755,7 +755,8 @@ - /* A further sanity check. */ - if (i_ehdrp->e_shnum != 0) - { -- if (i_ehdrp->e_shstrndx >= elf_numsections (abfd)) -+ if (i_ehdrp->e_shstrndx >= elf_numsections (abfd) -+ || i_shdrp[i_ehdrp->e_shstrndx].sh_type != SHT_STRTAB) - { - /* PR 2257: - We used to just goto got_wrong_format_error here diff --git a/SPECS/binutils/CVE-2019-14250.patch b/SPECS/binutils/CVE-2019-14250.patch deleted file mode 100644 index 4ee873ac810..00000000000 --- a/SPECS/binutils/CVE-2019-14250.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/libiberty/simple-object-elf.c -+++ b/libiberty/simple-object-elf.c -@@ -548,6 +548,14 @@ - XDELETE (eor); - return NULL; - } -+ -+ if (!eor->shstrndx) -+ { -+ *errmsg = "invalid ELF shstrndx == 0"; -+ *err = 0; -+ XDELETE (eor); -+ return NULL; -+ } - - return (void *) eor; - } diff --git a/SPECS/binutils/CVE-2019-14444.patch b/SPECS/binutils/CVE-2019-14444.patch deleted file mode 100644 index 4647fb9314c..00000000000 --- a/SPECS/binutils/CVE-2019-14444.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -13213,7 +13213,7 @@ - } - - rloc = start + rp->r_offset; -- if ((rloc + reloc_size) > end || (rloc < start)) -+ if (rloc >= end || (rloc + reloc_size) > end || (rloc < start)) - { - warn (_("skipping invalid relocation offset 0x%lx in section %s\n"), - (unsigned long) rp->r_offset, diff --git a/SPECS/binutils/CVE-2019-17450.patch b/SPECS/binutils/CVE-2019-17450.patch deleted file mode 100644 index a0956623966..00000000000 --- a/SPECS/binutils/CVE-2019-17450.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -2803,13 +2803,13 @@ - } - - static bfd_boolean --find_abstract_instance (struct comp_unit * unit, -- bfd_byte * orig_info_ptr, -- struct attribute * attr_ptr, -- const char ** pname, -- bfd_boolean * is_linkage, -- char ** filename_ptr, -- int * linenumber_ptr) -+find_abstract_instance (struct comp_unit *unit, -+ struct attribute *attr_ptr, -+ unsigned int recur_count, -+ const char **pname, -+ bfd_boolean *is_linkage, -+ char **filename_ptr, -+ int *linenumber_ptr) - { - bfd *abfd = unit->abfd; - bfd_byte *info_ptr; -@@ -2820,6 +2820,14 @@ - struct attribute attr; - const char *name = NULL; - -+ if (recur_count == 100) -+ { -+ _bfd_error_handler -+ (_("DWARF error: abstract instance recursion detected")); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ - /* DW_FORM_ref_addr can reference an entry in a different CU. It - is an offset from the .debug_info section, not the current CU. */ - if (attr_ptr->form == DW_FORM_ref_addr) -@@ -2939,15 +2947,6 @@ - info_ptr, info_ptr_end); - if (info_ptr == NULL) - break; -- /* It doesn't ever make sense for DW_AT_specification to -- refer to the same DIE. Stop simple recursion. */ -- if (info_ptr == orig_info_ptr) -- { -- _bfd_error_handler -- (_("DWARF error: abstract instance recursion detected")); -- bfd_set_error (bfd_error_bad_value); -- return FALSE; -- } - switch (attr.name) - { - case DW_AT_name: -@@ -2961,7 +2960,7 @@ - } - break; - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, recur_count + 1, - &name, is_linkage, - filename_ptr, linenumber_ptr)) - return FALSE; -@@ -3175,7 +3174,7 @@ - - case DW_AT_abstract_origin: - case DW_AT_specification: -- if (!find_abstract_instance (unit, info_ptr, &attr, -+ if (!find_abstract_instance (unit, &attr, 0, - &func->name, - &func->is_linkage, - &func->file, diff --git a/SPECS/binutils/CVE-2019-17451.patch b/SPECS/binutils/CVE-2019-17451.patch deleted file mode 100644 index 1afa4c8d0f4..00000000000 --- a/SPECS/binutils/CVE-2019-17451.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/bfd/dwarf2.c -+++ b/bfd/dwarf2.c -@@ -4426,7 +4425,16 @@ - for (total_size = 0; - msec; - msec = find_debug_info (debug_bfd, debug_sections, msec)) -- total_size += msec->size; -+ { -+ /* Catch PR25070 testcase overflowing size calculation here. */ -+ if (total_size + msec->size < total_size -+ || total_size + msec->size < msec->size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return FALSE; -+ } -+ total_size += msec->size; -+ } - - stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size); - if (stash->info_ptr_memory == NULL) diff --git a/SPECS/binutils/CVE-2019-9070.nopatch b/SPECS/binutils/CVE-2019-9070.nopatch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/SPECS/binutils/CVE-2019-9071.patch b/SPECS/binutils/CVE-2019-9071.patch deleted file mode 100644 index 7ccf14066f6..00000000000 --- a/SPECS/binutils/CVE-2019-9071.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/libiberty/cp-demangle.c -+++ b/libiberty/cp-demangle.c -@@ -861,7 +861,7 @@ - int - cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len) - { -- if (p == NULL || s == NULL || len == 0) -+ if (p == NULL || s == NULL || len <= 0) - return 0; - p->d_printing = 0; - p->type = DEMANGLE_COMPONENT_NAME; -@@ -4055,7 +4055,7 @@ - are larger than the actual numbers encountered. */ - - static void --d_count_templates_scopes (int *num_templates, int *num_scopes, -+d_count_templates_scopes (struct d_print_info *dpi, - const struct demangle_component *dc) - { - if (dc == NULL) -@@ -4075,13 +4075,13 @@ - break; - - case DEMANGLE_COMPONENT_TEMPLATE: -- (*num_templates)++; -+ dpi->num_copy_templates++; - goto recurse_left_right; - - case DEMANGLE_COMPONENT_REFERENCE: - case DEMANGLE_COMPONENT_RVALUE_REFERENCE: - if (d_left (dc)->type == DEMANGLE_COMPONENT_TEMPLATE_PARAM) -- (*num_scopes)++; -+ dpi->num_saved_scopes++; - goto recurse_left_right; - - case DEMANGLE_COMPONENT_QUAL_NAME: -@@ -4146,42 +4146,42 @@ - case DEMANGLE_COMPONENT_TAGGED_NAME: - case DEMANGLE_COMPONENT_CLONE: - recurse_left_right: -- d_count_templates_scopes (num_templates, num_scopes, -- d_left (dc)); -- d_count_templates_scopes (num_templates, num_scopes, -- d_right (dc)); -+ /* PR 89394 - Check for too much recursion. */ -+ if (dpi->recursion > DEMANGLE_RECURSION_LIMIT) -+ /* FIXME: There ought to be a way to report to the -+ user that the recursion limit has been reached. */ -+ return; -+ -+ ++ dpi->recursion; -+ d_count_templates_scopes (dpi, d_left (dc)); -+ d_count_templates_scopes (dpi, d_right (dc)); -+ -- dpi->recursion; - break; - - case DEMANGLE_COMPONENT_CTOR: -- d_count_templates_scopes (num_templates, num_scopes, -- dc->u.s_ctor.name); -+ d_count_templates_scopes (dpi, dc->u.s_ctor.name); - break; - - case DEMANGLE_COMPONENT_DTOR: -- d_count_templates_scopes (num_templates, num_scopes, -- dc->u.s_dtor.name); -+ d_count_templates_scopes (dpi, dc->u.s_dtor.name); - break; - - case DEMANGLE_COMPONENT_EXTENDED_OPERATOR: -- d_count_templates_scopes (num_templates, num_scopes, -- dc->u.s_extended_operator.name); -+ d_count_templates_scopes (dpi, dc->u.s_extended_operator.name); - break; - - case DEMANGLE_COMPONENT_FIXED_TYPE: -- d_count_templates_scopes (num_templates, num_scopes, -- dc->u.s_fixed.length); -+ d_count_templates_scopes (dpi, dc->u.s_fixed.length); - break; - - case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS: - case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS: -- d_count_templates_scopes (num_templates, num_scopes, -- d_left (dc)); -+ d_count_templates_scopes (dpi, d_left (dc)); - break; - - case DEMANGLE_COMPONENT_LAMBDA: - case DEMANGLE_COMPONENT_DEFAULT_ARG: -- d_count_templates_scopes (num_templates, num_scopes, -- dc->u.s_unary_num.sub); -+ d_count_templates_scopes (dpi, dc->u.s_unary_num.sub); - break; - } - } -@@ -4216,8 +4216,12 @@ - dpi->next_copy_template = 0; - dpi->num_copy_templates = 0; - -- d_count_templates_scopes (&dpi->num_copy_templates, -- &dpi->num_saved_scopes, dc); -+ d_count_templates_scopes (dpi, dc); -+ /* If we did not reach the recursion limit, then reset the -+ current recursion value back to 0, so that we can print -+ the templates. */ -+ if (dpi->recursion < DEMANGLE_RECURSION_LIMIT) -+ dpi->recursion = 0; - dpi->num_copy_templates *= dpi->num_saved_scopes; - - dpi->current_template = NULL; diff --git a/SPECS/binutils/CVE-2019-9072.nopatch b/SPECS/binutils/CVE-2019-9072.nopatch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/SPECS/binutils/CVE-2019-9073.patch b/SPECS/binutils/CVE-2019-9073.patch deleted file mode 100644 index 0d44fe81a6e..00000000000 --- a/SPECS/binutils/CVE-2019-9073.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/binutils/objdump.c -+++ b/binutils/objdump.c -@@ -3178,7 +3178,9 @@ - static void - dump_bfd_private_header (bfd *abfd) - { -- bfd_print_private_bfd_data (abfd, stdout); -+ if (!bfd_print_private_bfd_data (abfd, stdout)) -+ non_fatal (_("warning: private headers incomplete: %s"), -+ bfd_errmsg (bfd_get_error ())); - } - - static void diff --git a/SPECS/binutils/CVE-2019-9074.patch b/SPECS/binutils/CVE-2019-9074.patch deleted file mode 100644 index 721b72a474a..00000000000 --- a/SPECS/binutils/CVE-2019-9074.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/bfd/pei-x86_64.c -+++ b/bfd/pei-x86_64.c -@@ -541,7 +541,7 @@ - /* virt_size might be zero for objects. */ - if (stop == 0 && strcmp (abfd->xvec->name, "pe-x86-64") == 0) - { -- stop = (datasize / onaline) * onaline; -+ stop = datasize; - virt_size_is_zero = TRUE; - } - else if (datasize < stop) -@@ -551,8 +551,8 @@ - _("Warning: %s section size (%ld) is smaller than virtual size (%ld)\n"), - pdata_section->name, (unsigned long) datasize, - (unsigned long) stop); -- /* Be sure not to read passed datasize. */ -- stop = datasize / onaline; -+ /* Be sure not to read past datasize. */ -+ stop = datasize; - } - - /* Display functions table. */ -@@ -724,8 +724,7 @@ - altent += imagebase; - - if (altent >= pdata_vma -- && (altent + PDATA_ROW_SIZE <= pdata_vma -- + pei_section_data (abfd, pdata_section)->virt_size)) -+ && altent - pdata_vma + PDATA_ROW_SIZE <= stop) - { - pex64_get_runtime_function - (abfd, &arf, &pdata[altent - pdata_vma]); - diff --git a/SPECS/binutils/CVE-2019-9075.patch b/SPECS/binutils/CVE-2019-9075.patch deleted file mode 100644 index ac3c68f5a44..00000000000 --- a/SPECS/binutils/CVE-2019-9075.patch +++ /dev/null @@ -1,89 +0,0 @@ -Patch for CVE-2019-9075. -Adapted from upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8abac8031ed369a2734b1cdb7df28a39a54b4b49 ---- a/bfd/ChangeLog -+++ b/bfd/ChangeLog -@@ -1,3 +1,13 @@ -+2019-02-20 Alan Modra -+ -+ PR 24236 -+ * archive64.c (_bfd_archive_64_bit_slurp_armap): Move code adding -+ sentinel NUL to string buffer nearer to loop where it is used. -+ Don't go past sentinel when scanning strings, and don't write -+ NUL again. -+ * archive.c (do_slurp_coff_armap): Simplify string handling to -+ archive64.c style. -+ - 2019-02-02 Nick Clifton - - 2.32 Release ---- a/bfd/archive.c -+++ b/bfd/archive.c -@@ -1012,6 +1012,7 @@ do_slurp_coff_armap (bfd *abfd) - int *raw_armap, *rawptr; - struct artdata *ardata = bfd_ardata (abfd); - char *stringbase; -+ char *stringend; - bfd_size_type stringsize; - bfd_size_type parsed_size; - carsym *carsyms; -@@ -1071,22 +1072,18 @@ do_slurp_coff_armap (bfd *abfd) - } - - /* OK, build the carsyms. */ -- for (i = 0; i < nsymz && stringsize > 0; i++) -+ stringend = stringbase + stringsize; -+ *stringend = 0; -+ for (i = 0; i < nsymz; i++) - { -- bfd_size_type len; -- - rawptr = raw_armap + i; - carsyms->file_offset = swap ((bfd_byte *) rawptr); - carsyms->name = stringbase; -- /* PR 17512: file: 4a1d50c1. */ -- len = strnlen (stringbase, stringsize); -- if (len < stringsize) -- len ++; -- stringbase += len; -- stringsize -= len; -+ stringbase += strlen (stringbase); -+ if (stringbase != stringend) -+ ++stringbase; - carsyms++; - } -- *stringbase = 0; - - ardata->symdef_count = nsymz; - ardata->first_file_filepos = bfd_tell (abfd); ---- a/bfd/archive64.c -+++ b/bfd/archive64.c -@@ -100,8 +100,6 @@ - return FALSE; - carsyms = ardata->symdefs; - stringbase = ((char *) ardata->symdefs) + carsym_size; -- stringbase[stringsize] = 0; -- stringend = stringbase + stringsize; - - raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize); - if (raw_armap == NULL) -@@ -115,15 +113,17 @@ - goto release_raw_armap; - } - -+ stringend = stringbase + stringsize; -+ *stringend = 0; - for (i = 0; i < nsymz; i++) - { - carsyms->file_offset = bfd_getb64 (raw_armap + i * 8); - carsyms->name = stringbase; -- if (stringbase < stringend) -- stringbase += strlen (stringbase) + 1; -+ stringbase += strlen (stringbase); -+ if (stringbase != stringend) -+ ++stringbase; - ++carsyms; - } -- *stringbase = '\0'; - - ardata->symdef_count = nsymz; - ardata->first_file_filepos = bfd_tell (abfd); diff --git a/SPECS/binutils/CVE-2019-9076.nopatch b/SPECS/binutils/CVE-2019-9076.nopatch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/SPECS/binutils/CVE-2019-9077.patch b/SPECS/binutils/CVE-2019-9077.patch deleted file mode 100644 index 3ce89409384..00000000000 --- a/SPECS/binutils/CVE-2019-9077.patch +++ /dev/null @@ -1,29 +0,0 @@ -Patch for CVE-2019.9077. -Adapted from: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7fc0c668f2aceb8582d74db1ad2528e2bba8a921 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,9 @@ -+2019-02-20 Nick Clifton -+ -+ PR 24243 -+ * readelf.c (process_mips_specific): Check for an options section -+ that is too small to even contain a single option. -+ - 2018-06-24 Nick Clifton - - 2.32 branch created. ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -16178,6 +16178,12 @@ - error (_("No MIPS_OPTIONS header found\n")); - return FALSE; - } -+ /* PR 24243 */ -+ if (sect->sh_size < sizeof (* eopt)) -+ { -+ error (_("The MIPS options section is too small.\n")); -+ return FALSE; -+ } - - eopt = (Elf_External_Options *) get_data (NULL, filedata, options_offset, 1, - sect->sh_size, _("options")); diff --git a/SPECS/binutils/CVE-2020-35493.patch b/SPECS/binutils/CVE-2020-35493.patch deleted file mode 100644 index 89ba10192f4..00000000000 --- a/SPECS/binutils/CVE-2020-35493.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f2a3559d54602cecfec6d90f792be4a70ad918ab Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Fri, 3 Jan 2020 16:17:53 +0000 -Subject: [PATCH] Fix potential illegal memory access when parsing a corrupt - PEF format file. - - PR 25307 - (bfd_pef_parse_function_stubs): Correct the test that ensures that - there is enough data remaining in the code buffer before - attempting to read a function stub. ---- - bfd/pef.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/bfd/pef.c b/bfd/pef.c -index 726b8d7493..574d9bcb5d 100644 ---- a/bfd/pef.c -+++ b/bfd/pef.c -@@ -806,7 +806,7 @@ bfd_pef_parse_function_stubs (bfd *abfd, - codepos += 4; - } - -- if ((codepos + 4) > codelen) -+ if ((codepos + 24) > codelen) - break; - - ret = bfd_pef_parse_function_stub (abfd, codebuf + codepos, 24, &sym_index); --- -2.25.1 - diff --git a/SPECS/binutils/CVE-2020-35494-helper.patch b/SPECS/binutils/CVE-2020-35494-helper.patch deleted file mode 100644 index 6a7b1981395..00000000000 --- a/SPECS/binutils/CVE-2020-35494-helper.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8c5e259235a4e4546910245b170de1e29a711034 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Sun, 29 Dec 2019 12:56:29 +1030 -Subject: [PATCH] Usage of unitialized heap in tic4x_print_cond - - PR 25319 - * tic4x-dis.c (tic4x_print_cond): Init all of condtable. ---- - opcodes/tic4x-dis.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c -index d9f95c9410..01cfa1e060 100644 ---- a/opcodes/tic4x-dis.c -+++ b/opcodes/tic4x-dis.c -@@ -277,7 +277,7 @@ tic4x_print_cond (struct disassemble_info *info, unsigned int cond) - - if (condtable == NULL) - { -- condtable = xmalloc (sizeof (tic4x_cond_t *) * 32); -+ condtable = xcalloc (sizeof (tic4x_cond_t *), 32); - for (i = 0; i < tic4x_num_conds; i++) - condtable[tic4x_conds[i].cond] = (tic4x_cond_t *)(tic4x_conds + i); - } --- -2.25.1 - diff --git a/SPECS/binutils/CVE-2020-35494.patch b/SPECS/binutils/CVE-2020-35494.patch deleted file mode 100644 index 493f40d26dd..00000000000 --- a/SPECS/binutils/CVE-2020-35494.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2c5b6e1a1c406cbe06e2d6f77861764ebd01b9ce Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Mon, 30 Dec 2019 09:19:25 +1030 -Subject: [PATCH] Re: Usage of unitialized heap in tic4x_print_cond - - PR 25319 - * tic4x-dis.c (tic4x_print_cond): Correct order of xcalloc args. ---- - opcodes/tic4x-dis.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c -index 01cfa1e060..e058fdc9f8 100644 ---- a/opcodes/tic4x-dis.c -+++ b/opcodes/tic4x-dis.c -@@ -277,7 +277,7 @@ tic4x_print_cond (struct disassemble_info *info, unsigned int cond) - - if (condtable == NULL) - { -- condtable = xcalloc (sizeof (tic4x_cond_t *), 32); -+ condtable = xcalloc (32, sizeof (tic4x_cond_t *)); - for (i = 0; i < tic4x_num_conds; i++) - condtable[tic4x_conds[i].cond] = (tic4x_cond_t *)(tic4x_conds + i); - } --- -2.25.1 - diff --git a/SPECS/binutils/CVE-2020-35495.patch b/SPECS/binutils/CVE-2020-35495.patch deleted file mode 100644 index e9e1effdeee..00000000000 --- a/SPECS/binutils/CVE-2020-35495.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 7a0fb7be96e0ce79e1ae429bc1ba913e5244d537 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Fri, 3 Jan 2020 14:41:02 +0000 -Subject: [PATCH] Fix potential illegal memory access failures in the BFD - library by ensuring that the return value from bfd_malloc() is checked before - it is used. - - PR 25308 - * elf-properties.c (_bfd_elf_convert_gnu_properties): Check the - return value from bfd_malloc. - * elf32-arm.c (bfd_elf32_arm_vfp11_fix_veneer_locations): Likewise. - (bfd_elf32_arm_stm32l4xx_fix_veneer_locations): Likewise. - (elf32_arm_filter_cmse_symbols): Likewise. - (elf32_arm_write_section): Likewise. - * mach-o.c (bfd_mach_o_core_fetch_environment): Likewise. - (bfd_mach_o_follow_dsym): Likewise. - * pef.c (bfd_pef_print_loader_section): Likewise. - (bfd_pef_scan_start_address): Likewise. - (bfd_pef_parse_function_stubs): Likewise. - (bfd_pef_parse_symbols): Likewise. ---- - bfd/elf-properties.c | 2 ++ - bfd/elf32-arm.c | 11 ++++++----- - bfd/mach-o.c | 7 +++++++ - bfd/pef.c | 11 +++++++++++ - 4 files changed, 26 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c -index a42abc44dd..76ddad6037 100644 ---- a/bfd/elf-properties.c -+++ b/bfd/elf-properties.c -@@ -703,6 +703,8 @@ _bfd_elf_convert_gnu_properties (bfd *ibfd, asection *isec, - if (size > bfd_get_section_size (isec)) - { - contents = (bfd_byte *) bfd_malloc (size); -+ if (contents == NULL) -+ return FALSE; - free (*ptr); - *ptr = contents; - } -diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c -index ae8a269426..2bf355a331 100644 ---- a/bfd/elf32-arm.c -+++ b/bfd/elf32-arm.c -@@ -7148,7 +7148,6 @@ find_arm_glue (struct bfd_link_info *link_info, - - tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name) - + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1); -- - BFD_ASSERT (tmp_name); - - sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name); -@@ -7323,7 +7322,6 @@ record_arm_to_thumb_glue (struct bfd_link_info * link_info, - - tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name) - + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1); -- - BFD_ASSERT (tmp_name); - - sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name); -@@ -7401,7 +7399,6 @@ record_arm_bx_glue (struct bfd_link_info * link_info, int reg) - /* Add symbol for veneer. */ - tmp_name = (char *) - bfd_malloc ((bfd_size_type) strlen (ARM_BX_GLUE_ENTRY_NAME) + 1); -- - BFD_ASSERT (tmp_name); - - sprintf (tmp_name, ARM_BX_GLUE_ENTRY_NAME, reg); -@@ -7493,7 +7490,6 @@ record_vfp11_erratum_veneer (struct bfd_link_info *link_info, - - tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen - (VFP11_ERRATUM_VENEER_ENTRY_NAME) + 10); -- - BFD_ASSERT (tmp_name); - - sprintf (tmp_name, VFP11_ERRATUM_VENEER_ENTRY_NAME, -@@ -7613,7 +7609,6 @@ record_stm32l4xx_erratum_veneer (struct bfd_link_info *link_info, - - tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen - (STM32L4XX_ERRATUM_VENEER_ENTRY_NAME) + 10); -- - BFD_ASSERT (tmp_name); - - sprintf (tmp_name, STM32L4XX_ERRATUM_VENEER_ENTRY_NAME, -@@ -8644,6 +8639,7 @@ bfd_elf32_arm_vfp11_fix_veneer_locations (bfd *abfd, - - tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen - (VFP11_ERRATUM_VENEER_ENTRY_NAME) + 10); -+ BFD_ASSERT (tmp_name); - - for (sec = abfd->sections; sec != NULL; sec = sec->next) - { -@@ -8731,6 +8727,7 @@ bfd_elf32_arm_stm32l4xx_fix_veneer_locations (bfd *abfd, - - tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen - (STM32L4XX_ERRATUM_VENEER_ENTRY_NAME) + 10); -+ BFD_ASSERT (tmp_name); - - for (sec = abfd->sections; sec != NULL; sec = sec->next) - { -@@ -18505,6 +18502,8 @@ elf32_arm_filter_cmse_symbols (bfd *abfd ATTRIBUTE_UNUSED, - - maxnamelen = 128; - cmse_name = (char *) bfd_malloc (maxnamelen); -+ BFD_ASSERT (cmse_name); -+ - for (src_count = 0; src_count < symcount; src_count++) - { - struct elf32_arm_link_hash_entry *cmse_hash; -@@ -19700,6 +19699,8 @@ elf32_arm_write_section (bfd *output_bfd, - unsigned int in_index, out_index; - bfd_vma add_to_offsets = 0; - -+ if (edited_contents == NULL) -+ return FALSE; - for (in_index = 0, out_index = 0; in_index * 8 < input_size || edit_node;) - { - if (edit_node) -diff --git a/bfd/mach-o.c b/bfd/mach-o.c -index b494a77690..3b6fbb5788 100644 ---- a/bfd/mach-o.c -+++ b/bfd/mach-o.c -@@ -5752,6 +5752,8 @@ bfd_mach_o_core_fetch_environment (bfd *abfd, - unsigned char *buf = bfd_malloc (1024); - unsigned long size = 1024; - -+ if (buf == NULL) -+ return -1; - for (;;) - { - bfd_size_type nread = 0; -@@ -5797,6 +5799,8 @@ bfd_mach_o_core_fetch_environment (bfd *abfd, - bottom = seg->fileoff + seg->filesize - offset; - top = seg->fileoff + seg->filesize - 4; - *rbuf = bfd_malloc (top - bottom); -+ if (*rbuf == NULL) -+ return -1; - *rlen = top - bottom; - - memcpy (*rbuf, buf + size - *rlen, *rlen); -@@ -5941,6 +5945,9 @@ bfd_mach_o_follow_dsym (bfd *abfd) - dsym_filename = (char *)bfd_malloc (strlen (base_bfd->filename) - + strlen (dsym_subdir) + 1 - + strlen (base_basename) + 1); -+ if (dsym_filename == NULL) -+ return NULL; -+ - sprintf (dsym_filename, "%s%s/%s", - base_bfd->filename, dsym_subdir, base_basename); - -diff --git a/bfd/pef.c b/bfd/pef.c -index d88fed7138..726b8d7493 100644 ---- a/bfd/pef.c -+++ b/bfd/pef.c -@@ -447,6 +447,8 @@ bfd_pef_print_loader_section (bfd *abfd, FILE *file) - - loaderlen = loadersec->size; - loaderbuf = bfd_malloc (loaderlen); -+ if (loaderbuf == NULL) -+ return -1; - - if (bfd_seek (abfd, loadersec->filepos, SEEK_SET) < 0 - || bfd_bread ((void *) loaderbuf, loaderlen, abfd) != loaderlen -@@ -478,6 +480,9 @@ bfd_pef_scan_start_address (bfd *abfd) - - loaderlen = loadersec->size; - loaderbuf = bfd_malloc (loaderlen); -+ if (loaderbuf == NULL) -+ goto end; -+ - if (bfd_seek (abfd, loadersec->filepos, SEEK_SET) < 0) - goto error; - if (bfd_bread ((void *) loaderbuf, loaderlen, abfd) != loaderlen) -@@ -753,6 +758,8 @@ bfd_pef_parse_function_stubs (bfd *abfd, - (header.imported_library_count * sizeof (bfd_pef_imported_library)); - imports = bfd_malloc - (header.total_imported_symbol_count * sizeof (bfd_pef_imported_symbol)); -+ if (libraries == NULL || imports == NULL) -+ goto error; - - if (loaderlen < (56 + (header.imported_library_count * 24))) - goto error; -@@ -897,6 +904,8 @@ bfd_pef_parse_symbols (bfd *abfd, asymbol **csym) - { - codelen = codesec->size; - codebuf = bfd_malloc (codelen); -+ if (codebuf == NULL) -+ goto end; - if (bfd_seek (abfd, codesec->filepos, SEEK_SET) < 0) - goto end; - if (bfd_bread ((void *) codebuf, codelen, abfd) != codelen) -@@ -908,6 +917,8 @@ bfd_pef_parse_symbols (bfd *abfd, asymbol **csym) - { - loaderlen = loadersec->size; - loaderbuf = bfd_malloc (loaderlen); -+ if (loaderbuf == NULL) -+ goto end; - if (bfd_seek (abfd, loadersec->filepos, SEEK_SET) < 0) - goto end; - if (bfd_bread ((void *) loaderbuf, loaderlen, abfd) != loaderlen) --- -2.25.1 - diff --git a/SPECS/binutils/CVE-2020-35496.nopatch b/SPECS/binutils/CVE-2020-35496.nopatch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/SPECS/binutils/CVE-2020-35507.nopatch b/SPECS/binutils/CVE-2020-35507.nopatch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/SPECS/binutils/binutils.signatures.json b/SPECS/binutils/binutils.signatures.json index af06521de05..8328d60773b 100644 --- a/SPECS/binutils/binutils.signatures.json +++ b/SPECS/binutils/binutils.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "binutils-2.32.tar.xz": "0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04" + "binutils-2.36.1.tar.xz": "e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0" } } \ No newline at end of file diff --git a/SPECS/binutils/binutils.spec b/SPECS/binutils/binutils.spec index 4d78289bcd0..be6440cead9 100644 --- a/SPECS/binutils/binutils.spec +++ b/SPECS/binutils/binutils.spec @@ -1,36 +1,13 @@ Summary: Contains a linker, an assembler, and other tools Name: binutils -Version: 2.32 -Release: 5%{?dist} +Version: 2.36.1 +Release: 1%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/Base URL: https://www.gnu.org/software/binutils Source0: https://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.xz -Patch0: CVE-2019-9070.nopatch -Patch1: CVE-2019-9075.patch -Patch2: CVE-2019-9077.patch -Patch3: CVE-2019-12972.patch -Patch4: CVE-2019-14250.patch -Patch5: CVE-2019-14444.patch -Patch6: CVE-2019-9071.patch -# Binutils commmunity does not consider this a bug -Patch7: CVE-2019-9072.nopatch -Patch8: CVE-2019-9073.patch -Patch9: CVE-2019-9074.patch -# Binutils community does not consider this a bug -Patch10: CVE-2019-9076.nopatch -Patch11: CVE-2019-17450.patch -Patch12: CVE-2019-17451.patch -Patch13: CVE-2020-35493.patch -Patch14: CVE-2020-35494-helper.patch -Patch15: CVE-2020-35494.patch -Patch16: CVE-2020-35495.patch -# Fix is included in CVE-2020-35495.patch. -Patch17: CVE-2020-35496.nopatch -# Fix is included in CVE-2020-35495.patch. -Patch18: CVE-2020-35507.nopatch %description The Binutils package contains a linker, an assembler, @@ -124,19 +101,33 @@ make %{?_smp_mflags} check %{_includedir}/dis-asm.h %{_includedir}/bfd_stdint.h %{_includedir}/diagnostics.h +%{_includedir}/ctf-api.h +%{_includedir}/ctf.h %{_libdir}/libbfd.a %{_libdir}/libopcodes.a %{_libdir}/libbfd.so %{_libdir}/libopcodes.so +%{_libdir}/bfd-plugins/libdep.so +%{_libdir}/libctf-nobfd.a +%{_libdir}/libctf-nobfd.so +%{_libdir}/libctf-nobfd.so.0 +%{_libdir}/libctf-nobfd.so.0.* +%{_libdir}/libctf.a +%{_libdir}/libctf.so +%{_libdir}/libctf.so.0 +%{_libdir}/libctf.so.0.* %changelog -* Mon Jan 11 2021 Emre Girgin - 2.32-5 -- Update URL and Source0 to use https. -- Fix CVE-2020-35493. -- Fix CVE-2020-35494. -- Fix CVE-2020-35495. -- Fix CVE-2020-35496. -- Fix CVE-2020-35507. +* Tue May 11 2021 Andrew Phelps 2.36.1-1 +- Update to version 2.36.1 + +* Mon Jan 11 2021 Emre Girgin 2.32-5 +- Update URL and Source0 to use https. +- Fix CVE-2020-35493. +- Fix CVE-2020-35494. +- Fix CVE-2020-35495. +- Fix CVE-2020-35496. +- Fix CVE-2020-35507. * Thu Oct 22 2020 Nicolas Ontiveros 2.32-4 - Use autosetup diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index b12846beeae..0e8fe3f56f3 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,13 +1,13 @@ Summary: Linux API header files Name: kernel-headers Version: 5.10.32.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel -#Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%{version}.tar.gz +#Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%%{version}.tar.gz Source0: kernel-%{version}.tar.gz BuildArch: noarch @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 +- Bump release number to match kernel release + * Thu May 13 2021 Rachel Menge - 5.10.32.1-2 - Bump release number to match kernel release diff --git a/SPECS/kernel-hyperv/config b/SPECS/kernel-hyperv/config index cc68f923400..497140c69e3 100644 --- a/SPECS/kernel-hyperv/config +++ b/SPECS/kernel-hyperv/config @@ -5,7 +5,7 @@ CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 -CONFIG_LD_VERSION=232000000 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y diff --git a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json index f52f149a5be..e19eb36cab9 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json +++ b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "config": "fb6e6d4ca0e02061b4df0f6790d15852f0f54d544c8766c7b35e0b0a0ec89c27", + "config": "8d6fcdec2063b54c4e979c2170805fbab522bbdb9ac6d5940eb9ded088a2c2eb", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index 7cce642e566..57ab1c2e4a1 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.10.32.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -141,18 +141,6 @@ install -vdm 755 %{buildroot}%{_prefix}/src/linux-headers-%{uname_r} install -vdm 755 %{buildroot}%{_lib}/debug/lib/modules/%{uname_r} make INSTALL_MOD_PATH=%{buildroot} modules_install -# Verify for build-id match -# We observe different IDs sometimes -# TODO: debug it -ID1=`readelf -n vmlinux | grep "Build ID"` -./scripts/extract-vmlinux arch/x86/boot/bzImage > extracted-vmlinux -ID2=`readelf -n extracted-vmlinux | grep "Build ID"` -if [ "$ID1" != "$ID2" ] ; then - echo "Build IDs do not match" - echo $ID1 - echo $ID2 - exit 1 -fi install -vm 600 arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-%{uname_r} # Restrict the permission on System.map-X file @@ -274,6 +262,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 +- Update CONFIG_LD_VERSION for binutils 2.36.1 +- Remove build-id match check + * Thu May 13 2021 Rachel Menge - 5.10.32.1-2 - Bump release number to match kernel release diff --git a/SPECS/kernel/config b/SPECS/kernel/config index feef1da7e9d..2b327cf167f 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -5,7 +5,7 @@ CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 -CONFIG_LD_VERSION=232000000 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index 048aceafa9e..0380a2379f5 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -5,7 +5,7 @@ CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=90100 -CONFIG_LD_VERSION=232000000 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index dd12a345023..ad0eb99bcbe 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { - "config": "774cfaea0547b798d8a0653d27010728497a97726df372b1f258ff592799d653", - "config_aarch64": "d08c55887bcd542ba63b7722dddd8d0734d419b812af4f1ed77b08a0c93e3b72", + "config": "24b55a258faf50ade68096d2c720cd475b1835704f32c1d059b80d5f12902aff", + "config_aarch64": "34574d361235d37f98b4b0cb50941ca22351cb8112da2e26c977aff83d788304", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 06fdba6e6be..12dfa4cf56c 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel Name: kernel Version: 5.10.32.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -325,18 +325,6 @@ install -vdm 755 %{buildroot}%{_lib}/debug/lib/modules/%{uname_r} make INSTALL_MOD_PATH=%{buildroot} modules_install %ifarch x86_64 -# Verify for build-id match -# We observe different IDs sometimes -# TODO: debug it -ID1=`readelf -n vmlinux | grep "Build ID"` -./scripts/extract-vmlinux arch/x86/boot/bzImage > extracted-vmlinux -ID2=`readelf -n extracted-vmlinux | grep "Build ID"` -if [ "$ID1" != "$ID2" ] ; then - echo "Build IDs do not match" - echo $ID1 - echo $ID2 - exit 1 -fi install -vm 600 arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-%{uname_r} %endif @@ -500,6 +488,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 +- Update CONFIG_LD_VERSION for binutils 2.36.1 +- Remove build-id match check + * Thu May 13 2021 Rachel Menge - 5.10.32.1-2 - Add CONFIG_AS_HAS_LSE_ATOMICS=y diff --git a/SPECS/kexec-tools/kexec-tools.signatures.json b/SPECS/kexec-tools/kexec-tools.signatures.json index f26a6317c35..13c6237707c 100644 --- a/SPECS/kexec-tools/kexec-tools.signatures.json +++ b/SPECS/kexec-tools/kexec-tools.signatures.json @@ -12,7 +12,7 @@ "dracut-module-setup.sh": "437b0b82c27d7a96d3baf847aaf33f7ca824676193d783619e938417c9d866ec", "dracut-monitor_dd_progress": "2e343a54c032f6af0d5f7b5fb49f2d90057b2a234625fe7ee6c1afb21cb5c435", "early-kdump-howto.txt": "984d51f3d9e7f2f858ef153418190c470bf20ee702c97fe34285c6d05078999c", - "eppic-d84c354.tar.gz": "115592c5feeaa32846442a00dd91196e19a2717009a5dcf661fcc25ee89ae364", + "eppic-e8844d3.tar.gz": "5bf3fce09fc880a96cbc0cbb3eadcae1892d7fd43350a585f150b1cce176b128", "fadump-howto.txt": "b9090c3e0e26b6124a0c8b0c79a7adf10637c9bbc34e0a59529e3f1b66c074f0", "kdump-dep-generator.sh": "f660e26df9c4843340093a294bcd41a68a71cea48314b5d1a3553bba5038bbbc", "kdump-in-cluster-environment.txt": "50784977e2c3a425ae00de4831f9fd4fb4a04574db1a72b9b28f7c0979a52564", diff --git a/SPECS/kexec-tools/kexec-tools.spec b/SPECS/kexec-tools/kexec-tools.spec index e1e3b399c4c..da02d96929e 100644 --- a/SPECS/kexec-tools/kexec-tools.spec +++ b/SPECS/kexec-tools/kexec-tools.spec @@ -1,15 +1,17 @@ -%global eppic_ver d84c3541035d95077aa8571f5d5c3e07c6ef510b +%global eppic_ver e8844d3793471163ae4a56d8f95897be9e5bd554 # First 7 digits from ^ -%global eppic_shortver d84c354 +%global eppic_shortver e8844d3 %global mkdf_ver 1.6.8 +Summary: The kexec/kdump userspace component Name: kexec-tools Version: 2.0.21 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 -Summary: The kexec/kdump userspace component Vendor: Microsoft Corporation Distribution: Mariner +Group: Development/Tools +URL: https://github.com/horms/kexec-tools Source0: http://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz Source1: kdumpctl @@ -322,6 +324,9 @@ done /usr/share/makedumpfile/ %changelog +* Tue May 11 2021 Andrew Phelps 2.0.21-2 +- Update eppic version for compatibility with binutils 2.36.1 +- Add Group and URL * Tue Feb 23 2021 Andrew Phelps 2.0.21-1 - Update version to 2.0.21 - Add patches for makedumpfile to support new printk in 5.10 kernel diff --git a/SPECS/qemu-kvm/qemu-kvm.spec b/SPECS/qemu-kvm/qemu-kvm.spec index db71a369697..78389df851b 100644 --- a/SPECS/qemu-kvm/qemu-kvm.spec +++ b/SPECS/qemu-kvm/qemu-kvm.spec @@ -1,7 +1,7 @@ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 4.2.0 -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2 AND GPLv2+ AND CC-BY AND BSD Vendor: Microsoft Corporation Distribution: Mariner @@ -110,6 +110,9 @@ This package provides a command line tool for manipulating disk images. %patch33 -p1 %patch34 -p1 +# Remove invalid flag exposed by binutils 2.36.1 +sed -i "/LDFLAGS_NOPIE/d" configure + %build %ifarch aarch64 @@ -205,6 +208,9 @@ fi %{_bindir}/qemu-nbd %changelog +* Tue May 11 2021 Andrew Phelps - 4.2.0-30 +- Remove LDFLAGS_NOPIE to compile with binutils 2.36.1 + * Wed Apr 07 2021 Neha Agarwal - 4.2.0-29 - Patch CVE-2021-3392 and CVE-2021-3409. diff --git a/SPECS/tboot/no_error_packed_member.patch b/SPECS/tboot/no_error_packed_member.patch deleted file mode 100644 index fe8f14bd5a1..00000000000 --- a/SPECS/tboot/no_error_packed_member.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tboot-1.9.7/Config.mk 2020-03-24 22:12:28.096834349 +0000 -+++ tboot-1.9.7/Config.mk 2020-03-24 22:12:51.324779226 +0000 -@@ -43,7 +43,7 @@ - -Wextra -Winit-self -Wswitch-default -Wunused-parameter \ - -Wwrite-strings \ - $(call cc-option,$(CC),-Wlogical-op,) \ -- -Wno-missing-field-initializers -+ -Wno-missing-field-initializers -Wno-address-of-packed-member - - AS = as - LD = ld diff --git a/SPECS/tboot/tboot.signatures.json b/SPECS/tboot/tboot.signatures.json index 68cd0eecbbd..af1de344a58 100644 --- a/SPECS/tboot/tboot.signatures.json +++ b/SPECS/tboot/tboot.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "tboot-1.9.7.tar.gz": "7cfd83e37e3c010a92d6bbf0fe3697736c6cb7397395699642f50b2e3eb2ebab" + "tboot-1.9.12.tar.gz": "007212deacab8eb159d71449766f9b2e0523439f1c4fd64d1932eb38cb60e053" } } \ No newline at end of file diff --git a/SPECS/tboot/tboot.spec b/SPECS/tboot/tboot.spec index 8c289e1d839..619d90fc449 100644 --- a/SPECS/tboot/tboot.spec +++ b/SPECS/tboot/tboot.spec @@ -1,18 +1,17 @@ -Summary: Trusted pre-kernel module and tools. -Name: tboot -Version: 1.9.7 -Release: 7%{?dist} -License: BSD -URL: https://sourceforge.net/projects/tboot/ -Group: System Environment/Security +Summary: Trusted pre-kernel module and tools. +Name: tboot +Version: 1.9.12 +Release: 1%{?dist} +License: BSD Vendor: Microsoft Corporation Distribution: Mariner -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -ExclusiveArch: x86_64 -BuildRequires: trousers-devel -Requires: libtspi +Group: System Environment/Security +URL: https://sourceforge.net/projects/tboot/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +BuildRequires: trousers-devel +Requires: libtspi +ExclusiveArch: x86_64 -Patch0: no_error_packed_member.patch %description Trusted Boot (tboot) is an open source, pre- kernel/VMM module that uses Intel(R) Trusted Execution Technology (Intel(R) TXT) to perform a measured @@ -20,10 +19,9 @@ and verified launch of an OS kernel/VMM. %prep %setup -q -%patch0 -p1 %build -CFLAGS="%{optflags}" +CFLAGS="%{optflags} -Wno-error=implicit-fallthrough= " export CFLAGS make debug=y %{?_smp_mflags} @@ -40,9 +38,10 @@ make debug=y DESTDIR=%{buildroot} install %exclude %{_sysconfdir} %changelog -* Sat May 09 00:20:59 PST 2020 Nick Samson - 1.9.7-7 -- Added %%license line automatically - +* Tue May 11 2021 Andrew Phelps 1.9.12-1 +- Update to version 1.9.12 for binutils 2.36.1 compatibility +* Sat May 09 2020 Nick Samson 1.9.7-7 +- Added %%license line automatically * Mon May 04 2020 Emre Girgin 1.9.7-6 - Replace BuildArch with ExclusiveArch * Tue Mar 24 2020 Henry Beberman 1.9.7-5 diff --git a/cgmanifest.json b/cgmanifest.json index 84c74d6c70e..6a4405377c1 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -325,8 +325,8 @@ "type": "other", "other": { "name": "binutils", - "version": "2.32", - "downloadUrl": "http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz" + "version": "2.36.1", + "downloadUrl": "http://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz" } } }, @@ -1110,6 +1110,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "eppic", + "version": "e8844d3793471163ae4a56d8f95897be9e5bd554", + "downloadUrl": "https://github.com/lucchouina/eppic/archive/e8844d3793471163ae4a56d8f95897be9e5bd554/eppic-e8844d3.tar.gz" + } + } + }, { "component": { "type": "other", @@ -6755,8 +6765,8 @@ "type": "other", "other": { "name": "tboot", - "version": "1.9.7", - "downloadUrl": "http://downloads.sourceforge.net/tboot/tboot-1.9.7.tar.gz" + "version": "1.9.12", + "downloadUrl": "http://downloads.sourceforge.net/tboot/tboot-1.9.12.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 79a1752f27a..524e21b49c8 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-2.cm1.noarch.rpm +kernel-headers-5.10.32.1-3.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm @@ -12,8 +12,8 @@ zlib-devel-1.2.11-3.cm1.aarch64.rpm file-5.38-1.cm1.aarch64.rpm file-devel-5.38-1.cm1.aarch64.rpm file-libs-5.38-1.cm1.aarch64.rpm -binutils-2.32-5.cm1.aarch64.rpm -binutils-devel-2.32-5.cm1.aarch64.rpm +binutils-2.36.1-1.cm1.aarch64.rpm +binutils-devel-2.36.1-1.cm1.aarch64.rpm gmp-6.1.2-5.cm1.aarch64.rpm gmp-devel-6.1.2-5.cm1.aarch64.rpm mpfr-4.0.1-3.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 87960703bef..872f54ca8a9 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-2.cm1.noarch.rpm +kernel-headers-5.10.32.1-3.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm @@ -12,8 +12,8 @@ zlib-devel-1.2.11-3.cm1.x86_64.rpm file-5.38-1.cm1.x86_64.rpm file-devel-5.38-1.cm1.x86_64.rpm file-libs-5.38-1.cm1.x86_64.rpm -binutils-2.32-5.cm1.x86_64.rpm -binutils-devel-2.32-5.cm1.x86_64.rpm +binutils-2.36.1-1.cm1.x86_64.rpm +binutils-devel-2.36.1-1.cm1.x86_64.rpm gmp-6.1.2-5.cm1.x86_64.rpm gmp-devel-6.1.2-5.cm1.x86_64.rpm mpfr-4.0.1-3.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 116d41540e1..940204a6d30 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -8,9 +8,9 @@ bash-4.4.18-6.cm1.aarch64.rpm bash-debuginfo-4.4.18-6.cm1.aarch64.rpm bash-devel-4.4.18-6.cm1.aarch64.rpm bash-lang-4.4.18-6.cm1.aarch64.rpm -binutils-2.32-5.cm1.aarch64.rpm -binutils-debuginfo-2.32-5.cm1.aarch64.rpm -binutils-devel-2.32-5.cm1.aarch64.rpm +binutils-2.36.1-1.cm1.aarch64.rpm +binutils-debuginfo-2.36.1-1.cm1.aarch64.rpm +binutils-devel-2.36.1-1.cm1.aarch64.rpm bison-3.1-3.cm1.aarch64.rpm bison-debuginfo-3.1-3.cm1.aarch64.rpm bzip2-1.0.6-15.cm1.aarch64.rpm @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-2.cm1.noarch.rpm +kernel-headers-5.10.32.1-3.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 7fea459bcef..233b8d7b26e 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -8,9 +8,9 @@ bash-4.4.18-6.cm1.x86_64.rpm bash-debuginfo-4.4.18-6.cm1.x86_64.rpm bash-devel-4.4.18-6.cm1.x86_64.rpm bash-lang-4.4.18-6.cm1.x86_64.rpm -binutils-2.32-5.cm1.x86_64.rpm -binutils-debuginfo-2.32-5.cm1.x86_64.rpm -binutils-devel-2.32-5.cm1.x86_64.rpm +binutils-2.36.1-1.cm1.x86_64.rpm +binutils-debuginfo-2.36.1-1.cm1.x86_64.rpm +binutils-devel-2.36.1-1.cm1.x86_64.rpm bison-3.1-3.cm1.x86_64.rpm bison-debuginfo-3.1-3.cm1.x86_64.rpm bzip2-1.0.6-15.cm1.x86_64.rpm @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-2.cm1.noarch.rpm +kernel-headers-5.10.32.1-3.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/toolchain-md5sums b/toolkit/scripts/toolchain/container/toolchain-md5sums index ad4446c0f59..34a06751dae 100644 --- a/toolkit/scripts/toolchain/container/toolchain-md5sums +++ b/toolkit/scripts/toolchain/container/toolchain-md5sums @@ -10,7 +10,7 @@ a42bce1f10e92be5f3f5c1c5c4798b06 aarch64-jdk8u181-b13-langtools.tar.bz2 53f38e7591fa57c3d2cee682be668e5b automake-1.16.1.tar.xz 518e2c187cc11a17040f0915dddce54e bash-4.4.18.tar.gz 1a05fb01fa1d5198894c931cf925c025 bigreqsproto-1.1.2.tar.bz2 -0d174cdaf85721c5723bf52355be41e6 binutils-2.32.tar.xz +628d490d976d8957279bbbff06cf29d4 binutils-2.36.1.tar.xz db7e431785ad96870bfa570a15cab079 bison-3.1.tar.xz 6a5ac7e89b791aae556de0f745916f7f bzip2-1.0.6-install_docs-1.patch 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz diff --git a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list index ac817783a3b..40635e5ccb9 100644 --- a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list +++ b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list @@ -1,6 +1,6 @@ http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz http://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.xz -https://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz +https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz http://ftp.gnu.org/gnu/dejagnu/dejagnu-1.6.2.tar.gz https://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.44.6.tar.gz https://sourceware.org/ftp/elfutils/0.176/elfutils-0.176.tar.bz2 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index 9110d0df55a..1e8f35c1bba 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -235,9 +235,9 @@ popd rm -rf m4-1.4.18 touch /logs/status_m4_complete -echo Binutils-2.32 -tar xf binutils-2.32.tar.xz -pushd binutils-2.32 +echo Binutils-2.36.1 +tar xf binutils-2.36.1.tar.xz +pushd binutils-2.36.1 sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in mkdir -v build cd build @@ -251,11 +251,10 @@ cd build --with-system-zlib # --enable-install-libiberty # libiberty.a used to be in binutils. Now it is in GCC. -# --enable-install-libiberty make -j$(nproc) tooldir=/usr make tooldir=/usr install popd -rm -rf binutils-2.32 +rm -rf binutils-2.36.1 touch /logs/status_binutils_complete echo GMP-6.1.2 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh index 053cc7e3919..83d9432fb20 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh @@ -16,9 +16,9 @@ touch $LFS/logs/temptoolchain/status_temp_toolchain_build_started cat /home/lfs/.bashrc LFS_TGT=$(uname -m)-lfs-linux-gnu -echo Binutils-2.32 - Pass 1 -tar xf binutils-2.32.tar.xz -pushd binutils-2.32 +echo Binutils-2.36.1 - Pass 1 +tar xf binutils-2.36.1.tar.xz +pushd binutils-2.36.1 mkdir -v build cd build ../configure --prefix=/tools \ @@ -31,7 +31,7 @@ make -j$(nproc) mkdir -v /tools/lib && ln -sv lib /tools/lib64 make install popd -rm -rf binutils-2.32 +rm -rf binutils-2.36.1 touch $LFS/logs/temptoolchain/status_binutils_pass1_complete @@ -182,9 +182,9 @@ rm -rf gcc-9.1.0 touch $LFS/logs/temptoolchain/status_libstdc++_complete -echo Binutils-2.32 - Pass 2 -tar xf binutils-2.32.tar.xz -pushd binutils-2.32 +echo Binutils-2.36.1 - Pass 2 +tar xf binutils-2.36.1.tar.xz +pushd binutils-2.36.1 mkdir -v build cd build CC=$LFS_TGT-gcc \ @@ -202,7 +202,7 @@ make -C ld clean make -C ld LIB_PATH=/usr/lib:/lib cp -v ld/ld-new /tools/bin popd -rm -rf binutils-2.32 +rm -rf binutils-2.36.1 touch $LFS/logs/temptoolchain/status_binutils_pass2_complete From c1e9adc9e1186ab8a9cea53afdfbf543ed53000c Mon Sep 17 00:00:00 2001 From: Neha Agarwal <58672330+neha170@users.noreply.github.com> Date: Tue, 18 May 2021 16:34:49 -0500 Subject: [PATCH 37/83] Add ceph and its dependencies to Mariner (#847) * Add ceph package and dependencies to Mariner * update Cython in licenses and cg-manifest * fix errors in cgmanifest.json * fix typo * remove openjdk8 from ignore_list, fix conflicts --- .github/workflows/validate-cg-manifest.sh | 6 + SPECS/CUnit/CUnit.signatures.json | 5 + SPECS/CUnit/CUnit.spec | 197 ++ SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md | 503 +++++ SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 5 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 35 + SPECS/bison/bison.spec | 44 +- SPECS/byacc/byacc.signatures.json | 5 + SPECS/byacc/byacc.spec | 305 +++ SPECS/ceph/ceph.signatures.json | 5 + SPECS/ceph/ceph.spec | 1784 +++++++++++++++++ .../docbook5-schemas.signatures.json | 7 + SPECS/docbook5-schemas/docbook5-schemas.spec | 395 ++++ SPECS/grpc/grpc.spec | 2 +- .../leveldb/0001-Allow-leveldbjni-build.patch | 18 + ...ndCompations-and-DB-ResumeCompaction.patch | 119 ++ ...alls-to-avoid-copies-into-std-string.patch | 166 ++ ...oom_test-failure-on-big-endian-archs.patch | 27 + SPECS/leveldb/leveldb.signatures.json | 5 + SPECS/leveldb/leveldb.spec | 206 ++ SPECS/libnl3/libnl3.spec | 57 +- .../libstoragemgmt/0001-change-run-dir.patch | 9 + .../libstoragemgmt.signatures.json | 5 + SPECS/libstoragemgmt/libstoragemgmt.spec | 907 +++++++++ SPECS/lsb-release/LICENSE.PTR | 133 ++ SPECS/lsb-release/lsb-release.signatures.json | 6 + SPECS/lsb-release/lsb-release.spec | 38 + SPECS/mailcap/mailcap.signatures.json | 5 + SPECS/mailcap/mailcap.spec | 352 ++++ .../oath-toolkit-2.0.2-man-fix.patch | 60 + ...toolkit-2.4.1-retain-original-xmldoc.patch | 42 + .../oath-toolkit-2.6.2-build-fix.patch | 875 ++++++++ .../oath-toolkit-2.6.2-lockfile.patch | 195 ++ .../oath-toolkit/oath-toolkit.signatures.json | 5 + SPECS/oath-toolkit/oath-toolkit.spec | 305 +++ .../python-cachetools.signatures.json | 5 + .../python-cachetools/python-cachetools.spec | 48 + .../python-cherrypy.signatures.json | 5 + SPECS/python-cherrypy/python-cherrypy.spec | 67 + SPECS/python-docutils/python-docutils.spec | 84 +- .../python-execnet.signatures.json | 5 + SPECS/python-execnet/python-execnet.spec | 70 + .../python-google-auth.signatures.json | 5 + .../python-google-auth.spec | 169 ++ SPECS/python-jwt/python-jwt.signatures.json | 5 + SPECS/python-jwt/python-jwt.spec | 186 ++ .../python-kubernetes.signatures.json | 6 + .../python-kubernetes/python-kubernetes.spec | 162 ++ .../python-logutils.signatures.json | 5 + SPECS/python-logutils/python-logutils.spec | 61 + SPECS/python-lxml/python-lxml.spec | 40 +- .../python-nocasedict.signatures.json | 5 + .../python-nocasedict/python-nocasedict.spec | 65 + .../python-pecan/python-pecan.signatures.json | 5 + SPECS/python-pecan/python-pecan.spec | 71 + .../python-pywbem.signatures.json | 5 + SPECS/python-pywbem/python-pywbem.spec | 297 +++ .../python-remoto.signatures.json | 5 + SPECS/python-remoto/python-remoto.spec | 65 + .../python-repoze-lru.signatures.json | 5 + .../python-repoze-lru/python-repoze-lru.spec | 62 + .../python-routes.signatures.json | 5 + SPECS/python-routes/python-routes.spec | 66 + SPECS/python-rsa/python-rsa.signatures.json | 5 + SPECS/python-rsa/python-rsa.spec | 50 + SPECS/python-sphinx/python-sphinx.spec | 19 +- ...n-sphinxcontrib-websupport.signatures.json | 5 + .../python-sphinxcontrib-websupport.spec | 97 + .../python-yamlloader.signatures.json | 5 + .../python-yamlloader/python-yamlloader.spec | 58 + ...ot-perform-device-rename-on-OPA-devi.patch | 33 + SPECS/rdma-core/rdma-core.signatures.json | 5 + SPECS/rdma-core/rdma-core.spec | 717 +++++++ SPECS/sgml-common/XMLSchema.dtd | 402 ++++ SPECS/sgml-common/datatypes.dtd | 203 ++ SPECS/sgml-common/html.dcl | 88 + SPECS/sgml-common/html.soc | 31 + SPECS/sgml-common/sgml-common-quotes.patch | 94 + SPECS/sgml-common/sgml-common-umask.patch | 12 + SPECS/sgml-common/sgml-common-xmldir.patch | 19 + SPECS/sgml-common/sgml-common.signatures.json | 15 + SPECS/sgml-common/sgml-common.spec | 428 ++++ SPECS/sgml-common/sgml.conf.5 | 40 + SPECS/sgml-common/sgmlwhich.1 | 21 + SPECS/sgml-common/xml.dcl | 179 ++ SPECS/sgml-common/xml.soc | 1 + SPECS/sgml-common/xml.xsd | 286 +++ SPECS/sgml-common/xmldsig-core-schema.xsd | 318 +++ SPECS/xmlstarlet/xmlstarlet-1.6.1-nogit.patch | 10 + SPECS/xmlstarlet/xmlstarlet.signatures.json | 5 + SPECS/xmlstarlet/xmlstarlet.spec | 208 ++ SPECS/yasm/0001-Update-elf-objfmt.c.patch | 31 + SPECS/yasm/yasm.signatures.json | 5 + SPECS/yasm/yasm.spec | 230 +++ cgmanifest.json | 310 +++ .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 4 +- .../manifests/package/toolchain_x86_64.txt | 4 +- 99 files changed, 12251 insertions(+), 103 deletions(-) create mode 100644 SPECS/CUnit/CUnit.signatures.json create mode 100644 SPECS/CUnit/CUnit.spec create mode 100644 SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md create mode 100644 SPECS/byacc/byacc.signatures.json create mode 100644 SPECS/byacc/byacc.spec create mode 100644 SPECS/ceph/ceph.signatures.json create mode 100644 SPECS/ceph/ceph.spec create mode 100644 SPECS/docbook5-schemas/docbook5-schemas.signatures.json create mode 100644 SPECS/docbook5-schemas/docbook5-schemas.spec create mode 100644 SPECS/leveldb/0001-Allow-leveldbjni-build.patch create mode 100644 SPECS/leveldb/0002-Added-a-DB-SuspendCompations-and-DB-ResumeCompaction.patch create mode 100644 SPECS/leveldb/0003-allow-Get-calls-to-avoid-copies-into-std-string.patch create mode 100644 SPECS/leveldb/0004-bloom_test-failure-on-big-endian-archs.patch create mode 100644 SPECS/leveldb/leveldb.signatures.json create mode 100644 SPECS/leveldb/leveldb.spec create mode 100644 SPECS/libstoragemgmt/0001-change-run-dir.patch create mode 100644 SPECS/libstoragemgmt/libstoragemgmt.signatures.json create mode 100644 SPECS/libstoragemgmt/libstoragemgmt.spec create mode 100644 SPECS/lsb-release/LICENSE.PTR create mode 100644 SPECS/lsb-release/lsb-release.signatures.json create mode 100644 SPECS/lsb-release/lsb-release.spec create mode 100644 SPECS/mailcap/mailcap.signatures.json create mode 100644 SPECS/mailcap/mailcap.spec create mode 100644 SPECS/oath-toolkit/oath-toolkit-2.0.2-man-fix.patch create mode 100644 SPECS/oath-toolkit/oath-toolkit-2.4.1-retain-original-xmldoc.patch create mode 100644 SPECS/oath-toolkit/oath-toolkit-2.6.2-build-fix.patch create mode 100644 SPECS/oath-toolkit/oath-toolkit-2.6.2-lockfile.patch create mode 100644 SPECS/oath-toolkit/oath-toolkit.signatures.json create mode 100644 SPECS/oath-toolkit/oath-toolkit.spec create mode 100644 SPECS/python-cachetools/python-cachetools.signatures.json create mode 100644 SPECS/python-cachetools/python-cachetools.spec create mode 100644 SPECS/python-cherrypy/python-cherrypy.signatures.json create mode 100644 SPECS/python-cherrypy/python-cherrypy.spec create mode 100644 SPECS/python-execnet/python-execnet.signatures.json create mode 100644 SPECS/python-execnet/python-execnet.spec create mode 100644 SPECS/python-google-auth/python-google-auth.signatures.json create mode 100644 SPECS/python-google-auth/python-google-auth.spec create mode 100644 SPECS/python-jwt/python-jwt.signatures.json create mode 100644 SPECS/python-jwt/python-jwt.spec create mode 100644 SPECS/python-kubernetes/python-kubernetes.signatures.json create mode 100644 SPECS/python-kubernetes/python-kubernetes.spec create mode 100644 SPECS/python-logutils/python-logutils.signatures.json create mode 100644 SPECS/python-logutils/python-logutils.spec create mode 100644 SPECS/python-nocasedict/python-nocasedict.signatures.json create mode 100644 SPECS/python-nocasedict/python-nocasedict.spec create mode 100644 SPECS/python-pecan/python-pecan.signatures.json create mode 100644 SPECS/python-pecan/python-pecan.spec create mode 100644 SPECS/python-pywbem/python-pywbem.signatures.json create mode 100644 SPECS/python-pywbem/python-pywbem.spec create mode 100644 SPECS/python-remoto/python-remoto.signatures.json create mode 100644 SPECS/python-remoto/python-remoto.spec create mode 100644 SPECS/python-repoze-lru/python-repoze-lru.signatures.json create mode 100644 SPECS/python-repoze-lru/python-repoze-lru.spec create mode 100644 SPECS/python-routes/python-routes.signatures.json create mode 100644 SPECS/python-routes/python-routes.spec create mode 100644 SPECS/python-rsa/python-rsa.signatures.json create mode 100644 SPECS/python-rsa/python-rsa.spec create mode 100644 SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.signatures.json create mode 100644 SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec create mode 100644 SPECS/python-yamlloader/python-yamlloader.signatures.json create mode 100644 SPECS/python-yamlloader/python-yamlloader.spec create mode 100644 SPECS/rdma-core/0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch create mode 100644 SPECS/rdma-core/rdma-core.signatures.json create mode 100644 SPECS/rdma-core/rdma-core.spec create mode 100644 SPECS/sgml-common/XMLSchema.dtd create mode 100644 SPECS/sgml-common/datatypes.dtd create mode 100644 SPECS/sgml-common/html.dcl create mode 100644 SPECS/sgml-common/html.soc create mode 100644 SPECS/sgml-common/sgml-common-quotes.patch create mode 100644 SPECS/sgml-common/sgml-common-umask.patch create mode 100644 SPECS/sgml-common/sgml-common-xmldir.patch create mode 100644 SPECS/sgml-common/sgml-common.signatures.json create mode 100644 SPECS/sgml-common/sgml-common.spec create mode 100644 SPECS/sgml-common/sgml.conf.5 create mode 100644 SPECS/sgml-common/sgmlwhich.1 create mode 100644 SPECS/sgml-common/xml.dcl create mode 100644 SPECS/sgml-common/xml.soc create mode 100644 SPECS/sgml-common/xml.xsd create mode 100644 SPECS/sgml-common/xmldsig-core-schema.xsd create mode 100644 SPECS/xmlstarlet/xmlstarlet-1.6.1-nogit.patch create mode 100644 SPECS/xmlstarlet/xmlstarlet.signatures.json create mode 100644 SPECS/xmlstarlet/xmlstarlet.spec create mode 100644 SPECS/yasm/0001-Update-elf-objfmt.c.patch create mode 100644 SPECS/yasm/yasm.signatures.json create mode 100644 SPECS/yasm/yasm.spec diff --git a/.github/workflows/validate-cg-manifest.sh b/.github/workflows/validate-cg-manifest.sh index 968037e37b4..94395440522 100755 --- a/.github/workflows/validate-cg-manifest.sh +++ b/.github/workflows/validate-cg-manifest.sh @@ -13,6 +13,7 @@ # Ignore some specs, mostly those with Source0 files that are not from an external source, or have very odd URLs ignore_list=" \ + byacc \ initramfs \ kf5 \ mariner-repos \ @@ -23,6 +24,11 @@ ignore_list=" \ python-markupsafe \ python-requests \ python-zope-interface \ + python-nocasedict \ + python-pywbem \ + python-repoze-lru \ + python-sphinxcontrib-websupport \ + python-yamlloader \ qt5-rpm-macros \ runc \ grub2-efi-binary-signed-aarch64 \ diff --git a/SPECS/CUnit/CUnit.signatures.json b/SPECS/CUnit/CUnit.signatures.json new file mode 100644 index 00000000000..3eab7d031dc --- /dev/null +++ b/SPECS/CUnit/CUnit.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "CUnit-2.1.3.tar.bz2": "f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214" + } +} \ No newline at end of file diff --git a/SPECS/CUnit/CUnit.spec b/SPECS/CUnit/CUnit.spec new file mode 100644 index 00000000000..c91099c0092 --- /dev/null +++ b/SPECS/CUnit/CUnit.spec @@ -0,0 +1,197 @@ +%global tarver 2.1-3 + +Name: CUnit +Version: 2.1.3 +Release: 23%{?dist} +Summary: Unit testing framework for C +Vendor: Microsoft Corporation +Distribution: Mariner +License: LGPLv2+ +URL: http://cunit.sourceforge.net/ +#Source0: https://downloads.sourceforge.net/cunit/%{name}-%{tarver}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 + +BuildRequires: automake +BuildRequires: libtool + +%description +CUnit is a lightweight system for writing, administering, +and running unit tests in C. It provides C programmers a basic +testing functionality with a flexible variety of user interfaces. + +%package devel +Summary: Header files and libraries for CUnit development +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains the header files +and libraries for use with CUnit package. + +%prep +%setup -q -n %{name}-%{tarver} +find -name *.c -exec chmod -x {} \; + +%build +autoreconf -f -i +%configure --disable-static +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} +rm -f `find %{buildroot} -name *.la` + +# work around bad docdir= in doc/Makefile* +mkdir -p %{buildroot}%{_docdir}/%{name} +mv %{buildroot}%{_prefix}/doc/%{name} %{buildroot}%{_docdir}/%{name}/html + +# add some doc files into the buildroot manually (#1001276) +for f in AUTHORS ChangeLog COPYING NEWS README TODO VERSION ; do + install -p -m0644 -D $f %{buildroot}%{_docdir}/%{name}/${f} +done + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%license %{_defaultdocdir}/%{name}/COPYING +%{_datadir}/%{name}/ +%{_libdir}/libcunit.so.* +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/AUTHORS +%{_docdir}/%{name}/ChangeLog +%{_docdir}/%{name}/NEWS +%{_docdir}/%{name}/README +%{_docdir}/%{name}/TODO +%{_docdir}/%{name}/VERSION + +%files devel +%{_docdir}/%{name}/html/ +%{_includedir}/%{name}/ +%{_libdir}/libcunit.so +%{_libdir}/pkgconfig/cunit.pc +%{_mandir}/man3/CUnit.3* + +%changelog +* Fri Aug 21 2020 Thomas Crain - 2.1.3-23 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Mon Jul 27 2020 Fedora Release Engineering - 2.1.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.1.3-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 2.1.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.1.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.1.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 2.1.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.1.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 2.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 2.1.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 2.1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 06 2014 Fedora Release Engineering - 2.1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Jun 1 2014 Michael Schwendt - 2.1.3-9 +- Fix HTML documentation installation location. +- Replace CUnit-2.1-3-src.tar.bz2 tarball, which really + is 2.1-2 in disguise according to configure.in, with 2.1-3 as + published on 2014-04-24. +- BR libtool +- Run autoreconf instead of autoconf. +- Drop --enable-curses because without BuildRequires ncurses-devel it + would disable itself automatically (and if it were enabled, test programs + would need to link with ncurses explicitly). + +* Sun Sep 29 2013 Michael Schwendt - 2.1.3-8 +- Add %%_isa to -devel base package dependency. +- Headers get installed by "make install", copying them from the HTML + doc headers dir is not necessary. +- Configure build with --disable-static. +- Drop unneeded spec stuff (buildroot def, removal, clean, pkgconfig dep). +- Using %%defattr is not needed anymore. +- Deduplicate documentation files in unversioned docdir (#1001276). + +* Tue Sep 10 2013 Shakthi Kannan - 2.1.3-7 +- Fix build with unversioned docdir (#1001276) + +* Fri Aug 02 2013 Fedora Release Engineering - 2.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 21 2013 Shakthi Kannan - 2.1.3-5 +- Use header files from doc folder as well +- Enable curses + +* Sat Apr 20 2013 Shakthi Kannan - 2.1.3-4 +- Use autoconf for ARM + +* Wed Feb 13 2013 Fedora Release Engineering - 2.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 2 2012 Shakthi Kannan 2.1.3-1 +- Updated to 2.1.3 sources re-run with autoreconf. + +* Thu Jan 12 2012 Fedora Release Engineering - 2.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 2.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 29 2011 Shakthi Kannan 2.1.2-6 +- Changed Group to System Environment/Libraries. +- Remove executable permission from C files. +- Created two separate patches for Makefile and manpage fixes. +- Removed passing datarootdir from configure. + +* Thu Jan 20 2011 Shakthi Kannan 2.1.2-5 +- Renamed Source0 to use Fedora sourceforge.net naming guidelines. +- Removed exit call in library patch. +- Use A.B.C version number. + +* Thu Jan 20 2011 Shakthi Kannan 2.1_2-4 +- Updated to license LGPLv2+. +- Changed to use BuildRoot. +- Added comments for inclusion of patches. +- Removed inconsistent macro usage. +- Moved man page, HTML documentation to devel package. +- Added AUTHORS, COPYING, README, TODO to doc in base package. +- Used * in man, library inclusion. + +* Sun Dec 26 2010 Shakthi Kannan 2.1_2-3 +- Created patch to fix man page warnings and datarootdir settings. +- Added patch to remove exit calls in library. + +* Wed Dec 15 2010 Shakthi Kannan 2.1_2-2 +- Moved libcunit.so.* to main package. +- Added post, postun ldconfig. +- Added smp flags for make build. +- Changed datarootdir to datadir. + +* Tue Dec 14 2010 Shakthi Kannan 2.1_2-1 +- First CUnit package. diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md b/SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md new file mode 100644 index 00000000000..d55f6088e5e --- /dev/null +++ b/SPECS/LICENSES-AND-NOTICES/LICENSE-LGPLv2.md @@ -0,0 +1,503 @@ +### GNU LESSER GENERAL PUBLIC LICENSE + +Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + [This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +### Preamble + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public Licenses +are intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + +When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + +To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there +is no warranty for the free library. Also, if the library is modified +by someone else and passed on, the recipients should know that what +they have is not the original version, so that the original author's +reputation will not be affected by problems that might be introduced +by others. + +Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + +When a program is linked with a library, whether statically or using a +shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + +We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + +For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + +Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + +### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +**0.** This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). Each +licensee is addressed as "you". + +A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does and +what the program that uses the Library does. + +**1.** You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee. + +**2.** You may modify your copy or copies of the Library or any +portion of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +- **a)** The modified work must itself be a software library. +- **b)** You must cause the files modified to carry prominent + notices stating that you changed the files and the date of + any change. +- **c)** You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. +- **d)** If a facility in the modified Library refers to a function + or a table of data to be supplied by an application program that + uses the facility, other than as an argument passed when the + facility is invoked, then you must make a good faith effort to + ensure that, in the event an application does not supply such + function or table, the facility still operates, and performs + whatever part of its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of + the application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +**3.** You may opt to apply the terms of the ordinary GNU General +Public License instead of this License to a given copy of the Library. +To do this, you must alter all the notices that refer to this License, +so that they refer to the ordinary GNU General Public License, version +2, instead of to this License. (If a newer version than version 2 of +the ordinary GNU General Public License has appeared, then you can +specify that version instead if you wish.) Do not make any other +change in these notices. + +Once this change is made in a given copy, it is irreversible for that +copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the +Library into a program that is not a library. + +**4.** You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from +a designated place, then offering equivalent access to copy the source +code from the same place satisfies the requirement to distribute the +source code, even though third parties are not compelled to copy the +source along with the object code. + +**5.** A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a work, +in isolation, is not a derivative work of the Library, and therefore +falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. Section +6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data structure +layouts and accessors, and small macros and small inline functions +(ten lines or less in length), then the use of the object file is +unrestricted, regardless of whether it is legally a derivative work. +(Executables containing this object code plus portions of the Library +will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +**6.** As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a work +containing portions of the Library, and distribute that work under +terms of your choice, provided that the terms permit modification of +the work for the customer's own use and reverse engineering for +debugging such modifications. + +You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + +- **a)** Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood that + the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) +- **b)** Use a suitable shared library mechanism for linking with + the Library. A suitable mechanism is one that (1) uses at run time + a copy of the library already present on the user's computer + system, rather than copying library functions into the executable, + and (2) will operate properly with a modified version of the + library, if the user installs one, as long as the modified version + is interface-compatible with the version that the work was + made with. +- **c)** Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. +- **d)** If distribution of the work is made by offering access to + copy from a designated place, offer equivalent access to copy the + above specified materials from the same place. +- **e)** Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + +It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +**7.** You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +- **a)** Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other + library facilities. This must be distributed under the terms of + the Sections above. +- **b)** Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + +**8.** You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +**9.** You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +**10.** Each time you redistribute the Library (or any work based on +the Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + +**11.** If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to patent +issues), conditions are imposed on you (whether by court order, +agreement or otherwise) that contradict the conditions of this +License, they do not excuse you from the conditions of this License. +If you cannot distribute so as to satisfy simultaneously your +obligations under this License and any other pertinent obligations, +then as a consequence you may not distribute the Library at all. For +example, if a patent license would not permit royalty-free +redistribution of the Library by all those who receive copies directly +or indirectly through you, then the only way you could satisfy both it +and this License would be to refrain entirely from distribution of the +Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +**12.** If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +**13.** The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. Such +new versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +**14.** If you wish to incorporate parts of the Library into other +free programs whose distribution conditions are incompatible with +these, write to the author to ask for permission. For software which +is copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + +**NO WARRANTY** + +**15.** BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**16.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +### END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + +To apply these terms, attach the following notices to the library. It +is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + one line to give the library's name and an idea of what it does. + Copyright (C) year name of author + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper +mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the library `Frob' (a library for tweaking knobs) written + by James Random Hacker. + + signature of Ty Coon, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! \ No newline at end of file diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 69731ee71cd..57151c3c04e 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -2,10 +2,11 @@ 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) | at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
dnf
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
hyperv-daemons
ipmitool
ipv6calc
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
libatasmart
libburn
libcgroup
libcomps
libdnf
libisoburn
libisofs
libkcapi
libpwquality
libxcrypt
mokutil
mozjs60
open-vm-tools
openssl
p11-kit
perl-JSON
pugixml
python-pexpect
python-ptyprocess
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
sos
squashfs-tools
uclibc-ng
uuid
websocketpp
words
yaml-cpp
zipper | -| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
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
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates-base
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 | +| Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
byacc
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
CUnit
dnf
docbook5-schemas
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
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
libstoragemgmt
libxcrypt
mailcap
mokutil
mozjs60
oath-toolkit
open-vm-tools
openssl
p11-kit
perl-JSON
pugixml
python-google-auth
python-jwt
python-kubernetes
python-pexpect
python-ptyprocess
python-pywbem
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
rdma-core
sgml-common
sos
squashfs-tools
uclibc-ng
uuid
websocketpp
words
xmlstarlet
yaml-cpp
yasm
zipper | +| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
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
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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) | nvidia-container-runtime | | Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka | +| Ceph | [LGPL2.1](https://github.com/ceph/ceph/blob/master/COPYING-LGPL2.1) | ceph | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 06a1d2daa08..28b026f8fdd 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -17,13 +17,16 @@ "bmake", "brotli", "busybox", + "byacc", "calamares", "catch", "chrony", "conntrack-tools", "cpprest", "cryptsetup", + "CUnit", "dnf", + "docbook5-schemas", "dos2unix", "ebtables", "extra-cmake-modules", @@ -42,6 +45,7 @@ "kf5-ki18n", "kf5-kwidgetsaddons", "kpmcore", + "leveldb", "libatasmart", "libburn", "libcgroup", @@ -51,28 +55,39 @@ "libisofs", "libkcapi", "libpwquality", + "libstoragemgmt", "libxcrypt", + "mailcap", "mokutil", "mozjs60", + "oath-toolkit", "open-vm-tools", "openssl", "p11-kit", "perl-JSON", "pugixml", + "python-google-auth", + "python-jwt", + "python-kubernetes", "python-pexpect", "python-ptyprocess", + "python-pywbem", "qt5-qtbase", "qt5-qtdeclarative", "qt5-qtsvg", "qt5-qttools", "qt5-rpm-macros", + "rdma-core", + "sgml-common", "sos", "squashfs-tools", "uclibc-ng", "uuid", "websocketpp", "words", + "xmlstarlet", "yaml-cpp", + "yasm", "zipper" ] }, @@ -122,6 +137,7 @@ "libmaxminddb", "libuv", "libxml++", + "lsb-release", "lttng-consume", "mariner-release", "mariner-repos", @@ -143,6 +159,18 @@ "perl-Text-Template", "pigz", "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", @@ -785,6 +813,13 @@ "specs": [ "librdkafka" ] + }, + { + "origin": "Ceph", + "license": "[LGPL2.1](https://github.com/ceph/ceph/blob/master/COPYING-LGPL2.1)", + "specs": [ + "ceph" + ] } ] } diff --git a/SPECS/bison/bison.spec b/SPECS/bison/bison.spec index 11a2dca6335..eceb3086f27 100644 --- a/SPECS/bison/bison.spec +++ b/SPECS/bison/bison.spec @@ -1,17 +1,16 @@ -Summary: Contains a parser generator -Name: bison -Version: 3.1 -Release: 3%{?dist} -License: GPLv3+ -URL: http://www.gnu.org/software/bison -Group: System Environment/Base +Summary: Contains a parser generator +Name: bison +Version: 3.1 +Release: 4%{?dist} +License: GPLv3+ +URL: http://www.gnu.org/software/bison +Group: System Environment/Base Vendor: Microsoft Corporation Distribution: Mariner -Source0: http://ftp.gnu.org/gnu/bison/%{name}-%{version}.tar.xz -%define sha1 bison=84e5b016fa76f6cd4246131b1ca11a0f926e7922 -BuildRequires: m4 -Requires: m4 -BuildRequires: flex +Source0: http://ftp.gnu.org/gnu/bison/%{name}-%{version}.tar.xz +BuildRequires: m4 +Requires: m4 +BuildRequires: flex %description This package contains a parser generator %prep @@ -22,14 +21,19 @@ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h ./configure \ - --prefix=%{_prefix} \ - --disable-silent-rules + --prefix=%{_prefix} \ + --disable-silent-rules make %{?_smp_mflags} + %install make DESTDIR=%{buildroot} install rm -rf %{buildroot}%{_infodir} %find_lang %{name} --all-name +# Remove yacc binary/man pages where they conflict with byacc +rm -f %{buildroot}/%{_bindir}/yacc +rm -f %{buildroot}/%{_mandir}/man1/yacc* + %check make %{?_smp_mflags} check @@ -42,12 +46,16 @@ make %{?_smp_mflags} check %{_datarootdir}/aclocal/* %{_mandir}/*/* %{_docdir}/bison/* + %changelog -* Sat May 09 00:21:04 PST 2020 Nick Samson - 3.1-3 +* Fri Aug 21 2020 Thomas Crain 3.1-4 +- Remove yacc command for compatibility with byacc package +- Remove sha hash +- License verified +* Sat May 09 00:21:04 PST 2020 Nick Samson 3.1-3 - Added %%license line automatically - -* Tue Sep 03 2019 Mateusz Malisz 3.1-2 -- Initial CBL-Mariner import from Photon (license: Apache2). +* Tue Sep 03 2019 Mateusz Malisz 3.1-2 +- Initial CBL-Mariner import from Photon (license: Apache2). * Tue Sep 18 2018 Tapas Kundu 3.1-1 - Updated to release 3.1 * Sun Sep 09 2018 Alexey Makhalov 3.0.4-4 diff --git a/SPECS/byacc/byacc.signatures.json b/SPECS/byacc/byacc.signatures.json new file mode 100644 index 00000000000..9403415cd71 --- /dev/null +++ b/SPECS/byacc/byacc.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "byacc-1.9.20200330.tar.gz": "e099e2dd8a684d739ac6b9a0e43d468314a5bc34fd21466502d120b18df51fb0" + } +} \ No newline at end of file diff --git a/SPECS/byacc/byacc.spec b/SPECS/byacc/byacc.spec new file mode 100644 index 00000000000..fdb5de8a949 --- /dev/null +++ b/SPECS/byacc/byacc.spec @@ -0,0 +1,305 @@ +%define byaccdate 20200330 + +Summary: Berkeley Yacc, a parser generator +Name: byacc +Version: 1.9.%{byaccdate} +Release: 3%{?dist} +License: Public Domain +URL: https://invisible-island.net/byacc/byacc.html +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{byaccdate}.tgz +Source0: %{name}-%{version}.tar.gz + +BuildRequires: gcc + +%description +This package provides a parser generator utility that reads a grammar +specification from a file and generates an LR(1) parser for it. The +parsers consist of a set of LALR(1) parsing tables and a driver +routine written in the C programming language. It has a public domain +license which includes the generated C. + +If you are going to do development on your system, you will want to install +this package. + +%prep +%setup -q -n byacc-%{byaccdate} + +# Revert default stack size back to 10000 +# https://bugzilla.redhat.com/show_bug.cgi?id=743343 +find . -type f -name \*.c -print0 | + xargs -0 sed -i 's/YYSTACKSIZE 500/YYSTACKSIZE 10000/g' + +%build +%configure --disable-dependency-tracking +%make_build + +%install +%make_install +ln -s yacc %{buildroot}%{_bindir}/byacc +ln -s yacc.1 %{buildroot}%{_mandir}/man1/byacc.1 + +%check +echo ====================TESTING========================= +make check +echo ====================TESTING END===================== + +%files +%license README +%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY +%{_bindir}/yacc +%{_bindir}/byacc +%{_mandir}/man1/yacc.1* +%{_mandir}/man1/byacc.1* + +%changelog +* Fri Aug 21 2020 Thomas Crain - 1.9.20200330-4 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Sat Aug 01 2020 Fedora Release Engineering - 1.9.20200330-3 +- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.9.20200330-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 8 2020 Arjun Shankar - 1.9.20200330-1 +- Rebase to 20200330 (#1819022) + +* Tue Jan 28 2020 Fedora Release Engineering - 1.9.20191125-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 8 2020 Arjun Shankar - 1.9.20191125-1 +- Rebase to 20191125 (#1768314) + +* Wed Jul 24 2019 Fedora Release Engineering - 1.9.20190617-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 26 2019 Arjun Shankar - 1.9.20190617-1 +- Rebase to 20190617 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.9.20170709-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Florian Weimer - 1.9.20170709-6 +- Rebuild with fixed binutils + +* Thu Jul 12 2018 Fedora Release Engineering - 1.9.20170709-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.9.20170709-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.9.20170709-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.9.20170709-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 12 2017 Patsy Franklin - 1.9.20170709-1 +- Rebase to 20170709 + +* Mon Feb 13 2017 Patsy Franklin - 1.9.20170201-1 +- Rebase to 20170201 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.9.20161202-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Dec 09 2016 Patsy Franklin - 1.9.20161202-1 +- Rebase to 20161202 + +* Mon Aug 01 2016 Patsy Franklin - 1.9.20160606-1 +- Rebase to 20160606 + +* Fri May 20 2016 Patsy Franklin - 1.9.20160324-1 +- Rebase to 20160324 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.9.20150711-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Oct 10 2015 Patsy Franklin - 1.9.20150711-1 +- Rebase to 20150711 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.9.20141128-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 02 2015 Patsy Franklin - 1.9.20141128-1 +- Rebase to 20141128 + +* Fri Aug 15 2014 Fedora Release Engineering - 1.9.20130925-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9.20130925-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Dec 02 2013 Patsy Franklin - 1.9.20130925-2 +- Update sources file. + +* Mon Dec 02 2013 Patsy Franklin - 1.9.20130925-1 +- Rebase to 20130925 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.20130304-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 20 2013 Petr Machata - 1.9.20130304-1 +- Rebase to 20130304 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.9.20120115-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.9.20120115-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Petr Machata - 1.9.20120115-1 +- Rebase to 20120115 +- Resolves: #782010 + +* Mon Jan 9 2012 Petr Machata - 1.9.20111219-1 +- Rebase to 20111219 + - add "-s" option + - Resolves: #769237 +- Revert default stack size to 10000 + - Related: #743343 + +* Thu Sep 29 2011 Petr Machata - 1.9.20110908-1 +- Rebase to 20110908 + - add "-i" option. + - add error-check in reader.c +- Resolves: #736627 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.9.20101229-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 3 2011 Petr Machata - 1.9.20101229-1 +- Rebase to 20101229 +- Resolves: #665985 + +* Mon Dec 6 2010 Petr Machata - 1.9.20101127-1 +- Rebase to 20101127 +- Resolves: #659010 + +* Wed Nov 10 2010 Petr Machata - 1.9.20100610-1 +- Rebase to 20100610 +- Update the description in accordance with upstream spec template +- Resolves: #643598 + +* Wed Apr 7 2010 Petr Machata - 1.9.20100216-1 +- Rebase to 20100216 +- Drop the buffer overflow patch, upstream implements this +- Resolves: #577016 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.9.20070509-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.9.20070509-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-4 +- Add a patch that fixes ancient buffer overflow +- Resolves: #454583 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.9.20070509-2 +- Autorebuild for GCC 4.3 + +* Tue Nov 13 2007 Petr Machata - 1.9.20070509-1 +- Update to the 20070509 release. +- Related: #225632 + +* Wed Sep 12 2007 Matthias Saou 1.9.20050813-2 +- Update summary. +- Remove useless doc copying in install section. +- Add NOTES and NO_WARRANTY docs. + +* Fri Feb 2 2007 Petr Machata - 1.9.20050813-1 +- Thomas Dickey's 20050813 version of byacc: + - own build system (linux patch reverted) + - use tmpfile (security patch reverted) +- Tidy up the specfile per rpmlint comments + +* Wed Jul 12 2006 Jesse Keating - 1.9-29.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.9-29.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.9-29.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Sun Feb 27 2005 Florian La Roche +- Copyright: -> License: + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 05 2002 Elliot Lee 1.9-23 +- Rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Jan 05 2001 Preston Brown +- security patch for tmpfile creation from Olaf Kirch + +* Fri Sep 29 2000 Bernhard Rosenkraenzer +- Update to the version in FreeBSD CVS - it's actively maintained, unlike + the 1993 4BSD version we used to have + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Bill Nottingham +- fix perms in tarball + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify +- handle RPM_OPT_FLAGS + +* Sat May 6 2000 Bill Nottingham +- fix yacc for ia64 + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- rebuild to compress man pages +- fix up manpage symlink + +* Wed Apr 07 1999 Preston Brown +- man page fixed. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 10) + +* Thu Dec 17 1998 Cristian Gafton +- build for glibc 2.1 + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Tue May 05 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Oct 23 1997 Donnie Barnes +- various spec file cleanups + +* Mon Jun 02 1997 Erik Troan +- built against glibc \ No newline at end of file diff --git a/SPECS/ceph/ceph.signatures.json b/SPECS/ceph/ceph.signatures.json new file mode 100644 index 00000000000..d9eab82642d --- /dev/null +++ b/SPECS/ceph/ceph.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "ceph-15.2.4.tar.gz": "5d51297d5f0358f6fc386ecf3d6e3093a044ef4714ed6c0f0d13af90c96dc54b" + } +} \ No newline at end of file diff --git a/SPECS/ceph/ceph.spec b/SPECS/ceph/ceph.spec new file mode 100644 index 00000000000..d088005fd4c --- /dev/null +++ b/SPECS/ceph/ceph.spec @@ -0,0 +1,1784 @@ +Summary: User space components of the Ceph file system +Name: ceph +Version: 15.2.4 +Release: 1%{?dist} +License: LGPLv2 and LGPLv3 and CC-BY-SA and GPLv2 and Boost and BSD and MIT and Public Domain and GPLv3 and ASL-2.0 +URL: https://ceph.io/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://download.ceph.com/tarballs/%{name}-%{version}.tar.gz + + +# +# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file +# at the top-level directory of this distribution and at +# https://github.com/ceph/ceph/blob/master/COPYING +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. +# +# This file is under the GNU Lesser General Public License, version 2.1 +# +# Please submit bugfixes or comments via http://tracker.ceph.com/ +# + +################################################################################# +# Mariner conditional build flags and macro definitions +################################################################################# +%bcond_with amqp_endpoint +%bcond_with ceph_test_package +%bcond_with cephfs_java +%bcond_with cmake_verbose_logging +%bcond_with kafka_endpoint +%bcond_with libradosstriper +%bcond_with lttng +%bcond_with make_check +%bcond_with ocf +%bcond_with seastar +%bcond_with selinux +%bcond_with tcmalloc +%bcond_with mgr_diskprediction + +%define debug_package %{nil} + +%if %{with selinux} +%{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} +%endif + +%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} +%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} +%{!?python3_pkgversion: %global python3_pkgversion 3} +%{!?python3_version: %global python3_version 3} +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +%define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") + + +# disable dwz which compresses the debuginfo +%global _find_debuginfo_dwz_opts %{nil} + + +################################################################################# +# Main package dependencies +################################################################################# +Requires: ceph-osd = %{version}-%{release} +Requires: ceph-mds = %{version}-%{release} +Requires: ceph-mgr = %{version}-%{release} +Requires: ceph-mon = %{version}-%{release} +Requires(post): binutils +Requires: systemd + +BuildRequires: cryptsetup +BuildRequires: expat-devel +BuildRequires: fuse-devel +BuildRequires: gcc +BuildRequires: gdbm +BuildRequires: gperf +BuildRequires: keyutils-devel +BuildRequires: leveldb-devel > 1.2 +BuildRequires: libaio-devel +BuildRequires: util-linux-libs +BuildRequires: libcap-ng-devel +BuildRequires: curl-devel +BuildRequires: libibverbs-devel +BuildRequires: libnl3-devel +BuildRequires: liboath-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: lsb-release +BuildRequires: lz4-devel >= 1.7 +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: nss-devel +BuildRequires: parted +BuildRequires: patch +BuildRequires: perl +BuildRequires: pkg-config +BuildRequires: python%{python3_pkgversion} +BuildRequires: python%{python3_pkgversion}-Cython +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-prettytable +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-sphinx +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport +BuildRequires: python%{python3_pkgversion}-xml +BuildRequires: snappy-devel +BuildRequires: sudo +BuildRequires: systemd-devel +BuildRequires: util-linux +BuildRequires: valgrind +BuildRequires: which +BuildRequires: xfsprogs +BuildRequires: xfsprogs-devel +BuildRequires: xmlstarlet +BuildRequires: yasm + +BuildRequires: CUnit-devel +BuildRequires: boost +BuildRequires: cmake > 3.5 +BuildRequires: librdmacm-devel +BuildRequires: mariner-rpm-macros +BuildRequires: openldap +BuildRequires: openssl-devel +BuildRequires: procps-ng + +%if 0%{with cephfs_java} +BuildRequires: java-devel +BuildRequires: sharutils +%endif + +%if 0%{with selinux} +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel +%endif + +%if 0%{with tcmalloc} +BuildRequires: gperftools-devel >= 2.6.1 +%endif + +%if 0%{with amqp_endpoint} +BuildRequires: librabbitmq-devel +%endif + +%if 0%{with kafka_endpoint} +BuildRequires: librdkafka-devel +%endif + +%if 0%{with make_check} +BuildRequires: jq +BuildRequires: libtool-ltdl-devel +BuildRequires: libuuid-devel +BuildRequires: python%{python3_pkgversion}-bcrypt +BuildRequires: python%{python3_pkgversion}-cherrypy +BuildRequires: python%{python3_pkgversion}-coverage +BuildRequires: python%{python3_pkgversion}-dateutil +BuildRequires: python%{python3_pkgversion}-jwt +BuildRequires: python%{python3_pkgversion}-nose +BuildRequires: python%{python3_pkgversion}-pecan +BuildRequires: python%{python3_pkgversion}-pyOpenSSL +BuildRequires: python%{python3_pkgversion}-pyOpenSSL +BuildRequires: python%{python3_pkgversion}-requests +BuildRequires: python%{python3_pkgversion}-routes +BuildRequires: python%{python3_pkgversion}-scipy +BuildRequires: python%{python3_pkgversion}-six +BuildRequires: python%{python3_pkgversion}-virtualenv +BuildRequires: python%{python3_pkgversion}-werkzeug +BuildRequires: socat +BuildRequires: xmlsec1 +BuildRequires: xmlsec1-devel +BuildRequires: xmlsec1-openssl +BuildRequires: xmlsec1-openssl-devel + +%ifarch x86_64 +BuildRequires: xmlsec1-nss +%endif +%endif + +%if 0%{with seastar} +BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3 +BuildRequires: c-ares-devel +BuildRequires: cryptopp-devel +BuildRequires: fmt-devel +BuildRequires: gcc-toolset-9-annobin +BuildRequires: gcc-toolset-9-libasan-devel +BuildRequires: gcc-toolset-9-libatomic-devel +BuildRequires: gcc-toolset-9-libubsan-devel +BuildRequires: gnutls-devel +BuildRequires: hwloc-devel +BuildRequires: libasan +BuildRequires: libatomic +BuildRequires: libpciaccess-devel +BuildRequires: libubsan +BuildRequires: lksctp-tools-devel +BuildRequires: numactl-devel +BuildRequires: protobuf-compiler +BuildRequires: protobuf-devel +BuildRequires: ragel +BuildRequires: systemtap-sdt-devel +BuildRequires: yaml-cpp-devel +%endif + +# lttng and babeltrace for rbd-replay-prep +%if %{with lttng} +BuildRequires: libbabeltrace-devel +BuildRequires: lttng-ust-devel +%endif + + +%description +Ceph is a massively scalable, open-source, distributed storage system that runs +on commodity hardware and delivers object, block and file system storage. + + +################################################################################# +# subpackage definitions +################################################################################# + +%package base +Summary: Ceph Base Package +Provides: ceph-test:/usr/bin/ceph-kvstore-tool +Requires: ceph-common = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: libcephfs2 = %{version}-%{release} +Requires: librgw2 = %{version}-%{release} +%if 0%{with selinux} +Requires: ceph-selinux = %{version}-%{release} +%endif +Requires: cryptsetup +Requires: e2fsprogs +Requires: findutils +Requires: grep +Requires: logrotate +Requires: parted +Requires: psmisc +Requires: python%{python3_pkgversion}-setuptools +Requires: util-linux +Requires: xfsprogs +Requires: which +# The following is necessary due to tracker 36508 and can be removed once the +# associated upstream bugs are resolved. +%if 0%{with tcmalloc} +Requires: gperftools-libs >= 2.6.1 +%endif +%description base +Base is the package that includes all the files shared amongst ceph servers + +%package -n cephadm +Summary: Utility to bootstrap Ceph clusters +Requires: lvm2 +Requires: python%{python3_pkgversion} +%description -n cephadm +Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed +with systemd and podman. + +%package -n ceph-common +Summary: Ceph Common +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: libcephfs2 = %{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{version}-%{release} +Requires: python%{python3_pkgversion}-rbd = %{version}-%{release} +Requires: python%{python3_pkgversion}-cephfs = %{version}-%{release} +Requires: python%{python3_pkgversion}-rgw = %{version}-%{release} +Requires: python%{python3_pkgversion}-ceph-argparse = %{version}-%{release} +Requires: python%{python3_pkgversion}-ceph-common = %{version}-%{release} +Requires: python%{python3_pkgversion}-prettytable +%if 0%{with libradosstriper} +Requires: libradosstriper1 = %{version}-%{release} +%endif +%{?systemd_requires} +%description -n ceph-common +Common utilities to mount and interact with a ceph storage cluster. +Comprised of files that are common to Ceph clients and servers. + +%package mds +Summary: Ceph Metadata Server Daemon +Requires: ceph-base = %{version}-%{release} +%description mds +ceph-mds is the metadata server daemon for the Ceph distributed file system. +One or more instances of ceph-mds collectively manage the file system +namespace, coordinating access to the shared OSD cluster. + +%package mon +Summary: Ceph Monitor Daemon +Provides: ceph-test:/usr/bin/ceph-monstore-tool +Requires: ceph-base = %{version}-%{release} + +%description mon +ceph-mon is the cluster monitor daemon for the Ceph distributed file +system. One or more instances of ceph-mon form a Paxos part-time +parliament cluster that provides extremely reliable and durable storage +of cluster membership, configuration, and state. + +%package mgr +Summary: Ceph Manager Daemon +Requires: ceph-base = %{version}-%{release} +Requires: ceph-mgr-modules-core = %{version}-%{release} + +%description mgr +ceph-mgr enables python modules that provide services (such as the REST +module derived from Calamari) and expose CLI hooks. ceph-mgr gathers +the cluster maps, the daemon metadata, and performance counters, and +exposes all these to the python modules. + +%package mgr-dashboard +Summary: Ceph Dashboard +BuildArch: noarch +Requires: ceph-mgr = %{version}-%{release} +Requires: ceph-grafana-dashboards = %{version}-%{release} +Requires: ceph-prometheus-alerts = %{version}-%{release} +Requires: python%{python3_pkgversion}-cherrypy +Requires: python%{python3_pkgversion}-jwt +Requires: python%{python3_pkgversion}-routes +Requires: python%{python3_pkgversion}-werkzeug + +%description mgr-dashboard +ceph-mgr-dashboard is a manager module, providing a web-based application +to monitor and manage many aspects of a Ceph cluster and related components. +See the Dashboard documentation at http://docs.ceph.com/ for details and a +detailed feature overview. + +%if %{with mgr_diskprediction} +%package mgr-diskprediction-local +Summary: Ceph Manager module for predicting disk failures +BuildArch: noarch +Requires: ceph-mgr = %{version}-%{release} +Requires: python%{python3_pkgversion}-numpy +Requires: python%{python3_pkgversion}-scikit-learn +Requires: python%{python3_pkgversion}-scipy + +%description mgr-diskprediction-local +ceph-mgr-diskprediction-local is a ceph-mgr module that tries to predict +disk failures using local algorithms and machine-learning databases. +%endif + +%package mgr-modules-core +Summary: Ceph Manager modules which are always enabled +BuildArch: noarch +Requires: python%{python3_pkgversion}-bcrypt +Requires: python%{python3_pkgversion}-pecan +Requires: python%{python3_pkgversion}-pyOpenSSL +Requires: python%{python3_pkgversion}-requests +Requires: python%{python3_pkgversion}-dateutil +Requires: python%{python3_pkgversion}-cherrypy +Requires: python%{python3_pkgversion}-PyYAML +Requires: python%{python3_pkgversion}-werkzeug + +%description mgr-modules-core +ceph-mgr-modules-core provides a set of modules which are always +enabled by ceph-mgr. + +%package mgr-rook +BuildArch: noarch +Summary: Ceph Manager module for Rook-based orchestration +Requires: ceph-mgr = %{version}-%{release} +Requires: python%{python3_pkgversion}-kubernetes +Requires: python%{python3_pkgversion}-jsonpatch + +%description mgr-rook +ceph-mgr-rook is a ceph-mgr module for orchestration functions using +a Rook backend. + +%package mgr-k8sevents +BuildArch: noarch +Summary: Ceph Manager module to orchestrate ceph-events to kubernetes' events API +Requires: ceph-mgr = %{version}-%{release} +Requires: python%{python3_pkgversion}-kubernetes + +%description mgr-k8sevents +ceph-mgr-k8sevents is a ceph-mgr module that sends every ceph-events +to kubernetes' events API + +%package mgr-cephadm +Summary: Ceph Manager module for cephadm-based orchestration +BuildArch: noarch +Requires: ceph-mgr = %{version}-%{release} +Requires: python%{python3_pkgversion}-remoto +Requires: cephadm = %{version}-%{release} +Requires: openssh-clients +Requires: python%{python3_pkgversion}-jinja2 + +%description mgr-cephadm +ceph-mgr-cephadm is a ceph-mgr module for orchestration functions using +the integrated cephadm deployment tool management operations. + +%package fuse +Summary: Ceph fuse-based client +Requires: fuse +Requires: python%{python3_pkgversion} + +%description fuse +FUSE based client for Ceph distributed network file system + +%package -n rbd-fuse +Summary: Ceph fuse-based client +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} + +%description -n rbd-fuse +FUSE based client to map Ceph rbd images to files + +%package -n rbd-mirror +Summary: Ceph daemon for mirroring RBD images +Requires: ceph-base = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} + +%description -n rbd-mirror +Daemon for mirroring RBD images between Ceph clusters, streaming +changes asynchronously. + +%package immutable-object-cache +Summary: Ceph daemon for immutable object cache +Requires: librados2 = %{version}-%{release} + +%description immutable-object-cache +Daemon for immutable object cache. + +%package -n rbd-nbd +Summary: Ceph RBD client base on NBD +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} + +%description -n rbd-nbd +NBD based client to map Ceph rbd images to local device + +%package radosgw +Summary: Rados REST gateway +Requires: ceph-base = %{version}-%{release} +%if 0%{with selinux} +Requires: ceph-selinux = %{version}-%{release} +%endif +Requires: librados2 = %{version}-%{release} +Requires: librgw2 = %{version}-%{release} +Requires: mailcap + +%description radosgw +RADOS is a distributed object store used by the Ceph distributed +storage system. This package provides a REST gateway to the +object store that aims to implement a superset of Amazon's S3 +service as well as the OpenStack Object Storage ("Swift") API. + +%if %{with ocf} +%package resource-agents +Summary: OCF-compliant resource agents for Ceph daemons +Requires: ceph-base = %{version} +Requires: resource-agents + +%description resource-agents +Resource agents for monitoring and managing Ceph daemons +under Open Cluster Framework (OCF) compliant resource +managers such as Pacemaker. +%endif + +%package osd +Summary: Ceph Object Storage Daemon +Provides: ceph-test:/usr/bin/ceph-osdomap-tool +Requires: ceph-base = %{version}-%{release} +Requires: lvm2 +Requires: sudo +Requires: libstoragemgmt + +%description osd +ceph-osd is the object storage daemon for the Ceph distributed file +system. It is responsible for storing objects on a local file system +and providing access to them over the network. + +%if 0%{with seastar} +%package crimson-osd +Summary: Ceph Object Storage Daemon (crimson) +Requires: ceph-osd = %{version}-%{release} + +%description crimson-osd +crimson-osd is the object storage daemon for the Ceph distributed file +system. It is responsible for storing objects on a local file system +and providing access to them over the network. +%endif + +%package -n librados2 +Summary: RADOS distributed object store client library + +%description -n librados2 +RADOS is a reliable, autonomic distributed object storage cluster +developed as part of the Ceph distributed storage system. This is a +shared library allowing applications to access the distributed object +store using a simple file-like interface. + +%package -n librados-devel +Summary: RADOS headers +Requires: librados2 = %{version}-%{release} +Provides: librados2-devel = %{version}-%{release} +Obsoletes: librados2-devel < %{version}-%{release} + +%description -n librados-devel +This package contains C libraries and headers needed to develop programs +that use RADOS object store. + +%package -n libradospp-devel +Summary: RADOS headers +Requires: librados2 = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} + +%description -n libradospp-devel +This package contains C++ libraries and headers needed to develop programs +that use RADOS object store. + +%package -n librgw2 +Summary: RADOS gateway client library +Requires: librados2 = %{version}-%{release} + +%description -n librgw2 +This package provides a library implementation of the RADOS gateway +(distributed object store with S3 and Swift personalities). + +%package -n librgw-devel +Summary: RADOS gateway client library +Requires: librados-devel = %{version}-%{release} +Requires: librgw2 = %{version}-%{release} +Provides: librgw2-devel = %{version}-%{release} +Obsoletes: librgw2-devel < %{version}-%{release} + +%description -n librgw-devel +This package contains libraries and headers needed to develop programs +that use RADOS gateway client library. + +%package -n python%{python3_pkgversion}-rgw +Summary: Python 3 libraries for the RADOS gateway +Requires: librgw2 = %{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-rgw} +Provides: python-rgw = %{version}-%{release} +Obsoletes: python-rgw < %{version}-%{release} + +%description -n python%{python3_pkgversion}-rgw +This package contains Python 3 libraries for interacting with Cephs RADOS +gateway. + +%package -n python%{python3_pkgversion}-rados +Summary: Python 3 libraries for the RADOS object store +Requires: python%{python3_pkgversion} +Requires: librados2 = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-rados} +Provides: python-rados = %{version}-%{release} +Obsoletes: python-rados < %{version}-%{release} + +%description -n python%{python3_pkgversion}-rados +This package contains Python 3 libraries for interacting with Cephs RADOS +object store. + +%if 0%{with libradosstriper} +%package -n libradosstriper1 +Summary: RADOS striping interface +Requires: librados2 = %{version}-%{release} + +%description -n libradosstriper1 +Striping interface built on top of the rados library, allowing +to stripe bigger objects onto several standard rados objects using +an interface very similar to the rados one. + +%package -n libradosstriper-devel +Summary: RADOS striping interface headers +Requires: libradosstriper1 = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} +Requires: libradospp-devel = %{version}-%{release} +Provides: libradosstriper1-devel = %{version}-%{release} +Obsoletes: libradosstriper1-devel < %{version}-%{release} + +%description -n libradosstriper-devel +This package contains libraries and headers needed to develop programs +that use RADOS striping interface. +%endif + +%package -n librbd1 +Summary: RADOS block device client library +Requires: librados2 = %{version}-%{release} + +%description -n librbd1 +RBD is a block device striped across multiple distributed objects in +RADOS, a reliable, autonomic distributed object storage cluster +developed as part of the Ceph distributed storage system. This is a +shared library allowing applications to manage these block devices. + +%package -n librbd-devel +Summary: RADOS block device headers +Requires: librbd1 = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} +Requires: libradospp-devel = %{version}-%{release} +Provides: librbd1-devel = %{version}-%{release} +Obsoletes: librbd1-devel < %{version}-%{release} + +%description -n librbd-devel +This package contains libraries and headers needed to develop programs +that use RADOS block device. + +%package -n python%{python3_pkgversion}-rbd +Summary: Python 3 libraries for the RADOS block device +Requires: librbd1 = %{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-rbd} +Provides: python-rbd = %{version}-%{release} +Obsoletes: python-rbd < %{version}-%{release} + +%description -n python%{python3_pkgversion}-rbd +This package contains Python 3 libraries for interacting with Cephs RADOS +block device. + +%package -n libcephfs2 +Summary: Ceph distributed file system client library + +%description -n libcephfs2 +Ceph is a distributed network file system designed to provide excellent +performance, reliability, and scalability. This is a shared library +allowing applications to access a Ceph distributed file system via a +POSIX-like interface. + +%package -n libcephfs-devel +Summary: Ceph distributed file system headers +Requires: libcephfs2 = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} +Provides: libcephfs2-devel = %{version}-%{release} +Obsoletes: libcephfs2-devel < %{version}-%{release} + +%description -n libcephfs-devel +This package contains libraries and headers needed to develop programs +that use Cephs distributed file system. + +%package -n python%{python3_pkgversion}-cephfs +Summary: Python 3 libraries for Ceph distributed file system +Requires: libcephfs2 = %{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{version}-%{release} +Requires: python%{python3_pkgversion}-ceph-argparse = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-cephfs} +Provides: python-cephfs = %{version}-%{release} +Obsoletes: python-cephfs < %{version}-%{release} + +%description -n python%{python3_pkgversion}-cephfs +This package contains Python 3 libraries for interacting with Cephs distributed +file system. + +%package -n python%{python3_pkgversion}-ceph-argparse +Summary: Python 3 utility libraries for Ceph CLI +%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-argparse} + +%description -n python%{python3_pkgversion}-ceph-argparse +This package contains types and routines for Python 3 used by the Ceph CLI as +well as the RESTful interface. These have to do with querying the daemons for +command-description information, validating user command input against those +descriptions, and submitting the command to the appropriate daemon. + +%package -n python%{python3_pkgversion}-ceph-common +Summary: Python 3 utility libraries for Ceph +Requires: python%{python3_pkgversion}-PyYAML +%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-common} + +%description -n python%{python3_pkgversion}-ceph-common +This package contains data structures, classes and functions used by Ceph. +It also contains utilities used for the cephadm orchestrator. + +%if 0%{with cephfs_shell} +%package -n cephfs-shell +Summary: Interactive shell for Ceph file system +Requires: python%{python3_pkgversion}-cmd2 +Requires: python%{python3_pkgversion}-colorama +Requires: python%{python3_pkgversion}-cephfs + +%description -n cephfs-shell +This package contains an interactive tool that allows accessing a Ceph +file system without mounting it by providing a nice pseudo-shell which +works like an FTP client. +%endif + +%if 0%{with ceph_test_package} +%package -n ceph-test +Summary: Ceph benchmarks and test tools +Requires: ceph-common = %{version}-%{release} +Requires: xmlstarlet +Requires: jq +Requires: socat + +%description -n ceph-test +This package contains Ceph benchmarks and test tools. +%endif + +%if 0%{with cephfs_java} + +%package -n libcephfs_jni1 +Summary: Java Native Interface library for CephFS Java bindings +Requires: java +Requires: libcephfs2 = %{version}-%{release} + +%description -n libcephfs_jni1 +This package contains the Java Native Interface library for CephFS Java +bindings. + +%package -n libcephfs_jni-devel +Summary: Development files for CephFS Java Native Interface library + +Requires: java +Requires: libcephfs_jni1 = %{version}-%{release} +Provides: libcephfs_jni1-devel = %{version}-%{release} +Obsoletes: libcephfs_jni1-devel < %{version}-%{release} +%description -n libcephfs_jni-devel +This package contains the development files for CephFS Java Native Interface +library. + +%package -n cephfs-java +Summary: Java libraries for the Ceph File System +Requires: java +Requires: libcephfs_jni1 = %{version}-%{release} +Requires: junit +BuildRequires: junit + +%description -n cephfs-java +This package contains the Java libraries for the Ceph File System. + +%endif + +%package -n rados-objclass-devel +Summary: RADOS object class development kit +Requires: libradospp-devel = %{version}-%{release} + +%description -n rados-objclass-devel +This package contains libraries and headers needed to develop RADOS object +class plugins. + +%if 0%{with selinux} + +%package selinux +Summary: SELinux support for Ceph MON, OSD and MDS +Requires: ceph-base = %{version}-%{release} +Requires: libselinux-utils +Requires: policycoreutils +Requires(post): ceph-base = %{version}-%{release} +Requires(post): gawk +Requires(post): policycoreutils +Requires(post): selinux-policy-base >= %{_selinux_policy_version} +Requires(postun): policycoreutils + +%description selinux +This package contains SELinux support for Ceph MON, OSD and MDS. The package +also performs file-system relabelling which can take a long time on heavily +populated file-systems. + +%endif + +%package grafana-dashboards +Summary: The set of Grafana dashboards for monitoring purposes +BuildArch: noarch + +%description grafana-dashboards +This package provides a set of Grafana dashboards for monitoring of +Ceph clusters. The dashboards require a Prometheus server setup +collecting data from Ceph Manager "prometheus" module and Prometheus +project "node_exporter" module. The dashboards are designed to be +integrated with the Ceph Manager Dashboard web UI. + +%package prometheus-alerts +Summary: Prometheus alerts for a Ceph deplyoment +BuildArch: noarch +Group: System/Monitoring +%description prometheus-alerts +This package provides Ceph’s default alerts for Prometheus. + +################################################################################# +# common +################################################################################# +%prep +%autosetup -p1 -n %{name}-%{version} + +# Despite disabling diskprediction, some unpackaged files stick around +# Delete directories to prevent these files from being built/installed later +cd /usr/src/mariner/BUILD/%{name}-%{version} +rm -rf ./src/pybind/mgr/diskprediction_local +rm -rf ./src/pybind/mgr/diskprediction_cloud + +%build +# LTO can be enabled as soon as the following GCC bug is fixed: +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 +%define _lto_cflags %{nil} + +%if 0%{with seastar} +. /opt/rh/gcc-toolset-9/enable +%endif + +%if 0%{with cephfs_java} +# Find jni.h +for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do + [ -d $i ] && java_inc="$java_inc -I$i" +done +%endif + +export CPPFLAGS="$java_inc" +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +export LDFLAGS="$RPM_LD_FLAGS" + +%if 0%{with seastar} +# seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk() +export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') +%endif + +# Parallel build settings ... +CEPH_MFLAGS_JOBS="%{?_smp_mflags}" +CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//') +%if 0%{?__isa_bits} == 32 +# 32-bit builds can use 3G memory max, which is not enough even for -j2 +CEPH_SMP_NCPUS="1" +%endif +# do not eat all memory +echo "Available memory:" +free -h +echo "System limits:" +ulimit -a +if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then + mem_per_process=2500 + max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p") + max_jobs="$(($max_mem / $mem_per_process))" + test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits" + test "$CEPH_SMP_NCPUS" -le 0 && CEPH_SMP_NCPUS="1" && echo "Warning: Not using parallel build at all because of memory limits" +fi +export CEPH_SMP_NCPUS +export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS" + +env | sort + +mkdir build +cd build +CMAKE=cmake +${CMAKE} .. \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \ + -DCMAKE_INSTALL_LOCALSTATEDIR=%{_localstatedir} \ + -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ + -DCMAKE_INSTALL_MANDIR=%{_mandir} \ + -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ + -DWITH_MANPAGE=ON \ + -DWITH_PYTHON3=%{python3_version} \ + -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ +%if 0%{without mgr_diskprediction} + -DMGR_DISABLED_MODULES=diskprediction_local\ +%endif +%if 0%{without ceph_test_package} + -DWITH_TESTS=OFF \ +%endif +%if 0%{with cephfs_java} + -DWITH_CEPHFS_JAVA=ON \ +%endif +%if 0%{with selinux} + -DWITH_SELINUX=ON \ +%endif +%if %{with lttng} + -DWITH_LTTNG=ON \ + -DWITH_BABELTRACE=ON \ +%else + -DWITH_LTTNG=OFF \ + -DWITH_BABELTRACE=OFF \ +%endif + $CEPH_EXTRA_CMAKE_ARGS \ +%if 0%{with ocf} + -DWITH_OCF=ON \ +%endif +%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 + -DWITH_BOOST_CONTEXT=ON \ +%else + -DWITH_BOOST_CONTEXT=OFF \ +%endif +%if 0%{with cephfs_shell} + -DWITH_CEPHFS_SHELL=ON \ +%endif +%if 0%{with libradosstriper} + -DWITH_LIBRADOSSTRIPER=ON \ +%else + -DWITH_LIBRADOSSTRIPER=OFF \ +%endif +%if 0%{with amqp_endpoint} + -DWITH_RADOSGW_AMQP_ENDPOINT=ON \ +%else + -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \ +%endif +%if 0%{with kafka_endpoint} + -DWITH_RADOSGW_KAFKA_ENDPOINT=ON \ +%else + -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ +%endif +%if 0%{with cmake_verbose_logging} + -DCMAKE_VERBOSE_MAKEFILE=ON \ +%endif + -DBOOST_J=$CEPH_SMP_NCPUS \ + -DWITH_GRAFANA=ON + +%if %{with cmake_verbose_logging} +cat ./CMakeFiles/CMakeOutput.log +cat ./CMakeFiles/CMakeError.log +%endif + +make "$CEPH_MFLAGS_JOBS" + + +%if 0%{with make_check} +%check +# run in-tree unittests +cd build +ctest "$CEPH_MFLAGS_JOBS" +%endif + + +%install +pushd build +make DESTDIR=%{buildroot} install +# we have dropped sysvinit bits +rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph +popd + +%if 0%{with seastar} +# package crimson-osd with the name of ceph-osd +install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd +%endif + +install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap +install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph +install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf +install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset +mkdir -p %{buildroot}%{_sbindir} +install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph +chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf +install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING +install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf + +install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm +mkdir -p %{buildroot}%{_sharedstatedir}/cephadm +chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm +mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh +chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh +touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys +chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys + +# udev rules +install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules + +# sudoers.d +install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl +install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm + +#set up placeholder directories +mkdir -p %{buildroot}%{_sysconfdir}/ceph +mkdir -p %{buildroot}%{_localstatedir}/run/ceph +mkdir -p %{buildroot}%{_localstatedir}/log/ceph +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/tmp +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mds +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mgr +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash/posted +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd +mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror + +# prometheus alerts +install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml + +%clean +rm -rf %{buildroot} + +################################################################################# +# files and systemd scriptlets +################################################################################# +%files + +%files base +%{_bindir}/ceph-crash +%{_bindir}/crushtool +%{_bindir}/monmaptool +%{_bindir}/osdmaptool +%{_bindir}/ceph-kvstore-tool +%{_bindir}/ceph-run +%{_libexecdir}/systemd/system-preset/50-ceph.preset +%{_sbindir}/ceph-create-keys +%dir %{_libexecdir}/ceph +%{_libexecdir}/ceph/ceph_common.sh +%dir %{_libdir}/rados-classes +%{_libdir}/rados-classes/* +%dir %{_libdir}/ceph +%dir %{_libdir}/ceph/erasure-code +%{_libdir}/ceph/erasure-code/libec_*.so* +%dir %{_libdir}/ceph/compressor +%{_libdir}/ceph/compressor/libceph_*.so* +%{_unitdir}/ceph-crash.service +%dir %{_libdir}/ceph/crypto +%{_libdir}/ceph/crypto/libceph_*.so* +%if %{with lttng} +%{_libdir}/libos_tp.so* +%{_libdir}/libosd_tp.so* +%endif +%config(noreplace) %{_sysconfdir}/logrotate.d/ceph +%config(noreplace) %{_sysconfdir}/sysconfig/ceph +%{_unitdir}/ceph.target +%dir %{python3_sitelib}/ceph_volume +%{python3_sitelib}/ceph_volume/* +%{python3_sitelib}/ceph_volume-* +%{_mandir}/man8/ceph-deploy.8* +%{_mandir}/man8/ceph-create-keys.8* +%{_mandir}/man8/ceph-run.8* +%{_mandir}/man8/crushtool.8* +%{_mandir}/man8/osdmaptool.8* +%{_mandir}/man8/monmaptool.8* +%{_mandir}/man8/ceph-kvstore-tool.8* +#set up placeholder directories +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/crash +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/crash/posted +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/tmp +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mds +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror + +%post base +/sbin/ldconfig +%systemd_post ceph.target ceph-crash.service +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph.target ceph-crash.service >/dev/null 2>&1 || : +fi + +%preun base +%systemd_preun ceph.target ceph-crash.service + +%postun base +/sbin/ldconfig +%systemd_postun ceph.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi +fi + +%pre -n cephadm +getent group cephadm >/dev/null || groupadd -r cephadm +getent passwd cephadm >/dev/null || useradd -r -g cephadm -s /bin/bash -c "cephadm user for mgr/cephadm" -d %{_sharedstatedir}/cephadm cephadm +exit 0 + +%files -n cephadm +%{_sbindir}/cephadm +%{_mandir}/man8/cephadm.8* +%{_sysconfdir}/sudoers.d/cephadm +%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm +%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh +%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys + +%files common +%license %{_defaultdocdir}/ceph/COPYING +%dir %{_docdir}/ceph +%doc %{_docdir}/ceph/sample.ceph.conf +%{_bindir}/ceph +%{_bindir}/ceph-authtool +%{_bindir}/ceph-conf +%{_bindir}/ceph-dencoder +%{_bindir}/ceph-rbdnamer +%{_bindir}/ceph-syn +%{_bindir}/cephfs-data-scan +%{_bindir}/cephfs-journal-tool +%{_bindir}/cephfs-table-tool +%{_bindir}/rados +%{_bindir}/radosgw-admin +%{_bindir}/rbd +%{_bindir}/rbd-replay +%{_bindir}/rbd-replay-many +%{_bindir}/rbdmap +%{_sbindir}/mount.ceph +%if %{with lttng} +%{_bindir}/rbd-replay-prep +%endif +%{_bindir}/ceph-post-file +%{_tmpfilesdir}/ceph-common.conf +%{_mandir}/man8/ceph-authtool.8* +%{_mandir}/man8/ceph-conf.8* +%{_mandir}/man8/ceph-dencoder.8* +%{_mandir}/man8/ceph-diff-sorted.8* +%{_mandir}/man8/ceph-rbdnamer.8* +%{_mandir}/man8/ceph-syn.8* +%{_mandir}/man8/ceph-post-file.8* +%{_mandir}/man8/ceph.8* +%{_mandir}/man8/mount.ceph.8* +%{_mandir}/man8/rados.8* +%{_mandir}/man8/radosgw-admin.8* +%{_mandir}/man8/rbd.8* +%{_mandir}/man8/rbdmap.8* +%{_mandir}/man8/rbd-replay.8* +%{_mandir}/man8/rbd-replay-many.8* +%{_mandir}/man8/rbd-replay-prep.8* +%{_mandir}/man8/rgw-orphan-list.8* +%dir %{_datadir}/ceph/ +%{_datadir}/ceph/known_hosts_drop.ceph.com +%{_datadir}/ceph/id_rsa_drop.ceph.com +%{_datadir}/ceph/id_rsa_drop.ceph.com.pub +%dir %{_sysconfdir}/ceph/ +%config %{_sysconfdir}/bash_completion.d/ceph +%config %{_sysconfdir}/bash_completion.d/rados +%config %{_sysconfdir}/bash_completion.d/rbd +%config %{_sysconfdir}/bash_completion.d/radosgw-admin +%config(noreplace) %{_sysconfdir}/ceph/rbdmap +%{_unitdir}/rbdmap.service +%dir %{_udevrulesdir} +%{_udevrulesdir}/50-rbd.rules +%attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/ +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/ + +%pre common +CEPH_GROUP_ID=167 +CEPH_USER_ID=167 +/usr/sbin/groupadd ceph -g $CEPH_GROUP_ID -o -r 2>/dev/null || : +/usr/sbin/useradd ceph -u $CEPH_USER_ID -o -r -g ceph -s /sbin/nologin -c "Ceph daemons" -d %{_localstatedir}/lib/ceph 2>/dev/null || : +exit 0 + +%post common +%tmpfiles_create %{_tmpfilesdir}/ceph-common.conf + +%postun common +# Package removal cleanup +if [ "$1" -eq "0" ] ; then + rm -rf %{_localstatedir}/log/ceph + rm -rf %{_sysconfdir}/ceph +fi + +%files mds +%{_bindir}/ceph-mds +%{_mandir}/man8/ceph-mds.8* +%{_unitdir}/ceph-mds@.service +%{_unitdir}/ceph-mds.target +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mds + +%post mds +%systemd_post ceph-mds@\*.service ceph-mds.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-mds.target >/dev/null 2>&1 || : +fi + +%preun mds +%systemd_preun ceph-mds@\*.service ceph-mds.target + +%postun mds +%systemd_postun ceph-mds@\*.service ceph-mds.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-mds@\*.service > /dev/null 2>&1 || : + fi +fi + +%files mgr +%{_bindir}/ceph-mgr +%dir %{_datadir}/ceph/mgr +%{_datadir}/ceph/mgr/mgr_module.* +%{_datadir}/ceph/mgr/mgr_util.* +%{_unitdir}/ceph-mgr@.service +%{_unitdir}/ceph-mgr.target +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr + +%post mgr +%systemd_post ceph-mgr@\*.service ceph-mgr.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-mgr.target >/dev/null 2>&1 || : +fi + +%preun mgr +%systemd_preun ceph-mgr@\*.service ceph-mgr.target + +%postun mgr +%systemd_postun ceph-mgr@\*.service ceph-mgr.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || : + fi +fi + +%files mgr-dashboard +%{_datadir}/ceph/mgr/dashboard + +%post mgr-dashboard +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%postun mgr-dashboard +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%if %{with mgr_diskprediction} +%files mgr-diskprediction-local +%{_datadir}/ceph/mgr/diskprediction_local + +%post mgr-diskprediction-local +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%postun mgr-diskprediction-local +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi +%endif + +%files mgr-modules-core +%dir %{_datadir}/ceph/mgr +%{_datadir}/ceph/mgr/alerts +%{_datadir}/ceph/mgr/balancer +%{_datadir}/ceph/mgr/crash +%{_datadir}/ceph/mgr/devicehealth +%{_datadir}/ceph/mgr/influx +%{_datadir}/ceph/mgr/insights +%{_datadir}/ceph/mgr/iostat +%{_datadir}/ceph/mgr/localpool +%{_datadir}/ceph/mgr/orchestrator +%{_datadir}/ceph/mgr/osd_perf_query +%{_datadir}/ceph/mgr/osd_support +%{_datadir}/ceph/mgr/pg_autoscaler +%{_datadir}/ceph/mgr/progress +%{_datadir}/ceph/mgr/prometheus +%{_datadir}/ceph/mgr/rbd_support +%{_datadir}/ceph/mgr/restful +%{_datadir}/ceph/mgr/selftest +%{_datadir}/ceph/mgr/status +%{_datadir}/ceph/mgr/telegraf +%{_datadir}/ceph/mgr/telemetry +%{_datadir}/ceph/mgr/test_orchestrator +%{_datadir}/ceph/mgr/volumes +%{_datadir}/ceph/mgr/zabbix + +%files mgr-rook +%{_datadir}/ceph/mgr/rook + +%post mgr-rook +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%postun mgr-rook +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%files mgr-k8sevents +%{_datadir}/ceph/mgr/k8sevents + +%post mgr-k8sevents +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%postun mgr-k8sevents +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%files mgr-cephadm +%{_datadir}/ceph/mgr/cephadm + +%post mgr-cephadm +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%postun mgr-cephadm +if [ $1 -eq 1 ] ; then + /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : +fi + +%files mon +%{_bindir}/ceph-mon +%{_bindir}/ceph-monstore-tool +%{_mandir}/man8/ceph-mon.8* +%{_unitdir}/ceph-mon@.service +%{_unitdir}/ceph-mon.target +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon + +%post mon +%systemd_post ceph-mon@\*.service ceph-mon.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || : +fi + +%preun mon +%systemd_preun ceph-mon@\*.service ceph-mon.target + +%postun mon +%systemd_postun ceph-mon@\*.service ceph-mon.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-mon@\*.service > /dev/null 2>&1 || : + fi +fi + +%files fuse +%{_bindir}/ceph-fuse +%{_mandir}/man8/ceph-fuse.8* +%{_sbindir}/mount.fuse.ceph +%{_unitdir}/ceph-fuse@.service +%{_unitdir}/ceph-fuse.target + +%files -n rbd-fuse +%{_bindir}/rbd-fuse +%{_mandir}/man8/rbd-fuse.8* + +%files -n rbd-mirror +%{_bindir}/rbd-mirror +%{_mandir}/man8/rbd-mirror.8* +%{_unitdir}/ceph-rbd-mirror@.service +%{_unitdir}/ceph-rbd-mirror.target + +%post -n rbd-mirror +%systemd_post ceph-rbd-mirror@\*.service ceph-rbd-mirror.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-rbd-mirror.target >/dev/null 2>&1 || : +fi + +%preun -n rbd-mirror +%systemd_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target + +%postun -n rbd-mirror +%systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-rbd-mirror@\*.service > /dev/null 2>&1 || : + fi +fi + +%files immutable-object-cache +%{_bindir}/ceph-immutable-object-cache +%{_mandir}/man8/ceph-immutable-object-cache.8* +%{_unitdir}/ceph-immutable-object-cache@.service +%{_unitdir}/ceph-immutable-object-cache.target + +%post immutable-object-cache +%systemd_post ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-immutable-object-cache.target >/dev/null 2>&1 || : +fi + +%preun immutable-object-cache +%systemd_preun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target + +%postun immutable-object-cache +test -n "$FIRST_ARG" || FIRST_ARG=$1 +%systemd_postun ceph-immutable-object-cache@\*.service ceph-immutable-object-cache.target +if [ $FIRST_ARG -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-immutable-object-cache@\*.service > /dev/null 2>&1 || : + fi +fi + +%files -n rbd-nbd +%{_bindir}/rbd-nbd +%{_mandir}/man8/rbd-nbd.8* + +%files radosgw +%{_bindir}/ceph-diff-sorted +%{_bindir}/radosgw +%{_bindir}/radosgw-token +%{_bindir}/radosgw-es +%{_bindir}/radosgw-object-expirer +%{_bindir}/rgw-orphan-list +%{_libdir}/libradosgw.so* +%{_mandir}/man8/radosgw.8* +%dir %{_localstatedir}/lib/ceph/radosgw +%{_unitdir}/ceph-radosgw@.service +%{_unitdir}/ceph-radosgw.target + +%post radosgw +/sbin/ldconfig +%systemd_post ceph-radosgw@\*.service ceph-radosgw.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-radosgw.target >/dev/null 2>&1 || : +fi + +%preun radosgw +%systemd_preun ceph-radosgw@\*.service ceph-radosgw.target + +%postun radosgw +/sbin/ldconfig +%systemd_postun ceph-radosgw@\*.service ceph-radosgw.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-radosgw@\*.service > /dev/null 2>&1 || : + fi +fi + +%files osd +%{_bindir}/ceph-clsinfo +%{_bindir}/ceph-bluestore-tool +%{_bindir}/ceph-objectstore-tool +%{_bindir}/ceph-osdomap-tool +%{_bindir}/ceph-osd +%{_libexecdir}/ceph/ceph-osd-prestart.sh +%{_sbindir}/ceph-volume +%{_sbindir}/ceph-volume-systemd +%{_mandir}/man8/ceph-clsinfo.8* +%{_mandir}/man8/ceph-osd.8* +%{_mandir}/man8/ceph-bluestore-tool.8* +%{_mandir}/man8/ceph-volume.8* +%{_mandir}/man8/ceph-volume-systemd.8* +%{_unitdir}/ceph-osd@.service +%{_unitdir}/ceph-osd.target +%{_unitdir}/ceph-volume@.service +%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd +%config(noreplace) %{_sysctldir}/90-ceph-osd.conf +%{_sysconfdir}/sudoers.d/ceph-osd-smartctl + +%post osd +%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target +if [ $1 -eq 1 ] ; then +/usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : +fi +%if 0%{?sysctl_apply} + %sysctl_apply 90-ceph-osd.conf +%else + /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || : +%endif + +%preun osd +%systemd_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target + +%postun osd +%systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target +if [ $1 -ge 1 ] ; then + # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to + # "yes". In any case: if units are not running, do not touch them. + SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph + if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then + source $SYSCONF_CEPH + fi + if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then + /usr/bin/systemctl try-restart ceph-osd@\*.service ceph-volume@\*.service > /dev/null 2>&1 || : + fi +fi + +%if 0%{with seastar} +%files crimson-osd +%{_bindir}/crimson-osd +%endif + +%if %{with ocf} + +%files resource-agents +%dir %{_prefix}/lib/ocf +%dir %{_prefix}/lib/ocf/resource.d +%dir %{_prefix}/lib/ocf/resource.d/ceph +%attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/ceph/rbd + +%endif + +%files -n librados2 +%{_libdir}/librados.so.* +%dir %{_libdir}/ceph +%{_libdir}/ceph/libceph-common.so.* +%if %{with lttng} +%{_libdir}/librados_tp.so.* +%endif +%dir %{_sysconfdir}/ceph + +%post -n librados2 -p /sbin/ldconfig + +%postun -n librados2 -p /sbin/ldconfig + +%files -n librados-devel +%dir %{_includedir}/rados +%{_includedir}/rados/librados.h +%{_includedir}/rados/rados_types.h +%{_libdir}/librados.so +%if %{with lttng} +%{_libdir}/librados_tp.so +%endif +%{_bindir}/librados-config +%{_mandir}/man8/librados-config.8* + +%files -n libradospp-devel +%dir %{_includedir}/rados +%{_includedir}/rados/buffer.h +%{_includedir}/rados/buffer_fwd.h +%{_includedir}/rados/crc32c.h +%{_includedir}/rados/inline_memory.h +%{_includedir}/rados/librados.hpp +%{_includedir}/rados/librados_fwd.hpp +%{_includedir}/rados/page.h +%{_includedir}/rados/rados_types.hpp + +%files -n python%{python3_pkgversion}-rados +%{python3_sitearch}/rados.cpython*.so +%{python3_sitearch}/rados-*.egg-info + +%if 0%{with libradosstriper} +%files -n libradosstriper1 +%{_libdir}/libradosstriper.so.* + +%post -n libradosstriper1 -p /sbin/ldconfig + +%postun -n libradosstriper1 -p /sbin/ldconfig + +%files -n libradosstriper-devel +%dir %{_includedir}/radosstriper +%{_includedir}/radosstriper/libradosstriper.h +%{_includedir}/radosstriper/libradosstriper.hpp +%{_libdir}/libradosstriper.so +%endif + +%files -n librbd1 +%{_libdir}/librbd.so.* +%if %{with lttng} +%{_libdir}/librbd_tp.so.* +%endif + +%post -n librbd1 -p /sbin/ldconfig + +%postun -n librbd1 -p /sbin/ldconfig + +%files -n librbd-devel +%dir %{_includedir}/rbd +%{_includedir}/rbd/librbd.h +%{_includedir}/rbd/librbd.hpp +%{_includedir}/rbd/features.h +%{_libdir}/librbd.so +%if %{with lttng} +%{_libdir}/librbd_tp.so +%endif + +%files -n librgw2 +%{_libdir}/librgw.so.* +%{_libdir}/librgw_admin_user.so.* +%if %{with lttng} +%{_libdir}/librgw_op_tp.so.* +%{_libdir}/librgw_rados_tp.so.* +%endif + +%post -n librgw2 -p /sbin/ldconfig + +%postun -n librgw2 -p /sbin/ldconfig + +%files -n librgw-devel +%dir %{_includedir}/rados +%{_includedir}/rados/librgw.h +%{_includedir}/rados/librgw_admin_user.h +%{_includedir}/rados/rgw_file.h +%{_libdir}/librgw.so +%{_libdir}/librgw_admin_user.so +%if %{with lttng} +%{_libdir}/librgw_op_tp.so +%{_libdir}/librgw_rados_tp.so +%endif + +%files -n python%{python3_pkgversion}-rgw +%{python3_sitearch}/rgw.cpython*.so +%{python3_sitearch}/rgw-*.egg-info + +%files -n python%{python3_pkgversion}-rbd +%{python3_sitearch}/rbd.cpython*.so +%{python3_sitearch}/rbd-*.egg-info + +%files -n libcephfs2 +%{_libdir}/libcephfs.so.* +%dir %{_sysconfdir}/ceph + +%post -n libcephfs2 -p /sbin/ldconfig + +%postun -n libcephfs2 -p /sbin/ldconfig + +%files -n libcephfs-devel +%dir %{_includedir}/cephfs +%{_includedir}/cephfs/libcephfs.h +%{_includedir}/cephfs/ceph_ll_client.h +%{_libdir}/libcephfs.so + +%files -n python%{python3_pkgversion}-cephfs +%{python3_sitearch}/cephfs.cpython*.so +%{python3_sitearch}/cephfs-*.egg-info +%{python3_sitelib}/ceph_volume_client.py + +%files -n python%{python3_pkgversion}-ceph-argparse +%{python3_sitelib}/ceph_argparse.py +%{python3_sitelib}/ceph_daemon.py + +%files -n python%{python3_pkgversion}-ceph-common +%{python3_sitelib}/ceph +%{python3_sitelib}/ceph-*.egg-info + +%if 0%{with cephfs_shell} +%files -n cephfs-shell +%{python3_sitelib}/cephfs_shell-*.egg-info +%{_bindir}/cephfs-shell +%endif + +%if 0%{with ceph_test_package} +%files -n ceph-test +%{_bindir}/ceph-client-debug +%{_bindir}/ceph_bench_log +%{_bindir}/ceph_kvstorebench +%{_bindir}/ceph_multi_stress_watch +%{_bindir}/ceph_erasure_code_benchmark +%{_bindir}/ceph_omapbench +%{_bindir}/ceph_objectstore_bench +%{_bindir}/ceph_perf_objectstore +%{_bindir}/ceph_perf_local +%{_bindir}/ceph_perf_msgr_client +%{_bindir}/ceph_perf_msgr_server +%{_bindir}/ceph_psim +%{_bindir}/ceph_radosacl +%{_bindir}/ceph_rgw_jsonparser +%{_bindir}/ceph_rgw_multiparser +%{_bindir}/ceph_scratchtool +%{_bindir}/ceph_scratchtoolpp +%{_bindir}/ceph_test_* +%{_bindir}/ceph-coverage +%{_bindir}/ceph-debugpack +%{_bindir}/ceph-dedup-tool +%{_mandir}/man8/ceph-debugpack.8* +%dir %{_libdir}/ceph +%{_libdir}/ceph/ceph-monstore-update-crush.sh +%endif + +%if 0%{with cephfs_java} +%files -n libcephfs_jni1 +%{_libdir}/libcephfs_jni.so.* + +%post -n libcephfs_jni1 -p /sbin/ldconfig + +%postun -n libcephfs_jni1 -p /sbin/ldconfig + +%files -n libcephfs_jni-devel +%{_libdir}/libcephfs_jni.so + +%files -n cephfs-java +%{_javadir}/libcephfs.jar +%{_javadir}/libcephfs-test.jar +%endif + +%files -n rados-objclass-devel +%dir %{_includedir}/rados +%{_includedir}/rados/objclass.h + +%if 0%{with selinux} +%files selinux +%attr(0600,root,root) %{_datadir}/selinux/packages/ceph.pp +%{_datadir}/selinux/devel/include/contrib/ceph.if +%{_mandir}/man8/ceph_selinux.8* + +%post selinux +# backup file_contexts before update +. /etc/selinux/config +FILE_CONTEXT=/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts +cp ${FILE_CONTEXT} ${FILE_CONTEXT}.pre + +# Install the policy +/usr/sbin/semodule -i %{_datadir}/selinux/packages/ceph.pp + +# Load the policy if SELinux is enabled +if ! /usr/sbin/selinuxenabled; then + # Do not relabel if selinux is not enabled + exit 0 +fi + +if diff ${FILE_CONTEXT} ${FILE_CONTEXT}.pre > /dev/null 2>&1; then + # Do not relabel if file contexts did not change + exit 0 +fi + +# Check whether the daemons are running +/usr/bin/systemctl status ceph.target > /dev/null 2>&1 +STATUS=$? + +# Stop the daemons if they were running +if test $STATUS -eq 0; then + /usr/bin/systemctl stop ceph.target > /dev/null 2>&1 +fi + +# Relabel the files fix for first package install +/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null + +rm -f ${FILE_CONTEXT}.pre +# The fixfiles command won't fix label for /var/run/ceph +/usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1 + +# Start the daemons iff they were running before +if test $STATUS -eq 0; then + /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || : +fi +exit 0 + +%postun selinux +if [ $1 -eq 0 ]; then + # backup file_contexts before update + . /etc/selinux/config + FILE_CONTEXT=/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts + cp ${FILE_CONTEXT} ${FILE_CONTEXT}.pre + + # Remove the module + /usr/sbin/semodule -n -r ceph > /dev/null 2>&1 + + # Reload the policy if SELinux is enabled + if ! /usr/sbin/selinuxenabled ; then + # Do not relabel if SELinux is not enabled + exit 0 + fi + + # Check whether the daemons are running + /usr/bin/systemctl status ceph.target > /dev/null 2>&1 + STATUS=$? + + # Stop the daemons if they were running + if test $STATUS -eq 0; then + /usr/bin/systemctl stop ceph.target > /dev/null 2>&1 + fi + + /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null + rm -f ${FILE_CONTEXT}.pre + # The fixfiles command won't fix label for /var/run/ceph + /usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1 + + # Start the daemons if they were running before + if test $STATUS -eq 0; then + /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || : + fi +fi +exit 0 +%endif + +%files grafana-dashboards +%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard +%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/* +%doc monitoring/grafana/dashboards/README +%doc monitoring/grafana/README.md + +%files prometheus-alerts +%attr(0755,root,root) %dir %{_sysconfdir}/prometheus/ceph +%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml + +%changelog +* Fri Aug 21 2020 Thomas Crain 15.2.4-1 +- Initial CBL-Mariner import from Ceph source (license: LGPLv2.1) +- License verified \ No newline at end of file diff --git a/SPECS/docbook5-schemas/docbook5-schemas.signatures.json b/SPECS/docbook5-schemas/docbook5-schemas.signatures.json new file mode 100644 index 00000000000..ad607e06a55 --- /dev/null +++ b/SPECS/docbook5-schemas/docbook5-schemas.signatures.json @@ -0,0 +1,7 @@ +{ + "Signatures": { + "docbook5-schemas-5.1.zip": "b3f3413654003c1e773360d7fc60ebb8abd0e8c9af8e7d6c4b55f124f34d1e7f", + "docbook-5.0.zip": "3dcd65e1f5d9c0c891b3be204fa2bb418ce485d32310e1ca052e81d36623208e", + "LICENSE": "5c66bad84ebcc537a993635ee5daea509830c948eb8c05e9a6d1edb388fda5ed" + } +} \ No newline at end of file diff --git a/SPECS/docbook5-schemas/docbook5-schemas.spec b/SPECS/docbook5-schemas/docbook5-schemas.spec new file mode 100644 index 00000000000..19d6ab2b24b --- /dev/null +++ b/SPECS/docbook5-schemas/docbook5-schemas.spec @@ -0,0 +1,395 @@ +Summary: Norman Walsh's schemas (DTD, Relax NG, W3C schema) for Docbook 5.X +Name: docbook5-schemas +Version: 5.1 +Release: 3%{?dist} +License: Freely redistributable without restriction +URL: https://docbook.org/ +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://www.docbook.org/xml/%{version}/docbook-v%{version}-os.zip +Source0: %{name}-%{version}.zip +Source1: https://www.docbook.org/xml/5.0/docbook-5.0.zip + +Provides: docbook5-dtd = %{version}-%{release} +Provides: docbook5-rng = %{version}-%{release} +Provides: docbook5-sch = %{version}-%{release} +Provides: docbook5-xsd = %{version}-%{release} + +Requires(post): libxml2 >= 2.4.8 +Requires(postun): libxml2 >= 2.4.8 +Requires: xml-common >= 0.6.3-24 +BuildRequires: perl +BuildRequires: unzip +BuildRequires: libxml2 >= 2.4.8 + +BuildArch: noarch + + +%description +Docbook 5.X is a complete rewrite of Docbook in RELAX NG and not compatible +with previous Docbook versions. This package contains Relax NG , DTD and W3C +schema for Docbook 5.X. Syntax of those schemas is XML-compliant and is +developed by the OASIS consortium. + +%prep +%setup -c -T +mkdir 5.0 +mkdir 5.1 + +#Unzip Docbook 5.0 specification +cd 5.0 +unzip %{SOURCE1} +mv docbook-5.0/* . +#Prepare docs to right place +mv docs/ ../ +mv README ../ +mv ChangeLog ../ +cd .. + +#Unzip Docbook 5.1 specification +cd 5.1 +unzip %{SOURCE0} +mv schemas/rng . +mv schemas/sch . +mv schemas/catalog.xml . +mv schemas/docbook.nvdl . +cd .. + +%build +CATALOG=docbook-5.xml +%{_bindir}/xmlcatalog --create --noout $CATALOG +for v in 5.0 +do + # DTD + %{_bindir}/xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML ${v}//EN" \ + "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "system" \ + "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \ + "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "system" \ + "http://docbook.org/xml/${v}/dtd/docbook.dtd" \ + "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG} + # XSD + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbook.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbook.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/xsd/docbook.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbook.xsd" ${CATALOG} + # XSD + XInclude + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbookxi.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbookxi.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/xsd/docbookxi.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbookxi.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/xsd/xi.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xi.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/xsd/xi.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xi.xsd" ${CATALOG} + # XLink + XML + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/xsd/xlink.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xlink.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/xsd/xlink.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xlink.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/xsd/xml.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/xsd/xml.xsd" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG} +done +for v in 5.0 5.1 +do + # RNG + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/rng/docbook.rng" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/rng/docbook.rng" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG} + # RNG+XInclude + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/rng/docbookxi.rng" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/rng/docbookxi.rng" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG} + # RNC + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbook.rnc" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/rng/docbook.rnc" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG} + # RNC+XInclude + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbookxi.rnc" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/rng/docbookxi.rnc" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG} + # Schematron + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/sch/docbook.sch" \ + "file://%{_datadir}/xml/docbook5/schema/sch/${v}/docbook.sch" ${CATALOG} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/sch/docbook.sch" \ + "file://%{_datadir}/xml/docbook5/schema/sch/${v}/docbook.sch" ${CATALOG} +done +# --------------------- +# Build XML catalog files for each Schema +for v in 5.0 5.1 +do + for s in rng sch; do + cat=${v}/${s}/catalog.xml + %{_bindir}/xmlcatalog --noout --create ${cat} + case $s in + sch) + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbook.${s}" \ + "docbook.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \ + "docbook.${s}" ${cat} + ;; + rng) + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbook.${s}" \ + "docbook.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \ + "docbook.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \ + "docbookxi.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \ + "docbookxi.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbook.rnc" \ + "docbook.rnc" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.rnc" \ + "docbook.rnc" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbookxi.rnc" \ + "docbookxi.rnc" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.rnc" \ + "docbookxi.rnc" ${cat} + ;; + esac + done +done +for v in 5.0 +do + for s in dtd xsd; do + cat=${v}/${s}/catalog.xml + %{_bindir}/xmlcatalog --noout --create ${cat} + case $s in + dtd) + %{_bindir}/xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML ${v}//EN" \ + "docbook.dtd" ${cat} + %{_bindir}/xmlcatalog --noout --add "system" \ + "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \ + "docbook.dtd" ${cat} + ;; + xsd) + # http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd + # http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbook.${s}" \ + "docbook.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \ + "docbook.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \ + "docbookxi.${s}" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \ + "docbookxi.${s}" ${cat} + # XLink + XML: + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/xlink.xsd" \ + "xlink.xsd" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/xlink.xsd" \ + "xlink.xsd" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://docbook.org/xml/${v}/${s}/xml.xsd" \ + "xml.xsd" ${cat} + %{_bindir}/xmlcatalog --noout --add "uri" \ + "http://www.oasis-open.org/docbook/xml/${v}/${s}/xml.xsd" \ + "xml.xsd" ${cat} + ;; + esac + done +done + +%install +DOCBOOK5DIR=%{buildroot}%{_datadir}/xml/docbook5 +for v in 5.0 5.1 +do +mkdir -p ${DOCBOOK5DIR}/schema/rng/$v +mkdir -p ${DOCBOOK5DIR}/schema/sch/$v +install -m644 $v/rng/* ${DOCBOOK5DIR}/schema/rng/$v +install -m644 $v/sch/* ${DOCBOOK5DIR}/schema/sch/$v +done +mkdir -p ${DOCBOOK5DIR}/schema/dtd/5.0 +mkdir -p ${DOCBOOK5DIR}/schema/xsd/5.0 +install -m644 5.0/dtd/* ${DOCBOOK5DIR}/schema/dtd/5.0 +install -m644 5.0/xsd/* ${DOCBOOK5DIR}/schema/xsd/5.0 +mkdir -p %{buildroot}%{_bindir} +install -m755 %{version}/tools/db4-entities.pl %{buildroot}%{_bindir} +mkdir -p ${DOCBOOK5DIR}/stylesheet/upgrade +install -m644 %{version}/tools/db4-upgrade.xsl ${DOCBOOK5DIR}/stylesheet/upgrade + +mkdir -p %{buildroot}%{_sysconfdir}/xml +install -m644 docbook-5.xml %{buildroot}%{_sysconfdir}/xml/docbook-5.xml + +%post +ROOTCATALOG=%{_sysconfdir}/xml/catalog +if [ -w $ROOTCATALOG ] +then + for v in 5.0 5.1 + do + %{_bindir}/xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML ${v}//EN" \ + "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \ + $ROOTCATALOG + %{_bindir}/xmlcatalog --noout --add "delegateURI" \ + "http://docbook.org/xml/${v}/rng/" \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \ + $ROOTCATALOG + %{_bindir}/xmlcatalog --noout --add "delegateURI" \ + "http://docbook.org/xml/${v}/sch/" \ + "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \ + $ROOTCATALOG + done + %{_bindir}/xmlcatalog --noout --add "delegateURI" \ + "http://docbook.org/xml/5.0/xsd/" \ + "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \ + $ROOTCATALOG + %{_bindir}/xmlcatalog --noout --add "delegateSystem" \ + "http://docbook.org/xml/5.0/dtd/" \ + "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \ + $ROOTCATALOG + %{_bindir}/xmlcatalog --noout --add "delegateURI" \ + "http://docbook.org/xml/5.0/dtd/" \ + "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \ + $ROOTCATALOG +fi + +%postun +if [ "$1" = 0 ]; then + ROOTCATALOG=%{_sysconfdir}/xml/catalog + if [ -w $ROOTCATALOG ] + then + for v in 5.0 5.1 + do + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \ + $ROOTCATALOG + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \ + $ROOTCATALOG + done + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_datadir}/xml/docbook5/schema/dtd/5.0/catalog.xml" \ + $ROOTCATALOG + %{_bindir}/xmlcatalog --noout --del \ + "file://%{_datadir}/xml/docbook5/schema/xsd/5.0/catalog.xml" \ + $ROOTCATALOG + + fi +fi + +%files +%license 5.1/docbook-v5.1-os.html +%doc docs/* README ChangeLog +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/docbook-5.xml +%dir %{_datadir}/xml/docbook5/ +%dir %{_datadir}/xml/docbook5/schema +%dir %{_datadir}/xml/docbook5/schema/dtd +%dir %{_datadir}/xml/docbook5/schema/rng +%dir %{_datadir}/xml/docbook5/schema/sch +%dir %{_datadir}/xml/docbook5/schema/xsd +%dir %{_datadir}/xml/docbook5/stylesheet +%dir %{_datadir}/xml/docbook5/stylesheet/upgrade +# Docbook5.0 +%{_datadir}/xml/docbook5/schema/dtd/5.0 +%{_datadir}/xml/docbook5/schema/rng/5.0 +%{_datadir}/xml/docbook5/schema/sch/5.0 +%{_datadir}/xml/docbook5/schema/xsd/5.0 +# Docbook 5.1 +%{_datadir}/xml/docbook5/schema/rng/%{version} +%{_datadir}/xml/docbook5/schema/sch/%{version} +%{_datadir}/xml/docbook5/stylesheet/upgrade/db4-upgrade.xsl +%{_bindir}/db4-entities.pl + +%changelog +* Fri Aug 21 2020 Thomas Crain - 5.1-3 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Mon Jul 27 2020 Fedora Release Engineering - 5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Feb 05 2020 Ondrej Vasik - 5.1-1 +- add Docbook 5.1 (no dtd and xsd schemas provided) + +* Tue Jan 28 2020 Fedora Release Engineering - 5.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 5.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 5.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 5.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 5.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 5.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 5.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 5.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 5.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 5.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 5.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 5.0-10 +- Perl 5.18 rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Nov 30 2012 Ondrej Vasik 5.0-8 +- rebuild to have latest entry in the changelog + +* Mon Feb 02 2009 Ondrej Vasik 5.0-2 +- do own /usr/share/xml/docbook5 properly(#483341) + +* Thu Nov 13 2008 Ondrej Vasik 5.0-1 +- Initial Fedora release \ No newline at end of file diff --git a/SPECS/grpc/grpc.spec b/SPECS/grpc/grpc.spec index 173953f7236..c6c56637912 100644 --- a/SPECS/grpc/grpc.spec +++ b/SPECS/grpc/grpc.spec @@ -98,4 +98,4 @@ find %{buildroot} -name '*.cmake' -delete - Switch to system provided packages for zlib and openssl. * Mon Mar 08 2021 Neha Agarwal - 1.35.0-1 -- Original CBL-Mariner version. License Verified. +- Original version for CBL-Mariner. License Verified. diff --git a/SPECS/leveldb/0001-Allow-leveldbjni-build.patch b/SPECS/leveldb/0001-Allow-leveldbjni-build.patch new file mode 100644 index 00000000000..bc0138cbd24 --- /dev/null +++ b/SPECS/leveldb/0001-Allow-leveldbjni-build.patch @@ -0,0 +1,18 @@ +From: Hiram Chirino +Date: Fri, 5 Jul 2013 18:32:28 +0400 +Subject: [PATCH] Allow leveldbjni build + + +diff --git a/include/leveldb/slice.h b/include/leveldb/slice.h +index 2df417d..1af5635 100644 +--- a/include/leveldb/slice.h ++++ b/include/leveldb/slice.h +@@ -86,7 +86,6 @@ class LEVELDB_EXPORT Slice { + return ((size_ >= x.size_) && (memcmp(data_, x.data_, x.size_) == 0)); + } + +- private: + const char* data_; + size_t size_; + }; + \ No newline at end of file diff --git a/SPECS/leveldb/0002-Added-a-DB-SuspendCompations-and-DB-ResumeCompaction.patch b/SPECS/leveldb/0002-Added-a-DB-SuspendCompations-and-DB-ResumeCompaction.patch new file mode 100644 index 00000000000..d8d6238881e --- /dev/null +++ b/SPECS/leveldb/0002-Added-a-DB-SuspendCompations-and-DB-ResumeCompaction.patch @@ -0,0 +1,119 @@ +From: Hiram Chirino +Date: Tue, 30 Oct 2012 16:56:52 -0400 +Subject: [PATCH] Added a DB:SuspendCompations() and DB:ResumeCompactions() + methods. Fixes issue #184 + +https://code.google.com/p/leveldb/issues/detail?id=184 + +diff --git a/db/db_impl.cc b/db/db_impl.cc +index 761ebf6..da4e160 100644 +--- a/db/db_impl.cc ++++ b/db/db_impl.cc +@@ -136,6 +136,9 @@ DBImpl::DBImpl(const Options& raw_options, const std::string& dbname) + table_cache_(new TableCache(dbname_, options_, TableCacheSize(options_))), + db_lock_(nullptr), + shutting_down_(false), ++ suspend_cv(&suspend_mutex), ++ suspend_count(0), ++ suspended(false), + background_work_finished_signal_(&mutex_), + mem_(nullptr), + imm_(nullptr), +@@ -1455,6 +1458,39 @@ void DBImpl::GetApproximateSizes(const Range* range, int n, uint64_t* sizes) { + } + } + ++void DBImpl::SuspendCompactions() { ++ MutexLock l(& suspend_mutex); ++ env_->Schedule(&SuspendWork, this); ++ suspend_count++; ++ while( !suspended ) { ++ suspend_cv.Wait(); ++ } ++} ++void DBImpl::SuspendWork(void* db) { ++ reinterpret_cast(db)->SuspendCallback(); ++} ++void DBImpl::SuspendCallback() { ++ MutexLock l(&suspend_mutex); ++ Log(options_.info_log, "Compactions suspended"); ++ suspended = true; ++ suspend_cv.SignalAll(); ++ while( suspend_count > 0 ) { ++ suspend_cv.Wait(); ++ } ++ suspended = false; ++ suspend_cv.SignalAll(); ++ Log(options_.info_log, "Compactions resumed"); ++} ++void DBImpl::ResumeCompactions() { ++ MutexLock l(&suspend_mutex); ++ suspend_count--; ++ suspend_cv.SignalAll(); ++ while( suspended ) { ++ suspend_cv.Wait(); ++ } ++} ++ ++ + // Default implementations of convenience methods that subclasses of DB + // can call if they wish + Status DB::Put(const WriteOptions& opt, const Slice& key, const Slice& value) { +diff --git a/db/db_impl.h b/db/db_impl.h +index ae87d6e..6213ccd 100644 +--- a/db/db_impl.h ++++ b/db/db_impl.h +@@ -47,6 +47,8 @@ class DBImpl : public DB { + virtual bool GetProperty(const Slice& property, std::string* value); + virtual void GetApproximateSizes(const Range* range, int n, uint64_t* sizes); + virtual void CompactRange(const Slice* begin, const Slice* end); ++ virtual void SuspendCompactions(); ++ virtual void ResumeCompactions(); + + // Extra methods (for testing) that are not in the public DB interface + +@@ -169,6 +171,13 @@ class DBImpl : public DB { + // Lock over the persistent DB state. Non-null iff successfully acquired. + FileLock* db_lock_; + ++ port::Mutex suspend_mutex; ++ port::CondVar suspend_cv; ++ int suspend_count; ++ bool suspended; ++ static void SuspendWork(void* db); ++ void SuspendCallback(); ++ + // State below is protected by mutex_ + port::Mutex mutex_; + std::atomic shutting_down_; +diff --git a/db/db_test.cc b/db/db_test.cc +index 78296d5..9a9c613 100644 +--- a/db/db_test.cc ++++ b/db/db_test.cc +@@ -2024,6 +2024,8 @@ class ModelDB : public DB { + }; + + explicit ModelDB(const Options& options) : options_(options) {} ++ virtual void SuspendCompactions() {} ++ virtual void ResumeCompactions() {} + ~ModelDB() {} + virtual Status Put(const WriteOptions& o, const Slice& k, const Slice& v) { + return DB::Put(o, k, v); +diff --git a/include/leveldb/db.h b/include/leveldb/db.h +index ea3d9e5..bd039c4 100644 +--- a/include/leveldb/db.h ++++ b/include/leveldb/db.h +@@ -145,6 +145,12 @@ class LEVELDB_EXPORT DB { + // Therefore the following call will compact the entire database: + // db->CompactRange(nullptr, nullptr); + virtual void CompactRange(const Slice* begin, const Slice* end) = 0; ++ ++ // Suspends the background compaction thread. This methods ++ // returns once suspended. ++ virtual void SuspendCompactions() = 0; ++ // Resumes a suspended background compation thread. ++ virtual void ResumeCompactions() = 0; + }; + + // Destroy the contents of the specified database. + \ No newline at end of file diff --git a/SPECS/leveldb/0003-allow-Get-calls-to-avoid-copies-into-std-string.patch b/SPECS/leveldb/0003-allow-Get-calls-to-avoid-copies-into-std-string.patch new file mode 100644 index 00000000000..29b61b0c2bf --- /dev/null +++ b/SPECS/leveldb/0003-allow-Get-calls-to-avoid-copies-into-std-string.patch @@ -0,0 +1,166 @@ +From: Steve Vinoski +Date: Thu, 20 Dec 2012 16:14:11 -0500 +Subject: [PATCH] allow Get() calls to avoid copies into std::string + +Add a new abstract base class leveldb::Value that applications can easily +derive from to supply their own memory management for values retrieved via +Get(). Add an internal class derived from Value that provides std::string +management to preserve backward compatibility. Overload DBImpl::Get() to +accept a Value*, and to preserve backward compatibility also keep the +original version taking a std::string*. + +diff --git a/db/db_impl.cc b/db/db_impl.cc +index 761ebf6..16af7e2 100644 +--- a/db/db_impl.cc ++++ b/db/db_impl.cc +@@ -86,6 +86,22 @@ struct DBImpl::CompactionState { + uint64_t total_bytes; + }; + ++Value::~Value() {} ++ ++class StringValue : public Value { ++ public: ++ explicit StringValue(std::string& val) : value_(val) {} ++ ~StringValue() {} ++ ++ StringValue& assign(const char* data, size_t size) { ++ value_.assign(data, size); ++ return *this; ++ } ++ ++ private: ++ std::string& value_; ++}; ++ + // Fix user-supplied options to be reasonable + template + static void ClipToRange(T* ptr, V minvalue, V maxvalue) { +@@ -1099,6 +1115,13 @@ int64_t DBImpl::TEST_MaxNextLevelOverlappingBytes() { + + Status DBImpl::Get(const ReadOptions& options, const Slice& key, + std::string* value) { ++ StringValue stringvalue(*value); ++ return DBImpl::Get(options, key, &stringvalue); ++} ++ ++Status DBImpl::Get(const ReadOptions& options, ++ const Slice& key, ++ Value* value) { + Status s; + MutexLock l(&mutex_); + SequenceNumber snapshot; +diff --git a/db/db_impl.h b/db/db_impl.h +index ae87d6e..ab96bc7 100644 +--- a/db/db_impl.h ++++ b/db/db_impl.h +@@ -41,6 +41,9 @@ class DBImpl : public DB { + virtual Status Write(const WriteOptions& options, WriteBatch* updates); + virtual Status Get(const ReadOptions& options, const Slice& key, + std::string* value); ++ virtual Status Get(const ReadOptions& options, ++ const Slice& key, ++ Value* value); + virtual Iterator* NewIterator(const ReadOptions&); + virtual const Snapshot* GetSnapshot(); + virtual void ReleaseSnapshot(const Snapshot* snapshot); +diff --git a/db/db_test.cc b/db/db_test.cc +index 78296d5..cc98ea2 100644 +--- a/db/db_test.cc ++++ b/db/db_test.cc +@@ -2036,6 +2036,11 @@ class ModelDB : public DB { + assert(false); // Not implemented + return Status::NotFound(key); + } ++ virtual Status Get(const ReadOptions& options, ++ const Slice& key, Value* value) { ++ assert(false); // Not implemented ++ return Status::NotFound(key); ++ } + virtual Iterator* NewIterator(const ReadOptions& options) { + if (options.snapshot == nullptr) { + KVMap* saved = new KVMap; +diff --git a/db/memtable.cc b/db/memtable.cc +index c91405c..382e15b 100644 +--- a/db/memtable.cc ++++ b/db/memtable.cc +@@ -97,7 +97,7 @@ void MemTable::Add(SequenceNumber s, ValueType type, const Slice& key, + table_.Insert(buf); + } + +-bool MemTable::Get(const LookupKey& key, std::string* value, Status* s) { ++bool MemTable::Get(const LookupKey& key, Value* value, Status* s) { + Slice memkey = key.memtable_key(); + Table::Iterator iter(&table_); + iter.Seek(memkey.data()); +diff --git a/db/memtable.h b/db/memtable.h +index 9d986b1..85c4cce 100644 +--- a/db/memtable.h ++++ b/db/memtable.h +@@ -60,7 +60,7 @@ class MemTable { + // If memtable contains a deletion for key, store a NotFound() error + // in *status and return true. + // Else, return false. +- bool Get(const LookupKey& key, std::string* value, Status* s); ++ bool Get(const LookupKey& key, Value* value, Status* s); + + private: + friend class MemTableIterator; +diff --git a/db/version_set.cc b/db/version_set.cc +index 96a92cc..6037878 100644 +--- a/db/version_set.cc ++++ b/db/version_set.cc +@@ -257,7 +257,7 @@ struct Saver { + SaverState state; + const Comparator* ucmp; + Slice user_key; +- std::string* value; ++ Value* value; + }; + } // namespace + static void SaveValue(void* arg, const Slice& ikey, const Slice& v) { +@@ -324,7 +324,7 @@ void Version::ForEachOverlapping(Slice user_key, Slice internal_key, void* arg, + } + + Status Version::Get(const ReadOptions& options, const LookupKey& k, +- std::string* value, GetStats* stats) { ++ Value* value, GetStats* stats) { + Slice ikey = k.internal_key(); + Slice user_key = k.user_key(); + const Comparator* ucmp = vset_->icmp_.user_comparator(); +diff --git a/db/version_set.h b/db/version_set.h +index 69f3d70..0f0a463 100644 +--- a/db/version_set.h ++++ b/db/version_set.h +@@ -72,7 +72,7 @@ class Version { + // REQUIRES: This version has been saved (see VersionSet::SaveTo) + void AddIterators(const ReadOptions&, std::vector* iters); + +- Status Get(const ReadOptions&, const LookupKey& key, std::string* val, ++ Status Get(const ReadOptions&, const LookupKey& key, Value* val, + GetStats* stats); + + // Adds "stats" into the current state. Returns true if a new +diff --git a/include/leveldb/db.h b/include/leveldb/db.h +index ea3d9e5..7891b41 100644 +--- a/include/leveldb/db.h ++++ b/include/leveldb/db.h +@@ -40,6 +40,17 @@ struct LEVELDB_EXPORT Range { + Slice limit; // Not included in the range + }; + ++// Abstract holder for a DB value. ++// This allows callers to manage their own value buffers and have ++// DB values copied directly into those buffers. ++class Value { ++ public: ++ virtual Value& assign(const char* data, size_t size) = 0; ++ ++ protected: ++ virtual ~Value(); ++}; ++ + // A DB is a persistent ordered map from keys to values. + // A DB is safe for concurrent access from multiple threads without + // any external synchronization. + \ No newline at end of file diff --git a/SPECS/leveldb/0004-bloom_test-failure-on-big-endian-archs.patch b/SPECS/leveldb/0004-bloom_test-failure-on-big-endian-archs.patch new file mode 100644 index 00000000000..49cb4cfc596 --- /dev/null +++ b/SPECS/leveldb/0004-bloom_test-failure-on-big-endian-archs.patch @@ -0,0 +1,27 @@ +From: Yehuda Sadeh +Date: Mon, 2 Jul 2012 14:29:06 -0700 +Subject: [PATCH] bloom_test failure on big endian archs + +When running bloom_test on big endian machines it fails due to unacceptable +false positive rate. I've looked into the issue and it seems that the +reason for that is that it passes a different input than when it runs on +little endian. When transforming the input to be little endian it behaves +as expected. +This issue holds up inclusion of ceph to debian due to ceph's use of +leveldb. The fix can be to bump up the acceptable false positives. + +https://groups.google.com/d/topic/leveldb/SbVPvl4j4vU/discussion + +diff --git a/util/bloom_test.cc b/util/bloom_test.cc +index 436daa9..e4edc45 100644 +--- a/util/bloom_test.cc ++++ b/util/bloom_test.cc +@@ -136,7 +136,7 @@ TEST(BloomTest, VaryingLengths) { + fprintf(stderr, "False positives: %5.2f%% @ length = %6d ; bytes = %6d\n", + rate * 100.0, length, static_cast(FilterSize())); + } +- ASSERT_LE(rate, 0.02); // Must not be over 2% ++ ASSERT_LE(rate, 0.03); // Must not be over 3% + if (rate > 0.0125) + mediocre_filters++; // Allowed, but not too often + else diff --git a/SPECS/leveldb/leveldb.signatures.json b/SPECS/leveldb/leveldb.signatures.json new file mode 100644 index 00000000000..c1685870832 --- /dev/null +++ b/SPECS/leveldb/leveldb.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "leveldb-1.22.tar.gz": "55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2" + } +} \ No newline at end of file diff --git a/SPECS/leveldb/leveldb.spec b/SPECS/leveldb/leveldb.spec new file mode 100644 index 00000000000..f096fcc9f36 --- /dev/null +++ b/SPECS/leveldb/leveldb.spec @@ -0,0 +1,206 @@ +%undefine __cmake_in_source_build + +Summary: A fast and lightweight key/value database library by Google +Name: leveldb +Version: 1.22 +Release: 3%{?dist} +License: BSD +URL: https://github.com/google/leveldb +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +# available in https://github.com/fusesource/leveldbjni/blob/leveldb.patch +Patch0001: 0001-Allow-leveldbjni-build.patch +# https://github.com/fusesource/leveldbjni/issues/34 +# https://code.google.com/p/leveldb/issues/detail?id=184 +# Add DB::SuspendCompactions() and DB:: ResumeCompactions() methods +Patch0002: 0002-Added-a-DB-SuspendCompations-and-DB-ResumeCompaction.patch +# Cherry-picked from Basho's fork +Patch0003: 0003-allow-Get-calls-to-avoid-copies-into-std-string.patch +# https://groups.google.com/d/topic/leveldb/SbVPvl4j4vU/discussion +Patch0004: 0004-bloom_test-failure-on-big-endian-archs.patch + +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: make +BuildRequires: snappy-devel +BuildRequires: sqlite-devel + +%description +LevelDB is a fast key-value storage library written at Google that provides an +ordered mapping from string keys to string values. + +%package devel +Summary: Development files for %{name} +# Provided by cmake +#Requires: cmake-filesystem +Requires: cmake +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +%{summary}. + +%prep +%autosetup -p1 + +cat > %{name}.pc << EOF +prefix=%{_prefix} +exec_prefix=${prefix} +libdir=%{_libdir} +includedir=%{_includedir} + +Name: %{name} +Description: %{summary} +Version: %{version} +Libs: -l%{name} +EOF + +%build +%cmake +%make_build + +%install +%make_install + +mkdir -p %{buildroot}%{_libdir}/pkgconfig +cp -a %{name}.pc %{buildroot}%{_libdir}/pkgconfig/ + +%check +ctest -V %{?_smp_mflags} + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + +%files +%license LICENSE +%doc AUTHORS README.md NEWS +%{_libdir}/lib%{name}.so.* + +%files devel +%doc doc/ CONTRIBUTING.md TODO +%{_includedir}/%{name}/ +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name}/ + + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.22-3 +- Initial CBL-Mariner version imported from Fedora 33 (license: MIT) +- License verified + +* Tue Jul 28 2020 Fedora Release Engineering - 1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Mar 29 2020 Kefu Chai - 1.22-1 +- Update to 1.22 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 09 2019 Peter Lemenkov - 1.21-1 +- Update to 1.21 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Oct 23 2017 Stephen Gallagher - 1.20-1 +- Update to 1.20 +- Disable parallel make invocation to prevent build failures + +* Thu Aug 03 2017 Fedora Release Engineering - 1.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 1.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Aug 07 2016 Igor Gnatenko - 1.18-1 +- Update to 1.18 (RHBZ #1306611) +- Cleanups and fixes in spec + +* Thu Feb 04 2016 Fedora Release Engineering - 1.12.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.12.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Tomas Hozza - 1.12.0-9 +- rebuild with newer gcc to resolve linking issues with Ceph + +* Sun Mar 1 2015 Mamoru TASAKA - 1.12.0-8 +- F-23: rebuild for gcc5 ABI change + +* Sun Aug 17 2014 Fedora Release Engineering - 1.12.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.12.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 25 2013 Peter Lemenkov - 1.12.0-5 +- Don't build with assertions + +* Sat Aug 03 2013 Fedora Release Engineering - 1.12.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 10 2013 Peter Lemenkov - 1.12.0-3 +- Backported Basho's patch (see rhbz#982980) + +* Mon Jul 01 2013 gil cattaneo 1.12.0-2 +- add SuspendCompactions and ResumeCompactions methods for allow leveldbjni build + +* Sat Jun 29 2013 gil cattaneo - 1.12.0-1 +- update to 1.12.0 + +* Wed Feb 27 2013 gil cattaneo - 1.9.0-1 +- update to 1.9.0 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Feb 07 2013 Karsten Hopp 1.7.0-5 +- temporarily ignore result of self checks on PPC* (rhbz #908800) + +* Thu Nov 29 2012 gil cattaneo - 1.7.0-4 +- Applied patch for allow leveldbjni build + +* Sat Oct 27 2012 Peter Lemenkov - 1.7.0-3 +- Dirty workarounds for failed tests on ARM + +* Sat Oct 27 2012 Peter Lemenkov - 1.7.0-2 +- Restored patch no.2 + +* Sat Oct 27 2012 Peter Lemenkov - 1.7.0-1 +- Ver. 1.7.0 (API/ABI compatible bugfix release) + +* Tue Aug 21 2012 Dan Horák - 1.5.0-4 +- add workaround for big endians eg. s390(x) + +* Thu Jul 19 2012 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Peter Lemenkov - 1.5.0-2 +- Cleaned up spec by removing EL5-related stuff +- Added notes about the patches + +* Fri Jun 15 2012 Peter Lemenkov - 1.5.0-1 +- Ver. 1.5.0 + +* Thu May 17 2012 Peter Lemenkov - 1.4.0-1 +- Initial package \ No newline at end of file diff --git a/SPECS/libnl3/libnl3.spec b/SPECS/libnl3/libnl3.spec index 53b3ae1bf6f..071b063a545 100644 --- a/SPECS/libnl3/libnl3.spec +++ b/SPECS/libnl3/libnl3.spec @@ -1,7 +1,7 @@ Summary: Netlink Protocol Library Suite Name: libnl3 Version: 3.4.0 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.infradead.org/~tgr/libnl/ @@ -22,6 +22,13 @@ Netlink is a IPC mechanism primarly between the kernel and user space processes. %package devel Summary: Libraries and headers for the libnl Requires: libnl3 +Provides: pkgconfig(libnl-3.0) +Provides: pkgconfig(libnl-cli-3.0) +Provides: pkgconfig(libnl-genl-3.0) +Provides: pkgconfig(libnl-idiag-3.0) +Provides: pkgconfig(libnl-nf-3.0) +Provides: pkgconfig(libnl-route-3.0) +Provides: pkgconfig(libnl-xfrm-3.0) %description devel Headers and static libraries for the libnl @@ -56,27 +63,35 @@ make %{?_smp_mflags} check %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/*.a -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/libnl-3.0.pc +%{_libdir}/pkgconfig/libnl-cli-3.0.pc +%{_libdir}/pkgconfig/libnl-genl-3.0.pc +%{_libdir}/pkgconfig/libnl-idiag-3.0.pc +%{_libdir}/pkgconfig/libnl-nf-3.0.pc +%{_libdir}/pkgconfig/libnl-route-3.0.pc +%{_libdir}/pkgconfig/libnl-xfrm-3.0.pc %changelog +* Fri Aug 28 2020 Thomas Crain - 3.4.0-6 +- Add pkg-config provides to devel package +- License verified * Sat May 09 00:21:15 PST 2020 Nick Samson - 3.4.0-5 - Added %%license line automatically - -* Thu Apr 30 2020 Nicolas Ontiveros 3.4.0-4 -- Rename from libnl to libnl3. -* Tue Apr 14 2020 Nick Samson 3.4.0-3 -- Updated Source0, URL. License verified. -* Tue Sep 03 2019 Mateusz Malisz 3.4.0-2 -- Initial CBL-Mariner import from Photon (license: Apache2). -* Wed Sep 19 2018 Bo Gan 3.4.0-1 -- Updated to version 3.4.0 -* Tue Apr 11 2017 Harish Udaiya Kumar 3.2.29-1 -- Updated to version 3.2.29. -* Tue May 24 2016 Priyesh Padmavilasom 3.2.27-2 -- GA - Bump release of all rpms -* Fri Jan 15 2016 Xiaolin Li 3.2.27-1 -- Updated to version 3.2.27 -* Tue Sep 22 2015 Harish Udaiya Kumar 3.2.25-2 -- Updated build-requires after creating devel package for dbus. -* Tue Jun 23 2015 Divya Thaluru 3.2.25-1 -- Initial build. +* Thu Apr 30 2020 Nicolas Ontiveros - 3.4.0-4 +- Rename from libnl to libnl3. +* Tue Apr 14 2020 Nick Samson - 3.4.0-3 +- Updated Source0, URL. License verified. +* Tue Sep 03 2019 Mateusz Malisz - 3.4.0-2 +- Initial CBL-Mariner import from Photon (license: Apache2). +* Wed Sep 19 2018 Bo Gan - 3.4.0-1 +- Updated to version 3.4.0 +* Tue Apr 11 2017 Harish Udaiya Kumar - 3.2.29-1 +- Updated to version 3.2.29. +* Tue May 24 2016 Priyesh Padmavilasom - 3.2.27-2 +- GA - Bump release of all rpms +* Fri Jan 15 2016 Xiaolin Li - 3.2.27-1 +- Updated to version 3.2.27 +* Tue Sep 22 2015 Harish Udaiya Kumar - 3.2.25-2 +- Updated build-requires after creating devel package for dbus. +* Tue Jun 23 2015 Divya Thaluru - 3.2.25-1 +- Initial build. diff --git a/SPECS/libstoragemgmt/0001-change-run-dir.patch b/SPECS/libstoragemgmt/0001-change-run-dir.patch new file mode 100644 index 00000000000..a8616c01b78 --- /dev/null +++ b/SPECS/libstoragemgmt/0001-change-run-dir.patch @@ -0,0 +1,9 @@ +diff --git a/packaging/daemon/libstoragemgmt.conf b/packaging/daemon/libstoragemgmt.conf +index 1c118a9..cdb43c2 100644 +--- a/packaging/daemon/libstoragemgmt.conf ++++ b/packaging/daemon/libstoragemgmt.conf +@@ -1,2 +1,2 @@ +-D /var/run/lsm 0775 root libstoragemgmt - +-D /var/run/lsm/ipc 0775 root libstoragemgmt - ++D /run/lsm 0775 root libstoragemgmt - ++D /run/lsm/ipc 0775 root libstoragemgmt - diff --git a/SPECS/libstoragemgmt/libstoragemgmt.signatures.json b/SPECS/libstoragemgmt/libstoragemgmt.signatures.json new file mode 100644 index 00000000000..f6e2d51069f --- /dev/null +++ b/SPECS/libstoragemgmt/libstoragemgmt.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "libstoragemgmt-1.8.4.tar.gz": "a2dcd67b2c4d113d2b18a3c0b83015cb05dd692f6061d62b9c6c5e31ef56625a" + } +} \ No newline at end of file diff --git a/SPECS/libstoragemgmt/libstoragemgmt.spec b/SPECS/libstoragemgmt/libstoragemgmt.spec new file mode 100644 index 00000000000..792c459a9fd --- /dev/null +++ b/SPECS/libstoragemgmt/libstoragemgmt.spec @@ -0,0 +1,907 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +Summary: Storage array management library +Name: libstoragemgmt +Version: 1.8.4 +Release: 6%{?dist} +License: LGPLv2+ +URL: https://github.com/libstorage/libstoragemgmt +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-change-run-dir.patch + +Requires: python3-%{name} +BuildRequires: gcc +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: libxml2-devel +#Provided by check +#BuildRequires: check-devel +BuildRequires: check +BuildRequires: perl +BuildRequires: openssl-devel +BuildRequires: glib-devel +BuildRequires: systemd +BuildRequires: bash-completion +BuildRequires: libconfig +BuildRequires: systemd-devel +BuildRequires: procps-ng +BuildRequires: sqlite-devel +BuildRequires: python3-six +BuildRequires: python3-devel +BuildRequires: python3-pywbem + +%{?systemd_requires} +BuildRequires: systemd +BuildRequires: systemd-devel + +BuildRequires: chrpath +BuildRequires: valgrind + +%description +The libStorageMgmt library will provide a vendor agnostic open source storage +application programming interface (API) that will allow management of storage +arrays. The library includes a command line interface for interactive use and +scripting (command lsmcli). The library also has a daemon that is used for +executing plug-ins in a separate process (lsmd). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package -n python3-%{name} +Summary: Python 3 client libraries and plug-in support for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +Requires: python3-%{name}-clibs +%{?python_provide:%python_provide python3-%{name}} + +%description -n python3-%{name} +This contains python 3 client libraries as well as python framework +support and open source plug-ins written in python 3. + +%package -n python3-%{name}-clibs +Summary: Python 3 C extension module for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python3-%{name}-clibs} + +%description -n python3-%{name}-clibs +This package contains python 3 client C extension libraries. + +%package smis-plugin +Summary: Files for SMI-S generic array support for %{name} +BuildRequires: python3-pywbem +Requires: python3-pywbem +BuildArch: noarch +Provides: %{name}-ibm-v7k-plugin = 2:%{version}-%{release} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} + + +%description smis-plugin +The %{name}-smis-plugin package contains plug-in for generic SMI-S array +support. + + +%package netapp-plugin +Summary: Files for NetApp array support for %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +Requires: python3-%{name} = %{version}-%{release} +BuildArch: noarch + +%description netapp-plugin +The %{name}-netapp-plugin package contains plug-in for NetApp array +support. + + +%package targetd-plugin +Summary: Files for targetd array support for %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description targetd-plugin +The %{name}-targetd-plugin package contains plug-in for targetd array +support. + + +%package nstor-plugin +Summary: Files for NexentaStor array support for %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description nstor-plugin +The %{name}-nstor-plugin package contains plug-in for NexentaStor array +support. + +%package udev +Summary: Udev files for %{name} + +%description udev +The %{name}-udev package contains udev rules and helper utilities for +uevents generated by the kernel. + +%package megaraid-plugin +Summary: Files for LSI MegaRAID support for %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description megaraid-plugin +The %{name}-megaraid-plugin package contains the plugin for LSI +MegaRAID storage management via storcli. + +%package hpsa-plugin +Summary: Files for HP SmartArray support for %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description hpsa-plugin +The %{name}-hpsa-plugin package contains the plugin for HP +SmartArray storage management via hpssacli. + +%package arcconf-plugin +Summary: Files for Microsemi Adaptec and Smart Family support for %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description arcconf-plugin +The %{name}-arcconf-plugin package contains the plugin for Microsemi +Adaptec RAID and Smart Family Controller storage management. + +%package nfs-plugin +Summary: Files for NFS local filesystem support for %{name} +Requires: python3-%{name} = %{version} +Requires: %{name}-nfs-plugin-clibs = %{version} +Requires: nfs-utils +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description nfs-plugin +The nfs-plugin package contains plug-in for local NFS exports support. + +%package nfs-plugin-clibs +Summary: Python C extension module for %{name} NFS plugin +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description nfs-plugin-clibs +The %{name}-nfs-plugin-clibs package contains python C +extension for %{name} NFS plugin. + + +%package local-plugin +Summary: Files for local pseudo plugin of %{name} +Requires: python3-%{name} = %{version} +Requires(post): python3-%{name} = %{version} +Requires(postun): python3-%{name} = %{version} +BuildArch: noarch + +%description local-plugin +The %{name}-local-plugin is a plugin that provides auto +plugin selection for locally managed storage. + +%prep +%autosetup -p1 + +%build +./autogen.sh +%configure --with-python3 --disable-static +%make_build + +%install +rm -rf %{buildroot} + +%make_install + +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +#Files for udev handling +mkdir -p %{buildroot}/%{_udevrulesdir} +install -m 644 tools/udev/90-scsi-ua.rules \ + %{buildroot}/%{_udevrulesdir}/90-scsi-ua.rules +install -m 755 tools/udev/scan-scsi-target \ + %{buildroot}/%{_udevrulesdir}/../scan-scsi-target + +mkdir -p %{buildroot}/%{_datadir}/bash-completion/completions/ +mv %{buildroot}/etc/bash_completion.d/lsmcli %{buildroot}/%{_datadir}/bash-completion/completions/ + +%check +if ! make check +then + cat test-suite.log || true + exit 1 +fi + +%pre +getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt +getent passwd libstoragemgmt >/dev/null || \ + useradd -r -g libstoragemgmt -d /var/run/lsm -s /sbin/nologin \ + -c "daemon account for libstoragemgmt" libstoragemgmt + +%post +/sbin/ldconfig +# Create tmp socket folders. +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf +%systemd_post %{name}.service + +%preun +%systemd_preun %{name}.service + +%postun +/sbin/ldconfig +%systemd_postun %{name}.service + +# Need to restart lsmd if plugin is new installed or removed. +%post smis-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +%postun smis-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post netapp-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +%postun netapp-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post targetd-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +%postun targetd-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post nstor-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +%postun nstor-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post megaraid-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi +%postun megaraid-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post hpsa-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi +%postun hpsa-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post arcconf-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi +%postun arcconf-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post nfs-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi +%postun nfs-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +# Need to restart lsmd if plugin is new installed or removed. +%post local-plugin +if [ $1 -eq 1 ]; then + # New install. + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi +%postun local-plugin +if [ $1 -eq 0 ]; then + # Remove + /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi + +%files +%license COPYING.LIB +%doc README NEWS +%{_mandir}/man1/lsmcli.1* +%{_mandir}/man1/lsmd.1* +%{_mandir}/man5/lsmd.conf.5* +%{_libdir}/*.so.* +%{_bindir}/lsmcli +%{_datadir}/bash-completion/completions/lsmcli +%{_bindir}/lsmd +%{_bindir}/simc_lsmplugin +%dir %{_sysconfdir}/lsm +%dir %{_sysconfdir}/lsm/pluginconf.d +%config(noreplace) %{_sysconfdir}/lsm/lsmd.conf +%{_mandir}/man1/simc_lsmplugin.1* + +%{_unitdir}/%{name}.service + +%ghost %dir %attr(0775, root, libstoragemgmt) /run/lsm/ +%ghost %dir %attr(0775, root, libstoragemgmt) /run/lsm/ipc + +%attr(0644, root, root) %{_tmpfilesdir}/%{name}.conf + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc +%{_mandir}/man3/lsm_* +%{_mandir}/man3/libstoragemgmt* + +%files -n python3-%{name} +%dir %{python3_sitelib}/lsm +%{python3_sitelib}/lsm/__init__.* +%dir %{python3_sitelib}/lsm/external +%{python3_sitelib}/lsm/external/* +%{python3_sitelib}/lsm/_client.* +%{python3_sitelib}/lsm/_common.* +%{python3_sitelib}/lsm/_local_disk.* +%{python3_sitelib}/lsm/_data.* +%{python3_sitelib}/lsm/_iplugin.* +%{python3_sitelib}/lsm/_pluginrunner.* +%{python3_sitelib}/lsm/_transport.* +%{python3_sitelib}/lsm/__pycache__/ +%{python3_sitelib}/lsm/version.* +%dir %{python3_sitelib}/lsm/plugin +%{python3_sitelib}/lsm/plugin/__init__.* +%{python3_sitelib}/lsm/plugin/__pycache__/ +%dir %{python3_sitelib}/lsm/plugin/sim +%{python3_sitelib}/lsm/plugin/sim/__pycache__/ +%{python3_sitelib}/lsm/plugin/sim/__init__.* +%{python3_sitelib}/lsm/plugin/sim/simulator.* +%{python3_sitelib}/lsm/plugin/sim/simarray.* +%dir %{python3_sitelib}/lsm/lsmcli +%{python3_sitelib}/lsm/lsmcli/__init__.* +%{python3_sitelib}/lsm/lsmcli/__pycache__/ +%{python3_sitelib}/lsm/lsmcli/data_display.* +%{python3_sitelib}/lsm/lsmcli/cmdline.* +%{_bindir}/sim_lsmplugin +%dir %{_libexecdir}/lsm.d +%{_libexecdir}/lsm.d/find_unused_lun.py* +%{_libexecdir}/lsm.d/local_sanity_check.py* +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf +%{_mandir}/man1/sim_lsmplugin.1* + +%files -n python3-%{name}-clibs +%{python3_sitelib}/lsm/_clib.* + +%files smis-plugin +%dir %{python3_sitelib}/lsm/plugin/smispy +%dir %{python3_sitelib}/lsm/plugin/smispy/__pycache__ +%{python3_sitelib}/lsm/plugin/smispy/__pycache__/* +%{python3_sitelib}/lsm/plugin/smispy/__init__.* +%{python3_sitelib}/lsm/plugin/smispy/smis.* +%{python3_sitelib}/lsm/plugin/smispy/dmtf.* +%{python3_sitelib}/lsm/plugin/smispy/utils.* +%{python3_sitelib}/lsm/plugin/smispy/smis_common.* +%{python3_sitelib}/lsm/plugin/smispy/smis_cap.* +%{python3_sitelib}/lsm/plugin/smispy/smis_sys.* +%{python3_sitelib}/lsm/plugin/smispy/smis_pool.* +%{python3_sitelib}/lsm/plugin/smispy/smis_disk.* +%{python3_sitelib}/lsm/plugin/smispy/smis_vol.* +%{python3_sitelib}/lsm/plugin/smispy/smis_ag.* +%{_bindir}/smispy_lsmplugin +%{_mandir}/man1/smispy_lsmplugin.1* + +%files netapp-plugin +%dir %{python3_sitelib}/lsm/plugin/ontap +%dir %{python3_sitelib}/lsm/plugin/ontap/__pycache__ +%{python3_sitelib}/lsm/plugin/ontap/__pycache__/* +%{python3_sitelib}/lsm/plugin/ontap/__init__.* +%{python3_sitelib}/lsm/plugin/ontap/na.* +%{python3_sitelib}/lsm/plugin/ontap/ontap.* +%{_bindir}/ontap_lsmplugin +%{_mandir}/man1/ontap_lsmplugin.1* + +%files targetd-plugin +%dir %{python3_sitelib}/lsm/plugin/targetd +%dir %{python3_sitelib}/lsm/plugin/targetd/__pycache__ +%{python3_sitelib}/lsm/plugin/targetd/__pycache__/* +%{python3_sitelib}/lsm/plugin/targetd/__init__.* +%{python3_sitelib}/lsm/plugin/targetd/targetd.* +%{_bindir}/targetd_lsmplugin +%{_mandir}/man1/targetd_lsmplugin.1* + +%files nstor-plugin +%dir %{python3_sitelib}/lsm/plugin/nstor +%dir %{python3_sitelib}/lsm/plugin/nstor/__pycache__ +%{python3_sitelib}/lsm/plugin/nstor/__pycache__/* +%{python3_sitelib}/lsm/plugin/nstor/__init__.* +%{python3_sitelib}/lsm/plugin/nstor/nstor.* +%{_bindir}/nstor_lsmplugin +%{_mandir}/man1/nstor_lsmplugin.1* + +%files udev +%{_udevrulesdir}/../scan-scsi-target +%{_udevrulesdir}/90-scsi-ua.rules + +%files megaraid-plugin +%dir %{python3_sitelib}/lsm/plugin/megaraid +%dir %{python3_sitelib}/lsm/plugin/megaraid/__pycache__ +%{python3_sitelib}/lsm/plugin/megaraid/__pycache__/* +%{python3_sitelib}/lsm/plugin/megaraid/__init__.* +%{python3_sitelib}/lsm/plugin/megaraid/megaraid.* +%{python3_sitelib}/lsm/plugin/megaraid/utils.* +%{_bindir}/megaraid_lsmplugin +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/megaraid.conf +%{_mandir}/man1/megaraid_lsmplugin.1* + +%files hpsa-plugin +%dir %{python3_sitelib}/lsm/plugin/hpsa +%dir %{python3_sitelib}/lsm/plugin/hpsa/__pycache__ +%{python3_sitelib}/lsm/plugin/hpsa/__pycache__/* +%{python3_sitelib}/lsm/plugin/hpsa/__init__.* +%{python3_sitelib}/lsm/plugin/hpsa/hpsa.* +%{python3_sitelib}/lsm/plugin/hpsa/utils.* +%{_bindir}/hpsa_lsmplugin +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf +%{_mandir}/man1/hpsa_lsmplugin.1* + +%files nfs-plugin +%dir %{python3_sitelib}/lsm/plugin/nfs +%dir %{python3_sitelib}/lsm/plugin/nfs/__pycache__ +%{python3_sitelib}/lsm/plugin/nfs/__pycache__/* +%{python3_sitelib}/lsm/plugin/nfs/__init__.* +%{python3_sitelib}/lsm/plugin/nfs/nfs.* +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf +%{_bindir}/nfs_lsmplugin +%{_mandir}/man1/nfs_lsmplugin.1* + +%files nfs-plugin-clibs +%{python3_sitelib}/lsm/plugin/nfs/nfs_clib.* + +%files arcconf-plugin +%dir %{python3_sitelib}/lsm/plugin/arcconf +%dir %{python3_sitelib}/lsm/plugin/arcconf/__pycache__ +%{python3_sitelib}/lsm/plugin/arcconf/__pycache__/* +%{python3_sitelib}/lsm/plugin/arcconf/__init__.* +%{python3_sitelib}/lsm/plugin/arcconf/arcconf.* +%{python3_sitelib}/lsm/plugin/arcconf/utils.* +%{_bindir}/arcconf_lsmplugin +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/arcconf.conf +%{_mandir}/man1/arcconf_lsmplugin.1* + +%files local-plugin +%dir %{python3_sitelib}/lsm/plugin/local +%dir %{python3_sitelib}/lsm/plugin/local/__pycache__ +%{python3_sitelib}/lsm/plugin/local/__pycache__/* +%{python3_sitelib}/lsm/plugin/local/__init__.* +%{python3_sitelib}/lsm/plugin/local/local.* +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf +%{_bindir}/local_lsmplugin +%{_mandir}/man1/local_lsmplugin.1* + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.8.4-6 +- Initial CBL-Mariner version imported from Fedora 33 (license: MIT) +- License verified + +* Sat Aug 01 2020 Fedora Release Engineering - 1.8.4-5 +- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard - 1.8.4-3 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Tue May 26 2020 Miro HronÄok - 1.8.4-2 +- Rebuilt for Python 3.9 + +* Thu May 21 2020 Tony Asleson - 1.8.4-1 +- Upgrade to 1.8.4 + +* Wed Feb 12 2020 Tony Asleson - 1.8.3-1 +- Upgrade to 1.8.3 + +* Mon Feb 10 2020 Tony Asleson - 1.8.2-3 +- Correct python clib packages to include ISA for correct dependencies + +* Wed Jan 29 2020 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 10 2019 Tony Asleson - 1.8.2-1 +- Upgrade to 1.8.2 + +* Thu Oct 03 2019 Miro HronÄok - 1.8.0-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro HronÄok - 1.8.0-3 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Apr 17 2019 Tony Asleson - 1.8.0-1 +- Upgrade to 1.8.0 + +* Mon Feb 18 2019 Tony Asleson - 1.7.3-1 +- Upgrade to 1.7.3 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Dec 19 2018 Tony Asleson - 1.7.2-1 +- Upgrade to 1.7.2 + +* Tue Nov 6 2018 Tony Asleson - 1.7.1-1 +- Upgrade to 1.7.1 + +* Wed Oct 31 2018 Tony Asleson - 1.7.0-1 +- Upgrade to 1.7.0 + +* Tue Sep 18 2018 Gris Ge - 1.6.2-10 +- Add explicit package version requirement to libstoragemgmt-nfs-plugin-clibs. + +* Mon Sep 17 2018 Gris Ge - 1.6.2-9 +- Fix the `rpm -V` failures. (RHBZ #1629735, the same issue also in Fedora) + +* Tue Jul 24 2018 Adam Williamson - 1.6.2-8 +- Rebuild for new libconfig + +* Tue Jul 24 2018 Gris Ge - 1.6.2-7 +- Add missing gcc gcc-c++ build requirements. + +* Fri Jul 13 2018 Fedora Release Engineering - 1.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 26 2018 Gris Ge - 1.6.2-5 +- Fix lscmli on python 3.7. + +* Tue Jun 26 2018 Gris Ge - 1.6.2-4 +- Rebuild again with --target=f29-python. + +* Tue Jun 19 2018 Miro HronÄok - 1.6.2-3 +- Rebuilt for Python 3.7 + +* Mon Jun 18 2018 Gris Ge - 1.6.2-2 +- Removed the requirement of initscripts. (RHBZ 1592363) + +* Fri May 18 2018 Gris Ge - 1.6.2-1 +- Upgrade to 1.6.2. + +* Fri Mar 23 2018 Gris Ge - 1.6.1-7 +- Fix incorect memset size. + +* Fri Mar 23 2018 Gris Ge - 1.6.1-6 +- Add ./autogen.sh back to fix the version diff on autotools. + +* Fri Mar 23 2018 Gris Ge - 1.6.1-5 +- Add missing rpm script for arcconf, nfs, local plugins. + +* Thu Mar 22 2018 Gris Ge - 1.6.1-4 +- Fix build on GCC 8 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Lumír Balhar - 1.6.1-2 +- Fix directory ownership in python subpackages + +* Tue Oct 31 2017 Gris Ge - 1.6.1-1 +- Upgrade to 1.6.1 + +* Thu Oct 19 2017 Gris Ge - 1.6.0-1 +- Upgrade to 1.6.0 + +* Sun Oct 15 2017 Gris Ge - 1.5.0-3 +- Specify Python version in SPEC Requires. + +* Wed Oct 11 2017 Gris Ge - 1.5.0-2 +- Fix multilib confliction of nfs-plugin by move binrary file to + another subpackage libstoragemgmt-nfs-plugin-clibs + +* Tue Oct 10 2017 Gris Ge - 1.5.0-0 +- New upstream release 1.5.0: + * New sub-package libstoragemgmt-nfs-plugin, libstoragemgmt-arcconf-plugin, + and libstoragemgmt-local-plugin. + * C API manpages for libstoragemgmt-devel package. + +* Tue Oct 3 2017 Tony Asleson - 1.4.0-5 +- Remove m2crypto requirement + +* Sat Aug 19 2017 Zbigniew JÄ™drzejewski-Szmek - 1.4.0-4 +- Python 2 binary packages renamed to python2-libstoragemgmt and python2-libstoragemgmt-clibs + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 +- %%python_provide added for all four python subpackages + +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 21 2017 Gris Ge 1.4.0-1 +- Add Python3 support. +- New sub rpm package python3-libstoragemgmt. +- Add support of lmiwbem(this rpm use pywbem instead). +- Allow plugin test to be run concurrently. +- Bug fixes: + * Fix megaraid plugin for dell PERC. + * Fix local disk rotation speed query on NVMe disk. + * Fix lsmcli incorrect try-expect on local disk query. + * Fix all the gcc compile warnings. + * Fix the obsolete usage of AC_OUTPUT in configure.ac. +- Library adds: + * Query serial of local disk: + lsm_local_disk_serial_num_get()/lsm.LocalDisk.serial_num_get() + * Query LED status of local disk: + lsm_local_disk_led_status_get()/lsm.LocalDisk.led_status_get() + * Query link speed of local disk: + lsm_local_disk_link_speed_get()/lsm.LocalDisk.link_speed_get() + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Sep 27 2016 Gris Ge 1.3.5-1 +- New upstream release 1.3.5 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.3.2-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed May 18 2016 Tony Asleson 1.3.2-1 +- New upstream release 1.3.2 + +* Fri May 13 2016 Tony Asleson 1.3.1-2 +- Disable make check as we are hitting a valgrind memleak in ld.so + on arm arch. + +* Fri May 13 2016 Tony Asleson 1.3.1-1 +- New upstream release 1.3.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 24 2015 Gris Ge 1.2.3-1 +- New upstream release 1.2.3: + * Bug fixes: + * lsmcli bash completion: Fix syntax error. + * lsmcli bash completion: Fix volume-delete. + * lsmcli bash completion: Add missing completions. + * Fix: selinux dac_override + * Manpage: Update hpsa and megaraid plugin manpages. + * HP Smart Array Plugin: Fix pool querying on P410i. + * MegaRAID Plugin: Fix bug when no volume configured. + +* Fri Jun 19 2015 Gris Ge - 1.2.1-1 +- New upstream release 1.2.1. +- Changed upstream URL and source URL to github. +- New sub-pacakges: + * libstoragemgmt-megaraid-plugin + New plugin in 1.2.0 release. + * libstoragemgmt-hpsa-plugin + New plugin in 1.2.0 release. +- Add bash-completion script for lsmcli. +- New rpmbuild switch: + * '--without test' + Use to skip 'make check' test to save debug time. + * '--without megaraid' + Don't compile megaraid plugin. + * '--without hpsa' + Don't compile hpsa plugin. +- Remove PyYAML BuildRequires. +- Add NEWS(changelog) to document folder. +- Replace the hardcoded udev path with {_udevrulesdir}. +- Fix rpmlint error 'dir-or-file-in-var-run'. +- Mark /run/lsm and /run/lsm/ipc as ghost folder. +- Fix rpmlint warnning 'W: non-standard-uid /run/lsm libstoragemgmt'. +- Add 'Requires(post)' and 'Requires(postun)' to plugins in order + to make sure plugin is installed after libstoragemgmt and removed before + libstoragemgmt. +- Fix the incorrect use of bcond_with and bcond_without. +- Removed autogen.sh which is not required for release version any more. + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.1.0-3 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Jan 16 2015 Tony Asleson 1.1.0-2 +- Make updates work correctly for removed sub package + libstoragemgmt-ibm-v7k-plugin + +* Thu Dec 4 2014 Tony Asleson 1.1.0-1 +- New upstream release +- Fix udev files directory +- Move command line files to python package + +* Wed Oct 8 2014 Tony Asleson - 1.0.0-3 +- Specify udev files to /usr/lib dir instead of /lib +- Move command line python files to python package + +* Wed Oct 1 2014 Tony Asleson - 1.0.0-2 +- BZ 850185, Use new systemd rpm macros +- BZ 1122117, Use correct tmpfiles.d dir + +* Sun Sep 7 2014 Tony Asleson - 1.0.0-1 +- New upstream release + +* Sun Aug 17 2014 Fedora Release Engineering - 0.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 3 2014 Tony Asleson - 0.1.0-1 +- New upstream release + +* Sat Jun 07 2014 Fedora Release Engineering - 0.0.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jan 30 2014 Tony Asleson 0.0.24-1 +- New upstream release + +* Wed Nov 27 2013 Tony Asleson 0.0.23-1 +- New upstream release + +* Mon Aug 12 2013 Tony Asleson 0.0.22-1 +- New upstream release + +* Sat Aug 03 2013 Fedora Release Engineering - 0.0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 16 2013 Tony Asleson 0.0.21-1 +- New upstream release +- Put plug-ins in separate sub packages +- Don't include IBM plug-in on RHEL > 6, missing paramiko + +* Tue May 28 2013 Tony Asleson - 0.0.20-1 +- New upstream release +- Separate package for python libraries +- Make timestamps match on version.py in library +- Add python-paramiko requirement for IBM plug-in + +* Mon Apr 22 2013 Tony Asleson - 0.0.19-1 +- New upstream release + +* Fri Mar 8 2013 Tony Asleson - 0.0.18-1 +- New upstream release + +* Thu Jan 31 2013 Tony Asleson - 0.0.17-1 +- New upstream release + +* Wed Jan 2 2013 Tony Asleson - 0.0.16-1 +- New upstream release + +* Tue Nov 27 2012 Tony Asleson - 0.0.15-1 +- New upstream release + +* Wed Oct 3 2012 Tony Asleson - 0.0.13-1 +- New upstream release + +* Tue Sep 18 2012 Tony Asleson - 0.0.12-1 +- New upstream release + +* Mon Aug 13 2012 Tony Asleson 0.0.11-1 +- New upstream release + +* Fri Jul 27 2012 Dan Horák - 0.0.9-3 +- detect also non-x86 arches in Pegasus check + +* Thu Jul 19 2012 Fedora Release Engineering - 0.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 12 2012 Tony Asleson 0.0.9-1 +- Initial checkin of lio plug-in +- System filtering via URI (smispy) +- Error code mapping (ontap) +- Fixed build so same build tarball is used for all binaries + +* Mon Jun 4 2012 Tony Asleson 0.0.8-1 +- Make building of SMI-S CPP plugin optional +- Add pkg-config file +- SMIS: Fix exception while retrieving Volumes +- SMIS: Fix exception while retrieving Volumes +- lsm: Add package imports +- Make Smis class available in lsm python package +- Add option to disable building C unit test +- Make simulator classes available in lsm python package +- Make ontap class available in lsm python package +- Changes to support building on Fedora 17 (v2) +- Spec. file updates from feedback from T. Callaway (spot) +- F17 linker symbol visibility correction +- Remove unneeded build dependencies and cleaned up some warnings +- C Updates, client C library feature parity with python + +* Fri May 11 2012 Tony Asleson 0.0.7-1 +- Bug fix for smi-s constants +- Display formatting improvements +- Added header option for lsmcli +- Improved version handling for builds +- Made terminology consistent +- Ability to list visibility for access groups and volumes +- Simulator plug-in fully supports all block operations +- Added support for multiple systems with a single plug-in instance + +* Fri Apr 20 2012 Tony Asleson 0.0.6-1 +- Documentation improvements (man & source code) +- Support for access groups +- Unified spec files Fedora/RHEL +- Package version auto generate +- Rpm target added to make +- Bug fix for missing optional property on volume retrieval (smispy plug-in) + +* Fri Apr 6 2012 Tony Asleson 0.0.5-1 +- Spec file clean-up improvements +- Async. operation added to lsmcli and ability to check on job status +- Sub volume replication support +- Ability to check for child dependencies on VOLUMES, FS and files +- SMI-S Bug fixes and improvements + +* Mon Mar 26 2012 Tony Asleson 0.0.4-1 +- Restore from snapshot +- Job identifiers string instead of integer +- Updated license address + +* Wed Mar 14 2012 Tony Asleson 0.0.3-1 +- Changes to installer, daemon uid, gid, /var/run/lsm/* +- NFS improvements and bug fixes +- Python library clean up (rpmlint errors) + +* Sun Mar 11 2012 Tony Asleson 0.0.2-1 +- Added NetApp native plugin + +* Mon Feb 6 2012 Tony Asleson 0.0.1alpha-1 +- Initial version of package diff --git a/SPECS/lsb-release/LICENSE.PTR b/SPECS/lsb-release/LICENSE.PTR new file mode 100644 index 00000000000..672dd19c3a0 --- /dev/null +++ b/SPECS/lsb-release/LICENSE.PTR @@ -0,0 +1,133 @@ +The source for this package does not include an explicit copy of the licenses. +License information is contained within the package source. + +See: +lsb_release + +Copyright (C) 2000 Free Software Group, Inc + +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +Preamble +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS +How to Apply These Terms to Your New Programs +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the program's name and an idea of what it does. +Copyright (C) yyyy name of author + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details +type `show w'. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c' +for details. +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright +interest in the program `Gnomovision' +(which makes passes at compilers) written +by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. \ No newline at end of file diff --git a/SPECS/lsb-release/lsb-release.signatures.json b/SPECS/lsb-release/lsb-release.signatures.json new file mode 100644 index 00000000000..0d072f6aec7 --- /dev/null +++ b/SPECS/lsb-release/lsb-release.signatures.json @@ -0,0 +1,6 @@ +{ + "Signatures": { + "LICENSE.PTR": "e795614588114961fc0d5aa0e142ca79b77a9448f1cbb8d199cdcce8d926d30f", + "lsb-release-1.4.tar.gz": "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" + } +} \ No newline at end of file diff --git a/SPECS/lsb-release/lsb-release.spec b/SPECS/lsb-release/lsb-release.spec new file mode 100644 index 00000000000..fbefb941d4f --- /dev/null +++ b/SPECS/lsb-release/lsb-release.spec @@ -0,0 +1,38 @@ +%define LICENSE_PATH LICENSE.PTR +Summary: lsb_release script +Name: lsb-release +Version: 1.4 +Release: 1%{?dist} +License: GPLv2+ +URL: https://wiki.linuxfoundation.org/lsb/start +Vendor: Microsoft Corporation +Distribution: Mariner +BuildArch: noarch +Source0: https://downloads.sourceforge.net/lsb/%{name}-%{version}.tar.gz +Source1: %{LICENSE_PATH} +BuildRequires: coreutils +BuildRequires: gzip +Requires: mariner-release + +%description +lsb_release prints certain LSB (Linux Standard Base) and Distribution information. + +%prep +%setup -q +cp %{SOURCE1} . + +%install +./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release > lsb_release.1 +gzip -9f lsb_release.1 +install -D -m 644 lsb_release.1.gz %{buildroot}%{_mandir}/man1/lsb_release.1.gz +install -D -m 755 lsb_release %{buildroot}%{_bindir}/lsb_release + +%files +%license %{LICENSE_PATH} +%{_bindir}/lsb_release +%{_mandir}/man1/lsb_release.1.gz + +%changelog +* Wed Aug 26 2020 Thomas Crain - 1.4-1 +- Original version for Mariner. +- License verified. diff --git a/SPECS/mailcap/mailcap.signatures.json b/SPECS/mailcap/mailcap.signatures.json new file mode 100644 index 00000000000..9babb467453 --- /dev/null +++ b/SPECS/mailcap/mailcap.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "mailcap-2.1.49.tar.xz": "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5" + } +} \ No newline at end of file diff --git a/SPECS/mailcap/mailcap.spec b/SPECS/mailcap/mailcap.spec new file mode 100644 index 00000000000..506aee5c52c --- /dev/null +++ b/SPECS/mailcap/mailcap.spec @@ -0,0 +1,352 @@ +Summary: Helper application and MIME type associations for file types +Name: mailcap +Version: 2.1.49 +Release: 3%{?dist} +License: Public Domain and MIT +URL: https://pagure.io/mailcap +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.xz +BuildArch: noarch + +BuildRequires: perl +# the test script is written in python +BuildRequires: python3 + + +%description +The mailcap file is used by the metamail program. Metamail reads the +mailcap file to determine how it should display non-text or multimedia +material. Basically, mailcap associates a particular type of file +with a particular program that a mail agent or other program can call +in order to handle the file. Mailcap should be installed to allow +certain programs to be able to handle non-text files. + +Also included in this package is the mime.types file which contains a +list of MIME types and their filename "extension" associations, used +by several applications e.g. to determine MIME types for filenames. + +%package -n nginx-mimetypes +Summary: MIME type mappings for nginx +License: Public Domain +Requires: nginx + +%description -n nginx-mimetypes +MIME type mappings for nginx. + + +%prep +%setup -q + + +%build +%make_build + + +%install +rm -rf ${buildroot} +%make_install sysconfdir=%{_sysconfdir} mandir=%{_mandir} + + +%check +make check + + +%files +%license COPYING +%doc NEWS +%config(noreplace) %{_sysconfdir}/mailcap +%config(noreplace) %{_sysconfdir}/mime.types +%{_mandir}/man5/mailcap.* + +%files -n nginx-mimetypes +%doc NEWS +%config(noreplace) %{_sysconfdir}/nginx/mime.types + + +%changelog +* Fri Aug 21 2020 Thomas Crain - 2.1.49-3 +- Initial CBL-Mariner version imported from Fedora 33 (license: MIT) +- License verified + +* Tue Jul 28 2020 Fedora Release Engineering - 2.1.49-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 22 2020 Tomas Korbar - 2.1.49-1 +- Rebase to 2.1.49 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.1.48-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.1.48-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.1.48-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.1.48-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 2.1.48-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.1.48-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu May 11 2017 Ville Skyttä - 2.1.48-1 +- Update to 2.1.48 + +* Fri Feb 10 2017 Fedora Release Engineering - 2.1.47-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Nov 1 2016 Ville Skyttä - 2.1.47-1 +- Update to 2.1.47 + +* Thu Jul 28 2016 Miroslav Lichvar - 2.1.46-2 +- Add build requirement for perl + +* Sun May 29 2016 Ville Skyttä - 2.1.46-1 +- Update to 2.1.46 + +* Thu Feb 04 2016 Fedora Release Engineering - 2.1.45-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Sep 25 2015 Ville Skyttä - 2.1.45-1 +- Update to 2.1.45 +- Output nginx-mimetypes subpackage + +* Wed Jun 17 2015 Fedora Release Engineering - 2.1.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Apr 27 2015 Ville Skyttä - 2.1.44-1 +- Update to 2.1.44 + +* Tue Oct 14 2014 Ville Skyttä - 2.1.43-1 +- Update to 2.1.43 +- Mark COPYING as %%license + +* Sat Jun 07 2014 Fedora Release Engineering - 2.1.42-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Oct 5 2013 Ville Skyttä - 2.1.42-1 +- Update to 2.1.42. + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 14 2013 Ville Skyttä - 2.1.41-1 +- Update to 2.1.41. +- Fix bogus dates in %%changelog. + +* Thu Feb 14 2013 Fedora Release Engineering - 2.1.40-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Aug 5 2012 Ville Skyttä - 2.1.40-1 +- Update to 2.1.40. + +* Thu Jul 19 2012 Fedora Release Engineering - 2.1.39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Feb 20 2012 Ville Skyttä - 2.1.39-1 +- Update to 2.1.39. + +* Fri Jan 13 2012 Fedora Release Engineering - 2.1.38-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Aug 16 2011 Ville Skyttä - 2.1.38-1 +- Update to 2.1.38. + +* Tue Mar 29 2011 Ville Skyttä - 2.1.37-1 +- Update to 2.1.37. + +* Tue Feb 22 2011 Ville Skyttä - 2.1.36-1 +- Update to 2.1.36. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.1.35-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 2 2010 Ville Skyttä - 2.1.35-2 +- Fix URL tag (#659210, Matt McCutchen). + +* Wed Oct 13 2010 Ville Skyttä - 2.1.35-1 +- Update to 2.1.35. + +* Tue Aug 24 2010 Ville Skyttä - 2.1.34-1 +- Update to 2.1.34. + +* Sat Jul 3 2010 Ville Skyttä - 2.1.33-1 +- Update to 2.1.33, fixes #604924. + +* Fri Mar 19 2010 Ville Skyttä - 2.1.32-1 +- Update to 2.1.32, fixes #546116. + +* Tue Nov 17 2009 Ville Skyttä - 2.1.31-1 +- Update to 2.1.31, fixes #529584. + +* Sat Sep 19 2009 Ville Skyttä - 2.1.30-1 +- Update to 2.1.30, see NEWS for details. +- Improve summary and description. +- Add MIT to License: for mailcap.4 man page. +- Specfile cleanup. + +* Sat Jul 25 2009 Fedora Release Engineering - 2.1.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.1.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 15 2008 Miroslav Lichvar 2.1.29-1 +- update mime.types (Ville Skyttä) (#476455) + +* Fri Feb 15 2008 Miroslav Lichvar 2.1.28-1 +- add new entries from perl-libwww-perl's media.types + (Ville Skyttä) (#432290) + +* Thu Feb 07 2008 Miroslav Lichvar 2.1.27-1 +- associate *.ent with text/xml-external-parsed-entity + (Ville Skyttä) (#431722) + +* Tue Jan 22 2008 Miroslav Lichvar 2.1.26-1 +- use xdg-open (Ville Skyttä) (#388481) +- spec cleanup (#226116) + +* Tue Jul 10 2007 Miroslav Lichvar 2.1.25-1 +- add image/vnd.microsoft.icon to mime.types (#247222) + +* Mon Jun 18 2007 Miroslav Lichvar 2.1.24-1 +- add text/x-vcard to mime.types (#243889) +- mark configs noreplace, cleanup spec a bit + +* Tue Sep 05 2006 Miroslav Lichvar 2.1.23-1 +- add video/x-flv to mime.types (#205239) + +* Mon Aug 07 2006 Miroslav Lichvar 2.1.22-1 +- add java/mobile mime types (#201512 ) + +* Tue Jul 18 2006 Miroslav Lichvar 2.1.21-1 +- add audio and video x-ms mime types (#197840) + +* Wed Jul 12 2006 Jesse Keating - 2.1.20-1.1 +- rebuild + +* Mon Feb 13 2006 Miroslav Lichvar 2.1.20-1 +- add OpenOffice.org 2.0 mime types (#173789) + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Mar 7 2005 Bill Nottingham 2.1.19-1 +- s/ggv/evince/ (#150509) + +* Fri Jan 21 2005 Bill Nottingham 2.1.18-1 +- add iso, img to octet-stream (#142459 ) + +* Mon Oct 11 2004 Bill Nottingham 2.1.17-1 +- pdfs -> back to ggv + +* Thu Sep 23 2004 Bill Nottingham 2.1.16-1 +- eog -> gthumb +- pdfs -> gpdf + +* Mon May 3 2004 Bill Nottingham 2.1.15-1 +- xpdf/gv -> ggv (#118401) +- add application/x-bittorrent (#118752) + +* Fri Jul 11 2003 Bill Nottingham 2.1.14-1 +- add application/ogg and OpenOffice.org mime.types + +* Fri Feb 7 2003 Bill Nottingham 2.1.13-1 +- resync mime.types with apache +- clean out mailcap some + +* Tue Sep 3 2002 Bill Nottingham 2.1.12-1 +- add application/x-ogg to mime.types + +* Fri Jul 19 2002 Jens Petersen 2.1.11-1 +- use eog instead of ee + +* Tue Jun 18 2002 Nalin Dahyabhai 2.1.10-1 +- resync mime.types with apache 1.3.26 + +* Mon Dec 24 2001 Bill Nottingham 2.1.9-1 +- fix Sep. 17 changes (#57362) + +* Tue Oct 23 2001 Nalin Dahyabhai 2.1.8-1 +- resync mime.types with apache 1.3.22 + +* Mon Sep 17 2001 Bill Nottingham 2.1.7-1 +- associate PS files with gv (#53734) + +* Fri Aug 10 2001 Bill Nottingham +- switch gtv & xanim order (#51408) + +* Tue Jul 17 2001 Bill Nottingham +- use htmlview for text/html (#48141) + +* Wed Mar 21 2001 Tim Waugh 2.1.4-2 +- Use gtv not xanim for video/mpeg, since we no longer ship the codecs. + +* Thu Jan 18 2001 Bill Nottingham +- use gpg, not pgp (#13816, others) + +* Sat Jan 6 2001 Bill Nottingham +- fix typo (#23409) + +* Thu Dec 28 2000 Bill Nottingham +- reintegrate stuff into the package so it doesn't get lost + +* Thu Dec 28 2000 Than Ngo +- add ms(TM) word document entry (Bug #17474) +- bzip2 sources + +* Mon Jun 12 2000 Preston Brown +- add wap entries + +* Fri Jun 9 2000 Bill Nottingham +- remove mailcap.vga + +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages + +* Tue Jan 18 2000 Bill Nottingham +- add .bz2 + +* Thu Jan 13 2000 Bill Nottingham +- add tgz/gz to gzip + +* Wed Jun 16 1999 Bill Nottingham +- rpm files are RPM files. :) + +* Sat May 15 1999 Jeff Johnson +- fix typo in pdf entry (#2618). + +* Mon Mar 29 1999 Bill Nottingham +- comment out play + +* Fri Mar 19 1999 Preston Brown +- updated mime type for images from xv to ee +- cleaned up for our new version of the package which is in CVS + +* Sat Mar 13 1999 Matt Wilson +- updated mime.types + +* Fri Feb 12 1999 Bill Nottingham +- comment out backticked %%variables to work around security problems + +* Wed Jan 06 1999 Cristian Gafton +- glibc version 2.1 + +* Mon Sep 21 1998 Bill Nottingham +- we don't ship tracker, use mikmod instead + +* Wed Jul 29 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Oct 21 1997 Donnie Barnes +- added /etc/mime.types from mutt to this package to make it universal + +* Tue Sep 09 1997 Erik Troan +- made a noarch package \ No newline at end of file diff --git a/SPECS/oath-toolkit/oath-toolkit-2.0.2-man-fix.patch b/SPECS/oath-toolkit/oath-toolkit-2.0.2-man-fix.patch new file mode 100644 index 00000000000..ee5f043c01c --- /dev/null +++ b/SPECS/oath-toolkit/oath-toolkit-2.0.2-man-fix.patch @@ -0,0 +1,60 @@ +diff --git a/libpskc/man/pskc_get_key_algparm_chall_max.3 b/libpskc/man/pskc_get_key_algparm_chall_max.3 +index 6ae79a3..2001320 100644 +--- a/libpskc/man/pskc_get_key_algparm_chall_max.3 ++++ b/libpskc/man/pskc_get_key_algparm_chall_max.3 +@@ -15,8 +15,8 @@ output variable indicating whether data was provided or not. + Get the PSKC KeyPackage Key AlgorithmParameters ChallengeFormat Max + value. This attribute defines the maximum size of the challenge + accepted by the device for CR mode and MUST be included. If the +-'Encoding' attribute is set to 'DECIMAL', 'HEXADECIMAL', or +-'ALPHANUMERIC', this value indicates the maximum number of ++\&'Encoding' attribute is set to 'DECIMAL', 'HEXADECIMAL', or ++\&'ALPHANUMERIC', this value indicates the maximum number of + digits/characters. If the 'Encoding' attribute is set to 'BASE64' + or 'BINARY', this value indicates the maximum number of bytes of + the unencoded value. +diff --git a/libpskc/man/pskc_get_key_algparm_chall_min.3 b/libpskc/man/pskc_get_key_algparm_chall_min.3 +index 85009d6..6e51e52 100644 +--- a/libpskc/man/pskc_get_key_algparm_chall_min.3 ++++ b/libpskc/man/pskc_get_key_algparm_chall_min.3 +@@ -15,8 +15,8 @@ output variable indicating whether data was provided or not. + Get the PSKC KeyPackage Key AlgorithmParameters ChallengeFormat Min + value. This attribute defines the minimum size of the challenge + accepted by the device for CR mode and MUST be included. If the +-'Encoding' attribute is set to 'DECIMAL', 'HEXADECIMAL', or +-'ALPHANUMERIC', this value indicates the minimum number of ++\&'Encoding' attribute is set to 'DECIMAL', 'HEXADECIMAL', or ++\&'ALPHANUMERIC', this value indicates the minimum number of + digits/characters. If the 'Encoding' attribute is set to 'BASE64' + or 'BINARY', this value indicates the minimum number of bytes of + the unencoded value. +diff --git a/libpskc/man/pskc_get_key_policy_pinmaxlength.3 b/libpskc/man/pskc_get_key_policy_pinmaxlength.3 +index be96a9a..d4ce51e 100644 +--- a/libpskc/man/pskc_get_key_policy_pinmaxlength.3 ++++ b/libpskc/man/pskc_get_key_policy_pinmaxlength.3 +@@ -16,9 +16,9 @@ Get the PSKC KeyPackage Key Policy PINPolicy MaxLength value. This + attribute indicates the maximum length of a PIN that can be set to + protect this key. It MUST NOT be possible to set a PIN longer than + this value. If the 'PINFormat' attribute is set to 'DECIMAL', +-'HEXADECIMAL', or 'ALPHANUMERIC', this value indicates the number ++\&'HEXADECIMAL', or 'ALPHANUMERIC', this value indicates the number + of digits/ characters. If the 'PINFormat' attribute is set to +-'BASE64' or 'BINARY', this value indicates the number of bytes of ++\&'BASE64' or 'BINARY', this value indicates the number of bytes of + the unencoded value. + + If \fIpresent\fP is non\-NULL, it will be 0 if the field is not present +diff --git a/libpskc/man/pskc_get_key_policy_pinminlength.3 b/libpskc/man/pskc_get_key_policy_pinminlength.3 +index c00523d..a5efe53 100644 +--- a/libpskc/man/pskc_get_key_policy_pinminlength.3 ++++ b/libpskc/man/pskc_get_key_policy_pinminlength.3 +@@ -16,7 +16,7 @@ Get the PSKC KeyPackage Key Policy PINPolicy MinLength value. This + attribute indicates the minimum length of a PIN that can be set to + protect the associated key. It MUST NOT be possible to set a PIN + shorter than this value. If the 'PINFormat' attribute is set to +-'DECIMAL', 'HEXADECIMAL', or 'ALPHANUMERIC', this value indicates ++\&'DECIMAL', 'HEXADECIMAL', or 'ALPHANUMERIC', this value indicates + the number of digits/ characters. If the 'PINFormat' attribute is + set to 'BASE64' or 'BINARY', this value indicates the number of + bytes of the unencoded value. + \ No newline at end of file diff --git a/SPECS/oath-toolkit/oath-toolkit-2.4.1-retain-original-xmldoc.patch b/SPECS/oath-toolkit/oath-toolkit-2.4.1-retain-original-xmldoc.patch new file mode 100644 index 00000000000..07530cd0a56 --- /dev/null +++ b/SPECS/oath-toolkit/oath-toolkit-2.4.1-retain-original-xmldoc.patch @@ -0,0 +1,42 @@ +--- a/libpskc/build.c ++++ a/libpskc/build.c +@@ -510,7 +510,7 @@ pskc_build_xml (pskc_t * container, char **out, size_t * len) + + xmlDocSetRootElement (doc, keycont); + +- if (container->xmldoc) ++ if (container->xmldoc && container->xmldoc != container->original_xmldoc) + xmlFreeDoc (container->xmldoc); + container->xmldoc = doc; + doc = NULL; +--- a/libpskc/internal.h ++++ a/libpskc/internal.h +@@ -103,7 +103,7 @@ struct pskc_key + struct pskc + { + /* raw XML */ +- xmlDocPtr xmldoc; ++ xmlDocPtr xmldoc, original_xmldoc; + /* Is there a Signature element in xmldoc? */ + int signed_p; + +--- a/libpskc/parser.c ++++ a/libpskc/parser.c +@@ -677,6 +677,8 @@ pskc_done (pskc_t * container) + return; + + xmlFreeDoc (container->xmldoc); ++ if (container->original_xmldoc != container->xmldoc) ++ xmlFreeDoc (container->original_xmldoc); + + for (i = 0; i < container->nkeypackages; i++) + { +@@ -717,7 +719,7 @@ pskc_parse_from_memory (pskc_t * container, size_t len, const char *buffer) + if (xmldoc == NULL) + return PSKC_XML_ERROR; + +- container->xmldoc = xmldoc; ++ container->original_xmldoc = container->xmldoc = xmldoc; + + root = xmlDocGetRootElement (xmldoc); + parse_keycontainer (container, root, &rc); diff --git a/SPECS/oath-toolkit/oath-toolkit-2.6.2-build-fix.patch b/SPECS/oath-toolkit/oath-toolkit-2.6.2-build-fix.patch new file mode 100644 index 00000000000..1ebb5165976 --- /dev/null +++ b/SPECS/oath-toolkit/oath-toolkit-2.6.2-build-fix.patch @@ -0,0 +1,875 @@ +diff --git a/liboath/gl/fflush.c b/liboath/gl/fflush.c +index 3664842..a140b7a 100644 +--- a/liboath/gl/fflush.c ++++ b/liboath/gl/fflush.c +@@ -1,18 +1,18 @@ + /* fflush.c -- allow flushing input streams +- Copyright (C) 2007-2016 Free Software Foundation, Inc. ++ Copyright (C) 2007-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2.1 of the License, or ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU Lesser General Public License for more details. ++ GNU General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ + + /* Written by Eric Blake. */ + +@@ -33,7 +33,8 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++/* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -51,7 +52,7 @@ static void + clear_ungetc_buffer (FILE *fp) + { + # if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + if (HASUB (fp)) + { + fp_->_p += fp_->_r; +@@ -63,7 +64,7 @@ clear_ungetc_buffer (FILE *fp) + fp->_ungetc_count = 0; + fp->_rcount = - fp->_rcount; + } +-# elif defined _IOERR /* Minix, AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ ++# elif defined _IOERR /* Minix, AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + /* Nothing to do. */ + # else /* other implementations */ + fseeko (fp, 0, SEEK_CUR); +@@ -72,10 +73,11 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1) ++/* GNU libc, BeOS, Haiku, Linux libc5 */ + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT +-/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + + static int + disable_seek_optimization (FILE *fp) +@@ -98,7 +100,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER, + off_t pos _GL_UNUSED_PARAMETER) + { + # if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + # if defined __CYGWIN__ + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; +@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +@@ -199,7 +202,7 @@ rpl_fflush (FILE *stream) + } + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + + { + /* Disable seek optimization for the next fseeko call. This tells the +diff --git a/liboath/gl/fpurge.c b/liboath/gl/fpurge.c +index acf5905..f9c2d25 100644 +--- a/liboath/gl/fpurge.c ++++ b/liboath/gl/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/liboath/gl/freading.c b/liboath/gl/freading.c +index 8ab19fd..54c3d5a 100644 +--- a/liboath/gl/freading.c ++++ b/liboath/gl/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/liboath/gl/fseeko.c b/liboath/gl/fseeko.c +index 67bb9ec..5616221 100644 +--- a/liboath/gl/fseeko.c ++++ b/liboath/gl/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/liboath/gl/stdio-impl.h b/liboath/gl/stdio-impl.h +index 4c02c9f..393ef0c 100644 +--- a/liboath/gl/stdio-impl.h ++++ b/liboath/gl/stdio-impl.h +@@ -1,23 +1,29 @@ + /* Implementation details of FILE streams. +- Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2.1 of the License, or ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU Lesser General Public License for more details. ++ GNU General Public License for more details. + +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ + + /* Many stdio implementations have the same logic and therefore can share + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +@@ -29,10 +35,10 @@ + #include /* For detecting Plan9. */ + + #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ +- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + + # if defined __DragonFly__ /* DragonFly */ +- /* See . */ ++ /* See . */ + # define fp_ ((struct { struct __FILE_public pub; \ + struct { unsigned char *_base; int _size; } _bf; \ + void *cookie; \ +@@ -49,30 +55,84 @@ + fpos_t _offset; \ + /* More fields, not relevant here. */ \ + } *) fp) +- /* See . */ ++ /* See . */ + # define _p pub._p + # define _flags pub._flags + # define _r pub._r + # define _w pub._w ++# elif defined __ANDROID__ /* Android */ ++ /* Up to this commit from 2015-10-12 ++ ++ the innards of FILE were public, and fp_ub could be defined like for OpenBSD, ++ see ++ and . ++ After this commit, the innards of FILE are hidden. */ ++# define fp_ ((struct { unsigned char *_p; \ ++ int _r; \ ++ int _w; \ ++ int _flags; \ ++ int _file; \ ++ struct { unsigned char *_base; size_t _size; } _bf; \ ++ int _lbfsize; \ ++ void *_cookie; \ ++ void *_close; \ ++ void *_read; \ ++ void *_seek; \ ++ void *_write; \ ++ struct { unsigned char *_base; size_t _size; } _ext; \ ++ unsigned char *_up; \ ++ int _ur; \ ++ unsigned char _ubuf[3]; \ ++ unsigned char _nbuf[1]; \ ++ struct { unsigned char *_base; size_t _size; } _lb; \ ++ int _blksize; \ ++ fpos_t _offset; \ ++ /* More fields, not relevant here. */ \ ++ } *) fp) + # else + # define fp_ fp + # endif + +-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ ++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ + /* See +- and */ ++ and ++ and */ + struct __sfileext + { + struct __sbuf _ub; /* ungetc buffer */ + /* More fields, not relevant here. */ + }; + # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub +-# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ ++# elif defined __ANDROID__ /* Android */ ++ struct __sfileext ++ { ++ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ ++ /* More fields, not relevant here. */ ++ }; ++# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub ++# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ + # define fp_ub fp_->_ub + # endif + + # define HASUB(fp) (fp_ub._base != NULL) + ++# if defined __ANDROID__ /* Android */ ++ /* Needed after this commit from 2016-01-25 ++ */ ++# ifndef __SEOF ++# define __SLBF 1 ++# define __SNBF 2 ++# define __SRD 4 ++# define __SWR 8 ++# define __SRW 0x10 ++# define __SEOF 0x20 ++# define __SERR 0x40 ++# endif ++# ifndef __SOFF ++# define __SOFF 0x1000 ++# endif ++# endif ++ + #endif + + +@@ -81,7 +141,7 @@ + #ifdef __TANDEM /* NonStop Kernel */ + # ifndef _IOERR + /* These values were determined by the program 'stdioext-flags' at +- . */ ++ . */ + # define _IOERR 0x40 + # define _IOREAD 0x80 + # define _IOWRT 0x4 +@@ -99,6 +159,8 @@ + int _file; \ + unsigned int _flag; \ + } *) fp) ++# elif defined __VMS /* OpenVMS */ ++# define fp_ ((struct _iobuf *) fp) + # else + # define fp_ fp + # endif +@@ -110,4 +172,31 @@ + # define _flag __flag + # endif + ++#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ ++ ++/* does not define the innards of FILE any more. */ ++# define WINDOWS_OPAQUE_FILE ++ ++struct _gl_real_FILE ++{ ++ /* Note: Compared to older Windows and to mingw, it has the fields ++ _base and _cnt swapped. */ ++ unsigned char *_ptr; ++ unsigned char *_base; ++ int _cnt; ++ int _flag; ++ int _file; ++ int _charbuf; ++ int _bufsiz; ++}; ++# define fp_ ((struct _gl_real_FILE *) fp) ++ ++/* These values were determined by a program similar to the one at ++ . */ ++# define _IOREAD 0x1 ++# define _IOWRT 0x2 ++# define _IORW 0x4 ++# define _IOEOF 0x8 ++# define _IOERR 0x10 ++ + #endif +diff --git a/libpskc/gl/intprops.h b/libpskc/gl/intprops.h +index feb02c3..af456ff 100644 +--- a/libpskc/gl/intprops.h ++++ b/libpskc/gl/intprops.h +@@ -1,6 +1,6 @@ + /* intprops.h -- properties of integer types + +- Copyright (C) 2001-2016 Free Software Foundation, Inc. ++ Copyright (C) 2001-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published +@@ -13,7 +13,7 @@ + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +@@ -21,13 +21,12 @@ + #define _GL_INTPROPS_H + + #include +-#include + + /* Return a value with the common real type of E and V and the value of V. */ + #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) + + /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see +- . */ ++ . */ + #define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) + + /* The extra casts in the following macros work around compiler bugs, +@@ -47,12 +46,16 @@ + + /* Minimum and maximum values for integer types and expressions. */ + ++/* The width in bits of the integer type or expression T. ++ Padding bits are not supported; this is checked at compile-time below. */ ++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) ++ + /* The maximum and minimum values for the integer type T. */ + #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) + #define TYPE_MAXIMUM(t) \ + ((t) (! TYPE_SIGNED (t) \ + ? (t) -1 \ +- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) ++ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) + + /* The maximum and minimum values for the type of the expression E, + after integer promotion. E should not have side effects. */ +@@ -65,29 +68,23 @@ + ? _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_NEGATE_CONVERT (e, 1)) + #define _GL_SIGNED_INT_MAXIMUM(e) \ +- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) ++ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) ++ ++/* Work around OpenVMS incompatibility with C99. */ ++#if !defined LLONG_MAX && defined __INT64_MAX ++# define LLONG_MAX __INT64_MAX ++# define LLONG_MIN __INT64_MIN ++#endif + + /* This include file assumes that signed types are two's complement without + padding bits; the above macros have undefined behavior otherwise. + If this is a problem for you, please let us know how to fix it for your host. +- As a sanity check, test the assumption for some signed types that +- bounds. */ +-verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); +-verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); +-verify (TYPE_MINIMUM (short int) == SHRT_MIN); +-verify (TYPE_MAXIMUM (short int) == SHRT_MAX); +-verify (TYPE_MINIMUM (int) == INT_MIN); +-verify (TYPE_MAXIMUM (int) == INT_MAX); +-verify (TYPE_MINIMUM (long int) == LONG_MIN); +-verify (TYPE_MAXIMUM (long int) == LONG_MAX); +-#ifdef LLONG_MAX +-verify (TYPE_MINIMUM (long long int) == LLONG_MIN); +-verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); +-#endif ++ This assumption is tested by the intprops-tests module. */ + + /* Does the __typeof__ keyword work? This could be done by + 'configure', but for now it's easier to do it by hand. */ +-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ ++#if (2 <= __GNUC__ \ ++ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) + # define _GL_HAVE___TYPEOF__ 1 + #else +@@ -116,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + signed, this macro may overestimate the true bound by one byte when + applied to unsigned types of size 2, 4, 16, ... bytes. */ + #define INT_STRLEN_BOUND(t) \ +- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ +- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ ++ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ + + _GL_SIGNED_TYPE_OR_EXPR (t)) + + /* Bound on buffer size needed to represent an integer type or expression T, +@@ -183,7 +179,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. + See above for restrictions. Avoid && and || as they tickle + bugs in Sun C 5.11 2010/08/13 and other compilers; see +- . */ ++ . */ + #define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \ + ((b) < 0 \ + ? ((a) < 0 \ +@@ -222,20 +218,27 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + ? (a) < (min) >> (b) \ + : (max) >> (b) < (a)) + +-/* True if __builtin_add_overflow (A, B, P) works when P is null. */ +-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) ++/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ ++#if 5 <= __GNUC__ && !defined __ICC ++# define _GL_HAS_BUILTIN_OVERFLOW 1 ++#else ++# define _GL_HAS_BUILTIN_OVERFLOW 0 ++#endif ++ ++/* True if __builtin_add_overflow_p (A, B, C) works. */ ++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) + + /* The _GL*_OVERFLOW macros have the same restrictions as the + *_RANGE_OVERFLOW macros, except that they do not assume that operands + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ +-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +-# define _GL_ADD_OVERFLOW(a, b, min, max) +- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) +-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) +- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) +-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) +- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) ++#if _GL_HAS_BUILTIN_OVERFLOW_P ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ ++ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ ++ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ ++ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) + #else + # define _GL_ADD_OVERFLOW(a, b, min, max) \ + ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ +@@ -315,7 +318,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) + #define INT_SUBTRACT_OVERFLOW(a, b) \ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) +-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL ++#if _GL_HAS_BUILTIN_OVERFLOW_P + # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) + #else + # define INT_NEGATE_OVERFLOW(a) \ +@@ -349,10 +352,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + #define INT_MULTIPLY_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) + +-#ifndef __has_builtin +-# define __has_builtin(x) 0 +-#endif +- + /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 + https://llvm.org/bugs/show_bug.cgi?id=25390 +@@ -369,17 +368,17 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + the operation. BUILTIN is the builtin operation, and OVERFLOW the + overflow predicate. Return 1 if the result overflows. See above + for restrictions. */ +-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) ++#if _GL_HAS_BUILTIN_OVERFLOW + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) + #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + (_Generic \ + (*(r), \ + signed char: \ +- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + signed char, SCHAR_MIN, SCHAR_MAX), \ + short int: \ +- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + short int, SHRT_MIN, SHRT_MAX), \ + int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ +@@ -393,10 +392,10 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + #else + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + (sizeof *(r) == sizeof (signed char) \ +- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + signed char, SCHAR_MIN, SCHAR_MAX) \ + : sizeof *(r) == sizeof (short int) \ +- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + short int, SHRT_MIN, SHRT_MAX) \ + : sizeof *(r) == sizeof (int) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ +@@ -412,15 +411,14 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + # else + # define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ +- long int, LONG_MIN, LONG_MAX)) ++ long int, LONG_MIN, LONG_MAX) + # endif + #endif + + /* Store the low-order bits of A B into *R, where the operation + is given by OP. Use the unsigned type UT for calculation to avoid +- overflow problems. *R's type is T, with extremal values TMIN and +- TMAX. T must be a signed integer type. Return 1 if the result +- overflows. */ ++ overflow problems. *R's type is T, with extrema TMIN and TMAX. ++ T must be a signed integer type. Return 1 if the result overflows. */ + #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ + (sizeof ((a) op (b)) < sizeof (t) \ + ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ +@@ -429,17 +427,27 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + ((overflow (a, b) \ + || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ + || (tmax) < ((a) op (b))) \ +- ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \ +- : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0)) +- +-/* Return A B, where the operation is given by OP. Use the +- unsigned type UT for calculation to avoid overflow problems. +- Convert the result to type T without overflow by subtracting TMIN +- from large values before converting, and adding it afterwards. +- Compilers can optimize all the operations except OP. */ +-#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \ +- (((ut) (a) op (ut) (b)) <= (tmax) \ +- ? (t) ((ut) (a) op (ut) (b)) \ +- : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin))) ++ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ ++ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) ++ ++/* Return the low-order bits of A B, where the operation is given ++ by OP. Use the unsigned type UT for calculation to avoid undefined ++ behavior on signed integer overflow, and convert the result to type T. ++ UT is at least as wide as T and is no narrower than unsigned int, ++ T is two's complement, and there is no padding or trap representations. ++ Assume that converting UT to T yields the low-order bits, as is ++ done in all known two's-complement C compilers. E.g., see: ++ https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html ++ ++ According to the C standard, converting UT to T yields an ++ implementation-defined result or signal for values outside T's ++ range. However, code that works around this theoretical problem ++ runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: ++ https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html ++ As the compiler bug is real, don't try to work around the ++ theoretical problem. */ ++ ++#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ ++ ((t) ((ut) (a) op (ut) (b))) + + #endif /* _GL_INTPROPS_H */ +diff --git a/oathtool/gl/intprops.h b/oathtool/gl/intprops.h +index e1fce5c..af456ff 100644 +--- a/oathtool/gl/intprops.h ++++ b/oathtool/gl/intprops.h +@@ -1,19 +1,19 @@ + /* intprops.h -- properties of integer types + +- Copyright (C) 2001-2016 Free Software Foundation, Inc. ++ Copyright (C) 2001-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or ++ under the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program. If not, see . */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . */ + + /* Written by Paul Eggert. */ + +@@ -21,13 +21,12 @@ + #define _GL_INTPROPS_H + + #include +-#include + + /* Return a value with the common real type of E and V and the value of V. */ + #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) + + /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see +- . */ ++ . */ + #define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) + + /* The extra casts in the following macros work around compiler bugs, +@@ -47,12 +46,16 @@ + + /* Minimum and maximum values for integer types and expressions. */ + ++/* The width in bits of the integer type or expression T. ++ Padding bits are not supported; this is checked at compile-time below. */ ++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) ++ + /* The maximum and minimum values for the integer type T. */ + #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) + #define TYPE_MAXIMUM(t) \ + ((t) (! TYPE_SIGNED (t) \ + ? (t) -1 \ +- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) ++ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) + + /* The maximum and minimum values for the type of the expression E, + after integer promotion. E should not have side effects. */ +@@ -65,29 +68,23 @@ + ? _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_NEGATE_CONVERT (e, 1)) + #define _GL_SIGNED_INT_MAXIMUM(e) \ +- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) ++ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) ++ ++/* Work around OpenVMS incompatibility with C99. */ ++#if !defined LLONG_MAX && defined __INT64_MAX ++# define LLONG_MAX __INT64_MAX ++# define LLONG_MIN __INT64_MIN ++#endif + + /* This include file assumes that signed types are two's complement without + padding bits; the above macros have undefined behavior otherwise. + If this is a problem for you, please let us know how to fix it for your host. +- As a sanity check, test the assumption for some signed types that +- bounds. */ +-verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); +-verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); +-verify (TYPE_MINIMUM (short int) == SHRT_MIN); +-verify (TYPE_MAXIMUM (short int) == SHRT_MAX); +-verify (TYPE_MINIMUM (int) == INT_MIN); +-verify (TYPE_MAXIMUM (int) == INT_MAX); +-verify (TYPE_MINIMUM (long int) == LONG_MIN); +-verify (TYPE_MAXIMUM (long int) == LONG_MAX); +-#ifdef LLONG_MAX +-verify (TYPE_MINIMUM (long long int) == LLONG_MIN); +-verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); +-#endif ++ This assumption is tested by the intprops-tests module. */ + + /* Does the __typeof__ keyword work? This could be done by + 'configure', but for now it's easier to do it by hand. */ +-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ ++#if (2 <= __GNUC__ \ ++ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) + # define _GL_HAVE___TYPEOF__ 1 + #else +@@ -116,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + signed, this macro may overestimate the true bound by one byte when + applied to unsigned types of size 2, 4, 16, ... bytes. */ + #define INT_STRLEN_BOUND(t) \ +- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ +- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ ++ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ + + _GL_SIGNED_TYPE_OR_EXPR (t)) + + /* Bound on buffer size needed to represent an integer type or expression T, +@@ -183,7 +179,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. + See above for restrictions. Avoid && and || as they tickle + bugs in Sun C 5.11 2010/08/13 and other compilers; see +- . */ ++ . */ + #define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \ + ((b) < 0 \ + ? ((a) < 0 \ +@@ -222,20 +218,27 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + ? (a) < (min) >> (b) \ + : (max) >> (b) < (a)) + +-/* True if __builtin_add_overflow (A, B, P) works when P is null. */ +-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) ++/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ ++#if 5 <= __GNUC__ && !defined __ICC ++# define _GL_HAS_BUILTIN_OVERFLOW 1 ++#else ++# define _GL_HAS_BUILTIN_OVERFLOW 0 ++#endif ++ ++/* True if __builtin_add_overflow_p (A, B, C) works. */ ++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) + + /* The _GL*_OVERFLOW macros have the same restrictions as the + *_RANGE_OVERFLOW macros, except that they do not assume that operands + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ +-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +-# define _GL_ADD_OVERFLOW(a, b, min, max) +- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) +-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) +- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) +-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) +- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) ++#if _GL_HAS_BUILTIN_OVERFLOW_P ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ ++ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ ++ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ ++ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) + #else + # define _GL_ADD_OVERFLOW(a, b, min, max) \ + ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ +@@ -315,7 +318,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) + #define INT_SUBTRACT_OVERFLOW(a, b) \ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) +-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL ++#if _GL_HAS_BUILTIN_OVERFLOW_P + # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) + #else + # define INT_NEGATE_OVERFLOW(a) \ +@@ -349,10 +352,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + #define INT_MULTIPLY_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) + +-#ifndef __has_builtin +-# define __has_builtin(x) 0 +-#endif +- + /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 + https://llvm.org/bugs/show_bug.cgi?id=25390 +@@ -369,17 +368,17 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + the operation. BUILTIN is the builtin operation, and OVERFLOW the + overflow predicate. Return 1 if the result overflows. See above + for restrictions. */ +-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) ++#if _GL_HAS_BUILTIN_OVERFLOW + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) + #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + (_Generic \ + (*(r), \ + signed char: \ +- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + signed char, SCHAR_MIN, SCHAR_MAX), \ + short int: \ +- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + short int, SHRT_MIN, SHRT_MAX), \ + int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ +@@ -393,10 +392,10 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + #else + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + (sizeof *(r) == sizeof (signed char) \ +- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + signed char, SCHAR_MIN, SCHAR_MAX) \ + : sizeof *(r) == sizeof (short int) \ +- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + short int, SHRT_MIN, SHRT_MAX) \ + : sizeof *(r) == sizeof (int) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ +@@ -412,15 +411,14 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + # else + # define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ +- long int, LONG_MIN, LONG_MAX)) ++ long int, LONG_MIN, LONG_MAX) + # endif + #endif + + /* Store the low-order bits of A B into *R, where the operation + is given by OP. Use the unsigned type UT for calculation to avoid +- overflow problems. *R's type is T, with extremal values TMIN and +- TMAX. T must be a signed integer type. Return 1 if the result +- overflows. */ ++ overflow problems. *R's type is T, with extrema TMIN and TMAX. ++ T must be a signed integer type. Return 1 if the result overflows. */ + #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ + (sizeof ((a) op (b)) < sizeof (t) \ + ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ +@@ -429,17 +427,27 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + ((overflow (a, b) \ + || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ + || (tmax) < ((a) op (b))) \ +- ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \ +- : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0)) +- +-/* Return A B, where the operation is given by OP. Use the +- unsigned type UT for calculation to avoid overflow problems. +- Convert the result to type T without overflow by subtracting TMIN +- from large values before converting, and adding it afterwards. +- Compilers can optimize all the operations except OP. */ +-#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \ +- (((ut) (a) op (ut) (b)) <= (tmax) \ +- ? (t) ((ut) (a) op (ut) (b)) \ +- : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin))) ++ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ ++ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) ++ ++/* Return the low-order bits of A B, where the operation is given ++ by OP. Use the unsigned type UT for calculation to avoid undefined ++ behavior on signed integer overflow, and convert the result to type T. ++ UT is at least as wide as T and is no narrower than unsigned int, ++ T is two's complement, and there is no padding or trap representations. ++ Assume that converting UT to T yields the low-order bits, as is ++ done in all known two's-complement C compilers. E.g., see: ++ https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html ++ ++ According to the C standard, converting UT to T yields an ++ implementation-defined result or signal for values outside T's ++ range. However, code that works around this theoretical problem ++ runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: ++ https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html ++ As the compiler bug is real, don't try to work around the ++ theoretical problem. */ ++ ++#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ ++ ((t) ((ut) (a) op (ut) (b))) + + #endif /* _GL_INTPROPS_H */ + \ No newline at end of file diff --git a/SPECS/oath-toolkit/oath-toolkit-2.6.2-lockfile.patch b/SPECS/oath-toolkit/oath-toolkit-2.6.2-lockfile.patch new file mode 100644 index 00000000000..ef672bf6031 --- /dev/null +++ b/SPECS/oath-toolkit/oath-toolkit-2.6.2-lockfile.patch @@ -0,0 +1,195 @@ +diff --git a/liboath/global.c b/liboath/global.c +index 6fb51fd..251ad15 100644 +--- a/liboath/global.c ++++ b/liboath/global.c +@@ -25,9 +25,12 @@ + + #include /* For snprintf, getline. */ + #include /* For strverscmp. */ ++#include /* For free. */ + + #include "gc.h" + ++char *oath_lockfile_path = NULL; ++ + /** + * oath_init: + * +@@ -52,6 +55,8 @@ oath_init (void) + if (gc_init () != GC_OK) + return OATH_CRYPTO_ERROR; + ++ oath_lockfile_path = NULL; ++ + return OATH_OK; + } + +@@ -71,6 +76,11 @@ oath_done (void) + { + gc_done (); + ++ if (oath_lockfile_path) ++ { ++ free(oath_lockfile_path); ++ oath_lockfile_path = NULL; ++ } + return OATH_OK; + } + +@@ -99,3 +109,23 @@ oath_check_version (const char *req_version) + + return NULL; + } ++ ++int ++oath_set_lockfile_path(const char *lockfile) ++{ ++ int l; ++ ++ if (oath_lockfile_path) ++ { ++ free(oath_lockfile_path); ++ oath_lockfile_path = NULL; ++ } ++ ++ if (lockfile) ++ { ++ l = asprintf (&oath_lockfile_path, "%s", lockfile); ++ if (oath_lockfile_path == NULL || ((size_t) l) != strlen (lockfile)) ++ return OATH_PRINTF_ERROR; ++ } ++ return OATH_OK; ++} +diff --git a/liboath/liboath.map b/liboath/liboath.map +index 010c512..fd32e07 100644 +--- a/liboath/liboath.map ++++ b/liboath/liboath.map +@@ -75,6 +75,7 @@ LIBOATH_2.2.0 + global: + oath_totp_validate3; + oath_totp_validate3_callback; ++ oath_set_lockfile_path; + } LIBOATH_1.12.0; + + LIBOATH_2.6.0 +diff --git a/liboath/oath.h b/liboath/oath.h +index 7819c02..8bb5fc6 100644 +--- a/liboath/oath.h ++++ b/liboath/oath.h +@@ -136,11 +136,15 @@ typedef enum + + /* Global */ + ++extern char *oath_lockfile_path; ++ + extern OATHAPI int oath_init (void); + extern OATHAPI int oath_done (void); + + extern OATHAPI const char *oath_check_version (const char *req_version); + ++extern OATHAPI int oath_set_lockfile_path(const char *lockfile); ++ + /* Error handling */ + + extern OATHAPI const char *oath_strerror (int err); +diff --git a/liboath/oath.h.in b/liboath/oath.h.in +index 524e9ac..4d5cddc 100644 +--- a/liboath/oath.h.in ++++ b/liboath/oath.h.in +@@ -136,11 +136,15 @@ typedef enum + + /* Global */ + ++extern char *oath_lockfile_path; ++ + extern OATHAPI int oath_init (void); + extern OATHAPI int oath_done (void); + + extern OATHAPI const char *oath_check_version (const char *req_version); + ++extern OATHAPI int oath_set_lockfile_path(const char *lockfile); ++ + /* Error handling */ + + extern OATHAPI const char *oath_strerror (int err); +diff --git a/liboath/usersfile.c b/liboath/usersfile.c +index 3442fd2..066f936 100644 +--- a/liboath/usersfile.c ++++ b/liboath/usersfile.c +@@ -323,9 +323,18 @@ update_usersfile (const char *usersfile, + { + int l; + +- l = asprintf (&lockfile, "%s.lock", usersfile); +- if (lockfile == NULL || ((size_t) l) != strlen (usersfile) + 5) +- return OATH_PRINTF_ERROR; ++ if (oath_lockfile_path) ++ { ++ l = asprintf (&lockfile, "%s", oath_lockfile_path); ++ if (lockfile == NULL || ((size_t) l) != strlen (oath_lockfile_path)) ++ return OATH_PRINTF_ERROR; ++ } ++ else ++ { ++ l = asprintf (&lockfile, "%s.lock", usersfile); ++ if (lockfile == NULL || ((size_t) l) != strlen (usersfile) + 5) ++ return OATH_PRINTF_ERROR; ++ } + + lockfh = fopen (lockfile, "w"); + if (!lockfh) +diff --git a/pam_oath/pam_oath.c b/pam_oath/pam_oath.c +index 57fd33c..aa041e3 100644 +--- a/pam_oath/pam_oath.c ++++ b/pam_oath/pam_oath.c +@@ -70,6 +70,7 @@ struct cfg + int try_first_pass; + int use_first_pass; + char *usersfile; ++ char *lockfile; + unsigned digits; + unsigned window; + }; +@@ -84,6 +85,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg) + cfg->try_first_pass = 0; + cfg->use_first_pass = 0; + cfg->usersfile = NULL; ++ cfg->lockfile = NULL; + cfg->digits = -1; + cfg->window = 5; + +@@ -99,6 +101,8 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg) + cfg->use_first_pass = 1; + if (strncmp (argv[i], "usersfile=", 10) == 0) + cfg->usersfile = (char *) argv[i] + 10; ++ if (strncmp (argv[i], "lockfile=", 9) == 0) ++ cfg->lockfile = (char *) argv[i] + 9; + if (strncmp (argv[i], "digits=", 7) == 0) + cfg->digits = atoi (argv[i] + 7); + if (strncmp (argv[i], "window=", 7) == 0) +@@ -124,6 +128,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg) + D (("try_first_pass=%d", cfg->try_first_pass)); + D (("use_first_pass=%d", cfg->use_first_pass)); + D (("usersfile=%s", cfg->usersfile ? cfg->usersfile : "(null)")); ++ D (("lockfile=%s", cfg->lockfile ? cfg->lockfile : "(null)")); + D (("digits=%d", cfg->digits)); + D (("window=%d", cfg->window)); + } +@@ -189,6 +194,17 @@ pam_sm_authenticate (pam_handle_t * pamh, + goto done; + } + ++ if (cfg.lockfile) ++ rc = oath_set_lockfile_path(cfg.lockfile); ++ else ++ rc = oath_set_lockfile_path("/var/lock/pam_oath.lock"); ++ if (rc != OATH_OK) ++ { ++ DBG (("oath_set_lockfile_path() failed (%d)", rc)); ++ retval = PAM_AUTHINFO_UNAVAIL; ++ goto done; ++ } ++ + if (password == NULL) + { + retval = pam_get_item (pamh, PAM_CONV, (const void **) &conv); diff --git a/SPECS/oath-toolkit/oath-toolkit.signatures.json b/SPECS/oath-toolkit/oath-toolkit.signatures.json new file mode 100644 index 00000000000..472d8dfbb99 --- /dev/null +++ b/SPECS/oath-toolkit/oath-toolkit.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "oath-toolkit-2.6.2.tar.gz": "b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0" + } +} \ No newline at end of file diff --git a/SPECS/oath-toolkit/oath-toolkit.spec b/SPECS/oath-toolkit/oath-toolkit.spec new file mode 100644 index 00000000000..16dffd2b5ad --- /dev/null +++ b/SPECS/oath-toolkit/oath-toolkit.spec @@ -0,0 +1,305 @@ +Summary: One-time password components +Name: oath-toolkit +Version: 2.6.2 +Release: 7%{?dist} +License: GPLv3+ and LGPLv2+ +URL: https://www.nongnu.org/oath-toolkit/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz + +# Escape leading single quotes in man pages which are misinterpreted as macros, +# patch sent upstream, upstream ticket #108312 +Patch0: oath-toolkit-2.0.2-man-fix.patch +# Fix invalid reads due to references to old (freed) xmlDoc, +# upstream ticket #108736 +Patch1: oath-toolkit-2.4.1-retain-original-xmldoc.patch +# rhbz#1605276 +Patch2: oath-toolkit-2.6.2-build-fix.patch +Patch3: oath-toolkit-2.6.2-lockfile.patch + +BuildRequires: pam-devel +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: xmlsec1-devel +BuildRequires: autoconf +BuildRequires: automake + +%description +The OATH Toolkit provide components for building one-time password +authentication systems. It contains shared libraries, command line tools and a +PAM module. Supported technologies include the event-based HOTP algorithm +(RFC4226) and the time-based TOTP algorithm (RFC6238). OATH stands for Open +AuTHentication, which is the organization that specify the algorithms. For +managing secret key files, the Portable Symmetric Key Container (PSKC) format +described in RFC6030 is supported. + +%package -n liboath +Summary: Library for OATH handling +License: LGPLv2+ +# https://fedorahosted.org/fpc/ticket/174 +#Provides: bundled(gnulib) + +%description -n liboath +OATH stands for Open AuTHentication, which is the organization that +specify the algorithms. Supported technologies include the event-based +HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238). + +%package -n liboath-devel +Summary: Development files for liboath +License: LGPLv2+ +Requires: liboath%{?_isa} = %{version}-%{release} + +%description -n liboath-devel +Development files for liboath. + +%package -n liboath-doc +Summary: Documentation files for liboath +License: LGPLv2+ +Requires: liboath = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description -n liboath-doc +Documentation files for liboath. + +%package -n libpskc +Summary: Library for PSKC handling +License: LGPLv2+ +Requires: xml-common +# https://fedorahosted.org/fpc/ticket/174 +#Provides: bundled(gnulib) + +%description -n libpskc +Library for managing secret key files, the Portable Symmetric Key +Container (PSKC) format described in RFC6030 is supported. + +%package -n libpskc-devel +Summary: Development files for libpskc +License: LGPLv2+ +Requires: libpskc%{?_isa} = %{version}-%{release} + +%description -n libpskc-devel +Development files for libpskc. + +%package -n libpskc-doc +Summary: Documentation files for libpskc +License: LGPLv2+ +Requires: libpskc = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description -n libpskc-doc +Documentation files for libpskc. + +%package -n oathtool +Summary: A command line tool for generating and validating OTPs +License: GPLv3+ +# https://fedorahosted.org/fpc/ticket/174 +Provides: bundled(gnulib) + +%description -n oathtool +A command line tool for generating and validating OTPs. + +%package -n pskctool +Summary: A command line tool for manipulating PSKC data +# https://fedorahosted.org/fpc/ticket/174 +Provides: bundled(gnulib) +Requires: xmlsec1%{?_isa} + +%description -n pskctool +A command line tool for manipulating PSKC data. + +%package -n pam_oath +Summary: A PAM module for pluggable login authentication for OATH +Requires: pam + +%description -n pam_oath +A PAM module for pluggable login authentication for OATH. + +%prep +%setup -q +%patch0 -p1 -b .man-fix +%patch1 -p1 -b .retain-original-xmldoc +%patch2 -p1 -b .build-fix +%patch3 -p1 -b .lockfile + +%build +autoreconf -fi +%configure --with-pam-dir=%{_libdir}/security + +# Kill rpaths and link with --as-needed +for d in liboath libpskc pskctool oathtool pam_oath +do + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $d/libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $d/libtool + sed -i 's| -shared | -Wl,--as-needed\0|g' $d/libtool +done + +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install + +# Remove static objects and libtool files +rm -f %{buildroot}%{_libdir}/*.{a,la} +rm -f %{buildroot}%{_libdir}/security/*.la + +# Make /etc/liboath directory +mkdir -p -m 0600 %{buildroot}%{_sysconfdir}/liboath + +%post -p /sbin/ldconfig -n liboath +%post -p /sbin/ldconfig -n libpskc + +%postun -p /sbin/ldconfig -n liboath +%postun -p /sbin/ldconfig -n libpskc + +%files -n liboath +%license liboath/COPYING +%attr(0600, root, root) %dir %{_sysconfdir}/liboath +%{_libdir}/liboath.so.* + +%files -n liboath-devel +%{_includedir}/liboath +%{_libdir}/liboath.so +%{_libdir}/pkgconfig/liboath.pc + +%files -n liboath-doc +%{_mandir}/man3/oath* +%{_datadir}/gtk-doc/html/liboath/* + +%files -n libpskc +%doc libpskc/README +%{_libdir}/libpskc.so.* +%{_datadir}/xml/pskc + +%files -n libpskc-devel +%{_includedir}/pskc +%{_libdir}/libpskc.so +%{_libdir}/pkgconfig/libpskc.pc + +%files -n libpskc-doc +%{_mandir}/man3/pskc* +%{_datadir}/gtk-doc/html/libpskc/* + +%files -n oathtool +%license oathtool/COPYING +%{_bindir}/oathtool +%{_mandir}/man1/oathtool.* + +%files -n pskctool +%{_bindir}/pskctool +%{_mandir}/man1/pskctool.* + +%files -n pam_oath +%license pam_oath/COPYING +%doc pam_oath/README +%{_libdir}/security/pam_oath.so + +%changelog +* Fri Aug 21 2020 Thomas Crain - 2.6.2-7 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon May 4 2020 Jaroslav Å karvada - 2.6.2-5 +- Added support for configurable lock file locations and set the default path + Resolves: rhbz#1178036 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 20 2018 Jaroslav Å karvada - 2.6.2-1 +- New version +- Fixed FTBFS + Resolves: rhbz#1605276 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Aug 4 2015 Jaroslav Å karvada - 2.6.1-1 +- New version + +* Wed Jun 17 2015 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 21 2015 Jaroslav Å karvada - 2.6.0-1 +- New version +- Dropped strdup-null-check patch (upstreamed) + +* Fri Jan 30 2015 Jaroslav Å karvada - 2.4.1-9 +- Fixed invalid reads in libpskc due to references to old (freed) xmlDoc + (by retain-original-xmldoc patch), patch provided by David Woodhouse + Resolves: rhbz#1129491 + +* Tue Nov 11 2014 Jaroslav Å karvada - 2.4.1-8 +- Removed RHEL conditionals (not needed any more) + +* Fri Nov 7 2014 Jaroslav Å karvada - 2.4.1-7 +- Added check for strdup failure (by strdup-null-check patch) + Resolves: rhbz#1161360 + +* Sun Aug 17 2014 Fedora Release Engineering - 2.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Aug 5 2014 Jaroslav Å karvada - 2.4.1-5 +- Added support for RHEL (i.e. no PSKC yet on RHEL) + +* Sat Jun 07 2014 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Feb 20 2014 Jaroslav Å karvada - 2.4.1-3 +- Added xmlsec1-openssl to requires + Resolves: rhbz#1066477 + +* Mon Feb 17 2014 Jaroslav Å karvada - 2.4.1-2 +- Added xmlsec1-openssl-devel to buildrequires + +* Thu Feb 13 2014 Jaroslav Å karvada - 2.4.1-1 +- New version + Resolves: rhbz#1064764 + +* Sat Aug 03 2013 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 Jaroslav Å karvada - 2.4.0-1 +- New version + Resolves: rhbz#987378 + +* Wed Jul 10 2013 Jaroslav Å karvada - 2.2.0-1 +- New version + Resolves: rhbz#982986 + +* Wed Jun 5 2013 Jaroslav Å karvada - 2.0.2-3 +- Fixed requirements according to reviewer comments +- Linked with --as-needed +- Fixed man pages (by man-fix patch) + +* Mon Apr 8 2013 Jaroslav Å karvada - 2.0.2-2 +- Added /etc/liboath directory to hold configuration / user lists + +* Sun Apr 07 2013 Jaroslav Å karvada - 2.0.2-1 +- Initial version \ No newline at end of file diff --git a/SPECS/python-cachetools/python-cachetools.signatures.json b/SPECS/python-cachetools/python-cachetools.signatures.json new file mode 100644 index 00000000000..33c7a959252 --- /dev/null +++ b/SPECS/python-cachetools/python-cachetools.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "cachetools-4.1.1.tar.gz": "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20" + } + } \ No newline at end of file diff --git a/SPECS/python-cachetools/python-cachetools.spec b/SPECS/python-cachetools/python-cachetools.spec new file mode 100644 index 00000000000..bcec3084be5 --- /dev/null +++ b/SPECS/python-cachetools/python-cachetools.spec @@ -0,0 +1,48 @@ +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +%global pkgname cachetools + +Summary: Various memoizing collections and decorators +Name: python-%{pkgname} +Version: 4.1.1 +Release: 1%{?dist} +License: MIT +URL: https://github.com/tkem/cachetools +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.python.org/packages/source/c/%{pkgname}/%{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%description +This module provides various memoizing collections and decorators, including variants of the Python Standard Library’s @lru_cache function decorator. + +%package -n python3-%{pkgname} +Summary: Various memoizing collections and decorators + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +Requires: python3 + +%description -n python3-%{pkgname} +This module provides various memoizing collections and decorators, including variants of the Python Standard Library’s @lru_cache function decorator. + +%prep +%autosetup -n %{pkgname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --root=%{buildroot} + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.rst CHANGELOG.rst +%{python3_sitelib}/%{pkgname} +%{python3_sitelib}/*.egg-info + +%changelog +* Fri Aug 21 2020 Thomas Crain - 1.20.1-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-cherrypy/python-cherrypy.signatures.json b/SPECS/python-cherrypy/python-cherrypy.signatures.json new file mode 100644 index 00000000000..5e4602e06ce --- /dev/null +++ b/SPECS/python-cherrypy/python-cherrypy.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "CherryPy-18.6.0.tar.gz": "56608edd831ad00991ae585625e0206ed61cf1a0850e4b2cc48489fb2308c499" + } +} \ No newline at end of file diff --git a/SPECS/python-cherrypy/python-cherrypy.spec b/SPECS/python-cherrypy/python-cherrypy.spec new file mode 100644 index 00000000000..2b6bf15e2a0 --- /dev/null +++ b/SPECS/python-cherrypy/python-cherrypy.spec @@ -0,0 +1,67 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname cherrypy +%define pypiname CherryPy + +Summary: A pythonic, object-oriented HTTP framework +Name: python-%{pkgname} +Version: 18.6.0 +Release: 1%{?dist} +License: BSD +Url: https://cherrypy.org/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.io/packages/source/C/%{pypiname}/%{pypiname}-%{version}.tar.gz +BuildArch: noarch + +%global _description %{expand: +CherryPy allows developers to build web applications in much the same way they would +build any other object-oriented Python program. This results in smaller source code +developed in less time. + +CherryPy is now more than ten years old and it is has proven to be fast and reliable. +It is being used in production by many sites, from the simplest to the most demanding.} + +%description %_description + +%package -n python3-%{pkgname} +Summary: A pythonic, object-oriented HTTP framework + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm +Requires: python3 +Requires: python3-libs +%if 0%{with check} +BuildRequires: python3-pip +%endif + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{pypiname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if 0%{with check} +%check +pip3 install tox +tox +%endif + +%files -n python3-%{pkgname} +%license LICENSE.md +%doc README.rst docs/ +%{python3_sitelib}/* +%{_bindir}/cherryd + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.4.0-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-docutils/python-docutils.spec b/SPECS/python-docutils/python-docutils.spec index b40a89afb84..b3a26bc4b18 100644 --- a/SPECS/python-docutils/python-docutils.spec +++ b/SPECS/python-docutils/python-docutils.spec @@ -4,14 +4,13 @@ Summary: Docutils -- Python Documentation Utilities. Name: python-docutils Version: 0.14 -Release: 3%{?dist} -License: public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt) +Release: 4%{?dist} +License: Public Domain, PSF-2.0, BSD, GPLv3 Group: Development/Languages/Python Vendor: Microsoft Corporation Distribution: Mariner Url: https://pypi.python.org/pypi/docutils Source0: https://files.pythonhosted.org/packages/source/d/docutils/docutils-%{version}.tar.gz -%define sha1 docutils=32cefb69ac3dab5b04c4d150776f35419cc4c863 BuildRequires: python2 BuildRequires: python2-libs @@ -51,21 +50,22 @@ python3 setup.py build popd %install + pushd ../p3dir python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -mv %{buildroot}/%{_bindir}/rstpep2html.py %{buildroot}/%{_bindir}/rstpep2html3.py -mv %{buildroot}/%{_bindir}/rst2xml.py %{buildroot}/%{_bindir}/rst2xml3.py -mv %{buildroot}/%{_bindir}/rst2xetex.py %{buildroot}/%{_bindir}/rst2xetex3.py -mv %{buildroot}/%{_bindir}/rst2s5.py %{buildroot}/%{_bindir}/rst2s53.py -mv %{buildroot}/%{_bindir}/rst2pseudoxml.py %{buildroot}/%{_bindir}/rst2pseudoxml3.py -mv %{buildroot}/%{_bindir}/rst2odt_prepstyles.py %{buildroot}/%{_bindir}/rst2odt_prepstyles3.py -mv %{buildroot}/%{_bindir}/rst2odt.py %{buildroot}/%{_bindir}/rst2odt3.py -mv %{buildroot}/%{_bindir}/rst2man.py %{buildroot}/%{_bindir}/rst2man3.py -mv %{buildroot}/%{_bindir}/rst2latex.py %{buildroot}/%{_bindir}/rst2latex3.py -mv %{buildroot}/%{_bindir}/rst2html5.py %{buildroot}/%{_bindir}/rst2html53.py -mv %{buildroot}/%{_bindir}/rst2html.py %{buildroot}/%{_bindir}/rst2html3.py +for BINARY in rstpep2html rst2xml rst2xetex rst2s5 rst2pseudoxml rst2odt_prepstyles rst2odt rst2man rst2latex rst2html5 rst2html rst2html4 +do + mv %{buildroot}/%{_bindir}/$(echo $BINARY).py %{buildroot}%{_bindir}/$(echo $BINARY)3.py + ln -sfv $(echo $BINARY)3.py %{buildroot}/%{_bindir}/$(echo $BINARY)3 +done popd + python2 setup.py install --prefix=%{_prefix} --root=%{buildroot} +for BINARY in rstpep2html rst2xml rst2xetex rst2s5 rst2pseudoxml rst2odt_prepstyles rst2odt rst2man rst2latex rst2html5 rst2html rst2html4 +do + ln -sfv $(echo $BINARY).py %{buildroot}%{_bindir}/$(echo $BINARY) +done + %check PATH=%{buildroot}%{_bindir}:${PATH} \ @@ -81,6 +81,18 @@ popd %defattr(-,root,root) %license licenses %{python2_sitelib}/* +%{_bindir}/rstpep2html +%{_bindir}/rst2xml +%{_bindir}/rst2xetex +%{_bindir}/rst2s5 +%{_bindir}/rst2pseudoxml +%{_bindir}/rst2odt_prepstyles +%{_bindir}/rst2odt +%{_bindir}/rst2man +%{_bindir}/rst2latex +%{_bindir}/rst2html5 +%{_bindir}/rst2html +%{_bindir}/rst2html4 %{_bindir}/rstpep2html.py %{_bindir}/rst2xml.py %{_bindir}/rst2xetex.py @@ -92,10 +104,23 @@ popd %{_bindir}/rst2latex.py %{_bindir}/rst2html5.py %{_bindir}/rst2html.py +%{_bindir}/rst2html4.py %files -n python3-docutils %defattr(-,root,root) %{python3_sitelib}/* +%{_bindir}/rstpep2html3 +%{_bindir}/rst2xml3 +%{_bindir}/rst2xetex3 +%{_bindir}/rst2s53 +%{_bindir}/rst2pseudoxml3 +%{_bindir}/rst2odt_prepstyles3 +%{_bindir}/rst2odt3 +%{_bindir}/rst2man3 +%{_bindir}/rst2latex3 +%{_bindir}/rst2html53 +%{_bindir}/rst2html3 +%{_bindir}/rst2html43 %{_bindir}/rstpep2html3.py %{_bindir}/rst2xml3.py %{_bindir}/rst2xetex3.py @@ -107,18 +132,27 @@ popd %{_bindir}/rst2latex3.py %{_bindir}/rst2html53.py %{_bindir}/rst2html3.py -%{_bindir}/rst2html4.py +%{_bindir}/rst2html43.py + %changelog +* Fri Aug 21 2020 Thomas Crain - 0.14-4 +- Follow the Fedora convention of providing a suffix-less binary name +- License verified + * Sat May 09 00:21:15 PST 2020 Nick Samson - 0.14-3 - Added %%license line automatically -* Tue Sep 03 2019 Mateusz Malisz 0.14-2 -- Initial CBL-Mariner import from Photon (license: Apache2). -* Sun Sep 09 2018 Tapas Kundu 0.14-1 -- Update to version 0.14 -* Thu Jun 22 2017 Dheeraj Shetty 0.13.1-3 -- Add BuildRequires python-xml and python3-xml for the tests to pass -* Thu Jun 01 2017 Dheeraj Shetty 0.13.1-2 -- Create separate packages for python2 and python3 in the bin directory -* Mon Mar 20 2017 Xiaolin Li 0.13.1-1 -- Initial packaging for Photon +* Tue Sep 03 2019 Mateusz Malisz 0.14-2 +- Initial CBL-Mariner import from Photon (license: Apache2). + +* Sun Sep 09 2018 Tapas Kundu 0.14-1 +- Update to version 0.14 + +* Thu Jun 22 2017 Dheeraj Shetty 0.13.1-3 +- Add BuildRequires python-xml and python3-xml for the tests to pass + +* Thu Jun 01 2017 Dheeraj Shetty 0.13.1-2 +- Create separate packages for python2 and python3 in the bin directory + +* Mon Mar 20 2017 Xiaolin Li 0.13.1-1 +- Initial packaging for Photon diff --git a/SPECS/python-execnet/python-execnet.signatures.json b/SPECS/python-execnet/python-execnet.signatures.json new file mode 100644 index 00000000000..4984320ec15 --- /dev/null +++ b/SPECS/python-execnet/python-execnet.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "execnet-1.7.1.tar.gz": "cacb9df31c9680ec5f95553976c4da484d407e85e41c83cb812aa014f0eddc50" + } +} \ No newline at end of file diff --git a/SPECS/python-execnet/python-execnet.spec b/SPECS/python-execnet/python-execnet.spec new file mode 100644 index 00000000000..2c8c6652ccd --- /dev/null +++ b/SPECS/python-execnet/python-execnet.spec @@ -0,0 +1,70 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname execnet + +Summary: Python execution distributor +Name: python-%{pkgname} +Version: 1.7.1 +Release: 1%{?dist} +License: MIT +URL: https://codespeak.net/execnet/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.io/packages/source/e/%{pkgname}/%{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%global _description %{expand: +execnet provides carefully tested means to ad-hoc interact with Python +interpreters across version, platform and network barriers. It provides +a minimal and fast API targetting the following uses: + +-distribute tasks to local or remote processes +-write and deploy hybrid multi-process applications +-write scripts to administer multiple hosts} + +%description %_description + +%package -n python3-%{pkgname} +Summary: Python execution distributor + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm +Requires: python3 +# python3-apipkg is provided by python3-py in Mariner +# Requires: python3-apipkg +Requires: python3-py +%if %{with check} +BuildRequires: python3-pip +%endif + + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{pkgname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if %{with check} +%check +pip3 install tox +tox +%endif + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.rst CHANGELOG.rst +%{python3_sitelib}/* + +%changelog +* Fri Aug 21 2020 Thomas Crain 0.3.5-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-google-auth/python-google-auth.signatures.json b/SPECS/python-google-auth/python-google-auth.signatures.json new file mode 100644 index 00000000000..2a82f7bee2c --- /dev/null +++ b/SPECS/python-google-auth/python-google-auth.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "google-auth-1.20.1.tar.gz": "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8" + } +} \ No newline at end of file diff --git a/SPECS/python-google-auth/python-google-auth.spec b/SPECS/python-google-auth/python-google-auth.spec new file mode 100644 index 00000000000..34140d63e36 --- /dev/null +++ b/SPECS/python-google-auth/python-google-auth.spec @@ -0,0 +1,169 @@ +%global library google-auth +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +Name: python-%{library} +Version: 1.20.1 +Release: 1%{?dist} +Summary: Google Auth Python Library +License: ASL 2.0 +URL: https://github.com/googleapis/google-auth-library-python +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.python.org/packages/source/g/%{library}/%{library}-%{version}.tar.gz + +BuildArch: noarch + +%description +Google Auth Python Library + +%package -n python3-%{library} +Summary: Google Auth Python Library + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +BuildRequires: git +Requires: python3-pyasn1 +Requires: python3-pyasn1-modules +Requires: python3-rsa +Requires: python3-six +Requires: python3-cachetools + +%description -n python3-%{library} +Python client for the kubernetes API. + +%prep +%autosetup -n %{library}-%{version} + +#Allow newer cachetools +sed -i 's/<3\.2/<5.0/g' setup.py + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --root=%{buildroot} + +%files -n python3-%{library} +%license LICENSE +%{python3_sitelib}/google/auth +%{python3_sitelib}/google/oauth2 +%{python3_sitelib}/google_auth-%{version}*.egg-info +%{python3_sitelib}/google_auth-%{version}*.pth + +%changelog +* Fri Aug 21 2020 Thomas Crain - 1.20.1-1 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Wed Jul 29 2020 Jason Montleon - 1:1.20.0-1 +- Update to 1.20.0 (#1858426) + +* Wed Jul 29 2020 Fedora Release Engineering - 1:1.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Jason Montleon - 1:1.19.1-1 +- Update to 1.19.1 (#1856662) + +* Fri Jun 19 2020 Fedora Release Monitoring - 1:1.18.0-1 +- Update to 1.18.0 (#1846258) + +* Thu Jun 04 2020 Fedora Release Monitoring - 1:1.16.1-1 +- Update to 1.16.1 (#1841468) + +* Tue May 26 2020 Miro HronÄÂok - 1:1.14.3-2 +- Rebuilt for Python 3.9 + +* Tue May 12 2020 Jason Montleon - 1:1.14.3-1 +- Update to 1.14.3 + +* Thu May 07 2020 Fedora Release Monitoring - 1:1.14.2-1 +- Update to 1.14.2 (#1832794) + +* Wed Apr 22 2020 Fedora Release Monitoring - 1:1.14.1-1 +- Update to 1.14.1 (#1824032) + +* Thu Apr 02 2020 Fedora Release Monitoring - 1:1.13.1-1 +- Update to 1.13.1 (#1817303) + +* Mon Mar 16 2020 Jason Montleon - 1:1.11.3-1 +- Update to 1.11.3 + +* Wed Feb 19 2020 Jason Montleon - 1:1.11.2-1 +- Update to 1.11.2 + +* Thu Jan 30 2020 Fedora Release Engineering - 1:1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 24 2020 Fedora Release Monitoring - 1:1.11.0-1 +- Update to 1.11.0 (#1794771) + +* Thu Jan 23 2020 Jason Montleon - 1:1.10.2-2 +- Update to 1.10.2 (#1793920) + +* Wed Jan 15 2020 Fedora Release Monitoring - 1:1.10.1-1 +- Update to 1.10.1 (#1779733) + +* Fri Dec 20 2019 Jason Montleon - 1:1.10.0-1 +- Update to 1.10.0 + +* Wed Dec 11 2019 Jason Montleon - 1:1.9.0-2 +- Allow newer cachetools + +* Wed Dec 11 2019 Jason Montleon - 1:1.9.0-1 +- Update to 1.9.0 + +* Wed Dec 11 2019 Fedora Release Monitoring - 1:1.8.2-1 +- Update to 1.8.2 (#1779733) + +* Tue Nov 19 2019 Jason Montleon - 1:1.7.1-1 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Oct 03 2019 Miro HronÄÂok - 1:1.1.1-10 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro HronÄÂok - 1:1.1.1-9 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1:1.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1:1.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 15 2019 Igor Gnatenko - 1:1.1.1-6 +- Enable python dependency generator + +* Mon Jan 14 2019 Jason Montleon - 1:1.1.1-5 +- Fix cachetools dependency for python2 + +* Thu Dec 13 2018 Jason Montleon - 1:1.1.1-4 +- Use python3_pkgversion for EPEL + +* Mon Dec 3 2018 Jason Montleon - 1:1.1.1-3 +- Use GitHub instead of PyPI source tarball to build + +* Tue Oct 23 2018 Alfredo Moralejo - 1:1.1.1-2 +- Removed python2 subpackages in Fedora (rhbz#1636936). + +* Mon Aug 13 2018 Alfredo Moralejo - 1:1.1.1-1 +- Revert to version 1.1.1. Version 1.3.0 requires pyasn1-modules newer that in Fedora (rhbz#1577286). + +* Sat Jul 14 2018 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro HronÄÂok - 1.3.0-4 +- Rebuilt for Python 3.7 + +* Wed Feb 21 2018 Iryna Shcherbina - 1.3.0-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 24 2018 Alfredo Moralejo 1.3.0-1 +- Update to 1.3.0 + +* Fri Oct 13 2017 Jason Montleon 1.1.1-1 +- Initial Build \ No newline at end of file diff --git a/SPECS/python-jwt/python-jwt.signatures.json b/SPECS/python-jwt/python-jwt.signatures.json new file mode 100644 index 00000000000..9867ba2be55 --- /dev/null +++ b/SPECS/python-jwt/python-jwt.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "PyJWT-1.7.1.tar.gz": "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96" + } +} \ No newline at end of file diff --git a/SPECS/python-jwt/python-jwt.spec b/SPECS/python-jwt/python-jwt.spec new file mode 100644 index 00000000000..fe9dbffc4d6 --- /dev/null +++ b/SPECS/python-jwt/python-jwt.spec @@ -0,0 +1,186 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +# what it's called on pypi +%global srcname PyJWT +# what it's imported as +%global libname jwt +# name of egg info directory +%global eggname %{srcname} +# package name fragment +%global pkgname %{libname} +%global python3_version 3.7 + +%bcond_without python3 + +%global common_description %{expand: +A Python implementation of JSON Web Token draft 01. This library provides a +means of representing signed content using JSON data structures, including +claims to be transferred between two parties encoded as digitally signed and +encrypted JSON objects.} + +Name: python-%{pkgname} +Version: 1.7.1 +Release: 8%{?dist} +Summary: JSON Web Token implementation in Python +License: MIT +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/jpadilla/pyjwt +Source0: https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c/%{srcname}-%{version}.tar.gz +BuildArch: noarch + +%description %{common_description} + +%if %{with python3} +%package -n python3-%{pkgname} +Summary: %{summary} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-cryptography >= 1.4.0 +BuildRequires: python3-pytest +Requires: python3-cryptography >= 1.4.0 +%{?python_provide:%python_provide python3-%{pkgname}} + +%description -n python3-%{pkgname} %{common_description} +%endif + +%prep +%autosetup -n %{srcname}-%{version} +rm -rf %{eggname}.egg-info +# prevent pullng in `addopts` for pytest run later +rm setup.cfg + +%build +%{?with_python3:python3 setup.py build} + +%install +%{?with_python3:python3 setup.py install --skip-build --root=%{buildroot}} + +%check +%{?with_python3:PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} --verbose tests} + +%if %{with python3} +%files -n python3-%{pkgname} +%doc README.rst AUTHORS +%license LICENSE +%{python3_sitelib}/%{libname} +%{python3_sitelib}/%{eggname}-%{version}-py%{python3_version}.egg-info +#%{python3_sitelib}/%{eggname}-%{version}-py3.7.egg-info +%{_bindir}/pyjwt +%endif + +%changelog +* Thu Feb 04 2021 Joe Schmitt - 1.7.1-8 +- Initial CBL-Mariner import from Fedora 32 (license: MIT). +- Update Source0 to a full url instead of a macro. +- License verified. + +* Thu Jan 30 2020 Fedora Release Engineering - 1.7.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro HronÄok - 1.7.1-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 29 2019 Carl George - 1.7.1-5 +- Disable python2 subpackage on F32+ rhbz#1744643 + +* Fri Aug 16 2019 Miro HronÄok - 1.7.1-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 27 2019 Carl George - 1.7.1-2 +- Re-enable python2 subpackage since python-oauthlib still needs it + +* Mon Mar 04 2019 Yatin Karel - 1.7.1-1 +- Update to 1.7.1 + +* Sat Feb 02 2019 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 04 2018 Carl George - 1.6.4-2 +- Disable python2 subpackage on F30+ +- Don't share doc and license dir between subpackages, can cause upgrade issues +- Add patch1 to skip failing tests + +* Wed Jul 25 2018 Pierre-Yves Chibon - 1.6.4-1 +- Update to 1.6.4 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 15 2018 Miro HronÄok - 1.6.1-2 +- Rebuilt for Python 3.7 + +* Thu Apr 05 2018 Carl George - 1.6.1-1 +- Latest upstream +- Add patch0 to remove pytest-{cov,runner} deps +- Share doc and license dir between subpackages +- Enable EPEL PY3 build + +* Mon Feb 12 2018 Iryna Shcherbina - 1.5.3-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Sep 16 2017 Kevin Fenzi - 1.5.3-1 +- Update to 1.5.3. Fixes bug #1488693 +- 1.5.1 fixed CVE-2017-11424 Fixes bug #1482529 + +* Mon Aug 14 2017 Troy Dawson - 1.5.2-3 +- Fixup spec file conditionals + +* Thu Jul 27 2017 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jun 24 2017 Kevin Fenzi - 1.5.2-1 +- Update to 1.5.2. Fixes bug #1464286 + +* Sat May 27 2017 Kevin Fenzi - 1.5.0-1 +- Update to 1.5.0. Fixes bug #1443792 + +* Mon Apr 17 2017 Kevin Fenzi - 1.4.2-4 +- Modernize spec and make sure to provide python2-jwt + +* Sat Feb 11 2017 Fedora Release Engineering - 1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Stratakis Charalampos - 1.4.2-2 +- Rebuild for Python 3.6 + +* Mon Aug 15 2016 Kevin Fenzi - 1.4.2-1 +- Update to 1.4.2. Fixes bug #1356333 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.4.0-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Wed Sep 16 2015 Ralph Bean - 1.4.0-1 +- new version + +* Wed Jun 17 2015 Ralph Bean - 1.3.0-1 +- new version +- start running the test suite. + +* Fri Mar 27 2015 Ralph Bean - 1.0.1-1 +- new version + +* Thu Mar 19 2015 Ralph Bean - 1.0.0-1 +- new version + +* Fri Feb 20 2015 Ralph Bean - 0.4.3-1 +- Latest upstream. +- Expand the description as per review feedback. +- Add a comment about the test suite. +- Declare noarch. +- Declare _docdir_fmt + +* Wed Feb 18 2015 Ralph Bean - 0.4.2-1 +- initial package for Fedora. \ No newline at end of file diff --git a/SPECS/python-kubernetes/python-kubernetes.signatures.json b/SPECS/python-kubernetes/python-kubernetes.signatures.json new file mode 100644 index 00000000000..fdd9e18b302 --- /dev/null +++ b/SPECS/python-kubernetes/python-kubernetes.signatures.json @@ -0,0 +1,6 @@ +{ + "Signatures": { + "python-kubernetes-11.0.0.tar.gz": "3ec0a0887bef32589ebb46efe7fbd30758c1da3c37f28d4394e9f4620172951a", + "python-kubernetes-base-11.0.0.tar.gz": "a9e189f06fba9c434326fe42d66162173631ccf2329dd9c78957e1fbee50e7d5" + } +} \ No newline at end of file diff --git a/SPECS/python-kubernetes/python-kubernetes.spec b/SPECS/python-kubernetes/python-kubernetes.spec new file mode 100644 index 00000000000..926dd6f4e49 --- /dev/null +++ b/SPECS/python-kubernetes/python-kubernetes.spec @@ -0,0 +1,162 @@ +%global library kubernetes +%global basehash d30f1e6fd4e2725aae04fa2f4982a4cfec7c682b +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +Name: python-%{library} +Version: 11.0.0 +Release: 5%{?dist} +Summary: Python client for the kubernetes API. +License: ASL 2.0 +URL: https://pypi.python.org/pypi/kubernetes +#Source0: https://github.com/kubernetes-client/python/archive/v%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +#Source1: https://github.com/kubernetes-client/python-base/archive/%{basehash}.tar.gz +Source1: %{name}-base-%{version}.tar.gz +BuildArch: noarch + +%package -n python3-%{library} +Summary: Kubernetes Python Client +BuildRequires: git +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +Requires: python3-certifi +Requires: python3-six +Requires: python3-dateutil +Requires: python3-setuptools +Requires: python3-urllib3 +Requires: python3-PyYAML +Requires: python3-google-auth +Requires: python3-websocket-client + + +%description -n python3-%{library} +Python client for the kubernetes API. + +%package -n python3-%{library}-tests +Summary: Tests python-kubernetes library + +Requires: python3-pip +Requires: python3-%{library} = %{version}-%{release} + +%description -n python3-%{library}-tests +Tests python-kubernetes library + + +%description +Python client for the kubernetes API. + +%prep +%autosetup -n python-%{version} -S git + +pushd kubernetes +rm -rf base +tar zxvf %{SOURCE1} +mv python-base-%{basehash} base +popd + + +%build +python3 setup.py build + +%install + +python3 setup.py install --skip-build --root=%{buildroot} +cp -pr kubernetes/test %{buildroot}%{python3_sitelib}/%{library}/ +cp -pr kubernetes/e2e_test %{buildroot}%{python3_sitelib}/%{library}/ + +%files -n python3-%{library} +%license LICENSE +%doc README.md +%{python3_sitelib}/%{library} +%{python3_sitelib}/%{library}-*.egg-info +%exclude %{python3_sitelib}/%{library}/test +%exclude %{python3_sitelib}/%{library}/e2e_test + +%files -n python3-%{library}-tests +%license LICENSE +%{python3_sitelib}/%{library}/test +%{python3_sitelib}/%{library}/e2e_test + +%changelog +* Fri Aug 21 2020 Thomas Crain - 11.0.0-5 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Wed Jul 29 2020 Fedora Release Engineering - 11.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro HronÄok - 11.0.0-3 +- Rebuilt for Python 3.9 + +* Thu Apr 30 2020 Jason Montleon - 11.0.0-2 +- Fix EPEL 7 and 8 builds + +* Thu Apr 30 2020 Jason Montleon - 11.0.0-1 +- Update to 11.0.0 + +* Thu Jan 30 2020 Fedora Release Engineering - 10.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +- Work around BZ1758141 for BZ1799937 + +* Fri Nov 08 2019 Jason Montleon 10.0.1-1 +- Update to upstream 10.0.1 + +* Fri Oct 18 2019 Jason Montleon 9.0.1-1 +- Update to upstream 9.0.1 + +* Thu Oct 03 2019 Miro HronÄok - 8.0.1-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro HronÄok - 8.0.1-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 8.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Feb 18 2019 Jason Montleon 8.0.1-1 +- Update to upstream 8.0.1 + +* Sat Feb 2 2019 Jason Montleon 8.0.0-8 +- add upstream patch to make python-adal optional +- remove python-adal requires for EL7 since it's not available in RHEL base, optional, or extras + +* Sat Feb 02 2019 Fedora Release Engineering - 8.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 17 2019 Jason Montleon 8.0.0-6 +- Only apply EL7 requirement patch on EL7 so Fedora dependency generator works correctly + +* Thu Jan 17 2019 Jason Montleon 8.0.0-5 +- Keep python 2 enabled for Fedora 29. + +* Tue Jan 15 2019 Igor Gnatenko - 8.0.0-4 +- Enable python dependency generator + +* Fri Dec 14 2018 Jason Montleon 8.0.0-3 +- Default to python 2 for EPEL 7 and python 3 for Fedora +- Add docs package for Fedora + +* Mon Nov 26 2018 Jason Montleon 8.0.0-2 +- Patch setup.py to work with EL7 python-setuptools + +* Mon Nov 5 2018 Jason Montleon 8.0.0-1 +- Update to 8.0.0 + +* Wed Oct 3 2018 Jason Montleon 7.0.0-3 +- Adding missing python3-adal dependency + +* Wed Oct 3 2018 Jason Montleon 7.0.0-2 +- Adding missing python-adal dependency + +* Wed Oct 3 2018 Jason Montleon 7.0.0-1 +- Update to 7.0.0 + +* Tue Feb 28 2017 Alfredo Moralejo 1.0.0-0.3.0b3 +- Remove BRs for documentation building as it's not creating html docs. + +* Mon Feb 27 2017 Alfredo Moralejo 1.0.0-0.2.0b3 +- Fixed files section of python3-kubernetes-tests to contain python3 tests. + +* Mon Feb 27 2017 Alfredo Moralejo 1.0.0-0.1.0b3 +- Initial spec for release 1.0.0b3 \ No newline at end of file diff --git a/SPECS/python-logutils/python-logutils.signatures.json b/SPECS/python-logutils/python-logutils.signatures.json new file mode 100644 index 00000000000..1b7df3a8fc7 --- /dev/null +++ b/SPECS/python-logutils/python-logutils.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "logutils-0.3.5.tar.gz": "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82" + } +} \ No newline at end of file diff --git a/SPECS/python-logutils/python-logutils.spec b/SPECS/python-logutils/python-logutils.spec new file mode 100644 index 00000000000..d059f7edee8 --- /dev/null +++ b/SPECS/python-logutils/python-logutils.spec @@ -0,0 +1,61 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname logutils + +Summary: A set of handlers for the Python standard library’s logging package +Name: python-%{pkgname} +Version: 0.3.5 +Release: 1%{?dist} +License: BSD +Url: https://logutils.readthedocs.io/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.io/packages/source/l/%{pkgname}/%{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%global _description %{expand: +The logutils package provides a set of handlers for the Python standard library’s logging package. + +Some of these handlers are out-of-scope for the standard library, and so they are packaged here. +Others are updated versions which have appeared in recent Python releases, but are usable with +older versions of Python, and so are packaged here..} + +%description %_description + +%package -n python3-%{pkgname} +Summary: A lean and fast WSGI object-dispatching web framework + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +Requires: python3 +Requires: python3-libs + + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{pkgname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if %{with check} +%check +python3 setup.py test +%endif + +%files -n python3-%{pkgname} +%license LICENSE.txt +%doc README.rst doc/ +%{python3_sitelib}/* + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.4.0-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-lxml/python-lxml.spec b/SPECS/python-lxml/python-lxml.spec index 72d3fabfe51..37618ce158c 100644 --- a/SPECS/python-lxml/python-lxml.spec +++ b/SPECS/python-lxml/python-lxml.spec @@ -1,29 +1,24 @@ -%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} Summary: XML and HTML with Python Name: python-lxml Version: 4.2.4 -Release: 6%{?dist} -Group: Development/Libraries +Release: 7%{?dist} # Test suite (and only the test suite) is GPLv2+ License: BSD and GPLv2+ URL: https://lxml.de +Vendor: Microsoft Corporation +Distribution: Mariner + # Source0: https://files.pythonhosted.org/packages/ca/63/139b710671c1655aed3b20c1e6776118c62e9f9311152f4c6031e12a0554/lxml-%{version}.tar.gz Source0: lxml-%{version}.tar.gz Patch0: lxml-make-check-fix.patch -Vendor: Microsoft Corporation -Distribution: Mariner -BuildRequires: python2-devel -BuildRequires: python2-libs -BuildRequires: python-xml + BuildRequires: libxslt BuildRequires: libxslt-devel -BuildRequires: Cython BuildRequires: python3 +BuildRequires: python3-Cython BuildRequires: python3-devel BuildRequires: python3-libs -Requires: python2 -Requires: libxslt %description The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. It is unique in that it combines the speed and XML feature completeness of these libraries with the simplicity of a native Python API, mostly compatible but superior to the well-known ElementTree API. @@ -40,46 +35,35 @@ Python 3 version. %prep %setup -q -n lxml-%{version} %patch0 -p1 -rm -rf ../p3dir -cp -a . ../p3dir %build -python2 setup.py build -pushd ../p3dir python3 setup.py build -popd %install -python2 setup.py install --skip-build --root %{buildroot} -pushd ../p3dir python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -popd %check export LC_ALL=en_US.UTF-8 export LANGUAGE=en_US.UTF-8 make test -pushd ../p3dir -make test -popd %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%license LICENSES.txt -%{python2_sitelib}/lxml/* -%{python2_sitelib}/lxml-%{version}-py2.7.egg-info %files -n python3-lxml %defattr(-,root,root,-) +%license LICENSES.txt %{python3_sitelib}/* %changelog -* Sat May 09 00:20:50 PST 2020 Nick Samson - 4.2.4-6 -- Added %%license line automatically - +* Wed Aug 26 2020 Thomas Crain 4.2.4-7 +- Remove python2 support. +- License verified. +* Sat May 09 00:20:50 PST 2020 Nick Samson 4.2.4-6 +- Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 4.2.4-5 - Renaming cython to Cython * Mon Apr 13 2020 Nick Samson 4.2.4-4 diff --git a/SPECS/python-nocasedict/python-nocasedict.signatures.json b/SPECS/python-nocasedict/python-nocasedict.signatures.json new file mode 100644 index 00000000000..49e771b7018 --- /dev/null +++ b/SPECS/python-nocasedict/python-nocasedict.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "nocasedict-0.5.0.tar.gz": "ddb5781d6ce7f5a0f2b1a89aa76f6c6ff6af733c2fda7b4ed837371884c885ca" + } +} \ No newline at end of file diff --git a/SPECS/python-nocasedict/python-nocasedict.spec b/SPECS/python-nocasedict/python-nocasedict.spec new file mode 100644 index 00000000000..0b79d3a5512 --- /dev/null +++ b/SPECS/python-nocasedict/python-nocasedict.spec @@ -0,0 +1,65 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%define pkgname nocasedict + +Summary: Case-insensitive ordered dictionary library for Python +Name: python-%{pkgname} +Version: 0.5.0 +Release: 1%{?dist} +License: LGPLv2+ +URL: https://github.com/pywbem/nocasedict +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://github.com/pywbem/%{pkgname}/archive/%{version}.tar.gz +Source0: %{pkgname}-%{version}.tar.gz +BuildArch: noarch + +%description +The NocaseDict class supports the functionality of the built-in dict class of Python 3.8. + + +%package -n python3-%{pkgname} +Summary: %{summary} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +BuildRequires: python3-six +BuildRequires: python3-pytest >= 3.0.7 +Requires: python3 +Requires: python3-six + + +%description -n python3-%{pkgname} +The NocaseDict class supports the functionality of the built-in dict class of Python 3.8. + + +%prep +%autosetup -n %{pkgname}-%{version} -p 1 +rm -rf *.egg-info + + +%build +python3 setup.py build + + +%install +python3 setup.py install --skip-build --root=%{buildroot} + + +%if %{with tests} +%check +python3 setup.py test +%endif + + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.rst +%{python3_sitelib}/%{pkgname} +%{python3_sitelib}/*.egg-info + + +%changelog +* Fri Aug 21 2020 Thomas Crain - 0.5.0-1 +- Original version for CBL-Mariner +- License verified. \ No newline at end of file diff --git a/SPECS/python-pecan/python-pecan.signatures.json b/SPECS/python-pecan/python-pecan.signatures.json new file mode 100644 index 00000000000..edc210bfb83 --- /dev/null +++ b/SPECS/python-pecan/python-pecan.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "pecan-1.4.0.tar.gz": "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a" + } +} \ No newline at end of file diff --git a/SPECS/python-pecan/python-pecan.spec b/SPECS/python-pecan/python-pecan.spec new file mode 100644 index 00000000000..200d8760d26 --- /dev/null +++ b/SPECS/python-pecan/python-pecan.spec @@ -0,0 +1,71 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname pecan + +Summary: A lean and fast WSGI object-dispatching web framework +Name: python-%{pkgname} +Version: 1.4.0 +Release: 1%{?dist} +License: BSD +Url: https://www.pecanpy.org/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.io/packages/source/p/%{pkgname}/%{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%global _description %{expand: +Pecan was created to fill a void in the Python web-framework world – a very +lightweight framework that provides object-dispatch style routing. Pecan does +not aim to be a “full stack†framework, and therefore includes no out of the +box support for things like sessions or databases (although tutorials are +included for integrating these yourself in just a few lines of code). Pecan +instead focuses on HTTP itself.} + +%description %_description + +%package -n python3-%{pkgname} +Summary: A lean and fast WSGI object-dispatching web framework + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +Requires: python3 +Requires: python3-libs +Requires: python3-webob +Requires: python3-mako +Requires: python3-six +Requires: python3-logutils +%if %{with check} +BuildRequires: python3-pip +%endif + + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{pkgname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if %{with check} +%check +pip3 install tox +tox +%endif + +%files -n python3-%{pkgname} +%license LICENSE +%{python3_sitelib}/* +%{_bindir}/pecan +%{_bindir}/gunicorn_pecan + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.4.0-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-pywbem/python-pywbem.signatures.json b/SPECS/python-pywbem/python-pywbem.signatures.json new file mode 100644 index 00000000000..868898a4a98 --- /dev/null +++ b/SPECS/python-pywbem/python-pywbem.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "pywbem-1.0.1.tar.gz": "c7a8b4d7b0c85a7d922b3c2cbfc534841399bd3be1af3418d83f198712b0d14a" + } +} \ No newline at end of file diff --git a/SPECS/python-pywbem/python-pywbem.spec b/SPECS/python-pywbem/python-pywbem.spec new file mode 100644 index 00000000000..3708db5b272 --- /dev/null +++ b/SPECS/python-pywbem/python-pywbem.spec @@ -0,0 +1,297 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%define pkgname pywbem + +Summary: Python WBEM client interface and related utilities +Name: python-%{pkgname} +Version: 1.0.1 +Release: 2%{?dist} +License: LGPLv2 +URL: https://github.com/pywbem/pywbem +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://github.com/%{pkgname}/%{pkgname}/archive/%{version}.tar.gz +Source0: %{pkgname}-%{version}.tar.gz + +BuildArch: noarch + + +%description +A Python library for making CIM (Common Information Model) operations over HTTP\ +using the WBEM CIM-XML protocol. It is based on the idea that a good WBEM\ +client should be easy to use and not necessarily require a large amount of\ +programming knowledge. It is suitable for a large range of tasks from simply\ +poking around to writing web and GUI applications.\ +\ +WBEM, or Web Based Enterprise Management is a manageability protocol, like\ +SNMP, standardized by the Distributed Management Task Force (DMTF) available\ +at http://www.dmtf.org/standards/wbem.\ +\ +It also provides a Python provider interface, and is the fastest and\ +easiest way to write providers on the planet. + +%package -n python3-%{pkgname} +Summary: Python3 WBEM Client and Provider Interface +BuildArch: noarch +BuildRequires: python3-pip +BuildRequires: python3-PyYAML +BuildRequires: python3-ply +BuildRequires: python3-pbr +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: python3 +Requires: python3-xml +Requires: python3-requests +Requires: python3-nocasedict +Requires: python3-PyYAML +Requires: python3-yamlloader +Requires: python3-ply + +%description -n python3-%{pkgname} +A WBEM client allows issuing operations to a WBEM server, using the CIM +operations over HTTP (CIM-XML) protocol defined in the DMTF standards DSP0200 +and DSP0201. The CIM/WBEM infrastructure is used for a wide variety of systems +management tasks supported by systems running WBEM servers. See WBEM Standards +for more information about WBEM. + +%prep +%setup -q -n %{pkgname}-%{version} +rm -rf ../p2dir +cp -a . ../p2dir + +%build + +PBR_VERSION="%{version}" CFLAGS="%{build_cflags}" python3 setup.py build + +%install +rm -rf %{buildroot} + +env PYTHONPATH=%{buildroot}/%{python3_sitelib} \ + PBR_VERSION="%{version}" \ + python3 setup.py install -O1 --skip-build --root %{buildroot} --prefix=%{_prefix} +rm -rf %{buildroot}/usr/bin/*.bat + +%files -n python3-%{pkgname} +%license LICENSE.txt +%{python3_sitelib}/*.egg-info +%{python3_sitelib}/pywbem +%{python3_sitelib}/pywbem_mock +%{_bindir}/mof_compiler +%doc README.rst + +%changelog +* Fri Aug 21 2020 Thomas Crain - 1.0.1-2 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Mon Aug 10 2020 Gris Ge - 1.0.1-1 +- Upgrade to 1.0.1 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.14.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro HronÄok - 0.14.6-3 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.14.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 17 2019 Tony Asleson - 0.14.6-1 +- Upgrade to 0.14.6 + +* Mon Sep 23 2019 Gris Ge - 0.14.4-1 +- Upgrade to 0.14.4 + +* Fri Sep 13 2019 Gris Ge - 0.14.3-5 +- Fix pywbemcli ModuleNotFoundError: RHBZ #1743784 + +* Mon Aug 19 2019 Miro HronÄok - 0.14.3-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.14.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jul 13 2019 Gris Ge - 0.14.3-2 +- Fix the conflict with sblim-wbemcli: RHBZ #1724104 + +* Sat Jul 13 2019 Gris Ge - 0.14.3-1 +- Upgrade to 0.14.3 and removed python2 stuff + +* Sat Feb 02 2019 Fedora Release Engineering - 0.12.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jan 11 2019 Igor Gnatenko - 0.12.6-2 +- Enable python dependency generator + +* Wed Dec 26 2018 Gris Ge - 0.12.6-1 +- Upgrade to 0.12.6 + +* Tue Jul 24 2018 Gris Ge - 0.12.4-1 +- Upgrade to 0.12.4 + +* Sat Jul 14 2018 Fedora Release Engineering - 0.12.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro HronÄok - 0.12.3-5 +- Rebuilt for Python 3.7 + +* Tue Jun 26 2018 Gris Ge - 0.12.3-4 +- iAdd missing dependency -- python3-devel + +* Tue Jun 26 2018 Gris Ge - 0.12.3-3 +- Rebuild again with --target=f29-python. + +* Thu Jun 21 2018 Gris Ge - 0.12.3-2 +- Rebuilt for Python 3.7 + +* Tue May 22 2018 Gris Ge - 0.12.3-1 +- Upgrade to 0.12.3 + +* Fri May 18 2018 Gris Ge - 0.12.2-3 +- Fix build failure on F28- where python2 is enabled. + Use %license macro. + +* Fri May 18 2018 Gris Ge - 0.12.2-2 +- Remove python2 for F29+. Add missing python3-pbr runtime requirement. + +* Fri May 04 2018 Gris Ge - 0.12.2-1 +- Upgrade to 0.12.2. + +* Wed Feb 14 2018 Iryna Shcherbina - 0.11.0-6 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 0.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 04 2018 Lumír Balhar - 0.11.0-4 +- Fix directory ownership + +* Thu Oct 19 2017 Gris Ge - 0.11.0-3 +- Fedora 25 does not have python2-pip, use python-pip instead. + +* Thu Oct 19 2017 Gris Ge - 0.11.0-2 +- Add missing runtime dependency python2-ply and python3-ply + +* Wed Oct 11 2017 Gris Ge - 0.11.0-1 +- Upgrade to 0.11.0 + +* Sat Aug 19 2017 Zbigniew JÄ™drzejewski-Szmek - 0.10.0-3 +- Python 2 binary package renamed to python2-pywbem + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Gris Ge - 0.10.0-1 +- Upgrade to 0.10.0 + +* Sat Feb 11 2017 Fedora Release Engineering - 0.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 22 2016 Miro HronÄok - 0.9.1-2 +- Rebuild for Python 3.6 + +* Thu Dec 08 2016 Gris Ge 0.9.1-1 +- Upgrade to 0.9.1 + +* Wed Oct 19 2016 Gris Ge 0.9.0-3 +- Add missing runtime dependency python3-six and python-six + +* Tue Sep 27 2016 Gris Ge 0.9.0-2 +- Add missing runtime dependency python3-PyYAML and PyYAML. + +* Wed Sep 14 2016 Gris Ge - 0.9.0-1 +- Upgrade to 0.9.0 and add python3 pacakge -- python3-pywbem. + +* Tue Jul 19 2016 Fedora Release Engineering - 0.7.0-30.20131121svn626 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 0.7.0-29.20131121svn626 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 0.7.0-28.20131121svn626 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Jun 30 2014 Toshio Kuratomi - 0.7.0-27.svn +- Replace python-setuptools-devel BR with python-setuptools + +* Sun Jun 08 2014 Fedora Release Engineering - 0.7.0-26.20131121svn626 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Feb 24 2014 Michal Minar 0.7.0-25.20131121svn656 +- Fixed local authentication under root. + +* Thu Jan 23 2014 Michal Minar 0.7.0-24.20131121svn656 +- Added support for non-ascii strings. + +* Fri Jan 03 2014 Michal Minar 0.7.0-23.20131121svn656 +- Skip hostname check when no verification is desired. + +* Fri Dec 27 2013 Michal Minar 0.7.0-22.20131121svn656 +- Work around M2Crypto's inability to handle unicode strings. + +* Wed Dec 18 2013 Michal Minar 0.7.0-21.20131121svn656 +- Adjusted default certificates paths searched for cert validation. + +* Tue Dec 17 2013 Michal Minar 0.7.0-20.20131121svn656 +- Tweaked the ssl_verify_host patch. + +* Mon Dec 16 2013 Michal Minar 0.7.0-18.20131121svn656 +- Fixes TOCTOU vulnerability in certificate validation. +- Resolves: rhbz#1026891 + +* Thu Nov 21 2013 Jan Safranek 0.7.0-17.20131121svn626 +- Added '-d' option to /usr/bin/mofcomp to just check mof files and their + includes. + +* Tue Aug 27 2013 Jan Safranek 0.7.0-16.20130827svn625 +- Fixed parsing of IPv6 addresses. + +* Fri Aug 09 2013 Michal Minar 0.7.0-15.20130723svn623 +- Fixed certificate verification issue. + +* Sun Aug 04 2013 Fedora Release Engineering - 0.7.0-14.20130723svn623 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 24 2013 0.7.0-13.20130702svn623 +- Added subpackage with Twisted module to reduce dependencies of the main package. + +* Tue Jul 23 2013 0.7.0-12.20130702svn623 +- Fixed checking of CIMVERSION in CIM-XML. + +* Tue Jul 2 2013 Jan Safranek 0.7.0-11.20130702svn622 +- New upstream version. +- Method parameters are now case-insensitive. + +* Fri May 24 2013 Tomas Bzatek 0.7.0-10.20130411svn619 +- Fix module imports in /usr/bin/mofcomp + +* Thu Apr 11 2013 Jan Safranek 0.7.0-9.20130411svn619 +- New upstream version. +- Removed debug 'print' statements. + +* Mon Jan 28 2013 Michal Minar 0.7.0-8.20130128svn613 +- New upstream version. +- Added post-release snapshot version info. +- Removed obsoleted BuildRoot, + +* Sat Jul 21 2012 Fedora Release Engineering - 0.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 0.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 22 2010 David Malcolm - 0.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Fri Jan 01 2010 David Nalley 0.7.0-3 +- refined requires for epel compat +* Sun Jun 28 2009 David Nalley 0.7.0-2 +- Added some verbiage regarding what WBEM is and expanding WBEM and CIM acronyms +- Added python-twisted as a dependency +* Thu Jun 25 2009 David Nalley 0.7.0-1 +- Initial packaging diff --git a/SPECS/python-remoto/python-remoto.signatures.json b/SPECS/python-remoto/python-remoto.signatures.json new file mode 100644 index 00000000000..09270fe314c --- /dev/null +++ b/SPECS/python-remoto/python-remoto.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "remoto-1.2.0.tar.gz": "86ede243083d498a26b907a33a913c0a0dcd8cef01e941c98548553f1eb6ffa8" + } +} \ No newline at end of file diff --git a/SPECS/python-remoto/python-remoto.spec b/SPECS/python-remoto/python-remoto.spec new file mode 100644 index 00000000000..09c575b54dd --- /dev/null +++ b/SPECS/python-remoto/python-remoto.spec @@ -0,0 +1,65 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname remoto + +Summary: A very simplistic remote-command-executor +Name: python-%{pkgname} +Version: 1.2.0 +Release: 1%{?dist} +License: MIT +URL: https://github.com/alfredodeza/remoto +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.io/packages/source/r/%{pkgname}/%{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%global _description %{expand: +A very simplistic remote-command-executor using connections to hosts (ssh, local, containers, and several others are supported) and Python in the remote end. + +All the heavy lifting is done by execnet, while this minimal API provides the bare minimum to handle easy logging and connections from the remote end. + +remoto is a bit opinionated as it was conceived to replace helpers and remote utilities for ceph-deploy, a tool to run remote commands to configure and setup the distributed file system Ceph. ceph-medic uses remoto as well to inspect Ceph clusters.} + +%description %_description + +%package -n python3-%{pkgname} +Summary: A very simplistic remote-command-executor + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +Requires: python3 +Requires: python3-execnet +%if %{with check} +BuildRequires: python3-pip +%endif + + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{pkgname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if %{with check} +%check +pip3 install tox +tox +%endif + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.rst +%{python3_sitelib}/* + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.2.0-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-repoze-lru/python-repoze-lru.signatures.json b/SPECS/python-repoze-lru/python-repoze-lru.signatures.json new file mode 100644 index 00000000000..d79d29db12f --- /dev/null +++ b/SPECS/python-repoze-lru/python-repoze-lru.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "repoze-lru-0.7.tar.gz": "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77" + } +} \ No newline at end of file diff --git a/SPECS/python-repoze-lru/python-repoze-lru.spec b/SPECS/python-repoze-lru/python-repoze-lru.spec new file mode 100644 index 00000000000..5e3d37df1a5 --- /dev/null +++ b/SPECS/python-repoze-lru/python-repoze-lru.spec @@ -0,0 +1,62 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname repoze-lru +%define pypiname repoze.lru + +Summary: A tiny LRU cache implementation and decorator +Name: python-%{pkgname} +Version: 0.7 +Release: 1%{?dist} +License: BSD +URL: https://github.com/repoze/repoze.lru +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://pypi.io/packages/source/r/%{pypiname}/%{pypiname}-%{version}.tar.gz +Source0: %{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%global _description %{expand: +A tiny LRU cache implementation and decorator.} + +%description %_description + +%package -n python3-%{pkgname} +Summary: A tiny LRU cache implementation and decorator + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +Requires: python3 +%if %{with check} +BuildRequires: python3-pip +%endif + + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{pypiname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if %{with check} +%check +pip3 install tox +tox +%endif + +%files -n python3-%{pkgname} +%license LICENSE.txt +%doc README.rst +%{python3_sitelib}/* + +%changelog +* Fri Aug 21 2020 Thomas Crain 2.4.1-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-routes/python-routes.signatures.json b/SPECS/python-routes/python-routes.signatures.json new file mode 100644 index 00000000000..5ee705705a2 --- /dev/null +++ b/SPECS/python-routes/python-routes.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "Routes-2.4.1.tar.gz": "26ee43340fca5a32769ffe0c58edcb396ccce6bc1dfa689ddf844d50877355fd" + } +} \ No newline at end of file diff --git a/SPECS/python-routes/python-routes.spec b/SPECS/python-routes/python-routes.spec new file mode 100644 index 00000000000..5b4f9e40994 --- /dev/null +++ b/SPECS/python-routes/python-routes.spec @@ -0,0 +1,66 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without check +%define pkgname routes +%define upname Routes + +Summary: Python re-implementation of the Rails routes system +Name: python-%{pkgname} +Version: 2.4.1 +Release: 1%{?dist} +License: MIT +URL: https://routes.readthedocs.io/en/latest/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.io/packages/source/R/%{upname}/%{upname}-%{version}.tar.gz + +BuildArch: noarch + +%global _description %{expand: +Routes is a Python re-implementation of the Rails routes system for mapping URL's to Controllers/Actions and generating URL's. Routes makes it easy to create pretty and concise URL's that are RESTful with little effort. + +Speedy and dynamic URL generation means you get a URL with minimal cruft (no big dangling query args). Shortcut features like Named Routes cut down on repetitive typing.} + +%description %_description + +%package -n python3-%{pkgname} +Summary: Python re-implementation of the Rails routes system + +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: python3-setuptools +BuildRequires: python3-six +BuildRequires: python3-repoze-lru +Requires: python3 + +%if %{with check} +BuildRequires: python3-pip +%endif + + +%description -n python3-%{pkgname} %_description + +%prep +%setup -q -n %{upname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --root=%{buildroot} + +%if %{with check} +%check +pip3 install tox +tox +%endif + +%files -n python3-%{pkgname} +%license LICENSE.txt +%doc README.rst CHANGELOG.rst +%{python3_sitelib}/* + +%changelog +* Fri Aug 21 2020 Thomas Crain 2.4.1-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-rsa/python-rsa.signatures.json b/SPECS/python-rsa/python-rsa.signatures.json new file mode 100644 index 00000000000..5e15fba0bb8 --- /dev/null +++ b/SPECS/python-rsa/python-rsa.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "rsa-4.6.tar.gz": "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa" + } +} \ No newline at end of file diff --git a/SPECS/python-rsa/python-rsa.spec b/SPECS/python-rsa/python-rsa.spec new file mode 100644 index 00000000000..1a633a96ae7 --- /dev/null +++ b/SPECS/python-rsa/python-rsa.spec @@ -0,0 +1,50 @@ +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +%global pkgname rsa + +Summary: Purely Python RSA implementation +Name: python-%{pkgname} +Version: 4.6 +Release: 1%{?dist} +License: ASL 2.0 +URL: https://stuvel.eu/software/rsa/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://pypi.python.org/packages/source/r/%{pkgname}/%{pkgname}-%{version}.tar.gz + +BuildArch: noarch + +%description +Python-RSA is a pure-Python RSA implementation. It supports encryption and decryption, signing and verifying signatures, and key generation according to PKCS#1 version 1.5. + +%package -n python3-%{pkgname} +Summary: Various memoizing collections and decorators + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +Requires: python3 +Requires: python3-pyasn1 + +%description -n python3-%{pkgname} +Python-RSA is a pure-Python RSA implementation. It supports encryption and decryption, signing and verifying signatures, and key generation according to PKCS#1 version 1.5. + +%prep +%autosetup -n %{pkgname}-%{version} + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --root=%{buildroot} + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.md +%{python3_sitelib}/%{pkgname} +%{python3_sitelib}/*.egg-info +%{_bindir}/* + +%changelog +* Fri Aug 21 2020 Thomas Crain - 4.6-1 +- Original version for CBL-Mariner +- License verified diff --git a/SPECS/python-sphinx/python-sphinx.spec b/SPECS/python-sphinx/python-sphinx.spec index d2594ff0db6..5290ec395d1 100644 --- a/SPECS/python-sphinx/python-sphinx.spec +++ b/SPECS/python-sphinx/python-sphinx.spec @@ -4,9 +4,9 @@ Summary: Python documentation generator Name: python-sphinx Version: 1.7.9 -Release: 10%{?dist} +Release: 11%{?dist} Group: Development/Tools -License: BSD-2-Clause +License: BSD URL: https://www.sphinx-doc.org Vendor: Microsoft Corporation Distribution: Mariner @@ -42,6 +42,7 @@ Requires: python-imagesize Requires: python-requests Requires: python-snowballstemmer Requires: python-typing +Requires: python2-sphinxcontrib-websupport BuildArch: noarch @@ -81,6 +82,7 @@ Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize Requires: python3-requests Requires: python3-snowballstemmer +Requires: python3-sphinxcontrib-websupport %description -n python3-sphinx @@ -104,6 +106,10 @@ mv %{buildroot}/%{_bindir}/sphinx-quickstart %{buildroot}/%{_bindir}/sphinx-quic mv %{buildroot}/%{_bindir}/sphinx-build %{buildroot}/%{_bindir}/sphinx-build3 mv %{buildroot}/%{_bindir}/sphinx-autogen %{buildroot}/%{_bindir}/sphinx-autogen3 mv %{buildroot}/%{_bindir}/sphinx-apidoc %{buildroot}/%{_bindir}/sphinx-apidoc3 +ln -sfv sphinx-quickstart3 %{buildroot}%{_bindir}/sphinx-quickstart-3 +ln -sfv sphinx-build3 %{buildroot}%{_bindir}/sphinx-build-3 +ln -sfv sphinx-autogen3 %{buildroot}%{_bindir}/sphinx-autogen-3 +ln -sfv sphinx-apidoc3 %{buildroot}%{_bindir}/sphinx-apidoc-3 popd python2 setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -127,9 +133,18 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_bindir}/sphinx-build3 %{_bindir}/sphinx-autogen3 %{_bindir}/sphinx-apidoc3 +%{_bindir}/sphinx-quickstart-3 +%{_bindir}/sphinx-build-3 +%{_bindir}/sphinx-autogen-3 +%{_bindir}/sphinx-apidoc-3 %{python3_sitelib}/* %changelog +* Fri Aug 21 2020 Thomas Crain 1.7.9-11 +- Add sphinx-*-3 binary symlinks for Fedora compatibility +- Add Requires: python(2/3)-sphinxcontrib-websupport +- Correct license shortname +- License verified * Tue Jun 02 2020 Jon Slobodzian 1.7.9-10 - Add python-typing back. * Sat May 09 2020 Nick Samson 1.7.9-9 diff --git a/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.signatures.json b/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.signatures.json new file mode 100644 index 00000000000..f6b3e8fde44 --- /dev/null +++ b/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "sphinxcontrib-websupport-1.1.2.tar.gz": "c47faef4355390160d586bfbd1345052dfd663391014091e2eb13425dcb56ba7" + } +} \ No newline at end of file diff --git a/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec b/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec new file mode 100644 index 00000000000..5f07deee3e6 --- /dev/null +++ b/SPECS/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport.spec @@ -0,0 +1,97 @@ +%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%bcond_without python2 +%define pkgname sphinxcontrib-websupport + +Summary: Python API to integrate Sphinx into a web application +Name: python-%{pkgname} +Version: 1.1.2 +Release: 1%{?dist} +License: BSD +URL: https://github.com/sphinx-doc/sphinxcontrib-websupport +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://github.com/sphinx-doc/%{pkgname}/archive/%{version}.tar.gz +Source0: %{pkgname}-%{version}.tar.gz +BuildArch: noarch + +%global _description %{expand: +The python-sphinxcontrib-websupport package provides a Python API to easily integrate Sphinx documentation into your Web application.} + +%description %_description + + +%if %{with python2} +%package -n python2-%{pkgname} +Summary: %{summary} +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python-xml +Requires: python2 +%if %{with check} +BuildRequires: python-pip +%endif + +%description -n python2-%{pkgname} %_description +%endif + +%package -n python3-%{pkgname} +Summary: %{summary} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +Requires: python3 +%if %{with check} +BuildRequires: python3-pip +%endif + +%description -n python3-%{pkgname} %_description + + +%prep +%autosetup -n %{pkgname}-%{version} -p 1 +rm -rf *.egg-info + + +%build +%if %{with python2} +python2 setup.py build +%endif +python3 setup.py build + + +%install +%if %{with python2} +python2 setup.py install --skip-build --root=%{buildroot} +%endif +python3 setup.py install --skip-build --root=%{buildroot} + +%if %{with check} +%check +pip3 install tox +tox +%endif + +%if %{with python2} +%files -n python2-%{pkgname} +%license LICENSE +%doc README.rst +%{python2_sitelib}/sphinxcontrib/* +%{python2_sitelib}/*.egg-info +%{python2_sitelib}/*.pth +%endif + + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.rst +%{python3_sitelib}/sphinxcontrib/* +%{python3_sitelib}/*.egg-info +%{python3_sitelib}/*.pth + + +%changelog +* Fri Aug 21 2020 Thomas Crain - 0.5.0-1 +- Original version for CBL-Mariner. +- License verified. \ No newline at end of file diff --git a/SPECS/python-yamlloader/python-yamlloader.signatures.json b/SPECS/python-yamlloader/python-yamlloader.signatures.json new file mode 100644 index 00000000000..2bc9e799966 --- /dev/null +++ b/SPECS/python-yamlloader/python-yamlloader.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "yamlloader-0.5.4.tar.gz": "9137cc79f58438007ae0ba63581cdba8167eeeed51e451323b64df2e44c02f10" + } +} \ No newline at end of file diff --git a/SPECS/python-yamlloader/python-yamlloader.spec b/SPECS/python-yamlloader/python-yamlloader.spec new file mode 100644 index 00000000000..cb8b3b695a3 --- /dev/null +++ b/SPECS/python-yamlloader/python-yamlloader.spec @@ -0,0 +1,58 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} + +%define pkgname yamlloader + +Summary: Loaders and dumpers for PyYAML +Name: python-%{pkgname} +Version: 0.5.4 +Release: 1%{?dist} +License: MIT +URL: https://github.com/Phynix/yamlloader +Vendor: Microsoft Corporation +Distribution: Mariner +#Source0: https://github.com/Phynix/%{pkgname}/archive/%{version}.tar.gz +Source0: %{pkgname}-%{version}.tar.gz +BuildArch: noarch + +%description +This module provides loaders and dumpers for PyYAML. + + +%package -n python3-%{pkgname} +Summary: %{summary} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-xml +BuildRequires: python3-PyYAML +Requires: python3 +Requires: python3-PyYAML + + +%description -n python3-%{pkgname} +The NocaseDict class supports the functionality of the built-in dict class of Python 3.8. + + +%prep +%autosetup -n %{pkgname}-%{version} -p 1 +rm -rf *.egg-info + + +%build +python3 setup.py build + + +%install +python3 setup.py install --skip-build --root=%{buildroot} + + +%files -n python3-%{pkgname} +%license LICENSE +%doc README.rst +%{python3_sitelib}/%{pkgname} +%{python3_sitelib}/*.egg-info + + +%changelog +* Fri Aug 21 2020 Thomas Crain - 0.5.4-1 +- Original version for CBL-Mariner +- License verified \ No newline at end of file diff --git a/SPECS/rdma-core/0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch b/SPECS/rdma-core/0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch new file mode 100644 index 00000000000..8830b47b8d0 --- /dev/null +++ b/SPECS/rdma-core/0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch @@ -0,0 +1,33 @@ +From d9a376151c8a0d30ea814704e844f3aa3359d984 Mon Sep 17 00:00:00 2001 +From: "Goldman, Adam" +Date: Tue, 4 Feb 2020 08:55:20 -0500 +Subject: [PATCH] kernel-boot: Do not perform device rename on OPA devices + +PSM2 will not run with recent rdma-core releases. Several tools and +libraries like PSM2, require the hfi1 name to be present. + +Recent rdma-core releases added a new feature to rename kernel devices, +but the default configuration will not work with hfi1 fabrics. + +Related opa-psm2 github issue: + https://github.com/intel/opa-psm2/issues/43 + +Fixes: 5b4099d47be3 ("kernel-boot: Perform device rename to make stable names") +Reviewed-by: Mike Marciniszyn +Signed-off-by: Goldman, Adam +--- + kernel-boot/rdma-persistent-naming.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules +index 9b61e1630d56..95d6851fb97a 100644 +--- a/kernel-boot/rdma-persistent-naming.rules ++++ b/kernel-boot/rdma-persistent-naming.rules +@@ -25,4 +25,4 @@ + # Device type = RoCE + # mlx5_0 -> rocex525400c0fe123455 + # +-ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK" ++ACTION=="add", SUBSYSTEM=="infiniband", KERNEL!="hfi1*", PROGRAM="rdma_rename %k NAME_FALLBACK" +-- +2.24.1 diff --git a/SPECS/rdma-core/rdma-core.signatures.json b/SPECS/rdma-core/rdma-core.signatures.json new file mode 100644 index 00000000000..0639995207f --- /dev/null +++ b/SPECS/rdma-core/rdma-core.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "rdma-core-31.0.tar.gz": "51ae9a3ab81cd6834436813fafc310c8b7007feae9d09a53fdd5c169e648d50b" + } +} \ No newline at end of file diff --git a/SPECS/rdma-core/rdma-core.spec b/SPECS/rdma-core/rdma-core.spec new file mode 100644 index 00000000000..de98c8357ac --- /dev/null +++ b/SPECS/rdma-core/rdma-core.spec @@ -0,0 +1,717 @@ +%define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") +%{!?__python3: %global __python3 /usr/bin/python3} + +Summary: RDMA core userspace libraries and daemons +Name: rdma-core +Version: 31.0 +Release: 2%{?dist} +URL: https://github.com/linux-rdma/rdma-core +Vendor: Microsoft Corporation +Distribution: Mariner + +# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license +# providers/ipathverbs/ Dual licensed using a BSD license with an extra patent clause +# providers/rxe/ Incorporates code from ipathverbs and contains the patent clause +# providers/hfi1verbs Uses the 3 Clause BSD license +License: GPLv2 or BSD +Source0: https://github.com/linux-rdma/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch + +# Do not build static libs by default. +%define with_static %{?_with_static: 1} %{?!_with_static: 0} + +# 32-bit arm is missing required arch-specific memory barriers, +ExcludeArch: %{arm} + +BuildRequires: binutils +BuildRequires: cmake >= 2.8.11 +BuildRequires: gcc +BuildRequires: pkg-config +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-route-3.0) +BuildRequires: python3-Cython +BuildRequires: python-docutils +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRequires: systemd +BuildRequires: systemd-devel +BuildRequires: valgrind +Requires: pciutils + +Provides: rdma = %{version}-%{release} + +BuildRequires: ninja-build +%define CMAKE_FLAGS -GNinja +%define make_jobs ninja-build -C . -v %{?_smp_mflags} +%define cmake_install DESTDIR=%{buildroot} ninja-build -C . install + +%description +RDMA core userspace infrastructure and documentation, including initialization +scripts, kernel driver-specific modprobe override configs, IPoIB network +scripts, dracut rules, and the rdma-ndd utility. + +%package devel +Summary: RDMA core development libraries and headers +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libibverbs%{?_isa} = %{version}-%{release} +Provides: libibverbs-devel = %{version}-%{release} +Obsoletes: libibverbs-devel < %{version}-%{release} +Requires: libibumad%{?_isa} = %{version}-%{release} +Provides: libibumad-devel = %{version}-%{release} +Obsoletes: libibumad-devel < %{version}-%{release} +Requires: librdmacm%{?_isa} = %{version}-%{release} +Provides: librdmacm-devel = %{version}-%{release} +Obsoletes: librdmacm-devel < %{version}-%{release} +Requires: ibacm%{?_isa} = %{version}-%{release} +Provides: ibacm-devel = %{version}-%{release} +Obsoletes: ibacm-devel < %{version}-%{release} +Requires: infiniband-diags%{?_isa} = %{version}-%{release} +Provides: infiniband-diags-devel = %{version}-%{release} +Obsoletes: infiniband-diags-devel < %{version}-%{release} +Provides: libibmad-devel = %{version}-%{release} +Obsoletes: libibmad-devel < %{version}-%{release} +%if %{with_static} +# Since our pkg-config files include private references to these packages they +# need to have their .pc files installed too, even for dynamic linking, or +# pkg-config breaks. +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-route-3.0) +%endif + +%description devel +RDMA core development libraries and headers. + +%package -n infiniband-diags +Summary: InfiniBand Diagnostic Tools +Requires: libibumad%{?_isa} = %{version}-%{release} +Provides: perl(IBswcountlimits) +Provides: libibmad = %{version}-%{release} +Obsoletes: libibmad < %{version}-%{release} + +%description -n infiniband-diags +This package provides IB diagnostic programs and scripts needed to diagnose an +IB subnet. infiniband-diags now also provides libibmad. libibmad provides +low layer IB functions for use by the IB diagnostic and management +programs. These include MAD, SA, SMP, and other basic IB functions. + +%package -n infiniband-diags-compat +Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools + +%description -n infiniband-diags-compat +Deprecated scripts and utilities which provide duplicated functionality, most +often at a reduced performance. These are maintained for the time being for +compatibility reasons. + +%package -n libibverbs +Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: libcxgb4 = %{version}-%{release} +Obsoletes: libcxgb4 < %{version}-%{release} +Provides: libefa = %{version}-%{release} +Obsoletes: libefa < %{version}-%{release} +Provides: libhfi1 = %{version}-%{release} +Obsoletes: libhfi1 < %{version}-%{release} +Provides: libi40iw = %{version}-%{release} +Obsoletes: libi40iw < %{version}-%{release} +Provides: libipathverbs = %{version}-%{release} +Obsoletes: libipathverbs < %{version}-%{release} +Provides: libmlx4 = %{version}-%{release} +Obsoletes: libmlx4 < %{version}-%{release} +Provides: libmlx5 = %{version}-%{release} +Obsoletes: libmlx5 < %{version}-%{release} +Provides: libmthca = %{version}-%{release} +Obsoletes: libmthca < %{version}-%{release} +Provides: libocrdma = %{version}-%{release} +Obsoletes: libocrdma < %{version}-%{release} +Provides: librxe = %{version}-%{release} +Obsoletes: librxe < %{version}-%{release} + +%description -n libibverbs +libibverbs is a library that allows userspace processes to use RDMA +"verbs" as described in the InfiniBand Architecture Specification and +the RDMA Protocol Verbs Specification. This includes direct hardware +access from userspace to InfiniBand/iWARP adapters (kernel bypass) for +fast path operations. + +Device-specific plug-in ibverbs userspace drivers are included: + +- libcxgb4: Chelsio T4 iWARP HCA +- libefa: Amazon Elastic Fabric Adapter +- libhfi1: Intel Omni-Path HFI +- libhns: HiSilicon Hip06 SoC +- libi40iw: Intel Ethernet Connection X722 RDMA +- libipathverbs: QLogic InfiniPath HCA +- libmlx4: Mellanox ConnectX-3 InfiniBand HCA +- libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA +- libmthca: Mellanox InfiniBand HCA +- libocrdma: Emulex OneConnect RDMA/RoCE Device +- libqedr: QLogic QL4xxx RoCE HCA +- librxe: A software implementation of the RoCE protocol +- libsiw: A software implementation of the iWarp protocol +- libvmw_pvrdma: VMware paravirtual RDMA device + +%package -n libibverbs-utils +Summary: Examples for the libibverbs library +Requires: libibverbs%{?_isa} = %{version}-%{release} + +%description -n libibverbs-utils +Useful libibverbs example programs such as ibv_devinfo, which +displays information about RDMA devices. + +%package -n ibacm +Summary: InfiniBand Communication Manager Assistant +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n ibacm +The ibacm daemon helps reduce the load of managing path record lookups on +large InfiniBand fabrics by providing a user space implementation of what +is functionally similar to an ARP cache. The use of ibacm, when properly +configured, can reduce the SA packet load of a large IB cluster from O(n^2) +to O(n). The ibacm daemon is started and normally runs in the background, +user applications need not know about this daemon as long as their app +uses librdmacm to handle connection bring up/tear down. The librdmacm +library knows how to talk directly to the ibacm daemon to retrieve data. + +%package -n iwpmd +Summary: iWarp Port Mapper userspace daemon +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n iwpmd +iwpmd provides a userspace service for iWarp drivers to claim +tcp ports through the standard socket interface. + +%package -n libibumad +Summary: OpenFabrics Alliance InfiniBand umad (userspace management datagram) library +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n libibumad +libibumad provides the userspace management datagram (umad) library +functions, which sit on top of the umad modules in the kernel. These +are used by the IB diagnostic and management tools, including OpenSM. + +%package -n librdmacm +Summary: Userspace RDMA Connection Manager +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n librdmacm +librdmacm provides a userspace RDMA Communication Management API. + +%package -n librdmacm-utils +Summary: Examples for the librdmacm library +Requires: librdmacm%{?_isa} = %{version}-%{release} + +%description -n librdmacm-utils +Example test programs for the librdmacm library. + +%package -n srp_daemon +Summary: Tools for using the InfiniBand SRP protocol devices +Obsoletes: srptools <= 1.0.3 +Provides: srptools = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n srp_daemon +In conjunction with the kernel ib_srp driver, srp_daemon allows you to +discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand. + +%package -n python3-pyverbs +Summary: Python3 API over IB verbs +%{?python_provide:%python_provide python3-pyverbs} + +%description -n python3-pyverbs +Pyverbs is a Cython-based Python API over libibverbs, providing an +easy, object-oriented access to IB verbs. + +%prep +%autosetup -v -p1 + +%build +# This package uses top level ASM constructs which are incompatible with LTO. +# Top level ASMs are often used to implement symbol versioning. gcc-10 +# introduces a new mechanism for symbol versioning which works with LTO. +# Converting packages to use that mechanism instead of toplevel ASMs is +# recommended. +# Disable LTO +%define _lto_cflags %{nil} + +# New RPM defines _rundir, usually as /run +%if 0%{?_rundir:1} +%else +%define _rundir /var/run +%endif + +%{!?EXTRA_CMAKE_FLAGS: %define EXTRA_CMAKE_FLAGS %{nil}} + +# Pass all of the rpm paths directly to GNUInstallDirs and our other defines. +%cmake %{CMAKE_FLAGS} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \ + -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ + -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \ + -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \ + -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \ + -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \ + -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \ + -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \ + -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \ + -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \ + -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \ + -DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \ + -DENABLE_IBDIAGS_COMPAT:BOOL=True \ +%if %{with_static} + -DENABLE_STATIC=1 \ +%endif + %{EXTRA_CMAKE_FLAGS} \ + -DPYTHON_EXECUTABLE:PATH=%{__python3} \ + -DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \ + -DNO_PYVERBS=0 +%make_jobs + +%install +%cmake_install + +mkdir -p %{buildroot}/%{_sysconfdir}/rdma + +# Red Hat specific glue +%global dracutlibdir %{_prefix}/lib/dracut +%global sysmodprobedir %{_prefix}/lib/modprobe.d +mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d +mkdir -p %{buildroot}%{_libexecdir} +mkdir -p %{buildroot}%{_udevrulesdir} +mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma +mkdir -p %{buildroot}%{sysmodprobedir} +install -D -m0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf +install -D -m0644 redhat/rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs +install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf +install -D -m0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service +install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh +install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules +install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf +install -D -m0755 redhat/rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel +install -D -m0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf +install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh + +# ibacm +bin/ib_acme -D . -O +install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/ + +# Delete the package's init.d scripts +rm -rf %{buildroot}/%{_initrddir}/ +rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh + +%post -n libibverbs -p /sbin/ldconfig +%postun -n libibverbs -p /sbin/ldconfig + +%post -n libibumad -p /sbin/ldconfig +%postun -n libibumad -p /sbin/ldconfig + +%post -n librdmacm -p /sbin/ldconfig +%postun -n librdmacm -p /sbin/ldconfig + +%post -n rdma-core +if [ -x /sbin/udevadm ]; then +/sbin/udevadm trigger --subsystem-match=infiniband --action=change || true +/sbin/udevadm trigger --subsystem-match=net --action=change || true +/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change || true +fi + +%post -n ibacm +%systemd_post ibacm.service +%preun -n ibacm +%systemd_preun ibacm.service +%postun -n ibacm +%systemd_postun_with_restart ibacm.service + +%post -n srp_daemon +%systemd_post srp_daemon.service +%preun -n srp_daemon +%systemd_preun srp_daemon.service +%postun -n srp_daemon +%systemd_postun_with_restart srp_daemon.service + +%post -n iwpmd +%systemd_post iwpmd.service +%preun -n iwpmd +%systemd_preun iwpmd.service +%postun -n iwpmd +%systemd_postun_with_restart iwpmd.service + +%files +%license COPYING.BSD_FB COPYING.BSD_MIT COPYING.GPL2 COPYING.md +%dir %{_sysconfdir}/rdma +%dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/README.md +%doc %{_docdir}/%{name}/rxe.md +%doc %{_docdir}/%{name}/udev.md +%doc %{_docdir}/%{name}/tag_matching.md +%config(noreplace) %{_sysconfdir}/rdma/mlx4.conf +%config(noreplace) %{_sysconfdir}/rdma/modules/infiniband.conf +%config(noreplace) %{_sysconfdir}/rdma/modules/iwarp.conf +%config(noreplace) %{_sysconfdir}/rdma/modules/opa.conf +%config(noreplace) %{_sysconfdir}/rdma/modules/rdma.conf +%config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf +%config(noreplace) %{_sysconfdir}/rdma/rdma.conf +%config(noreplace) %{_sysconfdir}/rdma/sriov-vfs +%config(noreplace) %{_sysconfdir}/udev/rules.d/* +%dir %{_sysconfdir}/modprobe.d +%config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf +%{_unitdir}/rdma-hw.target +%{_unitdir}/rdma-load-modules@.service +%{_unitdir}/rdma.service +%dir %{dracutlibdir} +%dir %{dracutlibdir}/modules.d +%dir %{dracutlibdir}/modules.d/05rdma +%{dracutlibdir}/modules.d/05rdma/module-setup.sh +%dir %{_udevrulesdir} +%{_udevrulesdir}/../rdma_rename +%{_udevrulesdir}/60-rdma-ndd.rules +%{_udevrulesdir}/60-rdma-persistent-naming.rules +%{_udevrulesdir}/75-rdma-description.rules +%{_udevrulesdir}/90-rdma-hw-modules.rules +%{_udevrulesdir}/90-rdma-ulp-modules.rules +%{_udevrulesdir}/90-rdma-umad.rules +%{_udevrulesdir}/98-rdma.rules +%dir %{sysmodprobedir} +%{sysmodprobedir}/libmlx4.conf +%{_libexecdir}/rdma-init-kernel +%{_libexecdir}/rdma-set-sriov-vf +%{_libexecdir}/mlx4-setup.sh +%{_libexecdir}/truescale-serdes.cmds +%{_sbindir}/rdma-ndd +%{_unitdir}/rdma-ndd.service +%{_mandir}/man7/rxe* +%{_mandir}/man8/rdma-ndd.* + +%files devel +%doc %{_docdir}/%{name}/MAINTAINERS +%dir %{_includedir}/infiniband +%dir %{_includedir}/rdma +%{_includedir}/infiniband/* +%{_includedir}/rdma/* +%if %{with_static} +%{_libdir}/lib*.a +%endif +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/efadv* +%{_mandir}/man3/ibv_* +%{_mandir}/man3/rdma* +%{_mandir}/man3/umad* +%{_mandir}/man3/*_to_ibv_rate.* +%{_mandir}/man7/rdma_cm.* +%{_mandir}/man3/mlx5dv* +%{_mandir}/man3/mlx4dv* +%{_mandir}/man7/efadv* +%{_mandir}/man7/mlx5dv* +%{_mandir}/man7/mlx4dv* +%{_mandir}/man3/ibnd_* + +%files -n infiniband-diags-compat +%{_sbindir}/ibcheckerrs +%{_mandir}/man8/ibcheckerrs* +%{_sbindir}/ibchecknet +%{_mandir}/man8/ibchecknet* +%{_sbindir}/ibchecknode +%{_mandir}/man8/ibchecknode* +%{_sbindir}/ibcheckport +%{_mandir}/man8/ibcheckport.* +%{_sbindir}/ibcheckportwidth +%{_mandir}/man8/ibcheckportwidth* +%{_sbindir}/ibcheckportstate +%{_mandir}/man8/ibcheckportstate* +%{_sbindir}/ibcheckwidth +%{_mandir}/man8/ibcheckwidth* +%{_sbindir}/ibcheckstate +%{_mandir}/man8/ibcheckstate* +%{_sbindir}/ibcheckerrors +%{_mandir}/man8/ibcheckerrors* +%{_sbindir}/ibdatacounts +%{_mandir}/man8/ibdatacounts* +%{_sbindir}/ibdatacounters +%{_mandir}/man8/ibdatacounters* +%{_sbindir}/ibdiscover.pl +%{_mandir}/man8/ibdiscover* +%{_sbindir}/ibswportwatch.pl +%{_mandir}/man8/ibswportwatch* +%{_sbindir}/ibqueryerrors.pl +%{_sbindir}/iblinkinfo.pl +%{_sbindir}/ibprintca.pl +%{_mandir}/man8/ibprintca* +%{_sbindir}/ibprintswitch.pl +%{_mandir}/man8/ibprintswitch* +%{_sbindir}/ibprintrt.pl +%{_mandir}/man8/ibprintrt* +%{_sbindir}/set_nodedesc.sh + +%files -n infiniband-diags +%{_sbindir}/ibaddr +%{_mandir}/man8/ibaddr* +%{_sbindir}/ibnetdiscover +%{_mandir}/man8/ibnetdiscover* +%{_sbindir}/ibping +%{_mandir}/man8/ibping* +%{_sbindir}/ibportstate +%{_mandir}/man8/ibportstate* +%{_sbindir}/ibroute +%{_mandir}/man8/ibroute.* +%{_sbindir}/ibstat +%{_mandir}/man8/ibstat.* +%{_sbindir}/ibsysstat +%{_mandir}/man8/ibsysstat* +%{_sbindir}/ibtracert +%{_mandir}/man8/ibtracert* +%{_sbindir}/perfquery +%{_mandir}/man8/perfquery* +%{_sbindir}/sminfo +%{_mandir}/man8/sminfo* +%{_sbindir}/smpdump +%{_mandir}/man8/smpdump* +%{_sbindir}/smpquery +%{_mandir}/man8/smpquery* +%{_sbindir}/saquery +%{_mandir}/man8/saquery* +%{_sbindir}/vendstat +%{_mandir}/man8/vendstat* +%{_sbindir}/iblinkinfo +%{_mandir}/man8/iblinkinfo* +%{_sbindir}/ibqueryerrors +%{_mandir}/man8/ibqueryerrors* +%{_sbindir}/ibcacheedit +%{_mandir}/man8/ibcacheedit* +%{_sbindir}/ibccquery +%{_mandir}/man8/ibccquery* +%{_sbindir}/ibccconfig +%{_mandir}/man8/ibccconfig* +%{_sbindir}/dump_fts +%{_mandir}/man8/dump_fts* +%{_sbindir}/ibhosts +%{_mandir}/man8/ibhosts* +%{_sbindir}/ibswitches +%{_mandir}/man8/ibswitches* +%{_sbindir}/ibnodes +%{_mandir}/man8/ibnodes* +%{_sbindir}/ibrouters +%{_mandir}/man8/ibrouters* +%{_sbindir}/ibfindnodesusing.pl +%{_mandir}/man8/ibfindnodesusing* +%{_sbindir}/ibidsverify.pl +%{_mandir}/man8/ibidsverify* +%{_sbindir}/check_lft_balance.pl +%{_mandir}/man8/check_lft_balance* +%{_sbindir}/dump_lfts.sh +%{_mandir}/man8/dump_lfts* +%{_sbindir}/dump_mfts.sh +%{_mandir}/man8/dump_mfts* +%{_sbindir}/ibclearerrors +%{_mandir}/man8/ibclearerrors* +%{_sbindir}/ibclearcounters +%{_mandir}/man8/ibclearcounters* +%{_sbindir}/ibstatus +%{_mandir}/man8/ibstatus* +%{_mandir}/man8/infiniband-diags* +%{_libdir}/libibmad*.so.* +%{_libdir}/libibnetdisc*.so.* +%{perl_vendorlib}/IBswcountlimits.pm +%config(noreplace) %{_sysconfdir}/infiniband-diags/error_thresholds +%config(noreplace) %{_sysconfdir}/infiniband-diags/ibdiag.conf + +%files -n libibverbs +%dir %{_sysconfdir}/libibverbs.d +%dir %{_libdir}/libibverbs +%{_libdir}/libefa.so.* +%{_libdir}/libibverbs*.so.* +%{_libdir}/libibverbs/*.so +%{_libdir}/libmlx5.so.* +%{_libdir}/libmlx4.so.* +%config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver +%doc %{_docdir}/%{name}/libibverbs.md + +%files -n libibverbs-utils +%{_bindir}/ibv_* +%{_mandir}/man1/ibv_* + +%files -n ibacm +%config(noreplace) %{_sysconfdir}/rdma/ibacm_opts.cfg +%{_bindir}/ib_acme +%{_sbindir}/ibacm +%{_mandir}/man1/ib_acme.* +%{_mandir}/man7/ibacm.* +%{_mandir}/man7/ibacm_prov.* +%{_mandir}/man8/ibacm.* +%{_unitdir}/ibacm.service +%{_unitdir}/ibacm.socket +%dir %{_libdir}/ibacm +%{_libdir}/ibacm/* +%doc %{_docdir}/%{name}/ibacm.md + +%files -n iwpmd +%{_sbindir}/iwpmd +%{_unitdir}/iwpmd.service +%config(noreplace) %{_sysconfdir}/rdma/modules/iwpmd.conf +%config(noreplace) %{_sysconfdir}/iwpmd.conf +%{_udevrulesdir}/90-iwpmd.rules +%{_mandir}/man8/iwpmd.* +%{_mandir}/man5/iwpmd.* + +%files -n libibumad +%{_libdir}/libibumad*.so.* + +%files -n librdmacm +%{_libdir}/librdmacm*.so.* +%dir %{_libdir}/rsocket +%{_libdir}/rsocket/*.so* +%doc %{_docdir}/%{name}/librdmacm.md +%{_mandir}/man7/rsocket.* + +%files -n librdmacm-utils +%{_bindir}/cmtime +%{_bindir}/mckey +%{_bindir}/rcopy +%{_bindir}/rdma_client +%{_bindir}/rdma_server +%{_bindir}/rdma_xclient +%{_bindir}/rdma_xserver +%{_bindir}/riostream +%{_bindir}/rping +%{_bindir}/rstream +%{_bindir}/ucmatose +%{_bindir}/udaddy +%{_bindir}/udpong +%{_mandir}/man1/cmtime.* +%{_mandir}/man1/mckey.* +%{_mandir}/man1/rcopy.* +%{_mandir}/man1/rdma_client.* +%{_mandir}/man1/rdma_server.* +%{_mandir}/man1/rdma_xclient.* +%{_mandir}/man1/rdma_xserver.* +%{_mandir}/man1/riostream.* +%{_mandir}/man1/rping.* +%{_mandir}/man1/rstream.* +%{_mandir}/man1/ucmatose.* +%{_mandir}/man1/udaddy.* +%{_mandir}/man1/udpong.* + +%files -n srp_daemon +%config(noreplace) %{_sysconfdir}/srp_daemon.conf +%config(noreplace) %{_sysconfdir}/rdma/modules/srp_daemon.conf +%{_libexecdir}/srp_daemon/start_on_all_ports +%{_unitdir}/srp_daemon.service +%{_unitdir}/srp_daemon_port@.service +%{_sbindir}/ibsrpdm +%{_sbindir}/srp_daemon +%{_sbindir}/run_srp_daemon +%{_udevrulesdir}/60-srp_daemon.rules +%{_mandir}/man5/srp_daemon.service.5* +%{_mandir}/man5/srp_daemon_port@.service.5* +%{_mandir}/man8/ibsrpdm.8* +%{_mandir}/man8/srp_daemon.8* +%doc %{_docdir}/%{name}/ibsrpdm.md + +%files -n python3-pyverbs +%{python3_sitearch}/pyverbs +%{_docdir}/%{name}/tests/*.py + +%changelog +* Fri Aug 21 2020 Thomas Crain - 31.0-2 +- Initial CBL-Mariner import from Fedora 33 (license: MIT). License verified. + +* Wed Aug 19 2020 Honggang Li - 31.0-1 +- Rebase to upstream release v31.0 + +* Thu Jul 30 2020 Honggang Li - 30.0-6 +- Update cmake options + +* Wed Jul 29 2020 Fedora Release Engineering - 30.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 02 2020 Stephen Gallagher - 30.0-4 +- Don't throw script errors if udev is not installed + +* Wed Jul 1 2020 Jeff Law - 30.0-3 +- Disable LTO + +* Thu Jun 25 2020 Zbigniew JÄ™drzejewski-Szmek - 30.0-2 +- Drop dependencies on systemd (#1837812) + +* Mon Jun 15 2020 Honggang Li - 30.0-1 +- Rebase to upstream release v30.0 + +* Tue May 26 2020 Miro HronÄok - 29.0-2 +- Rebuilt for Python 3.9 + +* Mon Apr 13 2020 Honggang Li - 29.0-1 +- Rebase to upstream release v29.0 + +* Wed Feb 12 2020 Honggang Li - 28.0-1 +- Rebase to upstream release v28.0 + +* Thu Jan 30 2020 Fedora Release Engineering - 27.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 19 2020 Orion Poplawski - 27.0-3 +- Fix typo in requires + +* Sun Jan 19 2020 Honggang Li - 27.0-2 +- Backport some spec improvement from upstream + +* Thu Dec 12 2019 Honggang Li - 27.0-1 +- Rebase to upstream release v27.0 + +* Thu Nov 28 2019 Honggang Li - 26.1-1 +- Rebase to upstream release v26.1 + +* Fri Jul 26 2019 Fedora Release Engineering - 20.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 20.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Björn Esser - 20.1-2 +- Append curdir to CMake invokation. (#1668512) + +* Fri Oct 19 2018 Jarod Wilson - 20.1-1 +- Long overdue update to upstream v20.1 stable release + +* Sat Jul 14 2018 Fedora Release Engineering - 16.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Mar 18 2018 Iryna Shcherbina - 16.2-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Tue Feb 06 2018 Orion Poplawski - 16.2-3 +- Build for s390/x + +* Tue Feb 06 2018 Patrick Uiterwijk - 16.2-2 +- Fix escaped macro + +* Sun Feb 04 2018 Doug Ledford - 16.2-1 +- Update to rdma-core-16.2 +- Drop the old sysv initscript files + +* Wed Aug 09 2017 Jarod Wilson - 14-4 +- Make use of systemd_requires, own srp_daemon dir + +* Tue Aug 01 2017 Jarod Wilson - 14-3 +- Revert work-around for ppc64le library issues +- Add Obsoletes/Provides for libusnic_verbs + +* Thu Jul 27 2017 Fedora Release Engineering - 14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jul 25 2017 Jarod Wilson - 14-1 +- Update to upstream v14 release +- Sync packaging updates from RHEL and upstream + +* Sat Feb 11 2017 Fedora Release Engineering - 12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 27 2017 Jarod Wilson - 12-1 +- Update to upstream final v12 release + +* Wed Jan 25 2017 Jarod Wilson - 12-0.1.rc3.1 +- Initial import to Fedora package database via post-v12-rc3 git snapshot \ No newline at end of file diff --git a/SPECS/sgml-common/XMLSchema.dtd b/SPECS/sgml-common/XMLSchema.dtd new file mode 100644 index 00000000000..e8e8f7625a9 --- /dev/null +++ b/SPECS/sgml-common/XMLSchema.dtd @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%xs-datatypes; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SPECS/sgml-common/datatypes.dtd b/SPECS/sgml-common/datatypes.dtd new file mode 100644 index 00000000000..8e48553beeb --- /dev/null +++ b/SPECS/sgml-common/datatypes.dtd @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SPECS/sgml-common/html.dcl b/SPECS/sgml-common/html.dcl new file mode 100644 index 00000000000..710e9e27e89 --- /dev/null +++ b/SPECS/sgml-common/html.dcl @@ -0,0 +1,88 @@ + + diff --git a/SPECS/sgml-common/html.soc b/SPECS/sgml-common/html.soc new file mode 100644 index 00000000000..c0b19498916 --- /dev/null +++ b/SPECS/sgml-common/html.soc @@ -0,0 +1,31 @@ + -- catalog: SGML Open style entity catalog for HTML -- + -- $Id: html.soc,v 1.1 2004/09/09 12:19:26 cvsdist Exp $ -- + -- Hacked by jjc -- + + -- Ways to refer to Level 2: most general to most specific -- +PUBLIC "-//IETF//DTD HTML//EN" html.dtd +PUBLIC "-//IETF//DTD HTML 2.0//EN" html.dtd +PUBLIC "-//IETF//DTD HTML Level 2//EN" html.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN" html.dtd + + -- Ways to refer to Level 1: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Level 1//EN" html-1.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN" html-1.dtd + + -- Ways to refer to + Strict Level 2: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Strict//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML Strict Level 2//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN" html-s.dtd + + -- Ways to refer to + Strict Level 1: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Strict Level 1//EN" html-1s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN" html-1s.dtd + + -- ISO latin 1 entity set for HTML -- +PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML" ISOlat1.sgm + +SGMLDECL html.dcl +DOCTYPE html html.dtd diff --git a/SPECS/sgml-common/sgml-common-quotes.patch b/SPECS/sgml-common/sgml-common-quotes.patch new file mode 100644 index 00000000000..c901b9e3a60 --- /dev/null +++ b/SPECS/sgml-common/sgml-common-quotes.patch @@ -0,0 +1,94 @@ +--- sgml-common-0.6.3/bin/install-catalog.in.quotes Mon Nov 5 11:19:23 2001 ++++ sgml-common-0.6.3/bin/install-catalog.in Mon Nov 5 11:20:12 2001 +@@ -39,8 +39,8 @@ + # Process actions + case $1 in + -a|--add) SGML_ACTION="addition" +- SGML_CENTRALIZED=$2 +- SGML_ORDINARY=$3 ++ SGML_CENTRALIZED="$2" ++ SGML_ORDINARY="$3" + ;; + -r|--remove) if [ -z "$3" -o "$3" = "--version" ] + then +@@ -48,8 +48,8 @@ + exit 0 + fi + SGML_ACTION="removal" +- SGML_CENTRALIZED=$2 +- SGML_ORDINARY=$3 ++ SGML_CENTRALIZED="$2" ++ SGML_ORDINARY="$3" + ;; + -h|--help) echo -e $SGML_HELP_MESSAGE + exit 0 +@@ -96,14 +96,14 @@ + fi + case $SGML_ACTION in + addition) +- if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ] ++ if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ] + then + echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2 + exit 2 + fi + ;; + removal) +- if [ ! -w $SGML_CENTRALIZED ] ++ if [ ! -w "$SGML_CENTRALIZED" ] + then + echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2 + exit 2 +@@ -119,7 +119,7 @@ + fi + case $SGML_ACTION in + addition) +- if [ ! -s $SGML_ORDINARY ] ++ if [ ! -s "$SGML_ORDINARY" ] + then + echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2 + exit 2 +@@ -131,33 +131,33 @@ + case $SGML_ACTION in + addition) + echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED" +- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null ++ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null + then + echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2 + else +- echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED ++ echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED" + fi +- grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null ++ grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null + if [ $? -ne 0 ] + then + echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog" +- echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog ++ echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog + fi + ;; + removal) + echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED" +- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null ++ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null + then +- sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new +- mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED ++ sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new" ++ mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED" + else + echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2 + fi +- if [ ! -s $SGML_CENTRALIZED ] ++ if [ ! -s "$SGML_CENTRALIZED" ] + then +- rm $SGML_CENTRALIZED ++ rm "$SGML_CENTRALIZED" + echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog" +- sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new ++ sed -e "\:$SGML_POINTER \"\\?$SGML_CENTRALIZED\"\\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new + mv /etc/sgml/catalog.new /etc/sgml/catalog + fi + ;; diff --git a/SPECS/sgml-common/sgml-common-umask.patch b/SPECS/sgml-common/sgml-common-umask.patch new file mode 100644 index 00000000000..90bda3bf2b6 --- /dev/null +++ b/SPECS/sgml-common/sgml-common-umask.patch @@ -0,0 +1,12 @@ +--- sgml-common-0.6.3/bin/install-catalog.in.umask Mon May 21 11:48:37 2001 ++++ sgml-common-0.6.3/bin/install-catalog.in Mon May 21 12:00:34 2001 +@@ -13,6 +13,9 @@ + \040 -h, --help: \t\t\t\t Print this help message and exit\n\ + \040 -v, --version: \t\t\t Print the version number and exit\n" + ++# We need the files we create to be world readable ++umask 022 ++ + # Set version message + SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)" + diff --git a/SPECS/sgml-common/sgml-common-xmldir.patch b/SPECS/sgml-common/sgml-common-xmldir.patch new file mode 100644 index 00000000000..d7c2b2ba7d7 --- /dev/null +++ b/SPECS/sgml-common/sgml-common-xmldir.patch @@ -0,0 +1,19 @@ +--- sgml-common-0.6.3/xml-iso-entities/Makefile.am.xmldir Fri Oct 5 16:37:43 2001 ++++ sgml-common-0.6.3/xml-iso-entities/Makefile.am Fri Oct 5 16:37:57 2001 +@@ -1,4 +1,4 @@ +-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986 ++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986 + isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent \ + ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent \ + ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent \ +--- sgml-common-0.6.3/xml-iso-entities/Makefile.in.xmldir 2007-05-15 17:21:31.000000000 +0100 ++++ sgml-common-0.6.3/xml-iso-entities/Makefile.in 2007-05-15 17:21:43.000000000 +0100 +@@ -62,7 +62,7 @@ + VERSION = @VERSION@ + docdir = @docdir@ + +-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986 ++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986 + isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent ISOtech.ent catalog + + diff --git a/SPECS/sgml-common/sgml-common.signatures.json b/SPECS/sgml-common/sgml-common.signatures.json new file mode 100644 index 00000000000..3b1a49425ff --- /dev/null +++ b/SPECS/sgml-common/sgml-common.signatures.json @@ -0,0 +1,15 @@ +{ + "Signatures": { + "datatypes.dtd": "6946432ca7af2e9584f91b48564111fd2c73c8debbbcd9a0e3f5ddd382eeb51c", + "html.dcl": "2c60aa036c12f9643d8408ed4b79efa6e28f15021dcaa41fca67b33aa1d4309a", + "html.soc": "661b4ed0d5757e5a3f328fb347b6719165fd9acbc8eef918358a9cc3a9df6e39", + "sgml-common-0.6.3.tgz": "7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959", + "sgml.conf.5": "74a44c17cf21bac20259f9458018db4d76c3d6e848f42ca8cfbd1c10bd652563", + "sgmlwhich.1": "a4409d4913c6f2c08c762dfd64828b4a89f4941a9ee05370e21804b13e81e73b", + "xml.dcl": "1068e172c737baefc5217b20631771ef83e4c5dd704f3f560a9f16c04f247d16", + "xml.soc": "e9d7967c700a7155a99c9490b8eee9364a9e20addbc5eee0dae203480782c2c1", + "xml.xsd": "cc701736c42cc64126fad063bb95f94484b5de3b5f808a86ea098b0957aff829", + "xmldsig-core-schema.xsd": "5baf55ea1ef7cfb89ca33209d7a764c594d26feca814116dacc04bee51b868ce", + "XMLSchema.dtd": "2032ead9fd47a61b22fe56aa02be1840bd9bb9015b0c0d3f1e8aac75dd91c3b9" + } +} \ No newline at end of file diff --git a/SPECS/sgml-common/sgml-common.spec b/SPECS/sgml-common/sgml-common.spec new file mode 100644 index 00000000000..c24558f933f --- /dev/null +++ b/SPECS/sgml-common/sgml-common.spec @@ -0,0 +1,428 @@ +%global xmlxsdver 2009/01 + +Summary: Common SGML catalog and DTD files +Name: sgml-common +Version: 0.6.3 +Release: 56%{?dist} +License: GPL+ + +BuildArch: noarch + +#Actually - there is no homepage of this project, on that URL +#page you could get complete ISO 8879 listing as was on the +#old page - only part of it is included in sgml-common package. +URL: http://www.w3.org/2003/entities/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz +# Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date: +Source1: xml.dcl +Source2: xml.soc +Source3: html.dcl +Source4: html.soc +Source5: xml.xsd +Source6: xmldsig-core-schema.xsd +Source7: XMLSchema.dtd +Source8: datatypes.dtd +Source9: sgmlwhich.1 +Source10: sgml.conf.5 + +Patch0: sgml-common-umask.patch +Patch1: sgml-common-xmldir.patch +Patch2: sgml-common-quotes.patch + +BuildRequires: libxml2 +BuildRequires: automake +Requires: %{_bindir}/basename + +%description +The sgml-common package contains a collection of entities and DTDs +that are useful for processing SGML, but that don't need to be +included in multiple packages. Sgml-common also includes an +up-to-date Open Catalog file. + +%package -n xml-common +Summary: Common XML catalog and DTD files +License: GPL+ +Requires(pre): %{_bindir}/xmlcatalog + +%description -n xml-common +The xml-common is a subpackage of sgml-common which contains +a collection XML catalogs that are useful for processing XML, +but that don't need to be included in main package. + +%prep +%setup -q +%patch0 -p1 -b .umask +%patch1 -p1 -b .xmldir +%patch2 -p1 -b .quotes + +# replace bogus links with files +automakedir=`ls -1d /usr/share/automake* | head -n +1` +for file in COPYING INSTALL install-sh missing mkinstalldirs; do + rm $file + cp -p $automakedir/$file . +done + +%build +%configure + +%install +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" htmldir='%{_datadir}/doc' INSTALL='install -p' +mkdir %{buildroot}%{_sysconfdir}/xml +mkdir -p %{buildroot}%{_sysconfdir}/sgml/docbook +mkdir -p %{buildroot}%{_datadir}/sgml/docbook +# Touch SGML catalog +touch %{buildroot}%{_sysconfdir}/sgml/catalog +# Create an empty XML catalog. +XMLCATALOG=%{buildroot}%{_sysconfdir}/xml/catalog +%{_bindir}/xmlcatalog --noout --create $XMLCATALOG +# ...and add xml.xsd in it +for type in system uri ; do + for path in 2001 %{xmlxsdver} ; do + %{_bindir}/xmlcatalog --noout --add $type \ + "http://www.w3.org/$path/xml.xsd" \ + "file://%{_datadir}/xml/xml.xsd" $XMLCATALOG + done + # Add xmldsig-core-schema.xsd to catalog + %{_bindir}/xmlcatalog --noout --add $type \ + "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" \ + "file://%{_datadir}/xml/xmldsig-core-schema.xsd" $XMLCATALOG +done +# Now put the common DocBook entries in it +%{_bindir}/xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG +%{_bindir}/xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG +%{_bindir}/xmlcatalog --noout --add "delegatePublic" \ + "ISO 8879:1986" \ + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG +%{_bindir}/xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG +%{_bindir}/xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG +for public in "-//W3C//DTD XMLSchema 200102//EN" "-//W3C//DTD XMLSCHEMA 200102//EN" ; do + %{_bindir}/xmlcatalog --noout --add "public" \ + "$public" \ + "file://%{_datadir}/xml/XMLSchema.dtd" $XMLCATALOG +done +%{_bindir}/xmlcatalog --noout --add "system" \ + "http://www.w3.org/2001/XMLSchema.dtd" \ + "file://%{_datadir}/xml/XMLSchema.dtd" $XMLCATALOG + +# Also create the common DocBook catalog +%{_bindir}/xmlcatalog --noout --create \ + %{buildroot}%{_sysconfdir}/sgml/docbook/xmlcatalog +ln -sf %{_sysconfdir}/sgml/docbook/xmlcatalog\ + %{buildroot}%{_datadir}/sgml/docbook/xmlcatalog + +rm -f %{buildroot}%{_datadir}/sgml/xml.dcl +install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ + %{buildroot}%{_datadir}/sgml +rm -rf %{buildroot}%{_datadir}/xml/* +install -p -m0644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \ + %{buildroot}%{_datadir}/xml +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man5 +install -p -m0644 %{SOURCE9} %{buildroot}%{_mandir}/man1 +install -p -m0644 %{SOURCE10} %{buildroot}%{_mandir}/man5 + +# remove installed doc file and prepare installation with %%doc +rm %{buildroot}%{_datadir}/doc/*.html +rm -rf __dist_doc/html/ +mkdir -p __dist_doc/html/ +cp -p doc/HTML/*.html __dist_doc/html/ + + +%pre -n xml-common +if [ $1 -gt 1 ] && [ -e %{_sysconfdir}/xml/catalog ]; then + for type in system uri ; do + for path in 2001 %{xmlxsdver} ; do + %{_bindir}/xmlcatalog --noout --add $type \ + "http://www.w3.org/$path/xml.xsd" \ + "file://%{_datadir}/xml/xml.xsd" \ + %{_sysconfdir}/xml/catalog + done + %{_bindir}/xmlcatalog --noout --add $type \ + "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" \ + "file://%{_datadir}/xml/xmldsig-core-schema.xsd" %{_sysconfdir}/xml/catalog + done + for public in "-//W3C//DTD XMLSchema 200102//EN" "-//W3C//DTD XMLSCHEMA 200102//EN" ; do + %{_bindir}/xmlcatalog --noout --add "public" \ + "$public" \ + "file://%{_datadir}/xml/XMLSchema.dtd" %{_sysconfdir}/xml/catalog + done +fi + +%files +%license COPYING +%doc __dist_doc/html/ AUTHORS NEWS ChangeLog README +%dir %{_sysconfdir}/sgml +%config(noreplace) %{_sysconfdir}/sgml/sgml.conf +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/sgml/catalog +%dir %{_datadir}/sgml +%dir %{_datadir}/sgml/sgml-iso-entities-8879.1986 +%{_datadir}/sgml/sgml-iso-entities-8879.1986/* +%{_datadir}/sgml/xml.dcl +%{_datadir}/sgml/xml.soc +%{_datadir}/sgml/html.dcl +%{_datadir}/sgml/html.soc +%{_bindir}/sgmlwhich +%{_bindir}/install-catalog +%{_mandir}/man8/install-catalog.8* +%{_mandir}/man1/sgmlwhich.1* +%{_mandir}/man5/sgml.conf.5* + +%files -n xml-common +%dir %{_sysconfdir}/xml +%dir %{_sysconfdir}/sgml +%dir %{_sysconfdir}/sgml/docbook +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/catalog +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook/xmlcatalog +%dir %{_datadir}/sgml +%dir %{_datadir}/sgml/docbook +%{_datadir}/sgml/docbook/xmlcatalog +%dir %{_datadir}/xml +%{_datadir}/xml/xml.xsd +%{_datadir}/xml/xmldsig-core-schema.xsd +%{_datadir}/xml/XMLSchema.dtd +%{_datadir}/xml/datatypes.dtd + +%changelog +* Fri Aug 21 2020 Thomas Crain - 0.6.3-56 +- Initial CBL-Mariner import from Fedora 33 (license: MIT) + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.3-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 0.6.3-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 0.6.3-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.6.3-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 05 2018 Ondrej Vasik - 0.6.3-51 +- add basic manpages for sgml.conf(5) and sgmlwhich(1) (#1612272) + +* Sat Jul 14 2018 Fedora Release Engineering - 0.6.3-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 12 2018 Jan Pazdziora - 0.6.3-49 +- Package and catalog xmldsig-core-schema.xsd, XMLSchema.dtd, and datatypes.dtd + +* Fri Feb 09 2018 Fedora Release Engineering - 0.6.3-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Oct 31 2017 Igor Gnatenko - 0.6.3-47 +- Use /usr/bin instead of /bin in Requires + +* Thu Jul 27 2017 Fedora Release Engineering - 0.6.3-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.6.3-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.6.3-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.6.3-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Dec 15 2014 Ondrej Vasik 0.6.3-42 +- add /etc/sgml ownership to xml-common subpackage (#1173925) + +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.3-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.6.3-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.6.3-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 11 2012 Ondrej Vasik 0.6.3-38 +- get rid of the explicit automake14 requirement + +* Sat Jul 21 2012 Fedora Release Engineering - 0.6.3-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.6.3-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Oct 30 2011 Ville Skyttä - 0.6.3-35 +- Include xml.xsd in xml-common (#750073). + +* Wed Feb 09 2011 Fedora Release Engineering - 0.6.3-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jul 12 2010 Ondrej Vasik 0.6.3-33 +- ship COPYING file with both sgml-common and xml-common +- ship documentation with xml-common + +* Fri Jan 15 2010 Ondrej Vasik 0.6.3-32 +- Merge review #226415: remove unapplied patches, remove + versioned BR + +* Wed Nov 11 2009 Ondrej Vasik 0.6.3-31 +- apply quotes patch once again (accidently deleted in Nov07-#533058) + +* Sun Jul 26 2009 Fedora Release Engineering - 0.6.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu May 28 2009 Ondrej Vasik 0.6.3-29 +- do own /etc/sgml/catalog + +* Tue May 19 2009 Ondrej Vasik 0.6.3-28 +- do not provide explicit url for xml-common subpackage, + fix trailing spaces +- add Requires: /bin/basename (#501360) + +* Wed Feb 25 2009 Fedora Release Engineering - 0.6.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Aug 07 2008 Ondrej Vasik 0.6.3-26 +- /etc/sgml/docbook dir now owned by package(#458230) +- get rid off fuzz in patches + +* Tue Jul 01 2008 Ondrej Vasik 0.6.3-25 +- mark xmlcatalog config(noreplace) to prevent overwriting + of the content, move it to sysconfdir and make symlink for + it to silence rpmlint + +* Mon Jun 30 2008 Ondrej Vasik 0.6.3-24 +- mark catalog files as (not md5 size mtime) for verify to + prevent info about changed files (#453271) + +* Thu Nov 22 2007 Ondrej Vasik 0.6.3-23 +- Another MergeReview improvements(provided by Patrice Dumas) +- copy Automake-1.4 files instead of rerunning autotools, +- better preserving timestamps, better handling of documentation +- improved XML-common description + +* Thu Nov 15 2007 Ondrej Vasik 0.6.3-22 +- Merge Review(226415) +- changed: License Tag, using RPM macros instead of hardcoded + dirs, summary ended with dot, added URL, removed CHANGES + file as obsolete, preserved timestamps and some other cosmetic + changes +- no longer shipping old automake tarball, fixed issue with man8_DATA, + BuildRequire:Automake,Autoconf again(see MergeReview discussion) + +* Mon May 28 2007 Ondrej Vasik 0.6.3-21 +- Fixed broken URL (changed to XML entity declarations) (bug #237726) +- Rebuilt + +* Tue May 15 2007 Tim Waugh 0.6.3-20 +- Added dist tag. +- Fixed summary. +- Removed build dependency on autoconf/automake. + +* Tue Oct 24 2006 Tim Waugh 0.6.3-19 +- Removed stale URL (bug #210848). + +* Mon Jun 12 2006 Tim Waugh 0.6.3-18 +- Build requires automake and autoconf (bug #194709). + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Sep 22 2004 Than Ngo 0.6.3-17 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Dec 8 2003 Tim Waugh 0.6.3-15 +- Patch from Ville Skyttä (bug #111625): + - Include /usr/share/xml in xml-common. + - Own /usr/share/sgml and /usr/share/xml. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Oct 23 2002 Tim Waugh 0.6.3-13 +- Ship the installed documentation. +- Don't install files not packaged. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 24 2002 Tim Waugh 0.6.3-10 +- Ship {xml,html}.{dcl,soc} (bug #63500, bug #62980). +- Work around broken tarball packaging. + +* Thu Feb 21 2002 Tim Waugh 0.6.3-9 +- Rebuild in new environment. + +* Thu Jan 17 2002 Tim Waugh 0.6.3-8 +- Back to /usr/share/sgml. Now install docbook-dtds. +- Use a real install-sh, not the symlink shipped in the tarball. + +* Wed Jan 09 2002 Tim Powers 0.6.3-7 +- automated rebuild + +* Mon Nov 5 2001 Tim Waugh 0.6.3-6 +- Don't create a useless empty catalog. +- Don't try to put install things outside the build root. +- Build requires a libxml2 that actually works. + +* Mon Nov 5 2001 Tim Waugh 0.6.3-4 +- Use (and handle) catalog files with quotes in install-catalog. + +* Thu Nov 1 2001 Tim Waugh 0.6.3-3 +- Create default XML Catalog at build time, not install time. + +* Fri Oct 5 2001 Tim Waugh 0.6.3-2 +- Move XML things into /usr/share/xml, and split them out into separate + xml-common package. + +* Mon Oct 1 2001 Tim Waugh 0.6.3-1 +- 0.6.3. Incorporates oldsyntax and quiet patches. +- Make /etc/sgml/sgml.conf noreplace. +- Own /etc/sgml, various other directories (bug #47485, bug #54180). + +* Wed May 23 2001 Tim Waugh 0.5-7 +- Remove execute bit from data files. + +* Mon May 21 2001 Tim Waugh 0.5-6 +- install-catalog needs to make sure that it creates world-readable files + (bug #41552). + +* Wed Mar 14 2001 Tim Powers 0.5-5 +- fixed license + +* Wed Jan 24 2001 Tim Waugh +- Make install-catalog quieter during normal operation. + +* Tue Jan 23 2001 Tim Waugh +- Require textutils, fileutils, grep (bug #24719). + +* Wed Jan 17 2001 Tim Waugh +- Require sh-utils. + +* Mon Jan 15 2001 Tim Waugh +- Don't play so many macro games. +- Fix typo in install-catalog patch. + +* Mon Jan 08 2001 Tim Waugh +- Change group. +- Install by hand (man/en/...). Use %%{_mandir}. +- Use %%{_tmppath}. +- Make install-catalog fail silently if given the old syntax. +- Add CHANGES file. +- Change Copyright: to License:. +- Remove Packager: line. + +* Mon Jan 08 2001 Tim Waugh +- Based on Eric Bischoff's new-trials packages. diff --git a/SPECS/sgml-common/sgml.conf.5 b/SPECS/sgml-common/sgml.conf.5 new file mode 100644 index 00000000000..7d97166f228 --- /dev/null +++ b/SPECS/sgml-common/sgml.conf.5 @@ -0,0 +1,40 @@ +.TH SGML.CONF 5 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +sgml.conf \- basic configuration file for SGML environment variables + +.SH "DESCRIPTION" +This file contains basic variables for SGML environment. +.HP +Format of this file is straightforward: + +- Lines are either empty lines, comment lines (starting with hash mark) or variable assignments. + +- Assigments take form of "variable=value" where whitespace is not allowed. This makes the format Bourne-shell includable. + +.SH "VARIABLES" +.TP +.B SGML_BASE_DIR +This variable contains root of the location of sgml components. Suggested value for this variable is /usr/share/sgml. +.TP +.B SGML_CATALOGS_DIRS +This variable contains location of sgml catalog files. Suggested value is /etc/sgml. +.TP +.B SGML_EXTRA_BASE_DIRS +This variable contains the directory name(s) of the root of the location(s) of optional sgml components that the system administrator doesn't want to install to primary SGML_BASE_DIR directory. If multiple directory names are mentioned, they are separated by colons. +.TP +.B SGML_BIN_DIR +This variable contains the directory where executables should be placed. By default /usr/bin. +.TP +.B SGML_EXTRA_BIN_DIRS +This variable contains the directory name(s) where optional executables can be placed. Suggested and default value is /usr/local/bin. If multiple directory names are mentioned, they are separated by colons. +.TP +.B SGML_TMP_DIR +A hint to components where to put temporary files. The suggested and default value is /tmp. +.TP +.B SGML_POSTINSTALL_CMD +A command that is to be executed when new components have been installed. This mechanism is not used by default, sgml components are usually registered by %post scriptlets. +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR xsltproc (1) diff --git a/SPECS/sgml-common/sgmlwhich.1 b/SPECS/sgml-common/sgmlwhich.1 new file mode 100644 index 00000000000..b00e7fdd01c --- /dev/null +++ b/SPECS/sgml-common/sgmlwhich.1 @@ -0,0 +1,21 @@ +.TH SGMLWHICH 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +sgmlwhich \- prints location of main sgml configuration file +.SH SYNOPSIS +.B sgmlwhich + +.SH "DESCRIPTION" +Simple script which prints location of main sgml configuration file. +It is provided for consistency with non-LSB platforms. + +.SH OPTIONS +Script doesn't accept any options. + +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR sgml.conf (5) + +.SH AUTHOR +Eric Bischoff diff --git a/SPECS/sgml-common/xml.dcl b/SPECS/sgml-common/xml.dcl new file mode 100644 index 00000000000..fed21030921 --- /dev/null +++ b/SPECS/sgml-common/xml.dcl @@ -0,0 +1,179 @@ +" + PIC "?>" + SHORTREF NONE + + NAMES + SGMLREF + + QUANTITY NONE + + ENTITIES + "amp" 38 + "lt" 60 + "gt" 62 + "quot" 34 + "apos" 39 + + FEATURES + MINIMIZE + DATATAG NO + OMITTAG NO + RANK NO + SHORTTAG + STARTTAG + EMPTY NO + UNCLOSED NO + NETENABL IMMEDNET + ENDTAG + EMPTY NO + UNCLOSED NO + ATTRIB + DEFAULT YES + OMITNAME NO + VALUE NO + EMPTYNRM YES + IMPLYDEF + ATTLIST NO + DOCTYPE NO + ELEMENT NO + ENTITY NO + NOTATION NO + LINK + SIMPLE NO + IMPLICIT NO + EXPLICIT NO + OTHER + CONCUR NO + SUBDOC NO + FORMAL NO + URN NO + KEEPRSRE YES + VALIDITY TYPE + ENTITIES + REF ANY + INTEGRAL YES + APPINFO NONE + SEEALSO "ISO 8879:1986//NOTATION + Extensible Markup Language (XML) 1.0//EN" +> diff --git a/SPECS/sgml-common/xml.soc b/SPECS/sgml-common/xml.soc new file mode 100644 index 00000000000..278c6f37adc --- /dev/null +++ b/SPECS/sgml-common/xml.soc @@ -0,0 +1 @@ +SGMLDECL "xml.dcl" diff --git a/SPECS/sgml-common/xml.xsd b/SPECS/sgml-common/xml.xsd new file mode 100644 index 00000000000..bd291f3d4be --- /dev/null +++ b/SPECS/sgml-common/xml.xsd @@ -0,0 +1,286 @@ + + + + + + +
+

About the XML namespace

+ +
+

+ This schema document describes the XML namespace, in a form + suitable for import by other schema documents. +

+

+ See + http://www.w3.org/XML/1998/namespace.html and + + http://www.w3.org/TR/REC-xml for information + about this namespace. +

+

+ Note that local names in this namespace are intended to be + defined only by the World Wide Web Consortium or its subgroups. + The names currently defined in this namespace are listed below. + They should not be used with conflicting semantics by any Working + Group, specification, or document instance. +

+

+ See further below in this document for more information about how to refer to this schema document from your own + XSD schema documents and about the + namespace-versioning policy governing this schema document. +

+
+
+ + + + + + +
+ +

lang (as an attribute name)

+

+ denotes an attribute whose value + is a language code for the natural language of the content of + any element; its value is inherited. This name is reserved + by virtue of its definition in the XML specification.

+ +
+
+

Notes

+

+ Attempting to install the relevant ISO 2- and 3-letter + codes as the enumerated possible values is probably never + going to be a realistic possibility. +

+

+ See BCP 47 at + http://www.rfc-editor.org/rfc/bcp/bcp47.txt + and the IANA language subtag registry at + + http://www.iana.org/assignments/language-subtag-registry + for further information. +

+

+ The union allows for the 'un-declaration' of xml:lang with + the empty string. +

+
+ + + + + + + + + + + + + + + + +
+ +

space (as an attribute name)

+

+ denotes an attribute whose + value is a keyword indicating what whitespace processing + discipline is intended for the content of the element; its + value is inherited. This name is reserved by virtue of its + definition in the XML specification.

+ +
+ + + + + + + + + + + + +
+ +

base (as an attribute name)

+

+ denotes an attribute whose value + provides a URI to be used as the base for interpreting any + relative URIs in the scope of the element on which it + appears; its value is inherited. This name is reserved + by virtue of its definition in the XML Base specification.

+ +

+ See http://www.w3.org/TR/xmlbase/ + for information about this attribute. +

+
+ + + + + + + +
+ +

id (as an attribute name)

+

+ denotes an attribute whose value + should be interpreted as if declared to be of type ID. + This name is reserved by virtue of its definition in the + xml:id specification.

+ +

+ See http://www.w3.org/TR/xml-id/ + for information about this attribute. +

+
+ + + + + + + + + + + + + +
+ +

Father (in any context at all)

+ +
+

+ denotes Jon Bosak, the chair of + the original XML Working Group. This name is reserved by + the following decision of the W3C XML Plenary and + XML Coordination groups: +

+
+

+ In appreciation for his vision, leadership and + dedication the W3C XML Plenary on this 10th day of + February, 2000, reserves for Jon Bosak in perpetuity + the XML name "xml:Father". +

+
+
+
+ + + + + +
+

About this schema document

+ +
+

+ This schema defines attributes and an attribute group suitable + for use by schemas wishing to allow xml:base, + xml:lang, xml:space or + xml:id attributes on elements they define. +

+

+ To enable this, such a schema must import this schema for + the XML namespace, e.g. as follows: +

+ 
+          <schema . . .>
+           . . .
+           <import namespace="http://www.w3.org/XML/1998/namespace"
+                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+

+ or +

+ 
+           <import namespace="http://www.w3.org/XML/1998/namespace"
+                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
+
+

+ Subsequently, qualified reference to any of the attributes or the + group defined below will have the desired effect, e.g. +

+ 
+          <type . . .>
+           . . .
+           <attributeGroup ref="xml:specialAttrs"/>
+
+

+ will define a type which will schema-validate an instance element + with any of those attributes. +

+
+
+ + + + + +
+

Versioning policy for this schema document

+
+

+ In keeping with the XML Schema WG's standard versioning + policy, this schema document will persist at + + http://www.w3.org/2009/01/xml.xsd. +

+

+ At the date of issue it can also be found at + + http://www.w3.org/2001/xml.xsd. +

+

+ The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XML + Schema itself, or with the XML namespace itself. In other words, + if the XML Schema or XML namespaces change, the version of this + document at + http://www.w3.org/2001/xml.xsd + + will change accordingly; the version at + + http://www.w3.org/2009/01/xml.xsd + + will not change. +

+

+ Previous dated (and unchanging) versions of this schema + document are at: +

+ +
+
+ + + + diff --git a/SPECS/sgml-common/xmldsig-core-schema.xsd b/SPECS/sgml-common/xmldsig-core-schema.xsd new file mode 100644 index 00000000000..e35571b9272 --- /dev/null +++ b/SPECS/sgml-common/xmldsig-core-schema.xsd @@ -0,0 +1,318 @@ + + + + + + ]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SPECS/xmlstarlet/xmlstarlet-1.6.1-nogit.patch b/SPECS/xmlstarlet/xmlstarlet-1.6.1-nogit.patch new file mode 100644 index 00000000000..9eb772eae9a --- /dev/null +++ b/SPECS/xmlstarlet/xmlstarlet-1.6.1-nogit.patch @@ -0,0 +1,10 @@ +`diff -uNr xmlstarlet-1.6.1-orig/configure.ac xmlstarlet-1.6.1/configure.ac +--- xmlstarlet-1.6.1-orig/configure.ac 2013-12-22 17:00:28.000000000 -0500 ++++ xmlstarlet-1.6.1/configure.ac 2014-12-08 17:12:47.836499274 -0500 +@@ -1,5 +1,5 @@ + AC_PREREQ([2.62]) +-AC_INIT([XMLStarlet], [m4_esyscmd_s([git describe --tags --dirty])], ++AC_INIT([XMLStarlet], [m4_esyscmd_s([if test -d .git ; then git describe --tags --dirty ; fi])], + [http://sourceforge.net/projects/xmlstar/support], + [], + [http://xmlstar.sourceforge.net/]) diff --git a/SPECS/xmlstarlet/xmlstarlet.signatures.json b/SPECS/xmlstarlet/xmlstarlet.signatures.json new file mode 100644 index 00000000000..252538302dc --- /dev/null +++ b/SPECS/xmlstarlet/xmlstarlet.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "xmlstarlet-1.6.1.tar.gz": "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" + } +} \ No newline at end of file diff --git a/SPECS/xmlstarlet/xmlstarlet.spec b/SPECS/xmlstarlet/xmlstarlet.spec new file mode 100644 index 00000000000..1ed04ea8909 --- /dev/null +++ b/SPECS/xmlstarlet/xmlstarlet.spec @@ -0,0 +1,208 @@ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + +Summary: Command Line XML Toolkit +Name: xmlstarlet +Version: 1.6.1 +Release: 16%{?dist} +License: MIT +URL: http://xmlstar.sourceforge.net/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://downloads.sourceforge.net/project/xmlstar/%{name}/%{version}/%{name}-%{version}.tar.gz + +# https://sourceforge.net/p/xmlstar/bugs/109/ +Patch0: xmlstarlet-1.6.1-nogit.patch +# http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106 + +BuildRequires: gcc +BuildRequires: xmlto +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libxslt-devel +BuildRequires: libxml2-devel >= 2.6.23 +BuildRequires: docbook5-schemas + + +%description +XMLStarlet is a set of command line utilities which can be used +to transform, query, validate, and edit XML documents and files +using simple set of shell commands in similar way it is done for +plain text files using UNIX grep, sed, awk, diff, patch, join, etc +commands. + +%prep +%setup -q +%patch0 -p1 -b .nogit + + +%build +autoreconf -i +%configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{_pkgdocdir} # --libdir=%{_libdir} +make %{?_smp_mflags} + + +%install +rm -fr %{buildroot} +make install DESTDIR=%{buildroot} +# Avoid name kludging in autotools +mv %{buildroot}%{_bindir}/xml %{buildroot}%{_bindir}/xmlstarlet + + +%check +make check + + +%files +%doc AUTHORS ChangeLog NEWS README Copyright TODO +%doc %{_pkgdocdir}/* +%{_mandir}/man1/xmlstarlet.1* +%{_bindir}/xmlstarlet + + +%changelog +* Fri Aug 21 2020 Thomas Crain - 1.6.1-16 +* Initial CBL-Mariner import from Fedora 33 (license: MIT) +- License verified + +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Mar 01 2016 Yaakov Selkowitz - 1.6.1-6 +- Mark installed documentation as %%doc (#1308255) + +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Dec 8 2014 Paul W. Frields - 1.6.1-3 +- Fix noisy git related spew (#1171864) + +* Mon Aug 18 2014 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Aug 13 2014 Paul W. Frields - 1.6.1-1 +- Update to upstream 1.6.1 (#1129106) + +* Mon Jun 16 2014 Paul W. Frields - 1.6.0-1 +- Update to upstream 1.6.0 (#1037400, #1107292) + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Jul 27 2013 Ville Skyttä - 1.5.0-2 +- Install docs to %%{_pkgdocdir} where available. + +* Wed Jul 10 2013 Paul W. Frields - 1.5.0-1 +- Update to upstream 1.5.0 (#983025) +- Fix man page rendering (#981050) +- Use standard docdir + +* Mon Mar 25 2013 Paul W. Frields - 1.4.2-1 +- Update to upstream 1.4.2 (#851880) + +* Fri Feb 15 2013 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Feb 15 2012 Paul W. Frields - 1.3.1-2 +- Fix build with configure flag + +* Wed Feb 15 2012 Paul W. Frields - 1.3.1-1 +- Update to upstream 1.3.1 (#782066) + +* Sat Jan 14 2012 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Oct 3 2011 Paul W. Frields - 1.3.0-1 +- Update to upstream 1.3.0 + +* Fri Aug 26 2011 Paul W. Frields - 1.2.1-1 +- Update to upstream 1.2.1 + +* Sun Apr 10 2011 Paul W. Frields - 1.1.0-1 +- Update to upstream 1.1.0 + +* Thu Apr 07 2011 Dan Horák - 1.0.6-2 +- fix build on 64-bit big-endians + +* Sat Mar 26 2011 Paul W. Frields - 1.0.6-1 +- Update to upstream 1.0.6 +- Drop obsolete patch + +* Thu Feb 17 2011 Paul W. Frields - 1.0.5-1 +- Update to upstream 1.0.5 +- Update libxml2 requirement +- Drop unnecessary patch, naming issue fixed upstream + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 19 2011 Paul W. Frields - 1.0.4-1 +- Update to new upstream 1.0.4 +- Drop patches for fixed upstream issues + +* Fri Dec 17 2010 Paul W. Frields - 1.0.3-1 +- Update to new upstream 1.0.3 +- Add %%check section for validation testing + +* Mon Nov 1 2010 Paul W. Frields - 1.0.2-1 +- Update to new upstream 1.0.2 + +* Sun Jan 10 2010 Paul W. Frields - 1.0.1-9 +- Correct source URL + +* Mon Jul 27 2009 Fedora Release Engineering - 1.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 1.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Mar 21 2008 Paul W. Frields - 1.0.1-6 +- Rebuild to use FORTIFY_SOURCE correctly + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-5 +- Autorebuild for GCC 4.3 + +* Sat Sep 2 2006 Paul W. Frields - 1.0.1-4 +- Bump release for FC6 mass rebuild + +* Fri Feb 17 2006 Paul W. Frields - 1.0.1-3 +- FESCo mandated rebuild + +* Wed Nov 23 2005 Paul W. Frields - 1.0.1-2 +- Minor changes per review + +* Tue Nov 22 2005 Paul W. Frields - 1.0.1-1.2 +- Improve patching to conquer inconsistent naming + +* Tue Nov 22 2005 Paul W. Frields - 1.0.1-1.1 +- Initial RPM version + diff --git a/SPECS/yasm/0001-Update-elf-objfmt.c.patch b/SPECS/yasm/0001-Update-elf-objfmt.c.patch new file mode 100644 index 00000000000..50ca61c6cfa --- /dev/null +++ b/SPECS/yasm/0001-Update-elf-objfmt.c.patch @@ -0,0 +1,31 @@ +From c7d58a55ace0fe4233aac8dc335bea0745ef7dd9 Mon Sep 17 00:00:00 2001 +From: kalebskeithley +Date: Thu, 21 May 2020 09:12:36 -0400 +Subject: [PATCH] Update elf-objfmt.c + +tl;dnr: add support for note.gnu.property note sections. + +ceph has a few optimized crc32 routines hand written in assembly in yasm format. (Nobody appears to have the stomach for rewriting them in another format.) Fedora requires that libraries be CET enabled. IOW all .o comprising a shared library need a note.gnu.properties NOTE section with some magic bits that tell the linker that the .o was compiled with the appropriate options. + +I can add such a note section, but without this change yasm will not set the correct section flag and I have to resort to some dd magic to set the correct section type before linking all the .o files into the shlib. +--- + modules/objfmts/elf/elf-objfmt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/objfmts/elf/elf-objfmt.c b/modules/objfmts/elf/elf-objfmt.c +index 0c3a1426..c4360c03 100644 +--- a/modules/objfmts/elf/elf-objfmt.c ++++ b/modules/objfmts/elf/elf-objfmt.c +@@ -1077,6 +1077,10 @@ elf_objfmt_section_switch(yasm_object *object, yasm_valparamhead *valparams, + align = 0; + data.type = SHT_PROGBITS; + data.flags = 0; ++ } else if (strcmp(sectname, ".note.gnu.property") == 0) { ++ align = 8; ++ data.type = SHT_NOTE; ++ data.flags = 0; + } else { + /* Default to code */ + align = 1; +-- +2.26.2 diff --git a/SPECS/yasm/yasm.signatures.json b/SPECS/yasm/yasm.signatures.json new file mode 100644 index 00000000000..cf5cc41889b --- /dev/null +++ b/SPECS/yasm/yasm.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "yasm-1.3.0.tar.gz": "3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f" + } +} \ No newline at end of file diff --git a/SPECS/yasm/yasm.spec b/SPECS/yasm/yasm.spec new file mode 100644 index 00000000000..835389ab8aa --- /dev/null +++ b/SPECS/yasm/yasm.spec @@ -0,0 +1,230 @@ +Summary: Modular Assembler +Name: yasm +Version: 1.3.0 +Release: 13%{?dist} +License: BSD and (GPLv2+ or Artistic or LGPLv2+) and LGPLv2 +URL: https://yasm.tortall.net/ +Vendor: Microsoft Corporation +Distribution: Mariner +Source0: https://www.tortall.net/projects/%{name}/releases/%{name}-%{version}.tar.gz +Patch1: 0001-Update-elf-objfmt.c.patch + +BuildRequires: gcc +BuildRequires: bison +BuildRequires: byacc +BuildRequires: gettext +BuildRequires: xmlto +Provides: bundled(md5-plumb) + + +%description +Yasm is a complete rewrite of the NASM assembler under the "new" BSD License +(some portions are under other licenses, see COPYING for details). It is +designed from the ground up to allow for multiple assembler syntaxes to be +supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object +formats and even multiple instruction sets. Another primary module of the +overall design is an optimizer module. + + +%package devel +Summary: Header files and static libraries for the yasm Modular Assembler +Requires: %{name} = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} +Provides: bundled(md5-plumb) + +%description devel +Yasm is a complete rewrite of the NASM assembler under the "new" BSD License +(some portions are under other licenses, see COPYING for details). It is +designed from the ground up to allow for multiple assembler syntaxes to be +supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object +formats and even multiple instruction sets. Another primary module of the +overall design is an optimizer module. +Install this package if you need to rebuild applications that use yasm. + + +%prep +%setup -q +%patch1 -p1 + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + + +%files +%license Artistic.txt BSD.txt COPYING GNU_GPL-2.0 GNU_LGPL-2.0 +%doc AUTHORS +%{_bindir}/vsyasm +%{_bindir}/yasm +%{_bindir}/ytasm +%{_mandir}/man1/yasm.1* + +%files devel +%{_includedir}/libyasm/ +%{_includedir}/libyasm-stdint.h +%{_includedir}/libyasm.h +%{_libdir}/libyasm.a +%{_mandir}/man7/yasm_*.7* + + +%changelog +* Fri Aug 21 2020 Thomas Crain 1.3.0-13 +- Initial CBL-Mariner version imported from Fedora 33 (license: MIT) +- License verified + +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Oct 01 2015 Christian Dersch - 1.3.0-2 +- Fixed bogus date (RHBZ #1190908) + +* Wed Sep 30 2015 Christian Dersch - 1.3.0-1 +- new version +- spec cleanup + +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Oct 17 2012 Mikolaj Izdebski - 1.2.0-3 +- Add missing Provides: bundled(md5-plumb) + +* Sun Jul 22 2012 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Matthias Saou 1.2.0-1 +- Update to 1.2.0 (#750234). +- Minor spec file cleanups (keep EPEL compatibility, #802162). + +* Sat Jan 14 2012 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Aug 15 2010 Matthias Saou 1.1.0-1 +- Update to 1.1.0 (#622240). + +* Thu Jul 29 2010 Matthias Saou 1.0.1-2 +- Provide static sub-package from devel (#609626). + +* Sun May 23 2010 Matthias Saou 1.0.1-1 +- Update to 1.0.1 (#593250). + +* Wed Apr 28 2010 Matthias Saou 1.0.0-1 +- Update to 1.0.0 (#580872). +- Include new vsyasm binary. + +* Mon Dec 7 2009 Matthias Saou 0.8.0-1 +- Update to 0.8.0 (#523729). +- Include new ytasm binary. + +* Mon Jul 27 2009 Fedora Release Engineering - 0.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Dec 24 2008 Matthias Saou 0.7.2-1 +- Update to 0.7.2. +- Remove useless /sbin/ldconfig calls, as we don't ship any shared library. +- Update summary. + +* Sat Sep 6 2008 Tom "spot" Callaway 0.7.1-2 +- fix license tag so that it doesn't trigger a false positive on the check + script. + +* Tue May 20 2008 Matthias Saou 0.7.1-1 +- Update to 0.7.1. + +* Tue May 13 2008 Matthias Saou 0.7.0-1 +- Update to 0.7.0. + +* Tue Feb 19 2008 Fedora Release Engineering +- Autorebuild for GCC 4.3 + +* Mon Sep 24 2007 Matthias Saou 0.6.2-1 +- Update to 0.6.2. + +* Thu Aug 23 2007 Matthias Saou 0.6.1-3 +- Rebuild for new BuildID feature. + +* Fri Aug 3 2007 Matthias Saou 0.6.1-2 +- Update License field, it wasn't simply "BSD"... + +* Tue Jun 19 2007 Matthias Saou 0.6.1-1 +- Update to 0.6.1. + +* Sun Feb 25 2007 Matthias Saou 0.6.0-1 +- Update to 0.6.0. + +* Mon Aug 28 2006 Matthias Saou 0.5.0-2 +- FC6 rebuild. +- Require the same release in the devel sub-package. + +* Fri Jul 14 2006 Matthias Saou 0.5.0-1 +- Update to 0.5.0. +- Remove empty files from %%doc. +- There are no more shared libraries, only a static one, so update %%files. + +* Mon Mar 6 2006 Matthias Saou 0.4.0-6 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 0.4.0-5 +- Rebuild for new gcc/glibc. + +* Sun May 22 2005 Jeremy Katz - 0.4.0-4 +- rebuild on all arches + +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + +* Mon Feb 14 2005 David Woodhouse 0.4.0-2 +- Fix corruption in genmacro + +* Fri Jan 28 2005 Matthias Saou 0.4.0-1 +- Initial RPM release. diff --git a/cgmanifest.json b/cgmanifest.json index 6a4405377c1..097f90f1409 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -580,6 +580,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "byacc", + "version": "1.9.20200330", + "downloadUrl": "https://invisible-mirror.net/archives/byacc/byacc-20200330.tgz" + } + } + }, { "component": { "type": "other", @@ -710,6 +720,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "ceph", + "version": "15.2.4", + "downloadUrl": "https://download.ceph.com/tarballs/ceph-15.2.4.tar.gz" + } + } + }, { "component": { "type": "other", @@ -840,6 +860,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "CUnit", + "version": "2.1.3", + "downloadUrl": "https://downloads.sourceforge.net/cunit/CUnit-2.1-3.tar.bz2" + } + } + }, { "component": { "type": "other", @@ -1040,6 +1070,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "docbook5-schemas", + "version": "5.1", + "downloadUrl": "https://www.docbook.org/xml/5.1/docbook-v5.1-os.zip" + } + } + }, { "component": { "type": "other", @@ -2350,6 +2390,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "leveldb", + "version": "1.22", + "downloadUrl": "https://github.com/google/leveldb/archive/1.22/leveldb-1.22.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3020,6 +3070,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "libstoragemgmt", + "version": "1.8.4", + "downloadUrl": "https://github.com/libstorage/libstoragemgmt/releases/download/1.8.4/libstoragemgmt-1.8.4.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3300,6 +3360,26 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "lsb-release", + "version": "1.4", + "downloadUrl": "https://downloads.sourceforge.net/lsb/lsb-release-1.4.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "lutok", + "version": "0.4", + "downloadUrl": "https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3430,6 +3510,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "mailcap", + "version": "2.1.49", + "downloadUrl": "https://pagure.io/releases/mailcap/mailcap-2.1.49.tar.xz" + } + } + }, { "component": { "type": "other", @@ -3940,6 +4030,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "oath-toolkit", + "version": "2.6.2", + "downloadUrl": "https://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz" + } + } + }, { "component": { "type": "other", @@ -4880,6 +4980,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-cachetools", + "version": "4.1.1", + "downloadUrl": "https://pypi.python.org/packages/source/c/cachetools/cachetools-4.1.1.tar.gz" + } + } + }, { "component": { "type": "other", @@ -4910,6 +5020,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-cherrypy", + "version": "18.6.0", + "downloadUrl": "https://pypi.io/packages/source/C/CherryPy/CherryPy-18.6.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5030,6 +5150,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-execnet", + "version": "1.7.1", + "downloadUrl": "https://pypi.io/packages/source/e/execnet/execnet-1.7.1.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5060,6 +5190,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-google-auth", + "version": "1.20.1", + "downloadUrl": "https://pypi.python.org/packages/source/g/google-auth/google-auth-1.20.1.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5200,6 +5340,26 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-jwt", + "version": "1.7.1", + "downloadUrl": "https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c/PyJWT-1.7.1.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "python-kubernetes", + "version": "11.0.0", + "downloadUrl": "https://github.com/kubernetes-client/python/archive/v11.0.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5210,6 +5370,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-logutils", + "version": "0.3.5", + "downloadUrl": "https://pypi.io/packages/source/l/logutils/logutils-0.3.5.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5300,6 +5470,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-nocasedict", + "version": "0.5.0", + "downloadUrl": "https://github.com/pywbem/nocasedict/archive/0.5.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5350,6 +5530,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-pecan", + "version": "1.4.0", + "downloadUrl": "https://pypi.io/packages/source/p/pecan/pecan-1.4.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5480,6 +5670,36 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-pywbem", + "version": "1.0.1", + "downloadUrl": "https://github.com/pywbem/pywbem/archive/1.0.1.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "python-remoto", + "version": "1.2.0", + "downloadUrl": "https://pypi.io/packages/source/r/remoto/remoto-1.2.0.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "python-repoze-lru", + "version": "0.7", + "downloadUrl": "https://pypi.io/packages/source/r/remoto/remoto-0.7.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5490,6 +5710,26 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-routes", + "version": "2.4.1", + "downloadUrl": "https://pypi.io/packages/source/R/Routes/Routes-2.4.1.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "python-rsa", + "version": "4.6", + "downloadUrl": "https://pypi.python.org/packages/source/r/rsa/rsa-4.6.tar.gz" + } + } + }, { "component": { "type": "other", @@ -5550,6 +5790,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-sphinxcontrib-websupport", + "version": "1.1.2", + "downloadUrl": " https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/1.1.2.tar.gz" + } + } + }, { "component": { "type": "other", @@ -6250,6 +6500,26 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "python-yamlloader", + "version": "0.5.4", + "downloadUrl": "https://github.com/Phynix/yamlloader/archive/0.5.4.tar.gz" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "rsyslog", + "version": "8.37.0", + "downloadUrl": "http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.37.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -6530,6 +6800,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "rdma-core", + "version": "31.0", + "downloadUrl": "https://github.com/linux-rdma/rdma-core/releases/download/v31.0/rdma-core-31.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -6730,6 +7010,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "sgml-common", + "version": "0.6.3", + "downloadUrl": "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz" + } + } + }, { "component": { "type": "other", @@ -7290,6 +7580,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "yasm", + "version": "1.3.0", + "downloadUrl": " http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" + } + } + }, { "component": { "type": "other", @@ -7300,6 +7600,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "xmlstarlet", + "version": "1.6.1", + "downloadUrl": "https://downloads.sourceforge.net/project/xmlstar/xmlstarlet/1.6.1/xmlstarlet-1.6.1.tar.gz" + } + } + }, { "component": { "type": "other", diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 524e21b49c8..e03eca70608 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -74,7 +74,7 @@ zstd-libs-1.4.4-1.cm1.aarch64.rpm libtool-2.4.6-5.cm1.aarch64.rpm flex-2.6.4-6.cm1.aarch64.rpm flex-devel-2.6.4-6.cm1.aarch64.rpm -bison-3.1-3.cm1.aarch64.rpm +bison-3.1-4.cm1.aarch64.rpm popt-1.16-7.cm1.aarch64.rpm popt-devel-1.16-7.cm1.aarch64.rpm popt-lang-1.16-7.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 872f54ca8a9..7e387d49c83 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -74,7 +74,7 @@ zstd-libs-1.4.4-1.cm1.x86_64.rpm libtool-2.4.6-5.cm1.x86_64.rpm flex-2.6.4-6.cm1.x86_64.rpm flex-devel-2.6.4-6.cm1.x86_64.rpm -bison-3.1-3.cm1.x86_64.rpm +bison-3.1-4.cm1.x86_64.rpm popt-1.16-7.cm1.x86_64.rpm popt-devel-1.16-7.cm1.x86_64.rpm popt-lang-1.16-7.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 940204a6d30..704a4beb12a 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -11,8 +11,8 @@ bash-lang-4.4.18-6.cm1.aarch64.rpm binutils-2.36.1-1.cm1.aarch64.rpm binutils-debuginfo-2.36.1-1.cm1.aarch64.rpm binutils-devel-2.36.1-1.cm1.aarch64.rpm -bison-3.1-3.cm1.aarch64.rpm -bison-debuginfo-3.1-3.cm1.aarch64.rpm +bison-3.1-4.cm1.aarch64.rpm +bison-debuginfo-3.1-4.cm1.aarch64.rpm bzip2-1.0.6-15.cm1.aarch64.rpm bzip2-debuginfo-1.0.6-15.cm1.aarch64.rpm bzip2-devel-1.0.6-15.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 233b8d7b26e..b1505ea709e 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -11,8 +11,8 @@ bash-lang-4.4.18-6.cm1.x86_64.rpm binutils-2.36.1-1.cm1.x86_64.rpm binutils-debuginfo-2.36.1-1.cm1.x86_64.rpm binutils-devel-2.36.1-1.cm1.x86_64.rpm -bison-3.1-3.cm1.x86_64.rpm -bison-debuginfo-3.1-3.cm1.x86_64.rpm +bison-3.1-4.cm1.x86_64.rpm +bison-debuginfo-3.1-4.cm1.x86_64.rpm bzip2-1.0.6-15.cm1.x86_64.rpm bzip2-debuginfo-1.0.6-15.cm1.x86_64.rpm bzip2-devel-1.0.6-15.cm1.x86_64.rpm From 72a8cbdf5c43d628c0ca0cdc28904321a37c339a Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Wed, 19 May 2021 13:21:01 -0700 Subject: [PATCH 38/83] update moby (#958) --- SPECS/moby-runc/generate-sources.sh | 4 ++-- SPECS/moby-runc/moby-runc.signatures.json | 2 +- SPECS/moby-runc/moby-runc.spec | 8 +++++--- cgmanifest.json | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SPECS/moby-runc/generate-sources.sh b/SPECS/moby-runc/generate-sources.sh index e0764d8398f..9baeb9556b2 100755 --- a/SPECS/moby-runc/generate-sources.sh +++ b/SPECS/moby-runc/generate-sources.sh @@ -5,8 +5,8 @@ # Git clone is a standard practice of producing source files for moby-* packages. RUNC_REPO=https://github.com/opencontainers/runc.git -RUNC_COMMIT=2c7861bc5e1b3e756392236553ec14a78a09f8bf -VERSION=v1.0.0-rc94 +RUNC_COMMIT=b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7 +VERSION=v1.0.0-rc95 mkdir -p /build/runc-src cd /build/runc-src diff --git a/SPECS/moby-runc/moby-runc.signatures.json b/SPECS/moby-runc/moby-runc.signatures.json index d6014a21b72..62806738d94 100644 --- a/SPECS/moby-runc/moby-runc.signatures.json +++ b/SPECS/moby-runc/moby-runc.signatures.json @@ -5,7 +5,7 @@ "golang-crypto-c07d793c2f9aacf728fe68cbd7acd73adbd04159.tar.gz": "b7e8935189ea46c67eedafe6a97aefbdc2bf71dd9097fb7ee8a2a8ebc7556e7e", "golang-sys-b0526f3d87448f0401ea3f7f3a81aa9e6ab4804d.tar.gz": "23703a84893a1cb53d3efbb46143451431b95b78d29ef1e02132cd580bb3a445", "logrus-v1.8.1.tar.gz": "e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74", - "runc-v1.0.0-rc94.tar.gz": "2e0d448363174a77c109053a593518a5aa2a6166f691a29edb33a6cb0850ba9a", + "runc-v1.0.0-rc95.tar.gz": "aa99fc1f018e0882491b771a0bb7f6ffeda3668e9936a079a5b305441e8e85d3", "runtime-spec-v1.0.2.tar.gz": "0933a1ba6e418fe020993e80426107da8de3572f3f20b4cd1ef296de6e62bb61", "urfave-cli-v2.3.0.tar.gz": "b17376246f1477157daab86d4a1562d6b004f5be0d15dfc61ebd8bb129384e6b" } diff --git a/SPECS/moby-runc/moby-runc.spec b/SPECS/moby-runc/moby-runc.spec index cd06d266619..434e012cdbb 100644 --- a/SPECS/moby-runc/moby-runc.spec +++ b/SPECS/moby-runc/moby-runc.spec @@ -1,13 +1,13 @@ Summary: CLI tool for spawning and running containers per OCI spec. Name: moby-runc -Version: 1.0.0~rc94+azure +Version: 1.0.0~rc95+azure Release: 1%{?dist} License: ASL 2.0 URL: https://runc.io/ # See generate-sources.sh for creating runc source tarball -#Source0: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc94/runc.tar.xz -Source0: runc-v1.0.0-rc94.tar.gz +#Source0: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc95/runc.tar.xz +Source0: runc-v1.0.0-rc95.tar.gz #Source1: https://github.com/sirupsen/logrus/archive/v1.8.1.tar.gz Source1: logrus-v1.8.1.tar.gz #Source2: https://github.com/opencontainers/runtime-spec/archive/v1.0.2.tar.gz @@ -114,6 +114,8 @@ cp %{SOURCE7} %{buildroot}/usr/share/doc/%{name}-%{version}/LICENSE %{_mandir}/*/* %changelog +* Wed May 19 2021 Andrew Phelps 1.0.0~rc95+azure-1 +- Update to version 1.0.0~rc95+azure to fix CVE-2021-30465 * Thu May 13 2021 Andrew Phelps 1.0.0~rc94+azure-1 - Update to version 1.0.0~rc94+azure * Mon Apr 26 2021 Nicolas Guibourge 1.0.0~rc10+azure-6 diff --git a/cgmanifest.json b/cgmanifest.json index 097f90f1409..419124b94d4 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3595,8 +3595,8 @@ "type": "other", "other": { "name": "moby-runc", - "version": "1.0.0~rc94+azure", - "downloadUrl": "https://github.com/opencontainers/runc/releases/download/v1.0.0-rc94/runc.tar.xz" + "version": "1.0.0~rc95+azure", + "downloadUrl": "https://github.com/opencontainers/runc/releases/download/v1.0.0-rc95/runc.tar.xz" } } }, From a3fb51701045b8a3d15f88b551f66ee544c3b6f7 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Thu, 20 May 2021 05:37:30 -0400 Subject: [PATCH 39/83] changes from PR --- .../libnvidia-container.spec | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec index 714d157d6bd..a440adeafd9 100644 --- a/SPECS/libnvidia-container/libnvidia-container.spec +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -4,13 +4,13 @@ Summary: NVIDIA container runtime library Name: libnvidia-container Version: 1.3.3 Release: 2%{?dist} -License: BSD-3-Clause AND Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND GPL-2.0-only +License: BSD AND ASL2.0 AND GPLv3+ AND LGPLv3+ AND MIT AND GPLv2 Vendor: Microsoft Corporation Distribution: Mariner URL: https://github.com/NVIDIA/libnvidia-container -#Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz +#Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz Source0: %{name}-%{version}.tar.gz -#Source1: https://github.com/NVIDIA/nvidia-modprobe/archive/%%{modprobe_version}.tar.gz +#Source1: https://github.com/NVIDIA/nvidia-modprobe/archive/%%{modprobe_version}.tar.gz Source1: nvidia-modprobe-%{modprobe_version}.tar.gz Patch0: common.mk.patch Patch1: libtirpc.patch @@ -36,12 +36,17 @@ tar -C deps/src/nvidia-modprobe-%{modprobe_version} --strip-components=1 -xzf %{ %patch2 -p1 -d deps/src/nvidia-modprobe-%{modprobe_version} touch deps/src/nvidia-modprobe-%{modprobe_version}/.download_stamp - %build %make_build WITH_LIBELF=yes %install -DESTDIR=%{buildroot} make install prefix=%{_prefix} exec_prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} includedir=%{_includedir} docdir=%{_licensedir} WITH_LIBELF=yes +DESTDIR=%{buildroot} make install prefix=%{_prefix} \ + exec_prefix=%{_prefix} \ + bindir=%{_bindir} \ + libdir=%{_libdir} \ + includedir=%{_includedir}\ + docdir=%{_licensedir} \ + WITH_LIBELF=yes %package -n %{name}%{_major} Summary: NVIDIA container runtime library @@ -53,13 +58,6 @@ kernel subsystems and is designed to be agnostic of the container runtime. This package requires the NVIDIA driver (>= 340.29) to be installed separately. -%post -n %{name}%{_major} -p /sbin/ldconfig -%postun -n %{name}%{_major} -p /sbin/ldconfig - -%files -n %{name}%{_major} -%license %{_licensedir}/* -%{_libdir}/lib*.so.* - %package devel Summary: NVIDIA container runtime library (development files) Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} @@ -71,12 +69,6 @@ kernel subsystems and is designed to be agnostic of the container runtime. This package contains the files required to compile programs with the library. -%files devel -%license %{_licensedir}/* -%{_includedir}/*.h -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/*.pc - %package static Summary: NVIDIA container runtime library (static library) Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -88,10 +80,6 @@ kernel subsystems and is designed to be agnostic of the container runtime. This package requires the NVIDIA driver (>= 340.29) to be installed separately. -%files static -%license %{_licensedir}/* -%{_libdir}/lib*.a - %define debug_package %{nil} %package -n %{name}%{_major}-debuginfo @@ -105,10 +93,6 @@ kernel subsystems and is designed to be agnostic of the container runtime. This package contains the debugging symbols for the library. -%files -n %{name}%{_major}-debuginfo -%license %{_licensedir}/* -%{_lib}/debug%{_libdir}/lib*.so.* - %package tools Summary: NVIDIA container runtime library (command-line tools) Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release} @@ -120,6 +104,27 @@ kernel subsystems and is designed to be agnostic of the container runtime. This package contains command-line tools that facilitate using the library. +%post -n %{name}%{_major} -p /sbin/ldconfig +%postun -n %{name}%{_major} -p /sbin/ldconfig + +%files -n %{name}%{_major} +%license %{_licensedir}/* +%{_libdir}/lib*.so.* + +%files devel +%license %{_licensedir}/* +%{_includedir}/*.h +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc + +%files static +%license %{_licensedir}/* +%{_libdir}/lib*.a + +%files -n %{name}%{_major}-debuginfo +%license %{_licensedir}/* +%{_lib}/debug%{_libdir}/lib*.so.* + %files tools %license %{_licensedir}/* %{_bindir}/* From b3e27c6a406c96b8c78d8361eb1e0c5c0c3f8f31 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Thu, 20 May 2021 06:21:04 -0400 Subject: [PATCH 40/83] changes from PR --- .../nvidia-container-toolkit.spec | 10 +++++++++- SPECS/nvidia-container-toolkit/vendor.tar.gz | Bin 30757 -> 0 bytes 2 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 SPECS/nvidia-container-toolkit/vendor.tar.gz diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec index d7f0cbc35ba..82b1e5b612a 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -9,7 +9,15 @@ Distribution: Mariner URL: https://github.com/NVIDIA/nvidia-container-runtime #Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz Source0: nvidia-container-toolkit-1.4.2.tar.gz -Source1: vendor.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/NVIDIA/%%{name}/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 -cf %%{name}-%%{version}-vendor.tar.gz vendor +Source1: %{name}-%{version}-vendor.tar.gz Patch0: nvidia-container-toolkit-1.4.2.patch BuildRequires: golang Provides: nvidia-container-runtime-hook diff --git a/SPECS/nvidia-container-toolkit/vendor.tar.gz b/SPECS/nvidia-container-toolkit/vendor.tar.gz deleted file mode 100644 index 965ccc00f6412b8158a46f63a1bea545d8dfeb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30757 zcmV(%K;pk2iwFQKWrkn?1MFP?bK5qS@2}BcfvA&)N)`IMlXaW!ByrO9ZJcBp=l142 znTir2i8V!N2~v(O>;L`U7XSn)%9hhMH#-+ir;!QZ;o;$Z`MgI!3z@|#-}>gy{A|PL z(ZK=!yYuK^+yB>ozS-H|-h*ccd-!~3_u$dqH{#$=<;r|YT|~JM-~6U7vP9;yb^UH? z|2O?Cc>gC!F)fGTNX`BPRk+3e?;Y;%!T#?b?j3yH|1a@b-T!B0o)zy(Jx%^7Rk;2B zA3oauYX4v4bM5{YYL@;1N^txAfAnbQ@az76iO^;r{-b{omW) z+1an}|L)E{#{cadg&rhvWdp8MKY7!POsA$m)S_jV61W&Ah<_gMEOLEFbtEdkoh-dzKd30BwFWLU6aG0!6f{WIVVrX0)%K$*EQ(gSKrL}IRptQaf? zAQ)Ek?0Td#GX+d(t0#0(7q$zfeWg0DIj6C4*r!|_q4pai_ z$=p{=R$ZCPib+fE40@GWEc0}UgK{~~rG_nxtmZ^5^MM?7Nm_`D7)_&W!ZJEmB2xuW zNkL6BSdX3Nb@(jwHiF2&X5G*a4kzKi&D#RnTku?w52LVtZ1jBzwtgE{>DpR^CIWxch`Vzd-H(P^q+c<*a8G zhh>(Gm(^sUTW(+Ew12^(*K3-XU4Rz9K|~U1av^!k;D33$t;mlfIS1cRAR+5aTFq2M zX%1ppvaPbpgaWurVli*%77{~Mc!28j05w7lizvxpx5l}eSq&V6hOt*gE_wFc;||Fr z*(fbzR!UgdOcqlG^9D&M!#+AOv}|&HKwr#MUNd{7z>|Tq=e@_>U|j>hxWYLKkEbNf zBF1KJ1n&>AY|WuXs$eB6%kaUqx5A5Vkd+g(L!yfn}3jCJu)+J;M+J4X|W z*U=12y-$9O`b?8JmKnRbX#y@S@=V8iG!T_eK+fo@GDqvhM>&GnTo*HqL2~6Bme0CW z*&R*U6cOyqJIOu4#4&V&;K`5zFop-#6nekcu0m_*Pef%T=2_=XEXPKXf}Z#!YTYyN zFIPeDbB)c|7)g_Rt;Svy#0}vWNl^qgfdD&#kxfAZM=FOXFjugDFan|=J3SzsgRajt zi1=6{bhrc!-AS(is5F73F!fByJ06T$xoS!qSDixL<8Nv7Qr}G2-hs`gBA4!`bvt|w1l2F z37Mo~k2hQpK7cuil$$22Y|{3Ph7i&qG3rv-amY`*sFg812+u&5T0vYWPBJ#3 zQKTi?X60ilw~EwwdD^Z|(*os0=9*V2Bk(1-QYX=#Z^aOY5t9}QX+;8Yo1sL59L!<7 z1apGERQM8&!8%i8u}vs!44C{RSht*k=O}W(FD_}%z?u~FEZZ|>)3Eq|V+7PkkYt~`+4`hWV3c8jV zEJXcH;3Py0atBA`Lq#J_Xe%x;2v_RFdSVeX>2a!*CeMJrhf#4(Ta1#C9}@rw{&<_u zAcBOs=P4+&f#QJR@&+~~#B4%fF0HTu6tD+u8DZs15VhtQoN5@404!Vf-HHvaoJBF~ z_y{u?2%;6(KGDZ=j0l6QA&a*_fn0bsny!W7aAm`g3&@p}6YYQq?G>^MJ~Re97%fNO z_l!dkC+H`%X|AHv?nYjfZ&rHRu|+=yznwf8@QaGdjOmj zB`U#_fx(QTln@}~S;jN_2m^I^j3mLN2IF~DOa~k&Oaf4l&ju^3sTwj7Q14sm+fcjB z;rdPZ3$RrYyX`)irh5HgsJVdP3k|2?ip-5-Lr`0Sn~u=CLLj6Jgi;L@RnCNNmJrVv zz?>@N@4rVxfN6sKPmm7jotOhpfGjav(^zjqwLmw7t)M>SbB7UzKjZW`4wX3>IKdWRIK5-E9|u78D@#*;5N@yT#hLCurNaL5^Vqx2zNDEi&p?ZN>i)@ zDC<^zDkW^=9Lt9owUGdmZOtIq{K$QJJA{zE?i{PUp>qc&e`g>A2JBG0QtHA0oRvyT zXgwV|D{ypAo;2N8@W74f1+cljUibnaqj8EjS+r=TO~f#&qQw_BHKACG4;@})8kQGV z+W;*i#{~$BomG|JpgV^l-~SzN^~G5pj#2(oTLPgk=~X zU(tj{XF&j{!YxwvQRRuNcbctsVtyWFPvbZ@(t~GqIR z`mY;08$Q)KnPiyaovFYivyLSAGt;jY#cgOiHfaZm4(+P9Ms%JLam|QXU0Q6mK3nQE zx4E{zjd9f;HyFi!hDqiTS$y{X=U|Ahp)|gR>KU0!ER95v9Oi$`AS(Lnr-WH4}EB*-TO2QQ^C&KZ4kB`5Z$ zPFeu1wX6IQF%YaNX4oY{GGA5ln#G4+2wG(|fZ;2vSsMKhKzgl7O)kVwl>-Jn5#N0W z&wi|)y@xd(?zbrj^sX!M9SsRAL@-h(O5HrHd;|m}xN#q5zm}IlWmW9t(VLj4@6e!` z#c^o>A(Es1t60E)WkTM``e+){@UAsh-%&t6T3s$T_$#iBJB{WogW&1f5l?Z$TE@`x zwWHo)m8gw9e7=4ZL7w(iAr@LU?ipbBmQnb4?HK26jyTkU_a+;&K3mS_#j@^QjeC7v z&Q2+(glP4X*skwn&|SeXocve?>e-!ch%;M)wO+Hvmsl{`+eL22V6nwCSLI~d*6DD+ zMHZ%|VG0{?%{EE+b1f1xN@p|n4I$Z`0tQ(BZ^njxO6G%aasziw3`oYVI`CxGn#fvw z8N>4G;1%Q5J$(e31jI60G5R9%-BfrH_s+V6d@8dy8VFe2%xnT8lDa@J27)cwZD7?^ z;M$0*MU;!NctDjV+&iu~LBCNnn#vf-zochDO+}DyQjs&mXqn?NKL3s%ohKjg8AxP2 z4yjxP5zKbK1KdpNpVt%6gZ1 zQXsAXjb|I@0_!~;qMaMoTa=w=?|EBZc@4C)>%0O+l`rWM$mBNh2g4{ve-LzGK(}tt zZS}2s+H?x(7p|080j|F5ns+ZPm~l^%Efy@P%f6Dl)O=)f za{WjHbv*3iTfzc25(u`K!3wOor2*L0q2P^tE~*R`q0R!1qUr6qQL&pfmEO8_Dau3!#p07!kahx3OcVYHm=o7_mtZwD z_}CZ-y3j{}95-Q7OvSzU2Qg8F_nr`ux@&Ynktp`vJiU5_)Ps7Jq!)}ju7wc}9RB-m zOY44k9_3&E;&R6vzW*q)bsmOA;Y_hFGWgGU8t#tNv(;DGpDFb^nqMpKrqbCpI<&I= z1N{4=Qw;d)`|lYBxgl)3Nv)m(9cYO0PhK(Ibzkp=?8prq(dI6qRsh*p9f84LZTORHy>G|PyBo&>-G$|9EIs7xt4zcY`rWE6CV<)qul{MLzz z*xpD|wzToPq(p_2N=CK!h^s}Hs_n;Go2k9Di+CmR?$?JNSyT&Hc8K{G9&VAN3j~g? zJ{qIr(ADD8pUl(fBRy^4^q|XS%X=}_164^cQ%tI&sId1K z_QGte!ShWnb`ICGv2)nU2RyztBRhvTa$;1sm6N^QR!-pYtvT7-UE$=avISI2(^#c3 ztxAPeyR};7mGthE8Rym|J+ss|(YE)AuWn59GxZGzHx+IhWm?vSO8ssr)beIUd!Mvu z+Pe8~tzYE^3idu}(Xe$K+*+^78x;%524!8fK6y^I%yJoxrdT7`)Y+O-R~xxoS5CZ* zza7@SEuHplgi)e9+#raWgJBynTdOB-%iyak(9;5B5Z=GD7-aZ1zSl@i7~JR5bRNo)dd zI%-$Lc3n)%&{V1MIgy(~&te>O?=4_UwaFpOVKU>UR{O@yzT*mvto9yzy**gc)U4_? zl7V^;@x(>1mf2L`+kd@^qUDPtfCE<%xG&xn@C_cAUrU;^Sa_bHrh0T*VKE5lh^RT8 z#FrOxsa3j=_N2Z&s#`y=QKwa14_YahR0pZ-ISbpxapq1^8b0V`;c!`<>ZNNKZ+#xe zDoxcTowde`4HX6Oepr*M4}C2!{o5G;KGi6qN*!1Tx;2uiH=_MaE6~Q{tmZUpHD~oQ zlV0c9*OhAAvG0(jrb{KI76Bc%S@*KDXJqcAxZ+M$dV3%6WH+@;`6mY)qtJe0IfYs}I!LRNEu_V?~5xZKiO|Gi8@Lrqv_3Kp!Ob44k zd50k?QJ7h{Gm|Q+!3+&6jz#MYTxrOj6l=Qj)eCo3p&6V}>|Y_VN0aWI zd3U?$-4YiY>|`jZ|LePqUq841+vLhos94@a!_mV-dwMU)#i!P--?;8eg!P3n#o#D~Q@HUu?37(c)c(9N0pyUqv*+ zkj`Q&F3mL-I+EkiNM1@4-P=T77aSkWoXMli7$VQYV zDH*PG=!q7|d#u>gwv=R4*-aav^+c%mia;>831H`e$O)&LLe!amBD$uf%l)XFC`3y? zYB9ZRje510Z8060n>KRXV!B}>Dq3g77So9~qO}vXm|nP3?WC~9Cq+G5Npa7fGmbao z>PBOgFgP>AE7P?bR|ahJU74_cA-zJ{N5Y7{FJAJMGb_Bl*=e#olz>IuZzHYwpmQoe z;^{y1H++K)ybhnZX7KN>lk?S??2(OTQO@{EEFvc(|iRBmQo211lWiVbIgC&syDx~%>@onojQktJgY#FGa!ow&HdSHBk0=`esVA_V`~ z=S z&xN2pO@=vMwHW-SRmRum1|MhXpkpZ83#fJ?I>>L%#c~O7u&ydb)H?O%)2gvLM~uI; zLOBrrI11ivjp^64RoX z>!U5-B+(8ZrXbHPPSc)4!UCl6%q#5<*K1_1aevMi+u?q={UNxK(AF?j!>w5a`BuJV zhU+bvaW^Idb`P8#t5G?#>+x7ru^NRcpIqZVI-QdYHZV%6%;cYO`otZdmE1I37GL`1=96)YXh17RTFT)!0R=gbCMJO*{V5019C|C=@YA9Pi8L|2jM2e0V9y}7d%8Qvy} z6Z7XP8z+G=`jBt9j;0n$u|@Jj@iLB&|E zB=cw{-~F!Ven>KgB$K%_H=b#*rTtuc?X}llPeu|OPz>pt86Dol0scc7VS{DqqSd0U zD89FHF^RgtU$J~yuN4I3#zjtp8k>!}|4nE*9URj{K8AuLxUnZV!i0*ZBrb;d zilKQg-(gvwFuHP30I}ySlz6+j_Ogdp<_i=H&>)2 z?+1JHFpDLR(1QzYq#Yy!G1#tiG7|?to2t26cNg1&eUg%Vkeo=O^AxT4b1pm^dGS;R z#5Lus*gHy(!)Jirqc*%?X&2vRa>r3atA{ictcI%PZPhI2LHnD$^9HRE@^F(pMRK!d z9d|zh(zh_Y0qzMBzDB{jfmvKD6!!fsZ-Q(-_+4a@NO2w_S*hM2_*M&d{J1!z^Os17 zCG!M?A#e7DfoYQ$;4zb^ZA5B)qyGEqn(akLG@I*XN;gv6CYL}kP%Kolf#5I@zj;!x zIU#6lpo4TcOvo>nMB@`^$=NV}QI}&CwGV_L3sJCj1_xG=6eHeB_*za?+&Ae3T*RH7 z2HkC=t~ebpzK*joiY$R;fSc@}X6rmpiWk$vX5%nP?N6Y&fNk-YK*>J3HjN8B%8|JT0FsOJUUW##u=#}i z2z3FF;2%X<96}S?UKougC(!{sNhUPzr4auIgARhh5k86k7#uAxH5+cF!?>u{S*fYB z&p{qw*u>5t2=<%D(b-vqjKd%v6;bn`8|(u(Rt|y#m>IJqV-p1~rSJoAC(2^E^5w>3 zGARJ3gAKgQkgpkwTef~-@A!n+9udSePSTv$00!BlNjJOr6^^0fsM$F1PIE_Hgh$bH zqY=qU6aaC(%zP~D5oW7t(H5d}KuFym57WlN(tzio%M?x?V+w7|kCPO+Bu5B6Qxt;WI&T7Sa_3Ps#Z z3*{DO1=X4pM9W0bYDfgF#v0uP5Z2zkS!2J+q0Vlfz|OvVE5+a<+bHY5z&GYzYx}i?2qTK#K(Bvi{*gd zWql8gI=EavI;Ui5d=!`o1&lWzpBF50MlWBf<$wNXKK&0_gc)9)jXtuEIrM+&{>pOM z{tJ$Puk`;*d`6j|IzmMo|kxUv1OZmBh<1~=p zL3l3=Lw$I?pq`}14Nkwn?Qpn*V0&%v#pC9G;h)w2da?DgckejG@P+pdlW~&@(yfN7 z|EmG|Z}z!C{+IOVQ*8iYVHglfR=lY2XcS+q1LbOdo$tuU}Z*gwqW93ehyx8i~A3Q2S7Y2~OVX{%}oD#)C$x%tA-w z!kQMb5|H{Cl0M8T=s1KoTlXe;Lu_A2qeNn&*0*o5HV}?hz!-s0n&uJ#(Qxy?s7}X8 zL0#dXhFNqL- zx}}wpytFW!OGxp8&;+Hr1BBZ62%w$%=FA3}{Gp#<7*Wc*0XwQlGgUr9-Gr`84cKy+ z5vCUJYEMX-Mixi8M2EF7q6N?6Nra|Xfiz56XXIi~_?ccP8wOfk`t#JhE>?Y-P%FwT z1kv$0MX-mBZ}0gx#(y-~&%Sy5|I(wf{THwV%U{p`FY$?{ z!ISCmHEIgCVM_t%FlmY{<_WoQ$9D%|M(Wu z1byT^V9x%3v{Lo|dhp#>`R^C`)aHM*`5ZOt7IDw$(|nPWds9w+Uz9p38FQ8-lnYnQ&Ml$LXwek|K6y?`|xlwj>l29b{AP$eiF1rd)%x76p zZ4&!yMIn%b7M3uBYd1;He2D)XH8m%d9XsjvT<0^@?~w_=nMH_T5nF!JfU1hHK39P4 z9$N^*P=Z;x&T!}nKygmXegMV?j%`3FboZ>4#{%goYfnw-t?bumq)r5< z*6>Dyx5BWn0rK^JY}=X{4)aG73$rwM4b*CyaGKmdJ-D`><1&DT4~%W%-l+~JqROsj zur$dyQ;UZNr%c)%Ea0v@S+~%NOT#d9@m_IJA=Qnoj-F^lM?NKlW=CUe2#;VtsuMf$QjpuV!eEl{7FPsmFp)_);zXr;a5nGsQr&lO#S;1C$P}G;}+TFMeUH_H&Ay zcJ3}?bQ#Pg!euDttd!s9A{eihTD4JK=(WY&+@%qkOAxaLT&Zx$JA`JSGd9*U0;wFG z%;M2do1{}dbA82QmP440lTL*Ekdjl*u`6@*kD}a^J;Mu(ielX4Yh;m4H0nf?y5wlk z!+LF2H?tHGaWu+o{!n|wI>`?Ge4t38F#8sfwtDJ>z=T~xT!XXsfXa}KxF&{HcEW&N z`;t7a=W)O(-n@j%Y&}Rbfgh9;NV2Ck%BQ9q|Dzq%@C?ILSV_P_b2?6N&pKc4 zO^f08WN5`ytBB7uVoC#bLOC^sk9+JFt_3jH9>&$f2b=wk!1>q|$ed7({ZfmR;&fp| zH6+>v-Nvcmt!MmYkFrPG@B{qaL=E7drN98DOzm@y0pNsD;2#nf!3~MPzt|02a*HEY z70mIo&9qadHy+5CQ4F$+C7s{qEtM@7u@6l-pzBV7_4Evn8RtoVj58}Yw zD)9V6%WN}r{*0fEIY;{FGWeFFm~`~Hl;Y4PR_>LIC)2`4=%oJ0w0x4HNQ=H=xAK)5 zGffi4V3b{Sl7O$A;%g1%f$Z!VarE8k1piOk%`C>m++#|-WK-rj`SO&7R2u>go^XE= zD?t;dz-R^SCS0f}c0#Mwfrfw^I)9xEiW9hT-e=4BF+SskKs~sms64}qHlVRnLG+{3 zoO8kThiGyd18+*~V>%=gR8)=T1#yEgC728cY+&^#vTIwv;Pg=6Os$Mj$`>8O&|!2@ z0n~`)M+_f?AGAU#*b$t#V&oC-w5k&(7trkR^u6FEy8 z>Egx1FiA>rvZ_aqhDB_%3Z6uqUXCsih?snhQef=+;G8e6bJ!K^ zemzo95-~EKdW^}4ALcUcY!qBHjLrfKGd201nP3uB#3+rnf#vBvu*E+ujxIym1gnmq zjkbaxFCL09P#y>R6}mPIunuR0IT4&4*^$9v&oENV4@JL;0mpKy0sX-Q9@Hr2UAf## zC-?v-yBY+`_?^edEWg>V-C%jCBUO)1SM@?5@TE%u7qA@q=&}}c6W|Nm9&PCGkV9TH za{b zCc{51(u?;bu!N_kU;2gE@Ij|VhYEK!v!^|{q2IJO6>VXiUG#@*yZwK}0LB#CIcR5e zSacK#E<+}!xbzZ1iAXIHUPD}(ztb!8eVA)?ekSW?nf>+*?N+FCv#QpLa_ET_Q`=STZ8EV2Pc0Tah z;v&2Qpz4q17G4_n>OrU6_Y(Gf!A}81cj<>fAk%=!$76J5%}PQ$24if2FEW5aejbb2Zt|pTJPfML}1D4FIY#u!PX1{TWVtg z=ISlzIxcro9vcD`E44FCodH~AGM=i^&>K5ZblIIA;`3biScOfQPIxXbGTi!yS9C}e zZ2K!N^){9%Il+#T(K`-;ZXH0!8vKHOl2t44BUyA*u%lC)A4L;(0VV8;SaKhYupL_x z6&Q%F7^5yagn#4WDD2cgP}l;tMKGbSh3gH&(2IZVupE_hPM9c?SRl{j2IS|~wOMGD zxGLFE-TDyu%%|DSB?^wbhW{SA`Ud3_p>oYFuMSly&F1S94EjJvb4H<9lYDbS5k$F> z_;ME!Zgkm|9=y!TnTa9k-i=pzro;i7N=}Qu;DM@J(ZH%#)Rje0K{$t38J+bQ56t1= zYPKErk8)vhoO9s=6y=F~64}s<6!&X>Zf#PI;8DXwiI{#dl8snXo2Pg?lsh3O%7!g4 ziVLF{XZC%-M!^_hAuQ1jA9irDxAX)a86l2~GGQ_$`Hvf0rSPE6*L-bX*xkGpFlPx#e__# zsT^0qW-0$;nlNZY3^64W6V#?(d6?a!tHMo?TX0h`Gs82ajGnkG`cO4M(SSqp$dEZz z4P}GAB{G+`RtckNDyAguxYZdnSHbB_MDTwu^49DFn+URu6fo_0%yDk){JR`{vMEsN zB5u&i;X#V2Bft5BT(9;KzWXAo+sg zdf|ZC6}SU*O=XEWWLG>wy)>ZQH-E^USZLPn0k1pS62hd`EZ6*r`#_!zP+|yOlGAaH zXSs9`ZvE(!L?d;_M5PXCx%L3{fJESF1`Lt5eMYiFwm)EPd#Bl{^t>BS=Jv)-ikAwI zpO5IvmCfr!effKp_?CA7E&{KYvtXR^hQicMO)@B9h3hgf!5cIkG7VaOy8OnWoCIN) zXqE{a{2yZv6?iX};LgC7SXw!h=!6Wg3Ms^|mQs16xD6-i+C)|O$I7fL%#I}qoQA80 z(8%6!&KG$~Q^+M;NpQ?6uiygqI-1Bt&@7!YulAC|rk#Z7 zs1q^?wAjWA&86)6Si}y??GXUk%Cn=8tAqYIf>T zz`1#?mQMQmOPEgObI>`n^_)gs`Uj6cp7PzSH=k0FwS0*(qNS22aUzR(+TVw$t3yMh zV9h0q7J&@LV0&${c~b?QMUxIuMtpV^7iA{VrH(L?83;6Y+xs-KdN9z$XOW1Cc&1D; z{rh2wd|1T&n0BtE5DI^D42yb}@xHqGkz#vGX^1v%8#2|*lC#`do1m?FV(Yh{yQ|~v z@7bh!&f?72-TtoQ{B1X(;-$UH`{!nKwoE(fFIz}$dAJo2^WK!369?2oU{BOgU$v~! z_=?SGBWrA_qX@mWW)W7Djd+S%O0#sS#+p^7FNs-6k}^SQo)rwbn~eILv5J^3iqj=t zxcEVi?Qq}^%w!m9n_GK&l@%>_U$1WY6(H$l*GW<#8bL`oIYHx2Jm1Jf9p|1)H-q8Kmb(5=5QY| z#b&GNP0?wMX4$&i>ISXF)@lu+y8J8fovYZi2>eB-fUmlE;X6&(gnEk6Noy%9MI4vB zDY-C;Bu*OOR_oH451m-$u-Gex{d^-XfV}B_1_tp2wVc^mlILinj@0uq3MdQIfa;>V=o*mbEcrr?t6Qvqk`7t<5FQ+_2P<> zIh<0rMcx`@+FmQ9BR>j<+#}6XO3ap8gm%suVn_9H0^{rX^Lj#V`|MmNb}q~2w8r)F zWYbhM_wqrddTU4C>q6woz+0Y+rR`VNb!iQy~s6JeQGs%2`-Te&fx?? zB5};!;W`4Mit2*{fa4jRpkkwZN)Stlx|LZP4-1#Fh>WR!4f1(RCAl5(wopR=m(Nrd zK-r*yc)&1w!cW^GG*MxfatWPPGVc>D?hKq%pAlXX7*8Uu$$;vtUTL|~VQ&`y3VdZK z-x6gjcfz??J4Z zKg(ngk#LxdlU!B#q7`?Lu2w}s_(1p1-#NKg?d4Oum@SL4(5*0Q{zg*Kj~RZM!SZQ2 zTr}=UI`k;Xgs3xrCql_u#mjpo@7L0Hi@4alQ{KGkHme!NKl6O>ZODD-luZBYgtxOsJzs5IQ{xt7+=VSRSi)2F`XmxU zPim+-RfctCed7$mehnf2(3*{_pNpK|99wXZumByFxI(M!gdcY(YV#_Wcmfg`H7 z0CCo~1_E$5o~^K_?N~V^jB)G7+J@Xj?CZn0bB* zp|EnkDy{g$Wu|-ebq9&J%&mC~Z9N(42+6!f|7^6Rygv1!+!-{Y=KUv;iK=_^znD^7 zhfXf3buemd@W$E-%wjuOZA8Zoko4;e1!tTz-1}^G)eBA>S!fXHXvDUKq?%q8;~CiM z28dFPNMax!%6%x*B188pu7j#`IwA`am;QJiGy^!P+y6tiB8XT2EC zdXdd~(VX?7bWj^CX2mO(|9eMx>s6`bMmjz&6|B8rBxAP6iUmuJS=Kjy z{3sqvXsD3l9gOG}-7dGf&Zp|gAbc% zzj^gH`MlFBiCOr{d}k~_M($#-J11z@(vR@>r{DqnxqDZ9PAV=Zcar=?d>IV@_s^n{ zaXzU)>YX8uLkwnfV(YM?CKo@x)|+Xo8@wZXqZ!w*k?UnxAui4hM!`^7%#VP=_n#RG zadLc8TnC0%pA8I5Rx3JUM-n4)56-)O90Q_7oXM9=!Uq!B!V<|!TemSKR26uM5V~#F ztFK#cYqg2`Hb#YGuT(?=bQo3RXHX$tD`lV>j(EAGPID)DE&ORn^MU_m;9l0^+E6Dq zS(gyk<+{bG(-k?A3WCUWA_^Uj%XR9rE<1d%rC2nXWa(vcCIPf0xPnBLk#zFPKqS^{ z4`t-4BqFwqb0EO$+^&jt_!(Bjf_KJh04VqHpH=*a!25Un=kCm9x)#D(>^cxTdi!h8 zmSv`dx;1vpK@N-~tAcB6lvyW3CBGe~-zqh<852C8j?$1wH&2=+Q7h3(PqGBJnKL-v zRcr}V-cZ-kF}6#3`D%BMJf&othd~crIfZ&~G{LlnfYewM@sZ)JKY2Jjrg%29+}v(K zr-%vv2ukI%>9UbaXyEbU)uopc3;>l#Y8Kvo0t+ANpN)Wh)RFN|Cr#8$$sAH$K1pom zY!(TqJx2S$Kc<*g1d3ogREF$69FCE6@q!TKlS}zK95*}UD2V|T>PNS0mjDv;c*Y`T zL;Xx6Ocm{N(M&$WY8k-RE|$`>MW$z;vN}}ey0syz9_Pp)=X91ntX52N93x>Ub{+qS z@oy~)Im=V~&MYgW^7Y*bG`o;Fk#i9PWWVM%mN7iGm$%$Nwu!UBfU`80X4$#+<~;K8)6wwMK7YdC)x@`&T(|Cw)5kd5!$MA|2Xxw!~{+p5kD1KIudtPsco0g zZSJ<36SuB+0hbq*S<`l8vBkJZve=ucuTlR?tHya(M4ki_o%Xk6F#WCTMIj!o1{!=f zM1UwXG}?xqku!oeRlsyZe+rd!uz89KMXR2OB`b6n*PK0a4P1B2ffn-7G-EL$23#Pj z2CP6{wlblyJ4z+iv&z)ERA$!?X5`M6$1@|$n$EH+MK!Hj8*W$oTM6<1E_=uE5$arG zko`Xqn40ui&*c$4<>RnOjvT{;b+RLxrUl zh9t>?pWyosZe8#8T;D>wt_egofVRAgoOi?0yEW(CvsTCH+wKqUsn6VUYE0vn(`RluGXHW5(Su5fQjhw~Ew^5>{?M}S za}H3?fsou-C>VfkHFz~X9b?{aLdVuOgH}jJ69uDkr_*tf8-4BJpX>4wcs;bgfdl@V zywhZy!Hf$g_Ov_#hNSZ~i1f#Q=Er~5WS?&-BgWh1aQU|3py%a(`|i8@rTEYA=WG1u zFY*DV;_l%z84ZFv$0_D}_R~3vz$}k#X#G66pj@uVU=F57tjnc@^D7!BCmN8M-Wi5r zolPIQ7dTK}nw0d!59L?mbbNJ2MZFyLrW`TUlu>{)5TW}9 z`4URHOYT5*&ysc)8Ehg~r7lhG0H8+lcu%4el56Vz!QoXAchL!i9YOTEgQZ@L&u%z) zr(|jPBq&4J-hB98x9$YY3z~v6euu@YnDE`wy2Z`+xc2^4I+DU*t10 z{`=u{n4}o%ozR5>z)MJYek_UGC`NpmX{>m-cb=ER#uvmnY4B?7r$-pYA>lck?|bpA zg8hU76^uciWyG+&OfKU=kL723l$z}^m(9b?_<}qDu*p?5oMCJg4*(LCo?#0ntqdJv zC@s|vHj|Mwf9saV$w=Fk7B^Fg%6Y@KFc+D$m5vvM8KR_EFiagKyyA8-?(xmqML{1@ zAB+e+OybeNMByXrV1c>^hLqzw&1j$E((%+4k|j$eiOOLBf$se?8nbb#Bs`x=B%fnI zY>Ypucwts*ELP)Qi_K=oOBWzHq&tj6l$~iHIhas?tFddLsy;MFLnw;Va(1{{G!hAlB*^i;tXZZq@(ilm7^vhJ);9GNkhuX znz?C=lJUT#XJh!u$spa0#NwNJ?Nec1eK|06bT))G2PucKjcQsCgD044n>^el0y-uN zCs6~sOG^)$aBP9qJUHwk9%E^BHoJ&fQ*t4%C^q}Fpir5>FJO2EXwIq2DfljIX#a1C z8VN|`)P-f#38_Ry04n*u8Rz*&?n9m|T1|VY@tiJgBH942G@BbiX+F_%Z7?l_Ls#ku4*92~;k{Lur% zy(4N)AT5p^>~=LaZPRfUYAVjx*om0|)x;!`P?sE!yEO#1)71=E#Ysw{R1U^5JzSKk zs8mu6Ai=XqiG?zJZjqx@+N@p}SWj|@Ma0h%c%#weB!Z<+j_6JR>qmJXWA?^KFrmEA zg)n%TW`?e5Jn97H^?z2_ z4vdF;b{G!^e0h+8AaUp6u?s8ZZjct_xK20&u8Rqzb!cx-@iF~L7q->>7U(=OlVY|dv zcTB?41>~PF@ICxteV${(YfN`pyqBp>8LBgIzOk7KL8=_xxDEpG+}ShVvFn)5h5?FK zi7Mu@Pk^86?{0nnXlYsOZo-;coWli~Ai3-YCf6z+ctG`q8bK+}xN@QmJ&AHALtTjk zoWaRHE*y?c;_OifQ8^IuSoalYGdYgOaRx+7b`UuuUO*SI#?QCst&^U*Ea||+HmVpu z5BrMs?M~P(G#dj4FGZWMJ+g4}+Ca%It`@+&_lI0&oHa9Rjk8RifO7yIG!ncOc(>63I+I`wcRBUTV zm#o}f94C6~wTt+nx;~62GAcx!94@nM&kj|r2&#KI#4gB))NA!+G`VqmG?!WM+b*)t zIxxQeuFmS)3B<*uEJo)H%h}QH!|hDD&A-W8tHC!p$MD14xE&`BzDfi1;!uiYuW`Z0 zrR#8eqKQs(^+e&b+XSmG(Met7S^_EC@?3W7O^AX-0&yv%eMvE-0yD%gco7k$Jp$%a z@_KM}pEw=H81h3ib=lSu%qc|-2-m8Y&a!>qMQqsJXmkMpA+Gn;-g+pDc>#xZ2)|)& z&xq8wn=4C8j~17f7nfG{mLIMzJy>0O`1fYVrDZg|3KguJ5SUAw0SGwv$Aq7bm{b!E zoJYWaX*@7G1SEYep>5t(7UDegq`?(-0VlD|NS9@GTbiy0lB!y4c5*e}c8Ifc2rzZ7 z&}5g00n|j^CQu_IC8$e(JCzOesq}nizkR}CEQCtA<)uo`H=+I|YVVSErv5X#$Jf|D z{jDE>oEABXPV-Iko16rVzWmZ8lg~RdFCR0oq2_oQ#p7du9v?0n z@mTqN9Kb%xT+6O7T*3Oo;HhWMrU53i>y%Loi-_f8g5;8$SX_4KBJ>78wT>+M@Sr(w zjt(Pr%{4>P$zcX+n@P^4)+DB8L$vaY6)<+rMRs1DGMm5wcLQ(hlkm{C=nwnsHHH^Z z$%u`!6&t>G#}W@%|NZ@M@`D3_4L)M=BWyXUM=VQt7F`_*7Ojm&>6RhJDu#&OJb8qoR!R8c1Y?Y)HIy zi9u>sgou$Hg~Of4r8BLD2#k$$t>g#VMJ*_aFI5$PG&KT$>(vXwb}g^A@)sqL=*+?^fx{&hs@rFHy(;m<-b^ZW zbb_bmT;TZ=d}SIKQxnByQpG@kM}*>LnO3evu(27?(MEV|hRB=gmL-fjeG$Yl`9Cw{ zAJ_b8s?>_4^-QU-d%QD{N{)z}cUG_<&c6_c(Lmt>B>8+0i0}^iKLaC3S_?Yhj$!jNVOw-b6pyb6MeQWg?}&Vmu1 zs-W^P+&(?tMoI-#v)M!g<~zf1&6pCrugBS;*)wiu)LywR!G0KW#%B1)Syniw*22Q9 z6NzWAhlt|XH;BSRP!Vqhrf3lzOF9{pb`VQ|$ZqP(iD#9Hqx_ zo|3%D)Fy&yRazyJ7Fm)HjE1TenQ?p#tvGhU?rwARm`7cGLi^6l7c)I_oD=65TX2a+ zxh*9nbDA^c+yWlUA;Q2>(Q%JHpL7Vi3w^Sr;jK_F>c^gOQk=$}4-1zzJh|dy&Q|Mi zDR)oLC}fVmeE8|7AO4$83UY08uo#9*cr5*42};p3iyFaELHU-@K@O^Nej;0ycEcTK zH)#3C_PuFKE2Wq!4D(PSNlfw{es$(t8G~Ez&p1oD+TY>Z%vv)Je;FNYJ*em({(>(q zzIEze>A_F_L%b(w!p09t#V#Zy*W^^L`A93LcVe#EP@5~*(8>^Rd(Zq+*<8tHGZ7^4|z#@#yGtg{h%lBx38*tGY_a%ZtGNZZ)Nkuw@x)bC50~+ zaEkF@XYgS26xB6KDYtDKpJIjvr*6Ei(4jg|glbhP;mDwM5;qY<2#qvr>JdrThFDbj z#w^yM4@zUOF`*TB@R8ohv8pqqbD&l?5tSoD9geL)M+eJI$tY`-{0UbW=qbsKwHtLo z$xdnJ(#;U2hj%Hqg%G_ZcT5!W5-pp=Zk8s|=Aest$-3wS2brRs1M*$0(4-JGD&atq z#|B3FQWL0l95Uzbk&mZy=z}U!Su4&h5k9(dQgd+rm-hgJ&7EvnWyertp0HeY627b*FUik;w0p`F)o-0%gnfITI;+Bo2`T9@Hff%Ia!Pe%+Z&qI<$(;z*k51yF z)7%(VCZj7K=fZ|hpPgwMNreWB+u7^ckSJY}zsZ%~3uyWVXr&7Q6WvR=W zrDThI3wYHo>Clm0@&1mEg;{n?yNN|+<6`t{23R&1n~eox@93j4L(AK;*|p(W`L{}p z9F82X)&9wV{JA>}=$`=?9f!~3qD_YXP2P3|-9;Ch?(Vf!-{ZJfi8td} z;4zKUD~ymUl_g-BqTX6!8OJM~E(lc$sgCJ$nY!DuYk|kCIc$LH^NGxUggU>>$JHqF zZBMMZuj}dtjGR@YQv>0Ww^cCoi34B0w|xSD>)6At%Sx3E(EO3wqw9KZ{Eji>m_3`4 z1lOpa)@~Prx>kFwY^%$PG|O>Q_Z<~?qaj@kDo$Bc_1@3wl`{XL39Ww%T((I$~)K@Z0(-l zHGXf-t5bVk;af2fr*(C9or7j=j2b~!j@ILk-F9q#=MZ}l;doO*j+Sz+hs_xpZ^M#U znExu{ryS$fuB8-G1;?C|N_OdM%!dCrKJ)#**SEHR>u)~)gg)lPe^^<1^j*pSd+ED} zkG}eUe~AxDEnfEbf(@W!W1xa<_|a)J*3-#VM&XLvN1b40Y5Bg$I;O=*n&pkgw&cuA z$7lwHq1)BuszKsr%6&O3E+{Pa z7$vlMdX!LnLUlA`-^O7wLXS4eNV+REnw>6-qoYwH;mBtC%J_I?F_I+`nqY{UqtTQ! zPx^XkAi<^&rx+e0$A<(=5hFJQJ4#U*r@2G+j1)GgL zeuUm^bY)s?G;pOUjWErH7Z=EVA_=kB3&yUhyh6#G=-LrrBr$446qk;tLv|{#hsFh3 zU87c+Zh)m}hS2|uUa-6MZ145jPA};12HQJZzxJQ@o(9deUHA=$&FlW&i>+6C0hHKT z+uZvt*m@SMZT=Sg(%*dA4SIju-s$b`23tFg{>$x+eh;4YH`g~_Jq79%Jb`+c8+xM; z2n>zxZ3Wn&G}Z6zVq-6RJL@mt=h~D0Mt|?OZsS>hZxh>mwzU(i1>0*od;RrS8*4kk z_N$%kt=%4U{}h_t>~B8XfnItqdz*V9^a{^{-mmZ@*nP3Kv4LGR)?UHrcW`_GlFXg{ z^A~%;i>-~PJ$U$}2P0d1veDzNU{dQFYyFqq;OW}SwdXymwFRy0G_V+tE_nT-hmWwo zHTeJfUVm#7r?I}Zxwiv9yD-b0JyZ2{f4A2S)^_^42#{wxTQ9o}1SizkqDG+JW{+Dz zPzTjZSG7rEwERka5c^a%S z>ktN%`Ttc3rvyNp2rWwY;q<-??82w+{T6AH>N9%sv^NQ_^p-4vfx#2?)=dl z#g4|EYqj6ua=at^B|UfH(uF@ooEz9CRPnAWh9k7~8w&|pf{>YrQ_GnU_B)6t#ffIM z_3dn+-z$_PyOwG?bk&5Jp^FafkWDHOq8fnakZ+safTA0dM{J@V?bN%CB2iPKNkBTn ze+d6@emK1*YaFQ0YAv3+hSrvak+JO`@PI|;aw*R{0SoC6TJHnr-g?;yK2!_uUPP02 z(hYtO*a|1O+)oa=@bB*j!DITgrt??)F&27^+|+{KFBL+Y&$70ZkUpxZC~Q@OAz1P=BqC!0ggP{*0H@OX zrw3knEbx>6zN}`Lzr>>Y22hKcnGLA}H=F|ZxR{U;nPo364$*=^3XaFgpRozZLh)m? zJywiIqvJG#EqR8-9CzxVI9cQ{)_ELdM<*KN1BgaU-Kimbky5A{rh>sDlbv)D7^A>} zhMu{?q!MuBL=jinJXGWK*crBc+uM$!mWD+t85`o|D!!bI&|Y6unUaY|Vgk9TiNnT% zz64B=hTp?_P*7^;(R&!rYEXO-w}W*!OK9?d`%^gVSUiVdy}mE1#uoki?xc|BYq#rj z3bDGCqZ>$~j`Ji>NXyE;J5e?Q21sH-R*+?bZYp1I(=A4sT*9@rCWqxZ>+Re#!KP?w#`e2WHQi;) z-C83|V}n^|gjv^0q86xV1<)q`gS8PuAv$-LI|9?mRhu56fox)oOSy%8w+aF{X|VBa z!4{s@mK;qw*xr+sYz%^7QDZc{U1U0P#848L1e28XK4R%TL{u886|~GtEnIhE49YIN zACnDAGg>;jTxdCVr)b#XEet%c!@N_m?Us?k(R$4Lt<)gD9*fbdXT?hW*BF3{ZX8Cj zX-bOO_E7DNJ$q&`D}K*B91o=%=&BVTI;J<;k-8s#7B4`78(VjxOb-7!!{AyIim-+P zB#w79z(h59jH0Wqt*CBTl;~$XPEL{$i|RNO8v27smY(SZE(8?y-}YK?R+OWN(gz%- zQ*H=v1<usW0L(O0-t|o(E*le3%lOO)+00@+iS0=Zxc2p)5>$ycU2t<1>BjEG{2( zJlL1EQ3>79F{a}8;G9bd=N#MmSZXP^{`{ffw6RNhjJXC& zfiC7lxz8}JnitfDvP(h{*n}?(Hd0_*h|!^w{YM@-@GR2QfTqro6nUyL5Sa1NNt)&w zm=3+01}Ubn*AS09$$Xlfi}4g9xh`eShb8tF4bE|=b>+zEIu72t4*1~iV=ZZ%c*hhn zKI3gSkvWK~?z2QV5+{w32XX(Ni{^{O`$=?4+%wK#6Fk_JoDCBtX3p>fHnqE}KTG46 z$Ho=vcein^bRg&a@OMK>%`MC3;8DcIlBRRoF987s$OqL=>WLtcj-tlBvrh~b%r`KtD$Z8(0EhBQF|e$#^XEimWvW3gnP{DE^bWb92loi#CxyIeVI=JQr+Yl#Vec9B|NCf(xJy z9zfsntJUCl>LG(!V!9n_6a{yo8;ip3;r%5me6VcK;xg_z76hbXzbmYWp(Mmjdwjj) z`XsUuc&74}&xZrKY_aC}OLck}hbb^erUi)hX=56PFetXarqeQmqC9!OLCaPH( zw7*+*<#o@%&Laj0w&@sAhL2rq8?5sS+88-ln#3(X2%3LuRw2@nZ9>gt6`IDTW-ZuV+?6z;r!IW6ML#==?k3aPhNCW%K_eXwT*CxG$f zLh8s;FbdW*C*Ni&PU`UUG$FBaOd9TsG}A0x_0DznZ< z)L6s{;zP@Lm|gZ3vJ2 zReeYWhzVFcheH`KW08KDZ;Jzp!=1S=7fmR3Q%asR8pE@KdWFBi;zjUn2Q_{c8%m4D|0emm-|3}|_ z-TzA#h*iL?w;*jtjkD@QHGRE+y%0!_^$a5ZN5(q(rQXF01D2mV;+s&lGmuf$G zGt7}HNV}U@Mz;g!GYoUp=1k9w~wKj35hrI7Mm0rC;cmy!E)H00Y!98j*?<@ zg?zUB$lYa7Z!o*ACW8-+n$@JhktuRKVsBM81qID8tn>k*yudl0U3 z29R=5#d#_>x?EMu4M2Q?5Iq;vHC+)3cY`H*Y1VMH(l`kax+dx&L9bvJ)rps}T9Ym! zGc74X87}UfcoG)rWCL$+l;KgmWO!}xi7uh+dSMhRFAAi{B_?{t& zAZhmW75Ty7eH07e5A5V4kC2|S$~ z*)#IXo*tJrXQ|oKV{Wv;WKNujL}vaYzQ%FhdF-X5MeV5n2KF}=4s2Jv-A^f(m&leW z7UTru)JyP$(_<6N+Fx_Gv#xZ76ccBjqbpL9pRDuw$*q#$hNqXuk-L%$ME2eO=Rwl8|E0j`^>`zgqQI*jq}Budws8H$NmP8QikfR+N}3{r^$y4L z*q=F;>oDj?q+sNBDF9Df+c%T>RUX^+$W7IstpA#+&z#9Z6$T&$U~(IfzP$;c`rQpb z!qn%L4L?Hs67r$xM8&>B;+cFnp+}y_Y+uUE66w1L12L}%x~g-~5qx43?h%h^att`c z%fdA&gm%?r5w8%iQlf7@h-M`EE@$=@MxvDeyFS%--VNTm%bSp%O1Z;O0_At+0QXdK zB^sE9y2Kg=#@K{49Y9Myhb$WBBaS*bwr2^yWHZwf6ii=o(y-JC2Nhgoh&TgDMTXTW zB7iw{YZgT3DT~o|PH3Auq;vi1RJ_V3Va9>Md-+iW>||Rw2Snq7LWyi^NDT(DX{u&T z;LF(=>sk=}lV_-5*%T*gdcwU7UY}s@IZS}3{dKMxk~DjRF&WIMVBn4F&dw-boz9Kn zq`vufQP3COhKN7{+w?*cWz%?Ovr>spI9mEXdL!1v6x*G__;$< zde4SSE&?&k)g@g3KyH=_ghvk+4}ms{FZx0=Pmag2fp6|1bSVyJd0%)-e9gYF#vQ6^ zL`<7U4=CISM;a>ypgry{_ZZu@88bJ!U8LF_Uk70s!*-k{>7YVuP;f<@ zkCVKoEBi+DsjcOe`(X>M^IFScywd7QJ!@pbBge#`5n=rE^q!z5y~ePNq4)f2y42F3DSfks$QN-cb`rjEq4 zpb;4k*}4dmL!z3!2Ed<@oN^o;sxp(9{_|)A^?oY~(eL$oi{Cwbz`%s5FOmhXqRsUb zqkch%VgN7s$ETACjdZvwH_5^VMQoIXk@(AqH|>TNv5wi&CUGT>sWwN}(s!#%OMK+k zy|28X2Ok(H1!Kiy9;Y0z8|e|ro{elwk%|i8TZWLJilcO2SRl!&60cf=x;rXot*!^{ zK?6frk+6dHN*?F01>JOUAvolmXOnJO@Fi@R^$)g$^5yhemL@5jEB%kkrn@o$xSap! z7c<+(7XZ5AB7>V%vCu+YwBWi+GBb-ZPjk7I*nEo4JV*1Eeww?n16ir2(50DiX`iV? ze%hC^AVOop_XX0H=;!gZ67dEbF~*sQF9>*Y6F2Yh&dp7^*Kl|(GLR!v*WBynQP-<6 z<07xiyE=P)o$1bBWvQd`k{SHUDd~P9F`GesdmO2A!8d4oEpISu2A(EWP)y-n2i{w=_R5Z8S@Wg}~ z=76^tORXXZ5s5~PD5O>r!eWpzQ>c+PRZU2y>6QT`wI`m=9@|G&a3>M6NXV=iV|~1| zILxC6L@In}HCR-1L<&+=_%N3%$6;nqLSxQJM^5W)%QCuB+g0C{3?`+-WBa&djBN@S z>qsSt^uhwqaI+P_p}H51QCD-ja)x(Oo*Uh{j2eR^rKqx}{L(doz&b%aM_J_g8v}2bOB54bN}$Sz zg^bh4mC1H?km0}vXl{>Kl1?+7DcnSGe7bx@L`7NMK$V2^f{tm?C3DBGV|JmUOs?hm zN?zUlrPak{8)nrHTerUytU9p>*`M;QsNbD&vG=kw99L1Yu17f^A26=X6dV8V0F4w$ zEaMK10CI*Ak1*;(nd1Zk-j~u&+lGqU@yzF2KFDY!c>(q9U^-C7DWZah;T$Ae0wx1m za|@N~64QzF+Zumd(jH0RajM9*w{S;YBzSjD@IpzlAChQEKBYWC7YOoDdHHI0kKZBo zk)cS?KD^?F&XcU*O_flPC@84=raTg=PckXZ<%8?)L$DGbe*d5zn5!k|BMl~pxuQd; z#kFrp?s0AlkV={t_`QP=2~mG`_Q)LI znY6=h=xo4~lnkjU4;Htg22PAJlJ^23PFoB&m$R`L&)@1L-Cu|w?FOjF@mUMgMOU$h zF0QYUqo&E#6$VeHe!y?0pwJDGPysO|X~g6q4U^#~Pk~UIRF1MwndhmSLO64bj@?dW zazaD6+3R*QP06j0KA3Y?#03D12yC zX!JfjKQIK0Lvb(z*;Q4P-Iym11)_zAtzc6x;LL=ZNC7W_9k9NL%m7$-9kQ8?NVJ?s zd_4(+7x3pCS$ArrMybU-1Jc1s7M~~SGzaEJ7uB&O4fT?b!=}VF~!PQzS zYwjeh+}@4p9O2sU(0d@iN7BK2+Q%Z$-9>bN=O064_$BleyDM@eEb=^fN7;atRl?Is z{nU!oC0Z%a5@4xOwMO2Pg(PaIe(c_$@zAYEi+672tps>1X%wqBrK=bLFEkmU6c z+^VCELECU6oi2`;f)Q{t7wG*B<3)Q{&bEf5gTW!!e~8|(aZbDk)X{@=5+->a+pCl& zi;-cT#TXlNSmgp7j??q{;{;fAh-6p9I`S~HWPl|UZMYG#Q!@Ud-$r!F`8K%7((!TF zs6B&cfvZCHJ~S50_F{<)`~UILN3qPz$!GKWpnfMgnvNn-B2ow(y8-pQlL$zM7@2G| zBHTZV2N<&!_QTqKYS8E~7S znNrL8n~`GXoJgv@Z(o|kPzUUvC@ACH8Osb4qGm+?vN#UH$vWHms*cvC{@a_-q-A@Q5u~c6(JLkwPt`-ig2Sbnrsz#gcy=z^J!(%SPwRP z0p$=pd@NjEN~YC7DPn(QIha3*-K>*xI^zQ2dmhLBJ6A+NON}n56%2v z{WItP!B9((3H3DDRm$YSIn3 z5NALiy8$LpyT8KcSjhm(h=TCmfpQ-j9^Z-hq8MLBgZL=H6zgmV)iuVTEXrt#S?MTB z&T_upZ~Y=lpO@Qfd;KRHy^rlcN0s;=D_`^fe3=gh_=ySf`9OW}iX z>7ad56q9`Qo{J_VR~x~Np0VU`lpfyW;`gL_elH$#F@7GN0crh@-AMnYpZWVgM6ZG4 zahiQ}1fY5Qf9YX4|Htxo%S&JP|CjhsY#fY}(+Ix}^NUFX*PN`G?wN1&EJPXl*WLS{ z_L2R6mJTp(W>{PnpTCcJ`+sHGoc|B+{Qn}KzXY>Me*ow9{cyQ4yF}wJ ze+g9m)_|r`WC+4EJHB^`D8&sdHOkNL!{pk5`SLpNifqVSBhYx3; z|4XI#U&{|3-M{~Tf`^}fDAmvZ=lj39{+FK}18%?m50{r#zOMh5_|&aGQs~dw$49LH zqeshM*Z)g=X08AB+FoySZ}+qGF)#n~gO$?#Z~4)8D_`S3ev!}GfFssNqoBVX>~L1b z=P02M+S^fq2?9HfMw7zZquM++d6=8QSsaOa++-9cdlL+1ojW;^$xG;YnqpXgv>B5~ zHj=|*lBMW>9X7Oxn@pOrCH)f;365Ik9ay>j4zKy(>ytkyNz+W zs5z&z^eP$^SBsd7x*H@}7N4g_G`_ZkV2sFnKBwa z)ba82v@0$(`Sj?-43aH`a(2`pGods`HymuP!Q%cdWwBAS1k7D=fi`9-JBef|88HFu zb+IrF_t78IB;&l#Yza|JF>N*XO7OH5tn*iV6z6%AB_oW9GejY}=3c^$P2YNyW`L<2 zfIdMR{MpMxaODZ(*3K~BxS|bi@)Z5u7}a!D&M0>qCBPU=kJ#tIg269kQus+5k{(tP z$|FE=UC5n~XQ%n%Gn0k5>73pLys1cjf%g%a0y?_u%XK|0O;)S9ANQ6Ra#P{ZPr*T$`@Bu@k#VmFcKJ zML#;ba_VM$atPZlqZrC~_K<=J_N!!(Xt*@F%c;0UHJzCMk;SP@p>^ z$LMHUI|As*0fLSIW``uv4x(WO5q!!Z8Zxm#dNj4P5Ng~*Ur;^>f$(KXG|DZAHP27O zPm@ja*%Vu1H-VQN_Wkiu2&1*{a&{QZ8_ubKA*8R2PZTDrLwb{wQL-dn3m6)JUO?U9 zjO7&L4M_t&EG`f;H1h~W2m++RY;1^18KTRW5hu?%z4zXW{%)|l^=$9;+D%Z(h4WW1FG3fmYH@0B+#oES(Kg-6}>&@N{4&9w%@T3=P z^w*wj^spnEAZ@mv+02V!%%i7LwU1@W-_rI^85WEbY zuDx7)4pVE-fe0+g`m3GZOB^zQVfWRO-M#+atG! z-NII0_jh|8SgQUm7U)yAu=vpDE1EJc5sa!qUmb+)(n1FPXTjRjU;8+0DGW=$+ZQw; zkgdNEaDM{7GVA zU*5~q66bN zC-DD;^OtM?v$eAyzU*(}pY651^%wh#z=iDeHhOEjy@UO`PhRymo*o<=$OuFx^v4t# zro#*xL>DEveY3A;IuSu1hlZ4kaDD}B;^mK6pE~RY)FA~r38+){4;7nIjmK#iviP#d zEQtP$voxp1>_Dj{8Y;C!L4^=7S;8D6iSQ_T@*pi1^B7~dkWg-bGLa!{Itu;5**;m& zGn$-4W8iQz0IU;x2s=8tnw$WJ{iuOjqS0tki#lU+8s`;9VG~LBys6m5b(V-Z?>yMm zwf&XX7Hh2_P6Ta~5DD!Bn%d!rG00_Kq>=yzdHFCP-x_j?&0>kNf?9$y0NYUZ zI>r!!`(%_+;!1>+Mo^=M_Ab&&A4-T}Z)2hY-lOc>mt?i0CH%z-ybbZCORV?2NouI& z%G4yP3eye`=mu^M*sV*|qzZT^G?3%`!&dNUbB}PigE0c#BIo<7=+boFS!Aa?D%Lr$ z^%x(k^@6+l(lvuWmqmX`=6NWhp{*0v75uTM@Zn51wUkTyJYLc5C{Ae;} z3Que3!s`9ugRgnjGj&&CFxZ_U-A-g*QvU%{M3X~B&fmiNp?6vbFy!(lL_0BsONA8?_A}KnY{Jguo z`a3<+N~KNl`$1_1p@F+WGi)N>OBGqfZA+fL6U3p~bYR_P?QEO6c8k#7T_j_&i1_>V zi#TJfHH+ws;B)N*fSU!10PhKrC3h_D8Gjp)QA-Lf7gGHF)}X46tOiQl>1PBG&0bGV zIgxY>G-?hDFSiEtkB7s|oM9M)C>wCB3JwoZn%o2<*$hyzXbvgh*QTSw#AsN;Q|}xB zcY)Ei`PWbQ1Au*3e*YX?C|9{Q7nA{KmCq9nNjk!S9+YfbnGcHWA<4Vvv{gQ)Q5cK7 zILU?e;N%i*Sbz(&Fc?(Ztje;#EEAmE>56@LVb*GyqEO;XXVI37Zy6SFUMwyDq4!cXs5#a>@8uI_@D=m zU6u+~_`-W4YwjYCgz0e31s4bxrKFFR2(%}1ALwdaF3t5u`wAGTfBXZE6bUbI-V#Sd zj$GbUw)R|({HEz&;(Q3YoJ*{&iAf`Zu?T!BV;Vh-20jN?YSkGV*W)u09xOG*OA>D? z_BXSI@SEfZ)y8yoVXI~!)V7@+O+!Pv`cq}hzWr2P)@j~UubJ8{C&n$^WMZ=AZap#X zVdlhy<3Y3~HfM>so<$w2yGOmg-P2wox;dfS+yR(^%~CL>>xXbxhd>8hsdqU=ukD!X z&FJ&oxu2LyzfZ@f7+*IY53XAaC&Irx^|m!Firv{o7tc$ZrgFyqeqWC_KLxF&7HQjj<=St^VF3G)iqw!D-Purxgn(R9jDReBJA{m;q(QSWicfH^D+uWjXw8STd!KO&;lDcAQ6Xr_l;yi55JSG-fvrvU2DbGS1!jn682jT`xavJ*j zNdz}Ec<&b!%I57eMk{-X(op5xH#(i;V3YhwG=OPCqx51Gn|7m^H#B~^)Z^=$c40C2 zhRxm{oy+|CO*gc=5_dmlCH|?P|3nbq8kFuNjslJyQ3`6%S|e(8gws1BI`wy^d{O!N zpZt8O{QL)cek2E&)3+i+MHrbl@q<2!c51dh?9*0GDE^Xrm@T=(`C?-+eLCFxWjDAg z-*I4ZFR|8D?VSbNy6nh^uH1d(TwkQn&ozbYP396BxvJE+k$}AlrLjB5O5GIj40(-2 zS9o3F1If~u=(@Q9b~zGb<*Yf0a%u)cbY{-AS8twUN}1=M4?PwotOleMTcnc!=19M| z#I|jRj5aUQy3TWBjTGc)ZsbjZ54UlNl{2BtO^Q4^AMG`tZn@q$NDbMug_C`b;vt38 zWL@YK-i;_v1Dbf#uqlTFswyK*=8&(JTFNymn26-*aOAXIl7x(wa1h8TDPiHu0}?2V zD1v*A(gRUz`HhU?OKBn*^ASw#T2c)Dol!*5>yQ8&PO`_6)u;4AI1d~ zq1ybIA2>h4760e5Z6Z6e?FqYa4YjzeFtiQj374vN- Date: Thu, 20 May 2021 11:05:20 -0700 Subject: [PATCH 41/83] fix k8s version issue (#956) Co-authored-by: Nicolas Guibourge --- .../kubernetes-1.18.14.signatures.json | 3 ++- SPECS/kubernetes/kubernetes-1.18.14.spec | 22 +++++++++++++------ .../kubernetes-1.18.17.signatures.json | 3 ++- SPECS/kubernetes/kubernetes-1.18.17.spec | 18 ++++++++++----- .../kubernetes-1.19.7.signatures.json | 3 ++- SPECS/kubernetes/kubernetes-1.19.7.spec | 14 +++++++++--- .../kubernetes-1.19.9.signatures.json | 3 ++- SPECS/kubernetes/kubernetes-1.19.9.spec | 14 +++++++++--- .../kubernetes-1.20.2.signatures.json | 3 ++- SPECS/kubernetes/kubernetes-1.20.2.spec | 14 +++++++++--- .../kubernetes-1.20.5.signatures.json | 3 ++- SPECS/kubernetes/kubernetes-1.20.5.spec | 14 +++++++++--- SPECS/kubernetes/version-file-1.18.14.sh | 5 +++++ SPECS/kubernetes/version-file-1.18.17.sh | 5 +++++ SPECS/kubernetes/version-file-1.19.7.sh | 5 +++++ SPECS/kubernetes/version-file-1.19.9.sh | 5 +++++ SPECS/kubernetes/version-file-1.20.2.sh | 5 +++++ SPECS/kubernetes/version-file-1.20.5.sh | 5 +++++ 18 files changed, 114 insertions(+), 30 deletions(-) create mode 100755 SPECS/kubernetes/version-file-1.18.14.sh create mode 100755 SPECS/kubernetes/version-file-1.18.17.sh create mode 100755 SPECS/kubernetes/version-file-1.19.7.sh create mode 100755 SPECS/kubernetes/version-file-1.19.9.sh create mode 100755 SPECS/kubernetes/version-file-1.20.2.sh create mode 100755 SPECS/kubernetes/version-file-1.20.5.sh diff --git a/SPECS/kubernetes/kubernetes-1.18.14.signatures.json b/SPECS/kubernetes/kubernetes-1.18.14.signatures.json index 47a92160d18..4d886eaf788 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.14.signatures.json @@ -2,6 +2,7 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.14-hotfix.20210511.tar.gz": "ad232264bc80f2df182c805c03472ae94ec2e623c3bb1620475371c41e31db6e" + "kubernetes-node-linux-amd64-1.18.14-hotfix.20210511.tar.gz": "ad232264bc80f2df182c805c03472ae94ec2e623c3bb1620475371c41e31db6e", + "version-file-1.18.14.sh": "024f80d29f25956e24f8474c208bf6e7f6a597f2742add658bc8f8a4712db99e" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.14.spec b/SPECS/kubernetes/kubernetes-1.18.14.spec index ee997fed988..8002f1821ee 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.spec +++ b/SPECS/kubernetes/kubernetes-1.18.14.spec @@ -10,7 +10,7 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.14 -Release: 5%{?dist} +Release: 7%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -20,7 +20,8 @@ URL: https://mcr.microsoft.com/oss # Note that only amd64 tarball exist which is OK since kubernetes is built from source Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz Source1: kubelet.service -Source2: golang-1.15-k8s-1.18-test.patch +Source2: version-file-%{version}.sh +Source3: golang-1.15-k8s-1.18-test.patch # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch # CVE-2020-8563 Only applies when using VSphere as cloud provider, @@ -50,14 +51,14 @@ Microsoft Kubernetes %{version}. %package client Summary: Client utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description client Client utilities for Microsoft Kubernetes %{version}. %package kubeadm Summary: Bootstrap utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: moby-cli %description kubeadm @@ -107,6 +108,10 @@ mkdir -p %{_builddir}/%{name}/src cd %{_builddir}/%{name}/src tar -xof %{_builddir}/%{name}/kubernetes-src.tar.gz +# set version information using version file +# (see k8s code: hack/lib/version.sh for more detail) +export KUBE_GIT_VERSION_FILE=%{SOURCE2} + # build host and container image related components components_to_build=%{host_components} for component in ${components_to_build}; do @@ -131,7 +136,7 @@ popd %check # patch test script so it supports golang 1.15 which is now used to build kubernetes cd %{_builddir}/%{name}/src/hack/make-rules -patch -p1 test.sh < %{SOURCE2} +patch -p1 test.sh < %{SOURCE3} # perform unit tests # Note: @@ -270,10 +275,13 @@ fi %{_bindir}/pause %changelog -* Thu May 13 2021 CBL-Mariner Service Account - 1.18.14-5 +* Tue May 17 2021 Nicolas Guibourge 1.18.14-7 +- Manually set version variables. + +* Thu May 13 2021 CBL-Mariner Service Account - 1.18.14-6 - Update to version "1.18.14-hotfix.20210511". -* Mon May 03 2021 Nicolas Guibourge 1.18.14-4 +* Mon May 03 2021 Nicolas Guibourge 1.18.14-5 - Increment release to force republishing using golang 1.15.11. * Thu Apr 29 2021 CBL-Mariner Service Account - 1.18.14-4 diff --git a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json index 985c0b7e2c3..c6c7c6bb233 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json @@ -2,6 +2,7 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.17-hotfix.20210505.tar.gz": "0dae63a4ae89894f417b4370a9f5531cd2c0ae8aaed4393720d7e32dc87f54c4" + "kubernetes-node-linux-amd64-1.18.17-hotfix.20210505.tar.gz": "0dae63a4ae89894f417b4370a9f5531cd2c0ae8aaed4393720d7e32dc87f54c4", + "version-file-1.18.17.sh": "1e36b3f8112b3e3a25b624cad1a6dbf581c967567eb1f2026158119d0f5e6ef0" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.17.spec b/SPECS/kubernetes/kubernetes-1.18.17.spec index 464757cb8df..c3c6e3cc64d 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.spec +++ b/SPECS/kubernetes/kubernetes-1.18.17.spec @@ -10,7 +10,7 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.17 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -20,7 +20,8 @@ URL: https://mcr.microsoft.com/oss # Note that only amd64 tarball exist which is OK since kubernetes is built from source Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz Source1: kubelet.service -Source2: golang-1.15-k8s-1.18-test.patch +Source2: version-file-%{version}.sh +Source3: golang-1.15-k8s-1.18-test.patch # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch # CVE-2020-8563 Only applies when using VSphere as cloud provider, @@ -50,14 +51,14 @@ Microsoft Kubernetes %{version}. %package client Summary: Client utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description client Client utilities for Microsoft Kubernetes %{version}. %package kubeadm Summary: Bootstrap utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: moby-cli %description kubeadm @@ -107,6 +108,10 @@ mkdir -p %{_builddir}/%{name}/src cd %{_builddir}/%{name}/src tar -xof %{_builddir}/%{name}/kubernetes-src.tar.gz +# set version information using version file +# (see k8s code: hack/lib/version.sh for more detail) +export KUBE_GIT_VERSION_FILE=%{SOURCE2} + # build host and container image related components components_to_build=%{host_components} for component in ${components_to_build}; do @@ -131,7 +136,7 @@ popd %check # patch test script so it supports golang 1.15 which is now used to build kubernetes cd %{_builddir}/%{name}/src/hack/make-rules -patch -p1 test.sh < %{SOURCE2} +patch -p1 test.sh < %{SOURCE3} # perform unit tests # Note: @@ -270,6 +275,9 @@ fi %{_bindir}/pause %changelog +* Tue May 17 2021 Nicolas Guibourge 1.18.17-4 +- Manually set version variables. + * Fri May 07 2021 CBL-Mariner Service Account - 1.18.17-3 - Update to version "1.18.17-hotfix.20210505". diff --git a/SPECS/kubernetes/kubernetes-1.19.7.signatures.json b/SPECS/kubernetes/kubernetes-1.19.7.signatures.json index dc8ebe4aae6..09f7fa5da9a 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.7.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.7-hotfix.20210511.tar.gz": "12cb563ec25222662e9a3f615ab30f28abed7dbb50d3cc165b642db0d89c7078" + "kubernetes-node-linux-amd64-1.19.7-hotfix.20210511.tar.gz": "12cb563ec25222662e9a3f615ab30f28abed7dbb50d3cc165b642db0d89c7078", + "version-file-1.19.7.sh": "4a04df39fb96ad2350c0828f8d81f0107b546173867600957c8834e3147be3d9" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.7.spec b/SPECS/kubernetes/kubernetes-1.19.7.spec index 55bb3f395aa..b5521431475 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.spec +++ b/SPECS/kubernetes/kubernetes-1.19.7.spec @@ -10,7 +10,7 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.7 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -20,6 +20,7 @@ URL: https://mcr.microsoft.com/oss # Note that only amd64 tarball exist which is OK since kubernetes is built from source Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz Source1: kubelet.service +Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch BuildRequires: flex-devel @@ -46,14 +47,14 @@ Microsoft Kubernetes %{version}. %package client Summary: Client utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description client Client utilities for Microsoft Kubernetes %{version}. %package kubeadm Summary: Bootstrap utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: moby-cli %description kubeadm @@ -103,6 +104,10 @@ mkdir -p %{_builddir}/%{name}/src cd %{_builddir}/%{name}/src tar -xof %{_builddir}/%{name}/kubernetes-src.tar.gz +# set version information using version file +# (see k8s code: hack/lib/version.sh for more detail) +export KUBE_GIT_VERSION_FILE=%{SOURCE2} + # build host and container image related components components_to_build=%{host_components} for component in ${components_to_build}; do @@ -266,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Tue May 17 2021 Nicolas Guibourge 1.19.7-4 +- Manually set version variables. + * Thu May 13 2021 CBL-Mariner Service Account - 1.19.7-3 - Update to version "1.19.7-hotfix.20210511". diff --git a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json index 242211eb54b..5163813b03e 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.9-hotfix.20210505.tar.gz": "c3113cdecf5ae317fac264c67571bfda3eeb58d7ba3780ec5fddfbe83238b052" + "kubernetes-node-linux-amd64-1.19.9-hotfix.20210505.tar.gz": "c3113cdecf5ae317fac264c67571bfda3eeb58d7ba3780ec5fddfbe83238b052", + "version-file-1.19.9.sh": "c2a7312e4d376f24e0a85af74dfbe91ed370fe8960d3def0d499fc0698100bc9" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.9.spec b/SPECS/kubernetes/kubernetes-1.19.9.spec index 36abb7f82bf..640ca364b1b 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.spec +++ b/SPECS/kubernetes/kubernetes-1.19.9.spec @@ -10,7 +10,7 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.9 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -20,6 +20,7 @@ URL: https://mcr.microsoft.com/oss # Note that only amd64 tarball exist which is OK since kubernetes is built from source Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz Source1: kubelet.service +Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch BuildRequires: flex-devel @@ -46,14 +47,14 @@ Microsoft Kubernetes %{version}. %package client Summary: Client utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description client Client utilities for Microsoft Kubernetes %{version}. %package kubeadm Summary: Bootstrap utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: moby-cli %description kubeadm @@ -103,6 +104,10 @@ mkdir -p %{_builddir}/%{name}/src cd %{_builddir}/%{name}/src tar -xof %{_builddir}/%{name}/kubernetes-src.tar.gz +# set version information using version file +# (see k8s code: hack/lib/version.sh for more detail) +export KUBE_GIT_VERSION_FILE=%{SOURCE2} + # build host and container image related components components_to_build=%{host_components} for component in ${components_to_build}; do @@ -266,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Tue May 17 2021 Nicolas Guibourge 1.19.9-4 +- Manually set version variables. + * Fri May 07 2021 CBL-Mariner Service Account - 1.19.9-3 - Update to version "1.19.9-hotfix.20210505". diff --git a/SPECS/kubernetes/kubernetes-1.20.2.signatures.json b/SPECS/kubernetes/kubernetes-1.20.2.signatures.json index 525aad59fbe..34cb9afd649 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.2.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.2-hotfix.20210511.tar.gz": "ac2e7737d9deee2b9a10cff9ccc8e50010d9b896d909be1369685963932c9151" + "kubernetes-node-linux-amd64-1.20.2-hotfix.20210511.tar.gz": "ac2e7737d9deee2b9a10cff9ccc8e50010d9b896d909be1369685963932c9151", + "version-file-1.20.2.sh": "be1e9057920635d52949c8d684d026ab7699fbf0d5de14a92f08f4f7e2ea92d8" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.2.spec b/SPECS/kubernetes/kubernetes-1.20.2.spec index 7c59dfd9ed0..6cb88c2fe0e 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.spec +++ b/SPECS/kubernetes/kubernetes-1.20.2.spec @@ -10,7 +10,7 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.2 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -20,6 +20,7 @@ URL: https://mcr.microsoft.com/oss # Note that only amd64 tarball exist which is OK since kubernetes is built from source Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz Source1: kubelet.service +Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch BuildRequires: flex-devel @@ -46,14 +47,14 @@ Microsoft Kubernetes %{version}. %package client Summary: Client utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description client Client utilities for Microsoft Kubernetes %{version}. %package kubeadm Summary: Bootstrap utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: moby-cli %description kubeadm @@ -103,6 +104,10 @@ mkdir -p %{_builddir}/%{name}/src cd %{_builddir}/%{name}/src tar -xof %{_builddir}/%{name}/kubernetes-src.tar.gz +# set version information using version file +# (see k8s code: hack/lib/version.sh for more detail) +export KUBE_GIT_VERSION_FILE=%{SOURCE2} + # build host and container image related components components_to_build=%{host_components} for component in ${components_to_build}; do @@ -266,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Tue May 17 2021 Nicolas Guibourge 1.20.2-4 +- Manually set version variables. + * Thu May 13 2021 CBL-Mariner Service Account - 1.20.2-3 - Update to version "1.20.2-hotfix.20210511". diff --git a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json index 2d6d1a78d41..38d5f93724b 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.5-hotfix.20210505.tar.gz": "718342c353ab6aa430a0f4be2e6e5eb122da74beb5815dfaf3b0fd4c9dee57f4" + "kubernetes-node-linux-amd64-1.20.5-hotfix.20210505.tar.gz": "718342c353ab6aa430a0f4be2e6e5eb122da74beb5815dfaf3b0fd4c9dee57f4", + "version-file-1.20.5.sh": "8fccf5b3dc34ca43ab9c39f7bc817be6094299b6352aed9ab0325a77353c2f3e" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.5.spec b/SPECS/kubernetes/kubernetes-1.20.5.spec index c9f99e5e9df..cada3903d58 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.spec +++ b/SPECS/kubernetes/kubernetes-1.20.5.spec @@ -10,7 +10,7 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.5 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -20,6 +20,7 @@ URL: https://mcr.microsoft.com/oss # Note that only amd64 tarball exist which is OK since kubernetes is built from source Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz Source1: kubelet.service +Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) Patch0: CVE-2020-8565.nopatch BuildRequires: flex-devel @@ -46,14 +47,14 @@ Microsoft Kubernetes %{version}. %package client Summary: Client utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description client Client utilities for Microsoft Kubernetes %{version}. %package kubeadm Summary: Bootstrap utilities -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: moby-cli %description kubeadm @@ -103,6 +104,10 @@ mkdir -p %{_builddir}/%{name}/src cd %{_builddir}/%{name}/src tar -xof %{_builddir}/%{name}/kubernetes-src.tar.gz +# set version information using version file +# (see k8s code: hack/lib/version.sh for more detail) +export KUBE_GIT_VERSION_FILE=%{SOURCE2} + # build host and container image related components components_to_build=%{host_components} for component in ${components_to_build}; do @@ -266,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Tue May 17 2021 Nicolas Guibourge 1.20.5-4 +- Manually set version variables. + * Fri May 07 2021 CBL-Mariner Service Account - 1.20.5-3 - Update to version "1.20.5-hotfix.20210505". diff --git a/SPECS/kubernetes/version-file-1.18.14.sh b/SPECS/kubernetes/version-file-1.18.14.sh new file mode 100755 index 00000000000..2bdc7de957f --- /dev/null +++ b/SPECS/kubernetes/version-file-1.18.14.sh @@ -0,0 +1,5 @@ +KUBE_GIT_COMMIT='1adde27c8a2253fde5290a6874e9cdb6cb318fc0' +KUBE_GIT_TREE_STATE='archive' +KUBE_GIT_VERSION='v1.18.14-hotfix.20210511' +KUBE_GIT_MAJOR='1' +KUBE_GIT_MINOR='18+' diff --git a/SPECS/kubernetes/version-file-1.18.17.sh b/SPECS/kubernetes/version-file-1.18.17.sh new file mode 100755 index 00000000000..51fe8b5564f --- /dev/null +++ b/SPECS/kubernetes/version-file-1.18.17.sh @@ -0,0 +1,5 @@ +KUBE_GIT_COMMIT='89dfc218f902e4673e21dd0d53fabab330b8ff8d' +KUBE_GIT_TREE_STATE='archive' +KUBE_GIT_VERSION='v1.18.17-hotfix.20210505' +KUBE_GIT_MAJOR='1' +KUBE_GIT_MINOR='18+' diff --git a/SPECS/kubernetes/version-file-1.19.7.sh b/SPECS/kubernetes/version-file-1.19.7.sh new file mode 100755 index 00000000000..1393e9a4eb4 --- /dev/null +++ b/SPECS/kubernetes/version-file-1.19.7.sh @@ -0,0 +1,5 @@ +KUBE_GIT_COMMIT='96f5948a28081b6c4eb245ddeceae357b7e96012' +KUBE_GIT_TREE_STATE='archive' +KUBE_GIT_VERSION='v1.19.7-hotfix.20210511' +KUBE_GIT_MAJOR='1' +KUBE_GIT_MINOR='19+' diff --git a/SPECS/kubernetes/version-file-1.19.9.sh b/SPECS/kubernetes/version-file-1.19.9.sh new file mode 100755 index 00000000000..de502b28a04 --- /dev/null +++ b/SPECS/kubernetes/version-file-1.19.9.sh @@ -0,0 +1,5 @@ +KUBE_GIT_COMMIT='f7f4d8da3c33240c5eefeb09ead466e3e7e171b6' +KUBE_GIT_TREE_STATE='archive' +KUBE_GIT_VERSION='v1.19.9-hotfix.20210505' +KUBE_GIT_MAJOR='1' +KUBE_GIT_MINOR='19+' diff --git a/SPECS/kubernetes/version-file-1.20.2.sh b/SPECS/kubernetes/version-file-1.20.2.sh new file mode 100755 index 00000000000..0f93d6cb31b --- /dev/null +++ b/SPECS/kubernetes/version-file-1.20.2.sh @@ -0,0 +1,5 @@ +KUBE_GIT_COMMIT='cdca464418d7038e3d8f2fe32cea26574d81283c' +KUBE_GIT_TREE_STATE='archive' +KUBE_GIT_VERSION='v1.20.2-hotfix.20210511' +KUBE_GIT_MAJOR='1' +KUBE_GIT_MINOR='20+' diff --git a/SPECS/kubernetes/version-file-1.20.5.sh b/SPECS/kubernetes/version-file-1.20.5.sh new file mode 100755 index 00000000000..6dfbbb37427 --- /dev/null +++ b/SPECS/kubernetes/version-file-1.20.5.sh @@ -0,0 +1,5 @@ +KUBE_GIT_COMMIT='8337600e5ea8f2365e283542b0369b530fd78326' +KUBE_GIT_TREE_STATE='archive' +KUBE_GIT_VERSION='v1.20.5-hotfix.20210505' +KUBE_GIT_MAJOR='1' +KUBE_GIT_MINOR='20+' From c811da0e341554250d40b0573f71cd8443f1d7c5 Mon Sep 17 00:00:00 2001 From: Daniel McIlvaney Date: Wed, 14 Oct 2020 17:44:48 -0700 Subject: [PATCH 42/83] Improve PR template grammar Signed-off-by: Daniel McIlvaney --- .github/pull_request_template.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8ac0b1fe835..2a591c94d5e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -33,8 +33,9 @@ What does the PR accomplish, why was it needed? ###### Does this affect the toolchain? -**YES** -NO + + +**YES/NO** ###### Associated issues @@ -45,5 +46,5 @@ NO - https://nvd.nist.gov/vuln/detail/CVE-YYYY-XXXX ###### Test Methodology - + - Pipeline build id: xxxx From 2daeaf2f586f5875d2953590c5df30bfd523f13a Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Thu, 20 May 2021 16:44:17 -0400 Subject: [PATCH 43/83] changes from PR comments --- SPECS/libnvidia-container/libnvidia-container.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec index a440adeafd9..2fbfe5ab4c6 100644 --- a/SPECS/libnvidia-container/libnvidia-container.spec +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -1,5 +1,6 @@ %define modprobe_version 450.57 %define _major 1 +%define mod_probe_dir deps/src/nvidia-modprobe-%{modprobe_version} Summary: NVIDIA container runtime library Name: libnvidia-container Version: 1.3.3 @@ -31,10 +32,10 @@ kernel subsystems and is designed to be agnostic of the container runtime. %patch0 -p1 %patch1 -p1 -mkdir -p deps/src/nvidia-modprobe-%{modprobe_version} -tar -C deps/src/nvidia-modprobe-%{modprobe_version} --strip-components=1 -xzf %{SOURCE1} -%patch2 -p1 -d deps/src/nvidia-modprobe-%{modprobe_version} -touch deps/src/nvidia-modprobe-%{modprobe_version}/.download_stamp +mkdir -p %{mod_probe_dir} +tar -C %{mod_probe_dir} --strip-components=1 -xzf %{SOURCE1} +%patch2 -p1 -d %{mod_probe_dir} +touch %{mod_probe_dir}/.download_stamp %build %make_build WITH_LIBELF=yes From fd81d95d1b61ca8bb29889aa40fa8d34c0c46bb5 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Thu, 20 May 2021 16:45:37 -0400 Subject: [PATCH 44/83] changes from PR comments --- SPECS/libnvidia-container/libnvidia-container.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec index 2fbfe5ab4c6..d76ade95b9d 100644 --- a/SPECS/libnvidia-container/libnvidia-container.spec +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -96,7 +96,7 @@ This package contains the debugging symbols for the library. %package tools Summary: NVIDIA container runtime library (command-line tools) -Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release} +Requires: %{name}%{_major}%{?_isa} = %{version}-%{release} %description tools The nvidia-container library provides an interface to configure GNU/Linux From 9e6ed3c8657c1f8f445e5f6632efa4c8e841c624 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Thu, 20 May 2021 18:24:24 -0400 Subject: [PATCH 45/83] changes from PR comments --- .../nvidia-container-toolkit.signatures.json | 6 +++--- .../nvidia-container-toolkit/nvidia-container-toolkit.spec | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json index ed441dc60b7..c75ed74d262 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "nvidia-container-toolkit-1.4.2.tar.gz": "8c3ff8dd96812dcc2c09b203d2749fcba51941e33387aba1bca4da2f87065a0c", - "vendor.tar.gz": "3dd5518fc26db657ddcc686c0f26213fcd071d9161dfd27923c6330f9c55eaeb" + "nvidia-container-toolkit-1.4.2-vendor.tar.gz": "bb77da74cdaedfac1f3df70b91713d60eaabeae813b14e634d671dc0c28d334f", + "nvidia-container-toolkit-1.4.2.tar.gz": "8c3ff8dd96812dcc2c09b203d2749fcba51941e33387aba1bca4da2f87065a0c" } -} \ No newline at end of file +} diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec index 82b1e5b612a..4c2c031680f 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -3,7 +3,7 @@ Summary: NVIDIA container runtime hook Name: nvidia-container-toolkit Version: 1.4.2 Release: 2%{?dist} -License: Apache-2.0 +License: ALS2.0 Vendor: Microsoft Corporation Distribution: Mariner URL: https://github.com/NVIDIA/nvidia-container-runtime @@ -26,8 +26,7 @@ Provides: nvidia-container-runtime-hook Provides a OCI hook to enable GPU support in containers. %prep -%setup -q -%patch0 -p1 +%autosetup tar -xvf %{SOURCE1} %build From b99c54ff09f65b3b41320a1a2339450a3a3d6e19 Mon Sep 17 00:00:00 2001 From: chalamalasetty <42326515+chalamalasetty@users.noreply.github.com> Date: Thu, 20 May 2021 15:26:36 -0700 Subject: [PATCH 46/83] Add archivemount fuse-zip p7zip and libzip to Mariner (#961) * Add archivemount fuse-zip p7zip and libzip to Mariner * Add archivemount fuse-zip p7zip and libzip to Mariner * Add archivemount fuse-zip p7zip and libzip to data licenses file * Update data licenses file * Fix for ncat segmentation fault crash with unix sockets * Resolve PR code review comments --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 4 + .../archivemount/archivemount.signatures.json | 5 + SPECS/archivemount/archivemount.spec | 171 ++++ SPECS/fuse-zip/fuse-zip.signatures.json | 5 + SPECS/fuse-zip/fuse-zip.spec | 210 ++++ SPECS/libzip/libzip.signatures.json | 5 + SPECS/libzip/libzip.spec | 355 +++++++ SPECS/nmap/nmap-unix_crash.patch | 32 + SPECS/nmap/nmap.spec | 7 +- SPECS/p7zip/0001-fix-data-null-pointer.patch | 14 + SPECS/p7zip/0001-fix-out-of-mem.patch | 26 + SPECS/p7zip/02-man.patch | 22 + SPECS/p7zip/05-hardening-flags.patch | 33 + SPECS/p7zip/14-Fix-g++-warning.patch | 24 + SPECS/p7zip/CVE-2016-9296.patch | 12 + SPECS/p7zip/CVE-2017-17969.patch | 26 + SPECS/p7zip/gcc10-conversion.patch | 26 + SPECS/p7zip/p7zip-manpages.patch | 899 ++++++++++++++++++ SPECS/p7zip/p7zip.signatures.json | 5 + SPECS/p7zip/p7zip.spec | 421 ++++++++ SPECS/p7zip/p7zip_15.14-norar_cmake.patch | 149 +++ cgmanifest.json | 40 + 23 files changed, 2491 insertions(+), 2 deletions(-) create mode 100644 SPECS/archivemount/archivemount.signatures.json create mode 100644 SPECS/archivemount/archivemount.spec create mode 100644 SPECS/fuse-zip/fuse-zip.signatures.json create mode 100644 SPECS/fuse-zip/fuse-zip.spec create mode 100644 SPECS/libzip/libzip.signatures.json create mode 100644 SPECS/libzip/libzip.spec create mode 100644 SPECS/nmap/nmap-unix_crash.patch create mode 100644 SPECS/p7zip/0001-fix-data-null-pointer.patch create mode 100644 SPECS/p7zip/0001-fix-out-of-mem.patch create mode 100644 SPECS/p7zip/02-man.patch create mode 100644 SPECS/p7zip/05-hardening-flags.patch create mode 100644 SPECS/p7zip/14-Fix-g++-warning.patch create mode 100644 SPECS/p7zip/CVE-2016-9296.patch create mode 100644 SPECS/p7zip/CVE-2017-17969.patch create mode 100644 SPECS/p7zip/gcc10-conversion.patch create mode 100644 SPECS/p7zip/p7zip-manpages.patch create mode 100644 SPECS/p7zip/p7zip.signatures.json create mode 100644 SPECS/p7zip/p7zip.spec create mode 100644 SPECS/p7zip/p7zip_15.14-norar_cmake.patch diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 57151c3c04e..6ad929f8784 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -2,7 +2,7 @@ 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) | at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
byacc
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
CUnit
dnf
docbook5-schemas
dos2unix
ebtables
extra-cmake-modules
gnu-efi
hardening-check
heimdal
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
libstoragemgmt
libxcrypt
mailcap
mokutil
mozjs60
oath-toolkit
open-vm-tools
openssl
p11-kit
perl-JSON
pugixml
python-google-auth
python-jwt
python-kubernetes
python-pexpect
python-ptyprocess
python-pywbem
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
rdma-core
sgml-common
sos
squashfs-tools
uclibc-ng
uuid
websocketpp
words
xmlstarlet
yaml-cpp
yasm
zipper | +| Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | archivemount
at
attr
autoconf213
babeltrace2
bmake
brotli
busybox
byacc
calamares
catch
chrony
conntrack-tools
cpprest
cryptsetup
CUnit
dnf
docbook5-schemas
dos2unix
ebtables
extra-cmake-modules
fuse-zip
gnu-efi
hardening-check
heimdal
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
libstoragemgmt
libxcrypt
libzip
mailcap
mokutil
mozjs60
oath-toolkit
open-vm-tools
openssl
p11-kit
p7zip
perl-JSON
pugixml
python-google-auth
python-jwt
python-kubernetes
python-pexpect
python-ptyprocess
python-pywbem
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
rdma-core
sgml-common
sos
squashfs-tools
uclibc-ng
uuid
websocketpp
words
xmlstarlet
yaml-cpp
yasm
zipper | | Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
blobfuse
bmon
bond
bpftrace
ccache
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.7
coredns-1.7.0
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
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
libiothsm-std
libmaxminddb
libuv
libxml++
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
ntopng
omi
pcaudiolib
pcre2
perl-Test-Warnings
perl-Text-Template
pigz
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
dotnet-runtime-3.1
dotnet-sdk-3.1
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
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
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.15
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-8.11.4
nodejs-9.11.2
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 | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 28b026f8fdd..76674294df6 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -10,6 +10,7 @@ "origin": "Fedora", "license": "[Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files)", "specs": [ + "archivemount", "at", "attr", "autoconf213", @@ -30,6 +31,7 @@ "dos2unix", "ebtables", "extra-cmake-modules", + "fuse-zip", "gnu-efi", "hardening-check", "heimdal", @@ -57,12 +59,14 @@ "libpwquality", "libstoragemgmt", "libxcrypt", + "libzip", "mailcap", "mokutil", "mozjs60", "oath-toolkit", "open-vm-tools", "openssl", + "p7zip", "p11-kit", "perl-JSON", "pugixml", diff --git a/SPECS/archivemount/archivemount.signatures.json b/SPECS/archivemount/archivemount.signatures.json new file mode 100644 index 00000000000..ca7545178cf --- /dev/null +++ b/SPECS/archivemount/archivemount.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "archivemount-0.9.1.tar.gz": "c529b981cacb19541b48ddafdafb2ede47a40fcaf16c677c1e2cd198b159c5b3" + } +} diff --git a/SPECS/archivemount/archivemount.spec b/SPECS/archivemount/archivemount.spec new file mode 100644 index 00000000000..e2f62413832 --- /dev/null +++ b/SPECS/archivemount/archivemount.spec @@ -0,0 +1,171 @@ +Name: archivemount +Version: 0.9.1 +Release: 4%{?dist} +Summary: FUSE based filesystem for mounting compressed archives +Vendor: Microsoft Corporation +Distribution: Mariner +License: LGPLv2+ +URL: https://www.cybernoia.de/software/archivemount.html +Source0: https://www.cybernoia.de/software/archivemount/%{name}-%{version}.tar.gz + +BuildRequires: gcc +BuildRequires: fuse-devel +BuildRequires: libarchive-devel +BuildRequires: automake +BuildRequires: make +Requires: fuse + +%description +Archivemount is a piece of glue code between libarchive and FUSE. It can be +used to mount a (possibly compressed) archive (as in .tar.gz or .tar.bz2) +and use it like an ordinary filesystem. + +%prep +%autosetup -p1 + +%build +%configure --enable-debug +%make_build + +%install +rm -rf $RPM_BUILD_ROOT +rm -f archivemount.1 +%make_install + +%files +%doc CHANGELOG README +%license COPYING +%{_mandir}/*/* +%{_bindir}/archivemount + +%changelog +* Mon May 17 2021 Suresh Babu Chalamalasetty - 0.9.1-4 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- License verified + +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 20 2020 Niels de Vos - 0.9.1-1 +- Update to version 0.9.1 + +* Mon Apr 20 2020 Niels de Vos - 0.9.0-1 +- Update to version 0.9.0 (#1825602) + +* Tue Jan 28 2020 Fedora Release Engineering - 0.8.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 0.8.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 0.8.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 0.8.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Vasiliy N. Glazov - 0.8.12-2 +- Clean spec to match packaging guidelines + +* Sun Apr 1 2018 Niels de Vos - 0.8.12-1 +- Update to version 0.8.12 (#1560985) + +* Tue Mar 27 2018 Niels de Vos - 0.8.11-1 +- Update to version 0.8.11 (#1560985) + +* Fri Mar 16 2018 Niels de Vos - 0.8.10-1 +- Update to version 0.8.10 (#1557308) + +* Tue Mar 6 2018 Niels de Vos - 0.8.9-1 +- Update to version 0.8.9 (#1547963) + +* Wed Feb 07 2018 Fedora Release Engineering - 0.8.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0.8.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.8.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.8.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 0.8.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 24 2015 Niels de Vos - 0.8.7-1 +- Update to version 0.8.7 (#1284705) + +* Mon Nov 23 2015 Niels de Vos - 0.8.6-1 +- Update to version 0.8.6 (#1197053) + +* Wed Jun 17 2015 Fedora Release Engineering - 0.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 0.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Oct 24 2013 Niels de Vos - 0.8.3-1 +- Update to version 0.8.3 (#1022856) +- Drop upstreamed patches + +* Wed Oct 23 2013 Niels de Vos - 0.8.2-1 +- Update to version 0.8.2 (#1021347) + +* Sun Oct 13 2013 Niels de Vos - 0.8.1-2 +- Do not call fuse_main() to prevent a confusing error message (#1018587) + +* Mon Aug 19 2013 Niels de Vos - 0.8.1-1 +- Update to version 0.8.1 (#997779) + +* Sat Aug 03 2013 Fedora Release Engineering - 0.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 17 2013 Tomas Bzatek - 0.6.1-10 +- Rebuilt for new libarchive + +* Wed Jul 18 2012 Fedora Release Engineering - 0.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 26 2012 Tomas Bzatek - 0.6.1-8 +- Rebuilt for new libarchive + +* Sat Jan 07 2012 Niels de Vos - 0.6.1-7 +- Rebuild for new gcc-4.7 + +* Tue Nov 15 2011 Niels de Vos - 0.6.1-6 +- Rebuild for new libarchive + +* Mon Feb 07 2011 Fedora Release Engineering - 0.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Niels de Vos 0.6.1-4 +- fix the -debuginfo package as suggested by Tomas Mraz (BZ#598688 comment #12) + +* Fri Jan 14 2011 Niels de Vos 0.6.1-3 +- fix the -debuginfo package (BZ#598688 comment #10) + +* Mon Jan 10 2011 Niels de Vos 0.6.1-2 +- force running in single threaded mode (much more stable) +- fix some points from BZ #598688 comment #7 + +* Thu Jun 24 2010 Niels de Vos 0.6.1-1 +- upstream fixed licensing in the source to LGPL (v2 or newer) +- new source does not contain autom4te.cache anymore, no need to 'rm -rf' it + +* Tue Jun 15 2010 Niels de Vos 0.6.0-2 +- fix license to GNU Library General Public v2 or newer +- remove packaged autoconf/automake cache files + +* Tue Jun 01 2010 Niels de Vos 0.6.0-1 +- Initial package diff --git a/SPECS/fuse-zip/fuse-zip.signatures.json b/SPECS/fuse-zip/fuse-zip.signatures.json new file mode 100644 index 00000000000..98a42edc759 --- /dev/null +++ b/SPECS/fuse-zip/fuse-zip.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "fuse-zip-0.7.2.tar.gz": "3dd0be005677442f1fd9769a02dfc0b4fcdd39eb167e5697db2f14f4fee58915" + } +} diff --git a/SPECS/fuse-zip/fuse-zip.spec b/SPECS/fuse-zip/fuse-zip.spec new file mode 100644 index 00000000000..6acfa538769 --- /dev/null +++ b/SPECS/fuse-zip/fuse-zip.spec @@ -0,0 +1,210 @@ +Name: fuse-zip +Version: 0.7.2 +Release: 2%{?dist} +Summary: Filesystem to navigate, extract, create and modify ZIP archives +Vendor: Microsoft Corporation +Distribution: Mariner +License: GPLv3+ +URL: https://bitbucket.org/agalanin/fuse-zip/ +Source0: https://bitbucket.org/agalanin/fuse-zip/downloads/%{name}-%{version}.tar.gz + +BuildRequires: libstdc++ +BuildRequires: libstdc++-devel +BuildRequires: libzip-devel +BuildRequires: fuse-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: make +Requires: fuse + +%description +fuse-zip is a FUSE file system to navigate, extract, create and modify +ZIP archives based in libzip implemented in C++. + +With fuse-zip you really can work with ZIP archives as real directories. +Unlike KIO or Gnome VFS, it can be used in any application without +modifications. + +Unlike other FUSE filesystems, only fuse-zip provides write support +to ZIP archives. Also, fuse-zip is faster that all known implementations +on large archives with many files. + +%prep +%autosetup -p1 + +sed -i '/CXXFLAGS=.*/d' lib/Makefile +sed -i '/CXXFLAGS=.*/d' Makefile +sed -i "s|prefix=/usr/local|prefix=%{_prefix}|" Makefile + +%build +%set_build_flags +%make_build + +%install +%make_install + +%files +%doc README.md changelog +%license LICENSE +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1.gz +%{_docdir}/fuse-zip + +%changelog +* Mon May 17 2021 Suresh Babu Chalamalasetty - 0.7.2-2 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- License verified + +* Mon Feb 22 2021 Vasiliy Glazov - 0.7.2-1 +- Update to 0.7.2 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 21 2020 Vasiliy Glazov - 0.7.1-1 +- Update to 0.7.1 + +* Tue Jan 28 2020 Fedora Release Engineering - 0.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Sep 25 2019 Vasiliy N. Glazov - 0.7.0-1 +- Update to 0.7.0 + +* Tue Aug 06 2019 Vasiliy N. Glazov - 0.6.2-1 +- Update to 0.6.2 + +* Mon Jul 29 2019 Vasiliy N. Glazov - 0.6.1-1 +- Update to 0.6.1 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 20 2019 Vasiliy N. Glazov - 0.6.0-1 +- Update to 0.6.0 + +* Thu Jan 31 2019 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 25 2018 Vasiliy N. Glazov - 0.5.0-1 +- Update to 0.5.0 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Feb 05 2018 Vasiliy N. Glazov - 0.4.5-1 +- Update to 0.4.5 + +* Thu Dec 07 2017 Vasiliy N. Glazov - 0.4.4-1 +- Update to 0.4.4 + +* Wed Aug 02 2017 Fedora Release Engineering - 0.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 28 2017 Remi Collet - 0.4.2-3 +- rebuild for new libzip + +* Fri Feb 10 2017 Fedora Release Engineering - 0.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Mar 15 2016 Vasiliy N. Glazov - 0.4.2-1 +- Update to 0.4.2 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jul 29 2015 Vasiliy N. Glazov - 0.4.1-1 +- Update to 0.4.1 +- Update makefile patch + +* Wed Jun 17 2015 Fedora Release Engineering - 0.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 06 2015 Remi Collet - 0.4.0-4 +- rebuild for new libzip +- honour fedora build flags and fix FTBFS + +* Sat Aug 16 2014 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Mar 05 2014 Vasiliy N. Glazov - 0.4.0-1 +- Update to 0.4.0 +- Drop fuse-zip-libzip010.patch + +* Wed Aug 21 2013 Remi Collet - 0.2.12-9 +- rebuild for new libzip + +* Thu Aug 08 2013 Vasiliy N. Glazov - 0.2.12-8 +- Clean spec +- Correct build flags +- Added russian description + +* Sat Aug 03 2013 Fedora Release Engineering - 0.2.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.2.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0.2.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Feb 04 2012 Remi Collet - 0.2.12-4 +- rebuild for new libzip +- add patch for new callback prototype (fix #787370) + +* Fri Jan 13 2012 Fedora Release Engineering - 0.2.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue May 04 2010 Rakesh Pandit - 0.2.12-1 +- Updated to 0.2.12 + +* Sat Jan 30 2010 Rakesh Pandit - 0.2.11-1 +- Updated to 0.2.11 + +* Fri Dec 04 2009 Rakesh Pandit - 0.2.8-1 +- Updated to 0.2.8 + +* Thu Sep 17 2009 Peter Lemenkov - 0.2.7-4 +- Rebuilt with new fuse + +* Fri Jul 24 2009 Fedora Release Engineering - 0.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 0.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 29 2008 Rakesh Pandit 0.2.7-1 +- Upgraded to 0.2.7 + +* Mon Dec 29 2008 Rakesh Pandit 0.2.6-6 +- fixed man page spelling mistake + +* Sun Dec 07 2008 Rakesh Pandit 0.2.6-5 +- fixed debug info package + +* Sat Nov 08 2008 Rakesh Pandit 0.2.6-4 +- removed INSTALL file from package - not useful + +* Fri Nov 07 2008 Rakesh Pandit 0.2.6-3 +- fix flag, save timestamp and clean %%install + +* Tue Nov 04 2008 Rakesh Pandit 0.2.6-2 +- Makefile patch by Debarshi Ray , fix debuginfo + +* Tue Nov 04 2008 Rakesh Pandit 0.2.6-1 +- initial package + diff --git a/SPECS/libzip/libzip.signatures.json b/SPECS/libzip/libzip.signatures.json new file mode 100644 index 00000000000..420c46fbaea --- /dev/null +++ b/SPECS/libzip/libzip.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "libzip-1.7.3.tar.xz": "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132" + } +} diff --git a/SPECS/libzip/libzip.spec b/SPECS/libzip/libzip.spec new file mode 100644 index 00000000000..443296cc47e --- /dev/null +++ b/SPECS/libzip/libzip.spec @@ -0,0 +1,355 @@ +Name: libzip +Version: 1.7.3 +Release: 5%{?dist} +Summary: C library for reading, creating, and modifying zip archives +Vendor: Microsoft Corporation +Distribution: Mariner +License: BSD +URL: https://libzip.org/ +Source0: https://libzip.org/download/libzip-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel +BuildRequires: xz-devel +BuildRequires: cmake >= 3.0.2 +# Needed to run the test suite +# find regress/ -type f | /usr/lib/rpm/perl.req +# find regress/ -type f | /usr/lib/rpm/perl.prov +%if %{with_check} +BuildRequires: perl +BuildRequires: perl(Cwd) +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Path) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(Storable) +BuildRequires: perl(Symbol) +BuildRequires: perl(UNIVERSAL) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +%endif + +%description +libzip is a C library for reading, creating, and modifying zip archives. Files +can be added from data buffers, files, or compressed data copied directly from +other zip archives. Changes made without closing the archive can be reverted. +The API is documented by man pages. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package tools +Summary: Command line tools from %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tools +The %{name}-tools package provides command line tools split off %{name}: +- zipcmp +- zipmerge +- ziptool + + +%prep +%autosetup -p1 + +# unwanted in package documentation +rm INSTALL.md + +%build +%cmake \ + -DENABLE_COMMONCRYPTO:BOOL=OFF \ + -DENABLE_GNUTLS:BOOL=OFF \ + -DENABLE_MBEDTLS:BOOL=OFF \ + -DENABLE_OPENSSL:BOOL=ON \ + -DENABLE_WINDOWS_CRYPTO:BOOL=OFF \ + -DENABLE_BZIP2:BOOL=ON \ + -DENABLE_LZMA:BOOL=ON \ + -DBUILD_TOOLS:BOOL=ON \ + -DBUILD_REGRESS:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_DOC:BOOL=ON \ + . + +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} INSTALL='install -p' + +%check +make check + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%license LICENSE +%{_libdir}/libzip.so.5* +%{_docdir}/libzip +%{_libdir}/cmake/libzip + +%files tools +%{_bindir}/zipcmp +%{_bindir}/zipmerge +%{_bindir}/ziptool + +%files devel +%doc AUTHORS THANKS *.md +%{_includedir}/zip.h +%{_includedir}/zipconf*.h +%{_libdir}/libzip.so +%{_libdir}/pkgconfig/libzip.pc + + +%changelog +* Mon May 17 2021 Suresh Babu Chalamalasetty - 1.7.3-5 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- License verified + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Rex Dieter - 1.7.3-2 +- use %%cmake_build, %%cmake_install, %ctest + +* Wed Jul 15 2020 Remi Collet - 1.7.3-1 +- update to 1.7.3 +- drop patch merged upstream + +* Mon Jul 13 2020 Remi Collet - 1.7.2-1 +- update to 1.7.2 +- fix installation layout using merged patch from + https://github.com/nih-at/libzip/pull/190 + +* Mon Jun 15 2020 Remi Collet - 1.7.1-1 +- update to 1.7.1 + +* Fri Jun 5 2020 Remi Collet - 1.7.0-1 +- update to 1.7.0 +- patch zipconf.h to re-add missing LIBZIP_VERSION_* macros + +* Mon Feb 3 2020 Remi Collet - 1.6.1-1 +- update to 1.6.1 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 24 2020 Remi Collet - 1.6.0-1 +- update to 1.6.0 +- enable lzma support + +* Thu Jul 25 2019 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 12 2019 Remi Collet - 1.5.2-1 +- update to 1.5.2 +- add all explicit cmake options to ensure openssl is used + even in local build with other lilbraries available + +* Fri Feb 01 2019 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Apr 11 2018 Remi Collet - 1.5.1-1 +- update to 1.5.1 +- drop dependency on zlib-devel and bzip2-devel no more + referenced in libzip.pc +- drop rpath patch merged upstream + +* Thu Mar 15 2018 Remi Collet - 1.5.0-2 +- add dependency on zlib-devel and bzip2-devel #1556068 + +* Mon Mar 12 2018 Remi Collet - 1.5.0-1 +- update to 1.5.0 +- use openssl for cryptography instead of bundled custom AES implementation + +* Tue Feb 20 2018 Remi Collet - 1.4.0-5 +- missing BR on C compiler +- use ldconfig_scriptlets + +* Wed Feb 07 2018 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 5 2018 Remi Collet - 1.4.0-3 +- add upstream patch and drop multilib hack + +* Tue Jan 2 2018 Remi Collet - 1.4.0-2 +- re-add multilib hack #1529886 + +* Sat Dec 30 2017 Remi Collet - 1.4.0-1 +- update to 1.4.0 +- switch to cmake +- add upstream patch for lib64 + +* Mon Nov 20 2017 Remi Collet - 1.3.2-1 +- update to 1.3.2 +- drop multilib header hack +- change URL to https://libzip.org/ +- test suite now ok on all arch + +* Wed Sep 06 2017 Pavel Raiskup - 1.3.0-2 +- use multilib-rpm-config for multilib hacks + +* Mon Sep 4 2017 Remi Collet - 1.3.0-1 +- update to 1.3.0 +- add dependency on bzip2 library +- ignore 3 tests failing on 32-bit + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 28 2017 Remi Collet - 1.2.0-1 +- update to 1.2.0 +- soname bump to 5 + +* Tue Feb 28 2017 Remi Collet - 1.2.0-0 +- update to 1.2.0 +- soname bump to 5 +- temporarily keep libzip.so.4 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat May 28 2016 Remi Collet - 1.1.3-1 +- update to 1.1.3 + +* Sat Feb 20 2016 Remi Collet - 1.1.2-1 +- update to 1.1.2 +- add BR on perl(Getopt::Long) + +* Sat Feb 13 2016 Remi Collet - 1.1.1-1 +- update to 1.1.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Remi Collet - 1.1-1 +- update to 1.1 +- new ziptool command +- add fix for undefined optopt in ziptool.c (upstream) + +* Fri Dec 4 2015 Remi Collet - 1.0.1-3 +- fix libzip-tools summary #1288424 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 5 2015 Remi Collet - 1.0.1-1 +- update to 1.0.1 +- soname bump from .2 to .4 +- drop ziptorrent +- create "tools" sub package + +* Mon Mar 23 2015 Rex Dieter 0.11.2-5 +- actually apply patch (using %%autosetup) + +* Mon Mar 23 2015 Rex Dieter 0.11.2-4 +- CVE-2015-2331: integer overflow when processing ZIP archives (#1204676,#1204677) + +* Sun Aug 17 2014 Fedora Release Engineering - 0.11.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Dec 19 2013 Remi Collet - 0.11.2-1 +- update to 0.11.2 +- run test during build + +* Thu Oct 24 2013 Remi Collet - 0.11.1-3 +- replace php patch with upstream one + +* Fri Aug 23 2013 Remi Collet - 0.11.1-2 +- include API-CHANGES and LICENSE in package doc + +* Wed Aug 21 2013 Remi Collet - 0.11.1-1 +- update to 0.11.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.10.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.10.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Oct 15 2012 Remi Collet - 0.10.1-5 +- fix typo in multiarch (#866171) + +* Wed Sep 05 2012 Rex Dieter 0.10.1-4 +- Warning about conflicting contexts for /usr/lib64/libzip/include/zipconf.h versus /usr/include/zipconf-64.h (#853954) + +* Thu Jul 19 2012 Fedora Release Engineering - 0.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 10 2012 Rex Dieter 0.10.1-2 +- spec cleanup, better multilib fix + +* Wed Mar 21 2012 Remi Collet - 0.10.1-1 +- update to 0.10.1 (security fix only) +- fixes for CVE-2012-1162 and CVE-2012-1163 + +* Sun Mar 04 2012 Remi Collet - 0.10-2 +- try to fix ARM issue (#799684) + +* Sat Feb 04 2012 Remi Collet - 0.10-1 +- update to 0.10 +- apply patch with changes from php bundled lib (thanks spot) +- handle multiarch headers (ex from MySQL) + +* Fri Jan 13 2012 Fedora Release Engineering - 0.9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Feb 04 2010 Kalev Lember - 0.9.3-2 +- Cleaned up pkgconfig deps which are now automatically handled by RPM. + +* Thu Feb 04 2010 Kalev Lember - 0.9.3-1 +- Updated to libzip 0.9.3 + +* Tue Aug 11 2009 Ville Skyttä - 0.9-4 +- Use bzipped upstream tarball. + +* Sat Jul 25 2009 Fedora Release Engineering - 0.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 12 2008 Rex Dieter 0.9-1 +- libzip-0.9 + +* Sat Feb 09 2008 Sebastian Vahl 0.8-5 +- rebuild for new gcc-4.3 + +* Fri Jan 11 2008 Rex Dieter 0.8-4 +- use better workaround for removing rpaths + +* Tue Nov 20 2007 Sebastian Vahl 0.8-3 +- require pkgconfig in devel subpkg +- move api description to devel subpkg +- keep timestamps in %%install +- avoid lib64 rpaths + +* Thu Nov 15 2007 Sebastian Vahl 0.8-2 +- Change License to BSD + +* Thu Nov 15 2007 Sebastian Vahl 0.8-1 +- Initial version for Fedora diff --git a/SPECS/nmap/nmap-unix_crash.patch b/SPECS/nmap/nmap-unix_crash.patch new file mode 100644 index 00000000000..feb8f7a9ca9 --- /dev/null +++ b/SPECS/nmap/nmap-unix_crash.patch @@ -0,0 +1,32 @@ +From f6b40614e4a8131394792d590965f8af3c635323 Mon Sep 17 00:00:00 2001 +From: nnposter +Date: Fri, 16 Oct 2020 02:54:52 +0000 +Subject: [PATCH] Fix a Unix domain socket crash. Fixes #2154 + +--- + CHANGELOG | 2 ++ + ncat/ncat_main.c | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c +index 8942d83cb9..2792a6ac24 100644 +--- a/ncat/ncat_main.c ++++ b/ncat/ncat_main.c +@@ -846,7 +846,7 @@ int main(int argc, char *argv[]) + targetaddrs->addr.un.sun_family = AF_UNIX; + strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path)); + targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un); +- o.target = argv[optind]; ++ o.sslservername = o.target = argv[optind]; + optind++; + } else + #endif +@@ -865,7 +865,7 @@ int main(int argc, char *argv[]) + targetaddrs->addr.vm.svm_cid = long_cid; + + targetaddrs->addrlen = sizeof(targetaddrs->addr.vm); +- o.target = argv[optind]; ++ o.sslservername = o.target = argv[optind]; + optind++; + } + } else diff --git a/SPECS/nmap/nmap.spec b/SPECS/nmap/nmap.spec index b2bc2520743..6bfb678477d 100644 --- a/SPECS/nmap/nmap.spec +++ b/SPECS/nmap/nmap.spec @@ -1,13 +1,15 @@ Summary: Nmap Network Mapper Name: nmap Version: 7.90 -Release: 1%{?dist} +Release: 2%{?dist} License: Nmap Vendor: Microsoft Corporation Distribution: Mariner Group: Applications/System URL: https://nmap.org/ Source0: https://nmap.org/dist/%{name}-%{version}.tar.bz2 +## https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323.patch +Patch0: nmap-unix_crash.patch BuildRequires: binutils BuildRequires: gcc BuildRequires: kernel-headers @@ -57,6 +59,9 @@ ln -s ncat %{buildroot}%{_bindir}/nc %{_bindir}/nc %changelog +* Mon May 17 2021 Suresh Babu Chalamalasetty 7.90-2 +- nmap-unix_crash.patch fix for crash with unix sockets. + * Tue Feb 02 2021 Henry Beberman 7.90-1 - Add nmap spec - License verified diff --git a/SPECS/p7zip/0001-fix-data-null-pointer.patch b/SPECS/p7zip/0001-fix-data-null-pointer.patch new file mode 100644 index 00000000000..9c71025e541 --- /dev/null +++ b/SPECS/p7zip/0001-fix-data-null-pointer.patch @@ -0,0 +1,14 @@ +diff --git a/CPP/7zip/Archive/LzhHandler.cpp b/CPP/7zip/Archive/LzhHandler.cpp +index 21631f7..1f14621 100644 +--- a/CPP/7zip/Archive/LzhHandler.cpp ++++ b/CPP/7zip/Archive/LzhHandler.cpp +@@ -163,7 +163,8 @@ struct CItem + return false; + } + const Byte *data = (const Byte *)(Extensions[index].Data); +- value = GetUi32(data); ++ if (!data) value = 0; ++ else value = GetUi32(data); + return true; + } + diff --git a/SPECS/p7zip/0001-fix-out-of-mem.patch b/SPECS/p7zip/0001-fix-out-of-mem.patch new file mode 100644 index 00000000000..e1b7cba0651 --- /dev/null +++ b/SPECS/p7zip/0001-fix-out-of-mem.patch @@ -0,0 +1,26 @@ +diff --git a/C/Alloc.c b/C/Alloc.c +index 2706ec0..3178e7a 100644 +--- a/C/Alloc.c ++++ b/C/Alloc.c +@@ -58,12 +58,18 @@ void align_free(void * ptr) + #else + void *align_alloc(size_t size) + { +- return malloc(size); ++ void * p = malloc(size); ++ if(!p){ ++ printf("Out of memory: can't allocate %u bytes\n",size); ++ abort(); ++ } ++ return p; + } + + void align_free(void * ptr) + { +- free(ptr); ++ if(!ptr) return; ++ free(ptr); + } + + #endif + diff --git a/SPECS/p7zip/02-man.patch b/SPECS/p7zip/02-man.patch new file mode 100644 index 00000000000..909a44e7b27 --- /dev/null +++ b/SPECS/p7zip/02-man.patch @@ -0,0 +1,22 @@ +--- p7zip_16.02/man1/7z.1.orig 2018-02-04 03:47:31.934553305 +0000 ++++ p7zip_16.02/man1/7z.1 2018-02-04 03:54:22.504752021 +0000 +@@ -12,7 +12,7 @@ + .SH DESCRIPTION + 7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm + featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +-RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++RAR (it was removed due a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, + most filesystem images and DEB formats. + Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +--- p7zip_16.02/man1/7za.1.orig 2018-02-04 03:53:54.243463005 +0000 ++++ p7zip_16.02/man1/7za.1 2018-02-04 03:55:12.645264785 +0000 +@@ -12,7 +12,7 @@ + .SH DESCRIPTION + 7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm + featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +-RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++RAR (it was removed due a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, + most filesystem images and DEB formats. + Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP diff --git a/SPECS/p7zip/05-hardening-flags.patch b/SPECS/p7zip/05-hardening-flags.patch new file mode 100644 index 00000000000..aa42431970f --- /dev/null +++ b/SPECS/p7zip/05-hardening-flags.patch @@ -0,0 +1,33 @@ +From: Robert Luberda +Date: Fri, 22 Jan 2016 00:53:09 +0100 +Subject: Hardening flags + +Add support for $(CPPFLAGS) and do not override $(CXXFLAGS) +and $(CFLAGS) + +Bug-Debian: https://bugs.debian.org/#682167 +--- + makefile.glb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/makefile.glb b/makefile.glb +index fb001d5..e10ae03 100644 +--- a/makefile.glb ++++ b/makefile.glb +@@ -1,14 +1,14 @@ + + RM=rm -f + +-CFLAGS=-c -I. \ ++CFLAGS+=$(CPPFLAGS) -c -I. \ + -I../../../../C \ + -I../../../../CPP/myWindows \ + -I../../../../CPP/include_windows \ + -I../../../../CPP \ + $(ALLFLAGS) $(ALLFLAGS_C) + +-CXXFLAGS=-c -I. \ ++CXXFLAGS+=$(CPPFLAGS) -c -I. \ + -I../../../../C \ + -I../../../../CPP/myWindows \ + -I../../../../CPP/include_windows \ diff --git a/SPECS/p7zip/14-Fix-g++-warning.patch b/SPECS/p7zip/14-Fix-g++-warning.patch new file mode 100644 index 00000000000..226e239ee99 --- /dev/null +++ b/SPECS/p7zip/14-Fix-g++-warning.patch @@ -0,0 +1,24 @@ +From: Robert Luberda +Date: Sun, 28 Jan 2018 22:19:13 +0100 +Subject: Fix g++ warning + +Fix for "use of an operand of type 'bool' in 'operator++' +is deprecated [-Wdeprecated]" warning taken from 7zip 18.00.beta +package. +--- + CPP/7zip/Archive/Wim/WimHandler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp +index 27d3298..4ff5cfe 100644 +--- a/CPP/7zip/Archive/Wim/WimHandler.cpp ++++ b/CPP/7zip/Archive/Wim/WimHandler.cpp +@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value) + + AString res; + +- bool numMethods = 0; ++ unsigned numMethods = 0; + for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) + { + if (methodMask & ((UInt32)1 << i)) diff --git a/SPECS/p7zip/CVE-2016-9296.patch b/SPECS/p7zip/CVE-2016-9296.patch new file mode 100644 index 00000000000..773f92a46e0 --- /dev/null +++ b/SPECS/p7zip/CVE-2016-9296.patch @@ -0,0 +1,12 @@ +--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig 2016-11-21 01:42:29.460901230 +0000 ++++ ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +0000 +@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS + if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) + ThrowIncorrect(); + } +- HeadersSize += folders.PackPositions[folders.NumPackStreams]; ++ if (folders.PackPositions) ++ HeadersSize += folders.PackPositions[folders.NumPackStreams]; + return S_OK; + } + diff --git a/SPECS/p7zip/CVE-2017-17969.patch b/SPECS/p7zip/CVE-2017-17969.patch new file mode 100644 index 00000000000..ebc0ac93ef8 --- /dev/null +++ b/SPECS/p7zip/CVE-2017-17969.patch @@ -0,0 +1,26 @@ +From 79bca880ce7bcf07216c45f93afea545e0344418 Mon Sep 17 00:00:00 2001 +From: aone +Date: Mon, 5 Feb 2018 13:01:09 +0100 +Subject: [PATCH] Security fix CVE-2017-17969 + +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp +index 80b7e67..5bb0559 100644 +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; diff --git a/SPECS/p7zip/gcc10-conversion.patch b/SPECS/p7zip/gcc10-conversion.patch new file mode 100644 index 00000000000..45f9f84af4e --- /dev/null +++ b/SPECS/p7zip/gcc10-conversion.patch @@ -0,0 +1,26 @@ +diff -Nrup a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp +--- a/CPP/Windows/ErrorMsg.cpp 2015-01-18 11:20:28.000000000 -0700 ++++ b/CPP/Windows/ErrorMsg.cpp 2019-09-24 13:01:18.887289152 -0600 +@@ -14,14 +14,14 @@ UString MyFormatMessage(DWORD errorCode) + AString msg; + + switch(errorCode) { +- case ERROR_NO_MORE_FILES : txt = "No more files"; break ; +- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; +- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +- case E_ABORT : txt = "E_ABORT"; break ; +- case E_FAIL : txt = "E_FAIL"; break ; +- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; +- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; +- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; ++ case unsigned (ERROR_NO_MORE_FILES) : txt = "No more files"; break ; ++ case unsigned (E_NOTIMPL) : txt = "E_NOTIMPL"; break ; ++ case unsigned (E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ; ++ case unsigned (E_ABORT) : txt = "E_ABORT"; break ; ++ case unsigned (E_FAIL) : txt = "E_FAIL"; break ; ++ case unsigned (STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ; ++ case unsigned (E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ; ++ case unsigned (E_INVALIDARG) : txt = "E_INVALIDARG"; break ; + case ERROR_DIRECTORY : txt = "Error Directory"; break ; + default: + txt = strerror(errorCode); diff --git a/SPECS/p7zip/p7zip-manpages.patch b/SPECS/p7zip/p7zip-manpages.patch new file mode 100644 index 00000000000..8dc4df4affb --- /dev/null +++ b/SPECS/p7zip/p7zip-manpages.patch @@ -0,0 +1,899 @@ +Join of 02-man.patch, 09-man-update.patch and 10-drop-fm-doc.patch from Debian +diff -rup p7zip_16.02.orig/DOC/MANUAL/cmdline/index.htm p7zip_16.02/DOC/MANUAL/cmdline/index.htm +--- p7zip_16.02.orig/DOC/MANUAL/cmdline/index.htm 2016-05-10 10:50:08.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/cmdline/index.htm 2018-02-04 03:32:41.200460969 +0000 +@@ -11,12 +11,12 @@ +

Command Line Version User's Guide

+ + +-

7z.exe is the command line version of 7-Zip. 7z.exe uses 7z.dll +-from the 7-Zip package. 7z.dll is used by the 7-Zip File Manager also. ++

7z is the command line version of 7-Zip. 7z uses 7z.so ++from the 7-Zip package. + +-

7za.exe (a = alone) is a standalone version of 7-Zip. +-7za.exe supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. +-7za.exe doesn't use external modules. ++

7za (a = alone) is a standalone version of 7-Zip. ++7za supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. ++7za doesn't use external modules. + +

    +
  • Command Line syntax
    • +diff -rup p7zip_16.02.orig/DOC/MANUAL/cmdline/switches/sfx.htm p7zip_16.02/DOC/MANUAL/cmdline/switches/sfx.htm +--- p7zip_16.02.orig/DOC/MANUAL/cmdline/switches/sfx.htm 2016-05-10 10:50:08.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/cmdline/switches/sfx.htm 2018-02-04 03:32:41.200460969 +0000 +@@ -22,7 +22,7 @@ +
    {SFX_Module}
    +
    +

    Specifies the SFX module that will be combined with the archive. +- This module must be placed in the same directory as the 7z.exe. ++ This module must be placed in the same directory as the 7z. + If {SFX_Module} is not assigned, 7-Zip will use standard console + SFX module 7zCon.sfx.

    + +diff -rup p7zip_16.02.orig/DOC/MANUAL/general/index.htm p7zip_16.02/DOC/MANUAL/general/index.htm +--- p7zip_16.02.orig/DOC/MANUAL/general/index.htm 2016-05-10 10:50:08.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/general/index.htm 2018-02-04 03:32:41.200460969 +0000 +@@ -13,7 +13,6 @@ +

    The main features of 7-Zip

    + +
      +-
    • Powerful file manager
      • +
    • High compression ratio and high speed
      • +
    • Big number of supported archive formats
      • +
    • Additional command line version
      • +@@ -21,7 +20,7 @@ + +

      See Also

      + + + +diff -rup p7zip_16.02.orig/DOC/MANUAL/start.htm p7zip_16.02/DOC/MANUAL/start.htm +--- p7zip_16.02.orig/DOC/MANUAL/start.htm 2016-05-21 09:53:28.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/start.htm 2018-02-04 03:32:41.201460979 +0000 +@@ -17,7 +17,6 @@ + + + +@@ -25,7 +24,7 @@ + + + +
      +diff -rup p7zip_16.02.orig/man1/7z.1 p7zip_16.02/man1/7z.1 +--- p7zip_16.02.orig/man1/7z.1 2007-09-21 19:53:12.000000000 +0100 ++++ p7zip_16.02/man1/7z.1 2018-02-04 03:33:07.305726696 +0000 +@@ -1,97 +1,187 @@ +-.TH 7z 1 "September 1 2006" "Mohammed Adnene Trojette" ++.TH 7z 1 "March 6th, 2016" "7-Zip" + .SH NAME +-7z \- A file archiver with highest compression ratio ++7z \- A file archiver with high compression ratio format + .SH SYNOPSIS + .B 7z +-.BR [adeltux] +-.BR [\-] +-.BR [SWITCH] +-.BR +-.BR ... ++.B ++.RB [ "... ]" ++.B ++.RB [ "... ]" ++.RB [ <@listfiles> "... ]" + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-.TP +-7z uses plugins to handle archives. ++7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm ++featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, ++RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++most filesystem images and DEB formats. ++Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +-.SH FUNCTION LETTERS ++.B 7z ++uses plugins to handle archives, so it might be slightly slower than ++.BR 7za (1) ++but can handle more archive formats. ++.SH COMMANDS + .TP + .B a +-Add ++Add files to archive ++.TP ++.B b ++Benchmark + .TP + .B d +-Delete ++Delete files from archive + .TP + .B e +-Extract ++Extract files from archive (without using directory names) ++.TP ++.B h ++Calculate hash values for files ++.TP ++.B i ++Show information about supported formats + .TP + .B l +-List ++List contents of archive ++.TP ++.B rn ++Rename files in archive + .TP + .B t +-Test ++Test integrity of archive + .TP + .B u +-Update ++Update files to archive + .TP + .B x +-eXtract with full paths ++eXtract files with full paths + .PP + .SH SWITCHES + .TP +-.B \-ai[r[\-|0]]{@listfile|!wildcard} ++.B \-\- ++Stop switches parsing ++.TP ++.B \-ai[r[-|0]]{@listfile|!wildcard} + Include archives + .TP +-.B \-ax[r[\-|0]]{@listfile|!wildcard} +-eXclude archives ++.B \-ax[r[-|0]]{@listfile|!wildcard} ++Exclude archives ++.TP ++.B \-ao{a|s|t|u} ++Set Overwrite mode ++.TP ++.B \-an ++Disable archive_name field ++.TP ++.B -bb[0-3] ++Set output log level + .TP + .B \-bd +-Disable percentage indicator ++Disable progress indicator ++.TP ++.B \-bs{o|e|p}{0|1|2} ++Set output stream for output/error/progress line ++.TP ++.B \-bt ++Show execution time statistics + .TP + .B \-i[r[\-|0]]{@listfile|!wildcard} + Include filenames + .TP +-.B \-l +-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') +-.TP + .B \-m{Parameters} +-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods) +-.TP +-.B \-mhe=on|off +-7z format only : enables or disables archive header encryption (Default : off) ++Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP + .B \-o{Directory} + Set Output directory + .TP + .B \-p{Password} +-Set Password ++Set Password (NOTE: this flag does not work with 7zr) + .TP + .B \-r[\-|0] + Recurse subdirectories (CAUTION: this flag does not do what you think, avoid using it) + .TP ++.B \-sa{a|e|s} ++Set archive name mode ++.TP ++.B \-scc{UTF\-8|WIN|DOS} ++Set charset for for console input/output ++.TP ++.B \-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{id}} ++Set charset for list files ++.TP ++.B \-scrc[CRC32|CRC64|SHA1|SHA256|*] ++Set hash function for x, e, h commands ++.TP ++.B \-sdel ++Delete files after compression ++.TP ++.B \-seml[.] ++Send archive by email ++.TP + .B \-sfx[{name}] + Create SFX archive + .TP +-.B \-si +-Read data from StdIn (eg: tar cf \- directory | 7z a \-si directory.tar.7z) ++.B \-si[{name}] ++Read data from stdin (e.g. tar cf \- directory | 7z a \-si directory.tar.7z) + .TP +-.B \-so +-Write data to StdOut (eg: % echo foo | 7z a dummy \-tgzip \-si \-so > /dev/null) ++.B \-slp ++Set Large Pages mode + .TP + .B \-slt +-Sets technical mode for l (list) command ++Show technical information for l (List) command ++.TP ++.B \-snh ++Store hard links as links ++.TP ++.B \-snl ++Store symbolic links as links ++.TP ++.B \-sni ++Store NT security information ++.TP ++.B \-sns[\-] ++Store NTFS alternate streams ++.TP ++.B \-sfx[{name}] ++Create SFX archive ++.TP ++.B \-so ++Write data to stdout (e.g. 7z x \-so directory.tar.7z | tar xf \-) ++.TP ++.B \-spd ++Disable wildcard matching for file names ++.TP ++.B \-spe ++Eliminate duplication of root folder for extract command ++.TP ++.B \-spf ++Use fully qualified file paths ++.TP ++.B \-ssc[\-] ++Set sensitive case mode ++.TP ++.B \-ssw ++Compress shared files ++.TP ++.B \-stl ++Set archive timestamp from the most recently modified file ++.TP ++.B \-stm{HexMask} ++Set CPU thread affinity mask (hexadecimal number) ++.TP ++.B \-stx{Type} ++Exclude archive type + .TP + .B \-t{Type} +-Type of archive (7z, zip, gzip, bzip2 or tar. 7z format is default) ++Set type of archive ++.TP ++.B \-u[-][p#][q#][r#][x#][y#][z#][!newArchiveName] ++Update options + .TP + .B \-v{Size}[b|k|m|g] + Create volumes + .TP +-.B \-u[\-][p#][q#][r#][x#][y#][z#][!newArchiveName] +-Update options +-.TP + .B \-w[path] +-Set Working directory ++Set working directory. Empty path means a temporary directory + .TP + .B \-x[r[\-|0]]]{@listfile|!wildcard} + Exclude filenames +@@ -105,7 +195,8 @@ Assume Yes on all queries + .IP 0 + Normal (no errors or warnings detected) + .IP 1 +-Warning (Non fatal error(s)). For example, some files cannot be read during compressing. So they were not compressed ++Warning (Non fatal error(s)). For example, some files cannot be read during compressing, ++so they were not compressed + .IP 2 + Fatal error + .IP 7 +@@ -120,13 +211,13 @@ DO NOT USE the 7-zip format for backup p + + .LP + On Linux/Unix, in order to backup directories you must use tar : +- \- to backup a directory : tar cf \- directory | 7za a \-si directory.tar.7z +- \- to restore your backup : 7za x \-so directory.tar.7z | tar xf \- ++ \- to backup a directory : tar cf \- directory | 7z a \-si directory.tar.7z ++ \- to restore your backup : 7z x \-so directory.tar.7z | tar xf \- + + If you want to send files and directories (not the owner of file) + to others Unix/MacOS/Windows users, you can use the 7-zip format. + +- example : 7za a directory.7z directory ++ example : 7z a directory.7z directory + + .LP + Do not use "\-r" because this flag does not do what you think. +@@ -165,10 +256,15 @@ add all files from directory "dir1" to S + 7z a \-mhe=on \-pmy_password archive.7z a_directory + add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) + .SH "SEE ALSO" +-7za(1), 7zr(1), bzip2(1), gzip(1), zip(1) ++.BR 7zr (1), ++.BR 7za (1), ++.BR p7zip (1), ++.BR bzip2 (1), ++.BR gzip (1), ++.BR zip(1), + .PP + .SH "HTML Documentation" +-{DEST_SHARE_DOC}/MANUAL/index.htm ++/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm + .SH AUTHOR + .TP +-Written for Debian by Mohammed Adnene Trojette. ++Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. +diff -rup p7zip_16.02.orig/man1/7za.1 p7zip_16.02/man1/7za.1 +--- p7zip_16.02.orig/man1/7za.1 2007-09-21 19:53:24.000000000 +0100 ++++ p7zip_16.02/man1/7za.1 2018-02-04 03:33:07.305726696 +0000 +@@ -1,99 +1,190 @@ +-.TH 7za 1 "September 1 2006" "Mohammed Adnene Trojette" ++.TH 7za 1 "March 6th, 2016" "7-Zip" + .SH NAME +-7za \- A file archiver with highest compression ratio ++7za \- A file archiver with high compression ratio format + .SH SYNOPSIS + .B 7za +-.BR [adeltux] +-.BR [-] +-.BR [SWITCH] +-.BR +-.BR ... ++.B ++.RB [ "... ]" ++.B ++.RB [ "... ]" ++.RB [ <@listfiles> "... ]" + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-.TP +-7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others. ++7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm ++featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, ++RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++most filesystem images and DEB formats. ++Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +-.SH FUNCTION LETTERS ++.B 7za ++is a stand-alone executable. ++.B 7za ++handles fewer archive formats than ++.BR 7z (1). ++.SH COMMANDS + .TP + .B a +-Add ++Add files to archive ++.TP ++.B b ++Benchmark + .TP + .B d +-Delete ++Delete files from archive + .TP + .B e +-Extract ++Extract files from archive (without using directory names) ++.TP ++.B h ++Calculate hash values for files ++.TP ++.B i ++Show information about supported formats + .TP + .B l +-List ++List contents of archive ++.TP ++.B rn ++Rename files in archive + .TP + .B t +-Test ++Test integrity of archive + .TP + .B u +-Update ++Update files to archive + .TP + .B x +-eXtract with full paths ++eXtract files with full paths + .PP + .SH SWITCHES + .TP ++.B \-\- ++Stop switches parsing ++.TP + .B \-ai[r[-|0]]{@listfile|!wildcard} + Include archives + .TP + .B \-ax[r[-|0]]{@listfile|!wildcard} +-eXclude archives ++Exclude archives ++.TP ++.B \-ao{a|s|t|u} ++Set Overwrite mode ++.TP ++.B \-an ++Disable archive_name field ++.TP ++.B -bb[0-3] ++Set output log level + .TP + .B \-bd +-Disable percentage indicator ++Disable progress indicator + .TP +-.B \-i[r[-|0]]{@listfile|!wildcard} +-Include filenames ++.B \-bs{o|e|p}{0|1|2} ++Set output stream for output/error/progress line + .TP +-.B \-l +-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') ++.B \-bt ++Show execution time statistics + .TP +-.B \-m{Parameters} +-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods) ++.B \-i[r[\-|0]]{@listfile|!wildcard} ++Include filenames + .TP +-.B \-mhe=on|off +-7z format only : enables or disables archive header encryption (Default : off) ++.B \-m{Parameters} ++Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP + .B \-o{Directory} + Set Output directory + .TP + .B \-p{Password} +-Set Password ++Set Password (NOTE: this flag does not work with 7zr) + .TP +-.B \-r[-|0] ++.B \-r[\-|0] + Recurse subdirectories (CAUTION: this flag does not do what you think, avoid using it) + .TP ++.B \-sa{a|e|s} ++Set archive name mode ++.TP ++.B \-scc{UTF\-8|WIN|DOS} ++Set charset for for console input/output ++.TP ++.B \-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{id}} ++Set charset for list files ++.TP ++.B \-scrc[CRC32|CRC64|SHA1|SHA256|*] ++Set hash function for x, e, h commands ++.TP ++.B \-sdel ++Delete files after compression ++.TP ++.B \-seml[.] ++Send archive by email ++.TP + .B \-sfx[{name}] + Create SFX archive + .TP +-.B \-si +-Read data from StdIn (eg: tar cf \- directory | 7za a \-si directory.tar.7z) ++.B \-si[{name}] ++Read data from stdin (e.g. tar cf \- directory | 7za a \-si directory.tar.7z) + .TP +-.B \-so +-Write data to StdOut (eg: % echo foo | 7z a dummy \-tgzip \-si \-so > /dev/null) ++.B \-slp ++Set Large Pages mode + .TP + .B \-slt +-Sets technical mode for l (list) command ++Show technical information for l (List) command + .TP +-.B \-t{Type} +-Type of archive (7z, zip, gzip, bzip2 or tar. 7z format is default) ++.B \-snh ++Store hard links as links + .TP +-.B \-v{Size}[b|k|m|g] +-Create volumes ++.B \-snl ++Store symbolic links as links ++.TP ++.B \-sni ++Store NT security information ++.TP ++.B \-sns[\-] ++Store NTFS alternate streams ++.TP ++.B \-sfx[{name}] ++Create SFX archive ++.TP ++.B \-so ++Write data to stdout (e.g. 7za x \-so directory.tar.7z | tar xf \-) ++.TP ++.B \-spd ++Disable wildcard matching for file names ++.TP ++.B \-spe ++Eliminate duplication of root folder for extract command ++.TP ++.B \-spf ++Use fully qualified file paths ++.TP ++.B \-ssc[\-] ++Set sensitive case mode ++.TP ++.B \-ssw ++Compress shared files ++.TP ++.B \-stl ++Set archive timestamp from the most recently modified file ++.TP ++.B \-stm{HexMask} ++Set CPU thread affinity mask (hexadecimal number) ++.TP ++.B \-stx{Type} ++Exclude archive type ++.TP ++.B \-t{Type} ++Set type of archive + .TP + .B \-u[-][p#][q#][r#][x#][y#][z#][!newArchiveName] + Update options + .TP ++.B \-v{Size}[b|k|m|g] ++Create volumes ++.TP + .B \-w[path] +-Set Working directory ++Set working directory. Empty path means a temporary directory + .TP +-.B \-x[r[-|0]]]{@listfile|!wildcard} ++.B \-x[r[\-|0]]]{@listfile|!wildcard} + Exclude filenames + .TP + .B \-y +@@ -105,7 +196,8 @@ Assume Yes on all queries + .IP 0 + Normal (no errors or warnings detected) + .IP 1 +-Warning (Non fatal error(s)). For example, some files cannot be read during compressing. So they were not compressed ++Warning (Non fatal error(s)). For example, some files cannot be read during compressing, ++so they were not compressed + .IP 2 + Fatal error + .IP 7 +@@ -165,10 +257,15 @@ add all files from directory "dir1" to S + 7za a \-mhe=on \-pmy_password archive.7z a_directory + add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) + .SH "SEE ALSO" +-7z(1), 7zr(1), bzip2(1), gzip(1), zip(1) ++.BR 7zr (1), ++.BR 7z (1), ++.BR p7zip (1), ++.BR bzip2 (1), ++.BR gzip (1), ++.BR zip(1), + .PP + .SH "HTML Documentation" +-{DEST_SHARE_DOC}/MANUAL/index.htm ++/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm + .SH AUTHOR + .TP +-Written for Debian by Mohammed Adnene Trojette. ++Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. +diff -rup p7zip_16.02.orig/man1/7zr.1 p7zip_16.02/man1/7zr.1 +--- p7zip_16.02.orig/man1/7zr.1 2007-09-21 19:53:34.000000000 +0100 ++++ p7zip_16.02/man1/7zr.1 2018-02-04 03:33:07.305726696 +0000 +@@ -1,99 +1,192 @@ +-.TH 7zr 1 "September 1 2006" "Mohammed Adnene Trojette" ++.TH 7zr 1 "March 6th, 2016" "7-Zip" + .SH NAME +-7zr \- A file archiver with highest compression ratio ++7zr \- A file archiver with high compression ratio format + .SH SYNOPSIS + .B 7zr +-.BR [adeltux] +-.BR [-] +-.BR [SWITCH] +-.BR +-.BR ... ++.B ++.RB [ "... ]" ++.B ++.RB [ "... ]" ++.RB [ <@listfiles> "... ]" + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-.TP +-7zr is a stand-alone executable. 7zr handles less archive formats than 7z, but does not need any others. 7zr is a "light-version" of 7za that only handles 7z archives. ++7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm ++featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, ++RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++most filesystem images and DEB formats. ++Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +-.SH FUNCTION LETTERS ++.B 7zr ++is a stand-alone executable. ++.B 7zr ++is a "light-version" of ++.BR 7za (1). ++.B 7zr ++handles password-less archives in the 7z, LZMA2, and XZ formats only. ++.SH COMMANDS + .TP + .B a +-Add ++Add files to archive ++.TP ++.B b ++Benchmark + .TP + .B d +-Delete ++Delete files from archive + .TP + .B e +-Extract ++Extract files from archive (without using directory names) ++.TP ++.B h ++Calculate hash values for files ++.TP ++.B i ++Show information about supported formats + .TP + .B l +-List ++List contents of archive ++.TP ++.B rn ++Rename files in archive + .TP + .B t +-Test ++Test integrity of archive + .TP + .B u +-Update ++Update files to archive + .TP + .B x +-eXtract with full paths ++eXtract files with full paths + .PP + .SH SWITCHES + .TP ++.B \-\- ++Stop switches parsing ++.TP + .B \-ai[r[-|0]]{@listfile|!wildcard} + Include archives + .TP + .B \-ax[r[-|0]]{@listfile|!wildcard} +-eXclude archives ++Exclude archives ++.TP ++.B \-ao{a|s|t|u} ++Set Overwrite mode ++.TP ++.B \-an ++Disable archive_name field ++.TP ++.B -bb[0-3] ++Set output log level + .TP + .B \-bd +-Disable percentage indicator ++Disable progress indicator + .TP +-.B \-i[r[-|0]]{@listfile|!wildcard} +-Include filenames ++.B \-bs{o|e|p}{0|1|2} ++Set output stream for output/error/progress line + .TP +-.B \-l +-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') ++.B \-bt ++Show execution time statistics + .TP +-.B \-m{Parameters} +-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods) ++.B \-i[r[\-|0]]{@listfile|!wildcard} ++Include filenames + .TP +-.B \-mhe=on|off +-7z format only : enables or disables archive header encryption (Default : off) ++.B \-m{Parameters} ++Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP + .B \-o{Directory} + Set Output directory + .TP +-.B \-p{Password} +-Set Password +-.TP +-.B \-r[-|0] ++.B \-r[\-|0] + Recurse subdirectories (CAUTION: this flag does not do what you think, avoid using it) + .TP ++.B \-sa{a|e|s} ++Set archive name mode ++.TP ++.B \-scc{UTF\-8|WIN|DOS} ++Set charset for for console input/output ++.TP ++.B \-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{id}} ++Set charset for list files ++.TP ++.B \-scrc[CRC32|CRC64|SHA1|SHA256|*] ++Set hash function for x, e, h commands ++.TP ++.B \-sdel ++Delete files after compression ++.TP ++.B \-seml[.] ++Send archive by email ++.TP + .B \-sfx[{name}] + Create SFX archive + .TP +-.B \-si +-Read data from StdIn (eg: tar cf \- directory | 7zr a \-si directory.tar.7z) ++.B \-si[{name}] ++Read data from stdin (e.g. tar cf \- directory | 7zr a \-si directory.tar.7z) + .TP +-.B \-so +-Write data to StdOut (eg: 7zr x \-so directory.tar.7z | tar xf \-) ++.B \-slp ++Set Large Pages mode + .TP + .B \-slt +-Sets technical mode for l (list) command ++Show technical information for l (List) command + .TP +-.B \-v{Size}[b|k|m|g] +-Create volumes ++.B \-snh ++Store hard links as links ++.TP ++.B \-snl ++Store symbolic links as links ++.TP ++.B \-sni ++Store NT security information ++.TP ++.B \-sns[\-] ++Store NTFS alternate streams ++.TP ++.B \-sfx[{name}] ++Create SFX archive ++.TP ++.B \-so ++Write data to stdout (e.g. 7zr x \-so directory.tar.7z | tar xf \-) ++.TP ++.B \-spd ++Disable wildcard matching for file names ++.TP ++.B \-spe ++Eliminate duplication of root folder for extract command ++.TP ++.B \-spf ++Use fully qualified file paths ++.TP ++.B \-ssc[\-] ++Set sensitive case mode ++.TP ++.B \-ssw ++Compress shared files ++.TP ++.B \-stl ++Set archive timestamp from the most recently modified file ++.TP ++.B \-stm{HexMask} ++Set CPU thread affinity mask (hexadecimal number) ++.TP ++.B \-stx{Type} ++Exclude archive type ++.TP ++.B \-t{Type} ++Set type of archive + .TP + .B \-u[-][p#][q#][r#][x#][y#][z#][!newArchiveName] + Update options + .TP ++.B \-v{Size}[b|k|m|g] ++Create volumes ++.TP + .B \-w[path] +-Set Working directory ++Set working directory. Empty path means a temporary directory + .TP +-.B \-x[r[-|0]]]{@listfile|!wildcard} ++.B \-x[r[\-|0]]]{@listfile|!wildcard} + Exclude filenames + .TP +-.B \-y ++.B \-y + Assume Yes on all queries + .PP + .SH DIAGNOSTICS +@@ -102,7 +195,8 @@ Assume Yes on all queries + .IP 0 + Normal (no errors or warnings detected) + .IP 1 +-Warning (Non fatal error(s)). For example, some files cannot be read during compressing. So they were not compressed ++Warning (Non fatal error(s)). For example, some files cannot be read during compressing, ++so they were not compressed + .IP 2 + Fatal error + .IP 7 +@@ -117,8 +211,8 @@ DO NOT USE the 7-zip format for backup p + + .LP + On Linux/Unix, in order to backup directories you must use tar : +- \- to backup a directory : tar cf - directory | 7zr a -si directory.tar.7z +- \- to restore your backup : 7zr x -so directory.tar.7z | tar xf - ++ \- to backup a directory : tar cf \- directory | 7zr a \-si directory.tar.7z ++ \- to restore your backup : 7zr x \-so directory.tar.7z | tar xf \- + + If you want to send files and directories (not the owner of file) + to others Unix/MacOS/Windows users, you can use the 7-zip format. +@@ -156,16 +250,16 @@ solid archive = on + .B + 7zr a \-sfx archive.exe dir1 + add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX archive MUST end with ".exe") +-.SH EXAMPLE 3 +-.TP +-.B +-7zr a \-mhe=on \-pmy_password archive.7z a_directory +-add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) + .SH "SEE ALSO" +-7z(1), 7za(1), bzip2(1), gzip(1), zip(1) ++.BR 7za (1), ++.BR 7z (1), ++.BR p7zip (1), ++.BR bzip2 (1), ++.BR gzip (1), ++.BR zip(1), + .PP + .SH "HTML Documentation" +-{DEST_SHARE_DOC}/MANUAL/index.htm ++/usr/share/doc/p7zip/DOC/MANUAL/start.htm (avabilable when the p7zip-full package is installed) + .SH AUTHOR + .TP +-Written for Debian by Mohammed Adnene Trojette. ++Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. diff --git a/SPECS/p7zip/p7zip.signatures.json b/SPECS/p7zip/p7zip.signatures.json new file mode 100644 index 00000000000..bea223ea446 --- /dev/null +++ b/SPECS/p7zip/p7zip.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "p7zip_16.02_src_all-norar.tar.bz2": "a79d439abddb3a59ba63a019a7bdc9c9513bcf712c2cc84679845643b17c29fd" + } +} diff --git a/SPECS/p7zip/p7zip.spec b/SPECS/p7zip/p7zip.spec new file mode 100644 index 00000000000..6d5a4fcad38 --- /dev/null +++ b/SPECS/p7zip/p7zip.spec @@ -0,0 +1,421 @@ +Summary: Very high compression ratio file archiver +Name: p7zip +Version: 16.02 +Release: 21%{?dist} +Vendor: Microsoft Corporation +Distribution: Mariner +# Files under C/Compress/Lzma/ are dual LGPL or CPL +License: LGPLv2 and (LGPLv2+ or CPL) +URL: http://p7zip.sourceforge.net/ +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://downloads.sf.net/p7zip/p7zip_%%{version}_src_all.tar.bz2 +# export VERSION=15.14.1 +# wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto,QMAKE}/Rar* +# rm p7zip_${VERSION}/DOC/unRarLicense.txt +# tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: https://src.fedoraproject.org/repo/pkgs/p7zip/p7zip_16.02_src_all-norar.tar.bz2/7202a0bd2aa2935576c13314783d5e1d/p7zip_%{version}_src_all-norar.tar.bz2 +Patch0: p7zip_15.14-norar_cmake.patch +# from Debain +Patch4: p7zip-manpages.patch +Patch5: 02-man.patch +Patch6: CVE-2016-9296.patch +Patch7: 05-hardening-flags.patch +Patch10: CVE-2017-17969.patch +Patch11: 14-Fix-g++-warning.patch +Patch12: gcc10-conversion.patch +Patch13: 0001-fix-data-null-pointer.patch +Patch14: 0001-fix-out-of-mem.patch + +BuildRequires: make +BuildRequires: gcc +BuildRequires: libstdc++ +BuildRequires: libstdc++-devel +BuildRequires: cmake +%ifarch %{ix86} +BuildRequires: nasm +%endif +%ifarch x86_64 +BuildRequires: yasm +%endif + +%description +p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high +compression ratio. The original version can be found at http://www.7-zip.org/. + + +%package plugins +Summary: Additional plugins for p7zip + +%description plugins +Additional plugins that can be used with 7z to extend its abilities. +This package contains also a virtual file system for Midnight Commander. + +%package doc +Summary: Manual documentation and contrib directory +BuildArch: noarch + +%description doc +This package contains the p7zip manual documentation and some code +contributions. + +%prep +%autosetup -p1 -n %{name}_%{version} + +# move license files +mv DOC/License.txt DOC/copying.txt . + +%build +pushd CPP/7zip/CMAKE/ +sh ./generate.sh +popd +%ifarch %{ix86} +cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine +%endif +%ifarch x86_64 +cp -f makefile.linux_amd64_asm makefile.machine +%endif +%ifarch ppc ppc64 +cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine +%endif + +%make_build all2 \ + OPTFLAGS="%{optflags}" \ + DEST_HOME=%{_prefix} \ + DEST_BIN=%{_bindir} \ + DEST_SHARE=%{_libexecdir}/p7zip \ + DEST_MAN=%{_mandir} + + +%install +make install \ + DEST_DIR=%{buildroot} \ + DEST_HOME=%{_prefix} \ + DEST_BIN=%{_bindir} \ + DEST_SHARE=%{_libexecdir}/p7zip \ + DEST_MAN=%{_mandir} + +# remove redundant DOC dir +mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip +rmdir %{buildroot}%{_docdir}/p7zip/DOC/ + +%check +make test + +%files +%{_docdir}/p7zip +%exclude %{_docdir}/p7zip/MANUAL +%license copying.txt License.txt +%{_bindir}/7za +%dir %{_libexecdir}/p7zip/ +%{_libexecdir}/p7zip/7za +%{_libexecdir}/p7zip/7zCon.sfx +%{_mandir}/man1/7za.1* +%exclude %{_mandir}/man1/7zr.1* + +%files plugins +%{_bindir}/7z +%dir %{_libexecdir}/p7zip/ +%{_libexecdir}/p7zip/7z +%{_libexecdir}/p7zip/7z.so +%{_mandir}/man1/7z.1* + +%files doc +%{_docdir}/p7zip/MANUAL +%doc contrib/ + +%changelog +* Mon May 17 2021 Suresh Babu Chalamalasetty - 16.02-21 +- Initial CBL-Mariner import from Fedora 34 (license: MIT) +- License verified + +* Thu Apr 22 2021 Sérgio Basto - 16.02-20 +- Fix two Null Pointer Dereferences, thanks to NSFOCUS Security Team + +* Tue Jan 26 2021 Fedora Release Engineering - 16.02-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 16.02-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 16.02-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Sep 24 2019 Sérgio Basto - 16.02-16 +- Add gcc10-conversion.patch provide by Red Hat's compiler team + +* Thu Jul 25 2019 Fedora Release Engineering - 16.02-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 16.02-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 16.02-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +- https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot + +* Mon Jul 09 2018 Scott Talbert - 16.02-12 +- Rebuild with wxWidgets 3.0 + +* Wed Mar 07 2018 Adam Williamson - 16.02-11 +- Rebuild to fix GCC 8 mis-compilation + See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") + +* Tue Feb 06 2018 Sérgio Basto - 16.02-10 +- Improve security patch + +* Sat Jan 27 2018 Sérgio Basto - 16.02-9 +- Security fix for CVE-2017-17969 (from Debian) +- Add 05-hardening-flags.patch, 09-man-update.patch, 10-drop-fm-doc.patch + and 14-Fix-g++-warning.patch patches from Debian, very small changes + better documentation, compile flags and compile warning. + +* Wed Jan 24 2018 Sérgio Basto - 16.02-8 +- Add sub-package doc + +* Wed Jan 24 2018 Tomas Hoger - 16.02-7 +- Add conditional for building with(out) GUI support. Keep GUI enabled for + Fedora and EPEL builds, but disabled for RHEL. +- Add missing dependency - 7zG requires 7z.so, so p7zip-gui needs to require + p7zip-plugins. + +* Sun Sep 10 2017 Vasiliy N. Glazov - 16.02-6 +- Cleanup spec + +* Thu Aug 03 2017 Fedora Release Engineering - 16.02-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 16.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 16.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Nov 21 2016 Sérgio Basto - 16.02-2 +- Security fix for CVE-2016-9296 + +* Mon Jul 18 2016 Sérgio Basto - 16.02-1 +- Update p7zip to 16.02 and fix security issues + +* Sun Mar 27 2016 Sérgio Basto - 15.14.1-1 +- Update to 15.14.1 +- Revert 7zFM build, upstream recomends not build it + http://sourceforge.net/p/p7zip/bugs/175/ + +* Thu Mar 17 2016 Sérgio Basto - 15.14-2 +- Fix non-executable-in-bin for p7zipForFilemanager. +- Remove p7zip_compress2.desktop to not duplicate the menu entries. +- Also build 7zFM, rebuild p7zip_15.14_src_all-norar.tar.bz2, to build 7zFM + instead 7zFM_do_not_use. + +* Tue Mar 15 2016 Sérgio Basto - 15.14-1 +- Update to 15.14 . +- Rebase norar_cmake.patch +- Minor improvement in snippet of documentation. +- Drop patch1, from changelog build on s390 is fixed. +- Drop p7zip-15.09-CVE-2015-1038.patch, from changelog if fixed. +- Drop upstreamed p7zip_15.09-incorrect-fsf-address.patch . +- Drop p7zip_15.09-no7zG_and_7zFM.patch, p7zip build is fixed. +- Add sub-package p7zip-gui with 7zG. + +* Thu Feb 04 2016 Fedora Release Engineering - 15.09-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 25 2016 Sérgio Basto - 15.09-9 +- Add 02_man.patch from Debian + +* Fri Jan 22 2016 Sérgio Basto - 15.09-8 +- Revert better solutions for "create unowned directory" + +* Fri Jan 22 2016 Sérgio Basto - 15.09-7 +- Split incorrect-fsf-address.patch and do not pack backup files + +* Fri Jan 22 2016 Sérgio Basto - 15.09-6 +- Stating in License.txt file that we removed non-Free unrar code + from sources (#190277) +- Fix incorrect fsf address in the license files. +- Add p7zip_15.09-no7zG_and_7zFM.patch in a diferent patch. + +* Fri Jan 22 2016 Sérgio Basto - 15.09-5 +- Add license tag +- better solutions for "create unowned directory" (#917366) + +* Thu Dec 03 2015 Sérgio Basto - 15.09-4 +- Fix CVE-2015-1038 (#1179505) + +* Wed Dec 02 2015 Sérgio Basto - 15.09-3 +- Fix build on s390 architecture (#1286992) + +* Thu Nov 12 2015 Sérgio Basto - 15.09-2 +- fix rhbz #917366 + +* Thu Nov 05 2015 Sérgio Basto - 15.09-1 +- Update to p7zip_15.09 +- Use cmake. +- Refactor norar patch. +- Deleted: p7zip_9.20.1-execstack.patch (upstreamed) +- Deleted: p7zip_9.20.1-install.patch (upstreamed) +- Deleted: p7zip_9.20.1-nostrip.patch (upstreamed) + +* Thu Jun 18 2015 Fedora Release Engineering - 9.20.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 9.20.1-9 +- Rebuilt for GCC 5 C++11 ABI change + +* Sun Aug 17 2014 Fedora Release Engineering - 9.20.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 06 2014 Fedora Release Engineering - 9.20.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 9.20.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 9.20.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 9.20.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 9.20.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Jul 26 2011 Matthias Saou 9.20.1-2 +- Execstack patch to fix what's wanted by the yasm code (#718778). + +* Tue Jul 26 2011 Matthias Saou 9.20.1-1 +- Update to 9.20.1 (#688564). +- Update norar, nostrip and install patches. +- Minor clean ups : Don't use trivial macros + new email address. +- Don't require the main package from the plugins package (#690551). +- Use the any_cpu_gcc_4.X makefile for ppc* since the ppc specific one is gone. + +* Tue Feb 08 2011 Fedora Release Engineering - 9.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 8 2010 Matthias Saou 9.13-1 +- Update to 9.13. +- Update norar and nostrip patches. + +* Tue Dec 8 2009 Matthias Saou 9.04-1 +- Update to 9.04. +- Update norar patch. + +* Sat Jul 25 2009 Fedora Release Engineering - 4.65-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Apr 12 2009 Matthias Saou 4.65-1 +- Update to 4.65. +- Update norar patch. + +* Thu Feb 26 2009 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 23 2008 Matthias Saou 4.61-1 +- Update to 4.61. +- Update norar patch. +- Use asm for x86 too (nasm). + +* Wed Jun 18 2008 Matthias Saou 4.58-1 +- Update to 4.58. +- Update norar patch. +- Update install patch. + +* Tue Feb 19 2008 Fedora Release Engineering +- Autorebuild for GCC 4.3 + +* Wed Aug 22 2007 Matthias Saou 4.51-3 +- Rebuild for new BuildID feature. + +* Thu Aug 9 2007 Matthias Saou 4.51-2 +- Update License field some more (LGPL+ to LGPLv2+). + +* Sun Aug 5 2007 Matthias Saou 4.51-1 +- Update to 4.51. +- Update License field. + +* Tue Jun 19 2007 Matthias Saou 4.47-1 +- Update to 4.47. +- Include now required patch to exclude removed Rar bits from makefiles. +- Switch to using "make install" for installation... so patch and hack. +- Use the asm makefile for x86_64, so build require yasm for it too. +- Add ppc64 to the main %%ifarch. +- Remove no longer included Codecs and Formats dirs (7z.so replaces them?). +- Remove our wrapper scripts, since the install script creates its own. + +* Thu Mar 1 2007 Matthias Saou 4.44-2 +- Remove _smp_mflags since some builds fail with suspicious errors. + +* Thu Mar 1 2007 Matthias Saou 4.44-1 +- Update to 4.44. + +* Mon Aug 28 2006 Matthias Saou 4.42-2 +- FC6 rebuild. + +* Thu Jun 29 2006 Matthias Saou 4.42-1 +- Update to 4.42. + +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + +* Mon Mar 6 2006 Matthias Saou 4.30-3 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 4.30-2 +- Rebuild for new gcc/glibc. +- Include gcc 4.1 patch for extra qualification errors. + +* Mon Nov 28 2005 Matthias Saou 4.30-1 +- Update to 4.30. + +* Thu Oct 27 2005 Matthias Saou 4.29-3 +- Double quote args passed inside the shell scripts, to fix #171480. + +* Mon Oct 10 2005 Matthias Saou 4.29-2 +- Update to 4.29. + +* Sun Jun 05 2005 Dag Wieers - 4.20-1 +- Updated to release 4.20. + +* Sun Apr 10 2005 Dag Wieers - 4.16-1 +- Moved inline scripts to %%prep stage. +- Removed quotes for $@ as it should not be necessary. + +* Thu Mar 17 2005 Matthias Saou 4.14.01-1 +- Spec file cleanup. +- Fix wrapper scripts : Double quote $@ for filenames with spaces to work. +- Move files from /usr/share to /usr/libexec. +- Various other minor changes. + +* Mon Jan 24 2005 Marcin Zajaczkowski + - upgraded to 4.14.01 + +* Sun Jan 16 2005 Marcin Zajaczkowski + - upgraded to 4.14 + +* Mon Dec 20 2004 Marcin Zajaczkowski + - added 7za script and moved SFX module to _datadir/name/ to allow 7za & 7z + use it simultaneously + - returned to plugins in separate package + +* Sat Dec 18 2004 Charles Duffy + - upgraded to 4.13 + - added 7z (not just 7za) with a shell wrapper + - added gcc-c++ to the BuildRequires list + +* Sat Nov 20 2004 Marcin Zajaczkowski + - upgraded to 4.12 + - added virtual file system for Midnight Commander + +* Thu Nov 11 2004 Marcin Zajaczkowski + - upgraded to 4.10 + - plugins support was dropped out from p7zip + +* Sun Aug 29 2004 Marcin Zajaczkowski + - initial release + diff --git a/SPECS/p7zip/p7zip_15.14-norar_cmake.patch b/SPECS/p7zip/p7zip_15.14-norar_cmake.patch new file mode 100644 index 00000000000..41a351d2347 --- /dev/null +++ b/SPECS/p7zip/p7zip_15.14-norar_cmake.patch @@ -0,0 +1,149 @@ +diff -rup p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-10 07:27:16.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-15 13:50:22.638470716 +0000 +@@ -87,8 +87,6 @@ SRCS=\ + ../../../../CPP/7zip/Archive/PeHandler.cpp \ + ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ + ../../../../CPP/7zip/Archive/QcowHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ + ../../../../CPP/7zip/Archive/RpmHandler.cpp \ + ../../../../CPP/7zip/Archive/SplitHandler.cpp \ + ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ +@@ -191,9 +189,6 @@ SRCS=\ + ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ + ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ + ../../../../CPP/7zip/Crypto/RandGen.cpp \ +- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ +- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ +- ../../../../CPP/7zip/Crypto/RarAes.cpp \ + ../../../../CPP/7zip/Crypto/WzAes.cpp \ + ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ + ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ +@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp + QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp +-RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp +-Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp + RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp + SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp +@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/ + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp + RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp +-Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp +-Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp +-RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp + WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp + ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp +@@ -869,8 +854,6 @@ OBJS=\ + PeHandler.o \ + PpmdHandler.o \ + QcowHandler.o \ +- RarHandler.o \ +- Rar5Handler.o \ + RpmHandler.o \ + SplitHandler.o \ + SquashfsHandler.o \ +@@ -973,9 +956,6 @@ OBJS=\ + MyAesReg.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- Rar5Aes.o \ +- RarAes.o \ + WzAes.o \ + ZipCrypto.o \ + ZipStrong.o \ +diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt +--- p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-10 07:27:16.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-15 13:50:22.639470728 +0000 +@@ -126,8 +126,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Archive/PeHandler.cpp" + "../../../../CPP/7zip/Archive/PpmdHandler.cpp" + "../../../../CPP/7zip/Archive/QcowHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" + "../../../../CPP/7zip/Archive/RpmHandler.cpp" + "../../../../CPP/7zip/Archive/SplitHandler.cpp" + "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" +@@ -230,9 +228,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Crypto/MyAesReg.cpp" + "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" + "../../../../CPP/7zip/Crypto/RandGen.cpp" +- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" +- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" +- "../../../../CPP/7zip/Crypto/RarAes.cpp" + "../../../../CPP/7zip/Crypto/WzAes.cpp" + "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" + "../../../../CPP/7zip/Crypto/ZipStrong.cpp" +diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.14/CPP/7zip/CMAKE/generate.sh +--- p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh 2016-02-03 04:54:00.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/CMAKE/generate.sh 2016-03-15 13:50:47.596758591 +0000 +@@ -15,15 +15,15 @@ CURDIR=$PWD + cd $CURDIR + doit "Unix" "Unix Makefiles" + +-cd $CURDIR +-doit "codeblocks" "CodeBlocks - Unix Makefiles" ++#cd $CURDIR ++#doit "codeblocks" "CodeBlocks - Unix Makefiles" + + #cd $CURDIR + #doit "KDevelop3" "KDevelop3" + +-cd $CURDIR +-doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" ++#cd $CURDIR ++#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" + +-cd $CURDIR +-doit "ninja" "Ninja" ++#cd $CURDIR ++#doit "ninja" "Ninja" + +diff -rup p7zip_15.14.orig/DOC/License.txt p7zip_15.14/DOC/License.txt +--- p7zip_15.14.orig/DOC/License.txt 2016-03-02 05:57:39.000000000 +0000 ++++ p7zip_15.14/DOC/License.txt 2016-03-15 13:50:22.640470740 +0000 +@@ -1,3 +1,6 @@ ++ Fedora package note: non-Free unrar code have been removed from the sources ++ (#190277) ++ + 7-Zip source code + ~~~~~~~~~~~~~~~~~ + License for use and distribution +diff -rup p7zip_15.14.orig/makefile p7zip_15.14/makefile +--- p7zip_15.14.orig/makefile 2016-02-29 06:28:31.000000000 +0000 ++++ p7zip_15.14/makefile 2016-03-15 13:50:22.640470740 +0000 +@@ -31,7 +31,6 @@ depend: + $(MAKE) -C CPP/7zip/UI/Client7z depend + $(MAKE) -C CPP/7zip/UI/Console depend + $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend +- $(MAKE) -C CPP/7zip/Compress/Rar depend + $(MAKE) -C CPP/7zip/UI/GUI depend + $(MAKE) -C CPP/7zip/UI/FileManager depend + +@@ -42,7 +41,6 @@ sfx: common + common7z:common + $(MKDIR) bin/Codecs + $(MAKE) -C CPP/7zip/Bundles/Format7zFree all +- $(MAKE) -C CPP/7zip/Compress/Rar all + + lzham:common + $(MKDIR) bin/Codecs +@@ -67,7 +65,6 @@ clean_C: + $(MAKE) -C CPP/7zip/UI/FileManager clean + $(MAKE) -C CPP/7zip/UI/GUI clean + $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean +- $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/Lzham clean + $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 + $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean diff --git a/cgmanifest.json b/cgmanifest.json index 419124b94d4..808f18398a7 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -90,6 +90,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "archivemount", + "version": "0.9.1", + "downloadUrl": "https://www.cybernoia.de/software/archivemount/archivemount-0.9.1.tar.gz" + } + } + }, { "component": { "type": "other", @@ -1370,6 +1380,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "fuse-zip", + "version": "0.7.2", + "downloadUrl": "https://bitbucket.org/agalanin/fuse-zip/downloads/fuse-zip-0.7.2.tar.gz" + } + } + }, { "component": { "type": "other", @@ -3190,6 +3210,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "libzip", + "version": "1.7.3", + "downloadUrl": "https://libzip.org/download/libzip-1.7.3.tar.xz" + } + } + }, { "component": { "type": "other", @@ -4080,6 +4110,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "p7zip", + "version": "16.02", + "downloadUrl": "https://src.fedoraproject.org/repo/pkgs/p7zip/p7zip_16.02_src_all-norar.tar.bz2/7202a0bd2aa2935576c13314783d5e1d/p7zip_16.02_src_all-norar.tar.bz2" + } + } + }, { "component": { "type": "other", From eaf27184455ef6680dea159738f734bf736334b8 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Thu, 20 May 2021 18:48:51 -0400 Subject: [PATCH 47/83] added back -p1 argument for autosetup --- SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec index 4c2c031680f..5c17cca2d79 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -26,7 +26,7 @@ Provides: nvidia-container-runtime-hook Provides a OCI hook to enable GPU support in containers. %prep -%autosetup +%autosetup -p1 tar -xvf %{SOURCE1} %build From 9ca9d39fffcdd410e410ecb29127f21498b47151 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 20 May 2021 16:01:53 -0700 Subject: [PATCH 48/83] Adding CBL-Mariner .repo files to the toolkit. (#965) --- toolkit/scripts/toolkit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolkit/scripts/toolkit.mk b/toolkit/scripts/toolkit.mk index ce7aafd11dd..4a8d79634af 100644 --- a/toolkit/scripts/toolkit.mk +++ b/toolkit/scripts/toolkit.mk @@ -12,11 +12,14 @@ toolkit_component_extra_files = \ $(PROJECT_ROOT)/LICENSES-AND-NOTICES/LICENSE.md \ $(toolkit_root)/.gitignore +mariner_repos_dir = $(SPECS_DIR)/mariner-repos + # Outputs toolkit_version = $(RELEASE_VERSION)-$(build_arch) toolkit_archive = $(OUT_DIR)/toolkit-$(toolkit_version).tar.gz toolkit_remove_archive = $(OUT_DIR)/toolkit-*.tar.gz toolkit_build_dir = $(BUILD_DIR)/toolkit +toolkit_repos_dir = $(toolkit_build_dir)/repos toolkit_tools_dir = $(toolkit_build_dir)/tools/toolkit_bins toolkit_release_file = $(toolkit_build_dir)/version.txt @@ -30,8 +33,10 @@ clean-package-toolkit: package-toolkit: go-tools rm -rf $(toolkit_build_dir) && \ mkdir -p $(toolkit_build_dir) && \ + mkdir -p $(toolkit_repos_dir) && \ mkdir -p $(toolkit_tools_dir) && \ cp -r $(toolkit_root)/* $(toolkit_build_dir) && \ + cp $(mariner_repos_dir)/*.repo $(toolkit_repos_dir) && \ cp $(toolkit_component_extra_files) $(toolkit_build_dir) && \ cp $(go_tool_targets) $(toolkit_tools_dir) && \ echo "$(toolkit_version)" > $(toolkit_release_file) && \ From 3867e1bb75d17117392bbd4d602abfd84646c062 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 20 May 2021 17:05:20 -0700 Subject: [PATCH 49/83] Adding documentation about the `REPO_LIST` argument. (#966) --- toolkit/docs/building/building.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/toolkit/docs/building/building.md b/toolkit/docs/building/building.md index d22e7cb058e..97da3d4bb5d 100644 --- a/toolkit/docs/building/building.md +++ b/toolkit/docs/building/building.md @@ -382,7 +382,13 @@ If that is not desired all remote sources can be disabled by clearing the follow #### `REPO_LIST=...` -> List of RPM repositories to pull packages from. These packages are used to satisfy dependencies during the build process, and to compose a final image. Locally available packages are always prioritized. The repos are prioritized based on the order they appear in the list: Repos earlier in the list are higher priority. +> List of RPM repositories to pull packages from. These packages are used to satisfy dependencies during the build process, and to compose a final image. Locally available packages are always prioritized. The repos are prioritized based on the order they appear in the list: repos earlier in the list are higher priority. CBL-Mariner provides a set of pre-populated RPM repositories accessible inside the toolkit folder under `toolkit/repos`: +> +> - `mariner-official-base.repo` and `mariner-official-update.repo` - default, always-on CBL-Mariner repositories. +> - `mariner-preview.repo` - CBL-Mariner repository containing pre-release versions of RPMs **subject to change without notice**. Using this .repo file is equivallent to adding the [`USE_PREVIEW_REPO=y`](#use_preview_repoy) argument to your build command. +> - `mariner-ui.repo` and `mariner-ui-preview.repo` - CBL-Mariner repository containing packages related to any UI components. The preview version serves the same purpose as the official preview repo. +> - `mariner-extras.repo` and `mariner-extras-preview.repo` - CBL-Mariner repository containing proprietory RPMs with sources not viewable to the public. The preview version serves the same purpose as the official preview repo. +> #### Build Enable/Disable Flags From 92328fdac18a550923d44050b159d60075ddfe66 Mon Sep 17 00:00:00 2001 From: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com> Date: Fri, 21 May 2021 10:41:47 -0700 Subject: [PATCH 50/83] Recalculate sha512hmac on signed kernel binary (#964) --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 14 ++++++++++++-- SPECS-SIGNED/kernel-signed/sha512hmac-openssl.sh | 6 ++++++ SPECS/kernel-headers/kernel-headers.spec | 5 ++++- SPECS/kernel-hyperv/kernel-hyperv.spec | 6 +++++- SPECS/kernel/kernel.spec | 6 +++++- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- 9 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 SPECS-SIGNED/kernel-signed/sha512hmac-openssl.sh diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index ee9d9b6dae6..cedb060780c 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -1,4 +1,5 @@ %global debug_package %{nil} +%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh %ifarch x86_64 %global buildarch x86_64 %endif @@ -9,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.10.32.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -66,7 +67,10 @@ URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel # 4. Build this spec Source0: kernel-%{version}-%{release}.%{buildarch}.rpm Source1: vmlinuz-%{uname_r} +Source2: sha512hmac-openssl.sh BuildRequires: cpio +BuildRequires: openssl +BuildRequires: sed %description This package contains the Linux kernel package with kernel signed with the production key @@ -86,7 +90,6 @@ The kernel package contains the signed Linux kernel. %build # This spec's whole purpose is to inject the signed kernel binary -# Do not do anything extra. rpm2cpio %{SOURCE0} | cpio -idmv cp %{SOURCE1} ./boot/vmlinuz-%{uname_r} @@ -94,6 +97,10 @@ cp %{SOURCE1} ./boot/vmlinuz-%{uname_r} # Don't use * wildcard. It does not copy over hidden files in the root folder... cp -rp ./. %{buildroot}/ +# Recalculate sha512hmac for FIPS +%{sha512hmac} %{buildroot}/boot/vmlinuz-%{uname_r} | sed -e "s,$RPM_BUILD_ROOT,," > %{buildroot}/boot/.vmlinuz-%{uname_r}.hmac +cp %{buildroot}/boot/.vmlinuz-%{uname_r}.hmac %{buildroot}/lib/modules/%{uname_r}/.vmlinuz.hmac + %triggerin -n kernel -- initramfs mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/pending touch %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r} @@ -139,6 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 +- Recalculate sha512hmac on signed kernel binary + * Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 - Update to kernel release 5.10.32.1-3 diff --git a/SPECS-SIGNED/kernel-signed/sha512hmac-openssl.sh b/SPECS-SIGNED/kernel-signed/sha512hmac-openssl.sh new file mode 100644 index 00000000000..af67fa7b8f4 --- /dev/null +++ b/SPECS-SIGNED/kernel-signed/sha512hmac-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Mocks sha512hmac using the openssl tool. +# Only for use during RPM build. + +openssl sha512 -hmac FIPS-FTW-RHT2009 -hex "$1" | cut -f 2 -d ' ' | echo "$(cat -) $1" \ No newline at end of file diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 0e8fe3f56f3..c6326ac5194 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.10.32.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 +- Bump release number to match kernel-signed update + * Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 - Bump release number to match kernel release diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index 57ab1c2e4a1..2faa84cdc7f 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.10.32.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -28,6 +28,7 @@ BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: procps-ng-devel BuildRequires: python3 +BuildRequires: sed BuildRequires: xerces-c-devel Requires: filesystem Requires: kmod @@ -262,6 +263,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 +- Bump release number to match kernel-signed update + * Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 - Update CONFIG_LD_VERSION for binutils 2.36.1 - Remove build-id match check diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 12dfa4cf56c..c8d91fdb61d 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel Name: kernel Version: 5.10.32.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -176,6 +176,7 @@ BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: procps-ng-devel BuildRequires: python3 +BuildRequires: sed BuildRequires: xerces-c-devel Requires: filesystem Requires: kmod @@ -488,6 +489,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 +- Bump release number to match kernel-signed update + * Tue May 17 2021 Andrew Phelps - 5.10.32.1-3 - Update CONFIG_LD_VERSION for binutils 2.36.1 - Remove build-id match check diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index e03eca70608..0959be6e22f 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-3.cm1.noarch.rpm +kernel-headers-5.10.32.1-4.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 7e387d49c83..7c60500edce 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-3.cm1.noarch.rpm +kernel-headers-5.10.32.1-4.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 704a4beb12a..854ac031684 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-3.cm1.noarch.rpm +kernel-headers-5.10.32.1-4.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index b1505ea709e..b4794f7d565 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-3.cm1.noarch.rpm +kernel-headers-5.10.32.1-4.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm From c9cda35f17978ed26f9d0ede9640947278304609 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Fri, 21 May 2021 14:57:36 -0700 Subject: [PATCH 51/83] Enable individual usergroups in shadow-utils (#962) --- SPECS/shadow-utils/shadow-utils.spec | 10 ++++++---- .../resources/manifests/package/toolchain_aarch64.txt | 4 ++-- .../resources/manifests/package/toolchain_x86_64.txt | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SPECS/shadow-utils/shadow-utils.spec b/SPECS/shadow-utils/shadow-utils.spec index 5aca23c4044..f96e625ff83 100644 --- a/SPECS/shadow-utils/shadow-utils.spec +++ b/SPECS/shadow-utils/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Programs for handling passwords in a secure way Name: shadow-utils Version: 4.6 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Mariner @@ -54,9 +54,8 @@ sed -i 's/yes/no/' %{buildroot}%{_sysconfdir}/default/useradd ln -s useradd %{buildroot}%{_sbindir}/adduser # Use group id 100(users) by default sed -i 's/GROUP.*/GROUP=100/' %{buildroot}%{_sysconfdir}/default/useradd -# Disable usergroups. Use "users" group by default (see /etc/default/useradd) -# for all nonroot users. -sed -i 's/USERGROUPS_ENAB.*/USERGROUPS_ENAB no/' %{buildroot}%{_sysconfdir}/login.defs +# Enable usergroups. Each user will get their own primary group with a name matching their login name +sed -i 's/USERGROUPS_ENAB.*/USERGROUPS_ENAB yes/' %{buildroot}%{_sysconfdir}/login.defs cp etc/{limits,login.access} %{buildroot}%{_sysconfdir} for FUNCTION in FAIL_DELAY \ FAILLOG_ENAB \ @@ -140,6 +139,9 @@ make %{?_smp_mflags} check %config(noreplace) %{_sysconfdir}/pam.d/* %changelog +* Thu May 20 2021 Thomas Crain - 4.6-11 +- Enable usergroups for useradd + * Mon Mar 01 2021 Henry Li - 4.6-10 - Add sym link to adduser from useradd and create the file for adduser diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 854ac031684..dd6cc414a20 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -352,8 +352,8 @@ rpm-libs-4.14.2-11.cm1.aarch64.rpm sed-4.5-3.cm1.aarch64.rpm sed-debuginfo-4.5-3.cm1.aarch64.rpm sed-lang-4.5-3.cm1.aarch64.rpm -shadow-utils-4.6-10.cm1.aarch64.rpm -shadow-utils-debuginfo-4.6-10.cm1.aarch64.rpm +shadow-utils-4.6-11.cm1.aarch64.rpm +shadow-utils-debuginfo-4.6-11.cm1.aarch64.rpm sqlite-3.34.1-1.cm1.aarch64.rpm sqlite-debuginfo-3.34.1-1.cm1.aarch64.rpm sqlite-devel-3.34.1-1.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index b4794f7d565..bf43575ee97 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -352,8 +352,8 @@ rpm-libs-4.14.2-11.cm1.x86_64.rpm sed-4.5-3.cm1.x86_64.rpm sed-debuginfo-4.5-3.cm1.x86_64.rpm sed-lang-4.5-3.cm1.x86_64.rpm -shadow-utils-4.6-10.cm1.x86_64.rpm -shadow-utils-debuginfo-4.6-10.cm1.x86_64.rpm +shadow-utils-4.6-11.cm1.x86_64.rpm +shadow-utils-debuginfo-4.6-11.cm1.x86_64.rpm sqlite-3.34.1-1.cm1.x86_64.rpm sqlite-debuginfo-3.34.1-1.cm1.x86_64.rpm sqlite-devel-3.34.1-1.cm1.x86_64.rpm From 8935cc36b282b026b18b3bfd36282b3e775e28a5 Mon Sep 17 00:00:00 2001 From: Neha Agarwal <58672330+neha170@users.noreply.github.com> Date: Fri, 21 May 2021 18:40:45 -0500 Subject: [PATCH 52/83] Update version of ceph and python-rsa to fix CVEs (#970) --- SPECS/ceph/ceph.signatures.json | 2 +- SPECS/ceph/ceph.spec | 32 +++++++++++++++++---- SPECS/python-rsa/python-rsa.signatures.json | 2 +- SPECS/python-rsa/python-rsa.spec | 5 +++- cgmanifest.json | 8 +++--- 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/SPECS/ceph/ceph.signatures.json b/SPECS/ceph/ceph.signatures.json index d9eab82642d..b9a73e65492 100644 --- a/SPECS/ceph/ceph.signatures.json +++ b/SPECS/ceph/ceph.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ceph-15.2.4.tar.gz": "5d51297d5f0358f6fc386ecf3d6e3093a044ef4714ed6c0f0d13af90c96dc54b" + "ceph-16.2.0.tar.gz": "dfeee542536607220dc2ca49f47c41127c8562dea234a886625e0f7ee1524904" } } \ No newline at end of file diff --git a/SPECS/ceph/ceph.spec b/SPECS/ceph/ceph.spec index d088005fd4c..651942e97e4 100644 --- a/SPECS/ceph/ceph.spec +++ b/SPECS/ceph/ceph.spec @@ -1,6 +1,6 @@ Summary: User space components of the Ceph file system Name: ceph -Version: 15.2.4 +Version: 16.2.0 Release: 1%{?dist} License: LGPLv2 and LGPLv3 and CC-BY-SA and GPLv2 and Boost and BSD and MIT and Public Domain and GPLv3 and ASL-2.0 URL: https://ceph.io/ @@ -69,14 +69,17 @@ Requires(post): binutils Requires: systemd BuildRequires: cryptsetup +BuildRequires: cryptsetup-devel BuildRequires: expat-devel BuildRequires: fuse-devel BuildRequires: gcc BuildRequires: gdbm BuildRequires: gperf +BuildRequires: icu-devel BuildRequires: keyutils-devel BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel +BuildRequires: lua-devel BuildRequires: util-linux-libs BuildRequires: libcap-ng-devel BuildRequires: curl-devel @@ -942,7 +945,6 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules # sudoers.d install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl -install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm #set up placeholder directories mkdir -p %{buildroot}%{_sysconfdir}/ceph @@ -1053,7 +1055,6 @@ exit 0 %files -n cephadm %{_sbindir}/cephadm %{_mandir}/man8/cephadm.8* -%{_sysconfdir}/sudoers.d/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys @@ -1070,6 +1071,8 @@ exit 0 %{_bindir}/ceph-syn %{_bindir}/cephfs-data-scan %{_bindir}/cephfs-journal-tool +%{_bindir}/cephfs-mirror +%{_bindir}/cephfs-top %{_bindir}/cephfs-table-tool %{_bindir}/rados %{_bindir}/radosgw-admin @@ -1078,6 +1081,8 @@ exit 0 %{_bindir}/rbd-replay-many %{_bindir}/rbdmap %{_sbindir}/mount.ceph +%{_unitdir}/cephfs-mirror@.service +%{_unitdir}/cephfs-mirror.target %if %{with lttng} %{_bindir}/rbd-replay-prep %endif @@ -1100,6 +1105,9 @@ exit 0 %{_mandir}/man8/rbd-replay-many.8* %{_mandir}/man8/rbd-replay-prep.8* %{_mandir}/man8/rgw-orphan-list.8* +%{_mandir}/man8/cephfs-mirror.8* +%{_mandir}/man8/cephfs-top.8* +%{python3_sitelib}/cephfs_top-*.egg-info %dir %{_datadir}/ceph/ %{_datadir}/ceph/known_hosts_drop.ceph.com %{_datadir}/ceph/id_rsa_drop.ceph.com @@ -1115,6 +1123,8 @@ exit 0 %{_udevrulesdir}/50-rbd.rules %attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/ %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/ +%exclude %{_includedir}/libcephsqlite.h +%exclude %{_libdir}/libcephsqlite.so %pre common CEPH_GROUP_ID=167 @@ -1233,6 +1243,8 @@ fi %{_datadir}/ceph/mgr/insights %{_datadir}/ceph/mgr/iostat %{_datadir}/ceph/mgr/localpool +%{_datadir}/ceph/mgr/mds_autoscaler +%{_datadir}/ceph/mgr/mirroring %{_datadir}/ceph/mgr/orchestrator %{_datadir}/ceph/mgr/osd_perf_query %{_datadir}/ceph/mgr/osd_support @@ -1242,6 +1254,8 @@ fi %{_datadir}/ceph/mgr/rbd_support %{_datadir}/ceph/mgr/restful %{_datadir}/ceph/mgr/selftest +%{_datadir}/ceph/mgr/snap_schedule +%{_datadir}/ceph/mgr/stats %{_datadir}/ceph/mgr/status %{_datadir}/ceph/mgr/telegraf %{_datadir}/ceph/mgr/telemetry @@ -1322,6 +1336,7 @@ fi %files fuse %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* +%{_mandir}/man8/mount.fuse.ceph.8* %{_sbindir}/mount.fuse.ceph %{_unitdir}/ceph-fuse@.service %{_unitdir}/ceph-fuse.target @@ -1400,6 +1415,8 @@ fi %{_bindir}/radosgw-es %{_bindir}/radosgw-object-expirer %{_bindir}/rgw-orphan-list +%{_bindir}/rgw-gap-list +%{_bindir}/rgw-gap-list-comparator %{_libdir}/libradosgw.so* %{_mandir}/man8/radosgw.8* %dir %{_localstatedir}/lib/ceph/radosgw @@ -1434,6 +1451,7 @@ fi %files osd %{_bindir}/ceph-clsinfo %{_bindir}/ceph-bluestore-tool +%{_bindir}/ceph-erasure-code-tool %{_bindir}/ceph-objectstore-tool %{_bindir}/ceph-osdomap-tool %{_bindir}/ceph-osd @@ -1554,6 +1572,7 @@ fi %if %{with lttng} %{_libdir}/librbd_tp.so.* %endif +%{_libdir}/ceph/librbd/libceph_*.so* %post -n librbd1 -p /sbin/ldconfig @@ -1571,7 +1590,6 @@ fi %files -n librgw2 %{_libdir}/librgw.so.* -%{_libdir}/librgw_admin_user.so.* %if %{with lttng} %{_libdir}/librgw_op_tp.so.* %{_libdir}/librgw_rados_tp.so.* @@ -1584,10 +1602,8 @@ fi %files -n librgw-devel %dir %{_includedir}/rados %{_includedir}/rados/librgw.h -%{_includedir}/rados/librgw_admin_user.h %{_includedir}/rados/rgw_file.h %{_libdir}/librgw.so -%{_libdir}/librgw_admin_user.so %if %{with lttng} %{_libdir}/librgw_op_tp.so %{_libdir}/librgw_rados_tp.so @@ -1614,6 +1630,7 @@ fi %{_includedir}/cephfs/libcephfs.h %{_includedir}/cephfs/ceph_ll_client.h %{_libdir}/libcephfs.so +%{_includedir}/cephfs/metrics/Types.h %files -n python%{python3_pkgversion}-cephfs %{python3_sitearch}/cephfs.cpython*.so @@ -1779,6 +1796,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri May 21 2021 Neha Agarwal 16.2.0-1 +- Update package version to fix CVE-2020-25660, CVE-2020-25678 and CVE-2020-27781 + * Fri Aug 21 2020 Thomas Crain 15.2.4-1 - Initial CBL-Mariner import from Ceph source (license: LGPLv2.1) - License verified \ No newline at end of file diff --git a/SPECS/python-rsa/python-rsa.signatures.json b/SPECS/python-rsa/python-rsa.signatures.json index 5e15fba0bb8..657d2a1765d 100644 --- a/SPECS/python-rsa/python-rsa.signatures.json +++ b/SPECS/python-rsa/python-rsa.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "rsa-4.6.tar.gz": "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa" + "rsa-4.7.2.tar.gz": "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9" } } \ No newline at end of file diff --git a/SPECS/python-rsa/python-rsa.spec b/SPECS/python-rsa/python-rsa.spec index 1a633a96ae7..9e1636835a0 100644 --- a/SPECS/python-rsa/python-rsa.spec +++ b/SPECS/python-rsa/python-rsa.spec @@ -3,7 +3,7 @@ Summary: Purely Python RSA implementation Name: python-%{pkgname} -Version: 4.6 +Version: 4.7.2 Release: 1%{?dist} License: ASL 2.0 URL: https://stuvel.eu/software/rsa/ @@ -45,6 +45,9 @@ python3 setup.py install --skip-build --root=%{buildroot} %{_bindir}/* %changelog +* Fri May 21 2021 Neha Agarwal - 4.7.2-1 +- Update package version to fix CVE-2020-25658 + * Fri Aug 21 2020 Thomas Crain - 4.6-1 - Original version for CBL-Mariner - License verified diff --git a/cgmanifest.json b/cgmanifest.json index 808f18398a7..e0e3dfc0cf5 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -735,8 +735,8 @@ "type": "other", "other": { "name": "ceph", - "version": "15.2.4", - "downloadUrl": "https://download.ceph.com/tarballs/ceph-15.2.4.tar.gz" + "version": "16.2.0", + "downloadUrl": "https://download.ceph.com/tarballs/ceph-16.2.0.tar.gz" } } }, @@ -5765,8 +5765,8 @@ "type": "other", "other": { "name": "python-rsa", - "version": "4.6", - "downloadUrl": "https://pypi.python.org/packages/source/r/rsa/rsa-4.6.tar.gz" + "version": "4.7.2", + "downloadUrl": "https://pypi.python.org/packages/source/r/rsa/rsa-4.7.2.tar.gz" } } }, From 192cf25f8d126c33a8c48b91065b8189f12eb9b1 Mon Sep 17 00:00:00 2001 From: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com> Date: Fri, 21 May 2021 17:09:46 -0700 Subject: [PATCH 53/83] Add Jitterentropy to OpenSSL (#928) Co-authored-by: Pawel Winogrodzki --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 1 + .../jitterentropy.signatures.json | 5 + SPECS/jitterentropy/jitterentropy.spec | 69 +++++++ .../openssl/openssl-1.1.1-jitterentropy.patch | 193 ++++++++++++++++++ SPECS/openssl/openssl.spec | 10 +- cgmanifest.json | 10 + .../manifests/package/pkggen_core_aarch64.txt | 12 +- .../manifests/package/pkggen_core_x86_64.txt | 12 +- .../manifests/package/toolchain_aarch64.txt | 12 +- .../manifests/package/toolchain_x86_64.txt | 12 +- 11 files changed, 311 insertions(+), 27 deletions(-) create mode 100644 SPECS/jitterentropy/jitterentropy.signatures.json create mode 100644 SPECS/jitterentropy/jitterentropy.spec create mode 100644 SPECS/openssl/openssl-1.1.1-jitterentropy.patch diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index 6ad929f8784..fbface09959 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -3,7 +3,7 @@ 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) | archivemount
      at
      attr
      autoconf213
      babeltrace2
      bmake
      brotli
      busybox
      byacc
      calamares
      catch
      chrony
      conntrack-tools
      cpprest
      cryptsetup
      CUnit
      dnf
      docbook5-schemas
      dos2unix
      ebtables
      extra-cmake-modules
      fuse-zip
      gnu-efi
      hardening-check
      heimdal
      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
      libstoragemgmt
      libxcrypt
      libzip
      mailcap
      mokutil
      mozjs60
      oath-toolkit
      open-vm-tools
      openssl
      p11-kit
      p7zip
      perl-JSON
      pugixml
      python-google-auth
      python-jwt
      python-kubernetes
      python-pexpect
      python-ptyprocess
      python-pywbem
      qt5-qtbase
      qt5-qtdeclarative
      qt5-qtsvg
      qt5-qttools
      qt5-rpm-macros
      rdma-core
      sgml-common
      sos
      squashfs-tools
      uclibc-ng
      uuid
      websocketpp
      words
      xmlstarlet
      yaml-cpp
      yasm
      zipper | -| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
      auoms
      azure-iot-sdk-c
      azure-iotedge
      azure-storage-cpp
      blobfuse
      bmon
      bond
      bpftrace
      ccache
      clamav
      cloud-hypervisor
      cloud-init-vmware-guestinfo
      coredns-1.6.7
      coredns-1.7.0
      distroless-packages
      dtc
      espeak-ng
      espeakup
      flannel
      fluent-bit
      freefont
      gflags
      go-md2man
      grpc
      GSL
      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
      libiothsm-std
      libmaxminddb
      libuv
      libxml++
      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
      ntopng
      omi
      pcaudiolib
      pcre2
      perl-Test-Warnings
      perl-Text-Template
      pigz
      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 | +| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
      auoms
      azure-iot-sdk-c
      azure-iotedge
      azure-storage-cpp
      blobfuse
      bmon
      bond
      bpftrace
      ccache
      clamav
      cloud-hypervisor
      cloud-init-vmware-guestinfo
      coredns-1.6.7
      coredns-1.7.0
      distroless-packages
      dtc
      espeak-ng
      espeakup
      flannel
      fluent-bit
      freefont
      gflags
      go-md2man
      grpc
      GSL
      installkernel
      ivykis
      jitterentropy
      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
      libiothsm-std
      libmaxminddb
      libuv
      libxml++
      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
      ntopng
      omi
      pcaudiolib
      pcre2
      perl-Test-Warnings
      perl-Text-Template
      pigz
      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
      dotnet-runtime-3.1
      dotnet-sdk-3.1
      dracut
      dstat
      e2fsprogs
      ed
      efibootmgr
      efivar
      elfutils
      erlang
      etcd-3.4.13
      etcd-3.4.3
      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
      gmp
      gnome-common
      gnupg2
      gnuplot
      gnutls
      gobject-introspection
      golang-1.15
      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-8.11.4
      nodejs-9.11.2
      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 | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 76674294df6..72fb1d3ed67 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -127,6 +127,7 @@ "GSL", "installkernel", "ivykis", + "jitterentropy", "jsonbuilder", "kubernetes-1.18.14", "kubernetes-1.18.17", diff --git a/SPECS/jitterentropy/jitterentropy.signatures.json b/SPECS/jitterentropy/jitterentropy.signatures.json new file mode 100644 index 00000000000..2c99d1edf14 --- /dev/null +++ b/SPECS/jitterentropy/jitterentropy.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "jitterentropy-library-3.0.2.tar.gz": "5be868e343c25e24312f5e6894642ce1044994b99d6676430c760584a1b1613e" + } +} \ No newline at end of file diff --git a/SPECS/jitterentropy/jitterentropy.spec b/SPECS/jitterentropy/jitterentropy.spec new file mode 100644 index 00000000000..402a8ba8cf8 --- /dev/null +++ b/SPECS/jitterentropy/jitterentropy.spec @@ -0,0 +1,69 @@ +%define debug_package %{nil} +Summary: Library implementing the jitter entropy source +Name: jitterentropy +# NOTE: this package should be used only by OpenSSL +# Since OpenSSL has a static link to this package, +# OpenSSL release must be bumped when this package is updated. +Version: 3.0.2 +Release: 1%{?dist} +License: BSD OR GPLv2 +Vendor: Microsoft Corporation +Distribution: Mariner +Group: System Environment/Security +URL: https://github.com/smuellerDD/jitterentropy-library +#Source0: https://github.com/smuellerDD/%%{name}-library/archive/refs/tags/v%%{version}.tar.gz +Source0: %{name}-library-%{version}.tar.gz +BuildRequires: gcc +BuildRequires: make + +%description +The Jitter RNG provides a noise source using the CPU execution timing jitter. +It does not depend on any system resource other than a high-resolution time stamp. +It is a small-scale, yet fast entropy source that is viable in almost all environments and on a lot of CPU architectures. + +%package devel +Summary: Development Libraries for jitterentropy +Group: Development/Libraries + +%description devel +The jitterentropy-devel package contains include files and shared libraries +needed to develop applications that use jitterentropy. + +%package static +Summary: Libraries for static linking of applications which will use jitterentropy +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +The jitterentropy-static package contains static libraries needed for static linking of +applications which use jitterentropy. + +%prep +%autosetup -n %{name}-library-%{version} -p1 + +%build +export CFLAGS='-DOPENSSL -DOPENSSL_FIPS' +make + +%install +mkdir -p %{buildroot}%{_includedir} +make install-static install-includes install-shared DESTDIR=%{buildroot} PREFIX=%{_prefix} + +# Rename static library to libjitterentropy-openssl +mv %{buildroot}/%{_libdir}/lib%{name}.a %{buildroot}/%{_libdir}/lib%{name}-openssl.a + +%files +%doc README.md +%license COPYING COPYING.bsd COPYING.gplv2 +%{_libdir}/libjitterentropy.so.3* + +%files devel +%{_libdir}/libjitterentropy.so +%{_includedir}/* + +%files static +%{_libdir}/lib%{name}-openssl.a + +%changelog +* Wed Apr 14 2021 Nicolas Ontiveros - 3.0.2-1 +- Original version for CBL-Mariner. License verified. diff --git a/SPECS/openssl/openssl-1.1.1-jitterentropy.patch b/SPECS/openssl/openssl-1.1.1-jitterentropy.patch new file mode 100644 index 00000000000..a617f689c6c --- /dev/null +++ b/SPECS/openssl/openssl-1.1.1-jitterentropy.patch @@ -0,0 +1,193 @@ +diff --git a/crypto/fips/build.info b/crypto/fips/build.info +index 2859a08..1d97ca7 100644 +--- a/crypto/fips/build.info ++++ b/crypto/fips/build.info +@@ -1,6 +1,6 @@ + LIBS=../../libcrypto + SOURCE[../../libcrypto]=\ +- fips_aes_selftest.c fips_des_selftest.c fips_hmac_selftest.c \ ++ fips_aes_selftest.c fips_des_selftest.c fips_entropy.c fips_hmac_selftest.c \ + fips_rsa_selftest.c fips_sha_selftest.c fips.c fips_dsa_selftest.c \ + fips_post.c fips_drbg_ctr.c fips_drbg_hash.c fips_drbg_hmac.c \ + fips_drbg_lib.c fips_drbg_rand.c fips_drbg_selftest.c fips_rand_lib.c \ +diff --git a/crypto/fips/fips.c b/crypto/fips/fips.c +index 3b9d3e9..b3e0f43 100644 +--- a/crypto/fips/fips.c ++++ b/crypto/fips/fips.c +@@ -454,6 +454,14 @@ int FIPS_module_mode_set(int onoff) + + fips_post = 1; + ++ if (!FIPS_init_entropy()) { ++ FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET, ++ FIPS_R_ENTROPY_INIT_FAILED); ++ fips_selftest_fail = 1; ++ ret = 0; ++ goto end; ++ } ++ + if (!FIPS_selftest()) { + fips_selftest_fail = 1; + ret = 0; +diff --git a/crypto/fips/fips_entropy.c b/crypto/fips/fips_entropy.c +new file mode 100644 +index 0000000..098dc91 +--- /dev/null ++++ b/crypto/fips/fips_entropy.c +@@ -0,0 +1,53 @@ ++# include ++# include ++ ++#include "crypto/fips.h" ++ ++static int fips_entropy_init = 0; ++ ++int FIPS_init_entropy(void) ++{ ++ int rv = 1; ++ ++ if (jent_entropy_init() != 0) { ++ rv = 0; ++ } else { ++ fips_entropy_init = 1; ++ } ++ ++ return rv; ++} ++ ++ssize_t FIPS_jitter_entropy(unsigned char *buf, size_t buflen) ++{ ++ ssize_t ent_bytes = -1; ++ struct rand_data* ec = NULL; ++ ++ if (buf == NULL || buflen == 0) { ++ goto end; ++ } ++ ++ /* Ensure entropy source has been initiated */ ++ if (!fips_entropy_init) { ++ if (!FIPS_init_entropy()) { ++ goto end; ++ } ++ } ++ ++ /* Allocate entropy collector */ ++ ec = jent_entropy_collector_alloc(1, JENT_FORCE_FIPS); ++ if (ec == NULL) { ++ goto end; ++ } ++ ++ /* Get entropy */ ++ ent_bytes = jent_read_entropy(ec, (char *)buf, buflen); ++ ++end: ++ /* Free entropy collector */ ++ if (ec != NULL) { ++ jent_entropy_collector_free(ec); ++ } ++ ++ return ent_bytes; ++} +\ No newline at end of file +diff --git a/crypto/fips/fips_err.h b/crypto/fips/fips_err.h +index 3cf8d69..9a9c9a1 100644 +--- a/crypto/fips/fips_err.h ++++ b/crypto/fips/fips_err.h +@@ -138,6 +138,7 @@ static ERR_STRING_DATA FIPS_str_reasons[] = { + {ERR_REASON(FIPS_R_DRBG_NOT_INITIALISED), "drbg not initialised"}, + {ERR_REASON(FIPS_R_DRBG_STUCK), "drbg stuck"}, + {ERR_REASON(FIPS_R_ENTROPY_ERROR_UNDETECTED), "entropy error undetected"}, ++ {ERR_REASON(FIPS_R_ENTROPY_INIT_FAILED), "entropy init failed"}, + {ERR_REASON(FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED), + "entropy not requested for reseed"}, + {ERR_REASON(FIPS_R_ENTROPY_SOURCE_STUCK), "entropy source stuck"}, +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 5ed97cb..4c2d54e 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -634,9 +634,37 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) + return rand_pool_entropy_available(pool); + # else + size_t entropy_available; ++ int in_post; ++ ++#ifdef OPENSSL_FIPS ++ if (FIPS_mode()) { ++ /* Use jitter entropy in FIPS mode */ ++ for (in_post = fips_in_post(); in_post >= 0; --in_post) { ++ size_t bytes_needed; ++ unsigned char *buffer; ++ ssize_t bytes; ++ /* Maximum allowed number of consecutive unsuccessful attempts */ ++ int attempts = 3; ++ ++ bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/); ++ while (bytes_needed !=0 && attempts-- > 0) { ++ buffer = rand_pool_add_begin(pool, bytes_needed); ++ bytes = FIPS_jitter_entropy(buffer, bytes_needed); ++ if (bytes > 0) { ++ rand_pool_add_end(pool, bytes, 8 * bytes); ++ bytes_needed -= bytes; ++ attempts = 3; /* reset counter after successful attempt */ ++ } else if (bytes < 0) { ++ break; ++ } ++ } ++ } ++ entropy_available = rand_pool_entropy_available(pool); ++ return entropy_available; ++ } ++#endif + + # if defined(OPENSSL_RAND_SEED_GETRANDOM) +- int in_post; + + for (in_post = fips_in_post(); in_post >= 0; --in_post) { + { +diff --git a/include/crypto/fips.h b/include/crypto/fips.h +index 564261c..29c4923 100644 +--- a/include/crypto/fips.h ++++ b/include/crypto/fips.h +@@ -94,6 +94,8 @@ void fips_set_selftest_fail(void); + + void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr); + ++ssize_t FIPS_jitter_entropy(unsigned char *buf, size_t buflen); ++ + #else + + # define fips_in_post() 0 +diff --git a/include/openssl/fips.h b/include/openssl/fips.h +index abbe81b..be84e08 100644 +--- a/include/openssl/fips.h ++++ b/include/openssl/fips.h +@@ -78,6 +78,8 @@ extern "C" { + BN_GENCB *cb); + int FIPS_dsa_paramgen_check_g(DSA *dsa); + ++ int FIPS_init_entropy(void); ++ + /* BEGIN ERROR CODES */ + /* The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. +@@ -153,6 +155,7 @@ extern "C" { + # define FIPS_R_DRBG_NOT_INITIALISED 152 + # define FIPS_R_DRBG_STUCK 103 + # define FIPS_R_ENTROPY_ERROR_UNDETECTED 104 ++# define FIPS_R_ENTROPY_INIT_FAILED 158 + # define FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED 105 + # define FIPS_R_ENTROPY_SOURCE_STUCK 142 + # define FIPS_R_ERROR_INITIALISING_DRBG 115 +diff --git a/util/libcrypto.num b/util/libcrypto.num +index 2e47840..e354631 100644 +--- a/util/libcrypto.num ++++ b/util/libcrypto.num +@@ -4634,4 +4634,5 @@ EVP_KDF_vctrl 6594 1_1_1b EXIST::FUNCTION: + EVP_KDF_ctrl_str 6595 1_1_1b EXIST::FUNCTION: + EVP_KDF_size 6596 1_1_1b EXIST::FUNCTION: + EVP_KDF_derive 6597 1_1_1b EXIST::FUNCTION: +-EC_GROUP_check_named_curve 6598 1_1_1g EXIST::FUNCTION:EC +\ No newline at end of file ++EC_GROUP_check_named_curve 6598 1_1_1g EXIST::FUNCTION:EC ++FIPS_init_entropy 6599 1_1_1k EXIST::FUNCTION: +\ No newline at end of file diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index 267c1b0082c..565f29e3e59 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -4,7 +4,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.1k -Release: 2%{?dist} +Release: 3%{?dist} License: OpenSSL Vendor: Microsoft Corporation Distribution: Mariner @@ -39,6 +39,8 @@ Patch16: openssl-1.1.1-s390x-ecc.patch Patch17: openssl-1.1.1-kdf-selftest.patch Patch18: openssl-1.1.1-fips-curves.patch Patch19: openssl-1.1.1-sp80056arev3.patch +Patch20: openssl-1.1.1-jitterentropy.patch +BuildRequires: jitterentropy-static BuildRequires: perl-Test-Warnings BuildRequires: perl-Text-Template Requires: %{name}-libs = %{version}-%{release} @@ -124,6 +126,7 @@ cp %{SOURCE4} test/ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be @@ -145,7 +148,7 @@ export HASHBANGPERL=%{_bindir}/perl # Issue link: https://github.com/openssl/openssl/issues/7048. # For more details please read the comment inside the patch. ./config \ - --prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls --libdir=lib \ + --prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls --libdir=lib -ljitterentropy-openssl \ shared \ no-aria \ enable-bf \ @@ -318,6 +321,9 @@ rm -rf %{buildroot} %changelog +* Tue May 18 2021 Nicolas Ontiveros - 1.1.1k-3 +- In FIPS mode, use only jitterentropy + * Tue May 11 2021 Nicolas Ontiveros - 1.1.1k-2 - Remove FIPS DRBG rewire patch diff --git a/cgmanifest.json b/cgmanifest.json index e0e3dfc0cf5..4fdda70f53d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2060,6 +2060,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "jitterentropy", + "version": "3.0.2", + "downloadUrl": "https://github.com/smuellerDD/jitterentropy-library/archive/refs/tags/v3.0.2.tar.gz" + } + } + }, { "component": { "type": "other", diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0959be6e22f..f4922cf91ff 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.aarch64.rpm texinfo-6.5-7.cm1.aarch64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-2.cm1.aarch64.rpm -openssl-devel-1.1.1k-2.cm1.aarch64.rpm -openssl-libs-1.1.1k-2.cm1.aarch64.rpm -openssl-perl-1.1.1k-2.cm1.aarch64.rpm -openssl-static-1.1.1k-2.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm +openssl-1.1.1k-3.cm1.aarch64.rpm +openssl-devel-1.1.1k-3.cm1.aarch64.rpm +openssl-libs-1.1.1k-3.cm1.aarch64.rpm +openssl-perl-1.1.1k-3.cm1.aarch64.rpm +openssl-static-1.1.1k-3.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-3.cm1.aarch64.rpm libcap-2.26-2.cm1.aarch64.rpm libcap-devel-2.26-2.cm1.aarch64.rpm libdb-5.3.28-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 7c60500edce..6389b1e5036 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.x86_64.rpm texinfo-6.5-7.cm1.x86_64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-2.cm1.x86_64.rpm -openssl-devel-1.1.1k-2.cm1.x86_64.rpm -openssl-libs-1.1.1k-2.cm1.x86_64.rpm -openssl-perl-1.1.1k-2.cm1.x86_64.rpm -openssl-static-1.1.1k-2.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm +openssl-1.1.1k-3.cm1.x86_64.rpm +openssl-devel-1.1.1k-3.cm1.x86_64.rpm +openssl-libs-1.1.1k-3.cm1.x86_64.rpm +openssl-perl-1.1.1k-3.cm1.x86_64.rpm +openssl-static-1.1.1k-3.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-3.cm1.x86_64.rpm libcap-2.26-2.cm1.x86_64.rpm libcap-devel-2.26-2.cm1.x86_64.rpm libdb-5.3.28-4.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index dd6cc414a20..85b6ef85dd0 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.aarch64.rpm openjdk8-sample-1.8.0.292-1.cm1.aarch64.rpm openjdk8-src-1.8.0.292-1.cm1.aarch64.rpm openjre8-1.8.0.292-1.cm1.aarch64.rpm -openssl-1.1.1k-2.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm -openssl-devel-1.1.1k-2.cm1.aarch64.rpm -openssl-libs-1.1.1k-2.cm1.aarch64.rpm -openssl-perl-1.1.1k-2.cm1.aarch64.rpm -openssl-static-1.1.1k-2.cm1.aarch64.rpm +openssl-1.1.1k-3.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-3.cm1.aarch64.rpm +openssl-devel-1.1.1k-3.cm1.aarch64.rpm +openssl-libs-1.1.1k-3.cm1.aarch64.rpm +openssl-perl-1.1.1k-3.cm1.aarch64.rpm +openssl-static-1.1.1k-3.cm1.aarch64.rpm p11-kit-0.23.22-1.cm1.aarch64.rpm p11-kit-debuginfo-0.23.22-1.cm1.aarch64.rpm p11-kit-devel-0.23.22-1.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index bf43575ee97..8654b406717 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.x86_64.rpm openjdk8-sample-1.8.0.292-1.cm1.x86_64.rpm openjdk8-src-1.8.0.292-1.cm1.x86_64.rpm openjre8-1.8.0.292-1.cm1.x86_64.rpm -openssl-1.1.1k-2.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm -openssl-devel-1.1.1k-2.cm1.x86_64.rpm -openssl-libs-1.1.1k-2.cm1.x86_64.rpm -openssl-perl-1.1.1k-2.cm1.x86_64.rpm -openssl-static-1.1.1k-2.cm1.x86_64.rpm +openssl-1.1.1k-3.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-3.cm1.x86_64.rpm +openssl-devel-1.1.1k-3.cm1.x86_64.rpm +openssl-libs-1.1.1k-3.cm1.x86_64.rpm +openssl-perl-1.1.1k-3.cm1.x86_64.rpm +openssl-static-1.1.1k-3.cm1.x86_64.rpm p11-kit-0.23.22-1.cm1.x86_64.rpm p11-kit-debuginfo-0.23.22-1.cm1.x86_64.rpm p11-kit-devel-0.23.22-1.cm1.x86_64.rpm From 3293870b144fb94db8506003b85fecd5ca01a799 Mon Sep 17 00:00:00 2001 From: Jon Slobodzian Date: Sun, 23 May 2021 18:56:21 -0700 Subject: [PATCH 54/83] Fix build break. Revert "Add Jitterentropy to OpenSSL (#928)" This reverts commit 192cf25f8d126c33a8c48b91065b8189f12eb9b1. --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 1 - .../jitterentropy.signatures.json | 5 - SPECS/jitterentropy/jitterentropy.spec | 69 ------- .../openssl/openssl-1.1.1-jitterentropy.patch | 193 ------------------ SPECS/openssl/openssl.spec | 10 +- cgmanifest.json | 10 - .../manifests/package/pkggen_core_aarch64.txt | 12 +- .../manifests/package/pkggen_core_x86_64.txt | 12 +- .../manifests/package/toolchain_aarch64.txt | 12 +- .../manifests/package/toolchain_x86_64.txt | 12 +- 11 files changed, 27 insertions(+), 311 deletions(-) delete mode 100644 SPECS/jitterentropy/jitterentropy.signatures.json delete mode 100644 SPECS/jitterentropy/jitterentropy.spec delete mode 100644 SPECS/openssl/openssl-1.1.1-jitterentropy.patch diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index fbface09959..6ad929f8784 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -3,7 +3,7 @@ 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) | archivemount
      at
      attr
      autoconf213
      babeltrace2
      bmake
      brotli
      busybox
      byacc
      calamares
      catch
      chrony
      conntrack-tools
      cpprest
      cryptsetup
      CUnit
      dnf
      docbook5-schemas
      dos2unix
      ebtables
      extra-cmake-modules
      fuse-zip
      gnu-efi
      hardening-check
      heimdal
      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
      libstoragemgmt
      libxcrypt
      libzip
      mailcap
      mokutil
      mozjs60
      oath-toolkit
      open-vm-tools
      openssl
      p11-kit
      p7zip
      perl-JSON
      pugixml
      python-google-auth
      python-jwt
      python-kubernetes
      python-pexpect
      python-ptyprocess
      python-pywbem
      qt5-qtbase
      qt5-qtdeclarative
      qt5-qtsvg
      qt5-qttools
      qt5-rpm-macros
      rdma-core
      sgml-common
      sos
      squashfs-tools
      uclibc-ng
      uuid
      websocketpp
      words
      xmlstarlet
      yaml-cpp
      yasm
      zipper | -| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
      auoms
      azure-iot-sdk-c
      azure-iotedge
      azure-storage-cpp
      blobfuse
      bmon
      bond
      bpftrace
      ccache
      clamav
      cloud-hypervisor
      cloud-init-vmware-guestinfo
      coredns-1.6.7
      coredns-1.7.0
      distroless-packages
      dtc
      espeak-ng
      espeakup
      flannel
      fluent-bit
      freefont
      gflags
      go-md2man
      grpc
      GSL
      installkernel
      ivykis
      jitterentropy
      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
      libiothsm-std
      libmaxminddb
      libuv
      libxml++
      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
      ntopng
      omi
      pcaudiolib
      pcre2
      perl-Test-Warnings
      perl-Text-Template
      pigz
      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 | +| Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | aspnetcore-runtime-3.1
      auoms
      azure-iot-sdk-c
      azure-iotedge
      azure-storage-cpp
      blobfuse
      bmon
      bond
      bpftrace
      ccache
      clamav
      cloud-hypervisor
      cloud-init-vmware-guestinfo
      coredns-1.6.7
      coredns-1.7.0
      distroless-packages
      dtc
      espeak-ng
      espeakup
      flannel
      fluent-bit
      freefont
      gflags
      go-md2man
      grpc
      GSL
      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
      libiothsm-std
      libmaxminddb
      libuv
      libxml++
      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
      ntopng
      omi
      pcaudiolib
      pcre2
      perl-Test-Warnings
      perl-Text-Template
      pigz
      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
      dotnet-runtime-3.1
      dotnet-sdk-3.1
      dracut
      dstat
      e2fsprogs
      ed
      efibootmgr
      efivar
      elfutils
      erlang
      etcd-3.4.13
      etcd-3.4.3
      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
      gmp
      gnome-common
      gnupg2
      gnuplot
      gnutls
      gobject-introspection
      golang-1.15
      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-8.11.4
      nodejs-9.11.2
      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 | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 72fb1d3ed67..76674294df6 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -127,7 +127,6 @@ "GSL", "installkernel", "ivykis", - "jitterentropy", "jsonbuilder", "kubernetes-1.18.14", "kubernetes-1.18.17", diff --git a/SPECS/jitterentropy/jitterentropy.signatures.json b/SPECS/jitterentropy/jitterentropy.signatures.json deleted file mode 100644 index 2c99d1edf14..00000000000 --- a/SPECS/jitterentropy/jitterentropy.signatures.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Signatures": { - "jitterentropy-library-3.0.2.tar.gz": "5be868e343c25e24312f5e6894642ce1044994b99d6676430c760584a1b1613e" - } -} \ No newline at end of file diff --git a/SPECS/jitterentropy/jitterentropy.spec b/SPECS/jitterentropy/jitterentropy.spec deleted file mode 100644 index 402a8ba8cf8..00000000000 --- a/SPECS/jitterentropy/jitterentropy.spec +++ /dev/null @@ -1,69 +0,0 @@ -%define debug_package %{nil} -Summary: Library implementing the jitter entropy source -Name: jitterentropy -# NOTE: this package should be used only by OpenSSL -# Since OpenSSL has a static link to this package, -# OpenSSL release must be bumped when this package is updated. -Version: 3.0.2 -Release: 1%{?dist} -License: BSD OR GPLv2 -Vendor: Microsoft Corporation -Distribution: Mariner -Group: System Environment/Security -URL: https://github.com/smuellerDD/jitterentropy-library -#Source0: https://github.com/smuellerDD/%%{name}-library/archive/refs/tags/v%%{version}.tar.gz -Source0: %{name}-library-%{version}.tar.gz -BuildRequires: gcc -BuildRequires: make - -%description -The Jitter RNG provides a noise source using the CPU execution timing jitter. -It does not depend on any system resource other than a high-resolution time stamp. -It is a small-scale, yet fast entropy source that is viable in almost all environments and on a lot of CPU architectures. - -%package devel -Summary: Development Libraries for jitterentropy -Group: Development/Libraries - -%description devel -The jitterentropy-devel package contains include files and shared libraries -needed to develop applications that use jitterentropy. - -%package static -Summary: Libraries for static linking of applications which will use jitterentropy -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} - -%description static -The jitterentropy-static package contains static libraries needed for static linking of -applications which use jitterentropy. - -%prep -%autosetup -n %{name}-library-%{version} -p1 - -%build -export CFLAGS='-DOPENSSL -DOPENSSL_FIPS' -make - -%install -mkdir -p %{buildroot}%{_includedir} -make install-static install-includes install-shared DESTDIR=%{buildroot} PREFIX=%{_prefix} - -# Rename static library to libjitterentropy-openssl -mv %{buildroot}/%{_libdir}/lib%{name}.a %{buildroot}/%{_libdir}/lib%{name}-openssl.a - -%files -%doc README.md -%license COPYING COPYING.bsd COPYING.gplv2 -%{_libdir}/libjitterentropy.so.3* - -%files devel -%{_libdir}/libjitterentropy.so -%{_includedir}/* - -%files static -%{_libdir}/lib%{name}-openssl.a - -%changelog -* Wed Apr 14 2021 Nicolas Ontiveros - 3.0.2-1 -- Original version for CBL-Mariner. License verified. diff --git a/SPECS/openssl/openssl-1.1.1-jitterentropy.patch b/SPECS/openssl/openssl-1.1.1-jitterentropy.patch deleted file mode 100644 index a617f689c6c..00000000000 --- a/SPECS/openssl/openssl-1.1.1-jitterentropy.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff --git a/crypto/fips/build.info b/crypto/fips/build.info -index 2859a08..1d97ca7 100644 ---- a/crypto/fips/build.info -+++ b/crypto/fips/build.info -@@ -1,6 +1,6 @@ - LIBS=../../libcrypto - SOURCE[../../libcrypto]=\ -- fips_aes_selftest.c fips_des_selftest.c fips_hmac_selftest.c \ -+ fips_aes_selftest.c fips_des_selftest.c fips_entropy.c fips_hmac_selftest.c \ - fips_rsa_selftest.c fips_sha_selftest.c fips.c fips_dsa_selftest.c \ - fips_post.c fips_drbg_ctr.c fips_drbg_hash.c fips_drbg_hmac.c \ - fips_drbg_lib.c fips_drbg_rand.c fips_drbg_selftest.c fips_rand_lib.c \ -diff --git a/crypto/fips/fips.c b/crypto/fips/fips.c -index 3b9d3e9..b3e0f43 100644 ---- a/crypto/fips/fips.c -+++ b/crypto/fips/fips.c -@@ -454,6 +454,14 @@ int FIPS_module_mode_set(int onoff) - - fips_post = 1; - -+ if (!FIPS_init_entropy()) { -+ FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET, -+ FIPS_R_ENTROPY_INIT_FAILED); -+ fips_selftest_fail = 1; -+ ret = 0; -+ goto end; -+ } -+ - if (!FIPS_selftest()) { - fips_selftest_fail = 1; - ret = 0; -diff --git a/crypto/fips/fips_entropy.c b/crypto/fips/fips_entropy.c -new file mode 100644 -index 0000000..098dc91 ---- /dev/null -+++ b/crypto/fips/fips_entropy.c -@@ -0,0 +1,53 @@ -+# include -+# include -+ -+#include "crypto/fips.h" -+ -+static int fips_entropy_init = 0; -+ -+int FIPS_init_entropy(void) -+{ -+ int rv = 1; -+ -+ if (jent_entropy_init() != 0) { -+ rv = 0; -+ } else { -+ fips_entropy_init = 1; -+ } -+ -+ return rv; -+} -+ -+ssize_t FIPS_jitter_entropy(unsigned char *buf, size_t buflen) -+{ -+ ssize_t ent_bytes = -1; -+ struct rand_data* ec = NULL; -+ -+ if (buf == NULL || buflen == 0) { -+ goto end; -+ } -+ -+ /* Ensure entropy source has been initiated */ -+ if (!fips_entropy_init) { -+ if (!FIPS_init_entropy()) { -+ goto end; -+ } -+ } -+ -+ /* Allocate entropy collector */ -+ ec = jent_entropy_collector_alloc(1, JENT_FORCE_FIPS); -+ if (ec == NULL) { -+ goto end; -+ } -+ -+ /* Get entropy */ -+ ent_bytes = jent_read_entropy(ec, (char *)buf, buflen); -+ -+end: -+ /* Free entropy collector */ -+ if (ec != NULL) { -+ jent_entropy_collector_free(ec); -+ } -+ -+ return ent_bytes; -+} -\ No newline at end of file -diff --git a/crypto/fips/fips_err.h b/crypto/fips/fips_err.h -index 3cf8d69..9a9c9a1 100644 ---- a/crypto/fips/fips_err.h -+++ b/crypto/fips/fips_err.h -@@ -138,6 +138,7 @@ static ERR_STRING_DATA FIPS_str_reasons[] = { - {ERR_REASON(FIPS_R_DRBG_NOT_INITIALISED), "drbg not initialised"}, - {ERR_REASON(FIPS_R_DRBG_STUCK), "drbg stuck"}, - {ERR_REASON(FIPS_R_ENTROPY_ERROR_UNDETECTED), "entropy error undetected"}, -+ {ERR_REASON(FIPS_R_ENTROPY_INIT_FAILED), "entropy init failed"}, - {ERR_REASON(FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED), - "entropy not requested for reseed"}, - {ERR_REASON(FIPS_R_ENTROPY_SOURCE_STUCK), "entropy source stuck"}, -diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c -index 5ed97cb..4c2d54e 100644 ---- a/crypto/rand/rand_unix.c -+++ b/crypto/rand/rand_unix.c -@@ -634,9 +634,37 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) - return rand_pool_entropy_available(pool); - # else - size_t entropy_available; -+ int in_post; -+ -+#ifdef OPENSSL_FIPS -+ if (FIPS_mode()) { -+ /* Use jitter entropy in FIPS mode */ -+ for (in_post = fips_in_post(); in_post >= 0; --in_post) { -+ size_t bytes_needed; -+ unsigned char *buffer; -+ ssize_t bytes; -+ /* Maximum allowed number of consecutive unsuccessful attempts */ -+ int attempts = 3; -+ -+ bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/); -+ while (bytes_needed !=0 && attempts-- > 0) { -+ buffer = rand_pool_add_begin(pool, bytes_needed); -+ bytes = FIPS_jitter_entropy(buffer, bytes_needed); -+ if (bytes > 0) { -+ rand_pool_add_end(pool, bytes, 8 * bytes); -+ bytes_needed -= bytes; -+ attempts = 3; /* reset counter after successful attempt */ -+ } else if (bytes < 0) { -+ break; -+ } -+ } -+ } -+ entropy_available = rand_pool_entropy_available(pool); -+ return entropy_available; -+ } -+#endif - - # if defined(OPENSSL_RAND_SEED_GETRANDOM) -- int in_post; - - for (in_post = fips_in_post(); in_post >= 0; --in_post) { - { -diff --git a/include/crypto/fips.h b/include/crypto/fips.h -index 564261c..29c4923 100644 ---- a/include/crypto/fips.h -+++ b/include/crypto/fips.h -@@ -94,6 +94,8 @@ void fips_set_selftest_fail(void); - - void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr); - -+ssize_t FIPS_jitter_entropy(unsigned char *buf, size_t buflen); -+ - #else - - # define fips_in_post() 0 -diff --git a/include/openssl/fips.h b/include/openssl/fips.h -index abbe81b..be84e08 100644 ---- a/include/openssl/fips.h -+++ b/include/openssl/fips.h -@@ -78,6 +78,8 @@ extern "C" { - BN_GENCB *cb); - int FIPS_dsa_paramgen_check_g(DSA *dsa); - -+ int FIPS_init_entropy(void); -+ - /* BEGIN ERROR CODES */ - /* The following lines are auto generated by the script mkerr.pl. Any changes - * made after this point may be overwritten when the script is next run. -@@ -153,6 +155,7 @@ extern "C" { - # define FIPS_R_DRBG_NOT_INITIALISED 152 - # define FIPS_R_DRBG_STUCK 103 - # define FIPS_R_ENTROPY_ERROR_UNDETECTED 104 -+# define FIPS_R_ENTROPY_INIT_FAILED 158 - # define FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED 105 - # define FIPS_R_ENTROPY_SOURCE_STUCK 142 - # define FIPS_R_ERROR_INITIALISING_DRBG 115 -diff --git a/util/libcrypto.num b/util/libcrypto.num -index 2e47840..e354631 100644 ---- a/util/libcrypto.num -+++ b/util/libcrypto.num -@@ -4634,4 +4634,5 @@ EVP_KDF_vctrl 6594 1_1_1b EXIST::FUNCTION: - EVP_KDF_ctrl_str 6595 1_1_1b EXIST::FUNCTION: - EVP_KDF_size 6596 1_1_1b EXIST::FUNCTION: - EVP_KDF_derive 6597 1_1_1b EXIST::FUNCTION: --EC_GROUP_check_named_curve 6598 1_1_1g EXIST::FUNCTION:EC -\ No newline at end of file -+EC_GROUP_check_named_curve 6598 1_1_1g EXIST::FUNCTION:EC -+FIPS_init_entropy 6599 1_1_1k EXIST::FUNCTION: -\ No newline at end of file diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index 565f29e3e59..267c1b0082c 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -4,7 +4,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.1k -Release: 3%{?dist} +Release: 2%{?dist} License: OpenSSL Vendor: Microsoft Corporation Distribution: Mariner @@ -39,8 +39,6 @@ Patch16: openssl-1.1.1-s390x-ecc.patch Patch17: openssl-1.1.1-kdf-selftest.patch Patch18: openssl-1.1.1-fips-curves.patch Patch19: openssl-1.1.1-sp80056arev3.patch -Patch20: openssl-1.1.1-jitterentropy.patch -BuildRequires: jitterentropy-static BuildRequires: perl-Test-Warnings BuildRequires: perl-Text-Template Requires: %{name}-libs = %{version}-%{release} @@ -126,7 +124,6 @@ cp %{SOURCE4} test/ %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %build # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be @@ -148,7 +145,7 @@ export HASHBANGPERL=%{_bindir}/perl # Issue link: https://github.com/openssl/openssl/issues/7048. # For more details please read the comment inside the patch. ./config \ - --prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls --libdir=lib -ljitterentropy-openssl \ + --prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls --libdir=lib \ shared \ no-aria \ enable-bf \ @@ -321,9 +318,6 @@ rm -rf %{buildroot} %changelog -* Tue May 18 2021 Nicolas Ontiveros - 1.1.1k-3 -- In FIPS mode, use only jitterentropy - * Tue May 11 2021 Nicolas Ontiveros - 1.1.1k-2 - Remove FIPS DRBG rewire patch diff --git a/cgmanifest.json b/cgmanifest.json index 4fdda70f53d..e0e3dfc0cf5 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2060,16 +2060,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "jitterentropy", - "version": "3.0.2", - "downloadUrl": "https://github.com/smuellerDD/jitterentropy-library/archive/refs/tags/v3.0.2.tar.gz" - } - } - }, { "component": { "type": "other", diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index f4922cf91ff..0959be6e22f 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.aarch64.rpm texinfo-6.5-7.cm1.aarch64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-3.cm1.aarch64.rpm -openssl-devel-1.1.1k-3.cm1.aarch64.rpm -openssl-libs-1.1.1k-3.cm1.aarch64.rpm -openssl-perl-1.1.1k-3.cm1.aarch64.rpm -openssl-static-1.1.1k-3.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-3.cm1.aarch64.rpm +openssl-1.1.1k-2.cm1.aarch64.rpm +openssl-devel-1.1.1k-2.cm1.aarch64.rpm +openssl-libs-1.1.1k-2.cm1.aarch64.rpm +openssl-perl-1.1.1k-2.cm1.aarch64.rpm +openssl-static-1.1.1k-2.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm libcap-2.26-2.cm1.aarch64.rpm libcap-devel-2.26-2.cm1.aarch64.rpm libdb-5.3.28-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 6389b1e5036..7c60500edce 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.x86_64.rpm texinfo-6.5-7.cm1.x86_64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-3.cm1.x86_64.rpm -openssl-devel-1.1.1k-3.cm1.x86_64.rpm -openssl-libs-1.1.1k-3.cm1.x86_64.rpm -openssl-perl-1.1.1k-3.cm1.x86_64.rpm -openssl-static-1.1.1k-3.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-3.cm1.x86_64.rpm +openssl-1.1.1k-2.cm1.x86_64.rpm +openssl-devel-1.1.1k-2.cm1.x86_64.rpm +openssl-libs-1.1.1k-2.cm1.x86_64.rpm +openssl-perl-1.1.1k-2.cm1.x86_64.rpm +openssl-static-1.1.1k-2.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm libcap-2.26-2.cm1.x86_64.rpm libcap-devel-2.26-2.cm1.x86_64.rpm libdb-5.3.28-4.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 85b6ef85dd0..dd6cc414a20 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.aarch64.rpm openjdk8-sample-1.8.0.292-1.cm1.aarch64.rpm openjdk8-src-1.8.0.292-1.cm1.aarch64.rpm openjre8-1.8.0.292-1.cm1.aarch64.rpm -openssl-1.1.1k-3.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-3.cm1.aarch64.rpm -openssl-devel-1.1.1k-3.cm1.aarch64.rpm -openssl-libs-1.1.1k-3.cm1.aarch64.rpm -openssl-perl-1.1.1k-3.cm1.aarch64.rpm -openssl-static-1.1.1k-3.cm1.aarch64.rpm +openssl-1.1.1k-2.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm +openssl-devel-1.1.1k-2.cm1.aarch64.rpm +openssl-libs-1.1.1k-2.cm1.aarch64.rpm +openssl-perl-1.1.1k-2.cm1.aarch64.rpm +openssl-static-1.1.1k-2.cm1.aarch64.rpm p11-kit-0.23.22-1.cm1.aarch64.rpm p11-kit-debuginfo-0.23.22-1.cm1.aarch64.rpm p11-kit-devel-0.23.22-1.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 8654b406717..bf43575ee97 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.x86_64.rpm openjdk8-sample-1.8.0.292-1.cm1.x86_64.rpm openjdk8-src-1.8.0.292-1.cm1.x86_64.rpm openjre8-1.8.0.292-1.cm1.x86_64.rpm -openssl-1.1.1k-3.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-3.cm1.x86_64.rpm -openssl-devel-1.1.1k-3.cm1.x86_64.rpm -openssl-libs-1.1.1k-3.cm1.x86_64.rpm -openssl-perl-1.1.1k-3.cm1.x86_64.rpm -openssl-static-1.1.1k-3.cm1.x86_64.rpm +openssl-1.1.1k-2.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm +openssl-devel-1.1.1k-2.cm1.x86_64.rpm +openssl-libs-1.1.1k-2.cm1.x86_64.rpm +openssl-perl-1.1.1k-2.cm1.x86_64.rpm +openssl-static-1.1.1k-2.cm1.x86_64.rpm p11-kit-0.23.22-1.cm1.x86_64.rpm p11-kit-debuginfo-0.23.22-1.cm1.x86_64.rpm p11-kit-devel-0.23.22-1.cm1.x86_64.rpm From 961af3abcfbe126bf66b6b0bda4350c6a7d7c758 Mon Sep 17 00:00:00 2001 From: nicolas guibourge Date: Mon, 24 May 2021 16:12:43 -0700 Subject: [PATCH 55/83] Nicogbg/k8s hotfix may release (#977) * take latest k8s hotfix 05-19-2021 * update signatures and release numbers Co-authored-by: Nicolas Guibourge --- SPECS/kubernetes/kubernetes-1.18.17.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.18.17.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.19.9.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.19.9.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.20.5.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.20.5.spec | 9 ++++++--- SPECS/kubernetes/version-file-1.18.17.sh | 4 ++-- SPECS/kubernetes/version-file-1.19.9.sh | 4 ++-- SPECS/kubernetes/version-file-1.20.5.sh | 4 ++-- cgmanifest.json | 6 +++--- 10 files changed, 33 insertions(+), 24 deletions(-) diff --git a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json index c6c7c6bb233..2435fe55b01 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json @@ -2,7 +2,7 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.17-hotfix.20210505.tar.gz": "0dae63a4ae89894f417b4370a9f5531cd2c0ae8aaed4393720d7e32dc87f54c4", - "version-file-1.18.17.sh": "1e36b3f8112b3e3a25b624cad1a6dbf581c967567eb1f2026158119d0f5e6ef0" + "kubernetes-node-linux-amd64-1.18.17-hotfix.20210519.tar.gz": "d58dc5033229e790b152a44aca32c5a4b055bd081f85c65f6dcdb5db80742339", + "version-file-1.18.17.sh": "9798beb1daeada7694044b814f43617f8395358a4fb06d07cf92ddcf0ccc7f6f" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.17.spec b/SPECS/kubernetes/kubernetes-1.18.17.spec index c3c6e3cc64d..046e0bda582 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.spec +++ b/SPECS/kubernetes/kubernetes-1.18.17.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.17 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210519.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh Source3: golang-1.15-k8s-1.18-test.patch @@ -275,6 +275,9 @@ fi %{_bindir}/pause %changelog +* Mon May 24 2021 Nicolas Guibourge 1.18.17-5 +- Update to version "1.18.17-hotfix.20210519". + * Tue May 17 2021 Nicolas Guibourge 1.18.17-4 - Manually set version variables. diff --git a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json index 5163813b03e..1adc29edfcd 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.9-hotfix.20210505.tar.gz": "c3113cdecf5ae317fac264c67571bfda3eeb58d7ba3780ec5fddfbe83238b052", - "version-file-1.19.9.sh": "c2a7312e4d376f24e0a85af74dfbe91ed370fe8960d3def0d499fc0698100bc9" + "kubernetes-node-linux-amd64-1.19.9-hotfix.20210519.tar.gz": "1054f15a632fdef7b6a9f2502b37cc574bfc776656b4c14f657f3dfd7745cd90", + "version-file-1.19.9.sh": "5386f01ec8c3baf118aaf320a78d5582bd3e9ccfb103dd12aff704b07e6fdd34" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.9.spec b/SPECS/kubernetes/kubernetes-1.19.9.spec index 640ca364b1b..64ac80f1ea2 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.spec +++ b/SPECS/kubernetes/kubernetes-1.19.9.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.9 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210519.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -271,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Mon May 24 2021 Nicolas Guibourge 1.19.9-5 +- Update to version "1.19.9-hotfix.20210519". + * Tue May 17 2021 Nicolas Guibourge 1.19.9-4 - Manually set version variables. diff --git a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json index 38d5f93724b..21291852746 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.5-hotfix.20210505.tar.gz": "718342c353ab6aa430a0f4be2e6e5eb122da74beb5815dfaf3b0fd4c9dee57f4", - "version-file-1.20.5.sh": "8fccf5b3dc34ca43ab9c39f7bc817be6094299b6352aed9ab0325a77353c2f3e" + "kubernetes-node-linux-amd64-1.20.5-hotfix.20210519.tar.gz": "709379c8c3d09e044b4c24d59a7aba2e3f724f1e0aecbf93d05f78cc320db27a", + "version-file-1.20.5.sh": "2b050242db3d32762705545eb2606f527aa2ee01d55af1603eada4c39efccff0" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.5.spec b/SPECS/kubernetes/kubernetes-1.20.5.spec index cada3903d58..da93ffcf451 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.spec +++ b/SPECS/kubernetes/kubernetes-1.20.5.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.5 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210505.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210519.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -271,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Mon May 24 2021 Nicolas Guibourge 1.20.5-5 +- Update to version "1.20.5-hotfix.20210519". + * Tue May 17 2021 Nicolas Guibourge 1.20.5-4 - Manually set version variables. diff --git a/SPECS/kubernetes/version-file-1.18.17.sh b/SPECS/kubernetes/version-file-1.18.17.sh index 51fe8b5564f..1a15742efff 100755 --- a/SPECS/kubernetes/version-file-1.18.17.sh +++ b/SPECS/kubernetes/version-file-1.18.17.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='89dfc218f902e4673e21dd0d53fabab330b8ff8d' +KUBE_GIT_COMMIT='5871d3360e3612052babed0c1e2f0da18389cdaa' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.18.17-hotfix.20210505' +KUBE_GIT_VERSION='v1.18.17-hotfix.20210519' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='18+' diff --git a/SPECS/kubernetes/version-file-1.19.9.sh b/SPECS/kubernetes/version-file-1.19.9.sh index de502b28a04..474359092eb 100755 --- a/SPECS/kubernetes/version-file-1.19.9.sh +++ b/SPECS/kubernetes/version-file-1.19.9.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='f7f4d8da3c33240c5eefeb09ead466e3e7e171b6' +KUBE_GIT_COMMIT='c1ad2bc44e0c7f19a9db0879f7182ff556a8e5b4' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.19.9-hotfix.20210505' +KUBE_GIT_VERSION='v1.19.9-hotfix.20210519' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='19+' diff --git a/SPECS/kubernetes/version-file-1.20.5.sh b/SPECS/kubernetes/version-file-1.20.5.sh index 6dfbbb37427..0ee71a7a3c8 100755 --- a/SPECS/kubernetes/version-file-1.20.5.sh +++ b/SPECS/kubernetes/version-file-1.20.5.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='8337600e5ea8f2365e283542b0369b530fd78326' +KUBE_GIT_COMMIT='9a45ba1752db920873e084791faff8d470278b09' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.20.5-hotfix.20210505' +KUBE_GIT_VERSION='v1.20.5-hotfix.20210519' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='20+' diff --git a/cgmanifest.json b/cgmanifest.json index 61cc505fa6b..f676c677f70 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2276,7 +2276,7 @@ "other": { "name": "kubernetes", "version": "1.18.17", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2296,7 +2296,7 @@ "other": { "name": "kubernetes", "version": "1.19.9", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2316,7 +2316,7 @@ "other": { "name": "kubernetes", "version": "1.20.5", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210505/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, From 99d1a7c305eb50a67898d750bd4c4a91e28584a0 Mon Sep 17 00:00:00 2001 From: Joseph Knierman Date: Mon, 24 May 2021 17:02:46 -0700 Subject: [PATCH 56/83] Added Nvidia-Docker2 Packaged to Enable GPU Use on Docker (#967) * added spec file for nvidia-docker2 * updated licenses * updated source0 url * changes from linter --- SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md | 2 +- SPECS/LICENSES-AND-NOTICES/data/licenses.json | 3 +- .../nvidia-docker2.signatures.json | 5 ++ SPECS/nvidia-docker2/nvidia-docker2.spec | 56 +++++++++++++++++++ cgmanifest.json | 10 ++++ 5 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 SPECS/nvidia-docker2/nvidia-docker2.signatures.json create mode 100644 SPECS/nvidia-docker2/nvidia-docker2.spec diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index d604e92fe49..54ac10c1c78 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -7,6 +7,6 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | 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
      dotnet-runtime-3.1
      dotnet-sdk-3.1
      dracut
      dstat
      e2fsprogs
      ed
      efibootmgr
      efivar
      elfutils
      erlang
      etcd-3.4.13
      etcd-3.4.3
      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
      gmp
      gnome-common
      gnupg2
      gnuplot
      gnutls
      gobject-introspection
      golang-1.15
      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-8.11.4
      nodejs-9.11.2
      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) | nvidia-container-runtime
      nvidia-container-toolkit | +| Nvidia | [ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | nvidia-container-runtime
      nvidia-container-toolkit
      nvidia-docker2 | | Magnus Edenhill Open Source | [Magnus Edenhill Open Source BSD License](https://github.com/jemalloc/jemalloc/blob/dev/COPYING) | librdkafka | | Ceph | [LGPL2.1](https://github.com/ceph/ceph/blob/master/COPYING-LGPL2.1) | ceph | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index b6c4001f8e2..6147b94e4cf 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -809,7 +809,8 @@ "license": "[ASL 2.0 License](http://www.apache.org/licenses/LICENSE-2.0)", "specs": [ "nvidia-container-runtime", - "nvidia-container-toolkit" + "nvidia-container-toolkit", + "nvidia-docker2" ] }, { diff --git a/SPECS/nvidia-docker2/nvidia-docker2.signatures.json b/SPECS/nvidia-docker2/nvidia-docker2.signatures.json new file mode 100644 index 00000000000..e69d6fa38de --- /dev/null +++ b/SPECS/nvidia-docker2/nvidia-docker2.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "nvidia-docker-2.6.0.tar.gz": "a2f41b91770e45d3f7e6d361be720573a20e88ea33d4f8c7984b6b0cfdc57214" + } +} \ No newline at end of file diff --git a/SPECS/nvidia-docker2/nvidia-docker2.spec b/SPECS/nvidia-docker2/nvidia-docker2.spec new file mode 100644 index 00000000000..b941eb8f779 --- /dev/null +++ b/SPECS/nvidia-docker2/nvidia-docker2.spec @@ -0,0 +1,56 @@ +%global debug_package %{nil} +Summary: nvidia-docker CLI wrapper +Name: nvidia-docker2 +Version: 2.6.0 +Release: 2%{?dist} +License: ASL2.0 +Vendor: Microsoft Corporation +Distribution: Mariner +Group: Development Tools +URL: https://github.com/NVIDIA/nvidia-docker +#Source0: https://github.com/NVIDIA/nvidia-docker/archive/v%%{version}.tar.gz +Source0: nvidia-docker-%{version}.tar.gz +Requires: nvidia-container-runtime >= 3.4.2 +Conflicts: nvidia-docker < 2.0.0 +BuildArch: noarch + +%description +Replaces nvidia-docker with a new implementation based on nvidia-container-runtime + +%prep +%autosetup -n nvidia-docker-%{version} +cp nvidia-docker daemon.json LICENSE .. + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 755 -t %{buildroot}%{_bindir} nvidia-docker +mkdir -p %{buildroot}%{_sysconfdir}/docker +install -m 644 -t %{buildroot}%{_sysconfdir}/docker daemon.json + +%files +%license LICENSE +%{_bindir}/nvidia-docker +%config %{_sysconfdir}/docker/daemon.json + +%changelog +* Wed May 19 2021 Joseph Knierman - 2.6.0-2 +- License verified +- Initial CBL-Mariner import from NVIDIA (license: ASL 2.0). + +* Thu Apr 29 2021 NVIDIA CORPORATION 2.6.0-1 +- Add dependence on nvidia-container-runtime >= 3.5.0 +- Add Jenkinsfile for building packages + +* Wed Sep 16 2020 NVIDIA CORPORATION 2.5.0-1 +- Bump version to v2.5.0 +- Add dependence on nvidia-container-runtime >= 3.4.0 +- Update readme to point to the official documentatio +- Add %config directive to daemon.json for RPM installations + +* Wed Jul 08 2020 NVIDIA CORPORATION 2.4.0-1 +- 09a01276 Update package license to match source license +- b9c70155 Update dependence on nvidia-container-runtime to 3.3.0 + +* Fri May 15 2020 NVIDIA CORPORATION 2.3.0-1 +- 0d3b049a Update build system to support multi-arch builds +- 8557216d Require new MIG changes diff --git a/cgmanifest.json b/cgmanifest.json index f676c677f70..ba0a13824a6 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3980,6 +3980,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "nvidia-docker2", + "version": "2.6.0", + "downloadUrl": "https://github.com/NVIDIA/nvidia-docker/archive/v2.6.0.tar.gz" + } + } + }, { "component": { "type": "other", From 238a64108b07f3ed9c4938b7f90f4a49b4523e20 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Tue, 25 May 2021 01:18:01 -0700 Subject: [PATCH 57/83] Updating `nvidia-container-toolkit` signature to match source. (#979) --- .../nvidia-container-toolkit.signatures.json | 2 +- SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json index c75ed74d262..630c687713c 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "nvidia-container-toolkit-1.4.2-vendor.tar.gz": "bb77da74cdaedfac1f3df70b91713d60eaabeae813b14e634d671dc0c28d334f", + "nvidia-container-toolkit-1.4.2-vendor.tar.gz": "32756c8c17fb13328b72096d21ed83795c6b33705c7eddcd86c828799fb47329", "nvidia-container-toolkit-1.4.2.tar.gz": "8c3ff8dd96812dcc2c09b203d2749fcba51941e33387aba1bca4da2f87065a0c" } } diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec index 5c17cca2d79..4fcb57f79b8 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -8,7 +8,7 @@ Vendor: Microsoft Corporation Distribution: Mariner URL: https://github.com/NVIDIA/nvidia-container-runtime #Source0: https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz -Source0: nvidia-container-toolkit-1.4.2.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: From 90903bd2ebf346edd9567d8cbc88d1c7353330cf Mon Sep 17 00:00:00 2001 From: Christopher Co <35273088+christopherco@users.noreply.github.com> Date: Tue, 25 May 2021 08:32:22 -0700 Subject: [PATCH 58/83] kernel: Fix build break in aarch64 build (#975) AARCH64 kernel package builds were failing because certain configs were missing from the config file. CONFIG_ARM64_PTR_AUTH=y CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y CONFIG_ARM64_AS_HAS_MTE=y CONFIG_ARM64_MTE=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y These configs became active when we upgraded binutils to 2.36. The new assembler has changed the default value of some of these configs. So let's add the expected configs into our config file. Signed-off-by: Chris Co --- SPECS/kernel/config_aarch64 | 5 +++++ SPECS/kernel/kernel.signatures.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index 0380a2379f5..e5a7ad144a2 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -450,9 +450,11 @@ CONFIG_ARM64_CNP=y # # ARMv8.3 architectural features # +CONFIG_ARM64_PTR_AUTH=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_PAC=y +CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features # @@ -470,6 +472,8 @@ CONFIG_ARM64_BTI=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARCH_RANDOM=y +CONFIG_ARM64_AS_HAS_MTE=y +CONFIG_ARM64_MTE=y # end of ARMv8.5 architectural features CONFIG_ARM64_SVE=y @@ -1070,6 +1074,7 @@ CONFIG_IDLE_PAGE_TRACKING=y CONFIG_ARCH_HAS_PTE_DEVMAP=y CONFIG_HMM_MIRROR=y CONFIG_FRAME_VECTOR=y +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index ad0eb99bcbe..55d25713315 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "config": "24b55a258faf50ade68096d2c720cd475b1835704f32c1d059b80d5f12902aff", - "config_aarch64": "34574d361235d37f98b4b0cb50941ca22351cb8112da2e26c977aff83d788304", + "config_aarch64": "8723afa7c230379e50ef66be8846ba1f4686210db360f47b1f989651fa54a3a2", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } From 7b88264e01b465a196beff9fb1fab98828afedbe Mon Sep 17 00:00:00 2001 From: Nicolas Ontiveros <54044510+niontive@users.noreply.github.com> Date: Tue, 25 May 2021 14:32:05 -0700 Subject: [PATCH 59/83] Use jitterentropy in OpenSSL (#978) * Add Jitterentropy to OpenSSL (#928) Co-authored-by: Pawel Winogrodzki * Remove jent package from Mariner * Remove jent from openssl BR * Remove jent library from openssl config * Add jent source code to openssl jent patch Co-authored-by: Pawel Winogrodzki --- .../openssl/openssl-1.1.1-jitterentropy.patch | 2122 +++++++++++++++++ SPECS/openssl/openssl.spec | 10 +- .../manifests/package/pkggen_core_aarch64.txt | 12 +- .../manifests/package/pkggen_core_x86_64.txt | 12 +- .../manifests/package/toolchain_aarch64.txt | 12 +- .../manifests/package/toolchain_x86_64.txt | 12 +- 6 files changed, 2154 insertions(+), 26 deletions(-) create mode 100644 SPECS/openssl/openssl-1.1.1-jitterentropy.patch diff --git a/SPECS/openssl/openssl-1.1.1-jitterentropy.patch b/SPECS/openssl/openssl-1.1.1-jitterentropy.patch new file mode 100644 index 00000000000..7308baa8b96 --- /dev/null +++ b/SPECS/openssl/openssl-1.1.1-jitterentropy.patch @@ -0,0 +1,2122 @@ +diff --git a/crypto/fips/build.info b/crypto/fips/build.info +index 2859a08..a690d04 100644 +--- a/crypto/fips/build.info ++++ b/crypto/fips/build.info +@@ -1,11 +1,11 @@ + LIBS=../../libcrypto + SOURCE[../../libcrypto]=\ +- fips_aes_selftest.c fips_des_selftest.c fips_hmac_selftest.c \ ++ fips_aes_selftest.c fips_des_selftest.c fips_entropy.c fips_hmac_selftest.c \ + fips_rsa_selftest.c fips_sha_selftest.c fips.c fips_dsa_selftest.c \ + fips_post.c fips_drbg_ctr.c fips_drbg_hash.c fips_drbg_hmac.c \ + fips_drbg_lib.c fips_drbg_rand.c fips_drbg_selftest.c fips_rand_lib.c \ + fips_cmac_selftest.c fips_ecdh_selftest.c fips_ecdsa_selftest.c \ +- fips_dh_selftest.c fips_kdf_selftest.c fips_ers.c ++ fips_dh_selftest.c fips_kdf_selftest.c fips_ers.c jitterentropy-base.c + + PROGRAMS_NO_INST=\ + fips_standalone_hmac +diff --git a/crypto/fips/fips.c b/crypto/fips/fips.c +index 3b9d3e9..b3e0f43 100644 +--- a/crypto/fips/fips.c ++++ b/crypto/fips/fips.c +@@ -454,6 +454,14 @@ int FIPS_module_mode_set(int onoff) + + fips_post = 1; + ++ if (!FIPS_init_entropy()) { ++ FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET, ++ FIPS_R_ENTROPY_INIT_FAILED); ++ fips_selftest_fail = 1; ++ ret = 0; ++ goto end; ++ } ++ + if (!FIPS_selftest()) { + fips_selftest_fail = 1; + ret = 0; +diff --git a/crypto/fips/fips_entropy.c b/crypto/fips/fips_entropy.c +new file mode 100644 +index 0000000..a8943a8 +--- /dev/null ++++ b/crypto/fips/fips_entropy.c +@@ -0,0 +1,53 @@ ++# include ++ ++#include "crypto/fips.h" ++#include "crypto/jitterentropy.h" ++ ++static int fips_entropy_init = 0; ++ ++int FIPS_init_entropy(void) ++{ ++ int rv = 1; ++ ++ if (jent_entropy_init() != 0) { ++ rv = 0; ++ } else { ++ fips_entropy_init = 1; ++ } ++ ++ return rv; ++} ++ ++ssize_t FIPS_jitter_entropy(unsigned char *buf, size_t buflen) ++{ ++ ssize_t ent_bytes = -1; ++ struct rand_data* ec = NULL; ++ ++ if (buf == NULL || buflen == 0) { ++ goto end; ++ } ++ ++ /* Ensure entropy source has been initiated */ ++ if (!fips_entropy_init) { ++ if (!FIPS_init_entropy()) { ++ goto end; ++ } ++ } ++ ++ /* Allocate entropy collector */ ++ ec = jent_entropy_collector_alloc(1, JENT_FORCE_FIPS); ++ if (ec == NULL) { ++ goto end; ++ } ++ ++ /* Get entropy */ ++ ent_bytes = jent_read_entropy(ec, (char *)buf, buflen); ++ ++end: ++ /* Free entropy collector */ ++ if (ec != NULL) { ++ jent_entropy_collector_free(ec); ++ } ++ ++ return ent_bytes; ++} +\ No newline at end of file +diff --git a/crypto/fips/fips_err.h b/crypto/fips/fips_err.h +index 3cf8d69..9a9c9a1 100644 +--- a/crypto/fips/fips_err.h ++++ b/crypto/fips/fips_err.h +@@ -138,6 +138,7 @@ static ERR_STRING_DATA FIPS_str_reasons[] = { + {ERR_REASON(FIPS_R_DRBG_NOT_INITIALISED), "drbg not initialised"}, + {ERR_REASON(FIPS_R_DRBG_STUCK), "drbg stuck"}, + {ERR_REASON(FIPS_R_ENTROPY_ERROR_UNDETECTED), "entropy error undetected"}, ++ {ERR_REASON(FIPS_R_ENTROPY_INIT_FAILED), "entropy init failed"}, + {ERR_REASON(FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED), + "entropy not requested for reseed"}, + {ERR_REASON(FIPS_R_ENTROPY_SOURCE_STUCK), "entropy source stuck"}, +diff --git a/crypto/fips/jitterentropy-base.c b/crypto/fips/jitterentropy-base.c +new file mode 100644 +index 0000000..9fb5b96 +--- /dev/null ++++ b/crypto/fips/jitterentropy-base.c +@@ -0,0 +1,1458 @@ ++/* ++ * Non-physical true random number generator based on timing jitter. ++ * ++ * Copyright Stephan Mueller , 2014 - 2021 ++ * ++ * Design ++ * ====== ++ * ++ * See documentation in doc/ folder. ++ * ++ * Interface ++ * ========= ++ * ++ * See documentation in jitterentropy(3) man page. ++ * ++ * License ++ * ======= ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU General Public License, in which case the provisions of the GPL2 are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF ++ * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT ++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE ++ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH ++ * DAMAGE. ++ */ ++ ++#include "crypto/jitterentropy.h" ++ ++#define MAJVERSION 3 /* API / ABI incompatible changes, functional changes that ++ * require consumer to be updated (as long as this number ++ * is zero, the API is not considered stable and can ++ * change without a bump of the major version) */ ++#define MINVERSION 0 /* API compatible, ABI may change, functional ++ * enhancements only, consumer can be left unchanged if ++ * enhancements are not considered */ ++#define PATCHLEVEL 2 /* API / ABI compatible, no functional changes, no ++ * enhancements, bug fixes only */ ++ ++/*************************************************************************** ++ * Jitter RNG Static Definitions ++ * ++ * None of the following should be altered ++ ***************************************************************************/ ++ ++#ifdef __OPTIMIZE__ ++ #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." ++#endif ++ ++/* ++ * JENT_POWERUP_TESTLOOPCOUNT needs some loops to identify edge ++ * systems. 100 is definitely too little. ++ * ++ * SP800-90B requires at least 1024 initial test cycles. ++ */ ++#define JENT_POWERUP_TESTLOOPCOUNT 1024 ++ ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ++ ++/** ++ * jent_version() - Return machine-usable version number of jent library ++ * ++ * The function returns a version number that is monotonic increasing ++ * for newer versions. The version numbers are multiples of 100. For example, ++ * version 1.2.3 is converted to 1020300 -- the last two digits are reserved ++ * for future use. ++ * ++ * The result of this function can be used in comparing the version number ++ * in a calling program if version-specific calls need to be make. ++ * ++ * @return Version number of jitterentropy library ++ */ ++JENT_PRIVATE_STATIC ++unsigned int jent_version(void) ++{ ++ unsigned int version = 0; ++ ++ version = MAJVERSION * 1000000; ++ version += MINVERSION * 10000; ++ version += PATCHLEVEL * 100; ++ ++ return version; ++} ++ ++/*************************************************************************** ++ * Adaptive Proportion Test ++ * ++ * This test complies with SP800-90B section 4.4.2. ++ ***************************************************************************/ ++ ++/** ++ * Reset the APT counter ++ * ++ * @ec [in] Reference to entropy collector ++ */ ++static void jent_apt_reset(struct rand_data *ec, uint64_t current_delta) ++{ ++ /* Reset APT counter */ ++ ec->apt_count = 0; ++ ec->apt_base = current_delta; ++ ec->apt_observations = 0; ++} ++ ++/** ++ * Insert a new entropy event into APT ++ * ++ * @ec [in] Reference to entropy collector ++ * @current_delta [in] Current time delta ++ */ ++static void jent_apt_insert(struct rand_data *ec, uint64_t current_delta) ++{ ++ /* Initialize the base reference */ ++ if (!ec->apt_base_set) { ++ ec->apt_base = current_delta; ++ ec->apt_base_set = 1; ++ return; ++ } ++ ++ if (current_delta == ec->apt_base) { ++ ec->apt_count++; ++ ++ if (ec->apt_count >= JENT_APT_CUTOFF) ++ ec->health_failure = 1; ++ } ++ ++ ec->apt_observations++; ++ ++ if (ec->apt_observations >= JENT_APT_WINDOW_SIZE) ++ jent_apt_reset(ec, current_delta); ++} ++ ++/*************************************************************************** ++ * Stuck Test and its use as Repetition Count Test ++ * ++ * The Jitter RNG uses an enhanced version of the Repetition Count Test ++ * (RCT) specified in SP800-90B section 4.4.1. Instead of counting identical ++ * back-to-back values, the input to the RCT is the counting of the stuck ++ * values during the generation of one Jitter RNG output block. ++ * ++ * The RCT is applied with an alpha of 2^{-30} compliant to FIPS 140-2 IG 9.8. ++ * ++ * During the counting operation, the Jitter RNG always calculates the RCT ++ * cut-off value of C. If that value exceeds the allowed cut-off value, ++ * the Jitter RNG output block will be calculated completely but discarded at ++ * the end. The caller of the Jitter RNG is informed with an error code. ++ ***************************************************************************/ ++ ++/** ++ * Repetition Count Test as defined in SP800-90B section 4.4.1 ++ * ++ * @ec [in] Reference to entropy collector ++ * @stuck [in] Indicator whether the value is stuck ++ */ ++static void jent_rct_insert(struct rand_data *ec, int stuck) ++{ ++ /* ++ * If we have a count less than zero, a previous RCT round identified ++ * a failure. We will not overwrite it. ++ */ ++ if (ec->rct_count < 0) ++ return; ++ ++ if (stuck) { ++ ec->rct_count++; ++ ++ /* ++ * The cutoff value is based on the following consideration: ++ * alpha = 2^-30 as recommended in FIPS 140-2 IG 9.8. ++ * In addition, we require an entropy value H of 1/OSR as this ++ * is the minimum entropy required to provide full entropy. ++ * Note, we collect 64 * OSR deltas for inserting them into ++ * the entropy pool which should then have (close to) 64 bits ++ * of entropy. ++ * ++ * Note, ec->rct_count (which equals to value B in the pseudo ++ * code of SP800-90B section 4.4.1) starts with zero. Hence ++ * we need to subtract one from the cutoff value as calculated ++ * following SP800-90B. ++ */ ++ if ((unsigned int)ec->rct_count >= (31 * ec->osr)) { ++ ec->rct_count = -1; ++ ec->health_failure = 1; ++ } ++ } else { ++ ec->rct_count = 0; ++ } ++} ++ ++/** ++ * Is there an RCT health test failure? ++ * ++ * @ec [in] Reference to entropy collector ++ * ++ * @return ++ * 0 No health test failure ++ * 1 Permanent health test failure ++ */ ++static int jent_rct_failure(struct rand_data *ec) ++{ ++ if (ec->rct_count < 0) ++ return 1; ++ return 0; ++} ++ ++static inline uint64_t jent_delta(uint64_t prev, uint64_t next) ++{ ++ return (next - prev); ++} ++ ++/** ++ * Stuck test by checking the: ++ * 1st derivative of the jitter measurement (time delta) ++ * 2nd derivative of the jitter measurement (delta of time deltas) ++ * 3rd derivative of the jitter measurement (delta of delta of time deltas) ++ * ++ * All values must always be non-zero. ++ * ++ * @ec [in] Reference to entropy collector ++ * @current_delta [in] Jitter time delta ++ * ++ * @return ++ * 0 jitter measurement not stuck (good bit) ++ * 1 jitter measurement stuck (reject bit) ++ */ ++static unsigned int jent_stuck(struct rand_data *ec, uint64_t current_delta) ++{ ++ uint64_t delta2 = jent_delta(ec->last_delta, current_delta); ++ uint64_t delta3 = jent_delta(ec->last_delta2, delta2); ++ ++ ec->last_delta = current_delta; ++ ec->last_delta2 = delta2; ++ ++ /* ++ * Insert the result of the comparison of two back-to-back time ++ * deltas. ++ */ ++ jent_apt_insert(ec, current_delta); ++ ++ if (!current_delta || !delta2 || !delta3) { ++ /* RCT with a stuck bit */ ++ jent_rct_insert(ec, 1); ++ return 1; ++ } ++ ++ /* RCT with a non-stuck bit */ ++ jent_rct_insert(ec, 0); ++ ++ return 0; ++} ++ ++/** ++ * Report any health test failures ++ * ++ * @ec [in] Reference to entropy collector ++ * ++ * @return ++ * 0 No health test failure ++ * 1 Permanent health test failure ++ */ ++static int jent_health_failure(struct rand_data *ec) ++{ ++ /* Test is only enabled in FIPS mode */ ++ if (!ec->fips_enabled) ++ return 0; ++ ++ return ec->health_failure; ++} ++ ++/*************************************************************************** ++ * Message Digest Implementation ++ ***************************************************************************/ ++#define SHA3_SIZE_BLOCK(bits) ((1600 - 2 * bits) >> 3) ++#define SHA3_256_SIZE_BLOCK SHA3_SIZE_BLOCK(SHA3_256_SIZE_DIGEST_BITS) ++#define SHA3_MAX_SIZE_BLOCK SHA3_256_SIZE_BLOCK ++ ++struct sha_ctx { ++ uint64_t state[25]; ++ size_t msg_len; ++ unsigned int r; ++ unsigned int rword; ++ unsigned int digestsize; ++ uint8_t partial[SHA3_MAX_SIZE_BLOCK]; ++}; ++ ++#define aligned(val) __attribute__((aligned(val))) ++#define ALIGNED_BUFFER(name, size, type) \ ++ type name[(size + sizeof(type)-1) / sizeof(type)] aligned(sizeof(type)); ++ ++/* CTX size allows any hash type up to SHA3-224 */ ++#define SHA_MAX_CTX_SIZE 368 ++#define HASH_CTX_ON_STACK(name) \ ++ ALIGNED_BUFFER(name ## _ctx_buf, SHA_MAX_CTX_SIZE, uint64_t) \ ++ struct sha_ctx *name = (struct sha_ctx *) name ## _ctx_buf ++ ++/* ++ * Conversion of Little-Endian representations in byte streams - the data ++ * representation in the integer values is the host representation. ++ */ ++static inline uint32_t ptr_to_le32(const uint8_t *p) ++{ ++ return (uint32_t)p[0] | (uint32_t)p[1] << 8 | ++ (uint32_t)p[2] << 16 | (uint32_t)p[3] << 24; ++} ++ ++static inline uint64_t ptr_to_le64(const uint8_t *p) ++{ ++ return (uint64_t)ptr_to_le32(p) | (uint64_t)ptr_to_le32(p + 4) << 32; ++} ++ ++static inline void le32_to_ptr(uint8_t *p, const uint32_t value) ++{ ++ p[0] = (uint8_t)(value); ++ p[1] = (uint8_t)(value >> 8); ++ p[2] = (uint8_t)(value >> 16); ++ p[3] = (uint8_t)(value >> 24); ++} ++ ++static inline void le64_to_ptr(uint8_t *p, const uint64_t value) ++{ ++ le32_to_ptr(p + 4, (uint32_t)(value >> 32)); ++ le32_to_ptr(p, (uint32_t)(value)); ++} ++ ++/*********************************** Keccak ***********************************/ ++/* state[x + y*5] */ ++#define A(x, y) (x + 5 * y) ++ ++static inline void keccakp_theta(uint64_t s[25]) ++{ ++ uint64_t C[5], D[5]; ++ ++ /* Step 1 */ ++ C[0] = s[A(0, 0)] ^ s[A(0, 1)] ^ s[A(0, 2)] ^ s[A(0, 3)] ^ s[A(0, 4)]; ++ C[1] = s[A(1, 0)] ^ s[A(1, 1)] ^ s[A(1, 2)] ^ s[A(1, 3)] ^ s[A(1, 4)]; ++ C[2] = s[A(2, 0)] ^ s[A(2, 1)] ^ s[A(2, 2)] ^ s[A(2, 3)] ^ s[A(2, 4)]; ++ C[3] = s[A(3, 0)] ^ s[A(3, 1)] ^ s[A(3, 2)] ^ s[A(3, 3)] ^ s[A(3, 4)]; ++ C[4] = s[A(4, 0)] ^ s[A(4, 1)] ^ s[A(4, 2)] ^ s[A(4, 3)] ^ s[A(4, 4)]; ++ ++ /* Step 2 */ ++ D[0] = C[4] ^ rol64(C[1], 1); ++ D[1] = C[0] ^ rol64(C[2], 1); ++ D[2] = C[1] ^ rol64(C[3], 1); ++ D[3] = C[2] ^ rol64(C[4], 1); ++ D[4] = C[3] ^ rol64(C[0], 1); ++ ++ /* Step 3 */ ++ s[A(0, 0)] ^= D[0]; ++ s[A(1, 0)] ^= D[1]; ++ s[A(2, 0)] ^= D[2]; ++ s[A(3, 0)] ^= D[3]; ++ s[A(4, 0)] ^= D[4]; ++ ++ s[A(0, 1)] ^= D[0]; ++ s[A(1, 1)] ^= D[1]; ++ s[A(2, 1)] ^= D[2]; ++ s[A(3, 1)] ^= D[3]; ++ s[A(4, 1)] ^= D[4]; ++ ++ s[A(0, 2)] ^= D[0]; ++ s[A(1, 2)] ^= D[1]; ++ s[A(2, 2)] ^= D[2]; ++ s[A(3, 2)] ^= D[3]; ++ s[A(4, 2)] ^= D[4]; ++ ++ s[A(0, 3)] ^= D[0]; ++ s[A(1, 3)] ^= D[1]; ++ s[A(2, 3)] ^= D[2]; ++ s[A(3, 3)] ^= D[3]; ++ s[A(4, 3)] ^= D[4]; ++ ++ s[A(0, 4)] ^= D[0]; ++ s[A(1, 4)] ^= D[1]; ++ s[A(2, 4)] ^= D[2]; ++ s[A(3, 4)] ^= D[3]; ++ s[A(4, 4)] ^= D[4]; ++} ++ ++static inline void keccakp_rho(uint64_t s[25]) ++{ ++ /* Step 1 */ ++ /* s[A(0, 0)] = s[A(0, 0)]; */ ++ ++#define RHO_ROL(t) (((t + 1) * (t + 2) / 2) % 64) ++ /* Step 3 */ ++ s[A(1, 0)] = rol64(s[A(1, 0)], RHO_ROL(0)); ++ s[A(0, 2)] = rol64(s[A(0, 2)], RHO_ROL(1)); ++ s[A(2, 1)] = rol64(s[A(2, 1)], RHO_ROL(2)); ++ s[A(1, 2)] = rol64(s[A(1, 2)], RHO_ROL(3)); ++ s[A(2, 3)] = rol64(s[A(2, 3)], RHO_ROL(4)); ++ s[A(3, 3)] = rol64(s[A(3, 3)], RHO_ROL(5)); ++ s[A(3, 0)] = rol64(s[A(3, 0)], RHO_ROL(6)); ++ s[A(0, 1)] = rol64(s[A(0, 1)], RHO_ROL(7)); ++ s[A(1, 3)] = rol64(s[A(1, 3)], RHO_ROL(8)); ++ s[A(3, 1)] = rol64(s[A(3, 1)], RHO_ROL(9)); ++ s[A(1, 4)] = rol64(s[A(1, 4)], RHO_ROL(10)); ++ s[A(4, 4)] = rol64(s[A(4, 4)], RHO_ROL(11)); ++ s[A(4, 0)] = rol64(s[A(4, 0)], RHO_ROL(12)); ++ s[A(0, 3)] = rol64(s[A(0, 3)], RHO_ROL(13)); ++ s[A(3, 4)] = rol64(s[A(3, 4)], RHO_ROL(14)); ++ s[A(4, 3)] = rol64(s[A(4, 3)], RHO_ROL(15)); ++ s[A(3, 2)] = rol64(s[A(3, 2)], RHO_ROL(16)); ++ s[A(2, 2)] = rol64(s[A(2, 2)], RHO_ROL(17)); ++ s[A(2, 0)] = rol64(s[A(2, 0)], RHO_ROL(18)); ++ s[A(0, 4)] = rol64(s[A(0, 4)], RHO_ROL(19)); ++ s[A(4, 2)] = rol64(s[A(4, 2)], RHO_ROL(20)); ++ s[A(2, 4)] = rol64(s[A(2, 4)], RHO_ROL(21)); ++ s[A(4, 1)] = rol64(s[A(4, 1)], RHO_ROL(22)); ++ s[A(1, 1)] = rol64(s[A(1, 1)], RHO_ROL(23)); ++} ++ ++static inline void keccakp_pi(uint64_t s[25]) ++{ ++ uint64_t t = s[A(4, 4)]; ++ ++ /* Step 1 */ ++ /* s[A(0, 0)] = s[A(0, 0)]; */ ++ s[A(4, 4)] = s[A(1, 4)]; ++ s[A(1, 4)] = s[A(3, 1)]; ++ s[A(3, 1)] = s[A(1, 3)]; ++ s[A(1, 3)] = s[A(0, 1)]; ++ s[A(0, 1)] = s[A(3, 0)]; ++ s[A(3, 0)] = s[A(3, 3)]; ++ s[A(3, 3)] = s[A(2, 3)]; ++ s[A(2, 3)] = s[A(1, 2)]; ++ s[A(1, 2)] = s[A(2, 1)]; ++ s[A(2, 1)] = s[A(0, 2)]; ++ s[A(0, 2)] = s[A(1, 0)]; ++ s[A(1, 0)] = s[A(1, 1)]; ++ s[A(1, 1)] = s[A(4, 1)]; ++ s[A(4, 1)] = s[A(2, 4)]; ++ s[A(2, 4)] = s[A(4, 2)]; ++ s[A(4, 2)] = s[A(0, 4)]; ++ s[A(0, 4)] = s[A(2, 0)]; ++ s[A(2, 0)] = s[A(2, 2)]; ++ s[A(2, 2)] = s[A(3, 2)]; ++ s[A(3, 2)] = s[A(4, 3)]; ++ s[A(4, 3)] = s[A(3, 4)]; ++ s[A(3, 4)] = s[A(0, 3)]; ++ s[A(0, 3)] = s[A(4, 0)]; ++ s[A(4, 0)] = t; ++} ++ ++static inline void keccakp_chi(uint64_t s[25]) ++{ ++ uint64_t t0[5], t1[5]; ++ ++ t0[0] = s[A(0, 0)]; ++ t0[1] = s[A(0, 1)]; ++ t0[2] = s[A(0, 2)]; ++ t0[3] = s[A(0, 3)]; ++ t0[4] = s[A(0, 4)]; ++ ++ t1[0] = s[A(1, 0)]; ++ t1[1] = s[A(1, 1)]; ++ t1[2] = s[A(1, 2)]; ++ t1[3] = s[A(1, 3)]; ++ t1[4] = s[A(1, 4)]; ++ ++ s[A(0, 0)] ^= ~s[A(1, 0)] & s[A(2, 0)]; ++ s[A(0, 1)] ^= ~s[A(1, 1)] & s[A(2, 1)]; ++ s[A(0, 2)] ^= ~s[A(1, 2)] & s[A(2, 2)]; ++ s[A(0, 3)] ^= ~s[A(1, 3)] & s[A(2, 3)]; ++ s[A(0, 4)] ^= ~s[A(1, 4)] & s[A(2, 4)]; ++ ++ s[A(1, 0)] ^= ~s[A(2, 0)] & s[A(3, 0)]; ++ s[A(1, 1)] ^= ~s[A(2, 1)] & s[A(3, 1)]; ++ s[A(1, 2)] ^= ~s[A(2, 2)] & s[A(3, 2)]; ++ s[A(1, 3)] ^= ~s[A(2, 3)] & s[A(3, 3)]; ++ s[A(1, 4)] ^= ~s[A(2, 4)] & s[A(3, 4)]; ++ ++ s[A(2, 0)] ^= ~s[A(3, 0)] & s[A(4, 0)]; ++ s[A(2, 1)] ^= ~s[A(3, 1)] & s[A(4, 1)]; ++ s[A(2, 2)] ^= ~s[A(3, 2)] & s[A(4, 2)]; ++ s[A(2, 3)] ^= ~s[A(3, 3)] & s[A(4, 3)]; ++ s[A(2, 4)] ^= ~s[A(3, 4)] & s[A(4, 4)]; ++ ++ s[A(3, 0)] ^= ~s[A(4, 0)] & t0[0]; ++ s[A(3, 1)] ^= ~s[A(4, 1)] & t0[1]; ++ s[A(3, 2)] ^= ~s[A(4, 2)] & t0[2]; ++ s[A(3, 3)] ^= ~s[A(4, 3)] & t0[3]; ++ s[A(3, 4)] ^= ~s[A(4, 4)] & t0[4]; ++ ++ s[A(4, 0)] ^= ~t0[0] & t1[0]; ++ s[A(4, 1)] ^= ~t0[1] & t1[1]; ++ s[A(4, 2)] ^= ~t0[2] & t1[2]; ++ s[A(4, 3)] ^= ~t0[3] & t1[3]; ++ s[A(4, 4)] ^= ~t0[4] & t1[4]; ++} ++ ++static const uint64_t keccakp_iota_vals[] = { ++ 0x0000000000000001ULL, 0x0000000000008082ULL, 0x800000000000808aULL, ++ 0x8000000080008000ULL, 0x000000000000808bULL, 0x0000000080000001ULL, ++ 0x8000000080008081ULL, 0x8000000000008009ULL, 0x000000000000008aULL, ++ 0x0000000000000088ULL, 0x0000000080008009ULL, 0x000000008000000aULL, ++ 0x000000008000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL, ++ 0x8000000000008003ULL, 0x8000000000008002ULL, 0x8000000000000080ULL, ++ 0x000000000000800aULL, 0x800000008000000aULL, 0x8000000080008081ULL, ++ 0x8000000000008080ULL, 0x0000000080000001ULL, 0x8000000080008008ULL ++}; ++ ++static inline void keccakp_iota(uint64_t s[25], unsigned int round) ++{ ++ s[0] ^= keccakp_iota_vals[round]; ++} ++ ++static inline void keccakp_1600(uint64_t s[25]) ++{ ++ unsigned int round; ++ ++ for (round = 0; round < 24; round++) { ++ keccakp_theta(s); ++ keccakp_rho(s); ++ keccakp_pi(s); ++ keccakp_chi(s); ++ keccakp_iota(s, round); ++ } ++} ++ ++/*********************************** SHA-3 ************************************/ ++ ++static inline void sha3_init(struct sha_ctx *ctx) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < 25; i++) ++ ctx->state[i] = 0; ++ ctx->msg_len = 0; ++} ++ ++static void sha3_256_init(struct sha_ctx *ctx) ++{ ++ sha3_init(ctx); ++ ctx->r = SHA3_256_SIZE_BLOCK; ++ ctx->rword = SHA3_256_SIZE_BLOCK / sizeof(uint64_t); ++ ctx->digestsize = SHA3_256_SIZE_DIGEST; ++} ++ ++static inline void sha3_fill_state(struct sha_ctx *ctx, const uint8_t *in) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < ctx->rword; i++) { ++ ctx->state[i] ^= ptr_to_le64(in); ++ in += 8; ++ } ++} ++ ++static void sha3_update(struct sha_ctx *ctx, const uint8_t *in, size_t inlen) ++{ ++ size_t partial = ctx->msg_len % ctx->r; ++ ++ ctx->msg_len += inlen; ++ ++ /* Sponge absorbing phase */ ++ ++ /* Check if we have a partial block stored */ ++ if (partial) { ++ size_t todo = ctx->r - partial; ++ ++ /* ++ * If the provided data is small enough to fit in the partial ++ * buffer, copy it and leave it unprocessed. ++ */ ++ if (inlen < todo) { ++ memcpy(ctx->partial + partial, in, inlen); ++ return; ++ } ++ ++ /* ++ * The input data is large enough to fill the entire partial ++ * block buffer. Thus, we fill it and transform it. ++ */ ++ memcpy(ctx->partial + partial, in, todo); ++ inlen -= todo; ++ in += todo; ++ ++ sha3_fill_state(ctx, ctx->partial); ++ keccakp_1600(ctx->state); ++ } ++ ++ /* Perform a transformation of full block-size messages */ ++ for (; inlen >= ctx->r; inlen -= ctx->r, in += ctx->r) { ++ sha3_fill_state(ctx, in); ++ keccakp_1600(ctx->state); ++ } ++ ++ /* If we have data left, copy it into the partial block buffer */ ++ memcpy(ctx->partial, in, inlen); ++} ++ ++static void sha3_final(struct sha_ctx *ctx, uint8_t *digest) ++{ ++ size_t partial = ctx->msg_len % ctx->r; ++ unsigned int i; ++ ++ /* Final round in sponge absorbing phase */ ++ ++ /* Fill the unused part of the partial buffer with zeros */ ++ memset(ctx->partial + partial, 0, ctx->r - partial); ++ ++ /* ++ * Add the leading and trailing bit as well as the 01 bits for the ++ * SHA-3 suffix. ++ */ ++ ctx->partial[partial] = 0x06; ++ ctx->partial[ctx->r - 1] |= 0x80; ++ ++ /* Final transformation */ ++ sha3_fill_state(ctx, ctx->partial); ++ keccakp_1600(ctx->state); ++ ++ /* ++ * Sponge squeeze phase - the digest size is always smaller as the ++ * state size r which implies we only have one squeeze round. ++ */ ++ for (i = 0; i < ctx->digestsize / 8; i++, digest += 8) ++ le64_to_ptr(digest, ctx->state[i]); ++ ++ /* Add remaining 4 bytes if we use SHA3-224 */ ++ if (ctx->digestsize % 8) ++ le32_to_ptr(digest, (uint32_t)(ctx->state[i])); ++ ++ memset(ctx->partial, 0, ctx->r); ++ sha3_init(ctx); ++} ++ ++static int sha3_tester(void) ++{ ++ HASH_CTX_ON_STACK(ctx); ++ static const uint8_t msg_256[] = { 0x5E, 0x5E, 0xD6 }; ++ static const uint8_t exp_256[] = { 0xF1, 0x6E, 0x66, 0xC0, 0x43, 0x72, ++ 0xB4, 0xA3, 0xE1, 0xE3, 0x2E, 0x07, ++ 0xC4, 0x1C, 0x03, 0x40, 0x8A, 0xD5, ++ 0x43, 0x86, 0x8C, 0xC4, 0x0E, 0xC5, ++ 0x5E, 0x00, 0xBB, 0xBB, 0xBD, 0xF5, ++ 0x91, 0x1E }; ++ uint8_t act[SHA3_256_SIZE_DIGEST] = { 0 }; ++ unsigned int i; ++ ++ sha3_256_init(ctx); ++ sha3_update(ctx, msg_256, 3); ++ sha3_final(ctx, act); ++ ++ for (i = 0; i < SHA3_256_SIZE_DIGEST; i++) { ++ if (exp_256[i] != act[i]) ++ return 1; ++ } ++ ++ return 0; ++} ++ ++#ifdef JENT_CONF_ENABLE_INTERNAL_TIMER ++ ++/*************************************************************************** ++ * Timer-less timer replacement ++ * ++ * If there is no high-resolution hardware timer available, we create one ++ * ourselves. This logic is only used when the initialization identifies ++ * that no suitable time source is available. ++ ***************************************************************************/ ++ ++static int jent_force_internal_timer = 0; ++ ++/** ++ * Timer-replacement loop ++ * ++ * @brief The measurement loop triggers the read of the value from the ++ * counter function. It conceptually acts as the low resolution ++ * sampleS timer from a ring oscillator. ++ */ ++static void *jent_notime_sample_timer(void *arg) ++{ ++ struct rand_data *ec = (struct rand_data *)arg; ++ ++ ec->notime_timer = 0; ++ ++ while (1) { ++ if (ec->notime_interrupt) ++ return NULL; ++ ++ ec->notime_timer++; ++ } ++ ++ return NULL; ++} ++ ++/* ++ * Enable the clock: spawn a new thread that holds a counter. ++ * ++ * Note, although creating a thread is expensive, we do that every time a ++ * caller wants entropy from us and terminate the thread afterwards. This ++ * is to ensure an attacker cannot easily identify the ticking thread. ++ */ ++static inline int jent_notime_settick(struct rand_data *ec) ++{ ++ int ret; ++ ++ if (!ec->enable_notime) ++ return 0; ++ ++ ret = -pthread_attr_init(&ec->notime_pthread_attr); ++ if (ret) ++ return ret; ++ ++ ec->notime_interrupt = 0; ++ ec->notime_prev_timer = 0; ++ ec->notime_timer = 0; ++ ++ return -pthread_create(&ec->notime_thread_id, ++ &ec->notime_pthread_attr, ++ jent_notime_sample_timer, ec); ++} ++ ++static inline void jent_notime_unsettick(struct rand_data *ec) ++{ ++ if (!ec->enable_notime) ++ return; ++ ++ ec->notime_interrupt = 1; ++ pthread_join(ec->notime_thread_id, NULL); ++ pthread_attr_destroy(&ec->notime_pthread_attr); ++} ++ ++static inline void jent_get_nstime_internal(struct rand_data *ec, uint64_t *out) ++{ ++ if (ec->enable_notime) { ++ /* ++ * Allow the counting thread to be initialized and guarantee ++ * that it ticked since last time we looked. ++ * ++ * Note, we do not use an atomic operation here for reading ++ * jent_notime_timer since if this integer is garbled, it even ++ * adds to entropy. But on most architectures, read/write ++ * of an uint64_t should be atomic anyway. ++ */ ++ while (ec->notime_timer == ec->notime_prev_timer) ++ ; ++ ++ ec->notime_prev_timer = ec->notime_timer; ++ *out = ec->notime_prev_timer; ++ } else { ++ jent_get_nstime(out); ++ } ++} ++ ++static int jent_time_entropy_init(unsigned int enable_notime); ++static int jent_notime_enable(struct rand_data *ec, unsigned int flags) ++{ ++ /* Use internal timer */ ++ if (jent_force_internal_timer || (flags & JENT_FORCE_INTERNAL_TIMER)) { ++ /* Self test not run yet */ ++ if (!jent_force_internal_timer && jent_time_entropy_init(1)) ++ return EHEALTH; ++ ++ ec->enable_notime = 1; ++ } ++ ++ return 0; ++} ++ ++#else /* JENT_CONF_ENABLE_INTERNAL_TIMER */ ++ ++static inline void jent_get_nstime_internal(struct rand_data *ec, uint64_t *out) ++{ ++ (void)ec; ++ jent_get_nstime(out); ++} ++ ++static inline int jent_notime_enable(struct rand_data *ec, unsigned int flags) ++{ ++ (void)ec; ++ ++ /* If we force the timer-less noise source, we return an error */ ++ if (flags & JENT_FORCE_INTERNAL_TIMER) ++ return EHEALTH; ++ ++ return 0; ++} ++ ++static inline int jent_notime_settick(struct rand_data *ec) ++{ ++ (void)ec; ++ return 0; ++} ++ ++static inline void jent_notime_unsettick(struct rand_data *ec) { (void)ec; } ++ ++#endif /* JENT_CONF_ENABLE_INTERNAL_TIMER */ ++ ++/*************************************************************************** ++ * Noise sources ++ ***************************************************************************/ ++ ++/** ++ * Update of the loop count used for the next round of ++ * an entropy collection. ++ * ++ * @ec [in] entropy collector struct -- may be NULL ++ * @bits [in] is the number of low bits of the timer to consider ++ * @min [in] is the number of bits we shift the timer value to the right at ++ * the end to make sure we have a guaranteed minimum value ++ * ++ * @return Newly calculated loop counter ++ */ ++static uint64_t jent_loop_shuffle(struct rand_data *ec, ++ unsigned int bits, unsigned int min) ++{ ++#ifdef JENT_CONF_DISABLE_LOOP_SHUFFLE ++ ++ (void)ec; ++ (void)bits; ++ ++ return (1<data[0]; ++ } ++ ++ /* ++ * We fold the time value as much as possible to ensure that as many ++ * bits of the time stamp are included as possible. ++ */ ++ for (i = 0; ((DATA_SIZE_BITS + bits - 1) / bits) > i; i++) { ++ shuffle ^= time & mask; ++ time = time >> bits; ++ } ++ ++ /* ++ * We add a lower boundary value to ensure we have a minimum ++ * RNG loop count. ++ */ ++ return (shuffle + (1<data, SHA3_256_SIZE_DIGEST); ++ sha3_update(ctx, (uint8_t *)&time, sizeof(uint64_t)); ++ sha3_update(ctx, (uint8_t *)&j, sizeof(uint64_t)); ++ ++ /* ++ * If the time stamp is stuck, do not finally insert the value ++ * into the entropy pool. Although this operation should not do ++ * any harm even when the time stamp has no entropy, SP800-90B ++ * requires that any conditioning operation to have an identical ++ * amount of input data according to section 3.1.5. ++ */ ++ ++ /* ++ * The sha3_final operations re-initialize the context for the ++ * next loop iteration. ++ */ ++ if (stuck || (j < hash_loop_cnt - 1)) ++ sha3_final(ctx, itermediary); ++ else ++ sha3_final(ctx, ec->data); ++ } ++ ++ jent_memset_secure(ctx, SHA_MAX_CTX_SIZE); ++ jent_memset_secure(itermediary, sizeof(itermediary)); ++} ++ ++/** ++ * Memory Access noise source -- this is a noise source based on variations in ++ * memory access times ++ * ++ * This function performs memory accesses which will add to the timing ++ * variations due to an unknown amount of CPU wait states that need to be ++ * added when accessing memory. The memory size should be larger than the L1 ++ * caches as outlined in the documentation and the associated testing. ++ * ++ * The L1 cache has a very high bandwidth, albeit its access rate is usually ++ * slower than accessing CPU registers. Therefore, L1 accesses only add minimal ++ * variations as the CPU has hardly to wait. Starting with L2, significant ++ * variations are added because L2 typically does not belong to the CPU any more ++ * and therefore a wider range of CPU wait states is necessary for accesses. ++ * L3 and real memory accesses have even a wider range of wait states. However, ++ * to reliably access either L3 or memory, the ec->mem memory must be quite ++ * large which is usually not desirable. ++ * ++ * @ec [in] Reference to the entropy collector with the memory access data -- if ++ * the reference to the memory block to be accessed is NULL, this noise ++ * source is disabled ++ * @loop_cnt [in] if a value not equal to 0 is set, use the given value as ++ * number of loops to perform the hash operation ++ */ ++static void jent_memaccess(struct rand_data *ec, uint64_t loop_cnt) ++{ ++ unsigned int wrap = 0; ++ uint64_t i = 0; ++#define MAX_ACC_LOOP_BIT 7 ++#define MIN_ACC_LOOP_BIT 0 ++ uint64_t acc_loop_cnt = ++ jent_loop_shuffle(ec, MAX_ACC_LOOP_BIT, MIN_ACC_LOOP_BIT); ++ ++ if (NULL == ec || NULL == ec->mem) ++ return; ++ wrap = ec->memblocksize * ec->memblocks; ++ ++ /* ++ * testing purposes -- allow test app to set the counter, not ++ * needed during runtime ++ */ ++ if (loop_cnt) ++ acc_loop_cnt = loop_cnt; ++ for (i = 0; i < (ec->memaccessloops + acc_loop_cnt); i++) { ++ unsigned char *tmpval = ec->mem + ec->memlocation; ++ /* ++ * memory access: just add 1 to one byte, ++ * wrap at 255 -- memory access implies read ++ * from and write to memory location ++ */ ++ *tmpval = (unsigned char)((*tmpval + 1) & 0xff); ++ /* ++ * Addition of memblocksize - 1 to pointer ++ * with wrap around logic to ensure that every ++ * memory location is hit evenly ++ */ ++ ec->memlocation = ec->memlocation + ec->memblocksize - 1; ++ ec->memlocation = ec->memlocation % wrap; ++ } ++} ++ ++/*************************************************************************** ++ * Start of entropy processing logic ++ ***************************************************************************/ ++ ++/** ++ * This is the heart of the entropy generation: calculate time deltas and ++ * use the CPU jitter in the time deltas. The jitter is injected into the ++ * entropy pool. ++ * ++ * WARNING: ensure that ->prev_time is primed before using the output ++ * of this function! This can be done by calling this function ++ * and not using its result. ++ * ++ * @ec [in] Reference to entropy collector ++ * @loop_cnt [in] see jent_hash_time ++ * @ret_current_delta [out] Test interface: return time delta - may be NULL ++ * ++ * @return: result of stuck test ++ */ ++static unsigned int jent_measure_jitter(struct rand_data *ec, ++ uint64_t loop_cnt, ++ uint64_t *ret_current_delta) ++{ ++ uint64_t time = 0; ++ uint64_t current_delta = 0; ++ unsigned int stuck; ++ ++ /* Invoke one noise source before time measurement to add variations */ ++ jent_memaccess(ec, loop_cnt); ++ ++ /* ++ * Get time stamp and calculate time delta to previous ++ * invocation to measure the timing variations ++ */ ++ jent_get_nstime_internal(ec, &time); ++ current_delta = jent_delta(ec->prev_time, time); ++ ec->prev_time = time; ++ ++ /* Check whether we have a stuck measurement. */ ++ stuck = jent_stuck(ec, current_delta); ++ ++ /* Now call the next noise sources which also injects the data */ ++ jent_hash_time(ec, current_delta, loop_cnt, stuck); ++ ++ /* return the raw entropy value */ ++ if (ret_current_delta) ++ *ret_current_delta = current_delta; ++ ++ return stuck; ++} ++ ++/** ++ * Generator of one 256 bit random number ++ * Function fills rand_data->data ++ * ++ * @ec [in] Reference to entropy collector ++ */ ++static void jent_random_data(struct rand_data *ec) ++{ ++ unsigned int k = 0; ++ ++ /* priming of the ->prev_time value */ ++ jent_measure_jitter(ec, 0, NULL); ++ ++ while (1) { ++ /* If a stuck measurement is received, repeat measurement */ ++ if (jent_measure_jitter(ec, 0, NULL)) ++ continue; ++ ++ /* ++ * We multiply the loop value with ->osr to obtain the ++ * oversampling rate requested by the caller ++ */ ++ if (++k >= (DATA_SIZE_BITS * ec->osr)) ++ break; ++ } ++} ++ ++/*************************************************************************** ++ * Random Number Generation ++ ***************************************************************************/ ++ ++/** ++ * Entry function: Obtain entropy for the caller. ++ * ++ * This function invokes the entropy gathering logic as often to generate ++ * as many bytes as requested by the caller. The entropy gathering logic ++ * creates 64 bit per invocation. ++ * ++ * This function truncates the last 64 bit entropy value output to the exact ++ * size specified by the caller. ++ * ++ * @ec [in] Reference to entropy collector ++ * @data [out] pointer to buffer for storing random data -- buffer must ++ * already exist ++ * @len [in] size of the buffer, specifying also the requested number of random ++ * in bytes ++ * ++ * @return number of bytes returned when request is fulfilled or an error ++ * ++ * The following error codes can occur: ++ * -1 entropy_collector is NULL ++ * -2 RCT failed ++ * -3 APT test failed ++ * -4 The timer cannot be initialized ++ */ ++JENT_PRIVATE_STATIC ++ssize_t jent_read_entropy(struct rand_data *ec, char *data, size_t len) ++{ ++ char *p = data; ++ size_t orig_len = len; ++ int ret = 0; ++ ++ if (NULL == ec) ++ return -1; ++ ++ if (jent_notime_settick(ec)) ++ return -4; ++ ++ while (len > 0) { ++ size_t tocopy; ++ ++ jent_random_data(ec); ++ ++ if (jent_health_failure(ec)) { ++ if (jent_rct_failure(ec)) ++ ret = -2; ++ else ++ ret = -3; ++ ++ goto err; ++ } ++ ++ if ((DATA_SIZE_BITS / 8) < len) ++ tocopy = (DATA_SIZE_BITS / 8); ++ else ++ tocopy = len; ++ memcpy(p, &ec->data, tocopy); ++ ++ len -= tocopy; ++ p += tocopy; ++ } ++ ++ /* ++ * To be on the safe side, we generate one more round of entropy ++ * which we do not give out to the caller. That round shall ensure ++ * that in case the calling application crashes, memory dumps, pages ++ * out, or due to the CPU Jitter RNG lingering in memory for long ++ * time without being moved and an attacker cracks the application, ++ * all he reads in the entropy pool is a value that is NEVER EVER ++ * being used for anything. Thus, he does NOT see the previous value ++ * that was returned to the caller for cryptographic purposes. ++ */ ++ /* ++ * If we use secured memory, do not use that precaution as the secure ++ * memory protects the entropy pool. Moreover, note that using this ++ * call reduces the speed of the RNG by up to half ++ */ ++#ifndef CONFIG_CRYPTO_CPU_JITTERENTROPY_SECURE_MEMORY ++ jent_random_data(ec); ++#endif ++ ++err: ++ jent_notime_unsettick(ec); ++ return ret ? ret : (ssize_t)orig_len; ++} ++ ++/*************************************************************************** ++ * Initialization logic ++ ***************************************************************************/ ++ ++JENT_PRIVATE_STATIC ++struct rand_data *jent_entropy_collector_alloc(unsigned int osr, ++ unsigned int flags) ++{ ++ struct rand_data *entropy_collector; ++ ++ /* ++ * Requesting disabling and forcing of internal timer ++ * makes no sense. ++ */ ++ if ((flags & JENT_DISABLE_INTERNAL_TIMER) && ++ (flags & JENT_FORCE_INTERNAL_TIMER)) ++ return NULL; ++ ++ /* ++ * If the initial test code concludes to force the internal timer ++ * and the user requests it not to be used, do not allocate ++ * the Jitter RNG instance. ++ */ ++ if (jent_force_internal_timer && (flags & JENT_DISABLE_INTERNAL_TIMER)) ++ return NULL; ++ ++ entropy_collector = jent_zalloc(sizeof(struct rand_data)); ++ if (NULL == entropy_collector) ++ return NULL; ++ ++ if (!(flags & JENT_DISABLE_MEMORY_ACCESS)) { ++ /* Allocate memory for adding variations based on memory ++ * access ++ */ ++ entropy_collector->mem = ++ (unsigned char *)jent_zalloc(JENT_MEMORY_SIZE); ++ if (entropy_collector->mem == NULL) ++ goto err; ++ ++ entropy_collector->memblocksize = JENT_MEMORY_BLOCKSIZE; ++ entropy_collector->memblocks = JENT_MEMORY_BLOCKS; ++ entropy_collector->memaccessloops = JENT_MEMORY_ACCESSLOOPS; ++ } ++ ++ /* verify and set the oversampling rate */ ++ if (osr < JENT_MIN_OSR) ++ osr = JENT_MIN_OSR; ++ entropy_collector->osr = osr; ++ ++ if (jent_fips_enabled() || (flags & JENT_FORCE_FIPS)) ++ entropy_collector->fips_enabled = 1; ++ ++ /* Use timer-less noise source */ ++ if (!(flags & JENT_DISABLE_INTERNAL_TIMER)) { ++ if (jent_notime_enable(entropy_collector, flags)) ++ goto err; ++ } ++ ++ /* fill the data pad with non-zero values */ ++ if (jent_notime_settick(entropy_collector)) ++ goto err; ++ jent_random_data(entropy_collector); ++ jent_notime_unsettick(entropy_collector); ++ ++ return entropy_collector; ++ ++err: ++ if (entropy_collector->mem != NULL) ++ jent_zfree(entropy_collector->mem, JENT_MEMORY_SIZE); ++ jent_zfree(entropy_collector, sizeof(struct rand_data)); ++ return NULL; ++} ++ ++JENT_PRIVATE_STATIC ++void jent_entropy_collector_free(struct rand_data *entropy_collector) ++{ ++ if (entropy_collector != NULL) { ++ if (entropy_collector->mem != NULL) { ++ jent_zfree(entropy_collector->mem, JENT_MEMORY_SIZE); ++ entropy_collector->mem = NULL; ++ } ++ jent_zfree(entropy_collector, sizeof(struct rand_data)); ++ } ++} ++ ++static int jent_time_entropy_init(unsigned int enable_notime) ++{ ++ int i; ++ uint64_t delta_sum = 0; ++ uint64_t old_delta = 0; ++ unsigned int nonstuck = 0; ++ int time_backwards = 0; ++ int count_mod = 0; ++ int count_stuck = 0; ++ int ret = 0; ++ struct rand_data ec; ++ ++ memset(&ec, 0, sizeof(ec)); ++ ++ if (enable_notime) { ++ ec.enable_notime = 1; ++ jent_notime_settick(&ec); ++ } ++ ++ /* Required for RCT */ ++ ec.osr = 1; ++ if (jent_fips_enabled()) ++ ec.fips_enabled = 1; ++ ++ /* We could perform statistical tests here, but the problem is ++ * that we only have a few loop counts to do testing. These ++ * loop counts may show some slight skew and we produce ++ * false positives. ++ * ++ * Moreover, only old systems show potentially problematic ++ * jitter entropy that could potentially be caught here. But ++ * the RNG is intended for hardware that is available or widely ++ * used, but not old systems that are long out of favor. Thus, ++ * no statistical tests. ++ */ ++ ++ /* ++ * We could add a check for system capabilities such as clock_getres or ++ * check for CONFIG_X86_TSC, but it does not make much sense as the ++ * following sanity checks verify that we have a high-resolution ++ * timer. ++ */ ++ ++#define CLEARCACHE 100 ++ for (i = 0; (JENT_POWERUP_TESTLOOPCOUNT + CLEARCACHE) > i; i++) { ++ uint64_t time = 0; ++ uint64_t time2 = 0; ++ uint64_t delta = 0; ++ unsigned int lowdelta = 0; ++ unsigned int stuck; ++ ++ /* Invoke core entropy collection logic */ ++ jent_get_nstime_internal(&ec, &time); ++ ec.prev_time = time; ++ jent_memaccess(&ec, 0); ++ jent_hash_time(&ec, time, 0, 0); ++ jent_get_nstime_internal(&ec, &time2); ++ ++ /* test whether timer works */ ++ if (!time || !time2) { ++ ret = ENOTIME; ++ goto out; ++ } ++ delta = jent_delta(time, time2); ++ /* ++ * test whether timer is fine grained enough to provide ++ * delta even when called shortly after each other -- this ++ * implies that we also have a high resolution timer ++ */ ++ if (!delta) { ++ ret = ECOARSETIME; ++ goto out; ++ } ++ ++ stuck = jent_stuck(&ec, delta); ++ ++ /* ++ * up to here we did not modify any variable that will be ++ * evaluated later, but we already performed some work. Thus we ++ * already have had an impact on the caches, branch prediction, ++ * etc. with the goal to clear it to get the worst case ++ * measurements. ++ */ ++ if (CLEARCACHE > i) ++ continue; ++ ++ if (stuck) ++ count_stuck++; ++ else { ++ nonstuck++; ++ ++ /* ++ * Ensure that the APT succeeded. ++ * ++ * With the check below that count_stuck must be less ++ * than 10% of the overall generated raw entropy values ++ * it is guaranteed that the APT is invoked at ++ * floor((JENT_POWERUP_TESTLOOPCOUNT * 0.9) / 64) == 14 ++ * times. ++ */ ++ if ((nonstuck % JENT_APT_WINDOW_SIZE) == 0) { ++ jent_apt_reset(&ec, ++ delta & JENT_APT_WORD_MASK); ++ if (jent_health_failure(&ec)) { ++ ret = EHEALTH; ++ goto out; ++ } ++ } ++ } ++ ++ /* Validate RCT */ ++ if (jent_rct_failure(&ec)) { ++ ret = ERCT; ++ goto out; ++ } ++ ++ /* test whether we have an increasing timer */ ++ if (!(time2 > time)) ++ time_backwards++; ++ ++ /* use 32 bit value to ensure compilation on 32 bit arches */ ++ lowdelta = (unsigned int)(time2 - time); ++ if (!(lowdelta % 100)) ++ count_mod++; ++ ++ /* ++ * ensure that we have a varying delta timer which is necessary ++ * for the calculation of entropy -- perform this check ++ * only after the first loop is executed as we need to prime ++ * the old_data value ++ */ ++ if (delta > old_delta) ++ delta_sum += (delta - old_delta); ++ else ++ delta_sum += (old_delta - delta); ++ old_delta = delta; ++ } ++ ++ /* ++ * we allow up to three times the time running backwards. ++ * CLOCK_REALTIME is affected by adjtime and NTP operations. Thus, ++ * if such an operation just happens to interfere with our test, it ++ * should not fail. The value of 3 should cover the NTP case being ++ * performed during our test run. ++ */ ++ if (time_backwards > 3) { ++ ret = ENOMONOTONIC; ++ goto out; ++ } ++ ++ /* ++ * Variations of deltas of time must on average be larger ++ * than 1 to ensure the entropy estimation ++ * implied with 1 is preserved ++ */ ++ if ((delta_sum) <= JENT_POWERUP_TESTLOOPCOUNT) { ++ ret = EMINVARVAR; ++ goto out; ++ } ++ ++ /* ++ * Ensure that we have variations in the time stamp below 10 for at ++ * least 10% of all checks -- on some platforms, the counter increments ++ * in multiples of 100, but not always ++ */ ++ if (JENT_STUCK_INIT_THRES(JENT_POWERUP_TESTLOOPCOUNT) < count_mod) { ++ ret = ECOARSETIME; ++ goto out; ++ } ++ ++ /* ++ * If we have more than 90% stuck results, then this Jitter RNG is ++ * likely to not work well. ++ */ ++ if (JENT_STUCK_INIT_THRES(JENT_POWERUP_TESTLOOPCOUNT) < count_stuck) ++ ret = ESTUCK; ++ ++out: ++ if (enable_notime) ++ jent_notime_unsettick(&ec); ++ ++ return ret; ++} ++ ++JENT_PRIVATE_STATIC ++int jent_entropy_init(void) ++{ ++ int ret; ++ ++ if (sha3_tester()) ++ return EHASH; ++ ++ ret = jent_time_entropy_init(0); ++ ++#ifdef JENT_CONF_ENABLE_INTERNAL_TIMER ++ jent_force_internal_timer = 0; ++ if (ret) { ++ ret = jent_time_entropy_init(1); ++ if (!ret) ++ jent_force_internal_timer = 1; ++ } ++#endif /* JENT_CONF_ENABLE_INTERNAL_TIMER */ ++ ++ return ret; ++} +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 5ed97cb..4c2d54e 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -634,9 +634,37 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool) + return rand_pool_entropy_available(pool); + # else + size_t entropy_available; ++ int in_post; ++ ++#ifdef OPENSSL_FIPS ++ if (FIPS_mode()) { ++ /* Use jitter entropy in FIPS mode */ ++ for (in_post = fips_in_post(); in_post >= 0; --in_post) { ++ size_t bytes_needed; ++ unsigned char *buffer; ++ ssize_t bytes; ++ /* Maximum allowed number of consecutive unsuccessful attempts */ ++ int attempts = 3; ++ ++ bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/); ++ while (bytes_needed !=0 && attempts-- > 0) { ++ buffer = rand_pool_add_begin(pool, bytes_needed); ++ bytes = FIPS_jitter_entropy(buffer, bytes_needed); ++ if (bytes > 0) { ++ rand_pool_add_end(pool, bytes, 8 * bytes); ++ bytes_needed -= bytes; ++ attempts = 3; /* reset counter after successful attempt */ ++ } else if (bytes < 0) { ++ break; ++ } ++ } ++ } ++ entropy_available = rand_pool_entropy_available(pool); ++ return entropy_available; ++ } ++#endif + + # if defined(OPENSSL_RAND_SEED_GETRANDOM) +- int in_post; + + for (in_post = fips_in_post(); in_post >= 0; --in_post) { + { +diff --git a/include/crypto/fips.h b/include/crypto/fips.h +index 564261c..29c4923 100644 +--- a/include/crypto/fips.h ++++ b/include/crypto/fips.h +@@ -94,6 +94,8 @@ void fips_set_selftest_fail(void); + + void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr); + ++ssize_t FIPS_jitter_entropy(unsigned char *buf, size_t buflen); ++ + #else + + # define fips_in_post() 0 +diff --git a/include/crypto/jitterentropy-base-user.h b/include/crypto/jitterentropy-base-user.h +new file mode 100644 +index 0000000..e0a3477 +--- /dev/null ++++ b/include/crypto/jitterentropy-base-user.h +@@ -0,0 +1,220 @@ ++/* ++ * Non-physical true random number generator based on timing jitter. ++ * ++ * Copyright Stephan Mueller , 2013 - 2021 ++ * ++ * License ++ * ======= ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU General Public License, in which case the provisions of the GPL are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF ++ * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT ++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE ++ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH ++ * DAMAGE. ++ */ ++ ++#ifndef _JITTERENTROPY_BASE_USER_H ++#define _JITTERENTROPY_BASE_USER_H ++ ++/* ++ * Set the following defines as needed for your environment ++ */ ++/* Compilation for libgcrypt */ ++#ifndef LIBGCRYPT ++#undef LIBGCRYPT ++#endif ++ ++/* Compilation for OpenSSL */ ++#ifndef OPENSSL ++#define OPENSSL ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++/* Timer-less entropy source */ ++#ifdef JENT_CONF_ENABLE_INTERNAL_TIMER ++#include ++#endif /* JENT_CONF_ENABLE_INTERNAL_TIMER */ ++ ++#ifdef LIBGCRYPT ++#include ++#include "g10lib.h" ++#endif ++ ++#ifdef OPENSSL ++#include ++#ifdef OPENSSL_FIPS ++#include ++#endif ++#endif ++ ++#ifdef __MACH__ ++#include ++#include ++#include ++#include ++#include ++#endif ++ ++#ifdef __x86_64__ ++ ++# define DECLARE_ARGS(val, low, high) unsigned long low, high ++# define EAX_EDX_VAL(val, low, high) ((low) | (high) << 32) ++# define EAX_EDX_RET(val, low, high) "=a" (low), "=d" (high) ++ ++static inline void jent_get_nstime(uint64_t *out) ++{ ++ DECLARE_ARGS(val, low, high); ++ asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); ++ *out = EAX_EDX_VAL(val, low, high); ++} ++ ++#else /* __x86_64__ */ ++ ++static inline void jent_get_nstime(uint64_t *out) ++{ ++ /* OSX does not have clock_gettime -- taken from ++ * http://developer.apple.com/library/mac/qa/qa1398/_index.html */ ++# ifdef __MACH__ ++ *out = mach_absolute_time(); ++# elif _AIX ++ /* clock_gettime() on AIX returns a timer value that increments in ++ * steps of 1000 ++ */ ++ uint64_t tmp = 0; ++ timebasestruct_t aixtime; ++ read_real_time(&aixtime, TIMEBASE_SZ); ++ tmp = aixtime.tb_high; ++ tmp = tmp << 32; ++ tmp = tmp | aixtime.tb_low; ++ *out = tmp; ++# else /* __MACH__ */ ++ /* we could use CLOCK_MONOTONIC(_RAW), but with CLOCK_REALTIME ++ * we get some nice extra entropy once in a while from the NTP actions ++ * that we want to use as well... though, we do not rely on that ++ * extra little entropy */ ++ uint64_t tmp = 0; ++ struct timespec time; ++ if (clock_gettime(CLOCK_REALTIME, &time) == 0) ++ { ++ tmp = ((uint64_t)time.tv_sec & 0xFFFFFFFF) * 1000000000UL; ++ tmp = tmp + (uint64_t)time.tv_nsec; ++ } ++ *out = tmp; ++# endif /* __MACH__ */ ++} ++ ++#endif /* __x86_64__ */ ++ ++static inline void *jent_zalloc(size_t len) ++{ ++ void *tmp = NULL; ++#ifdef LIBGCRYPT ++ /* When using the libgcrypt secure memory mechanism, all precautions ++ * are taken to protect our state. If the user disables secmem during ++ * runtime, it is his decision and we thus try not to overrule his ++ * decision for less memory protection. */ ++#define CONFIG_CRYPTO_CPU_JITTERENTROPY_SECURE_MEMORY ++ tmp = gcry_xmalloc_secure(len); ++#elif defined(OPENSSL) ++ /* Does this allocation implies secure memory use? */ ++ tmp = OPENSSL_malloc(len); ++#else ++ /* we have no secure memory allocation! Hence ++ * we do not set CONFIG_CRYPTO_CPU_JITTERENTROPY_SECURE_MEMORY */ ++ tmp = malloc(len); ++#endif /* LIBGCRYPT */ ++ if(NULL != tmp) ++ memset(tmp, 0, len); ++ return tmp; ++} ++ ++static inline void jent_zfree(void *ptr, unsigned int len) ++{ ++#ifdef LIBGCRYPT ++ memset(ptr, 0, len); ++ gcry_free(ptr); ++#elif defined(OPENSSL) ++ OPENSSL_cleanse(ptr, len); ++ OPENSSL_free(ptr); ++#else ++ memset(ptr, 0, len); ++ free(ptr); ++#endif /* LIBGCRYPT */ ++} ++ ++static inline int jent_fips_enabled(void) ++{ ++#ifdef LIBGCRYPT ++ return fips_mode(); ++#elif defined(OPENSSL) ++#ifdef OPENSSL_FIPS ++ return FIPS_mode(); ++#else ++ return 0; ++#endif ++#else ++#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled" ++ char buf[2] = "0"; ++ int fd = 0; ++ ++ if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0) { ++ while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR); ++ close(fd); ++ } ++ if (buf[0] == '1') ++ return 1; ++ else ++ return 0; ++#endif ++} ++ ++static inline void jent_memset_secure(void *s, size_t n) ++{ ++ memset(s, 0, n); ++ __asm__ __volatile__("" : : "r" (s) : "memory"); ++} ++ ++/* --- helpers needed in user space -- */ ++ ++static inline uint64_t rol64(uint64_t x, int n) ++{ ++ return ( (x << (n&(64-1))) | (x >> ((64-n)&(64-1))) ); ++} ++ ++#endif /* _JITTERENTROPY_BASE_USER_H */ +diff --git a/include/crypto/jitterentropy.h b/include/crypto/jitterentropy.h +new file mode 100644 +index 0000000..078d750 +--- /dev/null ++++ b/include/crypto/jitterentropy.h +@@ -0,0 +1,227 @@ ++/* ++ * Non-physical true random number generator based on timing jitter. ++ * ++ * Copyright Stephan Mueller , 2014 - 2021 ++ * ++ * License ++ * ======= ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU General Public License, in which case the provisions of the GPL are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF ++ * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT ++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE ++ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH ++ * DAMAGE. ++ */ ++ ++#ifndef _JITTERENTROPY_H ++#define _JITTERENTROPY_H ++ ++/*************************************************************************** ++ * Jitter RNG Configuration Section ++ * ++ * You may alter the following options ++ ***************************************************************************/ ++ ++/* ++ * Enable timer-less timer support ++ * ++ * In case the hardware is identified to not provide a high-resolution time ++ * stamp, this option enables a built-in high-resolution time stamp mechanism. ++ * ++ * The timer-less noise source is based on threads. This noise source requires ++ * the linking with the POSIX threads library. I.e. the executing environment ++ * must offer POSIX threads. If this option is disabled, no linking ++ * with the POSIX threads library is needed. ++ */ ++#define JENT_CONF_ENABLE_INTERNAL_TIMER ++ ++/* ++ * Disable the loop shuffle operation ++ * ++ * The shuffle operation enlarges the timing of the conditioning function ++ * by a variable length defined by the LSB of a time stamp. Some mathematicians ++ * are concerned that this pseudo-random selection of the loop iteration count ++ * may create some form of dependency between the different loop counts ++ * and the associated time duration of the conditioning function. It ++ * also complicates entropy assessment because it effectively combines a bunch ++ * of shifted/scaled copies the same distribution and masks failures from the ++ * health testing. ++ * ++ * By enabling this flag, the loop shuffle operation is disabled and ++ * the entropy collection operates in a way that honor the concerns. ++ * ++ * By enabling this flag, the time of collecting entropy may be enlarged. ++ */ ++#define JENT_CONF_DISABLE_LOOP_SHUFFLE ++ ++/*************************************************************************** ++ * Jitter RNG State Definition Section ++ ***************************************************************************/ ++ ++#include "crypto/jitterentropy-base-user.h" ++ ++#define SHA3_256_SIZE_DIGEST_BITS 256 ++#define SHA3_256_SIZE_DIGEST (SHA3_256_SIZE_DIGEST_BITS >> 3) ++ ++/* The entropy pool */ ++struct rand_data ++{ ++ /* all data values that are vital to maintain the security ++ * of the RNG are marked as SENSITIVE. A user must not ++ * access that information while the RNG executes its loops to ++ * calculate the next random value. */ ++ uint8_t data[SHA3_256_SIZE_DIGEST]; /* SENSITIVE Actual random number */ ++ uint64_t prev_time; /* SENSITIVE Previous time stamp */ ++#define DATA_SIZE_BITS (SHA3_256_SIZE_DIGEST_BITS) ++ uint64_t last_delta; /* SENSITIVE stuck test */ ++ uint64_t last_delta2; /* SENSITIVE stuck test */ ++ unsigned int osr; /* Oversampling rate */ ++#define JENT_MEMORY_BLOCKS 64 ++#define JENT_MEMORY_BLOCKSIZE 32 ++#define JENT_MEMORY_ACCESSLOOPS 128 ++#define JENT_MEMORY_SIZE (JENT_MEMORY_BLOCKS*JENT_MEMORY_BLOCKSIZE) ++ unsigned char *mem; /* Memory access location with size of ++ * memblocks * memblocksize */ ++ unsigned int memlocation; /* Pointer to byte in *mem */ ++ unsigned int memblocks; /* Number of memory blocks in *mem */ ++ unsigned int memblocksize; /* Size of one memory block in bytes */ ++ unsigned int memaccessloops; /* Number of memory accesses per random ++ * bit generation */ ++ ++ /* Repetition Count Test */ ++ int rct_count; /* Number of stuck values */ ++ ++ /* Adaptive Proportion Test for a significance level of 2^-30 */ ++#define JENT_APT_CUTOFF 325 /* Taken from SP800-90B sec 4.4.2 */ ++#define JENT_APT_WINDOW_SIZE 512 /* Data window size */ ++ /* LSB of time stamp to process */ ++#define JENT_APT_LSB 16 ++#define JENT_APT_WORD_MASK (JENT_APT_LSB - 1) ++ unsigned int apt_observations; /* Number of collected observations */ ++ unsigned int apt_count; /* APT counter */ ++ uint64_t apt_base; /* APT base reference */ ++ unsigned int apt_base_set:1; /* APT base reference set? */ ++ ++ unsigned int fips_enabled:1; ++ unsigned int health_failure:1; /* Permanent health failure */ ++ unsigned int enable_notime:1; /* Use internal high-res timer */ ++ ++#ifdef JENT_CONF_ENABLE_INTERNAL_TIMER ++ volatile uint8_t notime_interrupt; /* indicator to interrupt ctr */ ++ volatile uint64_t notime_timer; /* high-res timer mock-up */ ++ uint64_t notime_prev_timer; /* previous timer value */ ++ pthread_attr_t notime_pthread_attr; /* pthreads library */ ++ pthread_t notime_thread_id; /* pthreads thread ID */ ++#endif /* JENT_CONF_ENABLE_INTERNAL_TIMER */ ++}; ++ ++/* Flags that can be used to initialize the RNG */ ++#define JENT_DISABLE_STIR (1<<0) /* UNUSED */ ++#define JENT_DISABLE_UNBIAS (1<<1) /* UNUSED */ ++#define JENT_DISABLE_MEMORY_ACCESS (1<<2) /* Disable memory access for more ++ entropy, saves MEMORY_SIZE RAM for ++ entropy collector */ ++#define JENT_FORCE_INTERNAL_TIMER (1<<3) /* Force the use of the internal ++ timer */ ++#define JENT_DISABLE_INTERNAL_TIMER (1<<4) /* Disable the potential use of ++ the internal timer. */ ++#define JENT_FORCE_FIPS (1<<5) /* Force FIPS compliant mode ++ including full SP800-90B ++ compliance. */ ++ ++#ifdef JENT_CONF_DISABLE_LOOP_SHUFFLE ++# define JENT_MIN_OSR 3 ++#else ++# define JENT_MIN_OSR 1 ++#endif ++ ++/* -- BEGIN Main interface functions -- */ ++ ++#ifndef JENT_STUCK_INIT_THRES ++/* ++ * Per default, not more than 90% of all measurements during initialization ++ * are allowed to be stuck. ++ * ++ * It is allowed to change this value as required for the intended environment. ++ */ ++#define JENT_STUCK_INIT_THRES(x) ((x*9) / 10) ++#endif ++ ++#ifdef JENT_PRIVATE_COMPILE ++# define JENT_PRIVATE_STATIC static ++#else /* JENT_PRIVATE_COMPILE */ ++# define JENT_PRIVATE_STATIC ++#endif ++ ++/* Number of low bits of the time value that we want to consider */ ++/* get raw entropy */ ++JENT_PRIVATE_STATIC ++ssize_t jent_read_entropy(struct rand_data *ec, char *data, size_t len); ++/* initialize an instance of the entropy collector */ ++JENT_PRIVATE_STATIC ++struct rand_data *jent_entropy_collector_alloc(unsigned int osr, ++ unsigned int flags); ++/* clearing of entropy collector */ ++JENT_PRIVATE_STATIC ++void jent_entropy_collector_free(struct rand_data *entropy_collector); ++ ++/* initialization of entropy collector */ ++JENT_PRIVATE_STATIC ++int jent_entropy_init(void); ++ ++/* return version number of core library */ ++JENT_PRIVATE_STATIC ++unsigned int jent_version(void); ++ ++/* -- END of Main interface functions -- */ ++ ++/* -- BEGIN error codes for init function -- */ ++#define ENOTIME 1 /* Timer service not available */ ++#define ECOARSETIME 2 /* Timer too coarse for RNG */ ++#define ENOMONOTONIC 3 /* Timer is not monotonic increasing */ ++#define EMINVARIATION 4 /* Timer variations too small for RNG */ ++#define EVARVAR 5 /* Timer does not produce variations of variations ++ (2nd derivation of time is zero) */ ++#define EMINVARVAR 6 /* Timer variations of variations is too small */ ++#define EPROGERR 7 /* Programming error */ ++#define ESTUCK 8 /* Too many stuck results during init. */ ++#define EHEALTH 9 /* Health test failed during initialization */ ++#define ERCT 10 /* RCT failed during initialization */ ++#define EHASH 11 /* Hash self test failed */ ++ ++/* -- BEGIN statistical test functions only complied with CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT -- */ ++ ++#ifdef CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT ++JENT_PRIVATE_STATIC ++uint64_t jent_lfsr_var_stat(struct rand_data *ec, unsigned int min); ++#endif /* CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT */ ++ ++/* -- END of statistical test function -- */ ++ ++#endif /* _JITTERENTROPY_H */ +diff --git a/include/openssl/fips.h b/include/openssl/fips.h +index abbe81b..be84e08 100644 +--- a/include/openssl/fips.h ++++ b/include/openssl/fips.h +@@ -78,6 +78,8 @@ extern "C" { + BN_GENCB *cb); + int FIPS_dsa_paramgen_check_g(DSA *dsa); + ++ int FIPS_init_entropy(void); ++ + /* BEGIN ERROR CODES */ + /* The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. +@@ -153,6 +155,7 @@ extern "C" { + # define FIPS_R_DRBG_NOT_INITIALISED 152 + # define FIPS_R_DRBG_STUCK 103 + # define FIPS_R_ENTROPY_ERROR_UNDETECTED 104 ++# define FIPS_R_ENTROPY_INIT_FAILED 158 + # define FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED 105 + # define FIPS_R_ENTROPY_SOURCE_STUCK 142 + # define FIPS_R_ERROR_INITIALISING_DRBG 115 +diff --git a/util/libcrypto.num b/util/libcrypto.num +index 2e47840..e354631 100644 +--- a/util/libcrypto.num ++++ b/util/libcrypto.num +@@ -4634,4 +4634,5 @@ EVP_KDF_vctrl 6594 1_1_1b EXIST::FUNCTION: + EVP_KDF_ctrl_str 6595 1_1_1b EXIST::FUNCTION: + EVP_KDF_size 6596 1_1_1b EXIST::FUNCTION: + EVP_KDF_derive 6597 1_1_1b EXIST::FUNCTION: +-EC_GROUP_check_named_curve 6598 1_1_1g EXIST::FUNCTION:EC +\ No newline at end of file ++EC_GROUP_check_named_curve 6598 1_1_1g EXIST::FUNCTION:EC ++FIPS_init_entropy 6599 1_1_1k EXIST::FUNCTION: +\ No newline at end of file diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index 267c1b0082c..2db830a3a8e 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -4,7 +4,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.1k -Release: 2%{?dist} +Release: 3%{?dist} License: OpenSSL Vendor: Microsoft Corporation Distribution: Mariner @@ -39,6 +39,7 @@ Patch16: openssl-1.1.1-s390x-ecc.patch Patch17: openssl-1.1.1-kdf-selftest.patch Patch18: openssl-1.1.1-fips-curves.patch Patch19: openssl-1.1.1-sp80056arev3.patch +Patch20: openssl-1.1.1-jitterentropy.patch BuildRequires: perl-Test-Warnings BuildRequires: perl-Text-Template Requires: %{name}-libs = %{version}-%{release} @@ -124,13 +125,15 @@ cp %{SOURCE4} test/ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be # marked as not requiring an executable stack. # Also add -DPURIFY to make using valgrind with openssl easier as we do not # want to depend on the uninitialized memory as a source of entropy anyway. -NEW_RPM_OPT_FLAGS="%{optflags} -Wa,--noexecstack -Wa,--generate-missing-build-notes=yes -DPURIFY $RPM_LD_FLAGS" +# Also add -O0 to enable optimization, which is needed for jitterentropy +NEW_RPM_OPT_FLAGS="%{optflags} -Wa,--noexecstack -Wa,--generate-missing-build-notes=yes -DPURIFY $RPM_LD_FLAGS -O0" export HASHBANGPERL=%{_bindir}/perl @@ -318,6 +321,9 @@ rm -rf %{buildroot} %changelog +* Tue May 18 2021 Nicolas Ontiveros - 1.1.1k-3 +- In FIPS mode, use only jitterentropy + * Tue May 11 2021 Nicolas Ontiveros - 1.1.1k-2 - Remove FIPS DRBG rewire patch diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0959be6e22f..f4922cf91ff 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.aarch64.rpm texinfo-6.5-7.cm1.aarch64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-2.cm1.aarch64.rpm -openssl-devel-1.1.1k-2.cm1.aarch64.rpm -openssl-libs-1.1.1k-2.cm1.aarch64.rpm -openssl-perl-1.1.1k-2.cm1.aarch64.rpm -openssl-static-1.1.1k-2.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm +openssl-1.1.1k-3.cm1.aarch64.rpm +openssl-devel-1.1.1k-3.cm1.aarch64.rpm +openssl-libs-1.1.1k-3.cm1.aarch64.rpm +openssl-perl-1.1.1k-3.cm1.aarch64.rpm +openssl-static-1.1.1k-3.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-3.cm1.aarch64.rpm libcap-2.26-2.cm1.aarch64.rpm libcap-devel-2.26-2.cm1.aarch64.rpm libdb-5.3.28-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 7c60500edce..6389b1e5036 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -105,12 +105,12 @@ perl-5.30.3-1.cm1.x86_64.rpm texinfo-6.5-7.cm1.x86_64.rpm autoconf-2.69-10.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -openssl-1.1.1k-2.cm1.x86_64.rpm -openssl-devel-1.1.1k-2.cm1.x86_64.rpm -openssl-libs-1.1.1k-2.cm1.x86_64.rpm -openssl-perl-1.1.1k-2.cm1.x86_64.rpm -openssl-static-1.1.1k-2.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm +openssl-1.1.1k-3.cm1.x86_64.rpm +openssl-devel-1.1.1k-3.cm1.x86_64.rpm +openssl-libs-1.1.1k-3.cm1.x86_64.rpm +openssl-perl-1.1.1k-3.cm1.x86_64.rpm +openssl-static-1.1.1k-3.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-3.cm1.x86_64.rpm libcap-2.26-2.cm1.x86_64.rpm libcap-devel-2.26-2.cm1.x86_64.rpm libdb-5.3.28-4.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index dd6cc414a20..85b6ef85dd0 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.aarch64.rpm openjdk8-sample-1.8.0.292-1.cm1.aarch64.rpm openjdk8-src-1.8.0.292-1.cm1.aarch64.rpm openjre8-1.8.0.292-1.cm1.aarch64.rpm -openssl-1.1.1k-2.cm1.aarch64.rpm -openssl-debuginfo-1.1.1k-2.cm1.aarch64.rpm -openssl-devel-1.1.1k-2.cm1.aarch64.rpm -openssl-libs-1.1.1k-2.cm1.aarch64.rpm -openssl-perl-1.1.1k-2.cm1.aarch64.rpm -openssl-static-1.1.1k-2.cm1.aarch64.rpm +openssl-1.1.1k-3.cm1.aarch64.rpm +openssl-debuginfo-1.1.1k-3.cm1.aarch64.rpm +openssl-devel-1.1.1k-3.cm1.aarch64.rpm +openssl-libs-1.1.1k-3.cm1.aarch64.rpm +openssl-perl-1.1.1k-3.cm1.aarch64.rpm +openssl-static-1.1.1k-3.cm1.aarch64.rpm p11-kit-0.23.22-1.cm1.aarch64.rpm p11-kit-debuginfo-0.23.22-1.cm1.aarch64.rpm p11-kit-devel-0.23.22-1.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index bf43575ee97..8654b406717 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -276,12 +276,12 @@ openjdk8-doc-1.8.0.292-1.cm1.x86_64.rpm openjdk8-sample-1.8.0.292-1.cm1.x86_64.rpm openjdk8-src-1.8.0.292-1.cm1.x86_64.rpm openjre8-1.8.0.292-1.cm1.x86_64.rpm -openssl-1.1.1k-2.cm1.x86_64.rpm -openssl-debuginfo-1.1.1k-2.cm1.x86_64.rpm -openssl-devel-1.1.1k-2.cm1.x86_64.rpm -openssl-libs-1.1.1k-2.cm1.x86_64.rpm -openssl-perl-1.1.1k-2.cm1.x86_64.rpm -openssl-static-1.1.1k-2.cm1.x86_64.rpm +openssl-1.1.1k-3.cm1.x86_64.rpm +openssl-debuginfo-1.1.1k-3.cm1.x86_64.rpm +openssl-devel-1.1.1k-3.cm1.x86_64.rpm +openssl-libs-1.1.1k-3.cm1.x86_64.rpm +openssl-perl-1.1.1k-3.cm1.x86_64.rpm +openssl-static-1.1.1k-3.cm1.x86_64.rpm p11-kit-0.23.22-1.cm1.x86_64.rpm p11-kit-debuginfo-0.23.22-1.cm1.x86_64.rpm p11-kit-devel-0.23.22-1.cm1.x86_64.rpm From 07084db86676696ab9238a5cb0598b0175dffdbf Mon Sep 17 00:00:00 2001 From: Mateusz Malisz Date: Tue, 25 May 2021 17:35:39 -0700 Subject: [PATCH 60/83] Update libwebp to 1.0.3, fixing CVEs. (#987) * Update libwebp to 1.0.3 --- SPECS/libwebp/libwebp.signatures.json | 4 +- SPECS/libwebp/libwebp.spec | 64 +++++++++++++++------------ cgmanifest.json | 4 +- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/SPECS/libwebp/libwebp.signatures.json b/SPECS/libwebp/libwebp.signatures.json index 21fe7cd5bbb..95cd67d3ae6 100644 --- a/SPECS/libwebp/libwebp.signatures.json +++ b/SPECS/libwebp/libwebp.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libwebp-1.0.0.tar.gz": "c5c5ebf979543ac1f3348df8f6245262abd787a147b9632c880d92bfc38dbbeb" + "libwebp-1.0.3.tar.gz": "082d114bcb18a0e2aafc3148d43367c39304f86bf18ba0b2e766447e111a4a91" } -} \ No newline at end of file +} diff --git a/SPECS/libwebp/libwebp.spec b/SPECS/libwebp/libwebp.spec index 4d2e1067cc1..9b9dab1322f 100644 --- a/SPECS/libwebp/libwebp.spec +++ b/SPECS/libwebp/libwebp.spec @@ -1,54 +1,53 @@ Summary: Library to encode and decode webP format images Name: libwebp -Version: 1.0.0 -Release: 4%{?dist} +Version: 1.0.3 +Release: 1%{?dist} License: BSD -URL: https://webmproject.org/ -Group: System Environment/Libraries Vendor: Microsoft Corporation Distribution: Mariner +Group: System Environment/Libraries +URL: https://webmproject.org/ #Source0: https://github.com/webmproject/%{name}/archive/v%{version}.tar.gz Source0: %{name}-%{version}.tar.gz -BuildRequires: libjpeg-turbo-devel -BuildRequires: libtiff-devel -BuildRequires: libpng-devel -Requires: libjpeg-turbo -Requires: libtiff -Requires: libpng +BuildRequires: libjpeg-turbo-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +Requires: libjpeg-turbo +Requires: libpng +Requires: libtiff + %description The libwebp package contains a library and support programs to encode and decode images in WebP format. -%package devel -Summary: Header and development files -Requires: %{name} = %{version}-%{release} -%description devel +%package devel +Summary: Header and development files +Requires: %{name} = %{version}-%{release} +%description devel It contains the libraries and header files to create applications %prep %setup -q + %build ./autogen.sh ./configure \ - --prefix=%{_prefix} \ - --enable-libwebpmux \ - --enable-libwebpdemux \ - --enable-libwebpdecoder \ - --enable-libwebpextras \ - --enable-swap-16bit-csp \ - --disable-static + --prefix=%{_prefix} \ + --enable-libwebpmux \ + --enable-libwebpdemux \ + --enable-libwebpdecoder \ + --enable-libwebpextras \ + --enable-swap-16bit-csp \ + --disable-static make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install -find %{buildroot} -name '*.la' -delete +find %{buildroot} -type f -name '*.la' -delete -print -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -64,16 +63,23 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:21:21 PST 2020 Nick Samson - 1.0.0-4 -- Added %%license line automatically +* Tue May 25 2021 Mateusz Malisz - 1.0.3-1 +- Update to version 1.0.3 + +* Sat May 09 2020 Nick Samson 1.0.0-4 +- Added %%license line automatically * Mon Apr 13 2020 Jon Slobodzian 1.0.0-3 - Verified license. Removed sha1. Fixed Source0 URL comment. Fixed formatting. URL to https. + * Tue Sep 03 2019 Mateusz Malisz 1.0.0-2 - Initial CBL-Mariner import from Photon (license: Apache2). + * Wed Sep 12 2018 Keerthana K 1.0.0-1 - Update to version 1.0.0 + * Thu Apr 06 2017 Kumar Kaushik 0.6.0-1 - Upgrading version to 0.6.0 + * Wed Jul 27 2016 Divya Thaluru 0.5.1-1 - Initial version diff --git a/cgmanifest.json b/cgmanifest.json index ba0a13824a6..be4663bd56e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3155,8 +3155,8 @@ "type": "other", "other": { "name": "libwebp", - "version": "1.0.0", - "downloadUrl": "https://github.com/webmproject/libwebp/archive/v1.0.0.tar.gz" + "version": "1.0.3", + "downloadUrl": "https://github.com/webmproject/libwebp/archive/v1.0.3.tar.gz" } } }, From a8f8db97282bc85c8e9d28a4b25e221516a5a71b Mon Sep 17 00:00:00 2001 From: chalamalasetty <42326515+chalamalasetty@users.noreply.github.com> Date: Tue, 25 May 2021 17:43:16 -0700 Subject: [PATCH 61/83] Update fluent-bit version and add nopatch for p7zip (#986) --- SPECS/fluent-bit/fluent-bit.signatures.json | 2 +- SPECS/fluent-bit/fluent-bit.spec | 9 ++++++--- SPECS/p7zip/CVE-2018-5996.nopatch | 0 SPECS/p7zip/p7zip.spec | 10 +++++++++- cgmanifest.json | 4 ++-- 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 SPECS/p7zip/CVE-2018-5996.nopatch diff --git a/SPECS/fluent-bit/fluent-bit.signatures.json b/SPECS/fluent-bit/fluent-bit.signatures.json index 6221a462e6e..49bb635c5b2 100644 --- a/SPECS/fluent-bit/fluent-bit.signatures.json +++ b/SPECS/fluent-bit/fluent-bit.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "fluent-bit-1.4.1.tar.gz" : "f5e2e10133d2a266e508db9d95e425108a1a7e43ca713bedd0d9005d962b0cff" + "fluent-bit-1.5.2.tar.gz" : "d9dd4fe94116533cd23fc5d2e505408f687c1eb1b4c233b4f9413ff6b87d53f3" } } diff --git a/SPECS/fluent-bit/fluent-bit.spec b/SPECS/fluent-bit/fluent-bit.spec index 3fc69496b49..6b6a44c738b 100644 --- a/SPECS/fluent-bit/fluent-bit.spec +++ b/SPECS/fluent-bit/fluent-bit.spec @@ -2,8 +2,8 @@ Name: fluent-bit Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.5.2 +Release: 1%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -46,9 +46,12 @@ make install DESTDIR=%{buildroot} %files devel %{_includedir}/* -/usr/lib64/*.so +/usr/lib64/fluent-bit/*.so %changelog +* Mon May 24 2021 Suresh Babu Chalamalasetty 1.5.2-1 +- Update to version 1.5.2 + * Mon Oct 19 2020 Pawel Winogrodzki 1.4.1-2 - License verified. - Fixed source URL. diff --git a/SPECS/p7zip/CVE-2018-5996.nopatch b/SPECS/p7zip/CVE-2018-5996.nopatch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/SPECS/p7zip/p7zip.spec b/SPECS/p7zip/p7zip.spec index 6d5a4fcad38..5c9032d3cf2 100644 --- a/SPECS/p7zip/p7zip.spec +++ b/SPECS/p7zip/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 21%{?dist} +Release: 22%{?dist} Vendor: Microsoft Corporation Distribution: Mariner # Files under C/Compress/Lzma/ are dual LGPL or CPL @@ -27,6 +27,11 @@ Patch11: 14-Fix-g++-warning.patch Patch12: gcc10-conversion.patch Patch13: 0001-fix-data-null-pointer.patch Patch14: 0001-fix-out-of-mem.patch +# p7zip sources does not include 7-Zips RAR compression code. +# Refer to p7zip no rar sources tar and patch0 for nonrar cmake. +# Patch to fix CVE-2018-5996 is for RAR functionality compression bug. +# It is not vulnerable hence adding nopatch +Patch15: CVE-2018-5996.nopatch BuildRequires: make BuildRequires: gcc @@ -126,6 +131,9 @@ make test %doc contrib/ %changelog +* Mon May 24 2021 Suresh Babu Chalamalasetty - 16.02-22 +- Add nopatch for CVE-2018-5996 + * Mon May 17 2021 Suresh Babu Chalamalasetty - 16.02-21 - Initial CBL-Mariner import from Fedora 34 (license: MIT) - License verified diff --git a/cgmanifest.json b/cgmanifest.json index be4663bd56e..18c3049ea84 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1325,8 +1325,8 @@ "type": "other", "other": { "name": "fluent-bit", - "version": "1.4.1", - "downloadUrl": "https://github.com/fluent/fluent-bit/archive/v1.4.1.tar.gz" + "version": "1.5.2", + "downloadUrl": "https://github.com/fluent/fluent-bit/archive/v1.5.2.tar.gz" } } }, From 2a88abac40a7c83d7fa6055a1f8404405d503884 Mon Sep 17 00:00:00 2001 From: Mateusz Malisz Date: Wed, 26 May 2021 10:00:11 -0700 Subject: [PATCH 62/83] Implement and integrate enumfield (#837) * Implement and integrate enumfield * Simplify style/color setup * Refactor drawing * Fixes from rebase --- .../primitives/enumfield/enumfield.go | 254 ++++++++++++++++++ .../manualpartitionwidget.go | 61 +++-- 2 files changed, 289 insertions(+), 26 deletions(-) create mode 100644 toolkit/tools/imagegen/attendedinstaller/primitives/enumfield/enumfield.go diff --git a/toolkit/tools/imagegen/attendedinstaller/primitives/enumfield/enumfield.go b/toolkit/tools/imagegen/attendedinstaller/primitives/enumfield/enumfield.go new file mode 100644 index 00000000000..6dfcdde4443 --- /dev/null +++ b/toolkit/tools/imagegen/attendedinstaller/primitives/enumfield/enumfield.go @@ -0,0 +1,254 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT License. + +package enumfield + +import ( + "math" + + "github.com/gdamore/tcell" + "github.com/rivo/tview" +) + +type EnumField struct { + *tview.Box + + // The label of the field + label string + + // Maximum width of the label, or 0 for label's length + labelWidth int + + // Options to choose from + options []string + + // Index of the currently selected option + selectedOption int + + // The label color. + labelColor tcell.Color + + // The label color when this item is selected. + labelColorActivated tcell.Color + + // The text color. + textColor tcell.Color + + // The text color when this item is selected. + textColorActivated tcell.Color + + // The background color. + backgroundColor tcell.Color + + // The background color when this item is selected. + backgroundColorActivated tcell.Color + + // A callback invoked when the user leaves this form item + onFinished func(tcell.Key) + + // A callback invoked when this primitive receives focus. + onFocus func() + + // A callback invoked when this primitive loses focus. + onBlur func() +} + +// NewEnumField returns a new navigation bar. +func NewEnumField(options []string) *EnumField { + return &EnumField{ + Box: tview.NewBox(), + backgroundColor: tview.Styles.PrimitiveBackgroundColor, + backgroundColorActivated: tview.Styles.ContrastBackgroundColor, + labelColor: tview.Styles.SecondaryTextColor, + labelColorActivated: tview.Styles.ContrastSecondaryTextColor, + textColor: tview.Styles.PrimaryTextColor, + textColorActivated: tview.Styles.PrimaryTextColor, + options: options, + } +} + +// SetLabelColor sets the color of button text. +func (n *EnumField) SetLabelColor(color tcell.Color) *EnumField { + n.labelColor = color + return n +} + +// SetLabelColorActivated sets the color of button text when the button is +// selected. +func (n *EnumField) SetLabelColorActivated(color tcell.Color) *EnumField { + n.labelColorActivated = color + return n +} + +// SetNavBackgroundColor sets the background color. +func (n *EnumField) SetFieldBackgroundColor(color tcell.Color) *EnumField { + n.backgroundColor = color + return n +} + +// SetBackgroundColorActivated sets the background color of the button text when +// the button is selected. +func (n *EnumField) SetBackgroundColorActivated(color tcell.Color) *EnumField { + n.backgroundColorActivated = color + return n +} + +// Draw renders this primitive onto the screen. +func (n *EnumField) Draw(screen tcell.Screen) { + + // Update dimensions + n.Box.Draw(screen) + + // Obtain dimensions + x, y, width, height := n.GetInnerRect() + rightLimit := x + width + if height < 1 || rightLimit <= x { + return + } + + // Draw label. + // Make sure labelWidth is not greater than n.labelWidth + labelWidth := rightLimit - x + if (n.labelWidth > 0) && (n.labelWidth < labelWidth) { + labelWidth = n.labelWidth + } + tview.Print(screen, n.label, x, y, labelWidth, tview.AlignLeft, n.labelColor) + // Always move to the edge to align input fields + x += n.labelWidth + + // Don't draw the option part if there are no options + if len(n.options) == 0 { + return + } + + // get as much space as needed or available + fieldWidth := math.MaxInt32 + if rightLimit-x < fieldWidth { + fieldWidth = rightLimit - x + } + + // Draw the background + var ( + fieldStyle tcell.Style + textColor tcell.Color + ) + + if n.HasFocus() { + fieldStyle = tcell.StyleDefault.Background(n.backgroundColorActivated) + textColor = n.textColorActivated + } else { + fieldStyle = tcell.StyleDefault.Background(n.backgroundColor) + textColor = n.textColor + } + + for index := 0; index < len(n.options[n.selectedOption]); index++ { + screen.SetContent(x+index, y, ' ', nil, fieldStyle) + } + + // Draw the text + text := n.options[n.selectedOption] + tview.Print(screen, tview.Escape(text), x, y, fieldWidth, tview.AlignLeft, textColor) +} + +// InputHandler returns the handler for this primitive. +func (n *EnumField) InputHandler() func(event *tcell.EventKey, setFocus func(p tview.Primitive)) { + return n.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) { + key := event.Key() + switch key { + case tcell.KeyLeft: + n.selectedOption-- + if n.selectedOption < 0 { + n.selectedOption = len(n.options) - 1 + } + case tcell.KeyRight: + n.selectedOption++ + if n.selectedOption == len(n.options) { + n.selectedOption = 0 + } + case tcell.KeyDown, tcell.KeyUp, tcell.KeyEnter, + tcell.KeyEscape, tcell.KeyTab, tcell.KeyBacktab: + n.onFinished(key) + } + }) +} + +// GetLabel returns the text to be displayed before the input area. +func (n *EnumField) GetLabel() string { + return n.label +} + +// GetFieldWidth obtains a screen width of the input area. A value of 0 means +// extend as much as possible. +func (n *EnumField) GetFieldWidth() int { + // Same as the text length + return 0 +} + +// SetFormAttributes sets attributes shared by all form items. Only bgColor is considered for bg colors. +func (n *EnumField) SetFormAttributes(labelWidth int, labelColor, bgColor, fieldTextColor, fieldBgColor tcell.Color) tview.FormItem { + n.labelWidth = labelWidth + n.labelColor = labelColor + n.textColor = fieldTextColor + n.backgroundColor = bgColor + + return n +} + +// SetFinishedFunc sets a callback invoked when the user leaves this form item. +func (n *EnumField) SetFinishedFunc(handler func(key tcell.Key)) tview.FormItem { + n.onFinished = handler + return n +} + +// SetOnFocusFunc sets a callback invoked when this primitive receives focus. +func (n *EnumField) SetOnFocusFunc(handler func()) *EnumField { + n.onFocus = handler + return n +} + +// SetOnBlurFunc sets a callback invoked when this primitive loses focus. +func (n *EnumField) SetOnBlurFunc(handler func()) *EnumField { + n.onBlur = handler + return n +} + +// Focus is called when this primitive receives focus. +func (n *EnumField) Focus(delegate func(p tview.Primitive)) { + if n.onFocus != nil { + n.onFocus() + } + + n.Box.Focus(delegate) +} + +// Blur is called when this primitive loses focus. +func (n *EnumField) Blur() { + if n.onBlur != nil { + n.onBlur() + } + n.Box.Blur() +} + +// GetText returns currently selected text +func (n *EnumField) GetText() string { + return n.options[n.selectedOption] +} + +// SetLabel sets label and returns the updated object. +func (n *EnumField) SetLabel(x string) *EnumField { + n.label = x + n.Box.SetTitle(n.label) + return n +} + +// SetLabelWidth sets the screen width of the label. A value of 0 will cause the +// primitive to use the width of the label string. +func (n *EnumField) SetLabelWidth(width int) *EnumField { + n.labelWidth = width + return n +} + +// GetLabelWidth returns width of the label field. +func (n *EnumField) GetLabelWidth() int { + return n.labelWidth +} diff --git a/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go b/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go index c4d98f8c234..937eadcfcbe 100644 --- a/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go +++ b/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go @@ -7,6 +7,7 @@ import ( "fmt" "strings" + "microsoft.com/pkggen/imagegen/attendedinstaller/primitives/enumfield" "microsoft.com/pkggen/imagegen/attendedinstaller/primitives/navigationbar" "microsoft.com/pkggen/imagegen/attendedinstaller/uitext" "microsoft.com/pkggen/imagegen/attendedinstaller/uiutils" @@ -80,10 +81,10 @@ type ManualPartitionWidget struct { addPartitionForm *tview.Form formFlex *tview.Flex formNavBar *navigationbar.NavigationBar - formatInput *tview.InputField + formatInput *enumfield.EnumField mountPointInput *tview.InputField nameInput *tview.InputField - sizeUnitInput *tview.InputField + sizeUnitInput *enumfield.EnumField sizeInput *tview.InputField formSpaceLeftText *tview.TextView @@ -129,13 +130,34 @@ func (mp *ManualPartitionWidget) Initialize(backButtonText string, sysConfig *co mp.addPartitionForm = tview.NewForm(). SetButtonsAlign(tview.AlignCenter) + // Calculate longest label size to align enum input fields + diskSizeLabelFull := fmt.Sprintf("%s %s", uitext.FormDiskSizeLabel, uitext.FormDiskSizeLabelMaxHelp) + var maxLabelWidth int + labels := []string{ + uitext.FormDiskFormatLabel, + uitext.FormDiskSizeUnitLabel, + uitext.FormDiskNameLabel, + uitext.FormDiskMountPointLabel, + diskSizeLabelFull, + } + for _, label := range labels { + labelLen := len(label) + if labelLen > maxLabelWidth { + maxLabelWidth = labelLen + } + } + mp.formatInput = mp.enumInputBox(validPartitionFormats). SetLabel(uitext.FormDiskFormatLabel). - SetFieldBackgroundColor(tcell.ColorWhite) + SetLabelWidth(maxLabelWidth). + SetFieldBackgroundColor(tcell.ColorWhite). + SetBackgroundColorActivated(tcell.ColorPurple) mp.sizeUnitInput = mp.enumInputBox(validSizeUnits). SetLabel(uitext.FormDiskSizeUnitLabel). - SetFieldBackgroundColor(tcell.ColorWhite) + SetLabelWidth(maxLabelWidth). + SetFieldBackgroundColor(tcell.ColorWhite). + SetBackgroundColorActivated(tcell.ColorPurple) mp.nameInput = tview.NewInputField(). SetLabel(uitext.FormDiskNameLabel). @@ -149,7 +171,7 @@ func (mp *ManualPartitionWidget) Initialize(backButtonText string, sysConfig *co SetFieldBackgroundColor(tcell.ColorWhite) mp.sizeInput = tview.NewInputField(). - SetLabel(fmt.Sprintf("%s %s", uitext.FormDiskSizeLabel, uitext.FormDiskSizeLabelMaxHelp)). + SetLabel(diskSizeLabelFull). SetAcceptanceFunc(mp.sizeInputValidation). SetFieldBackgroundColor(tcell.ColorWhite) @@ -660,38 +682,25 @@ func (mp *ManualPartitionWidget) onNextButton() { } } -// enumInputBox returns an input box that only allows values from elements to appear. -func (mp *ManualPartitionWidget) enumInputBox(elements []string) *tview.InputField { - field := tview.NewInputField() - index := 0 - // Initialize text with the first element - field.SetText(elements[index]) - +// enumInputBox returns an input box that only allows values +// from elements to appear and produces helpful error message for +// every unhandled input +func (mp *ManualPartitionWidget) enumInputBox(elements []string) *enumfield.EnumField { + field := enumfield.NewEnumField(elements) + // Add helpful message when user presses any key we do not process field.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { key := event.Key() - // Override movement left/right. Leave navigation keys intact. Consume all other input. switch key { - case tcell.KeyLeft: - if index == 0 { - index = len(elements) - } - index-- - case tcell.KeyRight: - index++ - if index == len(elements) { - index = 0 - } case tcell.KeyEnter, tcell.KeyEscape, tcell.KeyDown, tcell.KeyTab, - tcell.KeyUp, tcell.KeyBacktab: + tcell.KeyUp, tcell.KeyBacktab, + tcell.KeyLeft, tcell.KeyRight: // Navigation keys - pass return event default: mp.formNavBar.SetUserFeedback(uitext.EnumNavigationFeedback, tview.Styles.TertiaryTextColor) return nil } - field.SetText(elements[index]) - return nil }) return field } From 3ce66db0c545ff9006d194144e2a3a26a60e4290 Mon Sep 17 00:00:00 2001 From: Jim Perrin Date: Wed, 26 May 2021 10:33:38 -0700 Subject: [PATCH 63/83] Add SUPPORT.md file to repo (#793) --- SUPPORT.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 SUPPORT.md diff --git a/SUPPORT.md b/SUPPORT.md new file mode 100644 index 00000000000..aba08d50a7a --- /dev/null +++ b/SUPPORT.md @@ -0,0 +1,17 @@ +# Support + +## How to file issues and get help + +This project uses [GitHub issues][gh-issue] to [track bugs][gh-bug] and [feature requests][gh-feature]. Please search the existing issues before filing new issues to avoid duplicates. For new topics, file your bug or feature request as a new issue. + +For questions about using this project, please look at the [Demo repo for CBL-Mariner][demo] and our [Contributor's Guide][contributor] if you want to work on CBL-Mariner. + +## Microsoft Support Policy + +Support for CBL-Mariner is limited to the resources listed above. + +[gh-issue]: https://github.com/microsoft/CBL-Mariner/issues/new/choose +[gh-bug]: https://github.com/microsoft/CBL-Mariner/issues/new?labels=bug +[gh-feature]: https://github.com/microsoft/CBL-Mariner/issues/new?labels=enhancement +[demo]: https://github.com/Microsoft/CBL-MarinerDemo +[contributor]: https://github.com/microsoft/CBL-Mariner/blob/main/CONTRIBUTING.md From 2f4b47ba23f029cd4d9d2a62a1c1d527aa68bcba Mon Sep 17 00:00:00 2001 From: nicolas guibourge Date: Wed, 26 May 2021 10:37:01 -0700 Subject: [PATCH 64/83] update kubernetes spec to latest hotfix (#991) * update k8s to newest hotfix * update signatures Co-authored-by: Nicolas Guibourge --- SPECS/kubernetes/kubernetes-1.18.14.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.18.14.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.18.17.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.18.17.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.19.7.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.19.7.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.19.9.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.19.9.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.20.2.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.20.2.spec | 9 ++++++--- SPECS/kubernetes/kubernetes-1.20.5.signatures.json | 4 ++-- SPECS/kubernetes/kubernetes-1.20.5.spec | 9 ++++++--- SPECS/kubernetes/version-file-1.18.14.sh | 4 ++-- SPECS/kubernetes/version-file-1.18.17.sh | 4 ++-- SPECS/kubernetes/version-file-1.19.7.sh | 4 ++-- SPECS/kubernetes/version-file-1.19.9.sh | 4 ++-- SPECS/kubernetes/version-file-1.20.2.sh | 4 ++-- SPECS/kubernetes/version-file-1.20.5.sh | 4 ++-- cgmanifest.json | 12 ++++++------ 19 files changed, 66 insertions(+), 48 deletions(-) diff --git a/SPECS/kubernetes/kubernetes-1.18.14.signatures.json b/SPECS/kubernetes/kubernetes-1.18.14.signatures.json index 4d886eaf788..3fb67314b43 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.14.signatures.json @@ -2,7 +2,7 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.14-hotfix.20210511.tar.gz": "ad232264bc80f2df182c805c03472ae94ec2e623c3bb1620475371c41e31db6e", - "version-file-1.18.14.sh": "024f80d29f25956e24f8474c208bf6e7f6a597f2742add658bc8f8a4712db99e" + "kubernetes-node-linux-amd64-1.18.14-hotfix.20210525.tar.gz": "989cf9c8282eb9ae45a4fb31c0d1e4e596f0f02d455dfaf7945bd6293fa71e26", + "version-file-1.18.14.sh": "eba62317d1eb056ede056fc9e3b665fd8489e7f9866669845ad3b5196b5fc3ef" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.14.spec b/SPECS/kubernetes/kubernetes-1.18.14.spec index 8002f1821ee..58e271015c0 100644 --- a/SPECS/kubernetes/kubernetes-1.18.14.spec +++ b/SPECS/kubernetes/kubernetes-1.18.14.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.14 -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210525.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh Source3: golang-1.15-k8s-1.18-test.patch @@ -275,6 +275,9 @@ fi %{_bindir}/pause %changelog +* Wed May 26 2021 Nicolas Guibourge 1.18.14-8 +- Update to version "1.18.14-hotfix.20210525". + * Tue May 17 2021 Nicolas Guibourge 1.18.14-7 - Manually set version variables. diff --git a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json index 2435fe55b01..4f0e1e87177 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.18.17.signatures.json @@ -2,7 +2,7 @@ "Signatures": { "golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88", "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.18.17-hotfix.20210519.tar.gz": "d58dc5033229e790b152a44aca32c5a4b055bd081f85c65f6dcdb5db80742339", - "version-file-1.18.17.sh": "9798beb1daeada7694044b814f43617f8395358a4fb06d07cf92ddcf0ccc7f6f" + "kubernetes-node-linux-amd64-1.18.17-hotfix.20210525.tar.gz": "867b8ab28af471a64ae43d4d5bc690ea2aa06e2a93a1cb251837941c53ba4eea", + "version-file-1.18.17.sh": "008c106ef25a58c8f6c43ead83123c2ce31a9c9e042e1ff65025703d02c3e599" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.18.17.spec b/SPECS/kubernetes/kubernetes-1.18.17.spec index 046e0bda582..bd6ce3347d6 100644 --- a/SPECS/kubernetes/kubernetes-1.18.17.spec +++ b/SPECS/kubernetes/kubernetes-1.18.17.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.18.17 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210519.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210525.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh Source3: golang-1.15-k8s-1.18-test.patch @@ -275,6 +275,9 @@ fi %{_bindir}/pause %changelog +* Wed May 26 2021 Nicolas Guibourge 1.18.17-6 +- Update to version "1.18.17-hotfix.20210525". + * Mon May 24 2021 Nicolas Guibourge 1.18.17-5 - Update to version "1.18.17-hotfix.20210519". diff --git a/SPECS/kubernetes/kubernetes-1.19.7.signatures.json b/SPECS/kubernetes/kubernetes-1.19.7.signatures.json index 09f7fa5da9a..5097e7cfca8 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.7.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.7-hotfix.20210511.tar.gz": "12cb563ec25222662e9a3f615ab30f28abed7dbb50d3cc165b642db0d89c7078", - "version-file-1.19.7.sh": "4a04df39fb96ad2350c0828f8d81f0107b546173867600957c8834e3147be3d9" + "kubernetes-node-linux-amd64-1.19.7-hotfix.20210525.tar.gz": "36cb4c186561f0b072fd51e17cf2247d644293bffdd35579ea43cc38bfa97867", + "version-file-1.19.7.sh": "c1797eadb8e1747c89ffa74204b4c5d2e2514410ca25fd9983de12efa275ed70" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.7.spec b/SPECS/kubernetes/kubernetes-1.19.7.spec index b5521431475..91fc65bf6b6 100644 --- a/SPECS/kubernetes/kubernetes-1.19.7.spec +++ b/SPECS/kubernetes/kubernetes-1.19.7.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.7 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210525.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -271,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Wed May 26 2021 Nicolas Guibourge 1.19.7-5 +- Update to version "1.19.7-hotfix.20210525". + * Tue May 17 2021 Nicolas Guibourge 1.19.7-4 - Manually set version variables. diff --git a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json index 1adc29edfcd..00f1b856ed7 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.19.9.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.19.9-hotfix.20210519.tar.gz": "1054f15a632fdef7b6a9f2502b37cc574bfc776656b4c14f657f3dfd7745cd90", - "version-file-1.19.9.sh": "5386f01ec8c3baf118aaf320a78d5582bd3e9ccfb103dd12aff704b07e6fdd34" + "kubernetes-node-linux-amd64-1.19.9-hotfix.20210526.tar.gz": "041453b588243363d127629e479bdf02260864974303435a89b4315564f4b245", + "version-file-1.19.9.sh": "5b19790e50e5b518152eabbc5620784945a33c518705d43787868e41722e8818" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.19.9.spec b/SPECS/kubernetes/kubernetes-1.19.9.spec index 64ac80f1ea2..5c697795638 100644 --- a/SPECS/kubernetes/kubernetes-1.19.9.spec +++ b/SPECS/kubernetes/kubernetes-1.19.9.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.19.9 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210526/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210519.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210526.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -271,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Wed May 26 2021 Nicolas Guibourge 1.19.9-6 +- Update to version "1.19.9-hotfix.20210526". + * Mon May 24 2021 Nicolas Guibourge 1.19.9-5 - Update to version "1.19.9-hotfix.20210519". diff --git a/SPECS/kubernetes/kubernetes-1.20.2.signatures.json b/SPECS/kubernetes/kubernetes-1.20.2.signatures.json index 34cb9afd649..b2085695b58 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.2.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.2-hotfix.20210511.tar.gz": "ac2e7737d9deee2b9a10cff9ccc8e50010d9b896d909be1369685963932c9151", - "version-file-1.20.2.sh": "be1e9057920635d52949c8d684d026ab7699fbf0d5de14a92f08f4f7e2ea92d8" + "kubernetes-node-linux-amd64-1.20.2-hotfix.20210525.tar.gz": "4ae397f72e051e61266798537a3461af0cca7925a07d2eb4d9e6cf91ec368f2a", + "version-file-1.20.2.sh": "584e5132135cb4e2838e32e900b54e1a85c1e293052ae8614d3adff4a00605d9" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.2.spec b/SPECS/kubernetes/kubernetes-1.20.2.spec index 6cb88c2fe0e..3cf26cac229 100644 --- a/SPECS/kubernetes/kubernetes-1.20.2.spec +++ b/SPECS/kubernetes/kubernetes-1.20.2.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.2 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210511.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210525.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -271,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Wed May 26 2021 Nicolas Guibourge 1.20.2-5 +- Update to version "1.20.2-hotfix.20210525". + * Tue May 17 2021 Nicolas Guibourge 1.20.2-4 - Manually set version variables. diff --git a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json index 21291852746..fce1e033379 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.signatures.json +++ b/SPECS/kubernetes/kubernetes-1.20.5.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e", - "kubernetes-node-linux-amd64-1.20.5-hotfix.20210519.tar.gz": "709379c8c3d09e044b4c24d59a7aba2e3f724f1e0aecbf93d05f78cc320db27a", - "version-file-1.20.5.sh": "2b050242db3d32762705545eb2606f527aa2ee01d55af1603eada4c39efccff0" + "kubernetes-node-linux-amd64-1.20.5-hotfix.20210526.tar.gz": "aa80445462630c44583586abb4c91b18572c39f65b4facb64fd372456309b4de", + "version-file-1.20.5.sh": "85b92fea6a3bf5deb95226de3456ae5e256f40606da72fbfece6551d3907c409" } } \ No newline at end of file diff --git a/SPECS/kubernetes/kubernetes-1.20.5.spec b/SPECS/kubernetes/kubernetes-1.20.5.spec index da93ffcf451..94562ba3230 100644 --- a/SPECS/kubernetes/kubernetes-1.20.5.spec +++ b/SPECS/kubernetes/kubernetes-1.20.5.spec @@ -10,15 +10,15 @@ Summary: Microsoft Kubernetes Name: kubernetes Version: 1.20.5 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: Microsoft Kubernetes URL: https://mcr.microsoft.com/oss -#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz +#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210526/binaries/kubernetes-node-linux-amd64.tar.gz # Note that only amd64 tarball exist which is OK since kubernetes is built from source -Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210519.tar.gz +Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210526.tar.gz Source1: kubelet.service Source2: version-file-%{version}.sh # CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available) @@ -271,6 +271,9 @@ fi %{_bindir}/pause %changelog +* Wed May 26 2021 Nicolas Guibourge 1.20.5-6 +- Update to version "1.20.5-hotfix.20210526". + * Mon May 24 2021 Nicolas Guibourge 1.20.5-5 - Update to version "1.20.5-hotfix.20210519". diff --git a/SPECS/kubernetes/version-file-1.18.14.sh b/SPECS/kubernetes/version-file-1.18.14.sh index 2bdc7de957f..a67bb307024 100755 --- a/SPECS/kubernetes/version-file-1.18.14.sh +++ b/SPECS/kubernetes/version-file-1.18.14.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='1adde27c8a2253fde5290a6874e9cdb6cb318fc0' +KUBE_GIT_COMMIT='c4f126fb607b94e227e7a0c429b26c6d7ec4ac48' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.18.14-hotfix.20210511' +KUBE_GIT_VERSION='v1.18.14-hotfix.20210525' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='18+' diff --git a/SPECS/kubernetes/version-file-1.18.17.sh b/SPECS/kubernetes/version-file-1.18.17.sh index 1a15742efff..75cf290ff65 100755 --- a/SPECS/kubernetes/version-file-1.18.17.sh +++ b/SPECS/kubernetes/version-file-1.18.17.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='5871d3360e3612052babed0c1e2f0da18389cdaa' +KUBE_GIT_COMMIT='68e3e47dad98b808ba41087c0c62e80cd4fcec36' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.18.17-hotfix.20210519' +KUBE_GIT_VERSION='v1.18.17-hotfix.20210525' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='18+' diff --git a/SPECS/kubernetes/version-file-1.19.7.sh b/SPECS/kubernetes/version-file-1.19.7.sh index 1393e9a4eb4..9e6541f7fc5 100755 --- a/SPECS/kubernetes/version-file-1.19.7.sh +++ b/SPECS/kubernetes/version-file-1.19.7.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='96f5948a28081b6c4eb245ddeceae357b7e96012' +KUBE_GIT_COMMIT='07669e011dcd1dec94746384f44ead98396daf38' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.19.7-hotfix.20210511' +KUBE_GIT_VERSION='v1.19.7-hotfix.20210525' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='19+' diff --git a/SPECS/kubernetes/version-file-1.19.9.sh b/SPECS/kubernetes/version-file-1.19.9.sh index 474359092eb..485c5dfc6fa 100755 --- a/SPECS/kubernetes/version-file-1.19.9.sh +++ b/SPECS/kubernetes/version-file-1.19.9.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='c1ad2bc44e0c7f19a9db0879f7182ff556a8e5b4' +KUBE_GIT_COMMIT='1af681ff123a96cc50f4f6323a83c70a1daf6950' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.19.9-hotfix.20210519' +KUBE_GIT_VERSION='v1.19.9-hotfix.20210526' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='19+' diff --git a/SPECS/kubernetes/version-file-1.20.2.sh b/SPECS/kubernetes/version-file-1.20.2.sh index 0f93d6cb31b..c7bcc10b385 100755 --- a/SPECS/kubernetes/version-file-1.20.2.sh +++ b/SPECS/kubernetes/version-file-1.20.2.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='cdca464418d7038e3d8f2fe32cea26574d81283c' +KUBE_GIT_COMMIT='e0b7fa2fe3b6c1cd0ea26a048a7658d66f54fa52' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.20.2-hotfix.20210511' +KUBE_GIT_VERSION='v1.20.2-hotfix.20210525' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='20+' diff --git a/SPECS/kubernetes/version-file-1.20.5.sh b/SPECS/kubernetes/version-file-1.20.5.sh index 0ee71a7a3c8..d347fc978dd 100755 --- a/SPECS/kubernetes/version-file-1.20.5.sh +++ b/SPECS/kubernetes/version-file-1.20.5.sh @@ -1,5 +1,5 @@ -KUBE_GIT_COMMIT='9a45ba1752db920873e084791faff8d470278b09' +KUBE_GIT_COMMIT='5a7170d3bbf1731483f4844c2222c70501717341' KUBE_GIT_TREE_STATE='archive' -KUBE_GIT_VERSION='v1.20.5-hotfix.20210519' +KUBE_GIT_VERSION='v1.20.5-hotfix.20210526' KUBE_GIT_MAJOR='1' KUBE_GIT_MINOR='20+' diff --git a/cgmanifest.json b/cgmanifest.json index 18c3049ea84..dfd10577620 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2266,7 +2266,7 @@ "other": { "name": "kubernetes", "version": "1.18.14", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2276,7 +2276,7 @@ "other": { "name": "kubernetes", "version": "1.18.17", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.17-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2286,7 +2286,7 @@ "other": { "name": "kubernetes", "version": "1.19.7", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.7-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2296,7 +2296,7 @@ "other": { "name": "kubernetes", "version": "1.19.9", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9-hotfix.20210526/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2306,7 +2306,7 @@ "other": { "name": "kubernetes", "version": "1.20.2", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210511/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.2-hotfix.20210525/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, @@ -2316,7 +2316,7 @@ "other": { "name": "kubernetes", "version": "1.20.5", - "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210519/binaries/kubernetes-node-linux-amd64.tar.gz" + "downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5-hotfix.20210526/binaries/kubernetes-node-linux-amd64.tar.gz" } } }, From f33d67aca8441b078a0336760a41f4ed09baea3e Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Wed, 26 May 2021 17:14:18 -0700 Subject: [PATCH 65/83] Patch Curl: CVE-2021-22898 and CVE-2021-22901 (#990) * Patches for CVE-2021-22898 and CVE-2021-22901 --- SPECS/curl/CVE-2021-22898.patch | 32 ++ SPECS/curl/CVE-2021-22901.patch | 308 ++++++++++++++++++ SPECS/curl/curl.spec | 7 +- .../manifests/package/pkggen_core_aarch64.txt | 6 +- .../manifests/package/pkggen_core_x86_64.txt | 6 +- .../manifests/package/toolchain_aarch64.txt | 8 +- .../manifests/package/toolchain_x86_64.txt | 8 +- 7 files changed, 360 insertions(+), 15 deletions(-) create mode 100644 SPECS/curl/CVE-2021-22898.patch create mode 100644 SPECS/curl/CVE-2021-22901.patch diff --git a/SPECS/curl/CVE-2021-22898.patch b/SPECS/curl/CVE-2021-22898.patch new file mode 100644 index 00000000000..71e74964158 --- /dev/null +++ b/SPECS/curl/CVE-2021-22898.patch @@ -0,0 +1,32 @@ +From 280f4238182c4f2bc5843ce1fefce3dbc2220033 Mon Sep 17 00:00:00 2001 +From: Harry Sintonen +Date: Fri, 7 May 2021 13:09:57 +0200 +Subject: [PATCH] telnet: check sscanf() for correct number of matches + +CVE-2021-22898 + +Bug: https://curl.se/docs/CVE-2021-22898.html +--- + lib/telnet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/telnet.c b/lib/telnet.c +index f96a4cb4c..4551435a0 100644 +--- a/lib/telnet.c ++++ b/lib/telnet.c +@@ -919,11 +919,11 @@ static void suboption(struct Curl_easy *data) + + for(v = tn->telnet_vars; v; v = v->next) { + size_t tmplen = (strlen(v->data) + 1); + /* Add the variable only if it fits */ + if(len + tmplen < (int)sizeof(temp)-6) { +- if(sscanf(v->data, "%127[^,],%127s", varname, varval)) { ++ if(sscanf(v->data, "%127[^,],%127s", varname, varval) == 2) { + msnprintf((char *)&temp[len], sizeof(temp) - len, + "%c%s%c%s", CURL_NEW_ENV_VAR, varname, + CURL_NEW_ENV_VALUE, varval); + len += tmplen; + } +-- +2.31.1 + diff --git a/SPECS/curl/CVE-2021-22901.patch b/SPECS/curl/CVE-2021-22901.patch new file mode 100644 index 00000000000..8572b3869b1 --- /dev/null +++ b/SPECS/curl/CVE-2021-22901.patch @@ -0,0 +1,308 @@ +From 15156c613dc0e562ac20b5b24a39605ee7ec62d2 Mon Sep 17 00:00:00 2001 +From: Harry Sintonen +Date: Wed, 5 May 2021 13:42:26 +0200 +Subject: [PATCH] openssl: associate/detach the transfer from connection + +Bug: https://curl.se/docs/CVE-2021-22901.html +--- + lib/multi.c | 5 +- + lib/vtls/openssl.c | 146 +++++++++++++++++++++++++++++++++------------ + lib/vtls/vtls.c | 23 ++++++- + lib/vtls/vtls.h | 12 ++++ + 4 files changed, 145 insertions(+), 41 deletions(-) + +diff --git a/lib/multi.c b/lib/multi.c +index be3e41f..68c8404 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -872,8 +872,10 @@ bool Curl_multiplex_wanted(const struct Curl_multi *multi) + void Curl_detach_connnection(struct Curl_easy *data) + { + struct connectdata *conn = data->conn; +- if(conn) ++ if(conn) { + Curl_llist_remove(&conn->easyq, &data->conn_queue, NULL); ++ Curl_ssl_detach_conn(data, conn); ++ } + data->conn = NULL; + } + +@@ -890,6 +892,7 @@ void Curl_attach_connnection(struct Curl_easy *data, + data->conn = conn; + Curl_llist_insert_next(&conn->easyq, conn->easyq.tail, data, + &data->conn_queue); ++ Curl_ssl_associate_conn(data, conn); + } + + static int waitconnect_getsock(struct connectdata *conn, +diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c +index 68b9898..45a9eca 100644 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -246,6 +246,10 @@ struct ssl_backend_data { + #endif + }; + ++static void ossl_associate_connection(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex); ++ + /* + * Number of bytes to read from the random number seed file. This must be + * a finite value (because some entropy "files" like /dev/urandom have +@@ -2504,6 +2508,7 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + curl_socket_t sockfd = conn->sock[sockindex]; + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; + ctx_option_t ctx_options = 0; ++ void *ssl_sessionid = NULL; + + #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME + bool sni; +@@ -3205,46 +3210,23 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + } + #endif + +- /* Check if there's a cached ID we can/should use here! */ +- if(SSL_SET_OPTION(primary.sessionid)) { +- void *ssl_sessionid = NULL; +- int data_idx = ossl_get_ssl_data_index(); +- int connectdata_idx = ossl_get_ssl_conn_index(); +- int sockindex_idx = ossl_get_ssl_sockindex_index(); +- int proxy_idx = ossl_get_proxy_index(); +- +- if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && +- proxy_idx >= 0) { +- /* Store the data needed for the "new session" callback. +- * The sockindex is stored as a pointer to an array element. */ +- SSL_set_ex_data(backend->handle, data_idx, data); +- SSL_set_ex_data(backend->handle, connectdata_idx, conn); +- SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); +-#ifndef CURL_DISABLE_PROXY +- SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: +- NULL); +-#else +- SSL_set_ex_data(backend->handle, proxy_idx, NULL); +-#endif +- +- } ++ ossl_associate_connection(data, conn, sockindex); + +- Curl_ssl_sessionid_lock(data); +- if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, +- &ssl_sessionid, NULL, sockindex)) { +- /* we got a session id, use it! */ +- if(!SSL_set_session(backend->handle, ssl_sessionid)) { +- Curl_ssl_sessionid_unlock(data); +- failf(data, "SSL: SSL_set_session failed: %s", +- ossl_strerror(ERR_get_error(), error_buffer, +- sizeof(error_buffer))); +- return CURLE_SSL_CONNECT_ERROR; +- } +- /* Informational message */ +- infof(data, "SSL re-using session ID\n"); ++ Curl_ssl_sessionid_lock(data); ++ if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)) { ++ /* we got a session id, use it! */ ++ if(!SSL_set_session(backend->handle, ssl_sessionid)) { ++ Curl_ssl_sessionid_unlock(data); ++ failf(data, "SSL: SSL_set_session failed: %s", ++ ossl_strerror(ERR_get_error(), error_buffer, ++ sizeof(error_buffer))); ++ return CURLE_SSL_CONNECT_ERROR; + } +- Curl_ssl_sessionid_unlock(data); ++ /* Informational message */ ++ infof(data, "SSL re-using session ID\n"); + } ++ Curl_ssl_sessionid_unlock(data); + + #ifndef CURL_DISABLE_PROXY + if(conn->proxy_ssl[sockindex].use) { +@@ -4470,6 +4452,90 @@ static void *ossl_get_internals(struct ssl_connect_data *connssl, + (void *)backend->ctx : (void *)backend->handle; + } + ++static void ossl_associate_connection(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex) ++{ ++ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++ struct ssl_backend_data *backend = connssl->backend; ++ ++ /* If we don't have SSL context, do nothing. */ ++ if(!backend->handle) ++ return; ++ ++ if(SSL_SET_OPTION(primary.sessionid)) { ++ int data_idx = ossl_get_ssl_data_index(); ++ int connectdata_idx = ossl_get_ssl_conn_index(); ++ int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ ++ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { ++ /* Store the data needed for the "new session" callback. ++ * The sockindex is stored as a pointer to an array element. */ ++ SSL_set_ex_data(backend->handle, data_idx, data); ++ SSL_set_ex_data(backend->handle, connectdata_idx, conn); ++ SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); ++#ifndef CURL_DISABLE_PROXY ++ SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: ++ NULL); ++#else ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++#endif ++ } ++ } ++} ++ ++/* ++ * Starting with TLS 1.3, the ossl_new_session_cb callback gets called after ++ * the handshake. If the transfer that sets up the callback gets killed before ++ * this callback arrives, we must make sure to properly clear the data to ++ * avoid UAF problems. A future optimization could be to instead store another ++ * transfer that might still be using the same connection. ++ */ ++ ++static void ossl_disassociate_connection(struct Curl_easy *data, ++ int sockindex) ++{ ++ struct connectdata *conn = data->conn; ++ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++ struct ssl_backend_data *backend = connssl->backend; ++ ++ /* If we don't have SSL context, do nothing. */ ++ if(!backend->handle) ++ return; ++ ++ if(SSL_SET_OPTION(primary.sessionid)) { ++ bool isproxy = FALSE; ++ bool incache; ++ void *old_ssl_sessionid = NULL; ++ int data_idx = ossl_get_ssl_data_index(); ++ int connectdata_idx = ossl_get_ssl_conn_index(); ++ int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ ++ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { ++ /* Invalidate the session cache entry, if any */ ++ isproxy = SSL_get_ex_data(backend->handle, proxy_idx) ? TRUE : FALSE; ++ ++ /* Disable references to data in "new session" callback to avoid ++ * accessing a stale pointer. */ ++ SSL_set_ex_data(backend->handle, data_idx, NULL); ++ SSL_set_ex_data(backend->handle, connectdata_idx, NULL); ++ SSL_set_ex_data(backend->handle, sockindex_idx, NULL); ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++ } ++ ++ Curl_ssl_sessionid_lock(data); ++ incache = !(Curl_ssl_getsessionid(data, conn, isproxy, ++ &old_ssl_sessionid, NULL, sockindex)); ++ if(incache) ++ Curl_ssl_delsessionid(data, old_ssl_sessionid); ++ Curl_ssl_sessionid_unlock(data); ++ } ++} ++ + const struct Curl_ssl Curl_ssl_openssl = { + { CURLSSLBACKEND_OPENSSL, "openssl" }, /* info */ + +@@ -4504,10 +4570,12 @@ const struct Curl_ssl Curl_ssl_openssl = { + ossl_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ + #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256) +- ossl_sha256sum /* sha256sum */ ++ ossl_sha256sum, /* sha256sum */ + #else +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ + #endif ++ ossl_associate_connection, /* associate_connection */ ++ ossl_disassociate_connection /* disassociate_connection */ + }; + + #endif /* USE_OPENSSL */ +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index 2e07df0..22cfb88 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -579,6 +579,25 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, + return CURLE_OK; + } + ++void Curl_ssl_associate_conn(struct Curl_easy *data, ++ struct connectdata *conn) ++{ ++ if(Curl_ssl->associate_connection) { ++ Curl_ssl->associate_connection(data, conn, FIRSTSOCKET); ++ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) ++ Curl_ssl->associate_connection(data, conn, SECONDARYSOCKET); ++ } ++} ++ ++void Curl_ssl_detach_conn(struct Curl_easy *data, ++ struct connectdata *conn) ++{ ++ if(Curl_ssl->disassociate_connection) { ++ Curl_ssl->disassociate_connection(data, FIRSTSOCKET); ++ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) ++ Curl_ssl->disassociate_connection(data, SECONDARYSOCKET); ++ } ++} + + void Curl_ssl_close_all(struct Curl_easy *data) + { +@@ -1207,7 +1226,9 @@ static const struct Curl_ssl Curl_ssl_multi = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + const struct Curl_ssl *Curl_ssl = +diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h +index 2b43e77..78d1003 100644 +--- a/lib/vtls/vtls.h ++++ b/lib/vtls/vtls.h +@@ -83,6 +83,11 @@ struct Curl_ssl { + bool (*false_start)(void); + CURLcode (*sha256sum)(const unsigned char *input, size_t inputlen, + unsigned char *sha256sum, size_t sha256sumlen); ++ ++ void (*associate_connection)(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex); ++ void (*disassociate_connection)(struct Curl_easy *data, int sockindex); + }; + + #ifdef USE_SSL +@@ -277,6 +282,11 @@ bool Curl_ssl_cert_status_request(void); + + bool Curl_ssl_false_start(void); + ++void Curl_ssl_associate_conn(struct Curl_easy *data, ++ struct connectdata *conn); ++void Curl_ssl_detach_conn(struct Curl_easy *data, ++ struct connectdata *conn); ++ + #define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */ + + #else /* if not USE_SSL */ +@@ -303,6 +313,8 @@ bool Curl_ssl_false_start(void); + #define Curl_ssl_cert_status_request() FALSE + #define Curl_ssl_false_start() FALSE + #define Curl_ssl_tls13_ciphersuites() FALSE ++#define Curl_ssl_associate_conn(a,b) Curl_nop_stmt ++#define Curl_ssl_detach_conn(a,b) Curl_nop_stmt + #endif + + #endif /* HEADER_CURL_VTLS_H */ +-- +2.17.1 + diff --git a/SPECS/curl/curl.spec b/SPECS/curl/curl.spec index f502cec793a..c691e75c93b 100644 --- a/SPECS/curl/curl.spec +++ b/SPECS/curl/curl.spec @@ -1,13 +1,15 @@ Summary: An URL retrieval utility and library Name: curl Version: 7.76.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/NetworkingLibraries URL: https://curl.haxx.se Source0: https://curl.haxx.se/download/%{name}-%{version}.tar.gz +Patch0: CVE-2021-22898.patch +Patch1: CVE-2021-22901.patch BuildRequires: krb5-devel BuildRequires: libssh2-devel BuildRequires: openssl-devel @@ -98,6 +100,9 @@ rm -rf %{buildroot}/* %{_libdir}/libcurl.so.* %changelog +* Wed May 26 2021 Jon Slobodzian - 7.76.0-2 +- Patch 7.76.0 to fix CVE-2021-22898 and CVE-2021-22901. + * Wed Mar 31 2021 Nicolas Ontiveros - 7.76.0-1 - Upgrade to version 7.76.0 to fix CVE-2021-22876 and CVE-2021-22890. diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index f4922cf91ff..373a10d2f94 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -129,9 +129,9 @@ libsolv-0.7.7-4.cm1.aarch64.rpm libsolv-devel-0.7.7-4.cm1.aarch64.rpm libssh2-1.9.0-1.cm1.aarch64.rpm libssh2-devel-1.9.0-1.cm1.aarch64.rpm -curl-7.76.0-1.cm1.aarch64.rpm -curl-devel-7.76.0-1.cm1.aarch64.rpm -curl-libs-7.76.0-1.cm1.aarch64.rpm +curl-7.76.0-2.cm1.aarch64.rpm +curl-devel-7.76.0-2.cm1.aarch64.rpm +curl-libs-7.76.0-2.cm1.aarch64.rpm tdnf-2.1.0-6.cm1.aarch64.rpm tdnf-cli-libs-2.1.0-6.cm1.aarch64.rpm tdnf-devel-2.1.0-6.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 6389b1e5036..7e939ea84a9 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -129,9 +129,9 @@ libsolv-0.7.7-4.cm1.x86_64.rpm libsolv-devel-0.7.7-4.cm1.x86_64.rpm libssh2-1.9.0-1.cm1.x86_64.rpm libssh2-devel-1.9.0-1.cm1.x86_64.rpm -curl-7.76.0-1.cm1.x86_64.rpm -curl-devel-7.76.0-1.cm1.x86_64.rpm -curl-libs-7.76.0-1.cm1.x86_64.rpm +curl-7.76.0-2.cm1.x86_64.rpm +curl-devel-7.76.0-2.cm1.x86_64.rpm +curl-libs-7.76.0-2.cm1.x86_64.rpm tdnf-2.1.0-6.cm1.x86_64.rpm tdnf-cli-libs-2.1.0-6.cm1.x86_64.rpm tdnf-devel-2.1.0-6.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 85b6ef85dd0..0bfea112876 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -47,10 +47,10 @@ cryptsetup-debuginfo-2.3.3-2.cm1.aarch64.rpm cryptsetup-devel-2.3.3-2.cm1.aarch64.rpm cryptsetup-libs-2.3.3-2.cm1.aarch64.rpm cryptsetup-reencrypt-2.3.3-2.cm1.aarch64.rpm -curl-7.76.0-1.cm1.aarch64.rpm -curl-debuginfo-7.76.0-1.cm1.aarch64.rpm -curl-devel-7.76.0-1.cm1.aarch64.rpm -curl-libs-7.76.0-1.cm1.aarch64.rpm +curl-7.76.0-2.cm1.aarch64.rpm +curl-debuginfo-7.76.0-2.cm1.aarch64.rpm +curl-devel-7.76.0-2.cm1.aarch64.rpm +curl-libs-7.76.0-2.cm1.aarch64.rpm device-mapper-2.03.05-5.cm1.aarch64.rpm device-mapper-devel-2.03.05-5.cm1.aarch64.rpm device-mapper-event-2.03.05-5.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 8654b406717..51ba662f914 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -47,10 +47,10 @@ cryptsetup-debuginfo-2.3.3-2.cm1.x86_64.rpm cryptsetup-devel-2.3.3-2.cm1.x86_64.rpm cryptsetup-libs-2.3.3-2.cm1.x86_64.rpm cryptsetup-reencrypt-2.3.3-2.cm1.x86_64.rpm -curl-7.76.0-1.cm1.x86_64.rpm -curl-debuginfo-7.76.0-1.cm1.x86_64.rpm -curl-devel-7.76.0-1.cm1.x86_64.rpm -curl-libs-7.76.0-1.cm1.x86_64.rpm +curl-7.76.0-2.cm1.x86_64.rpm +curl-debuginfo-7.76.0-2.cm1.x86_64.rpm +curl-devel-7.76.0-2.cm1.x86_64.rpm +curl-libs-7.76.0-2.cm1.x86_64.rpm device-mapper-2.03.05-5.cm1.x86_64.rpm device-mapper-devel-2.03.05-5.cm1.x86_64.rpm device-mapper-event-2.03.05-5.cm1.x86_64.rpm From 381efa762a9055580bc09017adce39f24aea9034 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Wed, 26 May 2021 18:37:19 -0700 Subject: [PATCH 66/83] Enable live kernel debugger support (#993) --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 ++++- SPECS/kernel-headers/kernel-headers.spec | 5 ++++- SPECS/kernel-hyperv/kernel-hyperv.spec | 5 ++++- SPECS/kernel/config | 14 ++++++++++++-- SPECS/kernel/kernel.signatures.json | 5 +++-- SPECS/kernel/kernel.spec | 5 ++++- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- 10 files changed, 35 insertions(+), 12 deletions(-) diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index cedb060780c..81e63eadf61 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.10.32.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -146,6 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 +- Bump release number to match kernel release + * Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 - Recalculate sha512hmac on signed kernel binary diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index c6326ac5194..6de9cecdb8f 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.10.32.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 +- Bump release number to match kernel release + * Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 - Bump release number to match kernel-signed update diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index 2faa84cdc7f..c328cd30a4e 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.10.32.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -263,6 +263,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 +- Bump release number to match kernel release + * Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 - Bump release number to match kernel-signed update diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 2b327cf167f..0517ba58542 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -2970,9 +2970,11 @@ CONFIG_SERIAL_8250_MID=m # # Non-8250 serial port support # +# CONFIG_SERIAL_KGDB_NMI is not set # CONFIG_SERIAL_UARTLITE is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_CONSOLE_POLL=y # CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_SCCNXP is not set @@ -6991,13 +6993,21 @@ CONFIG_STACK_VALIDATION=y # # Generic Kernel Debugging Instruments # -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 +# CONFIG_MAGIC_SYSRQ_SERIAL is not set CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set +CONFIG_KGDB=y +CONFIG_KGDB_HONOUR_BLOCKLIST=y +CONFIG_KGDB_SERIAL_CONSOLE=y +# CONFIG_KGDB_TESTS is not set +# CONFIG_KGDB_LOW_LEVEL_TRAP is not set +# CONFIG_KGDB_KDB is not set +CONFIG_ARCH_HAS_EARLY_DEBUG=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 55d25713315..29e8c07e28b 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,8 +1,9 @@ { "Signatures": { - "config": "24b55a258faf50ade68096d2c720cd475b1835704f32c1d059b80d5f12902aff", + "config": "835d42ef28db98fe7ed7364c665c2b8bb8d0dba2f442b50e337e095c2785909a", "config_aarch64": "8723afa7c230379e50ef66be8846ba1f4686210db360f47b1f989651fa54a3a2", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } -} \ No newline at end of file +} + diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index c8d91fdb61d..0d38ccc6049 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel Name: kernel Version: 5.10.32.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -489,6 +489,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 +- Enable kernel debugger + * Thu May 20 2021 Nicolas Ontiveros - 5.10.32.1-4 - Bump release number to match kernel-signed update diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 373a10d2f94..bd9a6d080f5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-5.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 7e939ea84a9..6e31c414998 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-5.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 0bfea112876..89fdbf7a170 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-5.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 51ba662f914..305e158593f 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-4.cm1.noarch.rpm +kernel-headers-5.10.32.1-5.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm From 4e3f08a3101b7f18540bc8d693682ce6556fd4da Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Wed, 26 May 2021 20:53:13 -0700 Subject: [PATCH 67/83] Patch dhcp for CVE-2021-25217 (#996) * Patch dhcp for CVE-2021-25217 * cleanup tabs --- SPECS/dhcp/CVE-2021-25217.patch | 30 +++++++++++++++++++++++++ SPECS/dhcp/dhcp.spec | 40 +++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 SPECS/dhcp/CVE-2021-25217.patch diff --git a/SPECS/dhcp/CVE-2021-25217.patch b/SPECS/dhcp/CVE-2021-25217.patch new file mode 100644 index 00000000000..8e02a6f2454 --- /dev/null +++ b/SPECS/dhcp/CVE-2021-25217.patch @@ -0,0 +1,30 @@ +diff --git a/common/parse.c b/common/parse.c +index 386a6321..fc7b39c6 100644 +--- a/common/parse.c ++++ b/common/parse.c +@@ -3,7 +3,7 @@ + Common parser code for dhcpd and dhclient. */ + + /* +- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC") ++ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 1995-2003 by Internet Software Consortium + * + * This Source Code Form is subject to the terms of the Mozilla Public +@@ -5556,13 +5556,14 @@ int parse_X (cfile, buf, max) + skip_to_semi (cfile); + return 0; + } +- convert_num (cfile, &buf [len], val, 16, 8); +- if (len++ > max) { ++ if (len >= max) { + parse_warn (cfile, + "hexadecimal constant too long."); + skip_to_semi (cfile); + return 0; + } ++ convert_num (cfile, &buf [len], val, 16, 8); ++ len++; + token = peek_token (&val, (unsigned *)0, cfile); + if (token == COLON) + token = next_token (&val, diff --git a/SPECS/dhcp/dhcp.spec b/SPECS/dhcp/dhcp.spec index ff48515b8e6..ce75f4121ee 100644 --- a/SPECS/dhcp/dhcp.spec +++ b/SPECS/dhcp/dhcp.spec @@ -1,43 +1,47 @@ -Summary: Dynamic host configuration protocol -Name: dhcp -Version: 4.4.2 -Release: 1%{?dist} +Summary: Dynamic host configuration protocol +Name: dhcp +Version: 4.4.2 +Release: 2%{?dist} License: MPLv2.0 -Url: https://www.isc.org/dhcp/ -Source0: ftp://ftp.isc.org/isc/dhcp/%{version}/%{name}-%{version}.tar.gz -Group: System Environment/Base +Url: https://www.isc.org/dhcp/ +Source0: ftp://ftp.isc.org/isc/dhcp/%{version}/%{name}-%{version}.tar.gz +Patch1: CVE-2021-25217.patch +Group: System Environment/Base Vendor: Microsoft Corporation Distribution: Mariner -BuildRequires: systemd +BuildRequires: systemd %description The ISC DHCP package contains both the client and server programs for DHCP. dhclient (the client) is used for connecting to a network which uses DHCP to assign network addresses. dhcpd (the server) is used for assigning network addresses on private networks %package libs -Summary: Libraries for dhcp +Summary: Libraries for dhcp %description libs Libraries for the dhcp. %package devel -Summary: Development Libraries and header files for dhcp -Requires: dhcp-libs +Summary: Development Libraries and header files for dhcp +Requires: dhcp-libs %description devel Headers and libraries for the dhcp. %package server -Summary: Provides the ISC DHCP server -Requires: dhcp-libs +Summary: Provides the ISC DHCP server +Requires: dhcp-libs %description server dhcpd is the name of a program that operates as a daemon on a server to provide Dynamic Host Configuration Protocol (DHCP) service to a network. Clients may solicit an IP address (IP) from a DHCP server when they need one %package client -Summary: Provides the ISC DHCP client daemon and dhclient-script -Requires: dhcp-libs +Summary: Provides the ISC DHCP client daemon and dhclient-script +Requires: dhcp-libs %description client The ISC DHCP Client, dhclient, provides a means for configuring one or more network interfaces using the Dynamic Host Configuration Protocol, BOOTP protocol, or if these protocols fail, by statically assigning an address. %prep +%autosetup -p1 + %setup -qn %{name}-%{version} + %build CFLAGS="-D_PATH_DHCLIENT_SCRIPT='\"/sbin/dhclient-script\"' \ -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"' \ @@ -115,8 +119,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/dhclient/ #%check #Commented out %check due to missing support of ATF. -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files libs %defattr(-,root,root) @@ -166,6 +170,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/dhclient/ %{_mandir}/man8/dhclient.8.gz %changelog +* Wed May 26 2021 Jon Slobodzian 4.4.2-2 +- Patch to fix CVE-2021-25217. * Thu May 28 2020 Nicolas Ontiveros 4.4.2-1 - Update to version 4.4.2, which fixes CVE-2017-3144 and CVE-2018-5733. - License verified. From 8f8d74e8696bead71d18c6638f0bf26edd62dbdf Mon Sep 17 00:00:00 2001 From: chalamalasetty <42326515+chalamalasetty@users.noreply.github.com> Date: Thu, 27 May 2021 12:33:06 -0700 Subject: [PATCH 68/83] Upgrade WALinuxAgent version to 2.2.54.2 which has Mariner distro support (#995) * Upgrade WALinuxAgent version * Update WALinuxAgent to use python3 version --- .../WALinuxAgent/WALinuxAgent.signatures.json | 2 +- SPECS/WALinuxAgent/WALinuxAgent.spec | 50 ++-- SPECS/WALinuxAgent/add-distro.patch | 242 ------------------ cgmanifest.json | 4 +- 4 files changed, 30 insertions(+), 268 deletions(-) delete mode 100644 SPECS/WALinuxAgent/add-distro.patch diff --git a/SPECS/WALinuxAgent/WALinuxAgent.signatures.json b/SPECS/WALinuxAgent/WALinuxAgent.signatures.json index f041d63e956..ea3afc65421 100644 --- a/SPECS/WALinuxAgent/WALinuxAgent.signatures.json +++ b/SPECS/WALinuxAgent/WALinuxAgent.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "WALinuxAgent-2.2.52.tar.gz": "46f692edaa93f094eef6c0dc8d95f3ece5a7176e98ac6f3bce741da74946cd28" + "WALinuxAgent-2.2.54.2.tar.gz": "2c047d262ca55718268a0921c7bd04b6c1ab1032bd885e3e0949107f493e7b7c" } } \ No newline at end of file diff --git a/SPECS/WALinuxAgent/WALinuxAgent.spec b/SPECS/WALinuxAgent/WALinuxAgent.spec index 7abf572a34e..e2b36de34d9 100644 --- a/SPECS/WALinuxAgent/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent/WALinuxAgent.spec @@ -1,30 +1,29 @@ Summary: The Windows Azure Linux Agent Name: WALinuxAgent -Version: 2.2.52 -Release: 2%{?dist} +Version: 2.2.54.2 +Release: 1%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner Group: System/Daemons URL: https://github.com/Azure/WALinuxAgent -#Source0: https://github.com/Azure/WALinuxAgent/archive/v%{version}.tar.gz -Source0: https://github.com/Azure/WALinuxAgent/archive/%{name}-%{version}.tar.gz -Patch0: add-distro.patch -BuildRequires: python-distro -BuildRequires: python-setuptools -BuildRequires: python-xml -BuildRequires: python2 -BuildRequires: python2-libs +#Source0: https://github.com/Azure/WALinuxAgent/archive/refs/tags/v%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +BuildRequires: python3-distro +BuildRequires: python3-setuptools +BuildRequires: python3-xml +BuildRequires: python3 +BuildRequires: python3-libs BuildRequires: systemd Requires: /bin/grep Requires: /bin/sed Requires: iptables Requires: openssh Requires: openssl -Requires: python-pyasn1 -Requires: python-xml -Requires: python2 -Requires: python2-libs +Requires: python3-pyasn1 +Requires: python3-xml +Requires: python3 +Requires: python3-libs Requires: sudo Requires: systemd Requires: util-linux @@ -36,23 +35,26 @@ VMs in the Windows Azure cloud. This package should be installed on Linux disk images that are built to run in the Windows Azure environment. %prep -%setup -q -%patch0 -p1 +%setup -q -n %{name}-%{version} %pre -p /bin/sh %build -python2 setup.py build -b py2 +python3 setup.py build -b py3 %install -python2 -tt setup.py build -b py2 install --prefix=%{_prefix} --lnx-distro='mariner' --root=%{buildroot} --force +python3 -tt setup.py build -b py3 install --prefix=%{_prefix} --lnx-distro='mariner' --root=%{buildroot} --force mkdir -p %{buildroot}/%{_localstatedir}/log mkdir -p -m 0700 %{buildroot}/%{_sharedstatedir}/waagent mkdir -p %{buildroot}/%{_localstatedir}/log touch %{buildroot}/%{_localstatedir}/log/waagent.log +# python refers to python2 version on CBL-Mariner hence update to use python3 +sed -i 's,#!/usr/bin/env python,#!/usr/bin/python3,' %{buildroot}%{_bindir}/waagent +sed -i 's,#!/usr/bin/env python,#!/usr/bin/python3,' %{buildroot}%{_bindir}/waagent2.0 +sed -i 's,/usr/bin/python ,/usr/bin/python3 ,' %{buildroot}%{_lib}/systemd/system/waagent.service %check -python2 setup.py check && python2 setup.py test +python3 setup.py check && python3 setup.py test %post %systemd_post waagent.service @@ -67,15 +69,17 @@ python2 setup.py check && python2 setup.py test %{_lib}/systemd/system/* %defattr(0644,root,root,0755) %license LICENSE.txt -%doc Changelog -%attr(0755,root,root) %{_sbindir}/waagent -%attr(0755,root,root) %{_sbindir}/waagent2.0 +%attr(0755,root,root) %{_bindir}/waagent +%attr(0755,root,root) %{_bindir}/waagent2.0 %config %{_sysconfdir}/waagent.conf %ghost %{_localstatedir}/log/waagent.log %dir %attr(0700, root, root) %{_sharedstatedir}/waagent -%{_lib}/python2.7/site-packages/* +%{_lib}/python3.7/site-packages/* %changelog +* Mon May 24 2021 Suresh Babu Chalamalasetty - 2.2.54.2-1 +- Upgrade to version 2.2.54.2 which has Mariner distro support. + * Mon Jan 25 2021 Henry Beberman 2.2.52-2 - Remove log symlink and use /var/log/waagent.log directly diff --git a/SPECS/WALinuxAgent/add-distro.patch b/SPECS/WALinuxAgent/add-distro.patch deleted file mode 100644 index bdd6bde9fc7..00000000000 --- a/SPECS/WALinuxAgent/add-distro.patch +++ /dev/null @@ -1,242 +0,0 @@ ---- a/azurelinuxagent/common/osutil/factory.py 2020-09-29 11:31:13.000000000 -0700 -+++ b/azurelinuxagent/common/osutil/factory.py 2020-12-08 14:54:58.878191794 -0800 -@@ -24,6 +24,7 @@ - from .arch import ArchUtil - from .bigip import BigIpOSUtil - from .clearlinux import ClearLinuxUtil -+from .mariner import MarinerOSUtil - from .coreos import CoreOSUtil - from .debian import DebianOSBaseUtil, DebianOSModernUtil - from .default import DefaultOSUtil -@@ -57,6 +58,9 @@ - - if "Clear Linux" in distro_full_name: - return ClearLinuxUtil() -+ -+ if distro_name == "mariner": -+ return MarinerOSUtil() - - if distro_name == "ubuntu": - if Version(distro_version) in [Version("12.04"), Version("12.10")]: ---- a/azurelinuxagent/common/osutil/mariner.py 2020-12-08 22:14:27.843117432 -0800 -+++ b/azurelinuxagent/common/osutil/mariner.py 2020-12-08 22:52:05.926318033 -0800 -@@ -0,0 +1,89 @@ -+# -+# Copyright 2017 Microsoft Corporation -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+# Requires Python 2.4 and Openssl 1.0 -+# -+ -+import os -+import re -+import pwd -+import shutil -+import socket -+import array -+import struct -+import fcntl -+import time -+import base64 -+import azurelinuxagent.common.conf as conf -+import azurelinuxagent.common.logger as logger -+import azurelinuxagent.common.utils.fileutil as fileutil -+import azurelinuxagent.common.utils.shellutil as shellutil -+import azurelinuxagent.common.utils.textutil as textutil -+from azurelinuxagent.common.osutil.default import DefaultOSUtil -+ -+class MarinerOSUtil(DefaultOSUtil): -+ def __init__(self): -+ super(MarinerOSUtil, self).__init__() -+ self.agent_conf_file_path = '/etc/waagent.conf' -+ self.jit_enabled = True -+ -+ def is_dhcp_enabled(self): -+ return True -+ -+ def start_network(self) : -+ return shellutil.run("systemctl start systemd-networkd", chk_err=False) -+ -+ def restart_if(self, iface): -+ shellutil.run("systemctl restart systemd-networkd") -+ -+ def restart_ssh_service(self): -+ shellutil.run("systemctl restart sshd") -+ -+ def stop_dhcp_service(self): -+ return shellutil.run("systemctl stop systemd-networkd", chk_err=False) -+ -+ def start_dhcp_service(self): -+ return shellutil.run("systemctl start systemd-networkd", chk_err=False) -+ -+ def start_agent_service(self): -+ return shellutil.run("systemctl start waagent", chk_err=False) -+ -+ def stop_agent_service(self): -+ return shellutil.run("systemctl stop waagent", chk_err=False) -+ -+ def get_dhcp_pid(self): -+ ret= shellutil.run_get_output("pidof systemd-networkd") -+ return ret[1] if ret[0] == 0 else None -+ -+ def conf_sshd(self, disable_password): -+ pass -+ -+ def del_root_password(self): -+ try: -+ passwd_file_path = conf.get_passwd_file_path() -+ try: -+ passwd_content = fileutil.read_file(passwd_file_path) -+ if not passwd_content: -+ raise FileNotFoundError -+ except FileNotFoundError: -+ new_passwd = ["root:*LOCK*:14600::::::"] -+ else: -+ passwd = passwd_content.split('\n') -+ new_passwd = [x for x in passwd if not x.startswith("root:")] -+ new_passwd.insert(0, "root:*LOCK*:14600::::::") -+ fileutil.write_file(passwd_file_path, "\n".join(new_passwd)) -+ except IOError as e: -+ raise OSUtilError("Failed to delete root password:{0}".format(e)) -+ pass -\ No newline at end of file ---- a/azurelinuxagent/common/version.py 2020-09-29 11:31:13.000000000 -0700 -+++ b/azurelinuxagent/common/version.py 2020-12-08 14:58:51.840248635 -0800 -@@ -100,6 +100,9 @@ - - if os.path.exists("/etc/euleros-release"): - osinfo[0] = "euleros" -+ -+ if os.path.exists("/etc/mariner-release"): -+ osinfo[0] = "mariner" - - # The platform.py lib has issue with detecting BIG-IP linux distribution. - # Merge the following patch provided by F5. ---- a/config/mariner/waagent.conf 2020-12-08 22:15:55.038466254 -0800 -+++ b/config/mariner/waagent.conf 2020-12-08 15:06:48.272503589 -0800 -@@ -0,0 +1,80 @@ -+# Microsoft Azure Linux Agent Configuration -+# -+ -+# Specified program is invoked with the argument "Ready" when we report ready status -+# to the endpoint server. -+Role.StateConsumer=None -+ -+# Specified program is invoked with XML file argument specifying role -+# configuration. -+Role.ConfigurationConsumer=None -+ -+# Specified program is invoked with XML file argument specifying role topology. -+Role.TopologyConsumer=None -+ -+# Enable instance creation -+Provisioning.Enabled=n -+ -+# Rely on cloud-init to provision -+Provisioning.UseCloudInit=y -+ -+# Password authentication for root account will be unavailable. -+Provisioning.DeleteRootPassword=y -+ -+# Generate fresh host key pair. -+Provisioning.RegenerateSshHostKeyPair=y -+ -+# Supported values are "rsa", "dsa" and "ecdsa". -+Provisioning.SshHostKeyPairType=rsa -+ -+# Monitor host name changes and publish changes via DHCP requests. -+Provisioning.MonitorHostName=y -+ -+# Decode CustomData from Base64. -+Provisioning.DecodeCustomData=y -+ -+# Execute CustomData after provisioning. -+Provisioning.ExecuteCustomData=n -+ -+# Allow reset password of sys user -+Provisioning.AllowResetSysUser=n -+ -+# Format if unformatted. If 'n', resource disk will not be mounted. -+ResourceDisk.Format=n -+ -+# File system on the resource disk -+# Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. -+ResourceDisk.Filesystem=ext4 -+ -+# Mount point for the resource disk -+ResourceDisk.MountPoint=/mnt/resource -+ -+# Create and use swapfile on resource disk. -+ResourceDisk.EnableSwap=n -+ -+# Size of the swapfile. -+ResourceDisk.SwapSizeMB=0 -+ -+# Enable verbose logging (y|n) -+Logs.Verbose=n -+ -+# Is FIPS enabled -+OS.EnableFIPS=n -+ -+# Root device timeout in seconds. -+OS.RootDeviceScsiTimeout=300 -+ -+# If "None", the system default version is used. -+OS.OpensslPath=None -+ -+# Set the path to SSH keys and configuration files -+OS.SshDir=/etc/ssh -+ -+# Enable or disable self-update, default is enabled -+AutoUpdate.Enabled=y -+AutoUpdate.GAFamily=Prod -+ -+# Determine if the overprovisioning feature is enabled. If yes, hold extension -+# handling until inVMArtifactsProfile.OnHold is false. -+# Default is disabled -+# EnableOverProvisioning=n ---- a/init/mariner/waagent.service 2020-12-08 22:16:40.614123434 -0800 -+++ b/init/mariner/waagent.service 2020-12-08 15:06:44.940529116 -0800 -@@ -0,0 +1,16 @@ -+[Unit] -+Description=Azure Linux Agent -+Wants=systemd-networkd-wait-online.service sshd.service sshd-keygen.service -+After=systemd-networkd-wait-online.service cloud-init.service -+ -+ConditionFileIsExecutable=/usr/sbin/waagent -+ConditionPathExists=/etc/waagent.conf -+ -+[Service] -+Type=simple -+ExecStart=/usr/bin/python -u /usr/sbin/waagent -daemon -+Restart=always -+RestartSec=5 -+ -+[Install] -+WantedBy=multi-user.target ---- a/setup.py 2020-09-29 11:31:13.000000000 -0700 -+++ b/setup.py 2020-12-08 15:04:44.289458366 -0800 -@@ -116,6 +116,12 @@ - src=["config/clearlinux/waagent.conf"]) - set_systemd_files(data_files, dest='/usr/lib/systemd/system', - src=["init/clearlinux/waagent.service"]) -+ elif name == 'mariner': -+ set_bin_files(data_files) -+ set_conf_files(data_files, dest="/etc", -+ src=["config/mariner/waagent.conf"]) -+ set_systemd_files(data_files, dest='/usr/lib/systemd/system', -+ src=["init/mariner/waagent.service"]) - elif name == 'ubuntu': - set_bin_files(data_files) - set_conf_files(data_files, src=["config/ubuntu/waagent.conf"]) diff --git a/cgmanifest.json b/cgmanifest.json index b55109e3029..d6e57e6e261 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -7485,8 +7485,8 @@ "type": "other", "other": { "name": "WALinuxAgent", - "version": "2.2.52", - "downloadUrl": "https://github.com/Azure/WALinuxAgent/archive/v2.2.52.tar.gz" + "version": "2.2.54.2", + "downloadUrl": "https://github.com/Azure/WALinuxAgent/archive/refs/tags/v2.2.54.2.tar.gz" } } }, From 91b574d73829f37f25f23c0c0108c40e8c52959c Mon Sep 17 00:00:00 2001 From: Christopher Co <35273088+christopherco@users.noreply.github.com> Date: Thu, 27 May 2021 17:02:34 -0700 Subject: [PATCH 69/83] kernel: Add key into trusted keyring (#1000) Add key to default system keyring for signing loadable kernel modules. Signed-off-by: Chris Co --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 +++- SPECS/kernel-headers/kernel-headers.spec | 5 +++- .../kernel-hyperv/cbl-mariner-ca-20210127.pem | 29 +++++++++++++++++++ SPECS/kernel-hyperv/config | 5 ++-- .../kernel-hyperv.signatures.json | 3 +- SPECS/kernel-hyperv/kernel-hyperv.spec | 9 +++++- SPECS/kernel/cbl-mariner-ca-20210127.pem | 29 +++++++++++++++++++ SPECS/kernel/config | 5 ++-- SPECS/kernel/config_aarch64 | 5 ++-- SPECS/kernel/kernel.signatures.json | 8 ++--- SPECS/kernel/kernel.spec | 9 +++++- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- 15 files changed, 101 insertions(+), 19 deletions(-) create mode 100644 SPECS/kernel-hyperv/cbl-mariner-ca-20210127.pem create mode 100644 SPECS/kernel/cbl-mariner-ca-20210127.pem diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 81e63eadf61..9997e96a660 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.10.32.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -146,6 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Wed May 26 2021 Chris Co - 5.10.32.1-6 +- Bump release number to match kernel release + * Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 - Bump release number to match kernel release diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 6de9cecdb8f..83dd3df3976 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.10.32.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Wed May 26 2021 Chris Co - 5.10.32.1-6 +- Bump release number to match kernel release + * Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 - Bump release number to match kernel release diff --git a/SPECS/kernel-hyperv/cbl-mariner-ca-20210127.pem b/SPECS/kernel-hyperv/cbl-mariner-ca-20210127.pem new file mode 100644 index 00000000000..7b90650cf18 --- /dev/null +++ b/SPECS/kernel-hyperv/cbl-mariner-ca-20210127.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFBjCCA+6gAwIBAgITMwAABFzCHaG8uk/QhQABAAAEXDANBgkqhkiG9w0BAQsF +ADB5MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSMwIQYDVQQD +ExpNaWNyb3NvZnQgVGVzdGluZyBQQ0EgMjAxMDAeFw0yMTAxMjgyMTQ0MjVaFw0y +MjAxMjcyMTQ0MjVaMIGGMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3Rv +bjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0 +aW9uMTAwLgYDVQQDEydNYXJpbmVyIFNlY3VyZSBCb290KFByb2R1Y3Rpb24gU2ln +bmluZykwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlDKbGLQsXa/s9 +8dukx0OKHoZRCp5otKK/Av2PrbLA4obLl8rHW5uaSi8OFOEaQ75t/PR0me55CIb/ +W7XN/CTRzUtOd5F+ZjJA04asn+ztxvdF8VVtBexNswvh3wi88Tf6YkKDRzMdYboh +2X8lB2aZxUCa98AL4lfWDB2OxakrLJY3LMpnBcDQ8QuGYhEt3YRFkT5mrWeSqphj +6Q1zRtXcETX6P/Mv0JthF45QwVDJCVuRXpgKY+Ug7fXkANpuDO79UmovyLeBa7mv +Oqke6kiXjdCqWd6VuIQxg1VpKNL8wn132NjCQdSwimvmeO0F2r0gqQ7fpQECJoBk +OwEfEEYhAgMBAAGjggF3MIIBczATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4E +FgQUrrgYstPQgjOv9ptpbKdZJ8nqz1kwRQYDVR0RBD4wPKQ6MDgxHjAcBgNVBAsT +FU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEWMBQGA1UEBRMNNDYwODk3KzQ2NDEyOTAf +BgNVHSMEGDAWgBS/ZaKrb3WjTkWWVwXPOYf0wBUcHDBcBgNVHR8EVTBTMFGgT6BN +hktodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NybC9NaWNyb3NvZnQl +MjBUZXN0aW5nJTIwUENBJTIwMjAxMCgxKS5jcmwwaQYIKwYBBQUHAQEEXTBbMFkG +CCsGAQUFBzAChk1odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRz +L01pY3Jvc29mdCUyMFRlc3RpbmclMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMB +Af8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBLbLjVDt5GE8uu2ebkmIZBdyEwGQg/ +2y95ja8yfXvFX2p0SFdz1MTxox2ZiIOONF6MbhTadLRTCGifwvHgTwArsjPnl0jk +4YyMCZsJtQOaRtIn8YVRvoGQ8b7oUXx49JtMx1e+Fu0FR3cpBz0VEKrkPiLAzd0x +sRIRfkRDpgZDonOxugsIdceDu/sveqIMv5SlDtq8y7nh+4V2JQpJFs4dU+xTvAHI +9ntSEGLSnvNoj/Z2oTQEoxY4AcfyT81IGVzokDDyArlkp9dgAePoSEH0scJ4bYiF +fP48iMy8Qx136RQNzQQahsFOQDj9RD2weZXWIOCVWkBvaVIkCnk8XIzf +-----END CERTIFICATE----- diff --git a/SPECS/kernel-hyperv/config b/SPECS/kernel-hyperv/config index 497140c69e3..2c45b2e3c30 100644 --- a/SPECS/kernel-hyperv/config +++ b/SPECS/kernel-hyperv/config @@ -4104,10 +4104,11 @@ CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" +CONFIG_SYSTEM_TRUSTED_KEYS="certs/mariner.pem" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # end of Certificates for signature checking CONFIG_BINARY_PRINTF=y diff --git a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json index e19eb36cab9..25c70530991 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json +++ b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { - "config": "8d6fcdec2063b54c4e979c2170805fbab522bbdb9ac6d5940eb9ded088a2c2eb", + "cbl-mariner-ca-20210127.pem": "82363cb44e786353936abc2e2d62d9325cacf2d9e9a8ebaf4221ea30a9e0cd7b", + "config": "75f097281c07714ee9d6310f330fca8e5bcae322edc51bcebc541da79282edc3", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index c328cd30a4e..3e08bdd3abf 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.10.32.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -14,6 +14,7 @@ URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel Source0: kernel-%{version}.tar.gz Source1: config Source2: sha512hmac-openssl.sh +Source3: cbl-mariner-ca-20210127.pem BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc @@ -114,6 +115,9 @@ if [ -s config_diff ]; then exit 1 fi +# Add CBL-Mariner cert into kernel's trusted keyring +cp %{SOURCE3} certs/mariner.pem + make VERBOSE=1 KBUILD_BUILD_VERSION="1" KBUILD_BUILD_HOST="CBL-Mariner" ARCH=x86_64 %{?_smp_mflags} make -C tools perf @@ -263,6 +267,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Wed May 26 2021 Chris Co - 5.10.32.1-6 +- Add Mariner cert into the trusted kernel keyring + * Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 - Bump release number to match kernel release diff --git a/SPECS/kernel/cbl-mariner-ca-20210127.pem b/SPECS/kernel/cbl-mariner-ca-20210127.pem new file mode 100644 index 00000000000..7b90650cf18 --- /dev/null +++ b/SPECS/kernel/cbl-mariner-ca-20210127.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFBjCCA+6gAwIBAgITMwAABFzCHaG8uk/QhQABAAAEXDANBgkqhkiG9w0BAQsF +ADB5MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSMwIQYDVQQD +ExpNaWNyb3NvZnQgVGVzdGluZyBQQ0EgMjAxMDAeFw0yMTAxMjgyMTQ0MjVaFw0y +MjAxMjcyMTQ0MjVaMIGGMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3Rv +bjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0 +aW9uMTAwLgYDVQQDEydNYXJpbmVyIFNlY3VyZSBCb290KFByb2R1Y3Rpb24gU2ln +bmluZykwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlDKbGLQsXa/s9 +8dukx0OKHoZRCp5otKK/Av2PrbLA4obLl8rHW5uaSi8OFOEaQ75t/PR0me55CIb/ +W7XN/CTRzUtOd5F+ZjJA04asn+ztxvdF8VVtBexNswvh3wi88Tf6YkKDRzMdYboh +2X8lB2aZxUCa98AL4lfWDB2OxakrLJY3LMpnBcDQ8QuGYhEt3YRFkT5mrWeSqphj +6Q1zRtXcETX6P/Mv0JthF45QwVDJCVuRXpgKY+Ug7fXkANpuDO79UmovyLeBa7mv +Oqke6kiXjdCqWd6VuIQxg1VpKNL8wn132NjCQdSwimvmeO0F2r0gqQ7fpQECJoBk +OwEfEEYhAgMBAAGjggF3MIIBczATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4E +FgQUrrgYstPQgjOv9ptpbKdZJ8nqz1kwRQYDVR0RBD4wPKQ6MDgxHjAcBgNVBAsT +FU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEWMBQGA1UEBRMNNDYwODk3KzQ2NDEyOTAf +BgNVHSMEGDAWgBS/ZaKrb3WjTkWWVwXPOYf0wBUcHDBcBgNVHR8EVTBTMFGgT6BN +hktodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NybC9NaWNyb3NvZnQl +MjBUZXN0aW5nJTIwUENBJTIwMjAxMCgxKS5jcmwwaQYIKwYBBQUHAQEEXTBbMFkG +CCsGAQUFBzAChk1odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRz +L01pY3Jvc29mdCUyMFRlc3RpbmclMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMB +Af8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBLbLjVDt5GE8uu2ebkmIZBdyEwGQg/ +2y95ja8yfXvFX2p0SFdz1MTxox2ZiIOONF6MbhTadLRTCGifwvHgTwArsjPnl0jk +4YyMCZsJtQOaRtIn8YVRvoGQ8b7oUXx49JtMx1e+Fu0FR3cpBz0VEKrkPiLAzd0x +sRIRfkRDpgZDonOxugsIdceDu/sveqIMv5SlDtq8y7nh+4V2JQpJFs4dU+xTvAHI +9ntSEGLSnvNoj/Z2oTQEoxY4AcfyT81IGVzokDDyArlkp9dgAePoSEH0scJ4bYiF +fP48iMy8Qx136RQNzQQahsFOQDj9RD2weZXWIOCVWkBvaVIkCnk8XIzf +-----END CERTIFICATE----- diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 0517ba58542..22b865e4234 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -6827,10 +6827,11 @@ CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" +CONFIG_SYSTEM_TRUSTED_KEYS="certs/mariner.pem" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # end of Certificates for signature checking CONFIG_BINARY_PRINTF=y diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index e5a7ad144a2..c2abe837b0f 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -8979,10 +8979,11 @@ CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_SYSTEM_TRUSTED_KEYS="" +CONFIG_SYSTEM_TRUSTED_KEYS="certs/mariner.pem" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SECONDARY_TRUSTED_KEYRING is not set -# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # end of Certificates for signature checking CONFIG_BINARY_PRINTF=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 29e8c07e28b..276a98072d7 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,9 +1,9 @@ { "Signatures": { - "config": "835d42ef28db98fe7ed7364c665c2b8bb8d0dba2f442b50e337e095c2785909a", - "config_aarch64": "8723afa7c230379e50ef66be8846ba1f4686210db360f47b1f989651fa54a3a2", + "cbl-mariner-ca-20210127.pem": "82363cb44e786353936abc2e2d62d9325cacf2d9e9a8ebaf4221ea30a9e0cd7b", + "config": "854c7b16596c0fd8eedebdfc981e2a09773e291642804ed2cf8c0955e0dc86ce", + "config_aarch64": "95cd7ada5d4390481f6ac4328720336cebd7e433d934e81401986f6a2f2de946", "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } -} - +} \ No newline at end of file diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 0d38ccc6049..9f53b082a92 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel Name: kernel Version: 5.10.32.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -15,6 +15,7 @@ Source0: kernel-%{version}.tar.gz Source1: config Source2: config_aarch64 Source3: sha512hmac-openssl.sh +Source4: cbl-mariner-ca-20210127.pem # Kernel CVEs are addressed by moving to a newer version of the stable kernel. # Since kernel CVEs are filed against the upstream kernel version and not the # stable kernel version, our automated tooling will still flag the CVE as not @@ -297,6 +298,9 @@ if [ -s config_diff ]; then exit 1 fi +# Add CBL-Mariner cert into kernel's trusted keyring +cp %{SOURCE4} certs/mariner.pem + make VERBOSE=1 KBUILD_BUILD_VERSION="1" KBUILD_BUILD_HOST="CBL-Mariner" ARCH=${arch} %{?_smp_mflags} make -C tools perf @@ -489,6 +493,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Wed May 26 2021 Chris Co - 5.10.32.1-6 +- Add Mariner cert into the trusted kernel keyring + * Tue May 25 2021 Daniel Mihai - 5.10.32.1-5 - Enable kernel debugger diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index bd9a6d080f5..0345f264f1a 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-5.cm1.noarch.rpm +kernel-headers-5.10.32.1-6.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 6e31c414998..dd55ada4e20 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-5.cm1.noarch.rpm +kernel-headers-5.10.32.1-6.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 89fdbf7a170..fb6cbca0013 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-5.cm1.noarch.rpm +kernel-headers-5.10.32.1-6.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 305e158593f..257c0b4b8dd 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-5.cm1.noarch.rpm +kernel-headers-5.10.32.1-6.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm From c46f10385bd2d2fd37b87fc6f0ee474accd5920f Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 27 May 2021 20:14:38 -0700 Subject: [PATCH 70/83] Making vendor tarballs reproducible for `coredns` and `nvidia-container-toolkit` (#983) --- SPECS/coredns/coredns-1.6.7.signatures.json | 2 +- SPECS/coredns/coredns-1.6.7.spec | 12 +++++++++++- SPECS/coredns/coredns-1.7.0.signatures.json | 2 +- SPECS/coredns/coredns-1.7.0.spec | 12 +++++++++++- .../nvidia-container-toolkit.signatures.json | 2 +- .../nvidia-container-toolkit.spec | 12 +++++++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/SPECS/coredns/coredns-1.6.7.signatures.json b/SPECS/coredns/coredns-1.6.7.signatures.json index e3a20e31fe9..3516c62384a 100644 --- a/SPECS/coredns/coredns-1.6.7.signatures.json +++ b/SPECS/coredns/coredns-1.6.7.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "coredns-1.6.7-vendor.tar.gz": "3d388da75cdb9db6ee892c44e5bbe2af0e38ec7c757c6936503672e8d990b155", + "coredns-1.6.7-vendor.tar.gz": "b66685ad4546b80920fd97b124194eeaf121784787e4d06d22af2754b933d6de", "coredns-1.6.7.tar.gz": "36460bac70c04cdf9c89c2b930ec4faa2c0dc4cb6573097883f54670a707c818" } } \ No newline at end of file diff --git a/SPECS/coredns/coredns-1.6.7.spec b/SPECS/coredns/coredns-1.6.7.spec index 43660525caa..edaef729200 100644 --- a/SPECS/coredns/coredns-1.6.7.spec +++ b/SPECS/coredns/coredns-1.6.7.spec @@ -18,7 +18,17 @@ Source0: %{name}-%{version}.tar.gz # 2. tar -xf %%{name}-%%{version}.tar.gz # 3. cd %%{name}-%%{version} # 4. go mod vendor -# 5. tar -cf %%{name}-%%{version}-vendor.tar.gz 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 diff --git a/SPECS/coredns/coredns-1.7.0.signatures.json b/SPECS/coredns/coredns-1.7.0.signatures.json index 7733d7a2395..73a8702f04e 100644 --- a/SPECS/coredns/coredns-1.7.0.signatures.json +++ b/SPECS/coredns/coredns-1.7.0.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "coredns-1.7.0-vendor.tar.gz": "67162569abf8545a6b86aecac05bd59ccf7f27eb9c7fa7a50a9acb065542eaa4", + "coredns-1.7.0-vendor.tar.gz": "c1bc3e8a9156f322fc8bca2fc654311d8eaa31cdbd014432fe39e775693a4db9", "coredns-1.7.0.tar.gz": "7e436e9d0c0b84af863685e05d701b84247bb0f12b6dbf05ea87e165c1398b2b" } } \ No newline at end of file diff --git a/SPECS/coredns/coredns-1.7.0.spec b/SPECS/coredns/coredns-1.7.0.spec index 2df9781a596..790c73f891e 100644 --- a/SPECS/coredns/coredns-1.7.0.spec +++ b/SPECS/coredns/coredns-1.7.0.spec @@ -18,7 +18,17 @@ Source0: %{name}-%{version}.tar.gz # 2. tar -xf %%{name}-%%{version}.tar.gz # 3. cd %%{name}-%%{version} # 4. go mod vendor -# 5. tar -cf %%{name}-%%{version}-vendor.tar.gz 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 diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json index 630c687713c..5dcc5df4261 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "nvidia-container-toolkit-1.4.2-vendor.tar.gz": "32756c8c17fb13328b72096d21ed83795c6b33705c7eddcd86c828799fb47329", + "nvidia-container-toolkit-1.4.2-vendor.tar.gz": "5463294471c22283c0bad835ed8abd708971579c2b1d7caf461bd00f93efe610", "nvidia-container-toolkit-1.4.2.tar.gz": "8c3ff8dd96812dcc2c09b203d2749fcba51941e33387aba1bca4da2f87065a0c" } } diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec index 4fcb57f79b8..af56aa3d17c 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -16,7 +16,17 @@ Source0: %{name}-%{version}.tar.gz # 2. tar -xf %%{name}-%%{version}.tar.gz # 3. cd %%{name}-%%{version} # 4. go mod vendor -# 5. tar -cf %%{name}-%%{version}-vendor.tar.gz 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: nvidia-container-toolkit-1.4.2.patch BuildRequires: golang From aa8533e17a0737e3ecd35bd289db6c110703a502 Mon Sep 17 00:00:00 2001 From: Christopher Co <35273088+christopherco@users.noreply.github.com> Date: Fri, 28 May 2021 09:29:22 -0700 Subject: [PATCH 71/83] kernel: enable kernel lockdown integrity mode by default (#922) * kernel: enable lockdown=integrity by default Enable kernel lockdown in integrity mode by default. Users can update the kernel command line to disable this if needed but should only do this for development purposes. * kernel: set lockdown=integrity via cmdline instead Setting CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY=y makes it so we cannot disable kernel lockdown at runtime for developer scenarios. So instead leave the standard default at CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y and set our default grub.cfg to always set lockdown=integrity on the kernel cmdline. Signed-off-by: Chris Co --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 ++++- SPECS/kernel-headers/kernel-headers.spec | 5 ++++- SPECS/kernel-hyperv/kernel-hyperv.spec | 7 +++++-- SPECS/kernel/kernel.spec | 7 +++++-- toolkit/docs/security/security-features.md | 1 + .../isomaker/iso_root_static_files/boot/grub2/grub.cfg | 2 +- .../resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 2 +- toolkit/resources/manifests/package/toolchain_x86_64.txt | 2 +- 10 files changed, 24 insertions(+), 11 deletions(-) diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 9997e96a660..e1ed60b1e11 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.10.32.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -146,6 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Thu May 27 2021 Chris Co - 5.10.32.1-7 +- Bump release number to match kernel release + * Wed May 26 2021 Chris Co - 5.10.32.1-6 - Bump release number to match kernel release diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 83dd3df3976..79b296cfe15 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.10.32.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Thu May 27 2021 Chris Co - 5.10.32.1-7 +- Bump release number to match kernel release + * Wed May 26 2021 Chris Co - 5.10.32.1-6 - Bump release number to match kernel release diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index 3e08bdd3abf..86d83842367 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.10.32.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -158,7 +158,7 @@ ln -s vmlinux-%{uname_r} %{buildroot}%{_lib}/debug/lib/modules/%{uname_r}/vmlinu cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF" # GRUB Environment Block -mariner_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet no-vmw-sta crashkernel=128M +mariner_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet no-vmw-sta crashkernel=128M lockdown=integrity mariner_linux=vmlinuz-%{uname_r} mariner_initrd=initrd.img-%{uname_r} EOF @@ -267,6 +267,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Thu May 27 2021 Chris Co - 5.10.32.1-7 +- Set lockdown=integrity by default + * Wed May 26 2021 Chris Co - 5.10.32.1-6 - Add Mariner cert into the trusted kernel keyring diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 9f53b082a92..91deffc7559 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -4,7 +4,7 @@ Summary: Linux Kernel Name: kernel Version: 5.10.32.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -348,7 +348,7 @@ ln -s vmlinux-%{uname_r} %{buildroot}%{_lib}/debug/lib/modules/%{uname_r}/vmlinu cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF" # GRUB Environment Block -mariner_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet no-vmw-sta crashkernel=128M +mariner_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet no-vmw-sta crashkernel=128M lockdown=integrity mariner_linux=vmlinuz-%{uname_r} mariner_initrd=initrd.img-%{uname_r} EOF @@ -493,6 +493,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Thu May 27 2021 Chris Co - 5.10.32.1-7 +- Set lockdown=integrity by default + * Wed May 26 2021 Chris Co - 5.10.32.1-6 - Add Mariner cert into the trusted kernel keyring diff --git a/toolkit/docs/security/security-features.md b/toolkit/docs/security/security-features.md index 05a0d351b4f..219441db0b3 100644 --- a/toolkit/docs/security/security-features.md +++ b/toolkit/docs/security/security-features.md @@ -59,6 +59,7 @@ | | Password hashing | By default | SHA-512 | | Filesystem Capabilities | Available | [Capabilities](https://github.com/torvalds/linux/blob/master/Documentation/security/credentials.rst) and [chattr](https://sourceforge.net/p/e2fsprogs/code/ci/master/tree/misc/chattr.c) | | Tamper Resistant Logs | Available | [journalctl --verify](https://www.freedesktop.org/software/systemd/man/journalctl.html) +| | Kernel Lockdown | Integrity mode by default | [kernel lockdown](https://github.com/torvalds/linux/blob/master/security/lockdown/Kconfig) # References diff --git a/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg b/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg index 98d8356b4b8..49bd713f4b5 100644 --- a/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg +++ b/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg @@ -4,6 +4,6 @@ set timeout=0 # but it is observed to be needed to boot on some hardware/SoCs. menuentry "CBL-Mariner" { search --label CDROM --set root - linux /isolinux/vmlinuz root=/dev/ram0 loglevel=3 mariner.media=CDROM + linux /isolinux/vmlinuz root=/dev/ram0 loglevel=3 mariner.media=CDROM lockdown=integrity initrd /isolinux/initrd.img } diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0345f264f1a..3d619db00f7 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-6.cm1.noarch.rpm +kernel-headers-5.10.32.1-7.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index dd55ada4e20..04a97474b24 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-6.cm1.noarch.rpm +kernel-headers-5.10.32.1-7.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index fb6cbca0013..3d82ef0086a 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-6.cm1.noarch.rpm +kernel-headers-5.10.32.1-7.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 257c0b4b8dd..036b930f922 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-6.cm1.noarch.rpm +kernel-headers-5.10.32.1-7.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm From 684ce4ac4b82cbdd4aa8fe1135d4ca7ee30b14a0 Mon Sep 17 00:00:00 2001 From: rlmenge Date: Tue, 1 Jun 2021 09:45:06 -0400 Subject: [PATCH 72/83] kernel: Update to 5.10.37.1 (#994) * Update to 5.10.37.1 * Add nopatches --- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 7 ++++-- .../hyperv-daemons.signatures.json | 2 +- SPECS/hyperv-daemons/hyperv-daemons.spec | 5 +++- .../kernel-headers.signatures.json | 2 +- SPECS/kernel-headers/kernel-headers.spec | 7 ++++-- SPECS/kernel-hyperv/config | 2 +- .../kernel-hyperv.signatures.json | 4 ++-- SPECS/kernel-hyperv/kernel-hyperv.spec | 7 ++++-- SPECS/kernel/CVE-2021-23134.nopatch | 3 +++ SPECS/kernel/CVE-2021-29155.nopatch | 24 +++++++++++++++++++ SPECS/kernel/CVE-2021-31829.nopatch | 3 +++ SPECS/kernel/CVE-2021-31916.nopatch | 3 +++ SPECS/kernel/CVE-2021-32399.nopatch | 3 +++ SPECS/kernel/CVE-2021-33033.nopatch | 3 +++ SPECS/kernel/CVE-2021-33034.nopatch | 3 +++ SPECS/kernel/CVE-2021-3483.nopatch | 3 +++ SPECS/kernel/CVE-2021-3501.nopatch | 3 +++ SPECS/kernel/CVE-2021-3506.nopatch | 3 +++ SPECS/kernel/config | 2 +- SPECS/kernel/config_aarch64 | 2 +- SPECS/kernel/kernel.signatures.json | 6 ++--- SPECS/kernel/kernel.spec | 20 ++++++++++++++-- cgmanifest.json | 16 ++++++------- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- .../scripts/toolchain/container/Dockerfile | 2 +- .../toolchain/container/toolchain-md5sums | 2 +- .../container/toolchain_build_in_chroot.sh | 8 +++---- .../container/toolchain_build_temp_tools.sh | 8 +++---- 31 files changed, 120 insertions(+), 41 deletions(-) create mode 100644 SPECS/kernel/CVE-2021-23134.nopatch create mode 100644 SPECS/kernel/CVE-2021-29155.nopatch create mode 100644 SPECS/kernel/CVE-2021-31829.nopatch create mode 100644 SPECS/kernel/CVE-2021-31916.nopatch create mode 100644 SPECS/kernel/CVE-2021-32399.nopatch create mode 100644 SPECS/kernel/CVE-2021-33033.nopatch create mode 100644 SPECS/kernel/CVE-2021-33034.nopatch create mode 100644 SPECS/kernel/CVE-2021-3483.nopatch create mode 100644 SPECS/kernel/CVE-2021-3501.nopatch create mode 100644 SPECS/kernel/CVE-2021-3506.nopatch diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index e1ed60b1e11..4afe152932f 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -9,8 +9,8 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} -Version: 5.10.32.1 -Release: 7%{?dist} +Version: 5.10.37.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -146,6 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Fri May 28 2021 Rachel Menge - 5.10.37.1-1 +- Update source to 5.10.37.1 + * Thu May 27 2021 Chris Co - 5.10.32.1-7 - Bump release number to match kernel release diff --git a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json index c7bb3a418df..04ed13dab18 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json +++ b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json @@ -7,6 +7,6 @@ "hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", - "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79" + "kernel-5.10.37.1.tar.gz": "5ed453360f52e70767631d6c253306ab07248d957275b9f1d55b8bd03a88a29e" } } \ No newline at end of file diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index cdd89c783d8..65d28f27765 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons/hyperv-daemons.spec @@ -8,7 +8,7 @@ %global udev_prefix 70 Summary: Hyper-V daemons suite Name: hyperv-daemons -Version: 5.10.32.1 +Version: 5.10.37.1 Release: 1%{?dist} License: GPLv2+ Vendor: Microsoft Corporation @@ -219,6 +219,9 @@ fi %{_sbindir}/lsvmbus %changelog +* Fri May 28 2021 Rachel Menge - 5.10.37.1-1 +- Update source to 5.10.37.1 + * Mon May 03 2021 Rachel Menge - 5.10.32.1-1 - Update source to 5.10.32.1 diff --git a/SPECS/kernel-headers/kernel-headers.signatures.json b/SPECS/kernel-headers/kernel-headers.signatures.json index bd791135ed4..f54d9cca638 100644 --- a/SPECS/kernel-headers/kernel-headers.signatures.json +++ b/SPECS/kernel-headers/kernel-headers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79" + "kernel-5.10.37.1.tar.gz": "5ed453360f52e70767631d6c253306ab07248d957275b9f1d55b8bd03a88a29e" } } \ No newline at end of file diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 79b296cfe15..d540f78dc04 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers -Version: 5.10.32.1 -Release: 7%{?dist} +Version: 5.10.37.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Fri May 28 2021 Rachel Menge - 5.10.37.1-1 +- Update source to 5.10.37.1 + * Thu May 27 2021 Chris Co - 5.10.32.1-7 - Bump release number to match kernel release diff --git a/SPECS/kernel-hyperv/config b/SPECS/kernel-hyperv/config index 2c45b2e3c30..f28d960e7d6 100644 --- a/SPECS/kernel-hyperv/config +++ b/SPECS/kernel-hyperv/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.32.1 Kernel Configuration +# Linux/x86_64 5.10.37.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json index 25c70530991..13fa07debda 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json +++ b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "cbl-mariner-ca-20210127.pem": "82363cb44e786353936abc2e2d62d9325cacf2d9e9a8ebaf4221ea30a9e0cd7b", - "config": "75f097281c07714ee9d6310f330fca8e5bcae322edc51bcebc541da79282edc3", - "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", + "config": "b1072e7d4bf000fad2f78e9e56e7ddc8207425b9acb9a779bb98174399dd2218", + "kernel-5.10.37.1.tar.gz": "5ed453360f52e70767631d6c253306ab07248d957275b9f1d55b8bd03a88a29e", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } } \ No newline at end of file diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index 86d83842367..2661fddb27a 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -3,8 +3,8 @@ %define uname_r %{version}-%{release} Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv -Version: 5.10.32.1 -Release: 7%{?dist} +Version: 5.10.37.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -267,6 +267,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Fri May 28 2021 Rachel Menge - 5.10.37.1-1 +- Update source to 5.10.37.1 + * Thu May 27 2021 Chris Co - 5.10.32.1-7 - Set lockdown=integrity by default diff --git a/SPECS/kernel/CVE-2021-23134.nopatch b/SPECS/kernel/CVE-2021-23134.nopatch new file mode 100644 index 00000000000..01e8beacdc5 --- /dev/null +++ b/SPECS/kernel/CVE-2021-23134.nopatch @@ -0,0 +1,3 @@ +CVE-2021-23134 - already patched in 5.10.37.1 stable kernel +Upstream: c61760e6940dd4039a7f5e84a6afc9cdbf4d82b6 +Stable: 6b7021ed36dabf29e56842e3408781cd3b82ef6e \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-29155.nopatch b/SPECS/kernel/CVE-2021-29155.nopatch new file mode 100644 index 00000000000..cb0c2a4735c --- /dev/null +++ b/SPECS/kernel/CVE-2021-29155.nopatch @@ -0,0 +1,24 @@ +CVE-2021-29155 - already patched in 5.10.37.1 stable kernel +Upstream: 9601148392520e2e134936e76788fc2a6371e7be +Stable: 4f3ff11204eac0ee23acf64deecb3bad7b0db0c6 + +Upstream: 6f55b2f2a1178856c19bbce2f71449926e731914 +Stable: 480d875f12424a86fd710e8762ed1e23b7f02572 + +Upstream: 24c109bb1537c12c02aeed2d51a347b4d6a9b76e +Stable: 589fd9684dfafee37c60abde4ca3c0af723be3b3 + +Upstream: b658bbb844e28f1862867f37e8ca11a8e2aa94a3 +Stable: 55565c30790839b40311c270a8b1a437ae9b2769 + +Upstream: a6aaece00a57fa6f22575364b3903dfbccf5345d +Stable: 7723d3243857ab20f6450cfbbd765d8594e5e308 + +Upstream: 073815b756c51ba9d8384d924c5d1c03ca3d1ae4 +Stable: 2982ea926b5cb97ff79fbb27eba72521568811ff + +Upstream: f528819334881fd622fdadeddb3f7edaed8b7c9b +Stable: fbe6603e7cabad8a203a764300531e9ca811317a + +Upstream: 7fedb63a8307dda0ec3b8969a3b233a1dd7ea8e0 +Stable: b642e493a9a0ed56be3b8cfcfb95fe3c7cea0b55 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-31829.nopatch b/SPECS/kernel/CVE-2021-31829.nopatch new file mode 100644 index 00000000000..3828041008a --- /dev/null +++ b/SPECS/kernel/CVE-2021-31829.nopatch @@ -0,0 +1,3 @@ +CVE-2021-31829 - already patched in 5.10.37.1 stable kernel +Upstream: 801c6058d14a82179a7ee17a4b532cac6fad067f +Stable: 2fa15d61e4cbaaa1d1250e67b251ff96952fa614 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-31916.nopatch b/SPECS/kernel/CVE-2021-31916.nopatch new file mode 100644 index 00000000000..334bc42089e --- /dev/null +++ b/SPECS/kernel/CVE-2021-31916.nopatch @@ -0,0 +1,3 @@ +CVE-2021-31916 - already patched in 5.10.37.1 stable kernel +Upstream: 4edbe1d7bcffcd6269f3b5eb63f710393ff2ec7a +Stable: 921aae17bb0f02181fa05cf5580ebc855fdbd74d \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-32399.nopatch b/SPECS/kernel/CVE-2021-32399.nopatch new file mode 100644 index 00000000000..96094973906 --- /dev/null +++ b/SPECS/kernel/CVE-2021-32399.nopatch @@ -0,0 +1,3 @@ +CVE-2021-32399 - already patched in 5.10.37.1 stable kernel +Upstream: e2cb6b891ad2b8caa9131e3be70f45243df82a80 +Stable: 2d84ef4e6569a818f912d93d5345c21542807ac7 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-33033.nopatch b/SPECS/kernel/CVE-2021-33033.nopatch new file mode 100644 index 00000000000..a44e234fb90 --- /dev/null +++ b/SPECS/kernel/CVE-2021-33033.nopatch @@ -0,0 +1,3 @@ +CVE-2021-33033 - already patched in 5.10.37.1 stable kernel +Upstream: 1165affd484889d4986cf3b724318935a0b120d8 +Stable: 38731bbcd9f0bb8228baaed5feb4a1f76530e49c \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-33034.nopatch b/SPECS/kernel/CVE-2021-33034.nopatch new file mode 100644 index 00000000000..ad4b8ccedc6 --- /dev/null +++ b/SPECS/kernel/CVE-2021-33034.nopatch @@ -0,0 +1,3 @@ +CVE-2021-33034 - already patched in 5.10.37.1 stable kernel +Upstream: 5c4c8c9544099bb9043a10a5318130a943e32fc3 +Stable: 1d7bd87a2c8d264ca3e5c9ba6f3eafc23e994028 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-3483.nopatch b/SPECS/kernel/CVE-2021-3483.nopatch new file mode 100644 index 00000000000..0219c53bf2e --- /dev/null +++ b/SPECS/kernel/CVE-2021-3483.nopatch @@ -0,0 +1,3 @@ +CVE-2021-3483 - already patched in 5.10.37.1 stable kernel +Upstream: 829933ef05a951c8ff140e814656d73e74915faf +Stable: c04adcc819d3bdd85a5dc2523687707b89724df7 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-3501.nopatch b/SPECS/kernel/CVE-2021-3501.nopatch new file mode 100644 index 00000000000..e3ccde01a22 --- /dev/null +++ b/SPECS/kernel/CVE-2021-3501.nopatch @@ -0,0 +1,3 @@ +CVE-2021-3501 - already patched in 5.10.37.1 stable kernel +Upstream: 04c4f2ee3f68c9a4bf1653d15f1a9a435ae33f7a +Stable: 7f64753835a78c7d2cc2932a5808ef3b7fd4c050 \ No newline at end of file diff --git a/SPECS/kernel/CVE-2021-3506.nopatch b/SPECS/kernel/CVE-2021-3506.nopatch new file mode 100644 index 00000000000..fe5dee96074 --- /dev/null +++ b/SPECS/kernel/CVE-2021-3506.nopatch @@ -0,0 +1,3 @@ +CVE-2021-3506 - already patched in 5.10.37.1 stable kernel +Upstream: b862676e371715456c9dade7990c8004996d0d9e +Stable: 9aa4602237d535b83c579eb752e8fc1c3e7e7055 \ No newline at end of file diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 22b865e4234..64329c2a8f6 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.32.1 Kernel Configuration +# Linux/x86_64 5.10.37.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index c2abe837b0f..93d76eb65bd 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.32.1 Kernel Configuration +# Linux/arm64 5.10.37.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.1.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 276a98072d7..690bb015f07 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,9 +1,9 @@ { "Signatures": { "cbl-mariner-ca-20210127.pem": "82363cb44e786353936abc2e2d62d9325cacf2d9e9a8ebaf4221ea30a9e0cd7b", - "config": "854c7b16596c0fd8eedebdfc981e2a09773e291642804ed2cf8c0955e0dc86ce", - "config_aarch64": "95cd7ada5d4390481f6ac4328720336cebd7e433d934e81401986f6a2f2de946", - "kernel-5.10.32.1.tar.gz": "a9013e8ff4e4114b0730ad2ee40371734d40fc411e8a28d0307d3b293c419c79", + "config": "4f0050188f0d1c476dfd9343fd375d4c2b9e8189409f5fb215020ef251828bdb", + "config_aarch64": "a84c2218a98f05f23d3cc51e56cc41d9426487db390d49511396e856e07d7894", + "kernel-5.10.37.1.tar.gz": "5ed453360f52e70767631d6c253306ab07248d957275b9f1d55b8bd03a88a29e", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" } } \ No newline at end of file diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 91deffc7559..7a73b67b79d 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -3,8 +3,8 @@ %define uname_r %{version}-%{release} Summary: Linux Kernel Name: kernel -Version: 5.10.32.1 -Release: 7%{?dist} +Version: 5.10.37.1 +Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -163,6 +163,16 @@ Patch1132: CVE-2021-23133.nopatch Patch1133: CVE-2021-29154.nopatch # CVE-2021-30178 - Introducing commit not in stable tree. No fix necessary at this time. Patch1134: CVE-2021-30178.nopatch +Patch1135: CVE-2021-23134.nopatch +Patch1136: CVE-2021-29155.nopatch +Patch1137: CVE-2021-31829.nopatch +Patch1138: CVE-2021-31916.nopatch +Patch1139: CVE-2021-32399.nopatch +Patch1140: CVE-2021-33033.nopatch +Patch1141: CVE-2021-33034.nopatch +Patch1142: CVE-2021-3483.nopatch +Patch1143: CVE-2021-3501.nopatch +Patch1144: CVE-2021-3506.nopatch BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc @@ -493,6 +503,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %endif %changelog +* Fri May 28 2021 Rachel Menge - 5.10.37.1-1 +- Update source to 5.10.37.1 +- Address CVE-2021-23134, CVE-2021-29155, CVE-2021-31829, CVE-2021-31916, + CVE-2021-32399, CVE-2021-33033, CVE-2021-33034, CVE-2021-3483 + CVE-2021-3501, CVE-2021-3506 + * Thu May 27 2021 Chris Co - 5.10.32.1-7 - Set lockdown=integrity by default diff --git a/cgmanifest.json b/cgmanifest.json index d6e57e6e261..e4f97df0741 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1845,8 +1845,8 @@ "type": "other", "other": { "name": "hyperv-daemons", - "version": "5.10.32.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" + "version": "5.10.37.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.37.1.tar.gz" } } }, @@ -2145,8 +2145,8 @@ "type": "other", "other": { "name": "kernel-headers", - "version": "5.10.32.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" + "version": "5.10.37.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.37.1.tar.gz" } } }, @@ -2155,8 +2155,8 @@ "type": "other", "other": { "name": "kernel-hyperv", - "version": "5.10.32.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" + "version": "5.10.37.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.37.1.tar.gz" } } }, @@ -2165,8 +2165,8 @@ "type": "other", "other": { "name": "kernel", - "version": "5.10.32.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz" + "version": "5.10.37.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.37.1.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 3d619db00f7..dc35ee0cd39 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.10.32.1-7.cm1.noarch.rpm +kernel-headers-5.10.37.1-1.cm1.noarch.rpm glibc-2.28-18.cm1.aarch64.rpm glibc-devel-2.28-18.cm1.aarch64.rpm glibc-i18n-2.28-18.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 04a97474b24..f09176b3489 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.10.32.1-7.cm1.noarch.rpm +kernel-headers-5.10.37.1-1.cm1.noarch.rpm glibc-2.28-18.cm1.x86_64.rpm glibc-devel-2.28-18.cm1.x86_64.rpm glibc-i18n-2.28-18.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 3d82ef0086a..b88b72214e8 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.10.32.1-7.cm1.noarch.rpm +kernel-headers-5.10.37.1-1.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 036b930f922..c156911dfde 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.10.32.1-7.cm1.noarch.rpm +kernel-headers-5.10.37.1-1.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/Dockerfile b/toolkit/scripts/toolchain/container/Dockerfile index e8b53b8ffee..f049d20fdde 100644 --- a/toolkit/scripts/toolchain/container/Dockerfile +++ b/toolkit/scripts/toolchain/container/Dockerfile @@ -68,7 +68,7 @@ COPY [ "./toolchain-md5sums", \ WORKDIR $LFS/sources RUN wget -nv --no-clobber --timeout=30 --no-check-certificate --continue --input-file=$LFS/tools/toolchain-local-wget-list --directory-prefix=$LFS/sources; exit 0 RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0 -RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.32.1.tar.gz -O kernel-5.10.32.1.tar.gz --directory-prefix=$LFS/sources; exit 0 +RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.37.1.tar.gz -O kernel-5.10.37.1.tar.gz --directory-prefix=$LFS/sources; exit 0 USER root RUN /tools/toolchain-jdk8-wget.sh; exit 0 RUN md5sum -c $LFS/tools/toolchain-md5sums && \ diff --git a/toolkit/scripts/toolchain/container/toolchain-md5sums b/toolkit/scripts/toolchain/container/toolchain-md5sums index 34a06751dae..54bae37ed0a 100644 --- a/toolkit/scripts/toolchain/container/toolchain-md5sums +++ b/toolkit/scripts/toolchain/container/toolchain-md5sums @@ -59,7 +59,7 @@ bc62e7df6f75357b6dd1ec34600dbeaf jdk8u212-b04-langtools.tar.bz2 d0272e7a6107c64dae62b80ca7ec65e2 jdk8u212-b04-nashorn.tar.bz2 befd51c2b53a442e1fa6644bba89a95a jdk8u212-b04.tar.bz2 94afc90c1f7bef4a27fdd59ece39c878 kbproto-1.0.7.tar.bz2 -e3db9895e82f899524c607e4586f1d0d kernel-5.10.32.1.tar.gz +c20a04f9424e5a331843a42f0df0ab6b kernel-5.10.37.1.tar.gz d953ed6b47694dadf0e6042f8f9ff451 libarchive-3.4.2.tar.gz 968ac4d42a1a71754313527be2ab5df3 libcap-2.26.tar.xz ba983eba5a9f05d152a0725b8e863151 libdmx-1.1.3.tar.bz2 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index 1e8f35c1bba..5cebdc7429e 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -57,14 +57,14 @@ set -e # cd /sources -echo Linux-5.10.32.1 API Headers -tar xf kernel-5.10.32.1.tar.gz -pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 +echo Linux-5.10.37.1 API Headers +tar xf kernel-5.10.37.1.tar.gz +pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.37.1 make mrproper make headers cp -rv usr/include/* /usr/include popd -rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 +rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.37.1 touch /logs/status_kernel_headers_complete echo 6.8. Man-pages-5.02 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh index 83d9432fb20..fdbdf579802 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh @@ -113,14 +113,14 @@ rm -rf gcc-9.1.0 touch $LFS/logs/temptoolchain/status_gcc_pass1_complete -echo Linux-5.10.32.1 API Headers -tar xf kernel-5.10.32.1.tar.gz -pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 +echo Linux-5.10.37.1 API Headers +tar xf kernel-5.10.37.1.tar.gz +pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.37.1 make mrproper make headers cp -rv usr/include/* /tools/include popd -rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.32.1 +rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.37.1 touch $LFS/logs/temptoolchain/status_kernel_headers_complete From ce91f98dcc0201e96b2ffa2a03bad4f9f6e61fa7 Mon Sep 17 00:00:00 2001 From: Neha Agarwal <58672330+neha170@users.noreply.github.com> Date: Tue, 1 Jun 2021 16:27:44 -0500 Subject: [PATCH 73/83] Add marketplace image to mariner (#997) * Add marketplace image to mariner * Incorporate comments --- .../additionalconfigs/cloud-init.cfg | 91 +++++++++++++++++++ .../additionalconfigs/configure-image.sh | 2 + toolkit/imageconfigs/marketplace-gen1.json | 63 +++++++++++++ toolkit/imageconfigs/marketplace-gen2.json | 65 +++++++++++++ .../packagelists/azurevm-packages.json | 10 ++ .../resources/assets/meta-user-data/user-data | 2 + 6 files changed, 233 insertions(+) create mode 100644 toolkit/imageconfigs/additionalconfigs/cloud-init.cfg create mode 100755 toolkit/imageconfigs/additionalconfigs/configure-image.sh create mode 100644 toolkit/imageconfigs/marketplace-gen1.json create mode 100644 toolkit/imageconfigs/marketplace-gen2.json create mode 100644 toolkit/imageconfigs/packagelists/azurevm-packages.json diff --git a/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg b/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg new file mode 100644 index 00000000000..531f338cc8c --- /dev/null +++ b/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg @@ -0,0 +1,91 @@ +# The top level settings are used as module +# and system configuration. + +# A set of users which may be applied and/or used by various modules +# when a 'default' entry is found it will reference the 'default_user' +# from the distro configuration specified below +users: + - default + - name: root + lock-passwd: false + +# If this is set, 'root' will not be able to ssh in and they +# will get a message to login instead as the above $user (ubuntu) +disable_root: false + +#Vmware guest customization. +disable_vmware_customization: true + +# This will cause the set+update hostname module to not operate (if true) +preserve_hostname: false + +# datasources to check for cloud-config +datasource_list: [ + Azure, + NoCloud, + None + ] + +# Example datasource config +# datasource: +# Ec2: +# metadata_urls: [ 'blah.com' ] +# timeout: 5 # (defaults to 50 seconds) +# max_wait: 10 # (defaults to 120 seconds) + +# The modules that run in the 'init' stage +cloud_init_modules: + - bootcmd + - write-files + - growpart + - resizefs + - disk_setup + - mounts + - set_hostname + - update_hostname + - update_etc_hosts + - rsyslog + - users-groups + - ssh + +# The modules that run in the 'config' stage +cloud_config_modules: +# Emit the cloud config ready event +# this can be used by upstart jobs for 'start on cloud-config'. + - ssh-import-id + - set-passwords + - package-update-upgrade-install + - runcmd + - yum-add-repo + +# The modules that run in the 'final' stage +cloud_final_modules: + - scripts-vendor + - scripts-per-once + - scripts-per-boot + - scripts-per-instance + - scripts-user + - ssh-authkey-fingerprints + - final-message + +# System and/or distro specific settings +# (not accessible to handlers/transforms) +system_info: + # This will affect which distro class gets used + distro: mariner + # Default user name + that default users groups (if added/used) + default_user: + name: mariner + lock_passwd: true + gecos: Mariner + groups: [sudo, docker] + sudo: ["ALL=(ALL) NOPASSWD:ALL"] + shell: /bin/bash + # Automatically discover the best ntp_client + ntp_client: auto + # Other config here will be given to the distro class and/or path classes + paths: + cloud_dir: /var/lib/cloud/ + templates_dir: /etc/cloud/templates/ + + ssh_svcname: sshd diff --git a/toolkit/imageconfigs/additionalconfigs/configure-image.sh b/toolkit/imageconfigs/additionalconfigs/configure-image.sh new file mode 100755 index 00000000000..896fed16754 --- /dev/null +++ b/toolkit/imageconfigs/additionalconfigs/configure-image.sh @@ -0,0 +1,2 @@ +echo Enabling service for Azure Serial Console +systemctl enable serial-getty@ttyS0.service diff --git a/toolkit/imageconfigs/marketplace-gen1.json b/toolkit/imageconfigs/marketplace-gen1.json new file mode 100644 index 00000000000..b3841608c57 --- /dev/null +++ b/toolkit/imageconfigs/marketplace-gen1.json @@ -0,0 +1,63 @@ +{ + "Disks": [ + { + "PartitionTableType": "gpt", + "MaxSize": 600, + "Artifacts": [ + { + "Name": "cblmariner-gen1", + "Type": "vhd" + } + ], + "Partitions": [ + { + "ID": "boot", + "Flags": [ + "grub" + ], + "Start": 1, + "End": 9, + "FsType": "fat32" + }, + { + "ID": "rootfs", + "Start": 9, + "End": 0, + "FsType": "ext4" + } + ] + } + ], + "SystemConfigs": [ + { + "Name": "Standard", + "BootType": "legacy", + "PartitionSettings": [ + { + "ID": "boot", + "MountPoint": "" + }, + { + "ID": "rootfs", + "MountPoint": "/" + } + ], + "PackageLists": [ + "packagelists/core-packages-image.json", + "packagelists/azurevm-packages.json" + ], + "AdditionalFiles": { + "additionalconfigs/cloud-init.cfg": "/etc/cloud/cloud.cfg" + }, + "PostInstallScripts": [ + { + "Path": "additionalconfigs/configure-image.sh" + } + ], + "KernelOptions": { + "default": "kernel" + }, + "Hostname": "cbl-mariner" + } + ] +} diff --git a/toolkit/imageconfigs/marketplace-gen2.json b/toolkit/imageconfigs/marketplace-gen2.json new file mode 100644 index 00000000000..bcfdd80896d --- /dev/null +++ b/toolkit/imageconfigs/marketplace-gen2.json @@ -0,0 +1,65 @@ +{ + "Disks": [ + { + "PartitionTableType": "gpt", + "MaxSize": 600, + "Artifacts": [ + { + "Name": "cblmariner-gen2", + "Type": "vhd" + } + ], + "Partitions": [ + { + "ID": "boot", + "Flags": [ + "esp", + "boot" + ], + "Start": 1, + "End": 9, + "FsType": "fat32" + }, + { + "ID": "rootfs", + "Start": 9, + "End": 0, + "FsType": "ext4" + } + ] + } + ], + "SystemConfigs": [ + { + "Name": "Standard", + "BootType": "efi", + "PartitionSettings": [ + { + "ID": "boot", + "MountPoint": "/boot/efi", + "MountOptions" : "umask=0077" + }, + { + "ID": "rootfs", + "MountPoint": "/" + } + ], + "PackageLists": [ + "packagelists/core-packages-image.json", + "packagelists/azurevm-packages.json" + ], + "AdditionalFiles": { + "additionalconfigs/cloud-init.cfg": "/etc/cloud/cloud.cfg" + }, + "PostInstallScripts": [ + { + "Path": "additionalconfigs/configure-image.sh" + } + ], + "KernelOptions": { + "default": "kernel" + }, + "Hostname": "cbl-mariner" + } + ] +} diff --git a/toolkit/imageconfigs/packagelists/azurevm-packages.json b/toolkit/imageconfigs/packagelists/azurevm-packages.json new file mode 100644 index 00000000000..6a039f7360d --- /dev/null +++ b/toolkit/imageconfigs/packagelists/azurevm-packages.json @@ -0,0 +1,10 @@ +{ + "packages": [ + "cloud-init", + "cloud-utils-growpart", + "dhcp-client", + "hyperv-daemons", + "openssh-server", + "WALinuxAgent" + ] +} diff --git a/toolkit/resources/assets/meta-user-data/user-data b/toolkit/resources/assets/meta-user-data/user-data index 4d7c7d27ccd..f5b64020002 100644 --- a/toolkit/resources/assets/meta-user-data/user-data +++ b/toolkit/resources/assets/meta-user-data/user-data @@ -20,4 +20,6 @@ packages: - openssh-server runcmd: - sudo systemctl start sshd + - sudo systemctl stop waagent || true + - sudo systemctl disable waagent || true \ No newline at end of file From ee39729e98c0ee0dd73923831221715ecad3854f Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Thu, 3 Jun 2021 10:55:29 -0700 Subject: [PATCH 74/83] Reduce toolchain build time (via nss) and speed up nss package tests (#1006) * speed up nss compilation and tests * update manifests --- SPECS/nss/nss.spec | 13 +++++++++---- .../manifests/package/pkggen_core_aarch64.txt | 6 +++--- .../manifests/package/pkggen_core_x86_64.txt | 6 +++--- .../manifests/package/toolchain_aarch64.txt | 8 ++++---- .../manifests/package/toolchain_x86_64.txt | 8 ++++---- .../container/toolchain_build_in_chroot.sh | 1 + 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/SPECS/nss/nss.spec b/SPECS/nss/nss.spec index dcfa75e8170..211897ae64c 100644 --- a/SPECS/nss/nss.spec +++ b/SPECS/nss/nss.spec @@ -12,7 +12,7 @@ Summary: Security client Name: nss Version: 3.44 -Release: 4%{?dist} +Release: 5%{?dist} License: MPLv2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -58,6 +58,7 @@ This package contains minimal set of shared nss libraries. %build export NSS_FORCE_FIPS=1 +export NSS_DISABLE_GTESTS=1 cd nss # -j is not supported by nss make VERBOSE=1 BUILD_OPT=1 \ @@ -86,7 +87,7 @@ install -vm 644 Linux*/lib/pkgconfig/nss.pc %{buildroot}%{_libdir}/pkgconfig %check pushd nss/tests export USE_64=1 -HOST=localhost DOMSUF=localdomain BUILD_OPT=1 ./all.sh +HOST=localhost DOMSUF=localdomain BUILD_OPT=1 NSS_CYCLES=standard ./all.sh popd %post -p /sbin/ldconfig @@ -115,8 +116,12 @@ popd %{unsupported_tools_directory}/shlibsign %changelog -* Wed Mar 03 2021 Nicolas Ontiveros - 3.44-4 -- Enable FIPS mode +* Wed Jun 02 2021 Andrew Phelps 3.44-5 +- Set NSS_DISABLE_GTESTS=1 to speed up build +- Run tests much faster by limiting to NSS_CYCLES=standard + +* Wed Mar 03 2021 Nicolas Ontiveros 3.44-4 +- Enable FIPS mode * Tue Jan 26 2021 Andrew Phelps 3.44-3 - Fix check tests diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index dc35ee0cd39..55e47bd86b7 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -83,9 +83,9 @@ nspr-devel-4.21-2.cm1.aarch64.rpm sqlite-3.34.1-1.cm1.aarch64.rpm sqlite-devel-3.34.1-1.cm1.aarch64.rpm sqlite-libs-3.34.1-1.cm1.aarch64.rpm -nss-3.44-4.cm1.aarch64.rpm -nss-devel-3.44-4.cm1.aarch64.rpm -nss-libs-3.44-4.cm1.aarch64.rpm +nss-3.44-5.cm1.aarch64.rpm +nss-devel-3.44-5.cm1.aarch64.rpm +nss-libs-3.44-5.cm1.aarch64.rpm elfutils-0.176-4.cm1.aarch64.rpm elfutils-devel-0.176-4.cm1.aarch64.rpm elfutils-devel-static-0.176-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index f09176b3489..dd7d924eca5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -83,9 +83,9 @@ nspr-devel-4.21-2.cm1.x86_64.rpm sqlite-3.34.1-1.cm1.x86_64.rpm sqlite-devel-3.34.1-1.cm1.x86_64.rpm sqlite-libs-3.34.1-1.cm1.x86_64.rpm -nss-3.44-4.cm1.x86_64.rpm -nss-devel-3.44-4.cm1.x86_64.rpm -nss-libs-3.44-4.cm1.x86_64.rpm +nss-3.44-5.cm1.x86_64.rpm +nss-devel-3.44-5.cm1.x86_64.rpm +nss-libs-3.44-5.cm1.x86_64.rpm elfutils-0.176-4.cm1.x86_64.rpm elfutils-devel-0.176-4.cm1.x86_64.rpm elfutils-devel-static-0.176-4.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index b88b72214e8..4a3355aa360 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -266,10 +266,10 @@ npth-devel-1.6-3.cm1.aarch64.rpm nspr-4.21-2.cm1.aarch64.rpm nspr-debuginfo-4.21-2.cm1.aarch64.rpm nspr-devel-4.21-2.cm1.aarch64.rpm -nss-3.44-4.cm1.aarch64.rpm -nss-debuginfo-3.44-4.cm1.aarch64.rpm -nss-devel-3.44-4.cm1.aarch64.rpm -nss-libs-3.44-4.cm1.aarch64.rpm +nss-3.44-5.cm1.aarch64.rpm +nss-debuginfo-3.44-5.cm1.aarch64.rpm +nss-devel-3.44-5.cm1.aarch64.rpm +nss-libs-3.44-5.cm1.aarch64.rpm openjdk8-1.8.0.292-1.cm1.aarch64.rpm openjdk8-debuginfo-1.8.0.292-1.cm1.aarch64.rpm openjdk8-doc-1.8.0.292-1.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index c156911dfde..0596cabed3b 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -266,10 +266,10 @@ npth-devel-1.6-3.cm1.x86_64.rpm nspr-4.21-2.cm1.x86_64.rpm nspr-debuginfo-4.21-2.cm1.x86_64.rpm nspr-devel-4.21-2.cm1.x86_64.rpm -nss-3.44-4.cm1.x86_64.rpm -nss-debuginfo-3.44-4.cm1.x86_64.rpm -nss-devel-3.44-4.cm1.x86_64.rpm -nss-libs-3.44-4.cm1.x86_64.rpm +nss-3.44-5.cm1.x86_64.rpm +nss-debuginfo-3.44-5.cm1.x86_64.rpm +nss-devel-3.44-5.cm1.x86_64.rpm +nss-libs-3.44-5.cm1.x86_64.rpm openjdk8-1.8.0.292-1.cm1.x86_64.rpm openjdk8-debuginfo-1.8.0.292-1.cm1.x86_64.rpm openjdk8-doc-1.8.0.292-1.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index 5cebdc7429e..d60a6272bbf 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -1071,6 +1071,7 @@ tar xf nss-3.44.tar.gz pushd nss-3.44 patch -Np1 -i ../nss-3.44-standalone-1.patch cd nss +export NSS_DISABLE_GTESTS=1 # Build with single processor due to errors seen with parallel make make -j1 BUILD_OPT=1 \ NSPR_INCLUDE_DIR=/usr/include/nspr \ From 8b7aaa1214b3bb2bca47f3a36ce24e2ba5a930d2 Mon Sep 17 00:00:00 2001 From: Christopher Co <35273088+christopherco@users.noreply.github.com> Date: Thu, 3 Jun 2021 12:14:11 -0700 Subject: [PATCH 75/83] growpart: Remove flock workaround (#1007) Regression was root caused to this upstream LTS backport cc88a819 which refactored the BLKRRPART ioctl. This introduced behavior where this IOCTL would not return -EBUSY anymore. The fix for this backport patch was also recently backported (commit fc2454cc0) to restore the expected -EBUSY behavior. The original backport was introduced into 5.10 LTS in 5.10.20 and the fix was introduced in 5.10.33. We have now updated our kernel to a version that includes the fix so we can safely remove this workaround in growpart. Signed-off-by: Chris Co --- .../cloud-utils-growpart.spec | 7 ++- .../growpart-remove-flock-disk-locking.patch | 60 ------------------- 2 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 SPECS/cloud-utils-growpart/growpart-remove-flock-disk-locking.patch diff --git a/SPECS/cloud-utils-growpart/cloud-utils-growpart.spec b/SPECS/cloud-utils-growpart/cloud-utils-growpart.spec index 1c65b1e6c0e..80a5998d7e9 100644 --- a/SPECS/cloud-utils-growpart/cloud-utils-growpart.spec +++ b/SPECS/cloud-utils-growpart/cloud-utils-growpart.spec @@ -1,14 +1,13 @@ Summary: Shell script to auto detect free size on disk and grow partition. Name: cloud-utils-growpart Version: 0.32 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment URL: https://launchpad.net/cloud-utils Source0: https://launchpad.net/cloud-utils/trunk/%{version}/+download/cloud-utils-%{version}.tar.gz -Patch0: growpart-remove-flock-disk-locking.patch Requires: gawk Requires: gptfdisk Requires: util-linux @@ -21,7 +20,6 @@ This is generally used by cloud-init for disk space manangement on cloud images. %prep %setup -q -n cloud-utils-%{version} -%patch0 -p1 %build @@ -37,6 +35,9 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/ %doc %{_mandir}/man1/growpart.* %changelog +* Thu Jun 03 2021 Chris Co - 0.32-3 +- Remove patch now that unexpected timeout was root caused and fixed + * Tue Apr 27 2021 Chris Co - 0.32-2 - Add patch to handle unexpected timeout diff --git a/SPECS/cloud-utils-growpart/growpart-remove-flock-disk-locking.patch b/SPECS/cloud-utils-growpart/growpart-remove-flock-disk-locking.patch deleted file mode 100644 index 9f5a2129bad..00000000000 --- a/SPECS/cloud-utils-growpart/growpart-remove-flock-disk-locking.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1baf9aed12e35e7c032499081ea1c9887e65626a Mon Sep 17 00:00:00 2001 -From: Chris Co -Date: Wed, 28 Apr 2021 05:58:02 +0000 -Subject: [PATCH] growpart: remove flock disk locking - -Regression identified when using flock disk locking with 5.10 kernel and -systemd-239. During unlock_disk_and_settle(), udevadm settle will not -complete and eventually timeout after 2 minutes. When looking at the -systemd-udevd logs, the daemon crashes and produces the following stack -trace: - - Stack trace of thread 1531: - #0 0x00007fd73d9be405 recvmsg (libpthread.so.0) - #1 0x00007fd73dab33b8 udev_monitor_receive_device (libsystemd-shared-239.so) - #2 0x0000600347316201 on_uevent (systemd-udevd) - #3 0x0000600347316667 on_inotify (systemd-udevd) - #4 0x00007fd73dbad6d7 source_dispatch (libsystemd-shared-239.so) - #5 0x00007fd73dbaf4e5 sd_event_dispatch (libsystemd-shared-239.so) - #6 0x00007fd73dbaf678 sd_event_run (libsystemd-shared-239.so) - #7 0x00007fd73dbaf89f sd_event_loop (libsystemd-shared-239.so) - #8 0x00006003473132df run (systemd-udevd) - #9 0x00007fd73d80e133 __libc_start_main (libc.so.6) - #10 0x0000600347313efe _start (systemd-udevd) - -The failing behavior appears to be directly linked to the "exec FD" -actions. A quick way to replicate this issue in the repro environment: - exec 9<>$disk - exec 9>&- - udevadm settle - -This patch comments out the initial lock_disk() call, which makes -unlock_disk_and_settle() return early because ${FLOCK_DISK_FD} is not -set to a valid FD, avoiding the file descriptor actions that lead to -the failing behavior. - -Note that this change does re-introduce the possibility of udev race -conditions during the disk operations, effectively reverting this -behavior to pre-0.32 behavior. - -Signed-off-by: Chris Co ---- - bin/growpart | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/growpart b/bin/growpart -index 994b258..90fa016 100755 ---- a/bin/growpart -+++ b/bin/growpart -@@ -954,7 +954,7 @@ get_resizer "$format" "$resizer" || - fail "failed to get a resizer for format '$format'" - resizer=$_RET - --lock_disk $DISK -+#lock_disk $DISK - debug 1 "resizing $PART on $DISK using $resizer" - "$resizer" - ret=$? --- -2.17.1 - From ca118fb85ef07f9d46fa3e88caa9850d60020556 Mon Sep 17 00:00:00 2001 From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com> Date: Thu, 3 Jun 2021 13:42:29 -0700 Subject: [PATCH 76/83] Automatic package update for `ca-certificates`. (#1009) --- .../ca-certificates.signatures.json | 2 +- SPECS/ca-certificates/ca-certificates.spec | 5 +- SPECS/ca-certificates/certdata.microsoft.txt | 2929 +++++++++++------ .../prebuilt-ca-certificates-base.spec | 5 +- .../manifests/package/pkggen_core_aarch64.txt | 6 +- .../manifests/package/pkggen_core_x86_64.txt | 6 +- .../manifests/package/toolchain_aarch64.txt | 12 +- .../manifests/package/toolchain_x86_64.txt | 12 +- 8 files changed, 1887 insertions(+), 1090 deletions(-) diff --git a/SPECS/ca-certificates/ca-certificates.signatures.json b/SPECS/ca-certificates/ca-certificates.signatures.json index 05d01f84843..ca4d39e4516 100644 --- a/SPECS/ca-certificates/ca-certificates.signatures.json +++ b/SPECS/ca-certificates/ca-certificates.signatures.json @@ -14,7 +14,7 @@ "ca-legacy.8.txt": "4fef2b8fed41d21ae559803b06074ca61a3f46648f174832542e3223d16dabf4", "ca-legacy.conf": "400b96da374503fa6b6350a867347082d0c90e05ba4d02cc6b51b11229199c4d", "certdata.base.txt": "76c4cd1860b9a6f6ee9c2a0dcddcef46f65950b7ec12d2a7eeabeedca4e379f9", - "certdata.microsoft.txt": "80f8c0f75356730bea953a6f0317a70856c98991bced06d86c0eab9cfc8c4b85", + "certdata.microsoft.txt": "ec279962d396b9ad5cb6eb0db82436557b85a0063a79691baa40aa01ba3cad84", "certdata.txt": "cc6408bd4be7fbfb8699bdb40ccb7f6de5780d681d87785ea362646e4dad5e8e", "certdata2pem.py": "0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0", "nssckbi.h": "9d916fe1586259d94632f186a736449e8344b8a18f7ac97253f13efc764d77ea", diff --git a/SPECS/ca-certificates/ca-certificates.spec b/SPECS/ca-certificates/ca-certificates.spec index 9c26ae127d4..7953b8c8c62 100644 --- a/SPECS/ca-certificates/ca-certificates.spec +++ b/SPECS/ca-certificates/ca-certificates.spec @@ -71,7 +71,7 @@ Name: ca-certificates # When updating, "Version" AND "Release" tags must be updated in the "prebuilt-ca-certificates" package as well. Version: 20200720 -Release: 13%{?dist} +Release: 14%{?dist} License: MPLv2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -415,6 +415,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem} %{_bindir}/bundle2pem.sh %changelog +* Thu Jun 03 2021 CBL-Mariner Service Account - 20200720-14 +- Updating Microsoft trusted root CAs. + * Fri Mar 12 2021 CBL-Mariner Servicing Account - 20200720-13 - Updating Microsoft trusted root CAs. diff --git a/SPECS/ca-certificates/certdata.microsoft.txt b/SPECS/ca-certificates/certdata.microsoft.txt index 731a3c10297..5f7f5599c48 100644 --- a/SPECS/ca-certificates/certdata.microsoft.txt +++ b/SPECS/ca-certificates/certdata.microsoft.txt @@ -72,7 +72,7 @@ CKA_MODIFIABLE CK_BBOOL CK_FALSE CKA_LABEL UTF8 "Microsoft Builtin Roots" # -# Certificate "Edicom_CAEDICOM_ROOT" +# Certificate "CAEDICOM ROOT" # # Issuer: C=ES,O=EDICOM,CN=CAEDICOM Root # Serial Number:00:fb:71:26:58:ad:99:e5 @@ -85,7 +85,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Edicom_CAEDICOM_ROOT" +CKA_LABEL UTF8 "CAEDICOM ROOT" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\066\061\026\060\024\006\003\125\004\003\014\015\103\101\105 @@ -195,7 +195,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Edicom_CAEDICOM_ROOT" +# Trust for "CAEDICOM ROOT" # Issuer: C=ES,O=EDICOM,CN=CAEDICOM Root # Serial Number:00:fb:71:26:58:ad:99:e5 # Subject: C=ES,O=EDICOM,CN=CAEDICOM Root @@ -207,7 +207,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Edicom_CAEDICOM_ROOT" +CKA_LABEL UTF8 "CAEDICOM ROOT" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \125\233\272\173\017\376\200\326\323\202\233\037\320\172\244\323 \042\031\107\220 @@ -231,7 +231,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Certigna_CertignaRootCA" +# Certificate "Certigna Root CA" # # Issuer: CN=Certigna Root CA,OU=0002 48146308100036,O=Dhimyotis,C=FR # Serial Number:00:ca:e9:1b:89:f1:55:03:0d:a3:e6:41:6d:c4:e3:a6:e1 @@ -244,7 +244,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certigna_CertignaRootCA" +CKA_LABEL UTF8 "Certigna Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\013\060\011\006\003\125\004\006\023\002\106\122\061 @@ -375,7 +375,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Certigna_CertignaRootCA" +# Trust for "Certigna Root CA" # Issuer: CN=Certigna Root CA,OU=0002 48146308100036,O=Dhimyotis,C=FR # Serial Number:00:ca:e9:1b:89:f1:55:03:0d:a3:e6:41:6d:c4:e3:a6:e1 # Subject: CN=Certigna Root CA,OU=0002 48146308100036,O=Dhimyotis,C=FR @@ -387,7 +387,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certigna_CertignaRootCA" +CKA_LABEL UTF8 "Certigna Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \055\015\122\024\377\236\255\231\044\001\164\040\107\156\154\205 \047\047\365\103 @@ -414,7 +414,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TrustCor_RootCertCA1TrustCor" +# Certificate "TrustCor RootCert CA-1" # # Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA # Serial Number:00:da:9b:ec:71:f3:03:b0:19 @@ -427,7 +427,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustCor_RootCertCA1TrustCor" +CKA_LABEL UTF8 "TrustCor RootCert CA-1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\244\061\013\060\011\006\003\125\004\006\023\002\120\101 @@ -533,7 +533,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TrustCor_RootCertCA1TrustCor" +# Trust for "TrustCor RootCert CA-1" # Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA # Serial Number:00:da:9b:ec:71:f3:03:b0:19 # Subject: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -545,7 +545,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustCor_RootCertCA1TrustCor" +CKA_LABEL UTF8 "TrustCor RootCert CA-1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \377\275\315\347\202\310\103\136\074\157\046\206\134\312\250\072 \105\133\303\012 @@ -576,7 +576,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TrustCor_RootCertCA2TrustCor" +# Certificate "TrustCor RootCert CA-2" # # Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA # Serial Number:25:a1:df:ca:33:cb:59:02 @@ -589,7 +589,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustCor_RootCertCA2TrustCor" +CKA_LABEL UTF8 "TrustCor RootCert CA-2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\244\061\013\060\011\006\003\125\004\006\023\002\120\101 @@ -727,7 +727,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TrustCor_RootCertCA2TrustCor" +# Trust for "TrustCor RootCert CA-2" # Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA # Serial Number:25:a1:df:ca:33:cb:59:02 # Subject: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -739,7 +739,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustCor_RootCertCA2TrustCor" +CKA_LABEL UTF8 "TrustCor RootCert CA-2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \270\276\155\313\126\361\125\271\143\324\022\312\116\006\064\307 \224\262\034\300 @@ -770,7 +770,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TrustCor_ECA1TrustCor" +# Certificate "TrustCor ECA-1" # # Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA # Serial Number:00:84:82:2c:5f:1c:62:d0:40 @@ -783,7 +783,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustCor_ECA1TrustCor" +CKA_LABEL UTF8 "TrustCor ECA-1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\234\061\013\060\011\006\003\125\004\006\023\002\120\101 @@ -886,7 +886,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TrustCor_ECA1TrustCor" +# Trust for "TrustCor ECA-1" # Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA # Serial Number:00:84:82:2c:5f:1c:62:d0:40 # Subject: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -898,7 +898,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustCor_ECA1TrustCor" +CKA_LABEL UTF8 "TrustCor ECA-1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \130\321\337\225\225\147\153\143\300\360\133\034\027\115\213\204 \013\310\170\275 @@ -928,7 +928,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Amazon_AmazonRootCA1" +# Certificate "Amazon Root CA 1" # # Issuer: CN=Amazon Root CA 1,O=Amazon,C=US # Serial Number:06:6c:9f:cf:99:bf:8c:0a:39:e2:f0:78:8a:43:e6:96:36:5b:ca @@ -941,7 +941,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA1" +CKA_LABEL UTF8 "Amazon Root CA 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\071\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -1019,7 +1019,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Amazon_AmazonRootCA1" +# Trust for "Amazon Root CA 1" # Issuer: CN=Amazon Root CA 1,O=Amazon,C=US # Serial Number:06:6c:9f:cf:99:bf:8c:0a:39:e2:f0:78:8a:43:e6:96:36:5b:ca # Subject: CN=Amazon Root CA 1,O=Amazon,C=US @@ -1031,7 +1031,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA1" +CKA_LABEL UTF8 "Amazon Root CA 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \215\247\371\145\354\136\374\067\221\017\034\156\131\375\301\314 \152\156\336\026 @@ -1056,7 +1056,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Amazon_AmazonRootCA2" +# Certificate "Amazon Root CA 2" # # Issuer: CN=Amazon Root CA 2,O=Amazon,C=US # Serial Number:06:6c:9f:d2:96:35:86:9f:0a:0f:e5:86:78:f8:5b:26:bb:8a:37 @@ -1069,7 +1069,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA2" +CKA_LABEL UTF8 "Amazon Root CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\071\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -1179,7 +1179,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Amazon_AmazonRootCA2" +# Trust for "Amazon Root CA 2" # Issuer: CN=Amazon Root CA 2,O=Amazon,C=US # Serial Number:06:6c:9f:d2:96:35:86:9f:0a:0f:e5:86:78:f8:5b:26:bb:8a:37 # Subject: CN=Amazon Root CA 2,O=Amazon,C=US @@ -1191,7 +1191,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA2" +CKA_LABEL UTF8 "Amazon Root CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \132\214\357\105\327\246\230\131\166\172\214\213\104\226\265\170 \317\107\113\032 @@ -1216,7 +1216,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Amazon_AmazonRootCA3" +# Certificate "Amazon Root CA 3" # # Issuer: CN=Amazon Root CA 3,O=Amazon,C=US # Serial Number:06:6c:9f:d5:74:97:36:66:3f:3b:0b:9a:d9:e8:9e:76:03:f2:4a @@ -1229,7 +1229,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA3" +CKA_LABEL UTF8 "Amazon Root CA 3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\071\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -1282,7 +1282,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Amazon_AmazonRootCA3" +# Trust for "Amazon Root CA 3" # Issuer: CN=Amazon Root CA 3,O=Amazon,C=US # Serial Number:06:6c:9f:d5:74:97:36:66:3f:3b:0b:9a:d9:e8:9e:76:03:f2:4a # Subject: CN=Amazon Root CA 3,O=Amazon,C=US @@ -1294,7 +1294,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA3" +CKA_LABEL UTF8 "Amazon Root CA 3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \015\104\335\214\074\214\032\032\130\165\144\201\351\017\056\052 \377\263\322\156 @@ -1319,7 +1319,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Amazon_AmazonRootCA4" +# Certificate "Amazon Root CA 4" # # Issuer: CN=Amazon Root CA 4,O=Amazon,C=US # Serial Number:06:6c:9f:d7:c1:bb:10:4c:29:43:e5:71:7b:7b:2c:c8:1a:c1:0e @@ -1332,7 +1332,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA4" +CKA_LABEL UTF8 "Amazon Root CA 4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\071\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -1389,7 +1389,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Amazon_AmazonRootCA4" +# Trust for "Amazon Root CA 4" # Issuer: CN=Amazon Root CA 4,O=Amazon,C=US # Serial Number:06:6c:9f:d7:c1:bb:10:4c:29:43:e5:71:7b:7b:2c:c8:1a:c1:0e # Subject: CN=Amazon Root CA 4,O=Amazon,C=US @@ -1401,7 +1401,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Amazon_AmazonRootCA4" +CKA_LABEL UTF8 "Amazon Root CA 4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \366\020\204\007\326\370\273\147\230\014\302\342\104\302\353\256 \034\357\143\276 @@ -1426,7 +1426,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Harica_HaricaECCRootCA2015" +# Certificate "Hellenic Academic and Research Institutions ECC RootCA 2015" # # Issuer: CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR # Serial Number: 0 (0x0) @@ -1439,7 +1439,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Harica_HaricaECCRootCA2015" +CKA_LABEL UTF8 "Hellenic Academic and Research Institutions ECC RootCA 2015" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\252\061\013\060\011\006\003\125\004\006\023\002\107\122 @@ -1522,7 +1522,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Harica_HaricaECCRootCA2015" +# Trust for "Hellenic Academic and Research Institutions ECC RootCA 2015" # Issuer: CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR # Serial Number: 0 (0x0) # Subject: CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR @@ -1534,7 +1534,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Harica_HaricaECCRootCA2015" +CKA_LABEL UTF8 "Hellenic Academic and Research Institutions ECC RootCA 2015" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \237\361\161\215\222\325\232\363\175\164\227\264\274\157\204\150 \013\272\266\146 @@ -1565,7 +1565,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Harica_HaricaRootCA2015" +# Certificate "Hellenic Academic and Research Institutions RootCA 2015" # # Issuer: CN=Hellenic Academic and Research Institutions RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR # Serial Number: 0 (0x0) @@ -1578,7 +1578,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Harica_HaricaRootCA2015" +CKA_LABEL UTF8 "Hellenic Academic and Research Institutions RootCA 2015" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\246\061\013\060\011\006\003\125\004\006\023\002\107\122 @@ -1713,7 +1713,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Harica_HaricaRootCA2015" +# Trust for "Hellenic Academic and Research Institutions RootCA 2015" # Issuer: CN=Hellenic Academic and Research Institutions RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR # Serial Number: 0 (0x0) # Subject: CN=Hellenic Academic and Research Institutions RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR @@ -1725,7 +1725,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Harica_HaricaRootCA2015" +CKA_LABEL UTF8 "Hellenic Academic and Research Institutions RootCA 2015" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \001\014\006\225\246\230\031\024\377\277\137\306\260\266\225\352 \051\351\022\246 @@ -1756,7 +1756,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ICA_rca15_rsa" +# Certificate "I.CA Root CA/RSA" # # Issuer: serialNumber=NTRCZ-26439395,CN=I.CA Root CA/RSA,O="Prvn.. certifika..n.. autorita, a.s.",C=CZ # Serial Number: 100000000 (0x5f5e100) @@ -1769,7 +1769,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ICA_rca15_rsa" +CKA_LABEL UTF8 "I.CA Root CA/RSA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\160\061\013\060\011\006\003\125\004\006\023\002\103\132\061 @@ -1906,7 +1906,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ICA_rca15_rsa" +# Trust for "I.CA Root CA/RSA" # Issuer: serialNumber=NTRCZ-26439395,CN=I.CA Root CA/RSA,O="Prvn.. certifika..n.. autorita, a.s.",C=CZ # Serial Number: 100000000 (0x5f5e100) # Subject: serialNumber=NTRCZ-26439395,CN=I.CA Root CA/RSA,O="Prvn.. certifika..n.. autorita, a.s.",C=CZ @@ -1918,7 +1918,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ICA_rca15_rsa" +CKA_LABEL UTF8 "I.CA Root CA/RSA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \233\011\131\211\201\124\010\033\366\251\016\233\236\130\244\151 \014\233\241\004 @@ -1946,7 +1946,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Cisco_rxcr2" +# Certificate "RXC-R2" # # Issuer: CN=Cisco RXC-R2,O=Cisco Systems,C=US # Serial Number: 1 (0x1) @@ -1959,7 +1959,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Cisco_rxcr2" +CKA_LABEL UTF8 "RXC-R2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\074\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -2035,7 +2035,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Cisco_rxcr2" +# Trust for "RXC-R2" # Issuer: CN=Cisco RXC-R2,O=Cisco Systems,C=US # Serial Number: 1 (0x1) # Subject: CN=Cisco RXC-R2,O=Cisco Systems,C=US @@ -2047,7 +2047,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Cisco_rxcr2" +CKA_LABEL UTF8 "RXC-R2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \054\212\377\316\226\144\060\272\004\300\117\201\335\113\111\307 \033\133\201\240 @@ -2071,7 +2071,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GlobalS_globalsign_root-r6" +# Certificate "GlobalSign Root CA - R6" # # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 # Serial Number:45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51 @@ -2084,7 +2084,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_globalsign_root-r6" +CKA_LABEL UTF8 "GlobalSign Root CA - R6" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 @@ -2199,7 +2199,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GlobalS_globalsign_root-r6" +# Trust for "GlobalSign Root CA - R6" # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 # Serial Number:45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51 # Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 @@ -2211,7 +2211,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_globalsign_root-r6" +CKA_LABEL UTF8 "GlobalSign Root CA - R6" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \200\224\144\016\265\247\241\312\021\234\037\335\325\237\201\002 \143\247\373\321 @@ -2236,7 +2236,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Multicert_MCRootCA" +# Certificate "MULTICERT Root Certification Authority 01" # # Issuer: CN=MULTICERT Root Certification Authority 01,O=MULTICERT - Servi..os de Certifica....o Electr..nica S.A.,C=PT # Serial Number:54:4d:a5:bc:40:35:56:5a @@ -2249,7 +2249,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Multicert_MCRootCA" +CKA_LABEL UTF8 "MULTICERT Root Certification Authority 01" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\205\061\013\060\011\006\003\125\004\006\023\002\120\124 @@ -2379,7 +2379,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Multicert_MCRootCA" +# Trust for "MULTICERT Root Certification Authority 01" # Issuer: CN=MULTICERT Root Certification Authority 01,O=MULTICERT - Servi..os de Certifica....o Electr..nica S.A.,C=PT # Serial Number:54:4d:a5:bc:40:35:56:5a # Subject: CN=MULTICERT Root Certification Authority 01,O=MULTICERT - Servi..os de Certifica....o Electr..nica S.A.,C=PT @@ -2391,7 +2391,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Multicert_MCRootCA" +CKA_LABEL UTF8 "MULTICERT Root Certification Authority 01" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \106\257\172\061\265\231\106\015\106\235\140\101\024\133\023\145 \035\371\027\012 @@ -2420,7 +2420,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GuangDong_GDCA_TrustAUTH_R5_ROOT" +# Certificate "GDCA TrustAUTH R5 ROOT" # # Issuer: CN=GDCA TrustAUTH R5 ROOT,O="GUANG DONG CERTIFICATE AUTHORITY CO.,LTD.",C=CN # Serial Number:7d:09:97:fe:f0:47:ea:7a @@ -2433,7 +2433,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GuangDong_GDCA_TrustAUTH_R5_ROOT" +CKA_LABEL UTF8 "GDCA TrustAUTH R5 ROOT" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\142\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -2552,7 +2552,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GuangDong_GDCA_TrustAUTH_R5_ROOT" +# Trust for "GDCA TrustAUTH R5 ROOT" # Issuer: CN=GDCA TrustAUTH R5 ROOT,O="GUANG DONG CERTIFICATE AUTHORITY CO.,LTD.",C=CN # Serial Number:7d:09:97:fe:f0:47:ea:7a # Subject: CN=GDCA TrustAUTH R5 ROOT,O="GUANG DONG CERTIFICATE AUTHORITY CO.,LTD.",C=CN @@ -2564,7 +2564,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GuangDong_GDCA_TrustAUTH_R5_ROOT" +CKA_LABEL UTF8 "GDCA TrustAUTH R5 ROOT" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \017\066\070\133\201\032\045\303\233\061\116\203\312\351\064\146 \160\314\164\264 @@ -2591,7 +2591,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "IndiaGov_CCAIndia2015" +# Certificate "CCA India 2015" # # Issuer: CN=CCA India 2015 SPL,O=India PKI,C=IN # Serial Number: 10165 (0x27b5) @@ -2604,7 +2604,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "IndiaGov_CCAIndia2015" +CKA_LABEL UTF8 "CCA India 2015" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\076\061\013\060\011\006\003\125\004\006\023\002\111\116\061 @@ -2679,7 +2679,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "IndiaGov_CCAIndia2015" +# Trust for "CCA India 2015" # Issuer: CN=CCA India 2015 SPL,O=India PKI,C=IN # Serial Number: 10165 (0x27b5) # Subject: CN=CCA India 2015 SPL,O=India PKI,C=IN @@ -2691,7 +2691,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "IndiaGov_CCAIndia2015" +CKA_LABEL UTF8 "CCA India 2015" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \073\306\334\340\003\007\275\147\140\101\353\330\131\160\306\057 \217\332\121\011 @@ -2715,7 +2715,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SweedishGov_SwedishGovernmentRootAuthorityv3" +# Certificate "Swedish Government Root Authority v3" # # Issuer: CN=Swedish Government Root Authority v3,O=Swedish Social Insurance Agency,C=SE # Serial Number:32:69:a2:bf:40:6b:8d:b4:47:83:64:3c:8b:0d:c9:43 @@ -2728,7 +2728,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SweedishGov_SwedishGovernmentRootAuthorityv3" +CKA_LABEL UTF8 "Swedish Government Root Authority v3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\146\061\013\060\011\006\003\125\004\006\023\002\123\105\061 @@ -2850,7 +2850,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SweedishGov_SwedishGovernmentRootAuthorityv3" +# Trust for "Swedish Government Root Authority v3" # Issuer: CN=Swedish Government Root Authority v3,O=Swedish Social Insurance Agency,C=SE # Serial Number:32:69:a2:bf:40:6b:8d:b4:47:83:64:3c:8b:0d:c9:43 # Subject: CN=Swedish Government Root Authority v3,O=Swedish Social Insurance Agency,C=SE @@ -2862,7 +2862,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SweedishGov_SwedishGovernmentRootAuthorityv3" +CKA_LABEL UTF8 "Swedish Government Root Authority v3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \164\157\210\371\254\026\074\123\000\236\357\222\014\100\147\165 \152\025\161\176 @@ -2890,7 +2890,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NationalDigitalCertificationAgency_TunRootCA2" +# Certificate "Tunisian Root Certificate Authority - TunRootCA2" # # Issuer: O=National Digital Certification Agency,CN=Tunisian Root Certificate Authority - TunRootCA2,C=TN # Serial Number:21:66:15:05:05:27:05:05:bc:8a:b0:1d:af:0a:be:c4 @@ -2903,7 +2903,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NationalDigitalCertificationAgency_TunRootCA2" +CKA_LABEL UTF8 "Tunisian Root Certificate Authority - TunRootCA2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\170\061\013\060\011\006\003\125\004\006\023\002\124\116\061 @@ -3028,7 +3028,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NationalDigitalCertificationAgency_TunRootCA2" +# Trust for "Tunisian Root Certificate Authority - TunRootCA2" # Issuer: O=National Digital Certification Agency,CN=Tunisian Root Certificate Authority - TunRootCA2,C=TN # Serial Number:21:66:15:05:05:27:05:05:bc:8a:b0:1d:af:0a:be:c4 # Subject: O=National Digital Certification Agency,CN=Tunisian Root Certificate Authority - TunRootCA2,C=TN @@ -3040,7 +3040,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NationalDigitalCertificationAgency_TunRootCA2" +CKA_LABEL UTF8 "Tunisian Root Certificate Authority - TunRootCA2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \226\070\143\074\220\126\256\210\024\240\145\322\073\334\140\240 \356\160\057\247 @@ -3069,7 +3069,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "grca_grca2" +# Certificate "TW Government Root Certification Authority 2" # # Issuer: O=Government Root Certification Authority,C=TW # Serial Number:00:b6:4b:88:07:e2:23:ee:c8:5c:12:ad:a6:0e:06:a1:f2 @@ -3082,7 +3082,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "grca_grca2" +CKA_LABEL UTF8 "TW Government Root Certification Authority 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\077\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -3194,7 +3194,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "grca_grca2" +# Trust for "TW Government Root Certification Authority 2" # Issuer: O=Government Root Certification Authority,C=TW # Serial Number:00:b6:4b:88:07:e2:23:ee:c8:5c:12:ad:a6:0e:06:a1:f2 # Subject: O=Government Root Certification Authority,C=TW @@ -3206,7 +3206,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "grca_grca2" +CKA_LABEL UTF8 "TW Government Root Certification Authority 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \260\221\252\221\070\107\363\023\327\047\274\357\310\027\237\010 \157\072\214\017 @@ -3232,7 +3232,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ATrust_atroot05" +# Certificate "A-Trust-Root-05" # # Issuer: CN=A-Trust-Root-05,OU=A-Trust-Root-05,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1035700 (0xfcdb4) @@ -3245,7 +3245,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATrust_atroot05" +CKA_LABEL UTF8 "A-Trust-Root-05" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\213\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -3372,7 +3372,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ATrust_atroot05" +# Trust for "A-Trust-Root-05" # Issuer: CN=A-Trust-Root-05,OU=A-Trust-Root-05,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1035700 (0xfcdb4) # Subject: CN=A-Trust-Root-05,OU=A-Trust-Root-05,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT @@ -3384,7 +3384,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATrust_atroot05" +CKA_LABEL UTF8 "A-Trust-Root-05" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \056\146\311\204\021\201\300\217\261\337\253\324\377\215\134\307 \053\340\217\002 @@ -3413,7 +3413,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ATrust_atqual02a" +# Certificate "A-Trust-Qual-02" # # Issuer: CN=A-Trust-Qual-02,OU=A-Trust-Qual-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1330660 (0x144de4) @@ -3426,7 +3426,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATrust_atqual02a" +CKA_LABEL UTF8 "A-Trust-Qual-02" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\213\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -3521,7 +3521,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ATrust_atqual02a" +# Trust for "A-Trust-Qual-02" # Issuer: CN=A-Trust-Qual-02,OU=A-Trust-Qual-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1330660 (0x144de4) # Subject: CN=A-Trust-Qual-02,OU=A-Trust-Qual-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT @@ -3533,7 +3533,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATrust_atqual02a" +CKA_LABEL UTF8 "A-Trust-Qual-02" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \315\170\172\075\134\272\202\007\010\050\110\066\136\232\315\351 \150\063\144\330 @@ -3562,7 +3562,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ThaiNRCA_THNRCA" +# Certificate "Thailand National Root Certification Authority - G1" # # Issuer: CN=Thailand National Root Certification Authority - G1,OU=Thailand National Root Certification Authority,O=Electronic Transactions Development Agency (Public Organization),C=TH # Serial Number: 1364379020 (0x5152c58c) @@ -3575,7 +3575,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ThaiNRCA_THNRCA" +CKA_LABEL UTF8 "Thailand National Root Certification Authority - G1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\317\061\013\060\011\006\003\125\004\006\023\002\124\110 @@ -3724,7 +3724,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ThaiNRCA_THNRCA" +# Trust for "Thailand National Root Certification Authority - G1" # Issuer: CN=Thailand National Root Certification Authority - G1,OU=Thailand National Root Certification Authority,O=Electronic Transactions Development Agency (Public Organization),C=TH # Serial Number: 1364379020 (0x5152c58c) # Subject: CN=Thailand National Root Certification Authority - G1,OU=Thailand National Root Certification Authority,O=Electronic Transactions Development Agency (Public Organization),C=TH @@ -3736,7 +3736,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ThaiNRCA_THNRCA" +CKA_LABEL UTF8 "Thailand National Root Certification Authority - G1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \146\362\334\373\077\201\115\336\351\263\040\157\021\336\376\033 \373\337\341\062 @@ -3770,7 +3770,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TWCA_TWCA_GLOBAL_4096_EV" +# Certificate "TWCA Global Root CA" # # Issuer: CN=TWCA Global Root CA,OU=Root CA,O=TAIWAN-CA,C=TW # Serial Number: 3262 (0xcbe) @@ -3783,7 +3783,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TWCA_TWCA_GLOBAL_4096_EV" +CKA_LABEL UTF8 "TWCA Global Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\121\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -3896,7 +3896,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TWCA_TWCA_GLOBAL_4096_EV" +# Trust for "TWCA Global Root CA" # Issuer: CN=TWCA Global Root CA,OU=Root CA,O=TAIWAN-CA,C=TW # Serial Number: 3262 (0xcbe) # Subject: CN=TWCA Global Root CA,OU=Root CA,O=TAIWAN-CA,C=TW @@ -3908,7 +3908,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TWCA_TWCA_GLOBAL_4096_EV" +CKA_LABEL UTF8 "TWCA Global Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \234\273\110\123\366\244\366\323\122\244\350\062\122\125\140\023 \365\255\257\145 @@ -3934,7 +3934,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "pkioverheid_PKIoverheidEVRootCA" +# Certificate "Staat der Nederlanden EV Root CA" # # Issuer: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL # Serial Number: 10000013 (0x98968d) @@ -3947,7 +3947,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "pkioverheid_PKIoverheidEVRootCA" +CKA_LABEL UTF8 "Staat der Nederlanden EV Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\130\061\013\060\011\006\003\125\004\006\023\002\116\114\061 @@ -4063,7 +4063,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "pkioverheid_PKIoverheidEVRootCA" +# Trust for "Staat der Nederlanden EV Root CA" # Issuer: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL # Serial Number: 10000013 (0x98968d) # Subject: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL @@ -4075,7 +4075,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "pkioverheid_PKIoverheidEVRootCA" +CKA_LABEL UTF8 "Staat der Nederlanden EV Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \166\342\176\301\117\333\202\301\300\246\165\265\005\276\075\051 \264\355\333\273 @@ -4101,7 +4101,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "pkioverheid_PKIoverheid_G3Root" +# Certificate "Government of Netherlands G3" # # Issuer: CN=Staat der Nederlanden Root CA - G3,O=Staat der Nederlanden,C=NL # Serial Number: 10003001 (0x98a239) @@ -4114,7 +4114,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "pkioverheid_PKIoverheid_G3Root" +CKA_LABEL UTF8 "Government of Netherlands G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 @@ -4230,7 +4230,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "pkioverheid_PKIoverheid_G3Root" +# Trust for "Government of Netherlands G3" # Issuer: CN=Staat der Nederlanden Root CA - G3,O=Staat der Nederlanden,C=NL # Serial Number: 10003001 (0x98a239) # Subject: CN=Staat der Nederlanden Root CA - G3,O=Staat der Nederlanden,C=NL @@ -4242,7 +4242,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "pkioverheid_PKIoverheid_G3Root" +CKA_LABEL UTF8 "Government of Netherlands G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \330\353\153\101\121\222\131\340\363\347\205\000\300\075\266\210 \227\311\356\374 @@ -4268,7 +4268,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "certinomis_AC_Racine_G3" +# Certificate "Certinomis - Root CA" # # Issuer: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR # Serial Number: 1 (0x1) @@ -4281,7 +4281,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "certinomis_AC_Racine_G3" +CKA_LABEL UTF8 "Certinomis - Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\013\060\011\006\003\125\004\006\023\002\106\122\061 @@ -4399,7 +4399,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "certinomis_AC_Racine_G3" +# Trust for "Certinomis - Root CA" # Issuer: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR # Serial Number: 1 (0x1) # Subject: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR @@ -4411,7 +4411,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "certinomis_AC_Racine_G3" +CKA_LABEL UTF8 "Certinomis - Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \235\160\273\001\245\244\240\030\021\056\367\034\001\271\062\305 \064\347\210\250 @@ -4437,7 +4437,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ANF_ANF_Global_Root_CA_SHA1" +# Certificate "ANF Global Root CA" # # Issuer: CN=ANF Global Root CA,serialNumber=G63287510,E=info@anf.es,OU=ANF Clase 1 CA,O=ANF Autoridad de Certificacion,L=Barcelona (see current address at http://www.anf.es/es/address-direccion.html ),ST=Barcelona,C=ES # Serial Number:01:3f:2f:31:53:6f @@ -4450,7 +4450,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANF_ANF_Global_Root_CA_SHA1" +CKA_LABEL UTF8 "ANF Global Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\202\001\012\061\013\060\011\006\003\125\004\006\023\002\105 @@ -4630,7 +4630,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ANF_ANF_Global_Root_CA_SHA1" +# Trust for "ANF Global Root CA" # Issuer: CN=ANF Global Root CA,serialNumber=G63287510,E=info@anf.es,OU=ANF Clase 1 CA,O=ANF Autoridad de Certificacion,L=Barcelona (see current address at http://www.anf.es/es/address-direccion.html ),ST=Barcelona,C=ES # Serial Number:01:3f:2f:31:53:6f # Subject: CN=ANF Global Root CA,serialNumber=G63287510,E=info@anf.es,OU=ANF Clase 1 CA,O=ANF Autoridad de Certificacion,L=Barcelona (see current address at http://www.anf.es/es/address-direccion.html ),ST=Barcelona,C=ES @@ -4642,7 +4642,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANF_ANF_Global_Root_CA_SHA1" +CKA_LABEL UTF8 "ANF Global Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \133\265\231\040\321\033\071\024\171\106\072\335\121\000\333\035 \122\364\072\324 @@ -4679,7 +4679,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GovSaudiArabia_NCDCsnrcasha256" +# Certificate "Saudi National Root CA" # # Issuer: OU=Saudi National Root CA,O=National Center for Digital Certification,C=SA # Serial Number: 1236677912 (0x49b63518) @@ -4692,7 +4692,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovSaudiArabia_NCDCsnrcasha256" +CKA_LABEL UTF8 "Saudi National Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\142\061\013\060\011\006\003\125\004\006\023\002\123\101\061 @@ -4799,7 +4799,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GovSaudiArabia_NCDCsnrcasha256" +# Trust for "Saudi National Root CA" # Issuer: OU=Saudi National Root CA,O=National Center for Digital Certification,C=SA # Serial Number: 1236677912 (0x49b63518) # Subject: OU=Saudi National Root CA,O=National Center for Digital Certification,C=SA @@ -4811,7 +4811,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovSaudiArabia_NCDCsnrcasha256" +CKA_LABEL UTF8 "Saudi National Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \203\121\120\233\175\370\317\350\173\256\142\256\271\260\072\122 \364\346\054\171 @@ -4838,7 +4838,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SSC_SSC_GDL_CA_ROOT_B" +# Certificate "SSC GDL CA Root B" # # Issuer: CN=SSC GDL CA Root B,OU=CA ROOT Services,O=Skaitmeninio sertifikavimo centras,C=LT # Serial Number:3e:8c:4f:bc:e4:29:83:82:4d:84:55:8e:d5:35:80:cf @@ -4851,7 +4851,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSC_SSC_GDL_CA_ROOT_B" +CKA_LABEL UTF8 "SSC GDL CA Root B" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\161\061\013\060\011\006\003\125\004\006\023\002\114\124\061 @@ -4976,7 +4976,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SSC_SSC_GDL_CA_ROOT_B" +# Trust for "SSC GDL CA Root B" # Issuer: CN=SSC GDL CA Root B,OU=CA ROOT Services,O=Skaitmeninio sertifikavimo centras,C=LT # Serial Number:3e:8c:4f:bc:e4:29:83:82:4d:84:55:8e:d5:35:80:cf # Subject: CN=SSC GDL CA Root B,OU=CA ROOT Services,O=Skaitmeninio sertifikavimo centras,C=LT @@ -4988,7 +4988,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSC_SSC_GDL_CA_ROOT_B" +CKA_LABEL UTF8 "SSC GDL CA Root B" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \310\140\243\030\374\365\267\023\013\020\007\255\177\141\112\100 \377\377\030\137 @@ -5017,7 +5017,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GovHungary_NISZ_ROOT" +# Certificate "Fotanúsítványkiadó - Kormányzati Hitelesítés Szolgáltató" # # Issuer: CN=F..tan..s..tv..nykiad.. - Korm..nyzati Hiteles..t..s Szolg..ltat..,O=NISZ Nemzeti Infokommunik..ci..s Szolg..ltat.. Zrt.,L=Budapest,C=HU # Serial Number:74:f8:60:f1:e8:a3:8f:41 @@ -5030,7 +5030,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovHungary_NISZ_ROOT" +CKA_LABEL UTF8 "Fotanúsítványkiadó - Kormányzati Hitelesítés Szolgáltató" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\253\061\013\060\011\006\003\125\004\006\023\002\110\125 @@ -5169,7 +5169,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GovHungary_NISZ_ROOT" +# Trust for "Fotanúsítványkiadó - Kormányzati Hitelesítés Szolgáltató" # Issuer: CN=F..tan..s..tv..nykiad.. - Korm..nyzati Hiteles..t..s Szolg..ltat..,O=NISZ Nemzeti Infokommunik..ci..s Szolg..ltat.. Zrt.,L=Budapest,C=HU # Serial Number:74:f8:60:f1:e8:a3:8f:41 # Subject: CN=F..tan..s..tv..nykiad.. - Korm..nyzati Hiteles..t..s Szolg..ltat..,O=NISZ Nemzeti Infokommunik..ci..s Szolg..ltat.. Zrt.,L=Budapest,C=HU @@ -5181,7 +5181,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovHungary_NISZ_ROOT" +CKA_LABEL UTF8 "Fotanúsítványkiadó - Kormányzati Hitelesítés Szolgáltató" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \377\267\340\217\146\341\320\302\130\057\002\105\304\227\002\222 \244\156\210\003 @@ -5212,7 +5212,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TurkTrust_TURKTRUST_h5ROOT" +# Certificate "TÜRKTRUST Elektronik Sertifika Hizmet Saglayicisi H5" # # Issuer: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR # Serial Number:00:8e:17:fe:24:20:81 @@ -5225,7 +5225,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TurkTrust_TURKTRUST_h5ROOT" +CKA_LABEL UTF8 "TÜRKTRUST Elektronik Sertifika Hizmet Saglayicisi H5" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122 @@ -5332,7 +5332,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TurkTrust_TURKTRUST_h5ROOT" +# Trust for "TÜRKTRUST Elektronik Sertifika Hizmet Saglayicisi H5" # Issuer: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR # Serial Number:00:8e:17:fe:24:20:81 # Subject: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR @@ -5344,7 +5344,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TurkTrust_TURKTRUST_h5ROOT" +CKA_LABEL UTF8 "TÜRKTRUST Elektronik Sertifika Hizmet Saglayicisi H5" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \304\030\366\115\106\321\337\000\075\047\060\023\162\103\251\022 \021\306\165\373 @@ -5376,7 +5376,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SouthAfricanPostOffice_c3rootcert2014b64" +# Certificate "SAPO Class 3 Root CA" # # Issuer: E=pkiadmin@trustcentre.co.za,CN=SAPO Class 3 Root CA,OU=SAPO Trust Centre,O=South African Post Office Limited,L=Somerset West,ST=Western Cape,C=ZA # Serial Number: 2 (0x2) @@ -5389,7 +5389,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SouthAfricanPostOffice_c3rootcert2014b64" +CKA_LABEL UTF8 "SAPO Class 3 Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101 @@ -5535,7 +5535,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SouthAfricanPostOffice_c3rootcert2014b64" +# Trust for "SAPO Class 3 Root CA" # Issuer: E=pkiadmin@trustcentre.co.za,CN=SAPO Class 3 Root CA,OU=SAPO Trust Centre,O=South African Post Office Limited,L=Somerset West,ST=Western Cape,C=ZA # Serial Number: 2 (0x2) # Subject: E=pkiadmin@trustcentre.co.za,CN=SAPO Class 3 Root CA,OU=SAPO Trust Centre,O=South African Post Office Limited,L=Somerset West,ST=Western Cape,C=ZA @@ -5547,7 +5547,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SouthAfricanPostOffice_c3rootcert2014b64" +CKA_LABEL UTF8 "SAPO Class 3 Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \070\335\166\131\307\065\020\013\000\242\067\344\221\267\274\017 \374\322\061\154 @@ -5581,7 +5581,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "IdenTrust_IdenTrust_Commercial_Root_CA_1" +# Certificate "IdenTrust Commercial Root CA 1" # # Issuer: CN=IdenTrust Commercial Root CA 1,O=IdenTrust,C=US # Serial Number:0a:01:42:80:00:00:01:45:23:c8:44:b5:00:00:00:02 @@ -5594,7 +5594,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "IdenTrust_IdenTrust_Commercial_Root_CA_1" +CKA_LABEL UTF8 "IdenTrust Commercial Root CA 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -5708,7 +5708,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "IdenTrust_IdenTrust_Commercial_Root_CA_1" +# Trust for "IdenTrust Commercial Root CA 1" # Issuer: CN=IdenTrust Commercial Root CA 1,O=IdenTrust,C=US # Serial Number:0a:01:42:80:00:00:01:45:23:c8:44:b5:00:00:00:02 # Subject: CN=IdenTrust Commercial Root CA 1,O=IdenTrust,C=US @@ -5720,7 +5720,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "IdenTrust_IdenTrust_Commercial_Root_CA_1" +CKA_LABEL UTF8 "IdenTrust Commercial Root CA 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \337\161\176\252\112\331\116\311\125\204\231\140\055\110\336\137 \274\360\072\045 @@ -5746,7 +5746,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "IdenTrust_IdenTrust_Public_Sector_Root_CA_1" +# Certificate "IdenTrust Public Sector Root CA 1" # # Issuer: CN=IdenTrust Public Sector Root CA 1,O=IdenTrust,C=US # Serial Number:0a:01:42:80:00:00:01:45:23:cf:46:7c:00:00:00:02 @@ -5759,7 +5759,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "IdenTrust_IdenTrust_Public_Sector_Root_CA_1" +CKA_LABEL UTF8 "IdenTrust Public Sector Root CA 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -5873,7 +5873,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "IdenTrust_IdenTrust_Public_Sector_Root_CA_1" +# Trust for "IdenTrust Public Sector Root CA 1" # Issuer: CN=IdenTrust Public Sector Root CA 1,O=IdenTrust,C=US # Serial Number:0a:01:42:80:00:00:01:45:23:cf:46:7c:00:00:00:02 # Subject: CN=IdenTrust Public Sector Root CA 1,O=IdenTrust,C=US @@ -5885,7 +5885,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "IdenTrust_IdenTrust_Public_Sector_Root_CA_1" +CKA_LABEL UTF8 "IdenTrust Public Sector Root CA 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \272\051\101\140\167\230\077\364\363\357\362\061\005\073\056\352 \155\115\105\375 @@ -5911,7 +5911,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Disig_CA_Disig_Root_R2" +# Certificate "CA Disig Root R2" # # Issuer: CN=CA Disig Root R2,O=Disig a.s.,L=Bratislava,C=SK # Serial Number:00:92:b8:88:db:b0:8a:c1:63 @@ -5924,7 +5924,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Disig_CA_Disig_Root_R2" +CKA_LABEL UTF8 "CA Disig Root R2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\122\061\013\060\011\006\003\125\004\006\023\002\123\113\061 @@ -6039,7 +6039,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Disig_CA_Disig_Root_R2" +# Trust for "CA Disig Root R2" # Issuer: CN=CA Disig Root R2,O=Disig a.s.,L=Bratislava,C=SK # Serial Number:00:92:b8:88:db:b0:8a:c1:63 # Subject: CN=CA Disig Root R2,O=Disig a.s.,L=Bratislava,C=SK @@ -6051,7 +6051,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Disig_CA_Disig_Root_R2" +CKA_LABEL UTF8 "CA Disig Root R2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \265\141\353\352\244\336\344\045\113\151\032\230\245\127\107\302 \064\307\331\161 @@ -6077,7 +6077,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCertAssuredIDRootG2" +# Certificate "DigiCert Assured ID Root G2" # # Issuer: CN=DigiCert Assured ID Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:0b:93:1c:3a:d6:39:67:ea:67:23:bf:c3:af:9a:f4:4b @@ -6090,7 +6090,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertAssuredIDRootG2" +CKA_LABEL UTF8 "DigiCert Assured ID Root G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\145\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -6179,7 +6179,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCertAssuredIDRootG2" +# Trust for "DigiCert Assured ID Root G2" # Issuer: CN=DigiCert Assured ID Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:0b:93:1c:3a:d6:39:67:ea:67:23:bf:c3:af:9a:f4:4b # Subject: CN=DigiCert Assured ID Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -6191,7 +6191,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertAssuredIDRootG2" +CKA_LABEL UTF8 "DigiCert Assured ID Root G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \241\113\110\331\103\356\012\016\100\220\117\074\340\244\300\221 \223\121\135\077 @@ -6219,7 +6219,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCertAssuredIDRootG3" +# Certificate "DigiCert Assured ID Root G3" # # Issuer: CN=DigiCert Assured ID Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:0b:a1:5a:fa:1d:df:a0:b5:49:44:af:cd:24:a0:6c:ec @@ -6232,7 +6232,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertAssuredIDRootG3" +CKA_LABEL UTF8 "DigiCert Assured ID Root G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\145\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -6300,7 +6300,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCertAssuredIDRootG3" +# Trust for "DigiCert Assured ID Root G3" # Issuer: CN=DigiCert Assured ID Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:0b:a1:5a:fa:1d:df:a0:b5:49:44:af:cd:24:a0:6c:ec # Subject: CN=DigiCert Assured ID Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -6312,7 +6312,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertAssuredIDRootG3" +CKA_LABEL UTF8 "DigiCert Assured ID Root G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \365\027\242\117\232\110\306\311\370\242\000\046\237\334\017\110 \054\253\060\211 @@ -6340,7 +6340,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCertGlobalRootG2" +# Certificate "DigiCert Global Root G2" # # Issuer: CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:03:3a:f1:e6:a7:11:a9:a0:bb:28:64:b1:1d:09:fa:e5 @@ -6353,7 +6353,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertGlobalRootG2" +CKA_LABEL UTF8 "DigiCert Global Root G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -6442,7 +6442,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCertGlobalRootG2" +# Trust for "DigiCert Global Root G2" # Issuer: CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:03:3a:f1:e6:a7:11:a9:a0:bb:28:64:b1:1d:09:fa:e5 # Subject: CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -6454,7 +6454,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertGlobalRootG2" +CKA_LABEL UTF8 "DigiCert Global Root G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \337\074\044\371\277\326\146\166\033\046\200\163\376\006\321\314 \215\117\202\244 @@ -6482,7 +6482,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCertGlobalRootG3" +# Certificate "DigiCert Global Root G3" # # Issuer: CN=DigiCert Global Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:05:55:56:bc:f2:5e:a4:35:35:c3:a4:0f:d5:ab:45:72 @@ -6495,7 +6495,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertGlobalRootG3" +CKA_LABEL UTF8 "DigiCert Global Root G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -6563,7 +6563,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCertGlobalRootG3" +# Trust for "DigiCert Global Root G3" # Issuer: CN=DigiCert Global Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:05:55:56:bc:f2:5e:a4:35:35:c3:a4:0f:d5:ab:45:72 # Subject: CN=DigiCert Global Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -6575,7 +6575,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertGlobalRootG3" +CKA_LABEL UTF8 "DigiCert Global Root G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \176\004\336\211\152\076\146\155\000\346\207\323\077\372\331\073 \350\075\064\236 @@ -6603,7 +6603,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCertTrustedRootG4" +# Certificate "DigiCert Trusted Root G4" # # Issuer: CN=DigiCert Trusted Root G4,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:05:9b:1b:57:9e:8e:21:32:e2:39:07:bd:a7:77:75:5c @@ -6616,7 +6616,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertTrustedRootG4" +CKA_LABEL UTF8 "DigiCert Trusted Root G4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -6737,7 +6737,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCertTrustedRootG4" +# Trust for "DigiCert Trusted Root G4" # Issuer: CN=DigiCert Trusted Root G4,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:05:9b:1b:57:9e:8e:21:32:e2:39:07:bd:a7:77:75:5c # Subject: CN=DigiCert Trusted Root G4,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -6749,7 +6749,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCertTrustedRootG4" +CKA_LABEL UTF8 "DigiCert Trusted Root G4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \335\373\026\315\111\061\311\163\242\003\175\077\310\072\115\175 \167\135\005\344 @@ -6777,7 +6777,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "AGESIC_ACRN" +# Certificate "Autoridad Certificadora Raíz Nacional de Uruguay" # # Issuer: C=UY,O=AGESIC,CN=Autoridad Certificadora Ra..z Nacional de Uruguay # Serial Number:02:ee:00:9b:66:d8:6a:1d:67:fe:da:8a:25:6f:21:5a:75:1b @@ -6790,7 +6790,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "AGESIC_ACRN" +CKA_LABEL UTF8 "Autoridad Certificadora Raíz Nacional de Uruguay" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\072\060\070\006\003\125\004\003\014\061\101\165\164 @@ -6926,7 +6926,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "AGESIC_ACRN" +# Trust for "Autoridad Certificadora Raíz Nacional de Uruguay" # Issuer: C=UY,O=AGESIC,CN=Autoridad Certificadora Ra..z Nacional de Uruguay # Serial Number:02:ee:00:9b:66:d8:6a:1d:67:fe:da:8a:25:6f:21:5a:75:1b # Subject: C=UY,O=AGESIC,CN=Autoridad Certificadora Ra..z Nacional de Uruguay @@ -6938,7 +6938,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "AGESIC_ACRN" +CKA_LABEL UTF8 "Autoridad Certificadora Raíz Nacional de Uruguay" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \172\034\335\343\322\031\176\161\067\103\075\077\231\300\263\151 \367\006\307\111 @@ -6965,7 +6965,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "KIRSA_SZAFIRroot_ca" +# Certificate "SZAFIR ROOT CA" # # Issuer: CN=SZAFIR ROOT CA,O=Krajowa Izba Rozliczeniowa S.A.,C=PL # Serial Number:00:e6:09:fe:7a:ea:00:68:8c:e0:24:b4:ed:20:1b:1f:ef:52:b4:44:d1 @@ -6978,7 +6978,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "KIRSA_SZAFIRroot_ca" +CKA_LABEL UTF8 "SZAFIR ROOT CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\013\060\011\006\003\125\004\006\023\002\120\114\061 @@ -7063,7 +7063,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "KIRSA_SZAFIRroot_ca" +# Trust for "SZAFIR ROOT CA" # Issuer: CN=SZAFIR ROOT CA,O=Krajowa Izba Rozliczeniowa S.A.,C=PL # Serial Number:00:e6:09:fe:7a:ea:00:68:8c:e0:24:b4:ed:20:1b:1f:ef:52:b4:44:d1 # Subject: CN=SZAFIR ROOT CA,O=Krajowa Izba Rozliczeniowa S.A.,C=PL @@ -7075,7 +7075,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "KIRSA_SZAFIRroot_ca" +CKA_LABEL UTF8 "SZAFIR ROOT CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \323\356\373\313\274\364\230\147\203\206\046\342\073\265\234\240 \036\060\135\267 @@ -7102,7 +7102,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TMCA_TMCArootca" +# Certificate "TM Applied Business Root Certificate" # # Issuer: CN=TM Applied Business Root Certificate,OU=TM Applied Business Certification Authority,O=TM,C=my # Serial Number: 1 (0x1) @@ -7115,7 +7115,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TMCA_TMCArootca" +CKA_LABEL UTF8 "TM Applied Business Root Certificate" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\177\061\013\060\011\006\003\125\004\006\023\002\155\171\061 @@ -7228,7 +7228,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TMCA_TMCArootca" +# Trust for "TM Applied Business Root Certificate" # Issuer: CN=TM Applied Business Root Certificate,OU=TM Applied Business Certification Authority,O=TM,C=my # Serial Number: 1 (0x1) # Subject: CN=TM Applied Business Root Certificate,OU=TM Applied Business Certification Authority,O=TM,C=my @@ -7240,7 +7240,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TMCA_TMCArootca" +CKA_LABEL UTF8 "TM Applied Business Root Certificate" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \231\127\305\077\305\237\270\347\071\367\244\267\247\016\233\216 \145\237\040\214 @@ -7269,7 +7269,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TcTrust_TSYSTEMSGlobalRoot_Class_2" +# Certificate "T-TeleSec GlobalRoot Class 2" # # Issuer: CN=T-TeleSec GlobalRoot Class 2,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE # Serial Number: 1 (0x1) @@ -7282,7 +7282,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TcTrust_TSYSTEMSGlobalRoot_Class_2" +CKA_LABEL UTF8 "T-TeleSec GlobalRoot Class 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\202\061\013\060\011\006\003\125\004\006\023\002\104\105 @@ -7377,7 +7377,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TcTrust_TSYSTEMSGlobalRoot_Class_2" +# Trust for "T-TeleSec GlobalRoot Class 2" # Issuer: CN=T-TeleSec GlobalRoot Class 2,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE # Serial Number: 1 (0x1) # Subject: CN=T-TeleSec GlobalRoot Class 2,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE @@ -7389,7 +7389,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TcTrust_TSYSTEMSGlobalRoot_Class_2" +CKA_LABEL UTF8 "T-TeleSec GlobalRoot Class 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \131\015\055\175\210\117\100\056\141\176\245\142\062\027\145\317 \027\330\224\351 @@ -7418,7 +7418,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "eTurga_Etugra_Root" +# Certificate "E-Tugra Certification Authority" # # Issuer: CN=E-Tugra Certification Authority,OU=E-Tugra Sertifikasyon Merkezi,O=E-Tu..ra EBG Bili..im Teknolojileri ve Hizmetleri A....,L=Ankara,C=TR # Serial Number:6a:68:3e:9c:51:9b:cb:53 @@ -7431,7 +7431,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "eTurga_Etugra_Root" +CKA_LABEL UTF8 "E-Tugra Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\262\061\013\060\011\006\003\125\004\006\023\002\124\122 @@ -7572,7 +7572,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "eTurga_Etugra_Root" +# Trust for "E-Tugra Certification Authority" # Issuer: CN=E-Tugra Certification Authority,OU=E-Tugra Sertifikasyon Merkezi,O=E-Tu..ra EBG Bili..im Teknolojileri ve Hizmetleri A....,L=Ankara,C=TR # Serial Number:6a:68:3e:9c:51:9b:cb:53 # Subject: CN=E-Tugra Certification Authority,OU=E-Tugra Sertifikasyon Merkezi,O=E-Tu..ra EBG Bili..im Teknolojileri ve Hizmetleri A....,L=Ankara,C=TR @@ -7584,7 +7584,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "eTurga_Etugra_Root" +CKA_LABEL UTF8 "E-Tugra Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \121\306\347\010\111\006\156\363\222\324\134\240\015\155\243\142 \217\303\122\071 @@ -7616,7 +7616,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "JapanGov_GOVT_JPNApplicationCA2_Root" +# Certificate "GPKI ApplicationCA2 Root" # # Issuer: CN=ApplicationCA2 Root,OU=GPKI,O=Japanese Government,C=JP # Serial Number:12537282828 @@ -7629,7 +7629,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "JapanGov_GOVT_JPNApplicationCA2_Root" +CKA_LABEL UTF8 "GPKI ApplicationCA2 Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -7721,7 +7721,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "JapanGov_GOVT_JPNApplicationCA2_Root" +# Trust for "GPKI ApplicationCA2 Root" # Issuer: CN=ApplicationCA2 Root,OU=GPKI,O=Japanese Government,C=JP # Serial Number:12537282828 # Subject: CN=ApplicationCA2 Root,OU=GPKI,O=Japanese Government,C=JP @@ -7733,7 +7733,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "JapanGov_GOVT_JPNApplicationCA2_Root" +CKA_LABEL UTF8 "GPKI ApplicationCA2 Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \360\017\303\175\152\034\222\141\373\153\301\302\030\111\214\132 \244\334\121\373 @@ -7759,7 +7759,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ADOCA_ADOCA02" +# Certificate "Australian Defence Organisation (ADO) Certificate Authority 02" # # Issuer: CN=ADOCA02,OU=CAs,OU=PKI,OU=DoD,O=GOV,C=AU # Serial Number: 1813 (0x715) @@ -7772,7 +7772,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ADOCA_ADOCA02" +CKA_LABEL UTF8 "Australian Defence Organisation (ADO) Certificate Authority 02" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\127\061\013\060\011\006\003\125\004\006\023\002\101\125\061 @@ -7862,7 +7862,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ADOCA_ADOCA02" +# Trust for "Australian Defence Organisation (ADO) Certificate Authority 02" # Issuer: CN=ADOCA02,OU=CAs,OU=PKI,OU=DoD,O=GOV,C=AU # Serial Number: 1813 (0x715) # Subject: CN=ADOCA02,OU=CAs,OU=PKI,OU=DoD,O=GOV,C=AU @@ -7874,7 +7874,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ADOCA_ADOCA02" +CKA_LABEL UTF8 "Australian Defence Organisation (ADO) Certificate Authority 02" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \204\102\235\237\342\347\072\015\310\252\012\340\251\002\362\164 \231\063\376\002 @@ -7900,7 +7900,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "OATI_oati_ca1" +# Certificate "OATI WebCARES Root CA" # # Issuer: CN=OATI WebCARES Root CA,O=Open Access Technology International Inc,L=Minneapolis,ST=MN,C=US # Serial Number:02:57:62:06:6a:75:60:87:4f:90:04:bf:a1:c8:28:41 @@ -7913,7 +7913,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "OATI_oati_ca1" +CKA_LABEL UTF8 "OATI WebCARES Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -8116,7 +8116,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "OATI_oati_ca1" +# Trust for "OATI WebCARES Root CA" # Issuer: CN=OATI WebCARES Root CA,O=Open Access Technology International Inc,L=Minneapolis,ST=MN,C=US # Serial Number:02:57:62:06:6a:75:60:87:4f:90:04:bf:a1:c8:28:41 # Subject: CN=OATI WebCARES Root CA,O=Open Access Technology International Inc,L=Minneapolis,ST=MN,C=US @@ -8128,7 +8128,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "OATI_oati_ca1" +CKA_LABEL UTF8 "OATI WebCARES Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \113\153\322\323\210\116\106\310\014\342\271\142\274\131\214\331 \325\330\100\023 @@ -8158,7 +8158,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GlobalS_globalsign_root-r5" +# Certificate "GlobalSign ECC Root CA - R5" # # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5 # Serial Number:60:59:49:e0:26:2e:bb:55:f9:0a:77:8a:71:f9:4a:d8:6c @@ -8171,7 +8171,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_globalsign_root-r5" +CKA_LABEL UTF8 "GlobalSign ECC Root CA - R5" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157 @@ -8235,7 +8235,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GlobalS_globalsign_root-r5" +# Trust for "GlobalSign ECC Root CA - R5" # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5 # Serial Number:60:59:49:e0:26:2e:bb:55:f9:0a:77:8a:71:f9:4a:d8:6c # Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5 @@ -8247,7 +8247,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_globalsign_root-r5" +CKA_LABEL UTF8 "GlobalSign ECC Root CA - R5" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \037\044\306\060\315\244\030\357\040\151\377\255\117\335\137\106 \072\033\151\252 @@ -8274,7 +8274,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GlobalS_globalsign_root-r4" +# Certificate "Google Trust Services - GlobalSign ECC Root CA - R4" # # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4 # Serial Number:2a:38:a4:1c:96:0a:04:de:42:b2:28:a5:0b:e8:34:98:02 @@ -8287,7 +8287,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_globalsign_root-r4" +CKA_LABEL UTF8 "Google Trust Services - GlobalSign ECC Root CA - R4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157 @@ -8347,7 +8347,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GlobalS_globalsign_root-r4" +# Trust for "Google Trust Services - GlobalSign ECC Root CA - R4" # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4 # Serial Number:2a:38:a4:1c:96:0a:04:de:42:b2:28:a5:0b:e8:34:98:02 # Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4 @@ -8359,7 +8359,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_globalsign_root-r4" +CKA_LABEL UTF8 "Google Trust Services - GlobalSign ECC Root CA - R4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \151\151\126\056\100\200\364\044\241\347\031\237\024\272\363\356 \130\253\152\273 @@ -8386,7 +8386,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "QuoVadis_qvrca1g3" +# Certificate "QuoVadis Root CA 1 G3" # # Issuer: CN=QuoVadis Root CA 1 G3,O=QuoVadis Limited,C=BM # Serial Number:78:58:5f:2e:ad:2c:19:4b:e3:37:07:35:34:13:28:b5:96:d4:65:93 @@ -8399,7 +8399,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca1g3" +CKA_LABEL UTF8 "QuoVadis Root CA 1 G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\110\061\013\060\011\006\003\125\004\006\023\002\102\115\061 @@ -8513,7 +8513,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "QuoVadis_qvrca1g3" +# Trust for "QuoVadis Root CA 1 G3" # Issuer: CN=QuoVadis Root CA 1 G3,O=QuoVadis Limited,C=BM # Serial Number:78:58:5f:2e:ad:2c:19:4b:e3:37:07:35:34:13:28:b5:96:d4:65:93 # Subject: CN=QuoVadis Root CA 1 G3,O=QuoVadis Limited,C=BM @@ -8525,7 +8525,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca1g3" +CKA_LABEL UTF8 "QuoVadis Root CA 1 G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \033\216\352\127\226\051\032\311\071\352\270\012\201\032\163\163 \300\223\171\147 @@ -8551,7 +8551,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "QuoVadis_qvrca2g3" +# Certificate "QuoVadis Root CA 2 G3" # # Issuer: CN=QuoVadis Root CA 2 G3,O=QuoVadis Limited,C=BM # Serial Number:44:57:34:24:5b:81:89:9b:35:f2:ce:b8:2b:3b:5b:a7:26:f0:75:28 @@ -8564,7 +8564,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca2g3" +CKA_LABEL UTF8 "QuoVadis Root CA 2 G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\110\061\013\060\011\006\003\125\004\006\023\002\102\115\061 @@ -8678,7 +8678,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "QuoVadis_qvrca2g3" +# Trust for "QuoVadis Root CA 2 G3" # Issuer: CN=QuoVadis Root CA 2 G3,O=QuoVadis Limited,C=BM # Serial Number:44:57:34:24:5b:81:89:9b:35:f2:ce:b8:2b:3b:5b:a7:26:f0:75:28 # Subject: CN=QuoVadis Root CA 2 G3,O=QuoVadis Limited,C=BM @@ -8690,7 +8690,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca2g3" +CKA_LABEL UTF8 "QuoVadis Root CA 2 G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \011\074\141\363\213\213\334\175\125\337\165\070\002\005\000\341 \045\365\310\066 @@ -8716,7 +8716,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "QuoVadis_qvrca3g3" +# Certificate "QuoVadis Root CA 3 G3" # # Issuer: CN=QuoVadis Root CA 3 G3,O=QuoVadis Limited,C=BM # Serial Number:2e:f5:9b:02:28:a7:db:7a:ff:d5:a3:a9:ee:bd:03:a0:cf:12:6a:1d @@ -8729,7 +8729,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca3g3" +CKA_LABEL UTF8 "QuoVadis Root CA 3 G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\110\061\013\060\011\006\003\125\004\006\023\002\102\115\061 @@ -8843,7 +8843,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "QuoVadis_qvrca3g3" +# Trust for "QuoVadis Root CA 3 G3" # Issuer: CN=QuoVadis Root CA 3 G3,O=QuoVadis Limited,C=BM # Serial Number:2e:f5:9b:02:28:a7:db:7a:ff:d5:a3:a9:ee:bd:03:a0:cf:12:6a:1d # Subject: CN=QuoVadis Root CA 3 G3,O=QuoVadis Limited,C=BM @@ -8855,7 +8855,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca3g3" +CKA_LABEL UTF8 "QuoVadis Root CA 3 G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \110\022\275\222\074\250\304\071\006\347\060\155\047\226\346\244 \317\042\056\175 @@ -8881,7 +8881,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Entrust_ENTRUST_ec1" +# Certificate "Entrust Root Certification Authority - EC1" # # Issuer: CN=Entrust Root Certification Authority - EC1,OU="(c) 2012 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US # Serial Number:00:a6:8b:79:29:00:00:00:00:50:d0:91:f9 @@ -8894,7 +8894,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_ENTRUST_ec1" +CKA_LABEL UTF8 "Entrust Root Certification Authority - EC1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\277\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -8984,7 +8984,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Entrust_ENTRUST_ec1" +# Trust for "Entrust Root Certification Authority - EC1" # Issuer: CN=Entrust Root Certification Authority - EC1,OU="(c) 2012 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US # Serial Number:00:a6:8b:79:29:00:00:00:00:50:d0:91:f9 # Subject: CN=Entrust Root Certification Authority - EC1,OU="(c) 2012 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US @@ -8996,7 +8996,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_ENTRUST_ec1" +CKA_LABEL UTF8 "Entrust Root Certification Authority - EC1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \040\330\006\100\337\233\045\365\022\045\072\021\352\367\131\212 \353\024\265\107 @@ -9029,7 +9029,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Symantec_SYMC_PCA3_G6" +# Certificate "Symantec Class 3 Public Primary Certification Authority - G6" # # Issuer: CN=Symantec Class 3 Public Primary Certification Authority - G6,OU=Symantec Trust Network,O=Symantec Corporation,C=US # Serial Number:65:63:71:85:d3:6f:45:c6:8f:7f:31:f9:09:87:92:82 @@ -9042,7 +9042,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Symantec_SYMC_PCA3_G6" +CKA_LABEL UTF8 "Symantec Class 3 Public Primary Certification Authority - G6" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\224\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -9175,7 +9175,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Symantec_SYMC_PCA3_G6" +# Trust for "Symantec Class 3 Public Primary Certification Authority - G6" # Issuer: CN=Symantec Class 3 Public Primary Certification Authority - G6,OU=Symantec Trust Network,O=Symantec Corporation,C=US # Serial Number:65:63:71:85:d3:6f:45:c6:8f:7f:31:f9:09:87:92:82 # Subject: CN=Symantec Class 3 Public Primary Certification Authority - G6,OU=Symantec Trust Network,O=Symantec Corporation,C=US @@ -9187,7 +9187,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Symantec_SYMC_PCA3_G6" +CKA_LABEL UTF8 "Symantec Class 3 Public Primary Certification Authority - G6" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \046\241\154\043\132\044\162\042\233\043\142\200\045\274\200\227 \310\205\044\241 @@ -9218,7 +9218,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Symantec_SYMC_PCA_3_G4" +# Certificate "Symantec Class 3 Public Primary Certification Authority - G4" # # Issuer: CN=Symantec Class 3 Public Primary Certification Authority - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US # Serial Number:4c:79:b5:9a:28:9c:76:31:64:f5:89:44:d0:91:02:de @@ -9231,7 +9231,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Symantec_SYMC_PCA_3_G4" +CKA_LABEL UTF8 "Symantec Class 3 Public Primary Certification Authority - G4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\224\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -9311,7 +9311,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Symantec_SYMC_PCA_3_G4" +# Trust for "Symantec Class 3 Public Primary Certification Authority - G4" # Issuer: CN=Symantec Class 3 Public Primary Certification Authority - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US # Serial Number:4c:79:b5:9a:28:9c:76:31:64:f5:89:44:d0:91:02:de # Subject: CN=Symantec Class 3 Public Primary Certification Authority - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US @@ -9323,7 +9323,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Symantec_SYMC_PCA_3_G4" +CKA_LABEL UTF8 "Symantec Class 3 Public Primary Certification Authority - G4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \130\325\055\271\063\001\244\375\051\032\214\226\105\240\217\356 \177\122\222\202 @@ -9354,7 +9354,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CFCA_CFCA_EV_root" +# Certificate "CFCA EV ROOT" # # Issuer: CN=CFCA EV ROOT,O=China Financial Certification Authority,C=CN # Serial Number: 407555286 (0x184accd6) @@ -9367,7 +9367,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CFCA_CFCA_EV_root" +CKA_LABEL UTF8 "CFCA EV ROOT" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\126\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -9485,7 +9485,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CFCA_CFCA_EV_root" +# Trust for "CFCA EV ROOT" # Issuer: CN=CFCA EV ROOT,O=China Financial Certification Authority,C=CN # Serial Number: 407555286 (0x184accd6) # Subject: CN=CFCA EV ROOT,O=China Financial Certification Authority,C=CN @@ -9497,7 +9497,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CFCA_CFCA_EV_root" +CKA_LABEL UTF8 "CFCA EV ROOT" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \342\270\051\113\125\204\253\153\130\302\220\106\154\254\077\270 \071\217\204\203 @@ -9523,7 +9523,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Harica_Harica_root" +# Certificate "Hellenic Academic and Research Institutions RootCA 2011" # # Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR # Serial Number: 0 (0x0) @@ -9536,7 +9536,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Harica_Harica_root" +CKA_LABEL UTF8 "Hellenic Academic and Research Institutions RootCA 2011" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\225\061\013\060\011\006\003\125\004\006\023\002\107\122 @@ -9640,7 +9640,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Harica_Harica_root" +# Trust for "Hellenic Academic and Research Institutions RootCA 2011" # Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR # Serial Number: 0 (0x0) # Subject: CN=Hellenic Academic and Research Institutions RootCA 2011,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR @@ -9652,7 +9652,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Harica_Harica_root" +CKA_LABEL UTF8 "Hellenic Academic and Research Institutions RootCA 2011" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \376\105\145\233\171\003\133\230\241\141\265\121\056\254\332\130 \011\110\042\115 @@ -9682,7 +9682,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Athens_Athex_root" +# Certificate "Athex Root CA" # # Issuer: CN=ATHEX Root CA,O=Athens Exchange S.A.,C=GR # Serial Number: 10012 (0x271c) @@ -9695,7 +9695,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Athens_Athex_root" +CKA_LABEL UTF8 "Athex Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\104\061\013\060\011\006\003\125\004\006\023\002\107\122\061 @@ -9773,7 +9773,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Athens_Athex_root" +# Trust for "Athex Root CA" # Issuer: CN=ATHEX Root CA,O=Athens Exchange S.A.,C=GR # Serial Number: 10012 (0x271c) # Subject: CN=ATHEX Root CA,O=Athens Exchange S.A.,C=GR @@ -9785,7 +9785,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Athens_Athex_root" +CKA_LABEL UTF8 "Athex Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \333\053\173\103\115\373\177\301\313\131\046\354\135\225\041\376 \065\017\362\171 @@ -9810,7 +9810,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ACCV_ACCV_root" +# Certificate "ACCVRAIZ1" # # Issuer: C=ES,O=ACCV,OU=PKIACCV,CN=ACCVRAIZ1 # Serial Number:5e:c3:b7:a6:43:7f:a4:e0 @@ -9823,7 +9823,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ACCV_ACCV_root" +CKA_LABEL UTF8 "ACCVRAIZ1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\102\061\022\060\020\006\003\125\004\003\014\011\101\103\103 @@ -9975,7 +9975,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ACCV_ACCV_root" +# Trust for "ACCVRAIZ1" # Issuer: C=ES,O=ACCV,OU=PKIACCV,CN=ACCVRAIZ1 # Serial Number:5e:c3:b7:a6:43:7f:a4:e0 # Subject: C=ES,O=ACCV,OU=PKIACCV,CN=ACCVRAIZ1 @@ -9987,7 +9987,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ACCV_ACCV_root" +CKA_LABEL UTF8 "ACCVRAIZ1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \223\005\172\210\025\306\117\316\210\057\372\221\026\122\050\170 \274\123\144\027 @@ -10012,7 +10012,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Halcom_Halcom_Root_CA" +# Certificate "Halcom Root CA" # # Issuer: CN=Halcom Root CA,O=Halcom,C=SI # Serial Number: 504275 (0x7b1d3) @@ -10025,7 +10025,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Halcom_Halcom_Root_CA" +CKA_LABEL UTF8 "Halcom Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\067\061\013\060\011\006\003\125\004\006\023\002\123\111\061 @@ -10100,7 +10100,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Halcom_Halcom_Root_CA" +# Trust for "Halcom Root CA" # Issuer: CN=Halcom Root CA,O=Halcom,C=SI # Serial Number: 504275 (0x7b1d3) # Subject: CN=Halcom Root CA,O=Halcom,C=SI @@ -10112,7 +10112,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Halcom_Halcom_Root_CA" +CKA_LABEL UTF8 "Halcom Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \123\133\000\026\162\253\277\173\154\302\124\005\256\115\044\376 \003\077\321\314 @@ -10136,7 +10136,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CFCA_root1" +# Certificate "China Financial CA" # # Issuer: O=CFCA GT CA,C=CN # Serial Number: 429472831 (0x19993c3f) @@ -10149,7 +10149,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CFCA_root1" +CKA_LABEL UTF8 "China Financial CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\042\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -10222,7 +10222,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CFCA_root1" +# Trust for "China Financial CA" # Issuer: O=CFCA GT CA,C=CN # Serial Number: 429472831 (0x19993c3f) # Subject: O=CFCA GT CA,C=CN @@ -10234,7 +10234,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CFCA_root1" +CKA_LABEL UTF8 "China Financial CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \352\275\242\100\104\012\273\326\224\223\012\001\320\227\144\306 \302\327\171\146 @@ -10257,7 +10257,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "DigID_root1" +# Certificate "Digidentity BV" # # Issuer: CN=Digidentity L3 Root CA - G2,O=Digidentity B.V.,C=NL # Serial Number: 1 (0x1) @@ -10270,7 +10270,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigID_root1" +CKA_LABEL UTF8 "Digidentity BV" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\116\061\013\060\011\006\003\125\004\006\023\002\116\114\061 @@ -10387,7 +10387,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "DigID_root1" +# Trust for "Digidentity BV" # Issuer: CN=Digidentity L3 Root CA - G2,O=Digidentity B.V.,C=NL # Serial Number: 1 (0x1) # Subject: CN=Digidentity L3 Root CA - G2,O=Digidentity B.V.,C=NL @@ -10399,7 +10399,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigID_root1" +CKA_LABEL UTF8 "Digidentity BV" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \361\070\243\060\244\352\230\153\353\122\013\261\020\065\207\156 \373\235\177\034 @@ -10424,7 +10424,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Siths_root1" +# Certificate "Inera AB" # # Issuer: CN=SITHS Root CA v1,O=Inera AB,C=SE # Serial Number:00:90:66:61:a8:62:3d:65:44:77:04:3f:71:9a:c3:97:0c @@ -10437,7 +10437,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Siths_root1" +CKA_LABEL UTF8 "Inera AB" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\073\061\013\060\011\006\003\125\004\006\023\002\123\105\061 @@ -10552,7 +10552,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Siths_root1" +# Trust for "Inera AB" # Issuer: CN=SITHS Root CA v1,O=Inera AB,C=SE # Serial Number:00:90:66:61:a8:62:3d:65:44:77:04:3f:71:9a:c3:97:0c # Subject: CN=SITHS Root CA v1,O=Inera AB,C=SE @@ -10564,7 +10564,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Siths_root1" +CKA_LABEL UTF8 "Inera AB" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \130\137\170\165\276\347\103\076\260\171\352\253\175\005\273\017 \172\362\274\314 @@ -10589,7 +10589,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "MOGAHA_root2" +# Certificate "GPKIRootCA1" # # Issuer: CN=GPKIRootCA1,OU=GPKI,O=Government of Korea,C=KR # Serial Number: 1 (0x1) @@ -10602,7 +10602,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "MOGAHA_root2" +CKA_LABEL UTF8 "GPKIRootCA1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\013\060\011\006\003\125\004\006\023\002\113\122\061 @@ -10685,7 +10685,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "MOGAHA_root2" +# Trust for "GPKIRootCA1" # Issuer: CN=GPKIRootCA1,OU=GPKI,O=Government of Korea,C=KR # Serial Number: 1 (0x1) # Subject: CN=GPKIRootCA1,OU=GPKI,O=Government of Korea,C=KR @@ -10697,7 +10697,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "MOGAHA_root2" +CKA_LABEL UTF8 "GPKIRootCA1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \166\022\355\236\111\263\145\264\332\323\022\014\001\346\003\164 \215\256\214\360 @@ -10723,7 +10723,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "dtrust_nonevroot" +# Certificate "D-TRUST Root Class 3 CA 2 2009" # # Issuer: CN=D-TRUST Root Class 3 CA 2 2009,O=D-Trust GmbH,C=DE # Serial Number: 623603 (0x983f3) @@ -10736,7 +10736,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "dtrust_nonevroot" +CKA_LABEL UTF8 "D-TRUST Root Class 3 CA 2 2009" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\115\061\013\060\011\006\003\125\004\006\023\002\104\105\061 @@ -10830,7 +10830,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "dtrust_nonevroot" +# Trust for "D-TRUST Root Class 3 CA 2 2009" # Issuer: CN=D-TRUST Root Class 3 CA 2 2009,O=D-Trust GmbH,C=DE # Serial Number: 623603 (0x983f3) # Subject: CN=D-TRUST Root Class 3 CA 2 2009,O=D-Trust GmbH,C=DE @@ -10842,7 +10842,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "dtrust_nonevroot" +CKA_LABEL UTF8 "D-TRUST Root Class 3 CA 2 2009" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \130\350\253\260\066\025\063\373\200\367\233\033\155\051\323\377 \215\137\000\360 @@ -10867,7 +10867,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "dtrust_evroot" +# Certificate "D-TRUST Root Class 3 CA 2 EV 2009" # # Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009,O=D-Trust GmbH,C=DE # Serial Number: 623604 (0x983f4) @@ -10880,7 +10880,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "dtrust_evroot" +CKA_LABEL UTF8 "D-TRUST Root Class 3 CA 2 EV 2009" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\013\060\011\006\003\125\004\006\023\002\104\105\061 @@ -10977,7 +10977,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "dtrust_evroot" +# Trust for "D-TRUST Root Class 3 CA 2 EV 2009" # Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009,O=D-Trust GmbH,C=DE # Serial Number: 623604 (0x983f4) # Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009,O=D-Trust GmbH,C=DE @@ -10989,7 +10989,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "dtrust_evroot" +CKA_LABEL UTF8 "D-TRUST Root Class 3 CA 2 EV 2009" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \226\311\033\013\225\264\020\230\102\372\320\330\042\171\376\140 \372\271\026\203 @@ -11015,7 +11015,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Brazil_root1" +# Certificate "?Autoridade Certificadora Raiz Brasileira v2" # # Issuer: CN=Autoridade Certificadora Raiz Brasileira v2,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR # Serial Number: 1 (0x1) @@ -11028,7 +11028,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Brazil_root1" +CKA_LABEL UTF8 "?Autoridade Certificadora Raiz Brasileira v2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\227\061\013\060\011\006\003\125\004\006\023\002\102\122 @@ -11171,7 +11171,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Brazil_root1" +# Trust for "?Autoridade Certificadora Raiz Brasileira v2" # Issuer: CN=Autoridade Certificadora Raiz Brasileira v2,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR # Serial Number: 1 (0x1) # Subject: CN=Autoridade Certificadora Raiz Brasileira v2,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR @@ -11183,7 +11183,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Brazil_root1" +CKA_LABEL UTF8 "?Autoridade Certificadora Raiz Brasileira v2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \251\202\056\154\151\063\306\074\024\214\055\312\244\112\134\361 \252\322\304\056 @@ -11213,7 +11213,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SwissCom_Root2" +# Certificate "?Swisscom Root CA 2" # # Issuer: CN=Swisscom Root CA 2,OU=Digital Certificate Services,O=Swisscom,C=ch # Serial Number:1e:9e:28:e8:48:f2:e5:ef:c3:7c:4a:1e:5a:18:67:b6 @@ -11226,7 +11226,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissCom_Root2" +CKA_LABEL UTF8 "?Swisscom Root CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\144\061\013\060\011\006\003\125\004\006\023\002\143\150\061 @@ -11351,7 +11351,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SwissCom_Root2" +# Trust for "?Swisscom Root CA 2" # Issuer: CN=Swisscom Root CA 2,OU=Digital Certificate Services,O=Swisscom,C=ch # Serial Number:1e:9e:28:e8:48:f2:e5:ef:c3:7c:4a:1e:5a:18:67:b6 # Subject: CN=Swisscom Root CA 2,OU=Digital Certificate Services,O=Swisscom,C=ch @@ -11363,7 +11363,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissCom_Root2" +CKA_LABEL UTF8 "?Swisscom Root CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \167\107\117\306\060\344\017\114\107\144\077\204\272\270\306\225 \112\212\101\354 @@ -11391,7 +11391,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GovFrance_Root1" +# Certificate "?IGC/A AC racine Etat francais" # # Issuer: CN=IGC/A AC racine Etat francais,OU=0002 130007669,O=ANSSI,C=FR # Serial Number:11:21:85:0c:b3:9c:6a:32:fa:be:67:1b:81:3f:a4:86:15:8f @@ -11404,7 +11404,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovFrance_Root1" +CKA_LABEL UTF8 "?IGC/A AC racine Etat francais" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\136\061\013\060\011\006\003\125\004\006\023\002\106\122\061 @@ -11526,7 +11526,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GovFrance_Root1" +# Trust for "?IGC/A AC racine Etat francais" # Issuer: CN=IGC/A AC racine Etat francais,OU=0002 130007669,O=ANSSI,C=FR # Serial Number:11:21:85:0c:b3:9c:6a:32:fa:be:67:1b:81:3f:a4:86:15:8f # Subject: CN=IGC/A AC racine Etat francais,OU=0002 130007669,O=ANSSI,C=FR @@ -11538,7 +11538,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovFrance_Root1" +CKA_LABEL UTF8 "?IGC/A AC racine Etat francais" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \032\311\057\011\352\211\342\213\022\155\372\305\036\072\367\352 \220\225\243\356 @@ -11565,7 +11565,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "PersonalID_Root1" +# Certificate "?PersonalID Trustworthy RootCA 2011" # # Issuer: CN=PersonalID Trustworthy RootCA 2011,OU=Certificate Services,O=PersonalID Ltd.,C=IL # Serial Number:58:cb:f9:64:96:71:74:95:40:f4:ad:08:ac:64:e4:e3 @@ -11578,7 +11578,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "PersonalID_Root1" +CKA_LABEL UTF8 "?PersonalID Trustworthy RootCA 2011" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\163\061\013\060\011\006\003\125\004\006\023\002\111\114\061 @@ -11711,7 +11711,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "PersonalID_Root1" +# Trust for "?PersonalID Trustworthy RootCA 2011" # Issuer: CN=PersonalID Trustworthy RootCA 2011,OU=Certificate Services,O=PersonalID Ltd.,C=IL # Serial Number:58:cb:f9:64:96:71:74:95:40:f4:ad:08:ac:64:e4:e3 # Subject: CN=PersonalID Trustworthy RootCA 2011,OU=Certificate Services,O=PersonalID Ltd.,C=IL @@ -11723,7 +11723,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "PersonalID_Root1" +CKA_LABEL UTF8 "?PersonalID Trustworthy RootCA 2011" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \103\224\316\061\046\377\032\042\114\335\115\356\264\364\354\035 \243\150\357\152 @@ -11752,7 +11752,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Actalis_Root1" +# Certificate "Actalis Authentication Root CA" # # Issuer: CN=Actalis Authentication Root CA,O=Actalis S.p.A./03358520967,L=Milan,C=IT # Serial Number:57:0a:11:97:42:c4:e3:cc @@ -11765,7 +11765,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Actalis_Root1" +CKA_LABEL UTF8 "Actalis Authentication Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\153\061\013\060\011\006\003\125\004\006\023\002\111\124\061 @@ -11887,7 +11887,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Actalis_Root1" +# Trust for "Actalis Authentication Root CA" # Issuer: CN=Actalis Authentication Root CA,O=Actalis S.p.A./03358520967,L=Milan,C=IT # Serial Number:57:0a:11:97:42:c4:e3:cc # Subject: CN=Actalis Authentication Root CA,O=Actalis S.p.A./03358520967,L=Milan,C=IT @@ -11899,7 +11899,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Actalis_Root1" +CKA_LABEL UTF8 "Actalis Authentication Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \363\163\263\207\006\132\050\204\212\362\363\112\316\031\053\335 \307\216\234\254 @@ -11926,7 +11926,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "BuyPass_Root2" +# Certificate "Buypass Class 3 Root CA" # # Issuer: CN=Buypass Class 3 Root CA,O=Buypass AS-983163327,C=NO # Serial Number: 2 (0x2) @@ -11939,7 +11939,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BuyPass_Root2" +CKA_LABEL UTF8 "Buypass Class 3 Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\116\061\013\060\011\006\003\125\004\006\023\002\116\117\061 @@ -12051,7 +12051,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "BuyPass_Root2" +# Trust for "Buypass Class 3 Root CA" # Issuer: CN=Buypass Class 3 Root CA,O=Buypass AS-983163327,C=NO # Serial Number: 2 (0x2) # Subject: CN=Buypass Class 3 Root CA,O=Buypass AS-983163327,C=NO @@ -12063,7 +12063,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BuyPass_Root2" +CKA_LABEL UTF8 "Buypass Class 3 Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \332\372\367\372\146\204\354\006\217\024\120\275\307\302\201\245 \274\251\144\127 @@ -12088,7 +12088,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "BuyPass_Root1" +# Certificate "Buypass Class 2 Root CA" # # Issuer: CN=Buypass Class 2 Root CA,O=Buypass AS-983163327,C=NO # Serial Number: 2 (0x2) @@ -12101,7 +12101,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BuyPass_Root1" +CKA_LABEL UTF8 "Buypass Class 2 Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\116\061\013\060\011\006\003\125\004\006\023\002\116\117\061 @@ -12213,7 +12213,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "BuyPass_Root1" +# Trust for "Buypass Class 2 Root CA" # Issuer: CN=Buypass Class 2 Root CA,O=Buypass AS-983163327,C=NO # Serial Number: 2 (0x2) # Subject: CN=Buypass Class 2 Root CA,O=Buypass AS-983163327,C=NO @@ -12225,7 +12225,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BuyPass_Root1" +CKA_LABEL UTF8 "Buypass Class 2 Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \111\012\165\164\336\207\012\107\376\130\356\366\307\153\353\306 \013\022\100\231 @@ -12250,7 +12250,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TcTrust_root1" +# Certificate "T-TeleSec Global Root Class 3" # # Issuer: CN=T-TeleSec GlobalRoot Class 3,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE # Serial Number: 1 (0x1) @@ -12263,7 +12263,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TcTrust_root1" +CKA_LABEL UTF8 "T-TeleSec Global Root Class 3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\202\061\013\060\011\006\003\125\004\006\023\002\104\105 @@ -12358,7 +12358,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TcTrust_root1" +# Trust for "T-TeleSec Global Root Class 3" # Issuer: CN=T-TeleSec GlobalRoot Class 3,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE # Serial Number: 1 (0x1) # Subject: CN=T-TeleSec GlobalRoot Class 3,OU=T-Systems Trust Center,O=T-Systems Enterprise Services GmbH,C=DE @@ -12370,7 +12370,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TcTrust_root1" +CKA_LABEL UTF8 "T-TeleSec Global Root Class 3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \125\246\162\076\313\362\354\315\303\043\164\160\031\235\052\276 \021\343\201\321 @@ -12399,7 +12399,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "BIT_root2" +# Certificate "Swiss Government Root CA II" # # Issuer: CN=Swiss Government Root CA II,OU=Certification Authorities,OU=Services,O=The Federal Authorities of the Swiss Confederation,C=CH # Serial Number:0e:9f:17:99:a5:b1:3d:9c:cb:ec:06:eb:a3:f0:0e:69 @@ -12412,7 +12412,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BIT_root2" +CKA_LABEL UTF8 "Swiss Government Root CA II" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\247\061\013\060\011\006\003\125\004\006\023\002\103\110 @@ -12583,7 +12583,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "BIT_root2" +# Trust for "Swiss Government Root CA II" # Issuer: CN=Swiss Government Root CA II,OU=Certification Authorities,OU=Services,O=The Federal Authorities of the Swiss Confederation,C=CH # Serial Number:0e:9f:17:99:a5:b1:3d:9c:cb:ec:06:eb:a3:f0:0e:69 # Subject: CN=Swiss Government Root CA II,OU=Certification Authorities,OU=Services,O=The Federal Authorities of the Swiss Confederation,C=CH @@ -12595,7 +12595,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BIT_root2" +CKA_LABEL UTF8 "Swiss Government Root CA II" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \307\367\313\342\002\066\146\371\206\002\135\112\076\061\077\051 \353\014\133\070 @@ -12627,7 +12627,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "BIT_root1" +# Certificate "Swiss Government Root CA I" # # Issuer: CN=Swiss Government Root CA I,OU=Certification Authorities,OU=Services,O=The Federal Authorities of the Swiss Confederation,C=CH # Serial Number:00:fd:75:04:8d:7a:60:86:93:69:4c:aa:00:3c:65:d3:3d @@ -12640,7 +12640,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BIT_root1" +CKA_LABEL UTF8 "Swiss Government Root CA I" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\246\061\013\060\011\006\003\125\004\006\023\002\103\110 @@ -12811,7 +12811,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "BIT_root1" +# Trust for "Swiss Government Root CA I" # Issuer: CN=Swiss Government Root CA I,OU=Certification Authorities,OU=Services,O=The Federal Authorities of the Swiss Confederation,C=CH # Serial Number:00:fd:75:04:8d:7a:60:86:93:69:4c:aa:00:3c:65:d3:3d # Subject: CN=Swiss Government Root CA I,OU=Certification Authorities,OU=Services,O=The Federal Authorities of the Swiss Confederation,C=CH @@ -12823,7 +12823,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "BIT_root1" +CKA_LABEL UTF8 "Swiss Government Root CA I" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \241\130\121\207\025\145\206\316\371\304\124\342\052\261\134\130 \164\126\007\264 @@ -12855,7 +12855,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Comsign_root1" +# Certificate "ComSign Global Root CA" # # Issuer: C=IL,O=ComSign Ltd.,CN=ComSign Global Root CA # Serial Number:00:8f:61:71:15:ba:79:58:17:8c:7d:11:3a:ac:d6:db:ae @@ -12868,7 +12868,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comsign_root1" +CKA_LABEL UTF8 "ComSign Global Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\037\060\035\006\003\125\004\003\023\026\103\157\155 @@ -12992,7 +12992,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Comsign_root1" +# Trust for "ComSign Global Root CA" # Issuer: C=IL,O=ComSign Ltd.,CN=ComSign Global Root CA # Serial Number:00:8f:61:71:15:ba:79:58:17:8c:7d:11:3a:ac:d6:db:ae # Subject: C=IL,O=ComSign Ltd.,CN=ComSign Global Root CA @@ -13004,7 +13004,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comsign_root1" +CKA_LABEL UTF8 "ComSign Global Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \256\073\061\277\217\330\221\007\234\361\337\064\313\316\156\160 \323\177\265\260 @@ -13030,7 +13030,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetworkSolutions_root1" +# Certificate "Network Solutions" # # Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US # Serial Number:1c:a0:2d:c1:52:3b:6a:6d:8b:5c:1f:95:4a:ed:ac:30 @@ -13043,7 +13043,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetworkSolutions_root1" +CKA_LABEL UTF8 "Network Solutions" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -13132,7 +13132,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetworkSolutions_root1" +# Trust for "Network Solutions" # Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US # Serial Number:1c:a0:2d:c1:52:3b:6a:6d:8b:5c:1f:95:4a:ed:ac:30 # Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US @@ -13144,7 +13144,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetworkSolutions_root1" +CKA_LABEL UTF8 "Network Solutions" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \161\211\232\147\277\063\257\061\276\375\300\161\370\367\063\261 \203\205\143\062 @@ -13172,7 +13172,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Comodo_root1" +# Certificate "Sectigo (CCA)" # # Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number:20:a4:c4:7f:dd:df:e1:c7:53:63:07:13:88:77:60:12 @@ -13185,7 +13185,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_root1" +CKA_LABEL UTF8 "Sectigo (CCA)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102 @@ -13282,7 +13282,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Comodo_root1" +# Trust for "Sectigo (CCA)" # Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number:20:a4:c4:7f:dd:df:e1:c7:53:63:07:13:88:77:60:12 # Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB @@ -13294,7 +13294,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_root1" +CKA_LABEL UTF8 "Sectigo (CCA)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \356\206\223\207\377\375\203\111\253\132\321\103\042\130\207\211 \244\127\260\022 @@ -13324,7 +13324,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GovLux_root1" +# Certificate "LuxTrust Global Root CA" # # Issuer: CN=LuxTrust Global Root,O=LuxTrust s.a.,C=LU # Serial Number: 3000 (0xbb8) @@ -13337,7 +13337,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovLux_root1" +CKA_LABEL UTF8 "LuxTrust Global Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\104\061\013\060\011\006\003\125\004\006\023\002\114\125\061 @@ -13418,7 +13418,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GovLux_root1" +# Trust for "LuxTrust Global Root CA" # Issuer: CN=LuxTrust Global Root,O=LuxTrust s.a.,C=LU # Serial Number: 3000 (0xbb8) # Subject: CN=LuxTrust Global Root,O=LuxTrust s.a.,C=LU @@ -13430,7 +13430,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovLux_root1" +CKA_LABEL UTF8 "LuxTrust Global Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \311\074\064\352\220\331\023\014\017\003\000\113\230\275\213\065 \160\221\126\021 @@ -13455,7 +13455,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GovSpain_root1" +# Certificate "AC1 RAIZ MTIN" # # Issuer: C=ES,L=MADRID,O=MINISTERIO DE TRABAJO E INMIGRACION,OU=SUBDIRECCION GENERAL DE PROCESO DE DATOS,OU=PRESTADOR DE SERVICIOS DE CERTIFICACION MTIN,serialNumber=S2819001E,CN=AC1 RAIZ MTIN # Serial Number:05:0b:41:5e:82:7b @@ -13468,7 +13468,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovSpain_root1" +CKA_LABEL UTF8 "AC1 RAIZ MTIN" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\342\061\026\060\024\006\003\125\004\003\023\015\101\103 @@ -13663,7 +13663,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GovSpain_root1" +# Trust for "AC1 RAIZ MTIN" # Issuer: C=ES,L=MADRID,O=MINISTERIO DE TRABAJO E INMIGRACION,OU=SUBDIRECCION GENERAL DE PROCESO DE DATOS,OU=PRESTADOR DE SERVICIOS DE CERTIFICACION MTIN,serialNumber=S2819001E,CN=AC1 RAIZ MTIN # Serial Number:05:0b:41:5e:82:7b # Subject: C=ES,L=MADRID,O=MINISTERIO DE TRABAJO E INMIGRACION,OU=SUBDIRECCION GENERAL DE PROCESO DE DATOS,OU=PRESTADOR DE SERVICIOS DE CERTIFICACION MTIN,serialNumber=S2819001E,CN=AC1 RAIZ MTIN @@ -13675,7 +13675,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovSpain_root1" +CKA_LABEL UTF8 "AC1 RAIZ MTIN" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \152\322\073\235\304\216\067\137\205\232\331\312\265\205\062\134 \043\211\100\161 @@ -13710,7 +13710,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "msft_root1" +# Certificate "Microsoft Root Certificate Authority 2011" # # Issuer: CN=Microsoft Root Certificate Authority 2011,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:3f:8b:c8:b5:fc:9f:b2:96:43:b5:69:d6:6c:42:e1:44 @@ -13723,7 +13723,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "msft_root1" +CKA_LABEL UTF8 "Microsoft Root Certificate Authority 2011" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -13854,7 +13854,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "msft_root1" +# Trust for "Microsoft Root Certificate Authority 2011" # Issuer: CN=Microsoft Root Certificate Authority 2011,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:3f:8b:c8:b5:fc:9f:b2:96:43:b5:69:d6:6c:42:e1:44 # Subject: CN=Microsoft Root Certificate Authority 2011,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US @@ -13866,7 +13866,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "msft_root1" +CKA_LABEL UTF8 "Microsoft Root Certificate Authority 2011" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \217\103\050\212\322\162\363\020\073\157\261\102\204\205\352\060 \024\300\274\376 @@ -13896,7 +13896,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "atos_root1" +# Certificate "Atos TrustedRoot 2011" # # Issuer: C=DE,O=Atos,CN=Atos TrustedRoot 2011 # Serial Number:5c:33:cb:62:2c:5f:b3:32 @@ -13909,7 +13909,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "atos_root1" +CKA_LABEL UTF8 "Atos TrustedRoot 2011" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\074\061\036\060\034\006\003\125\004\003\014\025\101\164\157 @@ -13989,7 +13989,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "atos_root1" +# Trust for "Atos TrustedRoot 2011" # Issuer: C=DE,O=Atos,CN=Atos TrustedRoot 2011 # Serial Number:5c:33:cb:62:2c:5f:b3:32 # Subject: C=DE,O=Atos,CN=Atos TrustedRoot 2011 @@ -14001,7 +14001,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "atos_root1" +CKA_LABEL UTF8 "Atos TrustedRoot 2011" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \053\261\365\076\125\014\035\305\361\324\346\267\152\106\113\125 \006\002\254\041 @@ -14025,7 +14025,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ANCERT_root5" +# Certificate "ANCERT Certificados Notariales V2" # # Issuer: CN=ANCERT Certificados Notariales V2,O=Agencia Notarial de Certificacion S.L.U. - CIF B83395988,C=ES # Serial Number:09:bd:56:05:2a:13:16:f4:68:4f:74:0e:a9:7d:1c:48 @@ -14038,7 +14038,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANCERT_root5" +CKA_LABEL UTF8 "ANCERT Certificados Notariales V2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\174\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -14185,7 +14185,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ANCERT_root5" +# Trust for "ANCERT Certificados Notariales V2" # Issuer: CN=ANCERT Certificados Notariales V2,O=Agencia Notarial de Certificacion S.L.U. - CIF B83395988,C=ES # Serial Number:09:bd:56:05:2a:13:16:f4:68:4f:74:0e:a9:7d:1c:48 # Subject: CN=ANCERT Certificados Notariales V2,O=Agencia Notarial de Certificacion S.L.U. - CIF B83395988,C=ES @@ -14197,7 +14197,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANCERT_root5" +CKA_LABEL UTF8 "ANCERT Certificados Notariales V2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \157\142\336\270\154\205\130\132\344\056\107\215\264\327\155\263 \147\130\132\346 @@ -14226,7 +14226,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ANCERT_root4" +# Certificate "ANCERT Certificados CGN V2" # # Issuer: CN=ANCERT Certificados CGN V2,O=Agencia Notarial de Certificacion S.L.U. - CIF B83395988,C=ES # Serial Number:0f:38:8c:70:fe:a6:95:5d:e9:5d:9c:87:af:79:04:99 @@ -14239,7 +14239,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANCERT_root4" +CKA_LABEL UTF8 "ANCERT Certificados CGN V2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\165\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -14385,7 +14385,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ANCERT_root4" +# Trust for "ANCERT Certificados CGN V2" # Issuer: CN=ANCERT Certificados CGN V2,O=Agencia Notarial de Certificacion S.L.U. - CIF B83395988,C=ES # Serial Number:0f:38:8c:70:fe:a6:95:5d:e9:5d:9c:87:af:79:04:99 # Subject: CN=ANCERT Certificados CGN V2,O=Agencia Notarial de Certificacion S.L.U. - CIF B83395988,C=ES @@ -14397,7 +14397,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANCERT_root4" +CKA_LABEL UTF8 "ANCERT Certificados CGN V2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \176\261\240\102\233\345\364\050\254\053\223\227\035\174\204\110 \245\066\007\014 @@ -14426,7 +14426,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Juur-SK_EECCRCA" +# Certificate "Estonian Certification Centre Root CA" # # Issuer: E=pki@sk.ee,CN=EE Certification Centre Root CA,O=AS Sertifitseerimiskeskus,C=EE # Serial Number:54:80:f9:a0:73:ed:3f:00:4c:ca:89:d8:e3:71:e6:4a @@ -14439,7 +14439,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Juur-SK_EECCRCA" +CKA_LABEL UTF8 "Estonian Certification Centre Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\165\061\013\060\011\006\003\125\004\006\023\002\105\105\061 @@ -14537,7 +14537,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Juur-SK_EECCRCA" +# Trust for "Estonian Certification Centre Root CA" # Issuer: E=pki@sk.ee,CN=EE Certification Centre Root CA,O=AS Sertifitseerimiskeskus,C=EE # Serial Number:54:80:f9:a0:73:ed:3f:00:4c:ca:89:d8:e3:71:e6:4a # Subject: E=pki@sk.ee,CN=EE Certification Centre Root CA,O=AS Sertifitseerimiskeskus,C=EE @@ -14549,7 +14549,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Juur-SK_EECCRCA" +CKA_LABEL UTF8 "Estonian Certification Centre Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \311\250\271\347\125\200\136\130\343\123\167\247\045\353\257\303 \173\047\314\327 @@ -14578,7 +14578,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GSA_fbca256" +# Certificate "U.S Government Common Policy" # # Issuer: CN=Federal Common Policy CA,OU=FPKI,O=U.S. Government,C=US # Serial Number: 304 (0x130) @@ -14591,7 +14591,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GSA_fbca256" +CKA_LABEL UTF8 "U.S Government Common Policy" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\131\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -14690,7 +14690,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GSA_fbca256" +# Trust for "U.S Government Common Policy" # Issuer: CN=Federal Common Policy CA,OU=FPKI,O=U.S. Government,C=US # Serial Number: 304 (0x130) # Subject: CN=Federal Common Policy CA,OU=FPKI,O=U.S. Government,C=US @@ -14702,7 +14702,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GSA_fbca256" +CKA_LABEL UTF8 "U.S Government Common Policy" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \220\137\224\057\331\362\217\147\233\067\201\200\375\117\204\143 \107\366\105\301 @@ -14728,7 +14728,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CNNIC_CNNICEV" +# Certificate "China Internet Network Information Center EV Certificates Root" # # Issuer: CN=China Internet Network Information Center EV Certificates Root,O=China Internet Network Information Center,C=CN # Serial Number: 1218379777 (0x489f0001) @@ -14741,7 +14741,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CNNIC_CNNICEV" +CKA_LABEL UTF8 "China Internet Network Information Center EV Certificates Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\116 @@ -14839,7 +14839,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CNNIC_CNNICEV" +# Trust for "China Internet Network Information Center EV Certificates Root" # Issuer: CN=China Internet Network Information Center EV Certificates Root,O=China Internet Network Information Center,C=CN # Serial Number: 1218379777 (0x489f0001) # Subject: CN=China Internet Network Information Center EV Certificates Root,O=China Internet Network Information Center,C=CN @@ -14851,7 +14851,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CNNIC_CNNICEV" +CKA_LABEL UTF8 "China Internet Network Information Center EV Certificates Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \117\231\252\223\373\053\321\067\046\241\231\112\316\177\360\005 \362\223\135\036 @@ -14880,7 +14880,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Comodo_USERTrustECC" +# Certificate "Sectigo ECC" # # Issuer: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US # Serial Number:5c:8b:99:c5:5a:94:c5:d2:71:56:de:cd:89:80:cc:26 @@ -14893,7 +14893,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_USERTrustECC" +CKA_LABEL UTF8 "Sectigo ECC" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -14970,7 +14970,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Comodo_USERTrustECC" +# Trust for "Sectigo ECC" # Issuer: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US # Serial Number:5c:8b:99:c5:5a:94:c5:d2:71:56:de:cd:89:80:cc:26 # Subject: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US @@ -14982,7 +14982,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_USERTrustECC" +CKA_LABEL UTF8 "Sectigo ECC" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \321\313\312\135\262\325\052\177\151\073\147\115\345\360\132\035 \014\225\175\360 @@ -15012,7 +15012,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Comodo_USERTrustRSA" +# Certificate "Sectigo" # # Issuer: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US # Serial Number:01:fd:6d:30:fc:a3:ca:51:a8:1b:bc:64:0e:35:03:2d @@ -15025,7 +15025,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_USERTrustRSA" +CKA_LABEL UTF8 "Sectigo" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -15155,7 +15155,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Comodo_USERTrustRSA" +# Trust for "Sectigo" # Issuer: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US # Serial Number:01:fd:6d:30:fc:a3:ca:51:a8:1b:bc:64:0e:35:03:2d # Subject: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US @@ -15167,7 +15167,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_USERTrustRSA" +CKA_LABEL UTF8 "Sectigo" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \053\217\033\127\063\015\273\242\320\172\154\121\367\016\351\015 \332\271\255\216 @@ -15197,7 +15197,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Comodo_COMODORSA" +# Certificate "Sectigo (formerly Comodo CA)" # # Issuer: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number:4c:aa:f9:ca:db:63:6f:e0:1f:f7:4e:d8:5b:03:86:9d @@ -15210,7 +15210,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_COMODORSA" +CKA_LABEL UTF8 "Sectigo (formerly Comodo CA)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 @@ -15339,7 +15339,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Comodo_COMODORSA" +# Trust for "Sectigo (formerly Comodo CA)" # Issuer: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number:4c:aa:f9:ca:db:63:6f:e0:1f:f7:4e:d8:5b:03:86:9d # Subject: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB @@ -15351,7 +15351,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_COMODORSA" +CKA_LABEL UTF8 "Sectigo (formerly Comodo CA)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \257\345\322\104\250\321\031\102\060\377\107\237\342\370\227\273 \315\172\214\264 @@ -15381,7 +15381,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "VerizonRoot_vz_sha256" +# Certificate "DigiCert Global Root CA" # # Issuer: CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US # Serial Number: 1 (0x1) @@ -15394,7 +15394,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VerizonRoot_vz_sha256" +CKA_LABEL UTF8 "DigiCert Global Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\134\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -15478,7 +15478,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "VerizonRoot_vz_sha256" +# Trust for "DigiCert Global Root CA" # Issuer: CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US # Serial Number: 1 (0x1) # Subject: CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US @@ -15490,7 +15490,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VerizonRoot_vz_sha256" +CKA_LABEL UTF8 "DigiCert Global Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \221\041\230\356\362\075\312\304\011\071\061\057\356\227\335\126 \013\256\111\261 @@ -15516,7 +15516,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SwissSign_Silver_Root_G3" +# Certificate "SwissSign Silver Root CA – G3" # # Issuer: CN=SwissSign Silver Root CA - G3,O=SwissSign AG,C=CH # Serial Number:00:aa:88:b0:5a:0b:b1:76:9b @@ -15529,7 +15529,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Silver_Root_G3" +CKA_LABEL UTF8 "SwissSign Silver Root CA – G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\114\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -15644,7 +15644,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SwissSign_Silver_Root_G3" +# Trust for "SwissSign Silver Root CA – G3" # Issuer: CN=SwissSign Silver Root CA - G3,O=SwissSign AG,C=CH # Serial Number:00:aa:88:b0:5a:0b:b1:76:9b # Subject: CN=SwissSign Silver Root CA - G3,O=SwissSign AG,C=CH @@ -15656,7 +15656,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Silver_Root_G3" +CKA_LABEL UTF8 "SwissSign Silver Root CA – G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \215\010\374\103\300\167\014\250\117\115\314\262\324\032\135\225 \155\170\155\304 @@ -15681,7 +15681,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "MicroSec_Micorosec2009" +# Certificate "MicroSec e-Szigno Root CA 2009" # # Issuer: E=info@e-szigno.hu,CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU # Serial Number:00:c2:7e:43:04:4e:47:3f:19 @@ -15694,7 +15694,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "MicroSec_Micorosec2009" +CKA_LABEL UTF8 "MicroSec e-Szigno Root CA 2009" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 @@ -15793,7 +15793,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "MicroSec_Micorosec2009" +# Trust for "MicroSec e-Szigno Root CA 2009" # Issuer: E=info@e-szigno.hu,CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU # Serial Number:00:c2:7e:43:04:4e:47:3f:19 # Subject: E=info@e-szigno.hu,CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU @@ -15805,7 +15805,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "MicroSec_Micorosec2009" +CKA_LABEL UTF8 "MicroSec e-Szigno Root CA 2009" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221 \341\001\061\216 @@ -15834,7 +15834,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ANFAC_ANF_Server_CA" +# Certificate "ANF AC" # # Issuer: CN=ANF Server CA,serialNumber=G63287510,OU=ANF Clase 1 CA,O=ANF Autoridad de Certificaci..n,L=Barcelona (see current address at https://www.anf.es/address/),ST=Barcelona,C=ES # Serial Number: 78923 (0x1344b) @@ -15847,7 +15847,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANFAC_ANF_Server_CA" +CKA_LABEL UTF8 "ANF AC" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\331\061\013\060\011\006\003\125\004\006\023\002\105\123 @@ -15998,7 +15998,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ANFAC_ANF_Server_CA" +# Trust for "ANF AC" # Issuer: CN=ANF Server CA,serialNumber=G63287510,OU=ANF Clase 1 CA,O=ANF Autoridad de Certificaci..n,L=Barcelona (see current address at https://www.anf.es/address/),ST=Barcelona,C=ES # Serial Number: 78923 (0x1344b) # Subject: CN=ANF Server CA,serialNumber=G63287510,OU=ANF Clase 1 CA,O=ANF Autoridad de Certificaci..n,L=Barcelona (see current address at https://www.anf.es/address/),ST=Barcelona,C=ES @@ -16010,7 +16010,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ANFAC_ANF_Server_CA" +CKA_LABEL UTF8 "ANF AC" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \316\251\211\015\205\330\007\123\246\046\050\154\332\327\214\265 \146\327\014\362 @@ -16044,7 +16044,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SpanishProperty_RAIZ_REGISTRADORES_SAFELAYER" +# Certificate "Colegio de Registradores Mercantiles" # # Issuer: CN=Registradores de Espa..a - CA Ra..z,OU=Certificado Propio,O=Colegio de Registradores de la Propiedad y Mercantiles de Espa..a,C=ES # Serial Number:2d:e4:0a:e1:9b:d1:c2:aa:4c:f4:00:ac:81:35:f9 @@ -16057,7 +16057,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SpanishProperty_RAIZ_REGISTRADORES_SAFELAYER" +CKA_LABEL UTF8 "Colegio de Registradores Mercantiles" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\244\061\013\060\011\006\003\125\004\006\023\002\105\123 @@ -16210,7 +16210,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SpanishProperty_RAIZ_REGISTRADORES_SAFELAYER" +# Trust for "Colegio de Registradores Mercantiles" # Issuer: CN=Registradores de Espa..a - CA Ra..z,OU=Certificado Propio,O=Colegio de Registradores de la Propiedad y Mercantiles de Espa..a,C=ES # Serial Number:2d:e4:0a:e1:9b:d1:c2:aa:4c:f4:00:ac:81:35:f9 # Subject: CN=Registradores de Espa..a - CA Ra..z,OU=Certificado Propio,O=Colegio de Registradores de la Propiedad y Mercantiles de Espa..a,C=ES @@ -16222,7 +16222,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SpanishProperty_RAIZ_REGISTRADORES_SAFELAYER" +CKA_LABEL UTF8 "Colegio de Registradores Mercantiles" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \041\021\145\312\067\237\273\136\330\001\343\034\103\012\142\252 \301\011\274\264 @@ -16254,7 +16254,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Sonera_teliasonera" +# Certificate "TeliaSonera Root CA v1" # # Issuer: CN=TeliaSonera Root CA v1,O=TeliaSonera # Serial Number:00:95:be:16:a0:f7:2e:46:f1:7b:39:82:72:fa:8b:cd:96 @@ -16267,7 +16267,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Sonera_teliasonera" +CKA_LABEL UTF8 "TeliaSonera Root CA v1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\067\061\024\060\022\006\003\125\004\012\014\013\124\145\154 @@ -16376,7 +16376,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Sonera_teliasonera" +# Trust for "TeliaSonera Root CA v1" # Issuer: CN=TeliaSonera Root CA v1,O=TeliaSonera # Serial Number:00:95:be:16:a0:f7:2e:46:f1:7b:39:82:72:fa:8b:cd:96 # Subject: CN=TeliaSonera Root CA v1,O=TeliaSonera @@ -16388,7 +16388,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Sonera_teliasonera" +CKA_LABEL UTF8 "TeliaSonera Root CA v1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \103\023\273\226\361\325\206\233\301\116\152\222\366\317\366\064 \151\207\202\067 @@ -16413,7 +16413,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CzechPost_postsignum_qca2_root" +# Certificate "PostSignum Root QCA 2" # # Issuer: CN=PostSignum Root QCA 2,O="..esk.. po..ta, s.p. [I.. 47114983]",C=CZ # Serial Number: 100 (0x64) @@ -16426,7 +16426,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CzechPost_postsignum_qca2_root" +CKA_LABEL UTF8 "PostSignum Root QCA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\133\061\013\060\011\006\003\125\004\006\023\002\103\132\061 @@ -16544,7 +16544,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CzechPost_postsignum_qca2_root" +# Trust for "PostSignum Root QCA 2" # Issuer: CN=PostSignum Root QCA 2,O="..esk.. po..ta, s.p. [I.. 47114983]",C=CZ # Serial Number: 100 (0x64) # Subject: CN=PostSignum Root QCA 2,O="..esk.. po..ta, s.p. [I.. 47114983]",C=CZ @@ -16556,7 +16556,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CzechPost_postsignum_qca2_root" +CKA_LABEL UTF8 "PostSignum Root QCA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \240\370\333\077\013\364\027\151\073\050\056\267\112\152\330\155 \371\324\110\243 @@ -16582,7 +16582,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CertPlus_Keynectis" +# Certificate "KEYNECTSIS ROOT CA" # # Issuer: CN=KEYNECTIS ROOT CA,OU=ROOT,O=KEYNECTIS,C=FR # Serial Number:11:21:bc:27:6c:55:47:af:58:4e:ef:d4:ce:d6:29:b2:a2:85 @@ -16595,7 +16595,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CertPlus_Keynectis" +CKA_LABEL UTF8 "KEYNECTSIS ROOT CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\114\061\013\060\011\006\003\125\004\006\023\002\106\122\061 @@ -16685,7 +16685,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CertPlus_Keynectis" +# Trust for "KEYNECTSIS ROOT CA" # Issuer: CN=KEYNECTIS ROOT CA,OU=ROOT,O=KEYNECTIS,C=FR # Serial Number:11:21:bc:27:6c:55:47:af:58:4e:ef:d4:ce:d6:29:b2:a2:85 # Subject: CN=KEYNECTIS ROOT CA,OU=ROOT,O=KEYNECTIS,C=FR @@ -16697,7 +16697,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CertPlus_Keynectis" +CKA_LABEL UTF8 "KEYNECTSIS ROOT CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \234\141\134\115\115\205\020\072\123\046\302\115\272\352\344\242 \322\325\314\227 @@ -16723,7 +16723,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GovLithuania_RootCA" +# Certificate "VI Registru Centras RCSC (RootCA)" # # Issuer: CN=VI Registru Centras RCSC (RootCA),OU=Registru Centro Sertifikavimo Centras,O=VI Registru Centras - I.k. 124110246,C=LT # Serial Number:03:a3:a4:57:b5:f0:f3:86:4a:11:63:e8:98:ff:16:9c @@ -16736,7 +16736,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovLithuania_RootCA" +CKA_LABEL UTF8 "VI Registru Centras RCSC (RootCA)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\230\061\013\060\011\006\003\125\004\006\023\002\114\124 @@ -16878,7 +16878,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GovLithuania_RootCA" +# Trust for "VI Registru Centras RCSC (RootCA)" # Issuer: CN=VI Registru Centras RCSC (RootCA),OU=Registru Centro Sertifikavimo Centras,O=VI Registru Centras - I.k. 124110246,C=LT # Serial Number:03:a3:a4:57:b5:f0:f3:86:4a:11:63:e8:98:ff:16:9c # Subject: CN=VI Registru Centras RCSC (RootCA),OU=Registru Centro Sertifikavimo Centras,O=VI Registru Centras - I.k. 124110246,C=LT @@ -16890,7 +16890,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GovLithuania_RootCA" +CKA_LABEL UTF8 "VI Registru Centras RCSC (RootCA)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \227\035\064\206\374\036\216\143\025\367\306\362\341\051\147\307 \044\064\042\024 @@ -16921,7 +16921,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoDaddy_sfsroot-g2" +# Certificate "Amazon Services Root Certificate Authority -- G2" # # Issuer: CN=Starfield Services Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US # Serial Number: 0 (0x0) @@ -16934,7 +16934,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoDaddy_sfsroot-g2" +CKA_LABEL UTF8 "Amazon Services Root Certificate Authority -- G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -17034,7 +17034,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoDaddy_sfsroot-g2" +# Trust for "Amazon Services Root Certificate Authority -- G2" # Issuer: CN=Starfield Services Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US # Serial Number: 0 (0x0) # Subject: CN=Starfield Services Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US @@ -17046,7 +17046,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoDaddy_sfsroot-g2" +CKA_LABEL UTF8 "Amazon Services Root Certificate Authority -- G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143 \350\045\157\077 @@ -17076,7 +17076,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoDaddy_gdroot-g2" +# Certificate "Go Daddy Root Certificate Authority – G2" # # Issuer: CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US # Serial Number: 0 (0x0) @@ -17089,7 +17089,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoDaddy_gdroot-g2" +CKA_LABEL UTF8 "Go Daddy Root Certificate Authority – G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -17184,7 +17184,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoDaddy_gdroot-g2" +# Trust for "Go Daddy Root Certificate Authority – G2" # Issuer: CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US # Serial Number: 0 (0x0) # Subject: CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US @@ -17196,7 +17196,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoDaddy_gdroot-g2" +CKA_LABEL UTF8 "Go Daddy Root Certificate Authority – G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302 \124\375\346\213 @@ -17225,7 +17225,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoDaddy_sfroot-g2" +# Certificate "Starfield Root Certificate Authority – G2" # # Issuer: CN=Starfield Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US # Serial Number: 0 (0x0) @@ -17238,7 +17238,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoDaddy_sfroot-g2" +CKA_LABEL UTF8 "Starfield Root Certificate Authority – G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -17337,7 +17337,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoDaddy_sfroot-g2" +# Trust for "Starfield Root Certificate Authority – G2" # Issuer: CN=Starfield Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US # Serial Number: 0 (0x0) # Subject: CN=Starfield Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US @@ -17349,7 +17349,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoDaddy_sfroot-g2" +CKA_LABEL UTF8 "Starfield Root Certificate Authority – G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071 \324\347\017\016 @@ -17379,7 +17379,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "globals_GSRootR3" +# Certificate "GlobalSign Root CA - R3" # # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R3 # Serial Number:04:00:00:00:00:01:21:58:53:08:a2 @@ -17392,7 +17392,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "globals_GSRootR3" +CKA_LABEL UTF8 "GlobalSign Root CA - R3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 @@ -17473,7 +17473,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "globals_GSRootR3" +# Trust for "GlobalSign Root CA - R3" # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R3 # Serial Number:04:00:00:00:00:01:21:58:53:08:a2 # Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R3 @@ -17485,7 +17485,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "globals_GSRootR3" +CKA_LABEL UTF8 "GlobalSign Root CA - R3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133 \205\151\166\255 @@ -17510,7 +17510,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Affirmtrust_PremiumECC" +# Certificate "AffirmTrust Premium ECC" # # Issuer: CN=AffirmTrust Premium ECC,O=AffirmTrust,C=US # Serial Number:74:97:25:8a:c7:3f:7a:54 @@ -17523,7 +17523,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_PremiumECC" +CKA_LABEL UTF8 "AffirmTrust Premium ECC" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -17582,7 +17582,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Affirmtrust_PremiumECC" +# Trust for "AffirmTrust Premium ECC" # Issuer: CN=AffirmTrust Premium ECC,O=AffirmTrust,C=US # Serial Number:74:97:25:8a:c7:3f:7a:54 # Subject: CN=AffirmTrust Premium ECC,O=AffirmTrust,C=US @@ -17594,7 +17594,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_PremiumECC" +CKA_LABEL UTF8 "AffirmTrust Premium ECC" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312 \353\377\303\273 @@ -17619,7 +17619,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Affirmtrust_Premium" +# Certificate "AffirmTrust Premium" # # Issuer: CN=AffirmTrust Premium,O=AffirmTrust,C=US # Serial Number:6d:8c:14:46:b1:a6:0a:ee @@ -17632,7 +17632,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_Premium" +CKA_LABEL UTF8 "AffirmTrust Premium" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -17743,7 +17743,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Affirmtrust_Premium" +# Trust for "AffirmTrust Premium" # Issuer: CN=AffirmTrust Premium,O=AffirmTrust,C=US # Serial Number:6d:8c:14:46:b1:a6:0a:ee # Subject: CN=AffirmTrust Premium,O=AffirmTrust,C=US @@ -17755,7 +17755,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_Premium" +CKA_LABEL UTF8 "AffirmTrust Premium" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145 \046\062\050\047 @@ -17780,7 +17780,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Affirmtrust_Networking" +# Certificate "AffirmTrust Networking" # # Issuer: CN=AffirmTrust Networking,O=AffirmTrust,C=US # Serial Number:7c:4f:04:39:1c:d4:99:2d @@ -17793,7 +17793,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_Networking" +CKA_LABEL UTF8 "AffirmTrust Networking" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -17872,7 +17872,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Affirmtrust_Networking" +# Trust for "AffirmTrust Networking" # Issuer: CN=AffirmTrust Networking,O=AffirmTrust,C=US # Serial Number:7c:4f:04:39:1c:d4:99:2d # Subject: CN=AffirmTrust Networking,O=AffirmTrust,C=US @@ -17884,7 +17884,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_Networking" +CKA_LABEL UTF8 "AffirmTrust Networking" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220 \237\105\000\057 @@ -17909,7 +17909,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Affirmtrust_Commercial" +# Certificate "AffirmTrust Commercial" # # Issuer: CN=AffirmTrust Commercial,O=AffirmTrust,C=US # Serial Number:77:77:06:27:26:a9:b1:7c @@ -17922,7 +17922,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_Commercial" +CKA_LABEL UTF8 "AffirmTrust Commercial" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -18001,7 +18001,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Affirmtrust_Commercial" +# Trust for "AffirmTrust Commercial" # Issuer: CN=AffirmTrust Commercial,O=AffirmTrust,C=US # Serial Number:77:77:06:27:26:a9:b1:7c # Subject: CN=AffirmTrust Commercial,O=AffirmTrust,C=US @@ -18013,7 +18013,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Affirmtrust_Commercial" +CKA_LABEL UTF8 "AffirmTrust Commercial" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054 \307\262\170\267 @@ -18038,7 +18038,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Entrust_new2048ca" +# Certificate "Entrust (2048)" # # Issuer: CN=Entrust.net Certification Authority (2048),OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),O=Entrust.net # Serial Number: 946069240 (0x3863def8) @@ -18051,7 +18051,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_new2048ca" +CKA_LABEL UTF8 "Entrust (2048)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 @@ -18158,7 +18158,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Entrust_new2048ca" +# Trust for "Entrust (2048)" # Issuer: CN=Entrust.net Certification Authority (2048),OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),O=Entrust.net # Serial Number: 946069240 (0x3863def8) # Subject: CN=Entrust.net Certification Authority (2048),OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),O=Entrust.net @@ -18170,7 +18170,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_new2048ca" +CKA_LABEL UTF8 "Entrust (2048)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \120\060\006\011\035\227\324\365\256\071\367\313\347\222\175\175 \145\055\064\061 @@ -18202,7 +18202,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Firma_firma2048" +# Certificate "CAROOT Firmaprofesional" # # Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES # Serial Number:53:ec:3b:ee:fb:b2:48:5f @@ -18215,7 +18215,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Firma_firma2048" +CKA_LABEL UTF8 "CAROOT Firmaprofesional" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\121\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -18341,7 +18341,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Firma_firma2048" +# Trust for "CAROOT Firmaprofesional" # Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES # Serial Number:53:ec:3b:ee:fb:b2:48:5f # Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES @@ -18353,7 +18353,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Firma_firma2048" +CKA_LABEL UTF8 "CAROOT Firmaprofesional" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \256\305\373\077\310\341\277\304\345\117\003\007\132\232\350\000 \267\367\266\372 @@ -18379,7 +18379,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SECOM_SCRoot2" +# Certificate "SECOM Trust Systems Co Ltd." # # Issuer: OU=Security Communication RootCA2,O="SECOM Trust Systems CO.,LTD.",C=JP # Serial Number: 0 (0x0) @@ -18392,7 +18392,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SECOM_SCRoot2" +CKA_LABEL UTF8 "SECOM Trust Systems Co Ltd." CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\135\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -18476,7 +18476,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SECOM_SCRoot2" +# Trust for "SECOM Trust Systems Co Ltd." # Issuer: OU=Security Communication RootCA2,O="SECOM Trust Systems CO.,LTD.",C=JP # Serial Number: 0 (0x0) # Subject: OU=Security Communication RootCA2,O="SECOM Trust Systems CO.,LTD.",C=JP @@ -18488,7 +18488,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SECOM_SCRoot2" +CKA_LABEL UTF8 "SECOM Trust Systems Co Ltd." CKA_CERT_SHA1_HASH MULTILINE_OCTAL \137\073\214\362\370\020\263\175\170\264\316\354\031\031\303\163 \064\271\307\164 @@ -18514,7 +18514,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Brazil_acraizv1" +# Certificate "Autoridade Certificadora da Raiz Brasileira v1 - ICP-Brasil" # # Issuer: CN=Autoridade Certificadora Raiz Brasileira v1,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR # Serial Number: 1 (0x1) @@ -18527,7 +18527,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Brazil_acraizv1" +CKA_LABEL UTF8 "Autoridade Certificadora da Raiz Brasileira v1 - ICP-Brasil" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\227\061\013\060\011\006\003\125\004\006\023\002\102\122 @@ -18636,7 +18636,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Brazil_acraizv1" +# Trust for "Autoridade Certificadora da Raiz Brasileira v1 - ICP-Brasil" # Issuer: CN=Autoridade Certificadora Raiz Brasileira v1,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR # Serial Number: 1 (0x1) # Subject: CN=Autoridade Certificadora Raiz Brasileira v1,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR @@ -18648,7 +18648,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Brazil_acraizv1" +CKA_LABEL UTF8 "Autoridade Certificadora da Raiz Brasileira v1 - ICP-Brasil" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \160\135\053\105\145\307\004\172\124\006\224\247\232\367\253\270 \102\275\301\141 @@ -18678,7 +18678,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ATrust_Qual03a" +# Certificate "A-Trust-Qual-03a" # # Issuer: CN=A-Trust-Qual-03,OU=A-Trust-Qual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 255636 (0x3e694) @@ -18691,7 +18691,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATrust_Qual03a" +CKA_LABEL UTF8 "A-Trust-Qual-03a" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\213\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -18786,7 +18786,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ATrust_Qual03a" +# Trust for "A-Trust-Qual-03a" # Issuer: CN=A-Trust-Qual-03,OU=A-Trust-Qual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 255636 (0x3e694) # Subject: CN=A-Trust-Qual-03,OU=A-Trust-Qual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT @@ -18798,7 +18798,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATrust_Qual03a" +CKA_LABEL UTF8 "A-Trust-Qual-03a" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \102\357\335\346\277\363\136\320\272\346\254\335\040\114\120\256 \206\304\364\372 @@ -18827,7 +18827,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "UserTrust_AddTrustRoot" +# Certificate "Sectigo (AddTrust)" # # Issuer: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE # Serial Number: 1 (0x1) @@ -18840,7 +18840,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "UserTrust_AddTrustRoot" +CKA_LABEL UTF8 "Sectigo (AddTrust)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\157\061\013\060\011\006\003\125\004\006\023\002\123\105\061 @@ -18940,7 +18940,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "UserTrust_AddTrustRoot" +# Trust for "Sectigo (AddTrust)" # Issuer: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE # Serial Number: 1 (0x1) # Subject: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE @@ -18952,7 +18952,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "UserTrust_AddTrustRoot" +CKA_LABEL UTF8 "Sectigo (AddTrust)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \002\372\363\342\221\103\124\150\140\170\127\151\115\365\344\133 \150\205\030\150 @@ -18980,7 +18980,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Entrust_Entrust_G2_Root" +# Certificate "Entrust.net" # # Issuer: CN=Entrust Root Certification Authority - G2,OU="(c) 2009 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US # Serial Number: 1246989352 (0x4a538c28) @@ -18993,7 +18993,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_Entrust_G2_Root" +CKA_LABEL UTF8 "Entrust.net" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -19104,7 +19104,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Entrust_Entrust_G2_Root" +# Trust for "Entrust.net" # Issuer: CN=Entrust Root Certification Authority - G2,OU="(c) 2009 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US # Serial Number: 1246989352 (0x4a538c28) # Subject: CN=Entrust Root Certification Authority - G2,OU="(c) 2009 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US @@ -19116,7 +19116,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_Entrust_G2_Root" +CKA_LABEL UTF8 "Entrust.net" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \214\364\047\375\171\014\072\321\146\006\215\350\036\127\357\273 \223\042\162\324 @@ -19149,7 +19149,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "PortugalGov_ECRaizEstado" +# Certificate "ECRaizEstado" # # Issuer: CN=ECRaizEstado,O=SCEE,C=PT # Serial Number:42:ea:5b:0a:51:11:26:7c:d8:27:74:b7:df:7f:71 @@ -19162,7 +19162,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "PortugalGov_ECRaizEstado" +CKA_LABEL UTF8 "ECRaizEstado" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\063\061\013\060\011\006\003\125\004\006\023\002\120\124\061 @@ -19275,7 +19275,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "PortugalGov_ECRaizEstado" +# Trust for "ECRaizEstado" # Issuer: CN=ECRaizEstado,O=SCEE,C=PT # Serial Number:42:ea:5b:0a:51:11:26:7c:d8:27:74:b7:df:7f:71 # Subject: CN=ECRaizEstado,O=SCEE,C=PT @@ -19287,7 +19287,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "PortugalGov_ECRaizEstado" +CKA_LABEL UTF8 "ECRaizEstado" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \071\023\205\076\105\304\071\242\332\161\214\337\266\363\340\063 \340\117\356\161 @@ -19312,7 +19312,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SerbianPost_Root" +# Certificate "Posta CA Root" # # Issuer: CN=Posta CA Root,CN=AIA,CN=Public Key Services,CN=Services,CN=Configuration,DC=ca,DC=posta,DC=rs # Serial Number: 1224507125 (0x48fc7ef5) @@ -19325,7 +19325,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SerbianPost_Root" +CKA_LABEL UTF8 "Posta CA Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\256\061\022\060\020\006\012\011\222\046\211\223\362\054 @@ -19480,7 +19480,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SerbianPost_Root" +# Trust for "Posta CA Root" # Issuer: CN=Posta CA Root,CN=AIA,CN=Public Key Services,CN=Services,CN=Configuration,DC=ca,DC=posta,DC=rs # Serial Number: 1224507125 (0x48fc7ef5) # Subject: CN=Posta CA Root,CN=AIA,CN=Public Key Services,CN=Services,CN=Configuration,DC=ca,DC=posta,DC=rs @@ -19492,7 +19492,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SerbianPost_Root" +CKA_LABEL UTF8 "Posta CA Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \326\277\171\224\364\053\345\372\051\332\013\327\130\173\131\037 \107\244\117\042 @@ -19524,7 +19524,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "FNMT_fnmtrcm" +# Certificate "AC RAIZ FNMT-RCM" # # Issuer: OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES # Serial Number:00:81:bb:dd:6b:24:1f:da:b4:be:8f:1b:da:08:55:c4 @@ -19537,7 +19537,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "FNMT_fnmtrcm" +CKA_LABEL UTF8 "AC RAIZ FNMT-RCM" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\073\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -19651,7 +19651,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "FNMT_fnmtrcm" +# Trust for "AC RAIZ FNMT-RCM" # Issuer: OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES # Serial Number:00:81:bb:dd:6b:24:1f:da:b4:be:8f:1b:da:08:55:c4 # Subject: OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES @@ -19663,7 +19663,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "FNMT_fnmtrcm" +CKA_LABEL UTF8 "AC RAIZ FNMT-RCM" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \270\145\023\013\355\312\070\322\177\151\222\224\040\167\013\355 \206\357\274\020 @@ -19688,7 +19688,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TWCA_TWCA1" +# Certificate "TWCA Root Certification Authority 1" # # Issuer: CN=TWCA Root Certification Authority,OU=Root CA,O=TAIWAN-CA,C=TW # Serial Number: 1 (0x1) @@ -19701,7 +19701,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TWCA_TWCA1" +CKA_LABEL UTF8 "TWCA Root Certification Authority 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\137\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -19787,7 +19787,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TWCA_TWCA1" +# Trust for "TWCA Root Certification Authority 1" # Issuer: CN=TWCA Root Certification Authority,OU=Root CA,O=TAIWAN-CA,C=TW # Serial Number: 1 (0x1) # Subject: CN=TWCA Root Certification Authority,OU=Root CA,O=TAIWAN-CA,C=TW @@ -19799,7 +19799,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TWCA_TWCA1" +CKA_LABEL UTF8 "TWCA Root Certification Authority 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \317\236\207\155\323\353\374\102\046\227\243\265\243\172\240\166 \251\006\043\110 @@ -19826,7 +19826,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Verisign_VRSN_C3_PCA_G4" +# Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" # # Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3 @@ -19839,7 +19839,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Verisign_VRSN_C3_PCA_G4" +CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -19939,7 +19939,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Verisign_VRSN_C3_PCA_G4" +# Trust for "VeriSign Class 3 Public Primary Certification Authority - G4" # Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3 # Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US @@ -19951,7 +19951,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Verisign_VRSN_C3_PCA_G4" +CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144 \311\077\154\072 @@ -19985,7 +19985,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "thawte_THAWTE_PCA_G2" +# Certificate "thawte Primary Root CA - G2" # # Issuer: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US # Serial Number:35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56 @@ -19998,7 +19998,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte_THAWTE_PCA_G2" +CKA_LABEL UTF8 "thawte Primary Root CA - G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -20074,7 +20074,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "thawte_THAWTE_PCA_G2" +# Trust for "thawte Primary Root CA - G2" # Issuer: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US # Serial Number:35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56 # Subject: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US @@ -20086,7 +20086,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte_THAWTE_PCA_G2" +CKA_LABEL UTF8 "thawte Primary Root CA - G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333 \010\236\360\022 @@ -20116,7 +20116,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust_GEOTRUST_PCA_G2" +# Certificate "GeoTrust Primary Certification Authority - G2" # # Issuer: CN=GeoTrust Primary Certification Authority - G2,OU=(c) 2007 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US # Serial Number:3c:b2:f4:48:0a:00:e2:fe:eb:24:3b:5e:60:3e:c3:6b @@ -20129,7 +20129,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_GEOTRUST_PCA_G2" +CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -20210,7 +20210,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GeoTrust_GEOTRUST_PCA_G2" +# Trust for "GeoTrust Primary Certification Authority - G2" # Issuer: CN=GeoTrust Primary Certification Authority - G2,OU=(c) 2007 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US # Serial Number:3c:b2:f4:48:0a:00:e2:fe:eb:24:3b:5e:60:3e:c3:6b # Subject: CN=GeoTrust Primary Certification Authority - G2,OU=(c) 2007 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US @@ -20222,7 +20222,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_GEOTRUST_PCA_G2" +CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \215\027\204\325\067\363\003\175\354\160\376\127\213\121\232\231 \346\020\327\260 @@ -20253,7 +20253,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Verisign_VRSN_UNIVERSAL_ROOT_CA" +# Certificate "VeriSign Universal Root Certification Authority" # # Issuer: CN=VeriSign Universal Root Certification Authority,OU="(c) 2008 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:40:1a:c4:64:21:b3:13:21:03:0e:bb:e4:12:1a:c5:1d @@ -20266,7 +20266,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Verisign_VRSN_UNIVERSAL_ROOT_CA" +CKA_LABEL UTF8 "VeriSign Universal Root Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\275\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -20383,7 +20383,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Verisign_VRSN_UNIVERSAL_ROOT_CA" +# Trust for "VeriSign Universal Root Certification Authority" # Issuer: CN=VeriSign Universal Root Certification Authority,OU="(c) 2008 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:40:1a:c4:64:21:b3:13:21:03:0e:bb:e4:12:1a:c5:1d # Subject: CN=VeriSign Universal Root Certification Authority,OU="(c) 2008 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US @@ -20395,7 +20395,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Verisign_VRSN_UNIVERSAL_ROOT_CA" +CKA_LABEL UTF8 "VeriSign Universal Root Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \066\171\312\065\146\207\162\060\115\060\245\373\207\073\017\247 \173\267\015\124 @@ -20428,7 +20428,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "thawte_THAWTE_PCA_G3" +# Certificate "thawte Primary Root CA - G3" # # Issuer: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US # Serial Number:60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb @@ -20441,7 +20441,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte_THAWTE_PCA_G3" +CKA_LABEL UTF8 "thawte Primary Root CA - G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -20549,7 +20549,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "thawte_THAWTE_PCA_G3" +# Trust for "thawte Primary Root CA - G3" # Issuer: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US # Serial Number:60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb # Subject: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US @@ -20561,7 +20561,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte_THAWTE_PCA_G3" +CKA_LABEL UTF8 "thawte Primary Root CA - G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211 \312\363\153\362 @@ -20594,7 +20594,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust_GEOTRUST_PCA_G3" +# Certificate "GeoTrust Primary Certification Authority - G3" # # Issuer: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US # Serial Number:15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f @@ -20607,7 +20607,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_GEOTRUST_PCA_G3" +CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -20709,7 +20709,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GeoTrust_GEOTRUST_PCA_G3" +# Trust for "GeoTrust Primary Certification Authority - G3" # Issuer: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US # Serial Number:15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f # Subject: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US @@ -20721,7 +20721,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_GEOTRUST_PCA_G3" +CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062 \072\114\052\375 @@ -20752,7 +20752,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Edicom_ACEDICOMRoot" +# Certificate "EDICOM" # # Issuer: C=ES,O=EDICOM,OU=PKI,CN=ACEDICOM Root # Serial Number:61:8d:c7:86:3b:01:82:05 @@ -20765,7 +20765,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Edicom_ACEDICOMRoot" +CKA_LABEL UTF8 "EDICOM" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\104\061\026\060\024\006\003\125\004\003\014\015\101\103\105 @@ -20883,7 +20883,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Edicom_ACEDICOMRoot" +# Trust for "EDICOM" # Issuer: C=ES,O=EDICOM,OU=PKI,CN=ACEDICOM Root # Serial Number:61:8d:c7:86:3b:01:82:05 # Subject: C=ES,O=EDICOM,OU=PKI,CN=ACEDICOM Root @@ -20895,7 +20895,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Edicom_ACEDICOMRoot" +CKA_LABEL UTF8 "EDICOM" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \340\264\062\056\262\366\245\150\266\124\123\204\110\030\112\120 \066\207\103\204 @@ -20920,7 +20920,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Camerfirma_ChambersofCommerceRoot" +# Certificate "Chambers of Commerce Root - 2008" # # Issuer: CN=Chambers of Commerce Root - 2008,O=AC Camerfirma S.A.,serialNumber=A82743287,L=Madrid (see current address at www.camerfirma.com/address),C=EU # Serial Number:00:a3:da:42:7e:a4:b1:ae:da @@ -20933,7 +20933,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_ChambersofCommerceRoot" +CKA_LABEL UTF8 "Chambers of Commerce Root - 2008" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\256\061\013\060\011\006\003\125\004\006\023\002\105\125 @@ -21091,7 +21091,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Camerfirma_ChambersofCommerceRoot" +# Trust for "Chambers of Commerce Root - 2008" # Issuer: CN=Chambers of Commerce Root - 2008,O=AC Camerfirma S.A.,serialNumber=A82743287,L=Madrid (see current address at www.camerfirma.com/address),C=EU # Serial Number:00:a3:da:42:7e:a4:b1:ae:da # Subject: CN=Chambers of Commerce Root - 2008,O=AC Camerfirma S.A.,serialNumber=A82743287,L=Madrid (see current address at www.camerfirma.com/address),C=EU @@ -21103,7 +21103,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_ChambersofCommerceRoot" +CKA_LABEL UTF8 "Chambers of Commerce Root - 2008" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \170\152\164\254\166\253\024\177\234\152\060\120\272\236\250\176 \376\232\316\074 @@ -21135,7 +21135,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Camerfirma_ChambersignRoot" +# Certificate "Global Chambersign Root - 2008" # # Issuer: CN=Global Chambersign Root - 2008,O=AC Camerfirma S.A.,serialNumber=A82743287,L=Madrid (see current address at www.camerfirma.com/address),C=EU # Serial Number:00:c9:cd:d3:e9:d5:7d:23:ce @@ -21148,7 +21148,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_ChambersignRoot" +CKA_LABEL UTF8 "Global Chambersign Root - 2008" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\254\061\013\060\011\006\003\125\004\006\023\002\105\125 @@ -21303,7 +21303,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Camerfirma_ChambersignRoot" +# Trust for "Global Chambersign Root - 2008" # Issuer: CN=Global Chambersign Root - 2008,O=AC Camerfirma S.A.,serialNumber=A82743287,L=Madrid (see current address at www.camerfirma.com/address),C=EU # Serial Number:00:c9:cd:d3:e9:d5:7d:23:ce # Subject: CN=Global Chambersign Root - 2008,O=AC Camerfirma S.A.,serialNumber=A82743287,L=Madrid (see current address at www.camerfirma.com/address),C=EU @@ -21315,7 +21315,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_ChambersignRoot" +CKA_LABEL UTF8 "Global Chambersign Root - 2008" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \112\275\356\354\225\015\065\234\211\256\307\122\241\054\133\051 \366\326\252\014 @@ -21346,7 +21346,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Certum_ctnca" +# Certificate "Certum Trusted Network CA" # # Issuer: CN=Certum Trusted Network CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL # Serial Number: 279744 (0x444c0) @@ -21359,7 +21359,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum_ctnca" +CKA_LABEL UTF8 "Certum Trusted Network CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061 @@ -21451,7 +21451,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Certum_ctnca" +# Trust for "Certum Trusted Network CA" # Issuer: CN=Certum Trusted Network CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL # Serial Number: 279744 (0x444c0) # Subject: CN=Certum Trusted Network CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL @@ -21463,7 +21463,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum_ctnca" +CKA_LABEL UTF8 "Certum Trusted Network CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031 \247\017\006\236 @@ -21491,7 +21491,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CNNIC_root" +# Certificate "CNNIC Root" # # Issuer: CN=CNNIC ROOT,O=CNNIC,C=CN # Serial Number: 1228079105 (0x49330001) @@ -21504,7 +21504,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CNNIC_root" +CKA_LABEL UTF8 "CNNIC Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\062\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -21582,7 +21582,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CNNIC_root" +# Trust for "CNNIC Root" # Issuer: CN=CNNIC ROOT,O=CNNIC,C=CN # Serial Number: 1228079105 (0x49330001) # Subject: CN=CNNIC ROOT,O=CNNIC,C=CN @@ -21594,7 +21594,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CNNIC_root" +CKA_LABEL UTF8 "CNNIC Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \213\257\114\233\035\360\052\222\367\332\022\216\271\033\254\364 \230\140\113\157 @@ -21618,7 +21618,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "pkioverheid_GBORoot2" +# Certificate "Staat der Nederlanden Root CA - G2" # # Issuer: CN=Staat der Nederlanden Root CA - G2,O=Staat der Nederlanden,C=NL # Serial Number: 10000012 (0x98968c) @@ -21631,7 +21631,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "pkioverheid_GBORoot2" +CKA_LABEL UTF8 "Staat der Nederlanden Root CA - G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061 @@ -21752,7 +21752,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "pkioverheid_GBORoot2" +# Trust for "Staat der Nederlanden Root CA - G2" # Issuer: CN=Staat der Nederlanden Root CA - G2,O=Staat der Nederlanden,C=NL # Serial Number: 10000012 (0x98968c) # Subject: CN=Staat der Nederlanden Root CA - G2,O=Staat der Nederlanden,C=NL @@ -21764,7 +21764,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "pkioverheid_GBORoot2" +CKA_LABEL UTF8 "Staat der Nederlanden Root CA - G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353 \004\335\267\026 @@ -21790,7 +21790,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetLock_Gold" +# Certificate "NetLock Arany (Class Gold) Fotanúsítvány" # # Issuer: CN=NetLock Arany (Class Gold) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU # Serial Number:49:41:2c:e4:00:10 @@ -21803,7 +21803,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetLock_Gold" +CKA_LABEL UTF8 "NetLock Arany (Class Gold) Fotanúsítvány" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125 @@ -21907,7 +21907,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetLock_Gold" +# Trust for "NetLock Arany (Class Gold) Fotanúsítvány" # Issuer: CN=NetLock Arany (Class Gold) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU # Serial Number:49:41:2c:e4:00:10 # Subject: CN=NetLock Arany (Class Gold) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU @@ -21919,7 +21919,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetLock_Gold" +CKA_LABEL UTF8 "NetLock Arany (Class Gold) Fotanúsítvány" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006 \267\227\011\221 @@ -21950,7 +21950,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetLock_Platinum" +# Certificate "NetLock Platina (Class Platinum) Fotanúsítvány" # # Issuer: CN=NetLock Platina (Class Platinum) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU # Serial Number:49:41:2d:ec:00:10 @@ -21963,7 +21963,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetLock_Platinum" +CKA_LABEL UTF8 "NetLock Platina (Class Platinum) Fotanúsítvány" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\255\061\013\060\011\006\003\125\004\006\023\002\110\125 @@ -22100,7 +22100,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetLock_Platinum" +# Trust for "NetLock Platina (Class Platinum) Fotanúsítvány" # Issuer: CN=NetLock Platina (Class Platinum) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU # Serial Number:49:41:2d:ec:00:10 # Subject: CN=NetLock Platina (Class Platinum) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU @@ -22112,7 +22112,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetLock_Platinum" +CKA_LABEL UTF8 "NetLock Platina (Class Platinum) Fotanúsítvány" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \354\223\336\010\074\223\331\063\251\206\263\325\315\342\132\313 \057\356\317\216 @@ -22143,7 +22143,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "certSIGN_root" +# Certificate "certSIGN Root CA" # # Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO # Serial Number:20:06:05:16:70:02 @@ -22156,7 +22156,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "certSIGN_root" +CKA_LABEL UTF8 "certSIGN Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061 @@ -22232,7 +22232,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "certSIGN_root" +# Trust for "certSIGN Root CA" # Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO # Serial Number:20:06:05:16:70:02 # Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO @@ -22244,7 +22244,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "certSIGN_root" +CKA_LABEL UTF8 "certSIGN Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350 \174\113\057\233 @@ -22268,7 +22268,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Cisco_crca2048" +# Certificate "Cisco Systems" # # Issuer: CN=Cisco Root CA 2048,O=Cisco Systems # Serial Number:5f:f8:7b:28:2b:54:dc:8d:42:a3:15:b5:68:c9:ad:ff @@ -22281,7 +22281,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Cisco_crca2048" +CKA_LABEL UTF8 "Cisco Systems" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\065\061\026\060\024\006\003\125\004\012\023\015\103\151\163 @@ -22359,7 +22359,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Cisco_crca2048" +# Trust for "Cisco Systems" # Issuer: CN=Cisco Root CA 2048,O=Cisco Systems # Serial Number:5f:f8:7b:28:2b:54:dc:8d:42:a3:15:b5:68:c9:ad:ff # Subject: CN=Cisco Root CA 2048,O=Cisco Systems @@ -22371,7 +22371,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Cisco_crca2048" +CKA_LABEL UTF8 "Cisco Systems" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \336\231\014\355\231\340\103\037\140\355\303\223\176\174\325\277 \016\331\345\372 @@ -22396,7 +22396,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SHECA_UCAGlobalRoot4096" +# Certificate "UCA Global Root" # # Issuer: CN=UCA Global Root,O=UniTrust,C=CN # Serial Number: 8 (0x8) @@ -22409,7 +22409,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SHECA_UCAGlobalRoot4096" +CKA_LABEL UTF8 "UCA Global Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\072\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -22523,7 +22523,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SHECA_UCAGlobalRoot4096" +# Trust for "UCA Global Root" # Issuer: CN=UCA Global Root,O=UniTrust,C=CN # Serial Number: 8 (0x8) # Subject: CN=UCA Global Root,O=UniTrust,C=CN @@ -22535,7 +22535,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SHECA_UCAGlobalRoot4096" +CKA_LABEL UTF8 "UCA Global Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \013\227\054\236\246\347\314\130\331\073\040\277\161\354\101\056 \162\011\372\277 @@ -22559,7 +22559,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SHECA_UCARoot2048" +# Certificate "UCA Root" # # Issuer: CN=UCA Root,O=UniTrust,C=CN # Serial Number: 9 (0x9) @@ -22572,7 +22572,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SHECA_UCARoot2048" +CKA_LABEL UTF8 "UCA Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\063\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -22653,7 +22653,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SHECA_UCARoot2048" +# Trust for "UCA Root" # Issuer: CN=UCA Root,O=UniTrust,C=CN # Serial Number: 9 (0x9) # Subject: CN=UCA Root,O=UniTrust,C=CN @@ -22665,7 +22665,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SHECA_UCARoot2048" +CKA_LABEL UTF8 "UCA Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \202\120\276\325\242\024\103\072\146\067\174\274\020\357\203\366 \151\332\072\147 @@ -22689,7 +22689,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "comodo_COMODOECCCertificationAuthority" +# Certificate "Sectigo (formerly Comodo CA) ECC" # # Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a @@ -22702,7 +22702,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "comodo_COMODOECCCertificationAuthority" +CKA_LABEL UTF8 "Sectigo (formerly Comodo CA) ECC" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 @@ -22778,7 +22778,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "comodo_COMODOECCCertificationAuthority" +# Trust for "Sectigo (formerly Comodo CA) ECC" # Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a # Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB @@ -22790,7 +22790,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "comodo_COMODOECCCertificationAuthority" +CKA_LABEL UTF8 "Sectigo (formerly Comodo CA) ECC" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216 \055\223\303\021 @@ -22820,7 +22820,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CHT_eCA" +# Certificate "Chunghwa Telecom Co. Ltd." # # Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW # Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d @@ -22833,7 +22833,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CHT_eCA" +CKA_LABEL UTF8 "Chunghwa Telecom Co. Ltd." CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -22954,7 +22954,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CHT_eCA" +# Trust for "Chunghwa Telecom Co. Ltd." # Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW # Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d # Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW @@ -22966,7 +22966,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CHT_eCA" +CKA_LABEL UTF8 "Chunghwa Telecom Co. Ltd." CKA_CERT_SHA1_HASH MULTILINE_OCTAL \147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342 \075\151\306\360 @@ -22993,7 +22993,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Certigna_Certigna" +# Certificate "Certigna" # # Issuer: CN=Certigna,O=Dhimyotis,C=FR # Serial Number:00:fe:dc:e3:01:0f:c9:48:ff @@ -23006,7 +23006,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certigna_Certigna" +CKA_LABEL UTF8 "Certigna" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061 @@ -23089,7 +23089,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Certigna_Certigna" +# Trust for "Certigna" # Issuer: CN=Certigna,O=Dhimyotis,C=FR # Serial Number:00:fe:dc:e3:01:0f:c9:48:ff # Subject: CN=Certigna,O=Dhimyotis,C=FR @@ -23101,7 +23101,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certigna_Certigna" +CKA_LABEL UTF8 "Certigna" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \261\056\023\143\105\206\244\157\032\262\140\150\067\130\055\304 \254\375\224\227 @@ -23125,7 +23125,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "POSTAR_POSTARCA" +# Certificate "POSTarCA" # # Issuer: OU=POSTArCA,O=POSTA,C=SI # Serial Number: 1044616010 (0x3e43934a) @@ -23138,7 +23138,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "POSTAR_POSTARCA" +CKA_LABEL UTF8 "POSTarCA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\060\061\013\060\011\006\003\125\004\006\023\002\123\111\061 @@ -23226,7 +23226,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "POSTAR_POSTARCA" +# Trust for "POSTarCA" # Issuer: OU=POSTArCA,O=POSTA,C=SI # Serial Number: 1044616010 (0x3e43934a) # Subject: OU=POSTArCA,O=POSTA,C=SI @@ -23238,7 +23238,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "POSTAR_POSTARCA" +CKA_LABEL UTF8 "POSTarCA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \261\352\303\345\270\044\166\351\325\013\036\306\175\054\301\036 \022\340\264\221 @@ -23262,7 +23262,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "izenpe_sa_ca_raiz2" +# Certificate "Izenpe.com" # # Issuer: CN=Izenpe.com,O=IZENPE S.A.,C=ES # Serial Number:06:e8:46:27:2f:1f:0a:8f:d1:84:5c:e3:69:f6:d5 @@ -23275,7 +23275,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "izenpe_sa_ca_raiz2" +CKA_LABEL UTF8 "Izenpe.com" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\070\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -23396,7 +23396,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "izenpe_sa_ca_raiz2" +# Trust for "Izenpe.com" # Issuer: CN=Izenpe.com,O=IZENPE S.A.,C=ES # Serial Number:06:e8:46:27:2f:1f:0a:8f:d1:84:5c:e3:69:f6:d5 # Subject: CN=Izenpe.com,O=IZENPE S.A.,C=ES @@ -23408,7 +23408,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "izenpe_sa_ca_raiz2" +CKA_LABEL UTF8 "Izenpe.com" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \060\167\236\223\025\002\056\224\205\152\077\370\274\370\025\260 \202\371\256\375 @@ -23433,7 +23433,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GlobalS_GSRootR1" +# Certificate "GlobalSign Root CA - R1" # # Issuer: CN=GlobalSign Root CA,OU=Root CA,O=GlobalSign nv-sa,C=BE # Serial Number:04:00:00:00:00:01:15:4b:5a:c3:94 @@ -23446,7 +23446,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_GSRootR1" +CKA_LABEL UTF8 "GlobalSign Root CA - R1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\127\061\013\060\011\006\003\125\004\006\023\002\102\105\061 @@ -23530,7 +23530,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GlobalS_GSRootR1" +# Trust for "GlobalSign Root CA - R1" # Issuer: CN=GlobalSign Root CA,OU=Root CA,O=GlobalSign nv-sa,C=BE # Serial Number:04:00:00:00:00:01:15:4b:5a:c3:94 # Subject: CN=GlobalSign Root CA,OU=Root CA,O=GlobalSign nv-sa,C=BE @@ -23542,7 +23542,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalS_GSRootR1" +CKA_LABEL UTF8 "GlobalSign Root CA - R1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \261\274\226\213\324\364\235\142\052\250\232\201\362\025\001\122 \244\035\202\234 @@ -23568,7 +23568,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NLB_ACNLB" +# Certificate "NLB Nova Ljubljanska Banka d.d. Ljubljana" # # Issuer: O=ACNLB,C=SI # Serial Number: 1053001358 (0x3ec3868e) @@ -23581,7 +23581,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NLB_ACNLB" +CKA_LABEL UTF8 "NLB Nova Ljubljanska Banka d.d. Ljubljana" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\035\061\013\060\011\006\003\125\004\006\023\002\123\111\061 @@ -23661,7 +23661,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NLB_ACNLB" +# Trust for "NLB Nova Ljubljanska Banka d.d. Ljubljana" # Issuer: O=ACNLB,C=SI # Serial Number: 1053001358 (0x3ec3868e) # Subject: O=ACNLB,C=SI @@ -23673,7 +23673,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NLB_ACNLB" +CKA_LABEL UTF8 "NLB Nova Ljubljanska Banka d.d. Ljubljana" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \004\126\362\075\036\234\103\256\313\015\200\177\034\006\107\125 \032\005\364\126 @@ -23695,7 +23695,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Abogacia_Root1" +# Certificate "Autoridad de Certificacion de la Abogacia" # # Issuer: CN=Autoridad de Certificacion de la Abogacia,O=Consejo General de la Abogacia NIF:Q-2863006I,C=ES # Serial Number:00:90:8b:32:4f:c1:90:1a:ce:b4:c3:38:09:cd:cf:e4 @@ -23708,7 +23708,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Abogacia_Root1" +CKA_LABEL UTF8 "Autoridad de Certificacion de la Abogacia" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\171\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -23817,7 +23817,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Abogacia_Root1" +# Trust for "Autoridad de Certificacion de la Abogacia" # Issuer: CN=Autoridad de Certificacion de la Abogacia,O=Consejo General de la Abogacia NIF:Q-2863006I,C=ES # Serial Number:00:90:8b:32:4f:c1:90:1a:ce:b4:c3:38:09:cd:cf:e4 # Subject: CN=Autoridad de Certificacion de la Abogacia,O=Consejo General de la Abogacia NIF:Q-2863006I,C=ES @@ -23829,7 +23829,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Abogacia_Root1" +CKA_LABEL UTF8 "Autoridad de Certificacion de la Abogacia" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \177\212\167\203\153\334\155\006\217\213\007\067\374\305\162\124 \023\006\214\244 @@ -23858,7 +23858,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "VRK_Root1" +# Certificate "VRK Gov. Root CA" # # Issuer: CN=VRK Gov. Root CA,OU=Varmennepalvelut,OU=Certification Authority Services,O=Vaestorekisterikeskus CA,ST=Finland,C=FI # Serial Number: 100000 (0x186a0) @@ -23871,7 +23871,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VRK_Root1" +CKA_LABEL UTF8 "VRK Gov. Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\243\061\013\060\011\006\003\125\004\006\023\002\106\111 @@ -23975,7 +23975,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "VRK_Root1" +# Trust for "VRK Gov. Root CA" # Issuer: CN=VRK Gov. Root CA,OU=Varmennepalvelut,OU=Certification Authority Services,O=Vaestorekisterikeskus CA,ST=Finland,C=FI # Serial Number: 100000 (0x186a0) # Subject: CN=VRK Gov. Root CA,OU=Varmennepalvelut,OU=Certification Authority Services,O=Vaestorekisterikeskus CA,ST=Finland,C=FI @@ -23987,7 +23987,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VRK_Root1" +CKA_LABEL UTF8 "VRK Gov. Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \372\247\331\373\061\267\106\362\000\250\136\145\171\166\023\330 \026\340\143\265 @@ -24018,7 +24018,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Visa_Root2" +# Certificate "Visa Information Delivery Root CA" # # Issuer: CN=Visa Information Delivery Root CA,OU=Visa International Service Association,O=VISA,C=US # Serial Number:5b:57:d7:a8:4c:b0:af:d9:d3:6f:4b:a0:31:b4:d6:e2 @@ -24031,7 +24031,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Visa_Root2" +CKA_LABEL UTF8 "Visa Information Delivery Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\171\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -24128,7 +24128,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Visa_Root2" +# Trust for "Visa Information Delivery Root CA" # Issuer: CN=Visa Information Delivery Root CA,OU=Visa International Service Association,O=VISA,C=US # Serial Number:5b:57:d7:a8:4c:b0:af:d9:d3:6f:4b:a0:31:b4:d6:e2 # Subject: CN=Visa Information Delivery Root CA,OU=Visa International Service Association,O=VISA,C=US @@ -24140,7 +24140,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Visa_Root2" +CKA_LABEL UTF8 "Visa Information Delivery Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \132\115\016\213\137\334\375\366\116\162\231\243\154\006\015\262 \042\312\170\344 @@ -24169,7 +24169,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ArgeDaten_globaltrust2006" +# Certificate "Austrian Society for Data Protection GLOBALTRUST Certification Service" # # Issuer: E=info@globaltrust.info,CN=GLOBALTRUST,OU=GLOBALTRUST Certification Service,O=ARGE DATEN - Austrian Society for Data Protection,ST=Austria,L=Vienna,C=AT # Serial Number: 0 (0x0) @@ -24182,7 +24182,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ArgeDaten_globaltrust2006" +CKA_LABEL UTF8 "Austrian Society for Data Protection GLOBALTRUST Certification Service" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\324\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -24355,7 +24355,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ArgeDaten_globaltrust2006" +# Trust for "Austrian Society for Data Protection GLOBALTRUST Certification Service" # Issuer: E=info@globaltrust.info,CN=GLOBALTRUST,OU=GLOBALTRUST Certification Service,O=ARGE DATEN - Austrian Society for Data Protection,ST=Austria,L=Vienna,C=AT # Serial Number: 0 (0x0) # Subject: E=info@globaltrust.info,CN=GLOBALTRUST,OU=GLOBALTRUST Certification Service,O=ARGE DATEN - Austrian Society for Data Protection,ST=Austria,L=Vienna,C=AT @@ -24367,7 +24367,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ArgeDaten_globaltrust2006" +CKA_LABEL UTF8 "Austrian Society for Data Protection GLOBALTRUST Certification Service" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \064\054\331\323\006\055\244\214\064\151\145\051\177\010\036\274 \056\366\217\334 @@ -24401,7 +24401,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "globals_GSRootR2" +# Certificate "Google Trust Services - GlobalSign Root CA-R2" # # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R2 # Serial Number:04:00:00:00:00:01:0f:86:26:e6:0d @@ -24414,7 +24414,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "globals_GSRootR2" +CKA_LABEL UTF8 "Google Trust Services - GlobalSign Root CA-R2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 @@ -24500,7 +24500,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "globals_GSRootR2" +# Trust for "Google Trust Services - GlobalSign Root CA-R2" # Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R2 # Serial Number:04:00:00:00:00:01:0f:86:26:e6:0d # Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R2 @@ -24512,7 +24512,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "globals_GSRootR2" +CKA_LABEL UTF8 "Google Trust Services - GlobalSign Root CA-R2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \165\340\253\266\023\205\022\047\034\004\370\137\335\336\070\344 \267\044\056\376 @@ -24537,7 +24537,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "frenchgov_DCSSI_rsa" +# Certificate "Secrétariat Général de la Défense Nationale" # # Issuer: E=igca@sgdn.pm.gouv.fr,CN=IGC/A,OU=DCSSI,O=PM/SGDN,L=Paris,ST=France,C=FR # Serial Number:39:11:45:10:94 @@ -24550,7 +24550,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "frenchgov_DCSSI_rsa" +CKA_LABEL UTF8 "Secrétariat Général de la Défense Nationale" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\205\061\013\060\011\006\003\125\004\006\023\002\106\122 @@ -24649,7 +24649,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "frenchgov_DCSSI_rsa" +# Trust for "Secrétariat Général de la Défense Nationale" # Issuer: E=igca@sgdn.pm.gouv.fr,CN=IGC/A,OU=DCSSI,O=PM/SGDN,L=Paris,ST=France,C=FR # Serial Number:39:11:45:10:94 # Subject: E=igca@sgdn.pm.gouv.fr,CN=IGC/A,OU=DCSSI,O=PM/SGDN,L=Paris,ST=France,C=FR @@ -24661,7 +24661,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "frenchgov_DCSSI_rsa" +CKA_LABEL UTF8 "Secrétariat Général de la Défense Nationale" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \140\326\211\164\265\302\145\236\212\017\301\210\174\210\322\106 \151\033\030\054 @@ -24690,7 +24690,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "wisekey_owrgbca" +# Certificate "OISTE WISeKey Global Root GB CA" # # Issuer: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH # Serial Number:76:b1:20:52:74:f0:85:87:46:b3:f8:23:1a:f6:c2:c0 @@ -24703,7 +24703,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "wisekey_owrgbca" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GB CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -24794,7 +24794,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "wisekey_owrgbca" +# Trust for "OISTE WISeKey Global Root GB CA" # Issuer: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH # Serial Number:76:b1:20:52:74:f0:85:87:46:b3:f8:23:1a:f6:c2:c0 # Subject: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH @@ -24806,7 +24806,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "wisekey_owrgbca" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GB CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \017\371\100\166\030\323\327\152\113\230\360\250\065\236\014\375 \047\254\314\355 @@ -24834,7 +24834,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "wisekey_owgrgaca" +# Certificate "OISTE WISeKey Global Root GA CA" # # Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH # Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a @@ -24847,7 +24847,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "wisekey_owgrgaca" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110 @@ -24946,7 +24946,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "wisekey_owgrgaca" +# Trust for "OISTE WISeKey Global Root GA CA" # Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH # Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a # Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH @@ -24958,7 +24958,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "wisekey_owgrgaca" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \131\042\241\341\132\352\026\065\041\370\230\071\152\106\106\260 \104\033\017\251 @@ -24988,7 +24988,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SwissSign_Platinum_G2" +# Certificate "SwissSign Platinum G2 Root CA" # # Issuer: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH # Serial Number:4e:b2:00:67:0c:03:5d:4f @@ -25001,7 +25001,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Platinum_G2" +CKA_LABEL UTF8 "SwissSign Platinum G2 Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\111\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -25120,7 +25120,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SwissSign_Platinum_G2" +# Trust for "SwissSign Platinum G2 Root CA" # Issuer: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH # Serial Number:4e:b2:00:67:0c:03:5d:4f # Subject: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH @@ -25132,7 +25132,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Platinum_G2" +CKA_LABEL UTF8 "SwissSign Platinum G2 Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \126\340\372\300\073\217\030\043\125\030\345\323\021\312\350\302 \103\061\253\146 @@ -25157,7 +25157,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SwissSign_Gold_G2" +# Certificate "SwissSign" # # Issuer: CN=SwissSign Gold CA - G2,O=SwissSign AG,C=CH # Serial Number:00:bb:40:1c:43:f5:5e:4f:b0 @@ -25170,7 +25170,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Gold_G2" +CKA_LABEL UTF8 "SwissSign" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -25288,7 +25288,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SwissSign_Gold_G2" +# Trust for "SwissSign" # Issuer: CN=SwissSign Gold CA - G2,O=SwissSign AG,C=CH # Serial Number:00:bb:40:1c:43:f5:5e:4f:b0 # Subject: CN=SwissSign Gold CA - G2,O=SwissSign AG,C=CH @@ -25300,7 +25300,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Gold_G2" +CKA_LABEL UTF8 "SwissSign" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \330\305\070\212\267\060\033\033\156\324\172\346\105\045\072\157 \237\032\047\141 @@ -25325,7 +25325,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SwissSign_Silver_G2" +# Certificate "SwissSign Silver G2 Root CA" # # Issuer: CN=SwissSign Silver CA - G2,O=SwissSign AG,C=CH # Serial Number:4f:1b:d4:2f:54:bb:2f:4b @@ -25338,7 +25338,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Silver_G2" +CKA_LABEL UTF8 "SwissSign Silver G2 Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -25457,7 +25457,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SwissSign_Silver_G2" +# Trust for "SwissSign Silver G2 Root CA" # Issuer: CN=SwissSign Silver CA - G2,O=SwissSign AG,C=CH # Serial Number:4f:1b:d4:2f:54:bb:2f:4b # Subject: CN=SwissSign Silver CA - G2,O=SwissSign AG,C=CH @@ -25469,7 +25469,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign_Silver_G2" +CKA_LABEL UTF8 "SwissSign Silver G2 Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \233\252\345\237\126\356\041\313\103\132\276\045\223\337\247\360 \100\321\035\313 @@ -25494,7 +25494,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "geotrust_GeoTrust_Primary_Root_CA" +# Certificate "GeoTrust" # # Issuer: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US # Serial Number:18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1 @@ -25507,7 +25507,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "geotrust_GeoTrust_Primary_Root_CA" +CKA_LABEL UTF8 "GeoTrust" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -25592,7 +25592,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "geotrust_GeoTrust_Primary_Root_CA" +# Trust for "GeoTrust" # Issuer: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US # Serial Number:18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1 # Subject: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US @@ -25604,7 +25604,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "geotrust_GeoTrust_Primary_Root_CA" +CKA_LABEL UTF8 "GeoTrust" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \062\074\021\216\033\367\270\266\122\124\342\342\020\015\326\002 \220\067\360\226 @@ -25631,7 +25631,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "thawte_Thawte_Primary_Root_CA" +# Certificate "thawte" # # Issuer: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US # Serial Number:34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d @@ -25644,7 +25644,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte_Thawte_Primary_Root_CA" +CKA_LABEL UTF8 "thawte" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -25750,7 +25750,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "thawte_Thawte_Primary_Root_CA" +# Trust for "thawte" # Issuer: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US # Serial Number:34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d # Subject: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US @@ -25762,7 +25762,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "thawte_Thawte_Primary_Root_CA" +CKA_LABEL UTF8 "thawte" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \221\306\326\356\076\212\310\143\204\345\110\302\231\051\134\165 \154\201\173\201 @@ -25794,7 +25794,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "verisign_VRSN_C3_PCA_G5_Root_CA" +# Certificate "VeriSign" # # Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a @@ -25807,7 +25807,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "verisign_VRSN_C3_PCA_G5_Root_CA" +CKA_LABEL UTF8 "VeriSign" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -25928,7 +25928,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "verisign_VRSN_C3_PCA_G5_Root_CA" +# Trust for "VeriSign" # Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a # Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US @@ -25940,7 +25940,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "verisign_VRSN_C3_PCA_G5_Root_CA" +CKA_LABEL UTF8 "VeriSign" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \116\266\325\170\111\233\034\317\137\130\036\255\126\276\075\233 \147\104\245\345 @@ -25974,7 +25974,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "xramp_Secure_Global_CA_Certificate" +# Certificate "Trustwave" # # Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US # Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5 @@ -25987,7 +25987,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "xramp_Secure_Global_CA_Certificate" +CKA_LABEL UTF8 "Trustwave" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -26074,7 +26074,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "xramp_Secure_Global_CA_Certificate" +# Trust for "Trustwave" # Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US # Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5 # Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US @@ -26086,7 +26086,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "xramp_Secure_Global_CA_Certificate" +CKA_LABEL UTF8 "Trustwave" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \072\104\163\132\345\201\220\037\044\206\141\106\036\073\234\304 \137\365\072\033 @@ -26112,7 +26112,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "xramp_SecureTrust_CA_Certificate" +# Certificate "Trustwave" # # Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US # Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0 @@ -26125,7 +26125,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "xramp_SecureTrust_CA_Certificate" +CKA_LABEL UTF8 "Trustwave" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -26212,7 +26212,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "xramp_SecureTrust_CA_Certificate" +# Trust for "Trustwave" # Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US # Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0 # Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US @@ -26224,7 +26224,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "xramp_SecureTrust_CA_Certificate" +CKA_LABEL UTF8 "Trustwave" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \207\202\306\303\004\065\073\317\322\226\222\322\131\076\175\104 \331\064\377\021 @@ -26250,7 +26250,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Entrust_EntrustRootCACert" +# Certificate "Entrust" # # Issuer: CN=Entrust Root Certification Authority,OU="(c) 2006 Entrust, Inc.",OU=www.entrust.net/CPS is incorporated by reference,O="Entrust, Inc.",C=US # Serial Number: 1164660820 (0x456b5054) @@ -26263,7 +26263,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_EntrustRootCACert" +CKA_LABEL UTF8 "Entrust" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\260\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -26377,7 +26377,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Entrust_EntrustRootCACert" +# Trust for "Entrust" # Issuer: CN=Entrust Root Certification Authority,OU="(c) 2006 Entrust, Inc.",OU=www.entrust.net/CPS is incorporated by reference,O="Entrust, Inc.",C=US # Serial Number: 1164660820 (0x456b5054) # Subject: CN=Entrust Root Certification Authority,OU="(c) 2006 Entrust, Inc.",OU=www.entrust.net/CPS is incorporated by reference,O="Entrust, Inc.",C=US @@ -26389,7 +26389,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust_EntrustRootCACert" +CKA_LABEL UTF8 "Entrust" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \263\036\261\267\100\343\154\204\002\332\334\067\324\115\365\324 \147\111\122\371 @@ -26421,7 +26421,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCert_Assured_ID_Root_CA" +# Certificate "DigiCert" # # Issuer: CN=DigiCert Assured ID Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:0c:e7:e0:e5:17:d8:46:fe:8f:e5:60:fc:1b:f0:30:39 @@ -26434,7 +26434,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCert_Assured_ID_Root_CA" +CKA_LABEL UTF8 "DigiCert" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\145\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -26525,7 +26525,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCert_Assured_ID_Root_CA" +# Trust for "DigiCert" # Issuer: CN=DigiCert Assured ID Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:0c:e7:e0:e5:17:d8:46:fe:8f:e5:60:fc:1b:f0:30:39 # Subject: CN=DigiCert Assured ID Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -26537,7 +26537,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCert_Assured_ID_Root_CA" +CKA_LABEL UTF8 "DigiCert" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \005\143\270\143\015\142\327\132\273\310\253\036\113\337\265\250 \231\262\115\103 @@ -26565,7 +26565,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCert_Global_Root_CA" +# Certificate "DigiCert" # # Issuer: CN=DigiCert Global Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:08:3b:e0:56:90:42:46:b1:a1:75:6a:c9:59:91:c7:4a @@ -26578,7 +26578,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCert_Global_Root_CA" +CKA_LABEL UTF8 "DigiCert" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -26669,7 +26669,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCert_Global_Root_CA" +# Trust for "DigiCert" # Issuer: CN=DigiCert Global Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:08:3b:e0:56:90:42:46:b1:a1:75:6a:c9:59:91:c7:4a # Subject: CN=DigiCert Global Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -26681,7 +26681,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCert_Global_Root_CA" +CKA_LABEL UTF8 "DigiCert" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \250\230\135\072\145\345\345\304\262\327\326\155\100\306\335\057 \261\234\124\066 @@ -26709,7 +26709,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "digicert_DigiCert_High_Assurance_EV_Root_CA" +# Certificate "DigiCert" # # Issuer: CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:02:ac:5c:26:6a:0b:40:9b:8f:0b:79:f2:ae:46:25:77 @@ -26722,7 +26722,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCert_High_Assurance_EV_Root_CA" +CKA_LABEL UTF8 "DigiCert" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\154\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -26814,7 +26814,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "digicert_DigiCert_High_Assurance_EV_Root_CA" +# Trust for "DigiCert" # Issuer: CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US # Serial Number:02:ac:5c:26:6a:0b:40:9b:8f:0b:79:f2:ae:46:25:77 # Subject: CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US @@ -26826,7 +26826,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "digicert_DigiCert_High_Assurance_EV_Root_CA" +CKA_LABEL UTF8 "DigiCert" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \137\267\356\006\063\342\131\333\255\014\114\232\346\323\217\032 \141\307\334\045 @@ -26854,7 +26854,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "QuoVadis_qvrca2" +# Certificate "QuoVadis Root CA 2" # # Issuer: CN=QuoVadis Root CA 2,O=QuoVadis Limited,C=BM # Serial Number: 1289 (0x509) @@ -26867,7 +26867,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca2" +CKA_LABEL UTF8 "QuoVadis Root CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\013\060\011\006\003\125\004\006\023\002\102\115\061 @@ -26985,7 +26985,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "QuoVadis_qvrca2" +# Trust for "QuoVadis Root CA 2" # Issuer: CN=QuoVadis Root CA 2,O=QuoVadis Limited,C=BM # Serial Number: 1289 (0x509) # Subject: CN=QuoVadis Root CA 2,O=QuoVadis Limited,C=BM @@ -26997,7 +26997,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca2" +CKA_LABEL UTF8 "QuoVadis Root CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \312\072\373\317\022\100\066\113\104\262\026\040\210\200\110\071 \031\223\174\367 @@ -27022,7 +27022,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "QuoVadis_qvrca3" +# Certificate "QuoVadis Root CA 3" # # Issuer: CN=QuoVadis Root CA 3,O=QuoVadis Limited,C=BM # Serial Number: 1478 (0x5c6) @@ -27035,7 +27035,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca3" +CKA_LABEL UTF8 "QuoVadis Root CA 3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\013\060\011\006\003\125\004\006\023\002\102\115\061 @@ -27168,7 +27168,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "QuoVadis_qvrca3" +# Trust for "QuoVadis Root CA 3" # Issuer: CN=QuoVadis Root CA 3,O=QuoVadis Limited,C=BM # Serial Number: 1478 (0x5c6) # Subject: CN=QuoVadis Root CA 3,O=QuoVadis Limited,C=BM @@ -27180,7 +27180,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_qvrca3" +CKA_LABEL UTF8 "QuoVadis Root CA 3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \037\111\024\367\330\164\225\035\335\256\002\300\276\375\072\055 \202\165\121\205 @@ -27205,7 +27205,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Spanishgov_ACRAIZ_CERTIFICATE_AND_CRL_SIGNING_SHA1" +# Certificate "DIRECCION GENERAL DE LA POLICIA" # # Issuer: CN=AC RAIZ DNIE,OU=DNIE,O=DIRECCION GENERAL DE LA POLICIA,C=ES # Serial Number:00:d2:85:70:fd:ae:a7:d6:5f:11:84:15:c6:31:b5:cb @@ -27218,7 +27218,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Spanishgov_ACRAIZ_CERTIFICATE_AND_CRL_SIGNING_SHA1" +CKA_LABEL UTF8 "DIRECCION GENERAL DE LA POLICIA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\135\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -27340,7 +27340,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Spanishgov_ACRAIZ_CERTIFICATE_AND_CRL_SIGNING_SHA1" +# Trust for "DIRECCION GENERAL DE LA POLICIA" # Issuer: CN=AC RAIZ DNIE,OU=DNIE,O=DIRECCION GENERAL DE LA POLICIA,C=ES # Serial Number:00:d2:85:70:fd:ae:a7:d6:5f:11:84:15:c6:31:b5:cb # Subject: CN=AC RAIZ DNIE,OU=DNIE,O=DIRECCION GENERAL DE LA POLICIA,C=ES @@ -27352,7 +27352,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Spanishgov_ACRAIZ_CERTIFICATE_AND_CRL_SIGNING_SHA1" +CKA_LABEL UTF8 "DIRECCION GENERAL DE LA POLICIA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \263\217\354\354\013\024\212\246\206\303\320\017\001\354\310\204 \216\200\205\353 @@ -27379,7 +27379,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "catcert_EC-ACC_csrs" +# Certificate "Agencia Catalana de Certificacio (NIF Q-0801176-I)" # # Issuer: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES # Serial Number:ee:2b:3d:eb:d4:21:de:14:a8:62:ac:04:f3:dd:c4:01 @@ -27392,7 +27392,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "catcert_EC-ACC_csrs" +CKA_LABEL UTF8 "Agencia Catalana de Certificacio (NIF Q-0801176-I)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\363\061\013\060\011\006\003\125\004\006\023\002\105\123 @@ -27527,7 +27527,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "catcert_EC-ACC_csrs" +# Trust for "Agencia Catalana de Certificacio (NIF Q-0801176-I)" # Issuer: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES # Serial Number:ee:2b:3d:eb:d4:21:de:14:a8:62:ac:04:f3:dd:c4:01 # Subject: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES @@ -27539,7 +27539,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "catcert_EC-ACC_csrs" +CKA_LABEL UTF8 "Agencia Catalana de Certificacio (NIF Q-0801176-I)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \050\220\072\143\133\122\200\372\346\167\114\013\155\247\326\272 \246\112\362\350 @@ -27576,7 +27576,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Atrust_nQual03new" +# Certificate "A-Trust-nQual-03" # # Issuer: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1357049 (0x14b4f9) @@ -27589,7 +27589,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Atrust_nQual03new" +CKA_LABEL UTF8 "A-Trust-nQual-03" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\215\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -27685,7 +27685,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Atrust_nQual03new" +# Trust for "A-Trust-nQual-03" # Issuer: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1357049 (0x14b4f9) # Subject: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT @@ -27697,7 +27697,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Atrust_nQual03new" +CKA_LABEL UTF8 "A-Trust-nQual-03" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \114\256\343\211\061\321\232\347\073\061\252\165\312\063\326\041 \051\017\247\136 @@ -27726,7 +27726,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "DigSigT_X3" +# Certificate "DST Root CA X3" # # Issuer: CN=DST Root CA X3,O=Digital Signature Trust Co. # Serial Number:44:af:b0:80:d6:a3:27:ba:89:30:39:86:2e:f8:40:6b @@ -27739,7 +27739,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigSigT_X3" +CKA_LABEL UTF8 "DST Root CA X3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\077\061\044\060\042\006\003\125\004\012\023\033\104\151\147 @@ -27819,7 +27819,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "DigSigT_X3" +# Trust for "DST Root CA X3" # Issuer: CN=DST Root CA X3,O=Digital Signature Trust Co. # Serial Number:44:af:b0:80:d6:a3:27:ba:89:30:39:86:2e:f8:40:6b # Subject: CN=DST Root CA X3,O=Digital Signature Trust Co. @@ -27831,7 +27831,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigSigT_X3" +CKA_LABEL UTF8 "DST Root CA X3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \332\311\002\117\124\330\366\337\224\223\137\261\163\046\070\312 \152\327\174\023 @@ -27857,7 +27857,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "kisa_Wire" +# Certificate "KISA RootCA 1" # # Issuer: CN=KISA RootCA 1,OU=Korea Certification Authority Central,O=KISA,C=KR # Serial Number: 4 (0x4) @@ -27870,7 +27870,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "kisa_Wire" +CKA_LABEL UTF8 "KISA RootCA 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\144\061\013\060\011\006\003\125\004\006\023\002\113\122\061 @@ -27956,7 +27956,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "kisa_Wire" +# Trust for "KISA RootCA 1" # Issuer: CN=KISA RootCA 1,OU=Korea Certification Authority Central,O=KISA,C=KR # Serial Number: 4 (0x4) # Subject: CN=KISA RootCA 1,OU=Korea Certification Authority Central,O=KISA,C=KR @@ -27968,7 +27968,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "kisa_Wire" +CKA_LABEL UTF8 "KISA RootCA 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \002\162\150\051\076\137\135\027\252\244\263\303\346\066\036\037 \222\127\136\252 @@ -27995,7 +27995,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "godaddy_GD-Class2-root" +# Certificate "Go Daddy Class 2 Certification Authority" # # Issuer: OU=Go Daddy Class 2 Certification Authority,O="The Go Daddy Group, Inc.",C=US # Serial Number: 0 (0x0) @@ -28008,7 +28008,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "godaddy_GD-Class2-root" +CKA_LABEL UTF8 "Go Daddy Class 2 Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -28103,7 +28103,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "godaddy_GD-Class2-root" +# Trust for "Go Daddy Class 2 Certification Authority" # Issuer: OU=Go Daddy Class 2 Certification Authority,O="The Go Daddy Group, Inc.",C=US # Serial Number: 0 (0x0) # Subject: OU=Go Daddy Class 2 Certification Authority,O="The Go Daddy Group, Inc.",C=US @@ -28115,7 +28115,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "godaddy_GD-Class2-root" +CKA_LABEL UTF8 "Go Daddy Class 2 Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \047\226\272\346\077\030\001\342\167\046\033\240\327\167\160\002 \217\040\356\344 @@ -28142,7 +28142,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "godaddy_SF-Class2-root" +# Certificate "Starfield Class 2 Certification Authority" # # Issuer: OU=Starfield Class 2 Certification Authority,O="Starfield Technologies, Inc.",C=US # Serial Number: 0 (0x0) @@ -28155,7 +28155,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "godaddy_SF-Class2-root" +CKA_LABEL UTF8 "Starfield Class 2 Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\150\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -28251,7 +28251,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "godaddy_SF-Class2-root" +# Trust for "Starfield Class 2 Certification Authority" # Issuer: OU=Starfield Class 2 Certification Authority,O="Starfield Technologies, Inc.",C=US # Serial Number: 0 (0x0) # Subject: OU=Starfield Class 2 Certification Authority,O="Starfield Technologies, Inc.",C=US @@ -28263,7 +28263,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "godaddy_SF-Class2-root" +CKA_LABEL UTF8 "Starfield Class 2 Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \255\176\034\050\260\144\357\217\140\003\100\040\024\303\320\343 \067\016\265\212 @@ -28290,7 +28290,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "visa_RootCA" +# Certificate "Visa eCommerce Root" # # Issuer: CN=Visa eCommerce Root,OU=Visa International Service Association,O=VISA,C=US # Serial Number:13:86:35:4d:1d:3f:06:f2:c1:f9:65:05:d5:90:1c:62 @@ -28303,7 +28303,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "visa_RootCA" +CKA_LABEL UTF8 "Visa eCommerce Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\153\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -28393,7 +28393,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "visa_RootCA" +# Trust for "Visa eCommerce Root" # Issuer: CN=Visa eCommerce Root,OU=Visa International Service Association,O=VISA,C=US # Serial Number:13:86:35:4d:1d:3f:06:f2:c1:f9:65:05:d5:90:1c:62 # Subject: CN=Visa eCommerce Root,OU=Visa International Service Association,O=VISA,C=US @@ -28405,7 +28405,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "visa_RootCA" +CKA_LABEL UTF8 "Visa eCommerce Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \160\027\233\206\214\000\244\372\140\221\122\042\077\237\076\062 \275\340\005\142 @@ -28433,7 +28433,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "xramp_XGCA" +# Certificate "Trustwave" # # Issuer: CN=XRamp Global Certification Authority,O=XRamp Security Services Inc,OU=www.xrampsecurity.com,C=US # Serial Number:50:94:6c:ec:18:ea:d5:9c:4d:d5:97:ef:75:8f:a0:ad @@ -28446,7 +28446,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "xramp_XGCA" +CKA_LABEL UTF8 "Trustwave" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\202\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -28549,7 +28549,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "xramp_XGCA" +# Trust for "Trustwave" # Issuer: CN=XRamp Global Certification Authority,O=XRamp Security Services Inc,OU=www.xrampsecurity.com,C=US # Serial Number:50:94:6c:ec:18:ea:d5:9c:4d:d5:97:ef:75:8f:a0:ad # Subject: CN=XRamp Global Certification Authority,O=XRamp Security Services Inc,OU=www.xrampsecurity.com,C=US @@ -28561,7 +28561,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "xramp_XGCA" +CKA_LABEL UTF8 "Trustwave" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \270\001\206\321\353\234\206\245\101\004\317\060\124\363\114\122 \267\345\130\306 @@ -28591,7 +28591,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "secom_secom" +# Certificate "SECOM Trust Systems CO LTD" # # Issuer: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP # Serial Number: 0 (0x0) @@ -28604,7 +28604,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "secom_secom" +CKA_LABEL UTF8 "SECOM Trust Systems CO LTD" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -28686,7 +28686,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "secom_secom" +# Trust for "SECOM Trust Systems CO LTD" # Issuer: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP # Serial Number: 0 (0x0) # Subject: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP @@ -28698,7 +28698,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "secom_secom" +CKA_LABEL UTF8 "SECOM Trust Systems CO LTD" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \066\261\053\111\371\201\236\327\114\236\274\070\017\306\126\217 \135\254\262\367 @@ -28724,7 +28724,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "grca_grca" +# Certificate "TW Government Root Certification Authority" # # Issuer: O=Government Root Certification Authority,C=TW # Serial Number:1f:9d:59:5a:d7:2f:c2:06:44:a5:80:08:69:e3:5e:f6 @@ -28737,7 +28737,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "grca_grca" +CKA_LABEL UTF8 "TW Government Root Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\077\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -28852,7 +28852,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "grca_grca" +# Trust for "TW Government Root Certification Authority" # Issuer: O=Government Root Certification Authority,C=TW # Serial Number:1f:9d:59:5a:d7:2f:c2:06:44:a5:80:08:69:e3:5e:f6 # Subject: O=Government Root Certification Authority,C=TW @@ -28864,7 +28864,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "grca_grca" +CKA_LABEL UTF8 "TW Government Root Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \364\213\021\277\336\253\276\224\124\040\161\346\101\336\153\276 \210\053\100\271 @@ -28890,7 +28890,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "HongKongPost_RootCA1" +# Certificate "Hongkong Post Root CA 1" # # Issuer: CN=Hongkong Post Root CA 1,O=Hongkong Post,C=HK # Serial Number: 1000 (0x3e8) @@ -28903,7 +28903,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "HongKongPost_RootCA1" +CKA_LABEL UTF8 "Hongkong Post Root CA 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061 @@ -28981,7 +28981,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "HongKongPost_RootCA1" +# Trust for "Hongkong Post Root CA 1" # Issuer: CN=Hongkong Post Root CA 1,O=Hongkong Post,C=HK # Serial Number: 1000 (0x3e8) # Subject: CN=Hongkong Post Root CA 1,O=Hongkong Post,C=HK @@ -28993,7 +28993,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "HongKongPost_RootCA1" +CKA_LABEL UTF8 "Hongkong Post Root CA 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262 \130\262\212\130 @@ -29018,7 +29018,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Trustis_FPSRootCA" +# Certificate "Trustis FPS Root CA" # # Issuer: OU=Trustis FPS Root CA,O=Trustis Limited,C=GB # Serial Number:1b:1f:ad:b6:20:f9:24:d3:36:6b:f7:c7:f1:8c:a0:59 @@ -29031,7 +29031,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustis_FPSRootCA" +CKA_LABEL UTF8 "Trustis FPS Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\013\060\011\006\003\125\004\006\023\002\107\102\061 @@ -29113,7 +29113,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Trustis_FPSRootCA" +# Trust for "Trustis FPS Root CA" # Issuer: OU=Trustis FPS Root CA,O=Trustis Limited,C=GB # Serial Number:1b:1f:ad:b6:20:f9:24:d3:36:6b:f7:c7:f1:8c:a0:59 # Subject: OU=Trustis FPS Root CA,O=Trustis Limited,C=GB @@ -29125,7 +29125,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustis_FPSRootCA" +CKA_LABEL UTF8 "Trustis FPS Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \073\300\070\013\063\303\366\246\014\206\025\042\223\331\337\365 \113\201\300\004 @@ -29151,7 +29151,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Camerfirma_CommerceRoot" +# Certificate "Chambers of Commerce Root" # # Issuer: CN=Chambers of Commerce Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU # Serial Number: 0 (0x0) @@ -29164,7 +29164,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_CommerceRoot" +CKA_LABEL UTF8 "Chambers of Commerce Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\177\061\013\060\011\006\003\125\004\006\023\002\105\125\061 @@ -29275,7 +29275,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Camerfirma_CommerceRoot" +# Trust for "Chambers of Commerce Root" # Issuer: CN=Chambers of Commerce Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU # Serial Number: 0 (0x0) # Subject: CN=Chambers of Commerce Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU @@ -29287,7 +29287,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_CommerceRoot" +CKA_LABEL UTF8 "Chambers of Commerce Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \156\072\125\244\031\014\031\134\223\204\074\300\333\162\056\061 \060\141\360\261 @@ -29316,7 +29316,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Camerfirma_GlobalRoot" +# Certificate "Chambersign Global Root" # # Issuer: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU # Serial Number: 0 (0x0) @@ -29329,7 +29329,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_GlobalRoot" +CKA_LABEL UTF8 "Chambersign Global Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\175\061\013\060\011\006\003\125\004\006\023\002\105\125\061 @@ -29438,7 +29438,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Camerfirma_GlobalRoot" +# Trust for "Chambersign Global Root" # Issuer: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU # Serial Number: 0 (0x0) # Subject: CN=Global Chambersign Root,OU=http://www.chambersign.org,O=AC Camerfirma SA CIF A82743287,C=EU @@ -29450,7 +29450,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Camerfirma_GlobalRoot" +CKA_LABEL UTF8 "Chambersign Global Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \063\233\153\024\120\044\233\125\172\001\207\162\204\331\340\057 \303\322\330\351 @@ -29478,7 +29478,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Comodo_AAA" +# Certificate "Sectigo (AAA)" # # Issuer: CN=AAA Certificate Services,O=Comodo CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number: 1 (0x1) @@ -29491,7 +29491,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_AAA" +CKA_LABEL UTF8 "Sectigo (AAA)" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\173\061\013\060\011\006\003\125\004\006\023\002\107\102\061 @@ -29591,7 +29591,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Comodo_AAA" +# Trust for "Sectigo (AAA)" # Issuer: CN=AAA Certificate Services,O=Comodo CA Limited,L=Salford,ST=Greater Manchester,C=GB # Serial Number: 1 (0x1) # Subject: CN=AAA Certificate Services,O=Comodo CA Limited,L=Salford,ST=Greater Manchester,C=GB @@ -29603,7 +29603,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Comodo_AAA" +CKA_LABEL UTF8 "Sectigo (AAA)" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \321\353\043\244\155\027\326\217\331\045\144\302\361\361\140\027 \144\330\343\111 @@ -29631,7 +29631,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust_GlobalCA" +# Certificate "GeoTrust Global CA" # # Issuer: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US # Serial Number: 144470 (0x23456) @@ -29644,7 +29644,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_GlobalCA" +CKA_LABEL UTF8 "GeoTrust Global CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -29724,7 +29724,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GeoTrust_GlobalCA" +# Trust for "GeoTrust Global CA" # Issuer: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US # Serial Number: 144470 (0x23456) # Subject: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US @@ -29736,7 +29736,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_GlobalCA" +CKA_LABEL UTF8 "GeoTrust Global CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \336\050\364\244\377\345\271\057\243\305\003\321\243\111\247\371 \226\052\202\022 @@ -29761,7 +29761,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust_UniversalCA" +# Certificate "GeoTrust Universal CA" # # Issuer: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US # Serial Number: 1 (0x1) @@ -29774,7 +29774,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_UniversalCA" +CKA_LABEL UTF8 "GeoTrust Universal CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -29887,7 +29887,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GeoTrust_UniversalCA" +# Trust for "GeoTrust Universal CA" # Issuer: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US # Serial Number: 1 (0x1) # Subject: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US @@ -29899,7 +29899,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_UniversalCA" +CKA_LABEL UTF8 "GeoTrust Universal CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \346\041\363\065\103\171\005\232\113\150\060\235\212\057\164\042 \025\207\354\171 @@ -29924,7 +29924,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GeoTrust_UniversalCA2" +# Certificate "GeoTrust Universal CA 2" # # Issuer: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US # Serial Number: 1 (0x1) @@ -29937,7 +29937,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_UniversalCA2" +CKA_LABEL UTF8 "GeoTrust Universal CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -30050,7 +30050,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GeoTrust_UniversalCA2" +# Trust for "GeoTrust Universal CA 2" # Issuer: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US # Serial Number: 1 (0x1) # Subject: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US @@ -30062,7 +30062,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GeoTrust_UniversalCA2" +CKA_LABEL UTF8 "GeoTrust Universal CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \067\232\031\173\101\205\105\065\014\246\003\151\363\074\056\257 \107\117\040\171 @@ -30087,7 +30087,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "QuoVadis_RootCA" +# Certificate "QuoVadis Root Certification Authority" # # Issuer: CN=QuoVadis Root Certification Authority,OU=Root Certification Authority,O=QuoVadis Limited,C=BM # Serial Number: 985026699 (0x3ab6508b) @@ -30100,7 +30100,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_RootCA" +CKA_LABEL UTF8 "QuoVadis Root Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\177\061\013\060\011\006\003\125\004\006\023\002\102\115\061 @@ -30228,7 +30228,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "QuoVadis_RootCA" +# Trust for "QuoVadis Root Certification Authority" # Issuer: CN=QuoVadis Root Certification Authority,OU=Root Certification Authority,O=QuoVadis Limited,C=BM # Serial Number: 985026699 (0x3ab6508b) # Subject: CN=QuoVadis Root Certification Authority,OU=Root Certification Authority,O=QuoVadis Limited,C=BM @@ -30240,7 +30240,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "QuoVadis_RootCA" +CKA_LABEL UTF8 "QuoVadis Root Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \336\077\100\275\120\223\323\233\154\140\366\332\274\007\142\001 \000\211\166\311 @@ -30269,7 +30269,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Sonera_Class2CA" +# Certificate "Sonera Class2 CA" # # Issuer: CN=Sonera Class2 CA,O=Sonera,C=FI # Serial Number: 29 (0x1d) @@ -30282,7 +30282,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Sonera_Class2CA" +CKA_LABEL UTF8 "Sonera Class2 CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\071\061\013\060\011\006\003\125\004\006\023\002\106\111\061 @@ -30357,7 +30357,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Sonera_Class2CA" +# Trust for "Sonera Class2 CA" # Issuer: CN=Sonera Class2 CA,O=Sonera,C=FI # Serial Number: 29 (0x1d) # Subject: CN=Sonera Class2 CA,O=Sonera,C=FI @@ -30369,7 +30369,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Sonera_Class2CA" +CKA_LABEL UTF8 "Sonera Class2 CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \067\367\155\346\007\174\220\305\261\076\223\032\267\101\020\264 \362\344\232\047 @@ -30393,7 +30393,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Certum_root" +# Certificate "Certum" # # Issuer: CN=Certum CA,O=Unizeto Sp. z o.o.,C=PL # Serial Number: 65568 (0x10020) @@ -30406,7 +30406,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum_root" +CKA_LABEL UTF8 "Certum" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\076\061\013\060\011\006\003\125\004\006\023\002\120\114\061 @@ -30479,7 +30479,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Certum_root" +# Trust for "Certum" # Issuer: CN=Certum CA,O=Unizeto Sp. z o.o.,C=PL # Serial Number: 65568 (0x10020) # Subject: CN=Certum CA,O=Unizeto Sp. z o.o.,C=PL @@ -30491,7 +30491,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum_root" +CKA_LABEL UTF8 "Certum" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \142\122\334\100\367\021\103\242\057\336\236\367\064\216\006\102 \121\261\201\030 @@ -30515,7 +30515,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "baltimore_cybertrust" +# Certificate "DigiCert Baltimore Root" # # Issuer: CN=Baltimore CyberTrust Root,OU=CyberTrust,O=Baltimore,C=IE # Serial Number: 33554617 (0x20000b9) @@ -30528,7 +30528,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "baltimore_cybertrust" +CKA_LABEL UTF8 "DigiCert Baltimore Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\013\060\011\006\003\125\004\006\023\002\111\105\061 @@ -30612,7 +30612,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "baltimore_cybertrust" +# Trust for "DigiCert Baltimore Root" # Issuer: CN=Baltimore CyberTrust Root,OU=CyberTrust,O=Baltimore,C=IE # Serial Number: 33554617 (0x20000b9) # Subject: CN=Baltimore CyberTrust Root,OU=CyberTrust,O=Baltimore,C=IE @@ -30624,7 +30624,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "baltimore_cybertrust" +CKA_LABEL UTF8 "DigiCert Baltimore Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \324\336\040\320\136\146\374\123\376\032\120\210\054\170\333\050 \122\312\344\164 @@ -30650,7 +30650,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "verisign_c3pcag3v2" +# Certificate "VeriSign" # # Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:00:9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57 @@ -30663,7 +30663,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "verisign_c3pcag3v2" +CKA_LABEL UTF8 "VeriSign" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -30772,7 +30772,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "verisign_c3pcag3v2" +# Trust for "VeriSign" # Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US # Serial Number:00:9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57 # Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US @@ -30784,7 +30784,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "verisign_c3pcag3v2" +CKA_LABEL UTF8 "VeriSign" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \023\055\015\105\123\113\151\227\315\262\325\303\071\342\125\166 \140\233\134\306 @@ -30818,7 +30818,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "msft_msroot01" +# Certificate "Microsoft Root Certificate Authority" # # Issuer: CN=Microsoft Root Certificate Authority,DC=microsoft,DC=com # Serial Number:79:ad:16:a1:4a:a0:a5:ad:4c:73:58:f4:07:13:2e:65 @@ -30831,7 +30831,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "msft_msroot01" +CKA_LABEL UTF8 "Microsoft Root Certificate Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\137\061\023\060\021\006\012\011\222\046\211\223\362\054\144 @@ -30952,7 +30952,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "msft_msroot01" +# Trust for "Microsoft Root Certificate Authority" # Issuer: CN=Microsoft Root Certificate Authority,DC=microsoft,DC=com # Serial Number:79:ad:16:a1:4a:a0:a5:ad:4c:73:58:f4:07:13:2e:65 # Subject: CN=Microsoft Root Certificate Authority,DC=microsoft,DC=com @@ -30964,7 +30964,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "msft_msroot01" +CKA_LABEL UTF8 "Microsoft Root Certificate Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \315\324\356\256\140\000\254\177\100\303\200\054\027\036\060\024 \200\060\300\162 @@ -30992,7 +30992,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "msft_msroot10" +# Certificate "Microsoft Root Certificate Authority 2010" # # Issuer: CN=Microsoft Root Certificate Authority 2010,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:28:cc:3a:25:bf:ba:44:ac:44:9a:9b:58:6b:43:39:aa @@ -31005,7 +31005,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "msft_msroot10" +CKA_LABEL UTF8 "Microsoft Root Certificate Authority 2010" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -31136,7 +31136,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "msft_msroot10" +# Trust for "Microsoft Root Certificate Authority 2010" # Issuer: CN=Microsoft Root Certificate Authority 2010,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:28:cc:3a:25:bf:ba:44:ac:44:9a:9b:58:6b:43:39:aa # Subject: CN=Microsoft Root Certificate Authority 2010,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US @@ -31148,7 +31148,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "msft_msroot10" +CKA_LABEL UTF8 "Microsoft Root Certificate Authority 2010" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \073\036\375\072\146\352\050\261\146\227\071\107\003\247\054\243 \100\240\133\325 @@ -31178,7 +31178,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CertPlus_class2" +# Certificate "CertPlus Class 2 Primary CA" # # Issuer: CN=Class 2 Primary CA,O=Certplus,C=FR # Serial Number:00:85:bd:4b:f3:d8:da:e3:69:f6:94:d7:5f:c3:a5:44:23 @@ -31191,7 +31191,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CertPlus_class2" +CKA_LABEL UTF8 "CertPlus Class 2 Primary CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\075\061\013\060\011\006\003\125\004\006\023\002\106\122\061 @@ -31274,7 +31274,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CertPlus_class2" +# Trust for "CertPlus Class 2 Primary CA" # Issuer: CN=Class 2 Primary CA,O=Certplus,C=FR # Serial Number:00:85:bd:4b:f3:d8:da:e3:69:f6:94:d7:5f:c3:a5:44:23 # Subject: CN=Class 2 Primary CA,O=Certplus,C=FR @@ -31286,7 +31286,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CertPlus_class2" +CKA_LABEL UTF8 "CertPlus Class 2 Primary CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \164\040\164\101\162\234\335\222\354\171\061\330\043\020\215\302 \201\222\342\273 @@ -31311,7 +31311,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "DeutscheT_DTroot2" +# Certificate "Deutsche Telekom Root CA 2" # # Issuer: CN=Deutsche Telekom Root CA 2,OU=T-TeleSec Trust Center,O=Deutsche Telekom AG,C=DE # Serial Number: 38 (0x26) @@ -31324,7 +31324,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DeutscheT_DTroot2" +CKA_LABEL UTF8 "Deutsche Telekom Root CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\161\061\013\060\011\006\003\125\004\006\023\002\104\105\061 @@ -31415,7 +31415,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "DeutscheT_DTroot2" +# Trust for "Deutsche Telekom Root CA 2" # Issuer: CN=Deutsche Telekom Root CA 2,OU=T-TeleSec Trust Center,O=Deutsche Telekom AG,C=DE # Serial Number: 38 (0x26) # Subject: CN=Deutsche Telekom Root CA 2,OU=T-TeleSec Trust Center,O=Deutsche Telekom AG,C=DE @@ -31427,7 +31427,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DeutscheT_DTroot2" +CKA_LABEL UTF8 "Deutsche Telekom Root CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \205\244\010\300\234\031\076\135\121\130\175\315\326\023\060\375 \214\336\067\277 @@ -31455,7 +31455,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetLock_classa" +# Certificate "NetLock Kozjegyzoi (Class A) Tanusitvanykiado" # # Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado,OU=Tanusitvanykiadok,O=NetLock Halozatbiztonsagi Kft.,L=Budapest,ST=Hungary,C=HU # Serial Number: 259 (0x103) @@ -31468,7 +31468,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetLock_classa" +CKA_LABEL UTF8 "NetLock Kozjegyzoi (Class A) Tanusitvanykiado" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\257\061\013\060\011\006\003\125\004\006\023\002\110\125 @@ -31613,7 +31613,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetLock_classa" +# Trust for "NetLock Kozjegyzoi (Class A) Tanusitvanykiado" # Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado,OU=Tanusitvanykiadok,O=NetLock Halozatbiztonsagi Kft.,L=Budapest,ST=Hungary,C=HU # Serial Number: 259 (0x103) # Subject: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado,OU=Tanusitvanykiadok,O=NetLock Halozatbiztonsagi Kft.,L=Budapest,ST=Hungary,C=HU @@ -31625,7 +31625,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetLock_classa" +CKA_LABEL UTF8 "NetLock Kozjegyzoi (Class A) Tanusitvanykiado" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \254\355\137\145\123\375\045\316\001\137\037\172\110\073\152\164 \237\141\170\306 @@ -31657,7 +31657,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SZAFIR_SZAFIRROOTCA2E252" +# Certificate "SZAFIR ROOT CA2" # # Issuer: CN=SZAFIR ROOT CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL # Serial Number:3e:8a:5d:07:ec:55:d2:32:d5:b7:e3:b6:5f:01:eb:2d:dc:e4:d6:e4 @@ -31670,7 +31670,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SZAFIR_SZAFIRROOTCA2E252" +CKA_LABEL UTF8 "SZAFIR ROOT CA2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\121\061\013\060\011\006\003\125\004\006\023\002\120\114\061 @@ -31755,7 +31755,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SZAFIR_SZAFIRROOTCA2E252" +# Trust for "SZAFIR ROOT CA2" # Issuer: CN=SZAFIR ROOT CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL # Serial Number:3e:8a:5d:07:ec:55:d2:32:d5:b7:e3:b6:5f:01:eb:2d:dc:e4:d6:e4 # Subject: CN=SZAFIR ROOT CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL @@ -31767,7 +31767,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SZAFIR_SZAFIRROOTCA2E252" +CKA_LABEL UTF8 "SZAFIR ROOT CA2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \342\122\372\225\077\355\333\044\140\275\156\050\363\234\314\317 \136\263\077\336 @@ -31794,7 +31794,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CHUNGWA_ePKIRootCertificationAuthorityG2D99B" +# Certificate "ePKI Root Certification Authority - G2" # # Issuer: CN=ePKI Root Certification Authority - G2,O="Chunghwa Telecom Co., Ltd.",C=TW # Serial Number:00:d6:96:2e:c1:0a:15:93:12:af:8f:63:bc:d4:44:c9:5b @@ -31807,7 +31807,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CHUNGWA_ePKIRootCertificationAuthorityG2D99B" +CKA_LABEL UTF8 "ePKI Root Certification Authority - G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\143\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -31928,7 +31928,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CHUNGWA_ePKIRootCertificationAuthorityG2D99B" +# Trust for "ePKI Root Certification Authority - G2" # Issuer: CN=ePKI Root Certification Authority - G2,O="Chunghwa Telecom Co., Ltd.",C=TW # Serial Number:00:d6:96:2e:c1:0a:15:93:12:af:8f:63:bc:d4:44:c9:5b # Subject: CN=ePKI Root Certification Authority - G2,O="Chunghwa Telecom Co., Ltd.",C=TW @@ -31940,7 +31940,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CHUNGWA_ePKIRootCertificationAuthorityG2D99B" +CKA_LABEL UTF8 "ePKI Root Certification Authority - G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \331\233\020\102\230\131\107\143\360\271\251\047\267\222\151\313 \107\335\025\213 @@ -31968,7 +31968,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TUBITAK_KamuSMSSLKokSertifikasiSurum13143" +# Certificate "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1" # # Issuer: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1,OU=Kamu Sertifikasyon Merkezi - Kamu SM,O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK,L=Gebze - Kocaeli,C=TR # Serial Number: 1 (0x1) @@ -31981,7 +31981,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TUBITAK_KamuSMSSLKokSertifikasiSurum13143" +CKA_LABEL UTF8 "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\322\061\013\060\011\006\003\125\004\006\023\002\124\122 @@ -32096,7 +32096,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TUBITAK_KamuSMSSLKokSertifikasiSurum13143" +# Trust for "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1" # Issuer: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1,OU=Kamu Sertifikasyon Merkezi - Kamu SM,O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK,L=Gebze - Kocaeli,C=TR # Serial Number: 1 (0x1) # Subject: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1,OU=Kamu Sertifikasyon Merkezi - Kamu SM,O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK,L=Gebze - Kocaeli,C=TR @@ -32108,7 +32108,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TUBITAK_KamuSMSSLKokSertifikasiSurum13143" +CKA_LABEL UTF8 "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \061\103\144\233\354\316\047\354\355\072\077\013\217\015\344\350 \221\335\356\312 @@ -32142,7 +32142,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SSLCorporation_SSLcomEVRootCertificationAuthorityECC4CDD" +# Certificate "SSL.com EV Root Certification Authority ECC" # # Issuer: CN=SSL.com EV Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:2c:29:9c:5b:16:ed:05:95 @@ -32155,7 +32155,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomEVRootCertificationAuthorityECC4CDD" +CKA_LABEL UTF8 "SSL.com EV Root Certification Authority ECC" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\177\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -32231,7 +32231,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SSLCorporation_SSLcomEVRootCertificationAuthorityECC4CDD" +# Trust for "SSL.com EV Root Certification Authority ECC" # Issuer: CN=SSL.com EV Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:2c:29:9c:5b:16:ed:05:95 # Subject: CN=SSL.com EV Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US @@ -32243,7 +32243,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomEVRootCertificationAuthorityECC4CDD" +CKA_LABEL UTF8 "SSL.com EV Root Certification Authority ECC" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \114\335\121\243\321\365\040\062\024\260\306\305\062\043\003\221 \307\106\102\155 @@ -32272,7 +32272,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SSLCorporation_SSLcomEVRootCertificationAuthorityRSA1CB7" +# Certificate "SSL.com EV Root Certification Authority RSA" # # Issuer: CN=SSL.com EV Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:1d:6c:11:eb:6f:da:39:9d @@ -32285,7 +32285,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomEVRootCertificationAuthorityRSA1CB7" +CKA_LABEL UTF8 "SSL.com EV Root Certification Authority RSA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\177\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -32414,7 +32414,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SSLCorporation_SSLcomEVRootCertificationAuthorityRSA1CB7" +# Trust for "SSL.com EV Root Certification Authority RSA" # Issuer: CN=SSL.com EV Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:1d:6c:11:eb:6f:da:39:9d # Subject: CN=SSL.com EV Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US @@ -32426,7 +32426,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomEVRootCertificationAuthorityRSA1CB7" +CKA_LABEL UTF8 "SSL.com EV Root Certification Authority RSA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \034\267\355\341\166\274\337\357\014\206\157\106\373\371\200\351 \001\345\316\065 @@ -32455,7 +32455,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SSLCorporation_SSLcomRootCertificationAuthorityECCC319" +# Certificate "SSL.com Root Certification Authority ECC" # # Issuer: CN=SSL.com Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:75:e6:df:cb:c1:68:5b:a8 @@ -32468,7 +32468,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomRootCertificationAuthorityECCC319" +CKA_LABEL UTF8 "SSL.com Root Certification Authority ECC" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\174\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -32542,7 +32542,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SSLCorporation_SSLcomRootCertificationAuthorityECCC319" +# Trust for "SSL.com Root Certification Authority ECC" # Issuer: CN=SSL.com Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:75:e6:df:cb:c1:68:5b:a8 # Subject: CN=SSL.com Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US @@ -32554,7 +32554,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomRootCertificationAuthorityECCC319" +CKA_LABEL UTF8 "SSL.com Root Certification Authority ECC" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \303\031\174\071\044\346\124\257\033\304\253\040\225\172\342\303 \016\023\002\152 @@ -32582,7 +32582,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SSLCorporation_SSLcomRootCertificationAuthorityRSAB7AB" +# Certificate "SSL.com Root Certification Authority RSA" # # Issuer: CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:7b:2c:9b:d3:16:80:32:99 @@ -32595,7 +32595,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomRootCertificationAuthorityRSAB7AB" +CKA_LABEL UTF8 "SSL.com Root Certification Authority RSA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\174\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -32722,7 +32722,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SSLCorporation_SSLcomRootCertificationAuthorityRSAB7AB" +# Trust for "SSL.com Root Certification Authority RSA" # Issuer: CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:7b:2c:9b:d3:16:80:32:99 # Subject: CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US @@ -32734,7 +32734,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomRootCertificationAuthorityRSAB7AB" +CKA_LABEL UTF8 "SSL.com Root Certification Authority RSA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \267\253\063\010\321\352\104\167\272\024\200\022\132\157\275\251 \066\111\014\273 @@ -32762,7 +32762,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CERTUM_CertumTrustedNetworkCA2D3DD" +# Certificate "Certum Trusted Network CA 2" # # Issuer: CN=Certum Trusted Network CA 2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL # Serial Number:21:d6:d0:4a:4f:25:0f:c9:32:37:fc:aa:5e:12:8d:e9 @@ -32775,7 +32775,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CERTUM_CertumTrustedNetworkCA2D3DD" +CKA_LABEL UTF8 "Certum Trusted Network CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\200\061\013\060\011\006\003\125\004\006\023\002\120\114 @@ -32904,7 +32904,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CERTUM_CertumTrustedNetworkCA2D3DD" +# Trust for "Certum Trusted Network CA 2" # Issuer: CN=Certum Trusted Network CA 2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL # Serial Number:21:d6:d0:4a:4f:25:0f:c9:32:37:fc:aa:5e:12:8d:e9 # Subject: CN=Certum Trusted Network CA 2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL @@ -32916,7 +32916,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CERTUM_CertumTrustedNetworkCA2D3DD" +CKA_LABEL UTF8 "Certum Trusted Network CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \323\335\110\076\053\277\114\005\350\257\020\365\372\166\046\317 \323\334\060\222 @@ -32946,7 +32946,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "LuxTrustSA_LuxTrustGlobalRoot21E0E" +# Certificate "LuxTrust Global Root 2" # # Issuer: CN=LuxTrust Global Root 2,O=LuxTrust S.A.,C=LU # Serial Number:0a:7e:a6:df:4b:44:9e:da:6a:24:85:9e:e6:b8:15:d3:16:7f:bb:b1 @@ -32959,7 +32959,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "LuxTrustSA_LuxTrustGlobalRoot21E0E" +CKA_LABEL UTF8 "LuxTrust Global Root 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\106\061\013\060\011\006\003\125\004\006\023\002\114\125\061 @@ -33079,7 +33079,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "LuxTrustSA_LuxTrustGlobalRoot21E0E" +# Trust for "LuxTrust Global Root 2" # Issuer: CN=LuxTrust Global Root 2,O=LuxTrust S.A.,C=LU # Serial Number:0a:7e:a6:df:4b:44:9e:da:6a:24:85:9e:e6:b8:15:d3:16:7f:bb:b1 # Subject: CN=LuxTrust Global Root 2,O=LuxTrust S.A.,C=LU @@ -33091,7 +33091,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "LuxTrustSA_LuxTrustGlobalRoot21E0E" +CKA_LABEL UTF8 "LuxTrust Global Root 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \036\016\126\031\012\321\213\045\230\262\004\104\377\146\212\004 \027\231\137\077 @@ -33117,7 +33117,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CONSEJOGENERALDELAABOGACIA_ACAROOTD496" +# Certificate "ACA ROOT" # # Issuer: CN=ACA ROOT,O=CONSEJO GENERAL DE LA ABOGACIA,serialNumber=Q2863006I,C=ES # Serial Number:47:43:91:24:3f:ce:c3:0d:57:48:28:6b:ee:80:5d:ab @@ -33130,7 +33130,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CONSEJOGENERALDELAABOGACIA_ACAROOTD496" +CKA_LABEL UTF8 "ACA ROOT" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\135\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -33252,7 +33252,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CONSEJOGENERALDELAABOGACIA_ACAROOTD496" +# Trust for "ACA ROOT" # Issuer: CN=ACA ROOT,O=CONSEJO GENERAL DE LA ABOGACIA,serialNumber=Q2863006I,C=ES # Serial Number:47:43:91:24:3f:ce:c3:0d:57:48:28:6b:ee:80:5d:ab # Subject: CN=ACA ROOT,O=CONSEJO GENERAL DE LA ABOGACIA,serialNumber=Q2863006I,C=ES @@ -33264,7 +33264,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CONSEJOGENERALDELAABOGACIA_ACAROOTD496" +CKA_LABEL UTF8 "ACA ROOT" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \324\226\131\053\060\127\007\070\154\305\363\315\262\131\256\146 \327\146\037\312 @@ -33291,7 +33291,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "UniTrust_UCAGlobalG2Root28F9" +# Certificate "UCA Global G2 Root" # # Issuer: CN=UCA Global G2 Root,O=UniTrust,C=CN # Serial Number:5d:df:b1:da:5a:a3:ed:5d:be:5a:65:20:65:03:90:ef @@ -33304,7 +33304,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "UniTrust_UCAGlobalG2Root28F9" +CKA_LABEL UTF8 "UCA Global G2 Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\075\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -33414,7 +33414,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "UniTrust_UCAGlobalG2Root28F9" +# Trust for "UCA Global G2 Root" # Issuer: CN=UCA Global G2 Root,O=UniTrust,C=CN # Serial Number:5d:df:b1:da:5a:a3:ed:5d:be:5a:65:20:65:03:90:ef # Subject: CN=UCA Global G2 Root,O=UniTrust,C=CN @@ -33426,7 +33426,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "UniTrust_UCAGlobalG2Root28F9" +CKA_LABEL UTF8 "UCA Global G2 Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \050\371\170\026\031\172\377\030\045\030\252\104\376\301\240\316 \134\266\114\212 @@ -33451,7 +33451,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "UniTrust_UCAExtendedValidationRootA3A1" +# Certificate "UCA Extended Validation Root" # # Issuer: CN=UCA Extended Validation Root,O=UniTrust,C=CN # Serial Number:4f:d2:2b:8f:f5:64:c8:33:9e:4f:34:58:66:23:70:60 @@ -33464,7 +33464,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "UniTrust_UCAExtendedValidationRootA3A1" +CKA_LABEL UTF8 "UCA Extended Validation Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\103\116\061 @@ -33577,7 +33577,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "UniTrust_UCAExtendedValidationRootA3A1" +# Trust for "UCA Extended Validation Root" # Issuer: CN=UCA Extended Validation Root,O=UniTrust,C=CN # Serial Number:4f:d2:2b:8f:f5:64:c8:33:9e:4f:34:58:66:23:70:60 # Subject: CN=UCA Extended Validation Root,O=UniTrust,C=CN @@ -33589,7 +33589,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "UniTrust_UCAExtendedValidationRootA3A1" +CKA_LABEL UTF8 "UCA Extended Validation Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \243\241\260\157\044\141\043\112\343\066\245\302\067\374\246\377 \335\360\327\072 @@ -33615,7 +33615,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SECOMTrustSystemsCO_SecurityCommunicationECCRootCA1B80E" +# Certificate "Security Communication ECC RootCA1" # # Issuer: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP # Serial Number:00:d6:5d:9b:b3:78:81:2e:eb @@ -33628,7 +33628,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SECOMTrustSystemsCO_SecurityCommunicationECCRootCA1B80E" +CKA_LABEL UTF8 "Security Communication ECC RootCA1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\141\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -33694,7 +33694,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SECOMTrustSystemsCO_SecurityCommunicationECCRootCA1B80E" +# Trust for "Security Communication ECC RootCA1" # Issuer: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP # Serial Number:00:d6:5d:9b:b3:78:81:2e:eb # Subject: CN=Security Communication ECC RootCA1,O="SECOM Trust Systems CO.,LTD.",C=JP @@ -33706,7 +33706,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SECOMTrustSystemsCO_SecurityCommunicationECCRootCA1B80E" +CKA_LABEL UTF8 "Security Communication ECC RootCA1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \270\016\046\251\277\322\262\073\300\357\106\311\272\307\273\366 \035\015\101\101 @@ -33733,7 +33733,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SECOMTrustSystemsCO_SecurityCommunicationRootCA3C303" +# Certificate "Security Communication RootCA3" # # Issuer: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP # Serial Number:00:e1:7c:37:40:fd:1b:fe:67 @@ -33746,7 +33746,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SECOMTrustSystemsCO_SecurityCommunicationRootCA3C303" +CKA_LABEL UTF8 "Security Communication RootCA3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\135\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -33863,7 +33863,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SECOMTrustSystemsCO_SecurityCommunicationRootCA3C303" +# Trust for "Security Communication RootCA3" # Issuer: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP # Serial Number:00:e1:7c:37:40:fd:1b:fe:67 # Subject: CN=Security Communication RootCA3,O="SECOM Trust Systems CO.,LTD.",C=JP @@ -33875,7 +33875,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SECOMTrustSystemsCO_SecurityCommunicationRootCA3C303" +CKA_LABEL UTF8 "Security Communication RootCA3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \303\003\310\042\164\222\345\141\242\234\137\171\221\053\036\104 \023\221\060\072 @@ -33901,7 +33901,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ACCAMERFIRMASA_CHAMBERSOFCOMMERCEROOT20162DE1" +# Certificate "CHAMBERS OF COMMERCE ROOT - 2016" # # Issuer: CN=CHAMBERS OF COMMERCE ROOT - 2016,O=AC CAMERFIRMA S.A.,OID.2.5.4.97=VATES-A82743287,serialNumber=A82743287,OU=CHAMBERS OF COMMERCE ROOT - 2016,OU=see current address at www.camerfirma.com/address,L=MADRID,ST=MADRID,C=ES # Serial Number:34:9a:2d:a1:82:06:b2:b3 @@ -33914,7 +33914,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ACCAMERFIRMASA_CHAMBERSOFCOMMERCEROOT20162DE1" +CKA_LABEL UTF8 "CHAMBERS OF COMMERCE ROOT - 2016" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\202\001\014\061\013\060\011\006\003\125\004\006\023\002\105 @@ -34075,7 +34075,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ACCAMERFIRMASA_CHAMBERSOFCOMMERCEROOT20162DE1" +# Trust for "CHAMBERS OF COMMERCE ROOT - 2016" # Issuer: CN=CHAMBERS OF COMMERCE ROOT - 2016,O=AC CAMERFIRMA S.A.,OID.2.5.4.97=VATES-A82743287,serialNumber=A82743287,OU=CHAMBERS OF COMMERCE ROOT - 2016,OU=see current address at www.camerfirma.com/address,L=MADRID,ST=MADRID,C=ES # Serial Number:34:9a:2d:a1:82:06:b2:b3 # Subject: CN=CHAMBERS OF COMMERCE ROOT - 2016,O=AC CAMERFIRMA S.A.,OID.2.5.4.97=VATES-A82743287,serialNumber=A82743287,OU=CHAMBERS OF COMMERCE ROOT - 2016,OU=see current address at www.camerfirma.com/address,L=MADRID,ST=MADRID,C=ES @@ -34087,7 +34087,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ACCAMERFIRMASA_CHAMBERSOFCOMMERCEROOT20162DE1" +CKA_LABEL UTF8 "CHAMBERS OF COMMERCE ROOT - 2016" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \055\341\152\126\167\272\312\071\341\326\214\060\334\261\112\276 \042\246\027\233 @@ -34124,7 +34124,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ACCAMERFIRMASA_GLOBALCHAMBERSIGNROOT20161139" +# Certificate "GLOBAL CHAMBERSIGN ROOT - 2016" # # Issuer: CN=GLOBAL CHAMBERSIGN ROOT - 2016,O=AC CAMERFIRMA S.A.,OID.2.5.4.97=VATES-A82743287,serialNumber=A82743287,OU=GLOBAL CHAMBERSIGN ROOT - 2016,OU=see current address at www.camerfirma.com/address,L=MADRID,ST=MADRID,C=ES # Serial Number:2d:d2:2e:50:30:a6:5e:13 @@ -34137,7 +34137,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ACCAMERFIRMASA_GLOBALCHAMBERSIGNROOT20161139" +CKA_LABEL UTF8 "GLOBAL CHAMBERSIGN ROOT - 2016" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\202\001\010\061\013\060\011\006\003\125\004\006\023\002\105 @@ -34297,7 +34297,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ACCAMERFIRMASA_GLOBALCHAMBERSIGNROOT20161139" +# Trust for "GLOBAL CHAMBERSIGN ROOT - 2016" # Issuer: CN=GLOBAL CHAMBERSIGN ROOT - 2016,O=AC CAMERFIRMA S.A.,OID.2.5.4.97=VATES-A82743287,serialNumber=A82743287,OU=GLOBAL CHAMBERSIGN ROOT - 2016,OU=see current address at www.camerfirma.com/address,L=MADRID,ST=MADRID,C=ES # Serial Number:2d:d2:2e:50:30:a6:5e:13 # Subject: CN=GLOBAL CHAMBERSIGN ROOT - 2016,O=AC CAMERFIRMA S.A.,OID.2.5.4.97=VATES-A82743287,serialNumber=A82743287,OU=GLOBAL CHAMBERSIGN ROOT - 2016,OU=see current address at www.camerfirma.com/address,L=MADRID,ST=MADRID,C=ES @@ -34309,7 +34309,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ACCAMERFIRMASA_GLOBALCHAMBERSIGNROOT20161139" +CKA_LABEL UTF8 "GLOBAL CHAMBERSIGN ROOT - 2016" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \021\071\244\236\204\204\252\362\331\015\230\136\304\164\032\145 \335\135\224\342 @@ -34346,7 +34346,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetworkSolutionsLLC_NetworkSolutionsRSACertificateAuthority8E92" +# Certificate "Network Solutions RSA Certificate Authority" # # Issuer: CN=Network Solutions RSA Certificate Authority,O=Network Solutions L.L.C.,L=Jacksonville,ST=FL,C=US # Serial Number:4c:03:4b:ac:67:18:4c:7f:af:44:08:4d:82:96:c7:b2 @@ -34359,7 +34359,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetworkSolutionsLLC_NetworkSolutionsRSACertificateAuthority8E92" +CKA_LABEL UTF8 "Network Solutions RSA Certificate Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\212\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -34489,7 +34489,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetworkSolutionsLLC_NetworkSolutionsRSACertificateAuthority8E92" +# Trust for "Network Solutions RSA Certificate Authority" # Issuer: CN=Network Solutions RSA Certificate Authority,O=Network Solutions L.L.C.,L=Jacksonville,ST=FL,C=US # Serial Number:4c:03:4b:ac:67:18:4c:7f:af:44:08:4d:82:96:c7:b2 # Subject: CN=Network Solutions RSA Certificate Authority,O=Network Solutions L.L.C.,L=Jacksonville,ST=FL,C=US @@ -34501,7 +34501,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetworkSolutionsLLC_NetworkSolutionsRSACertificateAuthority8E92" +CKA_LABEL UTF8 "Network Solutions RSA Certificate Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \216\222\214\017\302\173\267\253\243\116\153\300\312\022\120\313 \127\266\017\204 @@ -34531,7 +34531,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetworkSolutionsLLC_NetworkSolutionsECCCertificateAuthority80F9" +# Certificate "Network Solutions ECC Certificate Authority" # # Issuer: CN=Network Solutions ECC Certificate Authority,O=Network Solutions L.L.C.,L=Jacksonville,ST=FL,C=US # Serial Number:79:38:4b:b4:19:1a:8d:74:22:cc:ff:85:32:f2:e4:ba @@ -34544,7 +34544,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetworkSolutionsLLC_NetworkSolutionsECCCertificateAuthority80F9" +CKA_LABEL UTF8 "Network Solutions ECC Certificate Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\212\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -34621,7 +34621,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetworkSolutionsLLC_NetworkSolutionsECCCertificateAuthority80F9" +# Trust for "Network Solutions ECC Certificate Authority" # Issuer: CN=Network Solutions ECC Certificate Authority,O=Network Solutions L.L.C.,L=Jacksonville,ST=FL,C=US # Serial Number:79:38:4b:b4:19:1a:8d:74:22:cc:ff:85:32:f2:e4:ba # Subject: CN=Network Solutions ECC Certificate Authority,O=Network Solutions L.L.C.,L=Jacksonville,ST=FL,C=US @@ -34633,7 +34633,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetworkSolutionsLLC_NetworkSolutionsECCCertificateAuthority80F9" +CKA_LABEL UTF8 "Network Solutions ECC Certificate Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \200\371\133\164\034\070\071\224\225\303\117\040\302\076\163\066 \061\115\074\153 @@ -34663,7 +34663,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GOV_AustralianDefencePublicRootCAA9CA" +# Certificate "Australian Defence Public Root CA" # # Issuer: CN=Australian Defence Public Root CA,OU=CAs,OU=PKI,OU=DoD,O=GOV,C=AU # Serial Number:29:eb:92:33:46:4f:32:41:ff:83:19:00:a9:ad:c4:d9:f8:e3:e2:7f @@ -34676,7 +34676,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GOV_AustralianDefencePublicRootCAA9CA" +CKA_LABEL UTF8 "Australian Defence Public Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\161\061\013\060\011\006\003\125\004\006\023\002\101\125\061 @@ -34776,7 +34776,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GOV_AustralianDefencePublicRootCAA9CA" +# Trust for "Australian Defence Public Root CA" # Issuer: CN=Australian Defence Public Root CA,OU=CAs,OU=PKI,OU=DoD,O=GOV,C=AU # Serial Number:29:eb:92:33:46:4f:32:41:ff:83:19:00:a9:ad:c4:d9:f8:e3:e2:7f # Subject: CN=Australian Defence Public Root CA,OU=CAs,OU=PKI,OU=DoD,O=GOV,C=AU @@ -34788,7 +34788,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GOV_AustralianDefencePublicRootCAA9CA" +CKA_LABEL UTF8 "Australian Defence Public Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \251\312\376\235\375\147\364\024\132\323\227\320\342\363\005\015 \031\215\346\356 @@ -34817,7 +34817,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "RepublikaSlovenija_SITRUSTRoot3A49" +# Certificate "SI-TRUST Root" # # Issuer: CN=SI-TRUST Root,OID.2.5.4.97=VATSI-17659957,O=Republika Slovenija,C=SI # Serial Number:00:90:ae:77:76:00:00:00:00:57:1d:d0:6f @@ -34830,7 +34830,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "RepublikaSlovenija_SITRUSTRoot3A49" +CKA_LABEL UTF8 "SI-TRUST Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\134\061\013\060\011\006\003\125\004\006\023\002\123\111\061 @@ -34931,7 +34931,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "RepublikaSlovenija_SITRUSTRoot3A49" +# Trust for "SI-TRUST Root" # Issuer: CN=SI-TRUST Root,OID.2.5.4.97=VATSI-17659957,O=Republika Slovenija,C=SI # Serial Number:00:90:ae:77:76:00:00:00:00:57:1d:d0:6f # Subject: CN=SI-TRUST Root,OID.2.5.4.97=VATSI-17659957,O=Republika Slovenija,C=SI @@ -34943,7 +34943,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "RepublikaSlovenija_SITRUSTRoot3A49" +CKA_LABEL UTF8 "SI-TRUST Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \072\111\171\264\017\250\101\110\202\000\265\202\373\356\266\072 \253\231\031\256 @@ -34969,7 +34969,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SwissGovernmentPKI_SwissGovernmentRootCAIIICCEA" +# Certificate "Swiss Government Root CA III" # # Issuer: CN=Swiss Government Root CA III,OU=www.pki.admin.ch,O=Swiss Government PKI,C=CH # Serial Number:00:fb:1f:0b:42:2b:a8:41:3e:57:d1:ee:2a:6e:5a:4f:bb @@ -34982,7 +34982,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissGovernmentPKI_SwissGovernmentRootCAIIICCEA" +CKA_LABEL UTF8 "Swiss Government Root CA III" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\156\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -35115,7 +35115,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SwissGovernmentPKI_SwissGovernmentRootCAIIICCEA" +# Trust for "Swiss Government Root CA III" # Issuer: CN=Swiss Government Root CA III,OU=www.pki.admin.ch,O=Swiss Government PKI,C=CH # Serial Number:00:fb:1f:0b:42:2b:a8:41:3e:57:d1:ee:2a:6e:5a:4f:bb # Subject: CN=Swiss Government Root CA III,OU=www.pki.admin.ch,O=Swiss Government PKI,C=CH @@ -35127,7 +35127,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissGovernmentPKI_SwissGovernmentRootCAIIICCEA" +CKA_LABEL UTF8 "Swiss Government Root CA III" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \314\352\343\044\105\315\102\030\335\030\216\255\316\263\023\074 \177\263\100\255 @@ -35155,7 +35155,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "LGPKI_ApplicationCAG4Root21DA" +# Certificate "Application CA G4 Root" # # Issuer: CN=Application CA G4 Root,O=LGPKI,C=JP # Serial Number:31:a5:f3:ca:90:ea:23:ac:d2:9e:bd @@ -35168,7 +35168,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "LGPKI_ApplicationCAG4Root21DA" +CKA_LABEL UTF8 "Application CA G4 Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\076\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -35247,7 +35247,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "LGPKI_ApplicationCAG4Root21DA" +# Trust for "Application CA G4 Root" # Issuer: CN=Application CA G4 Root,O=LGPKI,C=JP # Serial Number:31:a5:f3:ca:90:ea:23:ac:d2:9e:bd # Subject: CN=Application CA G4 Root,O=LGPKI,C=JP @@ -35259,7 +35259,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "LGPKI_ApplicationCAG4Root21DA" +CKA_LABEL UTF8 "Application CA G4 Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \041\332\316\114\054\064\346\144\150\356\006\061\115\260\125\240 \250\235\114\035 @@ -35283,7 +35283,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "DigicertSdnBhd_PosDigicertClass2RootCAG2313B" +# Certificate "PosDigicert Class 2 Root CA G2" # # Issuer: CN=PosDigicert Class 2 Root CA G2,O=Digicert Sdn. Bhd.,C=MY # Serial Number: 9969756 (0x98205c) @@ -35296,7 +35296,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigicertSdnBhd_PosDigicertClass2RootCAG2313B" +CKA_LABEL UTF8 "PosDigicert Class 2 Root CA G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\123\061\013\060\011\006\003\125\004\006\023\002\115\131\061 @@ -35414,7 +35414,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "DigicertSdnBhd_PosDigicertClass2RootCAG2313B" +# Trust for "PosDigicert Class 2 Root CA G2" # Issuer: CN=PosDigicert Class 2 Root CA G2,O=Digicert Sdn. Bhd.,C=MY # Serial Number: 9969756 (0x98205c) # Subject: CN=PosDigicert Class 2 Root CA G2,O=Digicert Sdn. Bhd.,C=MY @@ -35426,7 +35426,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigicertSdnBhd_PosDigicertClass2RootCAG2313B" +CKA_LABEL UTF8 "PosDigicert Class 2 Root CA G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \061\073\215\016\176\056\115\040\256\206\150\377\345\235\265\031 \074\277\172\062 @@ -35452,7 +35452,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NetrustPteLtd_NetrustRootCA20AB5" +# Certificate "Netrust Root CA 2" # # Issuer: CN=Netrust Root CA 2,OU=Netrust Certificate Authority,O=Netrust Pte Ltd,C=SG # Serial Number: 1472720116 (0x57c7ecf4) @@ -35465,7 +35465,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetrustPteLtd_NetrustRootCA20AB5" +CKA_LABEL UTF8 "Netrust Root CA 2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\153\061\013\060\011\006\003\125\004\006\023\002\123\107\061 @@ -35590,7 +35590,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NetrustPteLtd_NetrustRootCA20AB5" +# Trust for "Netrust Root CA 2" # Issuer: CN=Netrust Root CA 2,OU=Netrust Certificate Authority,O=Netrust Pte Ltd,C=SG # Serial Number: 1472720116 (0x57c7ecf4) # Subject: CN=Netrust Root CA 2,OU=Netrust Certificate Authority,O=Netrust Pte Ltd,C=SG @@ -35602,7 +35602,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NetrustPteLtd_NetrustRootCA20AB5" +CKA_LABEL UTF8 "Netrust Root CA 2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \012\265\303\315\164\110\270\155\161\036\167\245\111\203\213\207 \316\122\137\177 @@ -35629,7 +35629,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "FNMTRCM_ACRAIZFNMTRCMEC50" +# Certificate "AC RAIZ FNMT-RCM" # # Issuer: OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES # Serial Number:5d:93:8d:30:67:36:c8:06:1d:1a:c7:54:84:69:07 @@ -35642,7 +35642,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "FNMTRCM_ACRAIZFNMTRCMEC50" +CKA_LABEL UTF8 "AC RAIZ FNMT-RCM" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\073\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -35756,7 +35756,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "FNMTRCM_ACRAIZFNMTRCMEC50" +# Trust for "AC RAIZ FNMT-RCM" # Issuer: OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES # Serial Number:5d:93:8d:30:67:36:c8:06:1d:1a:c7:54:84:69:07 # Subject: OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES @@ -35768,7 +35768,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "FNMTRCM_ACRAIZFNMTRCMEC50" +CKA_LABEL UTF8 "AC RAIZ FNMT-RCM" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \354\120\065\007\262\025\304\225\142\031\342\250\232\133\102\231 \054\114\054\040 @@ -35793,7 +35793,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "SSLCorporation_SSLcomEVRootCertificationAuthorityRSAR2743A" +# Certificate "SSL.com EV Root Certification Authority RSA R2" # # Issuer: CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:56:b6:29:cd:34:bc:78:f6 @@ -35806,7 +35806,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomEVRootCertificationAuthorityRSAR2743A" +CKA_LABEL UTF8 "SSL.com EV Root Certification Authority RSA R2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\202\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -35935,7 +35935,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "SSLCorporation_SSLcomEVRootCertificationAuthorityRSAR2743A" +# Trust for "SSL.com EV Root Certification Authority RSA R2" # Issuer: CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US # Serial Number:56:b6:29:cd:34:bc:78:f6 # Subject: CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US @@ -35947,7 +35947,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SSLCorporation_SSLcomEVRootCertificationAuthorityRSAR2743A" +CKA_LABEL UTF8 "SSL.com EV Root Certification Authority RSA R2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \164\072\360\122\233\320\062\240\364\112\203\315\324\272\251\173 \174\056\304\232 @@ -35976,7 +35976,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoogleTrustServicesLLC_GTSRootR1E1C9" +# Certificate "GTS Root R1" # # Issuer: CN=GTS Root R1,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c5:4b:47:0c:0d:ec:33:d0:89:b9:1c:f4:e1 @@ -35989,7 +35989,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR1E1C9" +CKA_LABEL UTF8 "GTS Root R1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -36102,7 +36102,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoogleTrustServicesLLC_GTSRootR1E1C9" +# Trust for "GTS Root R1" # Issuer: CN=GTS Root R1,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c5:4b:47:0c:0d:ec:33:d0:89:b9:1c:f4:e1 # Subject: CN=GTS Root R1,O=Google Trust Services LLC,C=US @@ -36114,7 +36114,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR1E1C9" +CKA_LABEL UTF8 "GTS Root R1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \341\311\120\346\357\042\370\114\126\105\162\213\222\040\140\327 \325\247\243\350 @@ -36140,7 +36140,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoogleTrustServicesLLC_GTSRootR2D273" +# Certificate "GTS Root R2" # # Issuer: CN=GTS Root R2,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c6:5a:b3:e7:20:c5:30:9a:3f:68:52:f2:6f @@ -36153,7 +36153,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR2D273" +CKA_LABEL UTF8 "GTS Root R2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -36266,7 +36266,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoogleTrustServicesLLC_GTSRootR2D273" +# Trust for "GTS Root R2" # Issuer: CN=GTS Root R2,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c6:5a:b3:e7:20:c5:30:9a:3f:68:52:f2:6f # Subject: CN=GTS Root R2,O=Google Trust Services LLC,C=US @@ -36278,7 +36278,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR2D273" +CKA_LABEL UTF8 "GTS Root R2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \322\163\226\052\052\136\071\237\163\077\341\307\036\144\077\003 \070\064\374\115 @@ -36304,7 +36304,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoogleTrustServicesLLC_GTSRootR330D4" +# Certificate "GTS Root R3" # # Issuer: CN=GTS Root R3,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c7:6c:a9:73:24:40:89:0f:03:55:dd:8d:1d @@ -36317,7 +36317,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR330D4" +CKA_LABEL UTF8 "GTS Root R3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -36377,7 +36377,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoogleTrustServicesLLC_GTSRootR330D4" +# Trust for "GTS Root R3" # Issuer: CN=GTS Root R3,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c7:6c:a9:73:24:40:89:0f:03:55:dd:8d:1d # Subject: CN=GTS Root R3,O=Google Trust Services LLC,C=US @@ -36389,7 +36389,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR330D4" +CKA_LABEL UTF8 "GTS Root R3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \060\324\044\157\007\377\333\221\211\212\013\351\111\146\021\353 \214\136\106\345 @@ -36415,7 +36415,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GoogleTrustServicesLLC_GTSRootR42A1D" +# Certificate "GTS Root R4" # # Issuer: CN=GTS Root R4,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c8:8b:94:b6:e8:bb:3b:2a:d8:a2:b2:c1:99 @@ -36428,7 +36428,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR42A1D" +CKA_LABEL UTF8 "GTS Root R4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -36488,7 +36488,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GoogleTrustServicesLLC_GTSRootR42A1D" +# Trust for "GTS Root R4" # Issuer: CN=GTS Root R4,O=Google Trust Services LLC,C=US # Serial Number:6e:47:a9:c8:8b:94:b6:e8:bb:3b:2a:d8:a2:b2:c1:99 # Subject: CN=GTS Root R4,O=Google Trust Services LLC,C=US @@ -36500,7 +36500,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GoogleTrustServicesLLC_GTSRootR42A1D" +CKA_LABEL UTF8 "GTS Root R4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \052\035\140\047\331\112\261\012\034\115\221\134\315\063\240\313 \076\055\124\313 @@ -36526,7 +36526,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Halcomdd_HalcomRootCertificateAuthority23D7" +# Certificate "Halcom Root Certificate Authority" # # Issuer: CN=Halcom Root Certificate Authority,OID.2.5.4.97=VATSI-43353126,O=Halcom d.d.,C=SI # Serial Number: 843675 (0xcdf9b) @@ -36539,7 +36539,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Halcomdd_HalcomRootCertificateAuthority23D7" +CKA_LABEL UTF8 "Halcom Root Certificate Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\150\061\013\060\011\006\003\125\004\006\023\002\123\111\061 @@ -36626,7 +36626,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Halcomdd_HalcomRootCertificateAuthority23D7" +# Trust for "Halcom Root Certificate Authority" # Issuer: CN=Halcom Root Certificate Authority,OID.2.5.4.97=VATSI-43353126,O=Halcom d.d.,C=SI # Serial Number: 843675 (0xcdf9b) # Subject: CN=Halcom Root Certificate Authority,OID.2.5.4.97=VATSI-43353126,O=Halcom d.d.,C=SI @@ -36638,7 +36638,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Halcomdd_HalcomRootCertificateAuthority23D7" +CKA_LABEL UTF8 "Halcom Root Certificate Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \043\327\061\376\334\134\213\271\175\346\334\216\023\264\021\275 \117\044\000\117 @@ -36665,7 +36665,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ATHENSSTOCKEXCHANGE_ATHEXRootCAG2892A" +# Certificate "ATHEX Root CA G2" # # Issuer: CN=ATHEX Root CA G2,O=ATHENS STOCK EXCHANGE,C=GR # Serial Number: 16079 (0x3ecf) @@ -36678,7 +36678,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATHENSSTOCKEXCHANGE_ATHEXRootCAG2892A" +CKA_LABEL UTF8 "ATHEX Root CA G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\110\061\013\060\011\006\003\125\004\006\023\002\107\122\061 @@ -36789,7 +36789,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ATHENSSTOCKEXCHANGE_ATHEXRootCAG2892A" +# Trust for "ATHEX Root CA G2" # Issuer: CN=ATHEX Root CA G2,O=ATHENS STOCK EXCHANGE,C=GR # Serial Number: 16079 (0x3ecf) # Subject: CN=ATHEX Root CA G2,O=ATHENS STOCK EXCHANGE,C=GR @@ -36801,7 +36801,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ATHENSSTOCKEXCHANGE_ATHEXRootCAG2892A" +CKA_LABEL UTF8 "ATHEX Root CA G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \211\052\033\324\310\260\370\252\232\145\355\114\271\323\277\110 \100\263\113\301 @@ -36826,7 +36826,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "WISeKey_OISTEWISeKeyGlobalRootGCCAE011" +# Certificate "OISTE WISeKey Global Root GC CA" # # Issuer: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH # Serial Number:21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea @@ -36839,7 +36839,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "WISeKey_OISTEWISeKeyGlobalRootGCCAE011" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GC CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061 @@ -36909,7 +36909,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "WISeKey_OISTEWISeKeyGlobalRootGCCAE011" +# Trust for "OISTE WISeKey Global Root GC CA" # Issuer: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH # Serial Number:21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea # Subject: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH @@ -36921,7 +36921,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "WISeKey_OISTEWISeKeyGlobalRootGCCAE011" +CKA_LABEL UTF8 "OISTE WISeKey Global Root GC CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \340\021\204\136\064\336\276\210\201\271\234\366\026\046\321\226 \037\303\271\061 @@ -36949,7 +36949,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "CERTSIGNSA_certSIGNROOTCAG226F9" +# Certificate "certSIGN ROOT CA G2" # # Issuer: OU=certSIGN ROOT CA G2,O=CERTSIGN SA,C=RO # Serial Number:11:00:34:b6:4e:c6:36:2d:36 @@ -36962,7 +36962,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CERTSIGNSA_certSIGNROOTCAG226F9" +CKA_LABEL UTF8 "certSIGN ROOT CA G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\101\061\013\060\011\006\003\125\004\006\023\002\122\117\061 @@ -37073,7 +37073,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "CERTSIGNSA_certSIGNROOTCAG226F9" +# Trust for "certSIGN ROOT CA G2" # Issuer: OU=certSIGN ROOT CA G2,O=CERTSIGN SA,C=RO # Serial Number:11:00:34:b6:4e:c6:36:2d:36 # Subject: OU=certSIGN ROOT CA G2,O=CERTSIGN SA,C=RO @@ -37085,7 +37085,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CERTSIGNSA_certSIGNROOTCAG226F9" +CKA_LABEL UTF8 "certSIGN ROOT CA G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \046\371\223\264\355\075\050\047\260\271\113\247\351\025\035\243 \215\222\345\062 @@ -37110,7 +37110,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "DigiCert_Hotspot20TrustRootCA_03" +# Certificate "Hotspot 2.0 Trust Root CA - 03" # # Issuer: CN=Hotspot 2.0 Trust Root CA - 03,O=WFA Hotspot 2.0,C=US # Serial Number:0c:b3:0f:70:f2:86:a4:33:e0:b9:09:89:de:01:ed:b7 @@ -37123,7 +37123,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigiCert_Hotspot20TrustRootCA_03" +CKA_LABEL UTF8 "Hotspot 2.0 Trust Root CA - 03" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\120\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -37239,7 +37239,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "DigiCert_Hotspot20TrustRootCA_03" +# Trust for "Hotspot 2.0 Trust Root CA - 03" # Issuer: CN=Hotspot 2.0 Trust Root CA - 03,O=WFA Hotspot 2.0,C=US # Serial Number:0c:b3:0f:70:f2:86:a4:33:e0:b9:09:89:de:01:ed:b7 # Subject: CN=Hotspot 2.0 Trust Root CA - 03,O=WFA Hotspot 2.0,C=US @@ -37251,7 +37251,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "DigiCert_Hotspot20TrustRootCA_03" +CKA_LABEL UTF8 "Hotspot 2.0 Trust Root CA - 03" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \121\120\037\277\316\151\030\235\140\234\372\361\100\305\166\165 \135\314\037\337 @@ -37278,7 +37278,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "JapanGov_LGPKI_G3ROOT" +# Certificate "Application CA G3 Root" # # Issuer: CN=Application CA G3 Root,O=LGPKI,C=JP # Serial Number: 49 (0x31) @@ -37291,7 +37291,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "JapanGov_LGPKI_G3ROOT" +CKA_LABEL UTF8 "Application CA G3 Root" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\076\061\013\060\011\006\003\125\004\006\023\002\112\120\061 @@ -37369,7 +37369,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "JapanGov_LGPKI_G3ROOT" +# Trust for "Application CA G3 Root" # Issuer: CN=Application CA G3 Root,O=LGPKI,C=JP # Serial Number: 49 (0x31) # Subject: CN=Application CA G3 Root,O=LGPKI,C=JP @@ -37381,7 +37381,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "JapanGov_LGPKI_G3ROOT" +CKA_LABEL UTF8 "Application CA G3 Root" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \157\070\204\126\216\231\310\306\254\016\135\336\055\262\002\335 \000\056\066\143 @@ -37405,7 +37405,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GLOBALTRUST 2015465B26" +# Certificate "GLOBALTRUST 2015" # # Issuer: CN=GLOBALTRUST 2015,OU=GLOBALTRUST Certification Service,O=e-commerce monitoring GmbH,L=Wien,ST=Wien,C=AT # Serial Number: 0 (0x0) @@ -37418,7 +37418,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GLOBALTRUST 2015465B26" +CKA_LABEL UTF8 "GLOBALTRUST 2015" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\227\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -37551,7 +37551,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GLOBALTRUST 2015465B26" +# Trust for "GLOBALTRUST 2015" # Issuer: CN=GLOBALTRUST 2015,OU=GLOBALTRUST Certification Service,O=e-commerce monitoring GmbH,L=Wien,ST=Wien,C=AT # Serial Number: 0 (0x0) # Subject: CN=GLOBALTRUST 2015,OU=GLOBALTRUST Certification Service,O=e-commerce monitoring GmbH,L=Wien,ST=Wien,C=AT @@ -37563,7 +37563,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GLOBALTRUST 2015465B26" +CKA_LABEL UTF8 "GLOBALTRUST 2015" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \106\133\046\276\276\161\006\335\205\104\301\023\235\237\242\127 \000\301\327\275 @@ -37593,7 +37593,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Microsoft ECC Product Root Certificate Authority 2018(06F1AA)" +# Certificate "Microsoft ECC Product Root Certificate Authority 2018" # # Issuer: CN=Microsoft ECC Product Root Certificate Authority 2018,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:14:98:26:66:dc:7c:cd:8f:40:53:67:7b:b9:99:ec:85 @@ -37606,7 +37606,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft ECC Product Root Certificate Authority 2018(06F1AA)" +CKA_LABEL UTF8 "Microsoft ECC Product Root Certificate Authority 2018" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\224\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -37694,7 +37694,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Microsoft ECC Product Root Certificate Authority 2018(06F1AA)" +# Trust for "Microsoft ECC Product Root Certificate Authority 2018" # Issuer: CN=Microsoft ECC Product Root Certificate Authority 2018,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:14:98:26:66:dc:7c:cd:8f:40:53:67:7b:b9:99:ec:85 # Subject: CN=Microsoft ECC Product Root Certificate Authority 2018,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US @@ -37706,7 +37706,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft ECC Product Root Certificate Authority 2018(06F1AA)" +CKA_LABEL UTF8 "Microsoft ECC Product Root Certificate Authority 2018" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \006\361\252\063\013\222\173\165\072\100\346\214\337\042\343\113 \313\357\063\122 @@ -37737,7 +37737,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "ISRG Root X1(CABD2A)" +# Certificate "ISRG Root X1" # # Issuer: CN=ISRG Root X1,O=Internet Security Research Group,C=US # Serial Number:00:82:10:cf:b0:d2:40:e3:59:44:63:e0:bb:63:82:8b:00 @@ -37750,7 +37750,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ISRG Root X1(CABD2A)" +CKA_LABEL UTF8 "ISRG Root X1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -37866,7 +37866,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "ISRG Root X1(CABD2A)" +# Trust for "ISRG Root X1" # Issuer: CN=ISRG Root X1,O=Internet Security Research Group,C=US # Serial Number:00:82:10:cf:b0:d2:40:e3:59:44:63:e0:bb:63:82:8b:00 # Subject: CN=ISRG Root X1,O=Internet Security Research Group,C=US @@ -37878,7 +37878,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ISRG Root X1(CABD2A)" +CKA_LABEL UTF8 "ISRG Root X1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \312\275\052\171\241\007\152\061\362\035\045\066\065\313\003\235 \103\051\245\350 @@ -37905,7 +37905,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Entrust Root Certification Authority - G4(14884E)" +# Certificate "Entrust Root Certification Authority - G4" # # Issuer: CN=Entrust Root Certification Authority - G4,OU="(c) 2015 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US # Serial Number:00:d9:b5:43:7f:af:a9:39:0f:00:00:00:00:55:65:ad:58 @@ -37918,7 +37918,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust Root Certification Authority - G4(14884E)" +CKA_LABEL UTF8 "Entrust Root Certification Authority - G4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\276\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -38062,7 +38062,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Entrust Root Certification Authority - G4(14884E)" +# Trust for "Entrust Root Certification Authority - G4" # Issuer: CN=Entrust Root Certification Authority - G4,OU="(c) 2015 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US # Serial Number:00:d9:b5:43:7f:af:a9:39:0f:00:00:00:00:55:65:ad:58 # Subject: CN=Entrust Root Certification Authority - G4,OU="(c) 2015 Entrust, Inc. - for authorized use only",OU=See www.entrust.net/legal-terms,O="Entrust, Inc.",C=US @@ -38074,7 +38074,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Entrust Root Certification Authority - G4(14884E)" +CKA_LABEL UTF8 "Entrust Root Certification Authority - G4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \024\210\116\206\046\067\260\046\257\131\142\134\100\167\354\065 \051\272\226\001 @@ -38108,7 +38108,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "emSign Root CA - G1(8AC7AD)" +# Certificate "emSign Root CA - G1" # # Issuer: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN # Serial Number:31:f5:e4:62:0c:6c:58:ed:d6:d8 @@ -38121,7 +38121,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign Root CA - G1(8AC7AD)" +CKA_LABEL UTF8 "emSign Root CA - G1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\147\061\013\060\011\006\003\125\004\006\023\002\111\116\061 @@ -38209,7 +38209,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "emSign Root CA - G1(8AC7AD)" +# Trust for "emSign Root CA - G1" # Issuer: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN # Serial Number:31:f5:e4:62:0c:6c:58:ed:d6:d8 # Subject: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN @@ -38221,7 +38221,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign Root CA - G1(8AC7AD)" +CKA_LABEL UTF8 "emSign Root CA - G1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \212\307\255\217\163\254\116\301\265\165\115\245\100\364\374\317 \174\265\216\214 @@ -38248,7 +38248,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "emSign ECC Root CA - G3(3043FA)" +# Certificate "emSign ECC Root CA - G3" # # Issuer: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN # Serial Number:3c:f6:07:a9:68:70:0e:da:8b:84 @@ -38261,7 +38261,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign ECC Root CA - G3(3043FA)" +CKA_LABEL UTF8 "emSign ECC Root CA - G3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\153\061\013\060\011\006\003\125\004\006\023\002\111\116\061 @@ -38329,7 +38329,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "emSign ECC Root CA - G3(3043FA)" +# Trust for "emSign ECC Root CA - G3" # Issuer: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN # Serial Number:3c:f6:07:a9:68:70:0e:da:8b:84 # Subject: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN @@ -38341,7 +38341,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign ECC Root CA - G3(3043FA)" +CKA_LABEL UTF8 "emSign ECC Root CA - G3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \060\103\372\117\362\127\334\240\303\200\356\056\130\352\170\262 \077\346\273\301 @@ -38368,7 +38368,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "emSign Root CA - C1(E72EF1)" +# Certificate "emSign Root CA - C1" # # Issuer: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US # Serial Number:00:ae:cf:00:ba:c4:cf:32:f8:43:b2 @@ -38381,7 +38381,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign Root CA - C1(E72EF1)" +CKA_LABEL UTF8 "emSign Root CA - C1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\126\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -38465,7 +38465,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "emSign Root CA - C1(E72EF1)" +# Trust for "emSign Root CA - C1" # Issuer: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US # Serial Number:00:ae:cf:00:ba:c4:cf:32:f8:43:b2 # Subject: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US @@ -38477,7 +38477,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign Root CA - C1(E72EF1)" +CKA_LABEL UTF8 "emSign Root CA - C1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \347\056\361\337\374\262\011\050\317\135\324\325\147\067\261\121 \313\206\117\001 @@ -38503,7 +38503,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "emSign ECC Root CA - C3(B6AF43)" +# Certificate "emSign ECC Root CA - C3" # # Issuer: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US # Serial Number:7b:71:b6:82:56:b8:12:7c:9c:a8 @@ -38516,7 +38516,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign ECC Root CA - C3(B6AF43)" +CKA_LABEL UTF8 "emSign ECC Root CA - C3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\132\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -38579,7 +38579,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "emSign ECC Root CA - C3(B6AF43)" +# Trust for "emSign ECC Root CA - C3" # Issuer: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US # Serial Number:7b:71:b6:82:56:b8:12:7c:9c:a8 # Subject: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US @@ -38591,7 +38591,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "emSign ECC Root CA - C3(B6AF43)" +CKA_LABEL UTF8 "emSign ECC Root CA - C3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \266\257\103\302\233\201\123\175\366\357\153\303\037\037\140\025 \014\356\110\146 @@ -38617,7 +38617,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Fina Root CA(6202BF)" +# Certificate "Fina Root CA" # # Issuer: CN=Fina Root CA,O=Financijska agencija,C=HR # Serial Number:00:98:33:c9:a8:00:00:00:00:56:54:bc:6e @@ -38630,7 +38630,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Fina Root CA(6202BF)" +CKA_LABEL UTF8 "Fina Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\103\061\013\060\011\006\003\125\004\006\023\002\110\122\061 @@ -38744,7 +38744,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Fina Root CA(6202BF)" +# Trust for "Fina Root CA" # Issuer: CN=Fina Root CA,O=Financijska agencija,C=HR # Serial Number:00:98:33:c9:a8:00:00:00:00:56:54:bc:6e # Subject: CN=Fina Root CA,O=Financijska agencija,C=HR @@ -38756,7 +38756,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Fina Root CA(6202BF)" +CKA_LABEL UTF8 "Fina Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \142\002\277\026\232\362\177\246\176\320\316\306\153\170\053\203 \042\141\046\351 @@ -38781,7 +38781,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Hongkong Post Root CA 3(58A2D0)" +# Certificate "Hongkong Post Root CA 3" # # Issuer: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK # Serial Number:08:16:5f:8a:4c:a5:ec:00:c9:93:40:df:c4:c6:ae:23:b8:1c:5a:a4 @@ -38794,7 +38794,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Hongkong Post Root CA 3(58A2D0)" +CKA_LABEL UTF8 "Hongkong Post Root CA 3" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\157\061\013\060\011\006\003\125\004\006\023\002\110\113\061 @@ -38921,7 +38921,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Hongkong Post Root CA 3(58A2D0)" +# Trust for "Hongkong Post Root CA 3" # Issuer: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK # Serial Number:08:16:5f:8a:4c:a5:ec:00:c9:93:40:df:c4:c6:ae:23:b8:1c:5a:a4 # Subject: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK @@ -38933,7 +38933,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Hongkong Post Root CA 3(58A2D0)" +CKA_LABEL UTF8 "Hongkong Post Root CA 3" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \130\242\320\354\040\122\201\133\301\363\370\144\002\044\116\302 \216\002\113\002 @@ -38962,7 +38962,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Microsoft ECC TS Root Certificate Authority 2018(31F9FC)" +# Certificate "Microsoft ECC TS Root Certificate Authority 2018" # # Issuer: CN=Microsoft ECC TS Root Certificate Authority 2018,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:15:38:75:e1:64:7e:d1:b0:47:b4:ef:af:41:12:82:45 @@ -38975,7 +38975,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft ECC TS Root Certificate Authority 2018(31F9FC)" +CKA_LABEL UTF8 "Microsoft ECC TS Root Certificate Authority 2018" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -39062,7 +39062,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Microsoft ECC TS Root Certificate Authority 2018(31F9FC)" +# Trust for "Microsoft ECC TS Root Certificate Authority 2018" # Issuer: CN=Microsoft ECC TS Root Certificate Authority 2018,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US # Serial Number:15:38:75:e1:64:7e:d1:b0:47:b4:ef:af:41:12:82:45 # Subject: CN=Microsoft ECC TS Root Certificate Authority 2018,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US @@ -39074,7 +39074,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft ECC TS Root Certificate Authority 2018(31F9FC)" +CKA_LABEL UTF8 "Microsoft ECC TS Root Certificate Authority 2018" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \061\371\374\213\243\200\131\206\267\041\352\162\225\306\133\072 \104\123\102\164 @@ -39105,7 +39105,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "PostSignum Root QCA 4(AA40D2)" +# Certificate "PostSignum Root QCA 4" # # Issuer: CN=PostSignum Root QCA 4,O="..esk.. po..ta, s.p.",OID.2.5.4.97=NTRCZ-47114983,C=CZ # Serial Number: 4000 (0xfa0) @@ -39118,7 +39118,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "PostSignum Root QCA 4(AA40D2)" +CKA_LABEL UTF8 "PostSignum Root QCA 4" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\145\061\013\060\011\006\003\125\004\006\023\002\103\132\061 @@ -39264,7 +39264,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "PostSignum Root QCA 4(AA40D2)" +# Trust for "PostSignum Root QCA 4" # Issuer: CN=PostSignum Root QCA 4,O="..esk.. po..ta, s.p.",OID.2.5.4.97=NTRCZ-47114983,C=CZ # Serial Number: 4000 (0xfa0) # Subject: CN=PostSignum Root QCA 4,O="..esk.. po..ta, s.p.",OID.2.5.4.97=NTRCZ-47114983,C=CZ @@ -39276,7 +39276,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "PostSignum Root QCA 4(AA40D2)" +CKA_LABEL UTF8 "PostSignum Root QCA 4" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \252\100\322\127\233\250\044\044\315\047\161\233\035\153\037\065 \161\163\200\231 @@ -39303,7 +39303,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "NAVER Global Root Certification Authority(8F6BF2)" +# Certificate "NAVER Global Root Certification Authority" # # Issuer: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR # Serial Number:01:94:30:1e:a2:0b:dd:f5:c5:33:2a:b1:43:44:71:f8:d6:50:4d:0d @@ -39316,7 +39316,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NAVER Global Root Certification Authority(8F6BF2)" +CKA_LABEL UTF8 "NAVER Global Root Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061 @@ -39438,7 +39438,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "NAVER Global Root Certification Authority(8F6BF2)" +# Trust for "NAVER Global Root Certification Authority" # Issuer: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR # Serial Number:01:94:30:1e:a2:0b:dd:f5:c5:33:2a:b1:43:44:71:f8:d6:50:4d:0d # Subject: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR @@ -39450,7 +39450,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "NAVER Global Root Certification Authority(8F6BF2)" +CKA_LABEL UTF8 "NAVER Global Root Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \217\153\362\251\047\112\332\024\240\304\364\216\141\047\371\300 \036\170\135\321 @@ -39478,7 +39478,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "RCSC RootCA(FDE7C6)" +# Certificate "RCSC RootCA" # # Issuer: CN=RCSC RootCA,O=VI Registru centras- i.k. 124110246,OU=RCSC,C=LT # Serial Number:4f:00:1b:a1:24:bd:cb:88:48:be:bd:3f:2b:62:c7:c5 @@ -39491,7 +39491,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "RCSC RootCA(FDE7C6)" +CKA_LABEL UTF8 "RCSC RootCA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\140\061\013\060\011\006\003\125\004\006\023\002\114\124\061 @@ -39613,7 +39613,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "RCSC RootCA(FDE7C6)" +# Trust for "RCSC RootCA" # Issuer: CN=RCSC RootCA,O=VI Registru centras- i.k. 124110246,OU=RCSC,C=LT # Serial Number:4f:00:1b:a1:24:bd:cb:88:48:be:bd:3f:2b:62:c7:c5 # Subject: CN=RCSC RootCA,O=VI Registru centras- i.k. 124110246,OU=RCSC,C=LT @@ -39625,7 +39625,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "RCSC RootCA(FDE7C6)" +CKA_LABEL UTF8 "RCSC RootCA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \375\347\306\375\263\053\270\346\071\071\204\015\152\340\122\303 \330\267\073\207 @@ -39653,7 +39653,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "VRK Gov. Root CA - G2(F435F8)" +# Certificate "VRK Gov. Root CA - G2" # # Issuer: CN=VRK Gov. Root CA - G2,OU=Varmennepalvelut,OU=Certification Authority Services,O=Vaestorekisterikeskus CA,C=FI # Serial Number: 200000 (0x30d40) @@ -39666,7 +39666,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VRK Gov. Root CA - G2(F435F8)" +CKA_LABEL UTF8 "VRK Gov. Root CA - G2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\226\061\013\060\011\006\003\125\004\006\023\002\106\111 @@ -39800,7 +39800,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "VRK Gov. Root CA - G2(F435F8)" +# Trust for "VRK Gov. Root CA - G2" # Issuer: CN=VRK Gov. Root CA - G2,OU=Varmennepalvelut,OU=Certification Authority Services,O=Vaestorekisterikeskus CA,C=FI # Serial Number: 200000 (0x30d40) # Subject: CN=VRK Gov. Root CA - G2,OU=Varmennepalvelut,OU=Certification Authority Services,O=Vaestorekisterikeskus CA,C=FI @@ -39812,7 +39812,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "VRK Gov. Root CA - G2(F435F8)" +CKA_LABEL UTF8 "VRK Gov. Root CA - G2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \364\065\370\137\001\010\332\150\116\173\375\121\174\220\306\047 \273\232\154\365 @@ -39842,7 +39842,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Trustwave Global Certification Authority(2F8F36)" +# Certificate "Trustwave Global Certification Authority" # # Issuer: CN=Trustwave Global Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US # Serial Number:05:f7:0e:86:da:49:f3:46:35:2e:ba:b2 @@ -39855,7 +39855,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustwave Global Certification Authority(2F8F36)" +CKA_LABEL UTF8 "Trustwave Global Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -39983,7 +39983,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Trustwave Global Certification Authority(2F8F36)" +# Trust for "Trustwave Global Certification Authority" # Issuer: CN=Trustwave Global Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US # Serial Number:05:f7:0e:86:da:49:f3:46:35:2e:ba:b2 # Subject: CN=Trustwave Global Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US @@ -39995,7 +39995,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustwave Global Certification Authority(2F8F36)" +CKA_LABEL UTF8 "Trustwave Global Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \057\217\066\117\341\130\227\104\041\131\207\245\052\232\320\151 \225\046\177\265 @@ -40024,7 +40024,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Trustwave Global ECC P256 Certification Authority(B49082)" +# Certificate "Trustwave Global ECC P256 Certification Authority" # # Issuer: CN=Trustwave Global ECC P256 Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US # Serial Number:0d:6a:5f:08:3f:28:5c:3e:51:95:df:5d @@ -40037,7 +40037,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustwave Global ECC P256 Certification Authority(B49082)" +CKA_LABEL UTF8 "Trustwave Global ECC P256 Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\221\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -40112,7 +40112,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Trustwave Global ECC P256 Certification Authority(B49082)" +# Trust for "Trustwave Global ECC P256 Certification Authority" # Issuer: CN=Trustwave Global ECC P256 Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US # Serial Number:0d:6a:5f:08:3f:28:5c:3e:51:95:df:5d # Subject: CN=Trustwave Global ECC P256 Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US @@ -40124,7 +40124,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustwave Global ECC P256 Certification Authority(B49082)" +CKA_LABEL UTF8 "Trustwave Global ECC P256 Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \264\220\202\335\105\014\276\213\133\261\146\323\342\244\010\046 \315\355\102\317 @@ -40154,7 +40154,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Trustwave Global ECC P384 Certification Authority(E7F3A3)" +# Certificate "Trustwave Global ECC P384 Certification Authority" # # Issuer: CN=Trustwave Global ECC P384 Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US # Serial Number:08:bd:85:97:6c:99:27:a4:80:68:47:3b @@ -40167,7 +40167,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustwave Global ECC P384 Certification Authority(E7F3A3)" +CKA_LABEL UTF8 "Trustwave Global ECC P384 Certification Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\221\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -40246,7 +40246,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Trustwave Global ECC P384 Certification Authority(E7F3A3)" +# Trust for "Trustwave Global ECC P384 Certification Authority" # Issuer: CN=Trustwave Global ECC P384 Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US # Serial Number:08:bd:85:97:6c:99:27:a4:80:68:47:3b # Subject: CN=Trustwave Global ECC P384 Certification Authority,O="Trustwave Holdings, Inc.",L=Chicago,ST=Illinois,C=US @@ -40258,7 +40258,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Trustwave Global ECC P384 Certification Authority(E7F3A3)" +CKA_LABEL UTF8 "Trustwave Global ECC P384 Certification Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \347\363\243\310\317\157\303\004\056\155\016\147\062\305\236\150 \225\015\136\322 @@ -40288,7 +40288,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Digidentity Services Root CA(7B3FB2)" +# Certificate "Digidentity Services Root CA" # # Issuer: C=NL,O=Digidentity B.V.,CN=Digidentity Services Root CA # Serial Number:12:81:b9:18:f3:79:3a:42:93:ce:91:58:61:e4:ed:5c @@ -40301,7 +40301,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Digidentity Services Root CA(7B3FB2)" +CKA_LABEL UTF8 "Digidentity Services Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\117\061\045\060\043\006\003\125\004\003\014\034\104\151\147 @@ -40417,7 +40417,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Digidentity Services Root CA(7B3FB2)" +# Trust for "Digidentity Services Root CA" # Issuer: C=NL,O=Digidentity B.V.,CN=Digidentity Services Root CA # Serial Number:12:81:b9:18:f3:79:3a:42:93:ce:91:58:61:e4:ed:5c # Subject: C=NL,O=Digidentity B.V.,CN=Digidentity Services Root CA @@ -40429,7 +40429,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Digidentity Services Root CA(7B3FB2)" +CKA_LABEL UTF8 "Digidentity Services Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \173\077\262\167\356\061\034\036\325\140\312\271\156\117\355\167 \136\152\076\355 @@ -40456,7 +40456,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "HiPKI Root CA - G1(6A92E4)" +# Certificate "HiPKI Root CA - G1" # # Issuer: CN=HiPKI Root CA - G1,O="Chunghwa Telecom Co., Ltd.",C=TW # Serial Number:2d:dd:ac:ce:62:97:94:a1:43:e8:b0:cd:76:6a:5e:60 @@ -40469,7 +40469,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "HiPKI Root CA - G1(6A92E4)" +CKA_LABEL UTF8 "HiPKI Root CA - G1" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\117\061\013\060\011\006\003\125\004\006\023\002\124\127\061 @@ -40585,7 +40585,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "HiPKI Root CA - G1(6A92E4)" +# Trust for "HiPKI Root CA - G1" # Issuer: CN=HiPKI Root CA - G1,O="Chunghwa Telecom Co., Ltd.",C=TW # Serial Number:2d:dd:ac:ce:62:97:94:a1:43:e8:b0:cd:76:6a:5e:60 # Subject: CN=HiPKI Root CA - G1,O="Chunghwa Telecom Co., Ltd.",C=TW @@ -40597,7 +40597,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "HiPKI Root CA - G1(6A92E4)" +CKA_LABEL UTF8 "HiPKI Root CA - G1" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \152\222\344\250\356\033\354\226\105\067\343\051\127\111\315\226 \343\345\322\140 @@ -40624,7 +40624,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TrustFactory SSL Root Certificate Authority(D11478)" +# Certificate "TrustFactory SSL Root Certificate Authority" # # Issuer: CN=TrustFactory SSL Root Certificate Authority,OU=TrustFactory PKI Operations,O=TrustFactory(Pty)Ltd,L=Johannesburg,ST=Gauteng,C=ZA # Serial Number:68:5d:cc:26:39:e0:23:66:e4:4a:9d:64:d3:8e:04:35 @@ -40637,7 +40637,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustFactory SSL Root Certificate Authority(D11478)" +CKA_LABEL UTF8 "TrustFactory SSL Root Certificate Authority" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\261\061\013\060\011\006\003\125\004\006\023\002\132\101 @@ -40780,7 +40780,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TrustFactory SSL Root Certificate Authority(D11478)" +# Trust for "TrustFactory SSL Root Certificate Authority" # Issuer: CN=TrustFactory SSL Root Certificate Authority,OU=TrustFactory PKI Operations,O=TrustFactory(Pty)Ltd,L=Johannesburg,ST=Gauteng,C=ZA # Serial Number:68:5d:cc:26:39:e0:23:66:e4:4a:9d:64:d3:8e:04:35 # Subject: CN=TrustFactory SSL Root Certificate Authority,OU=TrustFactory PKI Operations,O=TrustFactory(Pty)Ltd,L=Johannesburg,ST=Gauteng,C=ZA @@ -40792,7 +40792,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TrustFactory SSL Root Certificate Authority(D11478)" +CKA_LABEL UTF8 "TrustFactory SSL Root Certificate Authority" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \321\024\170\350\345\373\142\124\005\223\322\054\121\127\015\001 \116\254\166\330 @@ -40825,7 +40825,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "A-Trust-Root-07(1B1815)" +# Certificate "A-Trust-Root-07" # # Issuer: CN=A-Trust-Root-07,OU=A-Trust-Root-07,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1408559753 (0x53f4ea89) @@ -40838,7 +40838,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "A-Trust-Root-07(1B1815)" +CKA_LABEL UTF8 "A-Trust-Root-07" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\213\061\013\060\011\006\003\125\004\006\023\002\101\124 @@ -40965,7 +40965,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "A-Trust-Root-07(1B1815)" +# Trust for "A-Trust-Root-07" # Issuer: CN=A-Trust-Root-07,OU=A-Trust-Root-07,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT # Serial Number: 1408559753 (0x53f4ea89) # Subject: CN=A-Trust-Root-07,OU=A-Trust-Root-07,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT @@ -40977,7 +40977,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "A-Trust-Root-07(1B1815)" +CKA_LABEL UTF8 "A-Trust-Root-07" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \033\030\025\257\222\135\024\016\374\132\371\241\252\125\356\273 \117\373\305\141 @@ -41006,7 +41006,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "AC RAIZ FNMT-RCM SERVIDORES SEGUROS(62FFD9)" +# Certificate "AC RAIZ FNMT-RCM SERVIDORES SEGUROS" # # Issuer: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS,OID.2.5.4.97=VATES-Q2826004J,OU=Ceres,O=FNMT-RCM,C=ES # Serial Number:62:f6:32:6c:e5:c4:e3:68:5c:1b:62:dd:9c:2e:9d:95 @@ -41019,7 +41019,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "AC RAIZ FNMT-RCM SERVIDORES SEGUROS(62FFD9)" +CKA_LABEL UTF8 "AC RAIZ FNMT-RCM SERVIDORES SEGUROS" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\170\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -41092,7 +41092,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "AC RAIZ FNMT-RCM SERVIDORES SEGUROS(62FFD9)" +# Trust for "AC RAIZ FNMT-RCM SERVIDORES SEGUROS" # Issuer: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS,OID.2.5.4.97=VATES-Q2826004J,OU=Ceres,O=FNMT-RCM,C=ES # Serial Number:62:f6:32:6c:e5:c4:e3:68:5c:1b:62:dd:9c:2e:9d:95 # Subject: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS,OID.2.5.4.97=VATES-Q2826004J,OU=Ceres,O=FNMT-RCM,C=ES @@ -41104,7 +41104,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "AC RAIZ FNMT-RCM SERVIDORES SEGUROS(62FFD9)" +CKA_LABEL UTF8 "AC RAIZ FNMT-RCM SERVIDORES SEGUROS" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \142\377\331\236\300\145\015\003\316\165\223\322\355\077\055\062 \311\343\345\112 @@ -41133,7 +41133,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Izenpe.com(2F783D)" +# Certificate "Izenpe.com" # # Issuer: CN=Izenpe.com,O=IZENPE S.A.,C=ES # Serial Number:00:b0:b7:5a:16:48:5f:bf:e1:cb:f5:8b:d7:19:e6:7d @@ -41146,7 +41146,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Izenpe.com(2F783D)" +CKA_LABEL UTF8 "Izenpe.com" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\070\061\013\060\011\006\003\125\004\006\023\002\105\123\061 @@ -41267,7 +41267,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Izenpe.com(2F783D)" +# Trust for "Izenpe.com" # Issuer: CN=Izenpe.com,O=IZENPE S.A.,C=ES # Serial Number:00:b0:b7:5a:16:48:5f:bf:e1:cb:f5:8b:d7:19:e6:7d # Subject: CN=Izenpe.com,O=IZENPE S.A.,C=ES @@ -41279,7 +41279,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Izenpe.com(2F783D)" +CKA_LABEL UTF8 "Izenpe.com" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \057\170\075\045\122\030\247\112\145\071\161\265\054\242\234\105 \025\157\351\031 @@ -41304,7 +41304,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Microsoft ECC Root Certificate Authority 2017(999A64)" +# Certificate "Microsoft ECC Root Certificate Authority 2017" # # Issuer: CN=Microsoft ECC Root Certificate Authority 2017,O=Microsoft Corporation,C=US # Serial Number:66:f2:3d:af:87:de:8b:b1:4a:ea:0c:57:31:01:c2:ec @@ -41317,7 +41317,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft ECC Root Certificate Authority 2017(999A64)" +CKA_LABEL UTF8 "Microsoft ECC Root Certificate Authority 2017" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\145\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -41386,7 +41386,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Microsoft ECC Root Certificate Authority 2017(999A64)" +# Trust for "Microsoft ECC Root Certificate Authority 2017" # Issuer: CN=Microsoft ECC Root Certificate Authority 2017,O=Microsoft Corporation,C=US # Serial Number:66:f2:3d:af:87:de:8b:b1:4a:ea:0c:57:31:01:c2:ec # Subject: CN=Microsoft ECC Root Certificate Authority 2017,O=Microsoft Corporation,C=US @@ -41398,7 +41398,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft ECC Root Certificate Authority 2017(999A64)" +CKA_LABEL UTF8 "Microsoft ECC Root Certificate Authority 2017" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \231\232\144\303\177\364\175\237\253\225\361\107\151\211\024\140 \356\304\303\305 @@ -41426,7 +41426,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Microsoft RSA Root Certificate Authority 2017(73A5E6)" +# Certificate "Microsoft RSA Root Certificate Authority 2017" # # Issuer: CN=Microsoft RSA Root Certificate Authority 2017,O=Microsoft Corporation,C=US # Serial Number:1e:d3:97:09:5f:d8:b4:b3:47:70:1e:aa:be:7f:45:b3 @@ -41439,7 +41439,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft RSA Root Certificate Authority 2017(73A5E6)" +CKA_LABEL UTF8 "Microsoft RSA Root Certificate Authority 2017" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\145\061\013\060\011\006\003\125\004\006\023\002\125\123\061 @@ -41561,7 +41561,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Microsoft RSA Root Certificate Authority 2017(73A5E6)" +# Trust for "Microsoft RSA Root Certificate Authority 2017" # Issuer: CN=Microsoft RSA Root Certificate Authority 2017,O=Microsoft Corporation,C=US # Serial Number:1e:d3:97:09:5f:d8:b4:b3:47:70:1e:aa:be:7f:45:b3 # Subject: CN=Microsoft RSA Root Certificate Authority 2017,O=Microsoft Corporation,C=US @@ -41573,7 +41573,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Microsoft RSA Root Certificate Authority 2017(73A5E6)" +CKA_LABEL UTF8 "Microsoft RSA Root Certificate Authority 2017" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \163\245\346\112\073\377\203\026\377\016\334\314\141\212\220\156 \116\256\115\164 @@ -41601,7 +41601,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "TunTrust Root CA(CFE970)" +# Certificate "TunTrust Root CA" # # Issuer: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN # Serial Number:13:02:d5:e2:40:4c:92:46:86:16:67:5d:b4:bb:bb:b2:6b:3e:fc:13 @@ -41614,7 +41614,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TunTrust Root CA(CFE970)" +CKA_LABEL UTF8 "TunTrust Root CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\141\061\013\060\011\006\003\125\004\006\023\002\124\116\061 @@ -41737,7 +41737,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "TunTrust Root CA(CFE970)" +# Trust for "TunTrust Root CA" # Issuer: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN # Serial Number:13:02:d5:e2:40:4c:92:46:86:16:67:5d:b4:bb:bb:b2:6b:3e:fc:13 # Subject: CN=TunTrust Root CA,O=Agence Nationale de Certification Electronique,C=TN @@ -41749,7 +41749,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "TunTrust Root CA(CFE970)" +CKA_LABEL UTF8 "TunTrust Root CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \317\351\160\204\017\340\163\017\235\366\014\177\054\113\356\040 \106\064\234\273 @@ -41777,7 +41777,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Certum EC-384 CA(F33E78)" +# Certificate "Certum EC-384 CA" # # Issuer: CN=Certum EC-384 CA,OU=Certum Certification Authority,O=Asseco Data Systems S.A.,C=PL # Serial Number:78:8f:27:5c:81:12:52:20:a5:04:d0:2d:dd:ba:73:f4 @@ -41790,7 +41790,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum EC-384 CA(F33E78)" +CKA_LABEL UTF8 "Certum EC-384 CA" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\164\061\013\060\011\006\003\125\004\006\023\002\120\114\061 @@ -41862,7 +41862,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Certum EC-384 CA(F33E78)" +# Trust for "Certum EC-384 CA" # Issuer: CN=Certum EC-384 CA,OU=Certum Certification Authority,O=Asseco Data Systems S.A.,C=PL # Serial Number:78:8f:27:5c:81:12:52:20:a5:04:d0:2d:dd:ba:73:f4 # Subject: CN=Certum EC-384 CA,OU=Certum Certification Authority,O=Asseco Data Systems S.A.,C=PL @@ -41874,7 +41874,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum EC-384 CA(F33E78)" +CKA_LABEL UTF8 "Certum EC-384 CA" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \363\076\170\074\254\337\364\242\314\254\147\125\151\126\327\345 \026\074\341\355 @@ -41903,7 +41903,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Certum Trusted Root CA(C88344)" +# Certificate "Certum Trusted Root CA " # # Issuer: CN=Certum Trusted Root CA,OU=Certum Certification Authority,O=Asseco Data Systems S.A.,C=PL # Serial Number:1e:bf:59:50:b8:c9:80:37:4c:06:f7:eb:55:4f:b5:ed @@ -41916,7 +41916,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum Trusted Root CA(C88344)" +CKA_LABEL UTF8 "Certum Trusted Root CA " CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\172\061\013\060\011\006\003\125\004\006\023\002\120\114\061 @@ -42042,7 +42042,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Certum Trusted Root CA(C88344)" +# Trust for "Certum Trusted Root CA " # Issuer: CN=Certum Trusted Root CA,OU=Certum Certification Authority,O=Asseco Data Systems S.A.,C=PL # Serial Number:1e:bf:59:50:b8:c9:80:37:4c:06:f7:eb:55:4f:b5:ed # Subject: CN=Certum Trusted Root CA,OU=Certum Certification Authority,O=Asseco Data Systems S.A.,C=PL @@ -42054,7 +42054,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Certum Trusted Root CA(C88344)" +CKA_LABEL UTF8 "Certum Trusted Root CA " CKA_CERT_SHA1_HASH MULTILINE_OCTAL \310\203\104\300\030\256\237\314\361\207\267\217\042\321\305\327 \105\204\272\345 @@ -42083,7 +42083,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Autoridade Certificadora Raiz Brasileira v10(6C155E)" +# Certificate "Autoridade Certificadora Raiz Brasileira v10" # # Issuer: CN=Autoridade Certificadora Raiz Brasileira v10,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR # Serial Number:00:d2:d5:8b:44:bf:81:93:42 @@ -42096,7 +42096,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Autoridade Certificadora Raiz Brasileira v10(6C155E)" +CKA_LABEL UTF8 "Autoridade Certificadora Raiz Brasileira v10" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\201\230\061\013\060\011\006\003\125\004\006\023\002\102\122 @@ -42239,7 +42239,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Autoridade Certificadora Raiz Brasileira v10(6C155E)" +# Trust for "Autoridade Certificadora Raiz Brasileira v10" # Issuer: CN=Autoridade Certificadora Raiz Brasileira v10,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR # Serial Number:00:d2:d5:8b:44:bf:81:93:42 # Subject: CN=Autoridade Certificadora Raiz Brasileira v10,OU=Instituto Nacional de Tecnologia da Informacao - ITI,O=ICP-Brasil,C=BR @@ -42251,7 +42251,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Autoridade Certificadora Raiz Brasileira v10(6C155E)" +CKA_LABEL UTF8 "Autoridade Certificadora Raiz Brasileira v10" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \154\025\136\327\047\032\220\112\015\300\100\360\310\127\377\123 \277\155\262\220 @@ -42281,7 +42281,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GlobalSign Root E46(39B46C)" +# Certificate "GlobalSign Root E46" # # Issuer: CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE # Serial Number:11:d2:bb:ba:33:6e:d4:bc:e6:24:68:c5:0d:84:1d:98:e8:43 @@ -42294,7 +42294,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalSign Root E46(39B46C)" +CKA_LABEL UTF8 "GlobalSign Root E46" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\106\061\013\060\011\006\003\125\004\006\023\002\102\105\061 @@ -42354,7 +42354,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GlobalSign Root E46(39B46C)" +# Trust for "GlobalSign Root E46" # Issuer: CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE # Serial Number:11:d2:bb:ba:33:6e:d4:bc:e6:24:68:c5:0d:84:1d:98:e8:43 # Subject: CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE @@ -42366,7 +42366,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalSign Root E46(39B46C)" +CKA_LABEL UTF8 "GlobalSign Root E46" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \071\264\154\325\376\200\006\353\342\057\112\273\010\063\240\257 \333\271\335\204 @@ -42392,7 +42392,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GlobalSign Root R46(53A2B0)" +# Certificate "GlobalSign Root R46" # # Issuer: CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE # Serial Number:11:d2:bb:b9:d7:23:18:9e:40:5f:0a:9d:2d:d0:df:25:67:d1 @@ -42405,7 +42405,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalSign Root R46(53A2B0)" +CKA_LABEL UTF8 "GlobalSign Root R46" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\106\061\013\060\011\006\003\125\004\006\023\002\102\105\061 @@ -42518,7 +42518,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GlobalSign Root R46(53A2B0)" +# Trust for "GlobalSign Root R46" # Issuer: CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE # Serial Number:11:d2:bb:b9:d7:23:18:9e:40:5f:0a:9d:2d:d0:df:25:67:d1 # Subject: CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE @@ -42530,7 +42530,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GlobalSign Root R46(53A2B0)" +CKA_LABEL UTF8 "GlobalSign Root R46" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \123\242\260\113\312\153\326\105\346\071\212\216\304\015\322\277 \167\303\242\220 @@ -42556,7 +42556,7 @@ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "GLOBALTRUST 2020(D067C1)" +# Certificate "GLOBALTRUST 2020" # # Issuer: CN=GLOBALTRUST 2020,O=e-commerce monitoring GmbH,C=AT # Serial Number:5a:4b:bd:5a:fb:4f:8a:5b:fa:65:e5 @@ -42569,7 +42569,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GLOBALTRUST 2020(D067C1)" +CKA_LABEL UTF8 "GLOBALTRUST 2020" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\115\061\013\060\011\006\003\125\004\006\023\002\101\124\061 @@ -42684,7 +42684,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "GLOBALTRUST 2020(D067C1)" +# Trust for "GLOBALTRUST 2020" # Issuer: CN=GLOBALTRUST 2020,O=e-commerce monitoring GmbH,C=AT # Serial Number:5a:4b:bd:5a:fb:4f:8a:5b:fa:65:e5 # Subject: CN=GLOBALTRUST 2020,O=e-commerce monitoring GmbH,C=AT @@ -42696,7 +42696,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "GLOBALTRUST 2020(D067C1)" +CKA_LABEL UTF8 "GLOBALTRUST 2020" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \320\147\301\023\121\001\014\252\320\307\152\145\067\061\026\046 \117\123\161\242 @@ -42715,13 +42715,13 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\013\132\113\275\132\373\117\212\133\372\145\345 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE # -# Certificate "Telia Root CA v2(B999CD)" +# Certificate "Telia Root CA v2" # # Issuer: CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI # Serial Number:01:67:5f:27:d6:fe:7a:e3:e4:ac:be:09:5b:05:9e @@ -42734,7 +42734,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Telia Root CA v2(B999CD)" +CKA_LABEL UTF8 "Telia Root CA v2" CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 CKA_SUBJECT MULTILINE_OCTAL \060\104\061\013\060\011\006\003\125\004\006\023\002\106\111\061 @@ -42849,7 +42849,7 @@ CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE -# Trust for "Telia Root CA v2(B999CD)" +# Trust for "Telia Root CA v2" # Issuer: CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI # Serial Number:01:67:5f:27:d6:fe:7a:e3:e4:ac:be:09:5b:05:9e # Subject: CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI @@ -42861,7 +42861,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Telia Root CA v2(B999CD)" +CKA_LABEL UTF8 "Telia Root CA v2" CKA_CERT_SHA1_HASH MULTILINE_OCTAL \271\231\315\321\163\120\212\304\107\005\010\234\214\210\373\276 \240\053\100\315 @@ -42885,3 +42885,794 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "DigiCert TLS RSA4096 Root G5" +# +# Issuer: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a +# Subject: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): 37:1A:00:DC:05:33:B3:72:1A:7E:EB:40:E8:41:9E:70:79:9D:2B:0A:0F:2C:1D:80:69:31:65:F7:CE:C4:AD:75 +# Fingerprint (SHA1): A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert TLS RSA4096 Root G5" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\045\060\043\006\003\125\004 +\003\023\034\104\151\147\151\103\145\162\164\040\124\114\123\040 +\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\045\060\043\006\003\125\004 +\003\023\034\104\151\147\151\103\145\162\164\040\124\114\123\040 +\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\010\371\264\170\250\372\176\332\152\063\067\211\336\174 +\317\212 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\146\060\202\003\116\240\003\002\001\002\002\020\010 +\371\264\170\250\372\176\332\152\063\067\211\336\174\317\212\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\115 +\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060 +\025\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164 +\054\040\111\156\143\056\061\045\060\043\006\003\125\004\003\023 +\034\104\151\147\151\103\145\162\164\040\124\114\123\040\122\123 +\101\064\060\071\066\040\122\157\157\164\040\107\065\060\036\027 +\015\062\061\060\061\061\065\060\060\060\060\060\060\132\027\015 +\064\066\060\061\061\064\062\063\065\071\065\071\132\060\115\061 +\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025 +\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164\054 +\040\111\156\143\056\061\045\060\043\006\003\125\004\003\023\034 +\104\151\147\151\103\145\162\164\040\124\114\123\040\122\123\101 +\064\060\071\066\040\122\157\157\164\040\107\065\060\202\002\042 +\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +\202\002\017\000\060\202\002\012\002\202\002\001\000\263\320\364 +\311\171\021\235\375\374\146\201\347\314\325\344\274\354\201\076 +\152\065\216\056\267\347\336\257\371\007\115\317\060\235\352\011 +\013\231\275\154\127\332\030\112\270\170\254\072\071\250\246\110 +\254\056\162\345\275\353\361\032\315\347\244\003\251\077\021\264 +\330\057\211\026\373\224\001\075\273\057\370\023\005\241\170\034 +\216\050\340\105\340\203\364\131\033\225\263\256\176\003\105\345 +\276\302\102\376\356\362\074\266\205\023\230\062\235\026\250\051 +\302\013\034\070\334\237\061\167\134\277\047\243\374\047\254\267 +\053\275\164\233\027\055\362\201\332\135\260\341\043\027\076\210 +\112\022\043\320\352\317\235\336\003\027\261\102\112\240\026\114 +\244\155\223\351\077\072\356\072\174\235\130\235\364\116\217\374 +\073\043\310\155\270\342\005\332\314\353\354\303\061\364\327\247 +\051\124\200\317\104\133\114\157\060\236\363\314\335\037\224\103 +\235\115\177\160\160\015\324\072\321\067\360\154\235\233\300\024 +\223\130\357\315\101\070\165\274\023\003\225\174\177\343\134\351 +\325\015\325\342\174\020\142\252\153\360\075\166\363\077\243\350 +\260\301\375\357\252\127\115\254\206\247\030\264\051\301\054\016 +\277\144\276\051\214\330\002\055\315\134\057\362\177\357\025\364 +\014\025\254\012\260\361\323\015\117\152\115\167\227\001\240\361 +\146\267\267\316\357\316\354\354\245\165\312\254\343\341\143\367 +\270\241\004\310\274\173\077\135\055\026\042\126\355\110\111\376 +\247\057\171\060\045\233\272\153\055\077\235\073\304\027\347\035 +\056\373\362\317\246\374\343\024\054\226\230\041\214\264\221\351 +\031\140\203\362\060\053\006\163\120\325\230\073\006\351\307\212 +\014\140\214\050\370\122\233\156\341\366\115\273\006\044\233\327 +\053\046\077\375\052\057\161\365\326\044\276\177\061\236\017\155 +\350\217\117\115\243\077\377\065\352\337\111\136\101\217\206\371 +\361\167\171\113\033\264\243\136\057\373\106\002\320\146\023\136 +\136\205\117\316\330\160\210\173\316\001\265\226\227\327\315\175 +\375\202\370\302\044\301\312\001\071\117\215\242\301\024\100\037 +\234\146\325\014\011\106\326\362\320\321\110\166\126\072\103\313 +\266\012\021\071\272\214\023\154\006\265\236\317\353\002\003\001 +\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004 +\024\121\063\034\355\066\100\257\027\323\045\315\151\150\362\257 +\116\043\076\263\101\060\016\006\003\125\035\017\001\001\377\004 +\004\003\002\001\206\060\017\006\003\125\035\023\001\001\377\004 +\005\060\003\001\001\377\060\015\006\011\052\206\110\206\367\015 +\001\001\014\005\000\003\202\002\001\000\140\246\257\133\137\127 +\332\211\333\113\120\251\304\043\065\041\377\320\141\060\204\221 +\267\077\020\317\045\216\311\277\106\064\331\301\041\046\034\160 +\031\162\036\243\311\207\376\251\103\144\226\072\310\123\004\012 +\266\101\273\304\107\000\331\237\030\030\073\262\016\363\064\352 +\044\367\335\257\040\140\256\222\050\137\066\347\135\344\336\307 +\074\333\120\071\255\273\075\050\115\226\174\166\306\133\364\301 +\333\024\245\253\031\142\007\030\100\137\227\221\334\234\307\253 +\265\121\015\346\151\123\125\314\071\175\332\305\021\125\162\305 +\073\213\211\370\064\055\244\027\345\027\346\231\175\060\210\041 +\067\315\060\027\075\270\362\274\250\165\240\103\334\076\211\113 +\220\256\155\003\340\034\243\240\226\011\273\175\243\267\052\020 +\104\113\106\007\064\143\355\061\271\004\356\243\233\232\256\346 +\061\170\364\352\044\141\073\253\130\144\377\273\207\047\142\045 +\201\337\334\241\057\366\355\247\377\172\217\121\056\060\370\244 +\001\322\205\071\137\001\231\226\157\132\133\160\031\106\376\206 +\140\076\255\200\020\011\335\071\045\057\130\177\273\322\164\360 +\367\106\037\106\071\112\330\123\320\363\056\073\161\245\324\157 +\374\363\147\344\007\217\335\046\031\341\215\133\372\243\223\021 +\233\351\310\072\303\125\150\232\222\341\122\166\070\350\341\272 +\275\373\117\325\357\263\347\110\203\061\360\202\041\343\266\276 +\247\253\157\357\237\337\114\317\001\270\142\152\043\075\347\011 +\115\200\033\173\060\244\303\335\007\177\064\276\244\046\262\366 +\101\350\011\035\343\040\230\252\067\117\377\367\361\342\051\160 +\061\107\077\164\320\024\026\372\041\212\002\325\212\011\224\167 +\056\362\131\050\213\174\120\222\012\146\170\070\203\165\304\265 +\132\250\021\306\345\301\235\146\125\317\123\304\257\327\165\205 +\251\102\023\126\354\041\167\201\223\132\014\352\226\331\111\312 +\241\010\362\227\073\155\233\004\030\044\104\216\174\001\362\334 +\045\330\136\206\232\261\071\333\365\221\062\152\321\246\160\212 +\242\367\336\244\105\205\046\250\036\214\135\051\133\310\113\330 +\232\152\003\136\160\362\205\117\154\113\150\057\312\124\366\214 +\332\062\376\303\153\203\077\070\306\176 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "DigiCert TLS RSA4096 Root G5" +# Issuer: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a +# Subject: CN=DigiCert TLS RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): 37:1A:00:DC:05:33:B3:72:1A:7E:EB:40:E8:41:9E:70:79:9D:2B:0A:0F:2C:1D:80:69:31:65:F7:CE:C4:AD:75 +# Fingerprint (SHA1): A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert TLS RSA4096 Root G5" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\247\210\111\334\135\174\165\214\214\336\071\230\126\263\252\320 +\262\245\161\065 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\254\376\367\064\226\251\362\263\264\022\113\344\047\101\157\341 +END +CKA_ISSUER MULTILINE_OCTAL +\060\115\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\045\060\043\006\003\125\004 +\003\023\034\104\151\147\151\103\145\162\164\040\124\114\123\040 +\122\123\101\064\060\071\066\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\010\371\264\170\250\372\176\332\152\063\067\211\336\174 +\317\212 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "DigiCert TLS ECC P384 Root G5" +# +# Issuer: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3 +# Subject: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): 01:8E:13:F0:77:25:32:CF:80:9B:D1:B1:72:81:86:72:83:FC:48:C6:E1:3B:E9:C6:98:12:85:4A:49:0C:1B:05 +# Fingerprint (SHA1): 17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert TLS ECC P384 Root G5" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\046\060\044\006\003\125\004 +\003\023\035\104\151\147\151\103\145\162\164\040\124\114\123\040 +\105\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\046\060\044\006\003\125\004 +\003\023\035\104\151\147\151\103\145\162\164\040\124\114\123\040 +\105\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\011\340\223\145\254\367\331\310\271\076\034\013\004\052 +\056\363 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\031\060\202\001\237\240\003\002\001\002\002\020\011 +\340\223\145\254\367\331\310\271\076\034\013\004\052\056\363\060 +\012\006\010\052\206\110\316\075\004\003\003\060\116\061\013\060 +\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003 +\125\004\012\023\016\104\151\147\151\103\145\162\164\054\040\111 +\156\143\056\061\046\060\044\006\003\125\004\003\023\035\104\151 +\147\151\103\145\162\164\040\124\114\123\040\105\103\103\040\120 +\063\070\064\040\122\157\157\164\040\107\065\060\036\027\015\062 +\061\060\061\061\065\060\060\060\060\060\060\132\027\015\064\066 +\060\061\061\064\062\063\065\071\065\071\132\060\116\061\013\060 +\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003 +\125\004\012\023\016\104\151\147\151\103\145\162\164\054\040\111 +\156\143\056\061\046\060\044\006\003\125\004\003\023\035\104\151 +\147\151\103\145\162\164\040\124\114\123\040\105\103\103\040\120 +\063\070\064\040\122\157\157\164\040\107\065\060\166\060\020\006 +\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003 +\142\000\004\301\104\241\317\021\227\120\232\336\043\202\065\007 +\315\320\313\030\235\322\361\177\167\065\117\073\335\224\162\122 +\355\302\073\370\354\372\173\153\130\040\354\231\256\311\374\150 +\263\165\271\333\011\354\310\023\365\116\306\012\035\146\060\114 +\273\037\107\012\074\141\020\102\051\174\245\010\016\340\042\351 +\323\065\150\316\233\143\237\204\265\231\115\130\240\216\365\124 +\347\225\311\243\102\060\100\060\035\006\003\125\035\016\004\026 +\004\024\301\121\105\120\131\253\076\347\054\132\372\040\042\022 +\007\200\210\174\021\152\060\016\006\003\125\035\017\001\001\377 +\004\004\003\002\001\206\060\017\006\003\125\035\023\001\001\377 +\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075 +\004\003\003\003\150\000\060\145\002\061\000\211\152\215\107\347 +\354\374\156\125\003\331\147\154\046\116\203\306\375\311\373\053 +\023\274\267\172\214\264\145\322\151\151\143\023\143\073\046\120 +\056\001\241\171\006\221\235\110\277\302\276\002\060\107\303\025 +\173\261\240\221\231\111\223\250\074\174\350\106\006\213\054\362 +\061\000\224\235\142\310\211\275\031\204\024\351\245\373\001\270 +\015\166\103\214\056\123\313\174\337\014\027\226\120 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "DigiCert TLS ECC P384 Root G5" +# Issuer: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3 +# Subject: CN=DigiCert TLS ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): 01:8E:13:F0:77:25:32:CF:80:9B:D1:B1:72:81:86:72:83:FC:48:C6:E1:3B:E9:C6:98:12:85:4A:49:0C:1B:05 +# Fingerprint (SHA1): 17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert TLS ECC P384 Root G5" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\027\363\336\136\237\017\031\351\216\366\037\062\046\156\040\304 +\007\256\060\356 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\323\161\004\152\103\034\333\246\131\341\250\243\252\305\161\355 +END +CKA_ISSUER MULTILINE_OCTAL +\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\046\060\044\006\003\125\004 +\003\023\035\104\151\147\151\103\145\162\164\040\124\114\123\040 +\105\103\103\040\120\063\070\064\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\011\340\223\145\254\367\331\310\271\076\034\013\004\052 +\056\363 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "DigiCert RSA4096 Root G5" +# +# Issuer: CN=DigiCert RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:08:bf:a2:6f:9a:3f:33:65:a2:ac:f0:a6:38:c4:01:70 +# Subject: CN=DigiCert RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): E4:6A:39:22:04:A8:DC:A3:42:A7:1C:1C:A9:A6:0C:91:85:B9:A9:30:37:01:20:C3:B9:C7:E3:85:6F:0D:8F:3B +# Fingerprint (SHA1): 87:B8:E6:D3:8F:1A:39:CD:97:F0:4A:9E:17:4B:3C:9E:E7:EE:11:15 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert RSA4096 Root G5" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\041\060\037\006\003\125\004 +\003\023\030\104\151\147\151\103\145\162\164\040\122\123\101\064 +\060\071\066\040\122\157\157\164\040\107\065 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\041\060\037\006\003\125\004 +\003\023\030\104\151\147\151\103\145\162\164\040\122\123\101\064 +\060\071\066\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\010\277\242\157\232\077\063\145\242\254\360\246\070\304 +\001\160 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\136\060\202\003\106\240\003\002\001\002\002\020\010 +\277\242\157\232\077\063\145\242\254\360\246\070\304\001\160\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\111 +\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027\060 +\025\006\003\125\004\012\023\016\104\151\147\151\103\145\162\164 +\054\040\111\156\143\056\061\041\060\037\006\003\125\004\003\023 +\030\104\151\147\151\103\145\162\164\040\122\123\101\064\060\071 +\066\040\122\157\157\164\040\107\065\060\036\027\015\062\061\060 +\061\061\065\060\060\060\060\060\060\132\027\015\064\066\060\061 +\061\064\062\063\065\071\065\071\132\060\111\061\013\060\011\006 +\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +\012\023\016\104\151\147\151\103\145\162\164\054\040\111\156\143 +\056\061\041\060\037\006\003\125\004\003\023\030\104\151\147\151 +\103\145\162\164\040\122\123\101\064\060\071\066\040\122\157\157 +\164\040\107\065\060\202\002\042\060\015\006\011\052\206\110\206 +\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002\012 +\002\202\002\001\000\252\276\015\262\006\175\046\371\107\352\344 +\033\347\102\151\270\231\302\271\356\044\261\106\220\313\131\044 +\122\124\065\246\044\302\137\221\031\310\266\102\326\363\107\145 +\225\144\347\205\145\147\251\256\174\000\117\340\170\003\120\255 +\363\177\216\270\021\347\201\142\261\213\337\362\111\046\011\336 +\017\026\274\332\050\233\241\310\227\057\223\220\332\040\052\343 +\204\324\377\251\236\260\055\277\264\000\336\233\037\310\240\143 +\123\150\205\157\115\205\306\252\143\371\215\262\065\166\142\164 +\003\334\223\230\150\005\236\315\220\145\335\322\172\061\253\044 +\055\155\100\056\220\077\143\154\054\353\372\036\200\124\215\171 +\002\220\024\263\265\117\116\365\210\004\103\200\303\110\263\046 +\057\254\121\225\062\125\045\057\101\226\260\126\241\010\073\334 +\230\037\162\205\054\167\312\230\314\070\373\216\162\311\155\354 +\005\354\355\115\267\074\133\024\120\205\335\227\373\131\367\220 +\022\364\023\277\203\115\200\262\025\145\021\227\140\345\326\134 +\346\004\265\120\346\161\063\266\040\223\251\150\000\070\316\111 +\333\264\134\073\162\327\105\134\124\277\315\074\001\043\036\174 +\326\370\151\054\245\000\012\154\062\110\264\336\160\055\072\023 +\027\301\177\144\313\363\060\355\241\075\226\147\361\224\265\140 +\154\133\151\150\365\202\063\011\242\266\331\363\205\262\156\240 +\224\360\302\304\175\241\054\312\163\365\256\340\122\234\242\146 +\346\003\316\352\337\355\030\324\271\143\213\367\350\377\373\263 +\133\217\103\305\257\267\164\224\120\065\145\256\326\057\361\205 +\217\123\241\160\364\215\062\135\274\226\303\036\302\004\004\234 +\004\017\263\135\176\211\040\312\136\047\015\211\112\022\043\264 +\366\304\335\330\037\370\150\263\066\370\036\274\306\367\204\266 +\350\212\116\210\060\070\300\046\330\160\012\011\072\064\016\153 +\202\022\226\034\057\346\236\255\330\161\065\201\261\214\006\156 +\364\156\146\377\113\112\256\275\360\376\327\134\137\123\273\062 +\074\315\142\321\024\240\051\037\020\336\251\162\117\261\255\144 +\345\203\052\217\213\352\204\225\356\230\045\230\232\263\161\074 +\301\247\120\362\254\102\142\061\302\241\220\306\356\342\267\212 +\250\265\266\033\073\002\003\001\000\001\243\102\060\100\060\035 +\006\003\125\035\016\004\026\004\024\142\155\267\221\117\304\352 +\243\142\140\217\240\320\276\265\217\006\174\150\000\060\016\006 +\003\125\035\017\001\001\377\004\004\003\002\001\206\060\017\006 +\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015 +\006\011\052\206\110\206\367\015\001\001\014\005\000\003\202\002 +\001\000\141\350\373\047\155\326\342\270\263\011\257\252\360\261 +\202\114\376\075\027\211\115\055\025\235\373\356\320\273\204\354 +\204\165\333\103\023\336\214\237\307\051\357\207\164\313\023\160 +\201\126\000\164\374\256\364\331\072\336\042\010\121\245\240\134 +\202\146\266\173\114\251\332\217\253\254\034\101\226\146\326\235 +\336\126\346\277\116\261\262\136\137\300\303\156\324\302\204\220 +\365\175\261\272\026\321\051\212\310\235\351\317\320\307\031\073 +\077\317\356\367\341\063\256\102\310\230\300\010\236\363\132\363 +\337\324\053\073\216\250\050\126\031\307\116\167\074\045\124\334 +\270\110\110\321\371\047\152\076\354\023\257\262\005\211\375\125 +\137\363\175\216\015\234\011\135\054\212\176\205\316\370\341\277 +\021\075\062\214\132\327\176\075\364\063\130\317\242\005\230\243 +\263\373\316\211\277\375\302\026\335\156\334\210\111\015\013\240 +\003\377\347\105\351\004\301\351\375\252\235\165\370\270\037\207 +\203\331\353\071\323\132\247\313\230\254\023\211\000\374\157\225 +\116\341\175\021\106\155\366\070\106\243\023\240\054\001\365\142 +\317\277\034\120\221\047\164\135\267\354\107\174\320\321\165\313 +\173\356\321\115\043\012\303\140\245\167\055\200\332\147\017\216 +\153\166\007\360\246\017\352\204\256\036\171\277\010\212\332\011 +\363\364\356\265\066\363\324\172\103\272\224\065\341\372\301\073 +\033\226\231\244\127\143\353\265\250\202\367\255\370\167\327\166 +\206\363\166\123\126\133\374\046\102\204\316\237\203\221\221\257 +\364\276\160\025\200\245\330\350\151\261\330\221\124\270\031\262 +\142\371\242\372\125\355\004\277\271\104\206\344\317\361\233\000 +\277\021\017\276\265\164\044\121\377\167\064\143\354\110\043\016 +\350\021\353\167\155\332\312\202\221\276\244\204\223\114\332\241 +\376\314\006\204\350\041\350\124\272\346\323\035\143\075\302\132 +\374\346\311\203\236\162\144\251\206\131\000\214\302\367\023\203 +\266\320\244\061\306\254\221\216\173\244\042\126\023\306\165\307 +\043\274\213\133\374\106\075\376\135\122\051\257\257\350\311\303 +\166\113\350\253\107\002\362\232\015\323\054\210\200\007\206\300 +\143\017\002\114\216\004\123\166\271\130\102\157\174\051\160\135 +\277\047 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "DigiCert RSA4096 Root G5" +# Issuer: CN=DigiCert RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:08:bf:a2:6f:9a:3f:33:65:a2:ac:f0:a6:38:c4:01:70 +# Subject: CN=DigiCert RSA4096 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): E4:6A:39:22:04:A8:DC:A3:42:A7:1C:1C:A9:A6:0C:91:85:B9:A9:30:37:01:20:C3:B9:C7:E3:85:6F:0D:8F:3B +# Fingerprint (SHA1): 87:B8:E6:D3:8F:1A:39:CD:97:F0:4A:9E:17:4B:3C:9E:E7:EE:11:15 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert RSA4096 Root G5" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\207\270\346\323\217\032\071\315\227\360\112\236\027\113\074\236 +\347\356\021\025 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\046\030\234\156\140\042\171\266\215\017\145\114\231\027\126\022 +END +CKA_ISSUER MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\041\060\037\006\003\125\004 +\003\023\030\104\151\147\151\103\145\162\164\040\122\123\101\064 +\060\071\066\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\010\277\242\157\232\077\063\145\242\254\360\246\070\304 +\001\160 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "DigiCert ECC P384 Root G5" +# +# Issuer: CN=DigiCert ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:0d:f3:d9:37:65:a3:79:c5:95:66:ea:92:e2:24:4f:34 +# Subject: CN=DigiCert ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): C1:46:8C:F2:25:4E:60:04:B2:46:96:AB:A2:09:D1:A3:0B:A6:E2:DF:F6:8A:9A:4E:32:C6:AB:41:4F:90:C8:D9 +# Fingerprint (SHA1): D1:EE:B1:E8:C0:90:20:BA:B8:5D:3D:E2:7F:78:EE:33:A0:6C:AE:DB +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert ECC P384 Root G5" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\042\060\040\006\003\125\004 +\003\023\031\104\151\147\151\103\145\162\164\040\105\103\103\040 +\120\063\070\064\040\122\157\157\164\040\107\065 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\042\060\040\006\003\125\004 +\003\023\031\104\151\147\151\103\145\162\164\040\105\103\103\040 +\120\063\070\064\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\015\363\331\067\145\243\171\305\225\146\352\222\342\044 +\117\064 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\021\060\202\001\227\240\003\002\001\002\002\020\015 +\363\331\067\145\243\171\305\225\146\352\222\342\044\117\064\060 +\012\006\010\052\206\110\316\075\004\003\003\060\112\061\013\060 +\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003 +\125\004\012\023\016\104\151\147\151\103\145\162\164\054\040\111 +\156\143\056\061\042\060\040\006\003\125\004\003\023\031\104\151 +\147\151\103\145\162\164\040\105\103\103\040\120\063\070\064\040 +\122\157\157\164\040\107\065\060\036\027\015\062\061\060\061\061 +\065\060\060\060\060\060\060\132\027\015\064\066\060\061\061\064 +\062\063\065\071\065\071\132\060\112\061\013\060\011\006\003\125 +\004\006\023\002\125\123\061\027\060\025\006\003\125\004\012\023 +\016\104\151\147\151\103\145\162\164\054\040\111\156\143\056\061 +\042\060\040\006\003\125\004\003\023\031\104\151\147\151\103\145 +\162\164\040\105\103\103\040\120\063\070\064\040\122\157\157\164 +\040\107\065\060\166\060\020\006\007\052\206\110\316\075\002\001 +\006\005\053\201\004\000\042\003\142\000\004\374\131\037\316\231 +\154\177\233\016\266\051\143\157\306\205\363\012\323\326\233\256 +\127\025\114\016\355\135\343\011\176\155\052\243\206\252\272\170 +\240\247\161\275\104\372\010\300\112\006\326\157\335\054\112\070 +\164\345\320\275\377\172\377\345\071\116\275\275\027\036\037\103 +\255\325\274\047\330\113\277\166\214\060\062\244\373\371\123\345 +\330\252\070\123\135\250\240\067\240\147\012\243\102\060\100\060 +\035\006\003\125\035\016\004\026\004\024\222\226\367\346\272\325 +\021\272\371\042\056\173\176\132\331\360\045\345\005\033\060\016 +\006\003\125\035\017\001\001\377\004\004\003\002\001\206\060\017 +\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +\012\006\010\052\206\110\316\075\004\003\003\003\150\000\060\145 +\002\061\000\375\300\115\361\244\247\333\247\014\046\021\364\111 +\275\007\070\143\053\104\142\006\171\010\307\303\324\317\233\076 +\253\072\047\252\220\307\375\131\242\270\062\122\333\312\216\027 +\013\012\220\002\060\135\032\354\121\211\324\144\334\371\345\036 +\070\275\133\056\343\345\104\344\073\030\172\327\360\225\100\217 +\362\353\317\364\371\320\145\242\101\362\260\346\174\301\066\054 +\217\136\071\335\067 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "DigiCert ECC P384 Root G5" +# Issuer: CN=DigiCert ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Serial Number:0d:f3:d9:37:65:a3:79:c5:95:66:ea:92:e2:24:4f:34 +# Subject: CN=DigiCert ECC P384 Root G5,O="DigiCert, Inc.",C=US +# Not Valid Before: Fri Jan 15 00:00:00 2021 +# Not Valid After : Sun Jan 14 23:59:59 2046 +# Fingerprint (SHA-256): C1:46:8C:F2:25:4E:60:04:B2:46:96:AB:A2:09:D1:A3:0B:A6:E2:DF:F6:8A:9A:4E:32:C6:AB:41:4F:90:C8:D9 +# Fingerprint (SHA1): D1:EE:B1:E8:C0:90:20:BA:B8:5D:3D:E2:7F:78:EE:33:A0:6C:AE:DB +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "DigiCert ECC P384 Root G5" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\321\356\261\350\300\220\040\272\270\135\075\342\177\170\356\063 +\240\154\256\333 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\021\177\205\256\107\037\121\141\156\006\224\036\152\103\010\013 +END +CKA_ISSUER MULTILINE_OCTAL +\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\104\151\147\151\103\145 +\162\164\054\040\111\156\143\056\061\042\060\040\006\003\125\004 +\003\023\031\104\151\147\151\103\145\162\164\040\105\103\103\040 +\120\063\070\064\040\122\157\157\164\040\107\065 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\015\363\331\067\145\243\171\305\225\146\352\222\342\044 +\117\064 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "ISRG Root X2" +# +# Issuer: CN=ISRG Root X2,O=Internet Security Research Group,C=US +# Serial Number:41:d2:9d:d1:72:ea:ee:a7:80:c1:2c:6c:e9:2f:87:52 +# Subject: CN=ISRG Root X2,O=Internet Security Research Group,C=US +# Not Valid Before: Fri Sep 04 00:00:00 2020 +# Not Valid After : Mon Sep 17 16:00:00 2040 +# Fingerprint (SHA-256): 69:72:9B:8E:15:A8:6E:FC:17:7A:57:AF:B7:17:1D:FC:64:AD:D2:8C:2F:CA:8C:F1:50:7E:34:45:3C:CB:14:70 +# Fingerprint (SHA1): BD:B1:B9:3C:D5:97:8D:45:C6:26:14:55:F8:DB:95:C7:5A:D1:53:AF +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "ISRG Root X2" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\051\060\047\006\003\125\004\012\023\040\111\156\164\145\162\156 +\145\164\040\123\145\143\165\162\151\164\171\040\122\145\163\145 +\141\162\143\150\040\107\162\157\165\160\061\025\060\023\006\003 +\125\004\003\023\014\111\123\122\107\040\122\157\157\164\040\130 +\062 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\051\060\047\006\003\125\004\012\023\040\111\156\164\145\162\156 +\145\164\040\123\145\143\165\162\151\164\171\040\122\145\163\145 +\141\162\143\150\040\107\162\157\165\160\061\025\060\023\006\003 +\125\004\003\023\014\111\123\122\107\040\122\157\157\164\040\130 +\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\101\322\235\321\162\352\356\247\200\301\054\154\351\057 +\207\122 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\033\060\202\001\241\240\003\002\001\002\002\020\101 +\322\235\321\162\352\356\247\200\301\054\154\351\057\207\122\060 +\012\006\010\052\206\110\316\075\004\003\003\060\117\061\013\060 +\011\006\003\125\004\006\023\002\125\123\061\051\060\047\006\003 +\125\004\012\023\040\111\156\164\145\162\156\145\164\040\123\145 +\143\165\162\151\164\171\040\122\145\163\145\141\162\143\150\040 +\107\162\157\165\160\061\025\060\023\006\003\125\004\003\023\014 +\111\123\122\107\040\122\157\157\164\040\130\062\060\036\027\015 +\062\060\060\071\060\064\060\060\060\060\060\060\132\027\015\064 +\060\060\071\061\067\061\066\060\060\060\060\132\060\117\061\013 +\060\011\006\003\125\004\006\023\002\125\123\061\051\060\047\006 +\003\125\004\012\023\040\111\156\164\145\162\156\145\164\040\123 +\145\143\165\162\151\164\171\040\122\145\163\145\141\162\143\150 +\040\107\162\157\165\160\061\025\060\023\006\003\125\004\003\023 +\014\111\123\122\107\040\122\157\157\164\040\130\062\060\166\060 +\020\006\007\052\206\110\316\075\002\001\006\005\053\201\004\000 +\042\003\142\000\004\315\233\325\237\200\203\012\354\011\112\363 +\026\112\076\134\317\167\254\336\147\005\015\035\007\266\334\026 +\373\132\213\024\333\342\161\140\304\272\105\225\021\211\216\352 +\006\337\367\052\026\034\244\271\305\305\062\340\003\340\036\202 +\030\070\213\327\105\330\012\152\156\346\000\167\373\002\121\175 +\042\330\012\156\232\133\167\337\360\372\101\354\071\334\165\312 +\150\007\014\037\352\243\102\060\100\060\016\006\003\125\035\017 +\001\001\377\004\004\003\002\001\006\060\017\006\003\125\035\023 +\001\001\377\004\005\060\003\001\001\377\060\035\006\003\125\035 +\016\004\026\004\024\174\102\226\256\336\113\110\073\372\222\370 +\236\214\317\155\213\251\162\067\225\060\012\006\010\052\206\110 +\316\075\004\003\003\003\150\000\060\145\002\060\173\171\116\106 +\120\204\302\104\207\106\033\105\160\377\130\231\336\364\375\244 +\322\125\246\040\055\164\326\064\274\101\243\120\137\001\047\126 +\264\276\047\165\006\257\022\056\165\230\215\374\002\061\000\213 +\365\167\154\324\310\145\252\340\013\054\356\024\235\047\067\244 +\371\123\245\121\344\051\203\327\370\220\061\133\102\237\012\365 +\376\256\000\150\347\214\111\017\266\157\133\133\025\362\347 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "ISRG Root X2" +# Issuer: CN=ISRG Root X2,O=Internet Security Research Group,C=US +# Serial Number:41:d2:9d:d1:72:ea:ee:a7:80:c1:2c:6c:e9:2f:87:52 +# Subject: CN=ISRG Root X2,O=Internet Security Research Group,C=US +# Not Valid Before: Fri Sep 04 00:00:00 2020 +# Not Valid After : Mon Sep 17 16:00:00 2040 +# Fingerprint (SHA-256): 69:72:9B:8E:15:A8:6E:FC:17:7A:57:AF:B7:17:1D:FC:64:AD:D2:8C:2F:CA:8C:F1:50:7E:34:45:3C:CB:14:70 +# Fingerprint (SHA1): BD:B1:B9:3C:D5:97:8D:45:C6:26:14:55:F8:DB:95:C7:5A:D1:53:AF +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "ISRG Root X2" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\275\261\271\074\325\227\215\105\306\046\024\125\370\333\225\307 +\132\321\123\257 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\323\236\304\036\043\074\246\337\317\243\176\155\340\024\346\345 +END +CKA_ISSUER MULTILINE_OCTAL +\060\117\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\051\060\047\006\003\125\004\012\023\040\111\156\164\145\162\156 +\145\164\040\123\145\143\165\162\151\164\171\040\122\145\163\145 +\141\162\143\150\040\107\162\157\165\160\061\025\060\023\006\003 +\125\004\003\023\014\111\123\122\107\040\122\157\157\164\040\130 +\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\101\322\235\321\162\352\356\247\200\301\054\154\351\057 +\207\122 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "e-Szigno Root CA 2017" +# +# Issuer: CN=e-Szigno Root CA 2017,OID.2.5.4.97=VATHU-23584497,O=Microsec Ltd.,L=Budapest,C=HU +# Serial Number:01:54:48:ef:21:fd:97:59:0d:f5:04:0a +# Subject: CN=e-Szigno Root CA 2017,OID.2.5.4.97=VATHU-23584497,O=Microsec Ltd.,L=Budapest,C=HU +# Not Valid Before: Tue Aug 22 12:07:06 2017 +# Not Valid After : Fri Aug 22 12:07:06 2042 +# Fingerprint (SHA-256): BE:B0:0B:30:83:9B:9B:C3:2C:32:E4:44:79:05:95:06:41:F2:64:21:B1:5E:D0:89:19:8B:51:8A:E2:EA:1B:99 +# Fingerprint (SHA1): 89:D4:83:03:4F:9E:9A:48:80:5F:72:37:D4:A9:A6:EF:CB:7C:1F:D1 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "e-Szigno Root CA 2017" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\161\061\013\060\011\006\003\125\004\006\023\002\110\125\061 +\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145 +\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151\143 +\162\157\163\145\143\040\114\164\144\056\061\027\060\025\006\003 +\125\004\141\014\016\126\101\124\110\125\055\062\063\065\070\064 +\064\071\067\061\036\060\034\006\003\125\004\003\014\025\145\055 +\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040\062 +\060\061\067 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\161\061\013\060\011\006\003\125\004\006\023\002\110\125\061 +\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145 +\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151\143 +\162\157\163\145\143\040\114\164\144\056\061\027\060\025\006\003 +\125\004\141\014\016\126\101\124\110\125\055\062\063\065\070\064 +\064\071\067\061\036\060\034\006\003\125\004\003\014\025\145\055 +\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040\062 +\060\061\067 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\014\001\124\110\357\041\375\227\131\015\365\004\012 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\100\060\202\001\345\240\003\002\001\002\002\014\001 +\124\110\357\041\375\227\131\015\365\004\012\060\012\006\010\052 +\206\110\316\075\004\003\002\060\161\061\013\060\011\006\003\125 +\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007\014 +\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003\125 +\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164\144 +\056\061\027\060\025\006\003\125\004\141\014\016\126\101\124\110 +\125\055\062\063\065\070\064\064\071\067\061\036\060\034\006\003 +\125\004\003\014\025\145\055\123\172\151\147\156\157\040\122\157 +\157\164\040\103\101\040\062\060\061\067\060\036\027\015\061\067 +\060\070\062\062\061\062\060\067\060\066\132\027\015\064\062\060 +\070\062\062\061\062\060\067\060\066\132\060\161\061\013\060\011 +\006\003\125\004\006\023\002\110\125\061\021\060\017\006\003\125 +\004\007\014\010\102\165\144\141\160\145\163\164\061\026\060\024 +\006\003\125\004\012\014\015\115\151\143\162\157\163\145\143\040 +\114\164\144\056\061\027\060\025\006\003\125\004\141\014\016\126 +\101\124\110\125\055\062\063\065\070\064\064\071\067\061\036\060 +\034\006\003\125\004\003\014\025\145\055\123\172\151\147\156\157 +\040\122\157\157\164\040\103\101\040\062\060\061\067\060\131\060 +\023\006\007\052\206\110\316\075\002\001\006\010\052\206\110\316 +\075\003\001\007\003\102\000\004\226\334\075\212\330\260\173\157 +\306\047\276\104\220\261\263\126\025\173\216\103\044\175\032\204 +\131\356\143\150\262\306\136\207\320\025\110\036\250\220\255\275 +\123\242\332\336\072\220\246\140\137\150\062\265\206\101\337\207 +\133\054\173\305\376\174\172\332\243\143\060\141\060\017\006\003 +\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 +\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 +\003\125\035\016\004\026\004\024\207\021\025\010\321\252\301\170 +\014\261\257\316\306\311\220\357\277\060\004\300\060\037\006\003 +\125\035\043\004\030\060\026\200\024\207\021\025\010\321\252\301 +\170\014\261\257\316\306\311\220\357\277\060\004\300\060\012\006 +\010\052\206\110\316\075\004\003\002\003\111\000\060\106\002\041 +\000\265\127\335\327\212\125\013\066\341\206\104\372\324\331\150 +\215\270\334\043\212\212\015\324\057\175\352\163\354\277\115\154 +\250\002\041\000\313\245\264\022\372\347\265\350\317\176\223\374 +\363\065\217\157\116\132\174\264\274\116\262\374\162\252\133\131 +\371\347\334\061 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "e-Szigno Root CA 2017" +# Issuer: CN=e-Szigno Root CA 2017,OID.2.5.4.97=VATHU-23584497,O=Microsec Ltd.,L=Budapest,C=HU +# Serial Number:01:54:48:ef:21:fd:97:59:0d:f5:04:0a +# Subject: CN=e-Szigno Root CA 2017,OID.2.5.4.97=VATHU-23584497,O=Microsec Ltd.,L=Budapest,C=HU +# Not Valid Before: Tue Aug 22 12:07:06 2017 +# Not Valid After : Fri Aug 22 12:07:06 2042 +# Fingerprint (SHA-256): BE:B0:0B:30:83:9B:9B:C3:2C:32:E4:44:79:05:95:06:41:F2:64:21:B1:5E:D0:89:19:8B:51:8A:E2:EA:1B:99 +# Fingerprint (SHA1): 89:D4:83:03:4F:9E:9A:48:80:5F:72:37:D4:A9:A6:EF:CB:7C:1F:D1 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "e-Szigno Root CA 2017" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\211\324\203\003\117\236\232\110\200\137\162\067\324\251\246\357 +\313\174\037\321 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\336\037\366\236\204\256\247\264\041\316\036\130\175\321\204\230 +END +CKA_ISSUER MULTILINE_OCTAL +\060\161\061\013\060\011\006\003\125\004\006\023\002\110\125\061 +\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145 +\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151\143 +\162\157\163\145\143\040\114\164\144\056\061\027\060\025\006\003 +\125\004\141\014\016\126\101\124\110\125\055\062\063\065\070\064 +\064\071\067\061\036\060\034\006\003\125\004\003\014\025\145\055 +\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040\062 +\060\061\067 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\014\001\124\110\357\041\375\227\131\015\365\004\012 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + diff --git a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec index a3ec9d6ddb9..178394817b5 100644 --- a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec +++ b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec @@ -2,7 +2,7 @@ Summary: Prebuilt version of ca-certificates-base package. Name: prebuilt-ca-certificates-base Version: 20200720 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -47,6 +47,9 @@ rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/* %{_datadir}/pki/ca-trust-legacy/* %changelog +* Thu Jun 03 2021 CBL-Mariner Service Account - 20200720-14 +- Making 'Release' match with 'ca-certificates'. + * Fri Mar 12 2021 CBL-Mariner Servicing Account - 20200720-13 - Making 'Release' match with 'ca-certificates'. diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 55e47bd86b7..d7ea77b730b 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -161,6 +161,6 @@ libffi-3.2.1-12.cm1.aarch64.rpm libtasn1-4.14-2.cm1.aarch64.rpm p11-kit-0.23.22-1.cm1.aarch64.rpm p11-kit-trust-0.23.22-1.cm1.aarch64.rpm -ca-certificates-shared-20200720-13.cm1.noarch.rpm -ca-certificates-tools-20200720-13.cm1.noarch.rpm -ca-certificates-base-20200720-13.cm1.noarch.rpm +ca-certificates-shared-20200720-14.cm1.noarch.rpm +ca-certificates-tools-20200720-14.cm1.noarch.rpm +ca-certificates-base-20200720-14.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index dd7d924eca5..b12158721a7 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -161,6 +161,6 @@ libffi-3.2.1-12.cm1.x86_64.rpm libtasn1-4.14-2.cm1.x86_64.rpm p11-kit-0.23.22-1.cm1.x86_64.rpm p11-kit-trust-0.23.22-1.cm1.x86_64.rpm -ca-certificates-shared-20200720-13.cm1.noarch.rpm -ca-certificates-tools-20200720-13.cm1.noarch.rpm -ca-certificates-base-20200720-13.cm1.noarch.rpm +ca-certificates-shared-20200720-14.cm1.noarch.rpm +ca-certificates-tools-20200720-14.cm1.noarch.rpm +ca-certificates-base-20200720-14.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 4a3355aa360..0b820464c7c 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -17,12 +17,12 @@ bzip2-1.0.6-15.cm1.aarch64.rpm bzip2-debuginfo-1.0.6-15.cm1.aarch64.rpm bzip2-devel-1.0.6-15.cm1.aarch64.rpm bzip2-libs-1.0.6-15.cm1.aarch64.rpm -ca-certificates-20200720-13.cm1.noarch.rpm -ca-certificates-base-20200720-13.cm1.noarch.rpm -ca-certificates-legacy-20200720-13.cm1.noarch.rpm -ca-certificates-microsoft-20200720-13.cm1.noarch.rpm -ca-certificates-shared-20200720-13.cm1.noarch.rpm -ca-certificates-tools-20200720-13.cm1.noarch.rpm +ca-certificates-20200720-14.cm1.noarch.rpm +ca-certificates-base-20200720-14.cm1.noarch.rpm +ca-certificates-legacy-20200720-14.cm1.noarch.rpm +ca-certificates-microsoft-20200720-14.cm1.noarch.rpm +ca-certificates-shared-20200720-14.cm1.noarch.rpm +ca-certificates-tools-20200720-14.cm1.noarch.rpm check-0.12.0-4.cm1.aarch64.rpm check-debuginfo-0.12.0-4.cm1.aarch64.rpm cmake-3.17.3-2.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 0596cabed3b..d08ab8319fe 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -17,12 +17,12 @@ bzip2-1.0.6-15.cm1.x86_64.rpm bzip2-debuginfo-1.0.6-15.cm1.x86_64.rpm bzip2-devel-1.0.6-15.cm1.x86_64.rpm bzip2-libs-1.0.6-15.cm1.x86_64.rpm -ca-certificates-20200720-13.cm1.noarch.rpm -ca-certificates-base-20200720-13.cm1.noarch.rpm -ca-certificates-legacy-20200720-13.cm1.noarch.rpm -ca-certificates-microsoft-20200720-13.cm1.noarch.rpm -ca-certificates-shared-20200720-13.cm1.noarch.rpm -ca-certificates-tools-20200720-13.cm1.noarch.rpm +ca-certificates-20200720-14.cm1.noarch.rpm +ca-certificates-base-20200720-14.cm1.noarch.rpm +ca-certificates-legacy-20200720-14.cm1.noarch.rpm +ca-certificates-microsoft-20200720-14.cm1.noarch.rpm +ca-certificates-shared-20200720-14.cm1.noarch.rpm +ca-certificates-tools-20200720-14.cm1.noarch.rpm check-0.12.0-4.cm1.x86_64.rpm check-debuginfo-0.12.0-4.cm1.x86_64.rpm cmake-3.17.3-2.cm1.x86_64.rpm From 16b4ba386aa10d5102b7e496b420979295a50ea4 Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Thu, 3 Jun 2021 13:45:08 -0700 Subject: [PATCH 77/83] Fix polkit CVE-2021-3560 (#1010) * Fix CVE-2021-3560 * Fix patchfile name * Fix changelog formatting --- SPECS/polkit/CVE-2021-3560.patch | 27 +++++++++++++++++++++++++++ SPECS/polkit/polkit.spec | 19 +++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 SPECS/polkit/CVE-2021-3560.patch diff --git a/SPECS/polkit/CVE-2021-3560.patch b/SPECS/polkit/CVE-2021-3560.patch new file mode 100644 index 00000000000..c4bea97d19f --- /dev/null +++ b/SPECS/polkit/CVE-2021-3560.patch @@ -0,0 +1,27 @@ +From a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Wed, 2 Jun 2021 15:43:38 +0200 +Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit + +initial values returned if error caught +--- + src/polkit/polkitsystembusname.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c +index 8daa12c..8ed1363 100644 +--- a/src/polkit/polkitsystembusname.c ++++ b/src/polkit/polkitsystembusname.c +@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus + while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error)) + g_main_context_iteration (tmp_context, TRUE); + ++ if (data.caught_error) ++ goto out; ++ + if (out_uid) + *out_uid = data.uid; + if (out_pid) +-- +GitLab + diff --git a/SPECS/polkit/polkit.spec b/SPECS/polkit/polkit.spec index 39ba3d414f2..bad6662bc57 100644 --- a/SPECS/polkit/polkit.spec +++ b/SPECS/polkit/polkit.spec @@ -1,12 +1,13 @@ Summary: A toolkit for defining and handling authorizations. Name: polkit Version: 0.116 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System Vendor: Microsoft Corporation License: LGPLv2+ URL: https://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html Source0: https://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz +Patch0: CVE-2021-3560.patch Distribution: Mariner BuildRequires: autoconf BuildRequires: expat-devel @@ -38,7 +39,7 @@ Requires: polkit = %{version}-%{release} header files and libraries for polkit %prep -%setup -q +%autosetup -p1 %build %configure \ @@ -111,24 +112,34 @@ fi %{_datadir}/gettext/its/polkit.loc %changelog -* Sat May 09 00:21:16 PST 2020 Nick Samson - 0.116-3 -- Added %%license line automatically +* Thu Jun 03 2021 Jon Slobodzian - 0.116-4 +- Patch for CVE 2021-3560. Fix changelog formatting. + +* Sat May 09 2020 Nick Samson - 0.116-3 +- Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 0.116-2 - Renaming Linux-PAM to pam + * Thu Apr 16 2020 Nicolas Ontiveros 0.116-1 - Update to version 0.116. - License verified. - Use mozjs60 instead of js for requires and BR. + * Tue Sep 03 2019 Mateusz Malisz 0.113-5 - Initial CBL-Mariner import from Photon (license: Apache2). + * Thu Jan 10 2019 Dweep Advani 0.113-4 - Fix for CVE-2018-19788 + * Thu Dec 07 2017 Alexey Makhalov 0.113-3 - Added pre and postun requires for shadow tools + * Thu Oct 05 2017 Vinay Kulkarni 0.113-2 - Enable PAM and systemd. + * Wed Oct 04 2017 Dheeraj Shetty 0.113-1 - Upgrade to 0.113-1 + * Fri May 22 2015 Alexey Makhalov 0.112-1 - initial version From e48fc8083a97a3706fcdc6069c69ecbd9a5f096f Mon Sep 17 00:00:00 2001 From: Christopher Datsikas Date: Thu, 3 Jun 2021 13:59:24 -0700 Subject: [PATCH 78/83] Creating nvidia repo file and user instructions (#1001) --- toolkit/docs/nvidia/mariner-nvidia.repo | 9 +++++++++ toolkit/docs/nvidia/nvidia.md | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 toolkit/docs/nvidia/mariner-nvidia.repo create mode 100644 toolkit/docs/nvidia/nvidia.md diff --git a/toolkit/docs/nvidia/mariner-nvidia.repo b/toolkit/docs/nvidia/mariner-nvidia.repo new file mode 100644 index 00000000000..33ba657e507 --- /dev/null +++ b/toolkit/docs/nvidia/mariner-nvidia.repo @@ -0,0 +1,9 @@ +[mariner-official-nvidia] +name=CBL-Mariner Official Nvidia $releasever $basearch +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/NVIDIA/$basearch/rpms +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +skip_if_unavailable=True +sslverify=1 \ No newline at end of file diff --git a/toolkit/docs/nvidia/nvidia.md b/toolkit/docs/nvidia/nvidia.md new file mode 100644 index 00000000000..0ee5eb0a737 --- /dev/null +++ b/toolkit/docs/nvidia/nvidia.md @@ -0,0 +1,19 @@ +# Nvidia Repository Configuration + +## Overview +The following documentation describes how to access CBL-Mariner packages from the NVIDIA RPM repository at [packages.microsoft.com](https://packages.microsoft.com/cbl-mariner/1.0/prod/NVIDIA/) + +## Licensing +The software in the NVIDIA RPM repository is subject to the following: + +> NVIDIA Software. The software may include components developed and owned by NVIDIA Corporation or its licensors. The use of these components is governed by the NVIDIA end user license agreement located at [https://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us](https://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us). + +## Instructions +The following instructions register the nvidia package store with the package manager. +```ls +# Navigate to the package manager configuration file directory +cd /etc/yum.repos.d + +# Copy the configuration to your directory to register the NVIDIA RPM repository with your package manager +sudo wget https://raw.githubusercontent.com/microsoft/CBL-Mariner/toolkit/docs/nvidia/mariner-nvidia.repo +``` From 95795ae1858916aa7288413121a761228f565652 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 3 Jun 2021 14:33:30 -0700 Subject: [PATCH 79/83] Bulk removal of time information from one changelog entry. (#1011) --- SPECS/GSL/GSL.spec | 2 +- SPECS/OpenIPMI/OpenIPMI.spec | 2 +- SPECS/PyPAM/PyPAM.spec | 2 +- SPECS/PyYAML/PyYAML.spec | 2 +- SPECS/ant-contrib/ant-contrib.spec | 2 +- SPECS/ant/ant.spec | 2 +- SPECS/apr-util/apr-util.spec | 2 +- SPECS/asciidoc/asciidoc.spec | 2 +- SPECS/atftp/atftp.spec | 2 +- SPECS/autogen/autogen.spec | 2 +- SPECS/automake/automake.spec | 2 +- SPECS/azure-iot-sdk-c/azure-iot-sdk-c.spec | 2 +- SPECS/babel/babel.spec | 2 +- SPECS/bind/bind.spec | 2 +- SPECS/bison/bison.spec | 2 +- SPECS/blktrace/blktrace.spec | 2 +- SPECS/boost/boost.spec | 2 +- SPECS/bridge-utils/bridge-utils.spec | 2 +- SPECS/btrfs-progs/btrfs-progs.spec | 2 +- SPECS/bubblewrap/bubblewrap.spec | 2 +- SPECS/bzip2/bzip2.spec | 2 +- SPECS/cdrkit/cdrkit.spec | 2 +- SPECS/check/check.spec | 2 +- SPECS/chrpath/chrpath.spec | 2 +- SPECS/clang/clang.spec | 2 +- SPECS/cmake/cmake.spec | 2 +- SPECS/cppunit/cppunit.spec | 2 +- SPECS/cracklib/cracklib.spec | 2 +- SPECS/createrepo_c/createrepo_c.spec | 2 +- SPECS/cronie/cronie.spec | 2 +- SPECS/ctags/ctags.spec | 2 +- SPECS/curl/curl.spec | 2 +- SPECS/dbus-glib/dbus-glib.spec | 2 +- SPECS/dejagnu/dejagnu.spec | 2 +- SPECS/dhcp/dhcp.spec | 2 +- SPECS/dialog/dialog.spec | 2 +- SPECS/diffutils/diffutils.spec | 2 +- SPECS/dkms/dkms.spec | 2 +- SPECS/dmidecode/dmidecode.spec | 2 +- SPECS/docbook-style-xsl/docbook-style-xsl.spec | 2 +- SPECS/dosfstools/dosfstools.spec | 2 +- SPECS/dstat/dstat.spec | 2 +- SPECS/e2fsprogs/e2fsprogs.spec | 2 +- SPECS/efibootmgr/efibootmgr.spec | 2 +- SPECS/efivar/efivar.spec | 2 +- SPECS/erlang/erlang.spec | 2 +- SPECS/ethtool/ethtool.spec | 2 +- SPECS/expat/expat.spec | 2 +- SPECS/expect/expect.spec | 2 +- SPECS/fcgi/fcgi.spec | 2 +- SPECS/findutils/findutils.spec | 2 +- SPECS/fping/fping.spec | 2 +- SPECS/freefont/freefont.spec | 2 +- SPECS/freetype/freetype.spec | 2 +- SPECS/fuse/fuse.spec | 2 +- SPECS/gcc/gcc.spec | 2 +- SPECS/gdbm/gdbm.spec | 2 +- SPECS/gettext/gettext.spec | 2 +- SPECS/git/git.spec | 2 +- SPECS/glib-networking/glib-networking.spec | 2 +- SPECS/glibmm24/glibmm24.spec | 2 +- SPECS/gmp/gmp.spec | 2 +- SPECS/gnome-common/gnome-common.spec | 2 +- SPECS/gnuplot/gnuplot.spec | 2 +- SPECS/gperf/gperf.spec | 2 +- SPECS/gptfdisk/gptfdisk.spec | 2 +- SPECS/grep/grep.spec | 2 +- SPECS/gtest/gtest.spec | 2 +- SPECS/gtk-doc/gtk-doc.spec | 2 +- SPECS/guile/guile.spec | 2 +- SPECS/gzip/gzip.spec | 2 +- SPECS/haproxy/haproxy.spec | 2 +- SPECS/harfbuzz/harfbuzz.spec | 2 +- SPECS/haveged/haveged.spec | 2 +- SPECS/hdparm/hdparm.spec | 2 +- SPECS/http-parser/http-parser.spec | 2 +- SPECS/i2c-tools/i2c-tools.spec | 2 +- SPECS/inotify-tools/inotify-tools.spec | 2 +- SPECS/intltool/intltool.spec | 2 +- SPECS/iotop/iotop.spec | 2 +- SPECS/iperf3/iperf3.spec | 2 +- SPECS/iproute/iproute.spec | 2 +- SPECS/ipset/ipset.spec | 2 +- SPECS/iptables/iptables.spec | 2 +- SPECS/ipvsadm/ipvsadm.spec | 2 +- SPECS/ipxe/ipxe.spec | 2 +- SPECS/irqbalance/irqbalance.spec | 2 +- SPECS/itstool/itstool.spec | 2 +- SPECS/jansson/jansson.spec | 2 +- SPECS/jna/jna.spec | 2 +- SPECS/jq/jq.spec | 2 +- SPECS/kbd/kbd.spec | 2 +- SPECS/kmod/kmod.spec | 2 +- SPECS/krb5/krb5.spec | 4 ++-- SPECS/lapack/lapack.spec | 2 +- SPECS/less/less.spec | 2 +- SPECS/libassuan/libassuan.spec | 2 +- SPECS/libatomic_ops/libatomic_ops.spec | 2 +- SPECS/libcap/libcap.spec | 2 +- SPECS/libconfig/libconfig.spec | 2 +- SPECS/libdb/libdb.spec | 2 +- SPECS/libdnet/libdnet.spec | 2 +- SPECS/libev/libev.spec | 2 +- SPECS/libevent/libevent.spec | 2 +- SPECS/libfastjson/libfastjson.spec | 2 +- SPECS/libgpg-error/libgpg-error.spec | 2 +- SPECS/libgssglue/libgssglue.spec | 2 +- SPECS/libgsystem/libgsystem.spec | 2 +- SPECS/libgudev/libgudev.spec | 2 +- SPECS/libjpeg-turbo/libjpeg-turbo.spec | 2 +- SPECS/libksba/libksba.spec | 2 +- SPECS/libmbim/libmbim.spec | 2 +- SPECS/libmnl/libmnl.spec | 2 +- SPECS/libmpc/libmpc.spec | 2 +- SPECS/libmspack/libmspack.spec | 2 +- SPECS/libnetfilter_conntrack/libnetfilter_conntrack.spec | 2 +- SPECS/libnetfilter_cthelper/libnetfilter_cthelper.spec | 2 +- SPECS/libnetfilter_cttimeout/libnetfilter_cttimeout.spec | 2 +- SPECS/libnetfilter_queue/libnetfilter_queue.spec | 2 +- SPECS/libnfnetlink/libnfnetlink.spec | 2 +- SPECS/libnftnl/libnftnl.spec | 2 +- SPECS/libnl3/libnl3.spec | 2 +- SPECS/libnsl2/libnsl2.spec | 2 +- SPECS/libpcap/libpcap.spec | 2 +- SPECS/libpng/libpng.spec | 2 +- SPECS/libqmi/libqmi.spec | 2 +- SPECS/libseccomp/libseccomp.spec | 2 +- SPECS/libselinux/libselinux.spec | 2 +- SPECS/libsepol/libsepol.spec | 2 +- SPECS/libsigc++20/libsigc++20.spec | 2 +- SPECS/libsoup/libsoup.spec | 2 +- SPECS/libssh2/libssh2.spec | 2 +- SPECS/libtar/libtar.spec | 2 +- SPECS/libtasn1/libtasn1.spec | 2 +- SPECS/libtirpc/libtirpc.spec | 2 +- SPECS/libtool/libtool.spec | 2 +- SPECS/libunwind/libunwind.spec | 2 +- SPECS/libusb/libusb.spec | 2 +- SPECS/libvirt/libvirt.spec | 2 +- SPECS/libxslt/libxslt.spec | 2 +- SPECS/libyaml/libyaml.spec | 2 +- SPECS/lldb/lldb.spec | 2 +- SPECS/llvm/llvm.spec | 2 +- SPECS/lmdb/lmdb.spec | 2 +- SPECS/log4cpp/log4cpp.spec | 2 +- SPECS/logrotate/logrotate.spec | 2 +- SPECS/lshw/lshw.spec | 2 +- SPECS/lsof/lsof.spec | 2 +- SPECS/lsscsi/lsscsi.spec | 2 +- SPECS/ltrace/ltrace.spec | 2 +- SPECS/lvm2/lvm2.spec | 2 +- SPECS/lzo/lzo.spec | 2 +- SPECS/m4/m4.spec | 2 +- SPECS/man-db/man-db.spec | 2 +- SPECS/man-pages/man-pages.spec | 2 +- SPECS/mc/mc.spec | 2 +- SPECS/mlocate/mlocate.spec | 2 +- SPECS/mpfr/mpfr.spec | 2 +- SPECS/nano/nano.spec | 2 +- SPECS/nasm/nasm.spec | 2 +- SPECS/net-snmp/net-snmp.spec | 2 +- SPECS/net-tools/net-tools.spec | 2 +- SPECS/nettle/nettle.spec | 2 +- SPECS/nghttp2/nghttp2.spec | 2 +- SPECS/nginx/nginx.spec | 2 +- SPECS/nodejs/nodejs-8.11.4.spec | 2 +- SPECS/nodejs/nodejs-9.11.2.spec | 2 +- SPECS/npth/npth.spec | 2 +- SPECS/nspr/nspr.spec | 2 +- SPECS/nss-altfiles/nss-altfiles.spec | 2 +- SPECS/ntp/ntp.spec | 2 +- SPECS/nvme-cli/nvme-cli.spec | 2 +- SPECS/openldap/openldap.spec | 2 +- SPECS/openscap/openscap.spec | 2 +- SPECS/openvswitch/openvswitch.spec | 2 +- SPECS/pciutils/pciutils.spec | 2 +- SPECS/perl-Canary-Stability/perl-Canary-Stability.spec | 2 +- SPECS/perl-DBD-SQLite/perl-DBD-SQLite.spec | 2 +- SPECS/perl-DBI/perl-DBI.spec | 2 +- SPECS/perl-Exporter-Tiny/perl-Exporter-Tiny.spec | 2 +- SPECS/perl-File-HomeDir/perl-File-HomeDir.spec | 2 +- SPECS/perl-File-Which/perl-File-Which.spec | 2 +- SPECS/perl-JSON-Any/perl-JSON-Any.spec | 2 +- SPECS/perl-JSON-XS/perl-JSON-XS.spec | 2 +- SPECS/perl-List-MoreUtils/perl-List-MoreUtils.spec | 2 +- SPECS/perl-Module-Build/perl-Module-Build.spec | 2 +- SPECS/perl-Module-Install/perl-Module-Install.spec | 2 +- SPECS/perl-Module-ScanDeps/perl-Module-ScanDeps.spec | 2 +- SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec | 2 +- SPECS/perl-NetAddr-IP/perl-NetAddr-IP.spec | 2 +- SPECS/perl-Path-Class/perl-Path-Class.spec | 2 +- SPECS/perl-Types-Serialiser/perl-Types-Serialiser.spec | 2 +- SPECS/perl-WWW-Curl/perl-WWW-Curl.spec | 2 +- SPECS/perl-YAML-Tiny/perl-YAML-Tiny.spec | 2 +- SPECS/perl-YAML/perl-YAML.spec | 2 +- SPECS/perl-common-sense/perl-common-sense.spec | 2 +- SPECS/perl-libintl-perl/perl-libintl-perl.spec | 2 +- SPECS/pgbouncer/pgbouncer.spec | 2 +- SPECS/pinentry/pinentry.spec | 2 +- SPECS/pixman/pixman.spec | 2 +- SPECS/pkg-config/pkg-config.spec | 2 +- SPECS/popt/popt.spec | 2 +- SPECS/procps-ng/procps-ng.spec | 2 +- SPECS/protobuf-c/protobuf-c.spec | 2 +- SPECS/protobuf/protobuf.spec | 2 +- SPECS/psmisc/psmisc.spec | 2 +- SPECS/pth/pth.spec | 2 +- SPECS/pyOpenSSL/pyOpenSSL.spec | 2 +- SPECS/pyasn1-modules/pyasn1-modules.spec | 2 +- SPECS/pygobject3/pygobject3.spec | 2 +- SPECS/pytest/pytest.spec | 2 +- SPECS/python-attrs/python-attrs.spec | 2 +- SPECS/python-boto3/python-boto3.spec | 2 +- SPECS/python-botocore/python-botocore.spec | 2 +- SPECS/python-certifi/python-certifi.spec | 2 +- SPECS/python-chardet/python-chardet.spec | 2 +- SPECS/python-constantly/python-constantly.spec | 2 +- SPECS/python-coverage/python-coverage.spec | 2 +- SPECS/python-cryptography/python-cryptography.spec | 2 +- SPECS/python-daemon/python-daemon.spec | 2 +- SPECS/python-dateutil/python-dateutil.spec | 2 +- SPECS/python-defusedxml/python-defusedxml.spec | 2 +- SPECS/python-docopt/python-docopt.spec | 2 +- SPECS/python-docutils/python-docutils.spec | 2 +- SPECS/python-ecdsa/python-ecdsa.spec | 2 +- SPECS/python-enum34/python-enum34.spec | 2 +- SPECS/python-futures/python-futures.spec | 2 +- SPECS/python-gevent/python-gevent.spec | 2 +- SPECS/python-greenlet/python-greenlet.spec | 2 +- SPECS/python-hyperlink/python-hyperlink.spec | 2 +- SPECS/python-hypothesis/python-hypothesis.spec | 2 +- SPECS/python-idna/python-idna.spec | 2 +- SPECS/python-incremental/python-incremental.spec | 2 +- SPECS/python-iniparse/python-iniparse.spec | 2 +- SPECS/python-ipaddress/python-ipaddress.spec | 2 +- SPECS/python-jmespath/python-jmespath.spec | 2 +- SPECS/python-jsonpatch/python-jsonpatch.spec | 2 +- SPECS/python-jsonschema/python-jsonschema.spec | 2 +- SPECS/python-lockfile/python-lockfile.spec | 2 +- SPECS/python-lxml/python-lxml.spec | 2 +- SPECS/python-m2r/python-m2r.spec | 2 +- SPECS/python-markupsafe/python-markupsafe.spec | 2 +- SPECS/python-mistune/python-mistune.spec | 2 +- SPECS/python-msgpack/python-msgpack.spec | 2 +- SPECS/python-netifaces/python-netifaces.spec | 2 +- SPECS/python-oauthlib/python-oauthlib.spec | 2 +- SPECS/python-packaging/python-packaging.spec | 2 +- SPECS/python-pam/python-pam.spec | 2 +- SPECS/python-prettytable/python-prettytable.spec | 2 +- SPECS/python-psutil/python-psutil.spec | 2 +- SPECS/python-psycopg2/python-psycopg2.spec | 2 +- SPECS/python-pyasn1/python-pyasn1.spec | 2 +- SPECS/python-pycparser/python-pycparser.spec | 2 +- SPECS/python-pyvmomi/python-pyvmomi.spec | 2 +- SPECS/python-setuptools/python-setuptools.spec | 2 +- SPECS/python-setuptools_scm/python-setuptools_scm.spec | 2 +- SPECS/python-simplejson/python-simplejson.spec | 2 +- SPECS/python-snowballstemmer/python-snowballstemmer.spec | 2 +- .../python-sphinx-theme-alabaster.spec | 2 +- SPECS/python-twisted/python-twisted.spec | 2 +- SPECS/python-virtualenv/python-virtualenv.spec | 2 +- SPECS/python-wcwidth/python-wcwidth.spec | 2 +- SPECS/python-webob/python-webob.spec | 2 +- SPECS/python3/python3.spec | 2 +- SPECS/pytz/pytz.spec | 2 +- SPECS/qemu-kvm/qemu-kvm.spec | 2 +- SPECS/readline/readline.spec | 2 +- SPECS/rpcbind/rpcbind.spec | 2 +- SPECS/rpcsvc-proto/rpcsvc-proto.spec | 2 +- SPECS/rpm/rpm.spec | 2 +- SPECS/rrdtool/rrdtool.spec | 2 +- SPECS/rsync/rsync.spec | 2 +- SPECS/rsyslog/rsyslog.spec | 2 +- SPECS/ruby/ruby.spec | 2 +- SPECS/rust/rust.spec | 2 +- SPECS/scons/scons.spec | 2 +- SPECS/sed/sed.spec | 2 +- SPECS/sg3_utils/sg3_utils.spec | 2 +- SPECS/shadow-utils/shadow-utils.spec | 2 +- SPECS/slang/slang.spec | 2 +- SPECS/snappy/snappy.spec | 2 +- SPECS/socat/socat.spec | 2 +- SPECS/sshpass/sshpass.spec | 2 +- SPECS/swupdate/swupdate.spec | 2 +- SPECS/syslinux/syslinux.spec | 2 +- SPECS/systemtap/systemtap.spec | 2 +- SPECS/tcl/tcl.spec | 2 +- SPECS/tcpdump/tcpdump.spec | 2 +- SPECS/tdnf/tdnf.spec | 2 +- SPECS/texinfo/texinfo.spec | 2 +- SPECS/tmux/tmux.spec | 2 +- SPECS/traceroute/traceroute.spec | 2 +- SPECS/tree/tree.spec | 2 +- SPECS/tzdata/tzdata.spec | 2 +- SPECS/unixODBC/unixODBC.spec | 2 +- SPECS/unzip/unzip.spec | 2 +- SPECS/userspace-rcu/userspace-rcu.spec | 2 +- SPECS/utf8proc/utf8proc.spec | 2 +- SPECS/util-linux/util-linux.spec | 2 +- SPECS/valgrind/valgrind.spec | 2 +- SPECS/vsftpd/vsftpd.spec | 2 +- SPECS/which/which.spec | 2 +- SPECS/wpa_supplicant/wpa_supplicant.spec | 2 +- SPECS/xfsprogs/xfsprogs.spec | 2 +- SPECS/xinetd/xinetd.spec | 2 +- SPECS/xmlsec1/xmlsec1.spec | 2 +- SPECS/xmlto/xmlto.spec | 2 +- SPECS/xz/xz.spec | 2 +- SPECS/zeromq/zeromq.spec | 2 +- SPECS/zlib/zlib.spec | 2 +- SPECS/zsh/zsh.spec | 2 +- 311 files changed, 312 insertions(+), 312 deletions(-) diff --git a/SPECS/GSL/GSL.spec b/SPECS/GSL/GSL.spec index 9bf7e7800a0..a85cf54ff11 100644 --- a/SPECS/GSL/GSL.spec +++ b/SPECS/GSL/GSL.spec @@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gsl/* %changelog -* Sat May 09 00:21:38 PST 2020 Nick Samson - 2.0.0-3 +* Sat May 09 2020 Nick Samson - 2.0.0-3 - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 2.0.0-2 diff --git a/SPECS/OpenIPMI/OpenIPMI.spec b/SPECS/OpenIPMI/OpenIPMI.spec index 0fd88989927..4e0c1ff9691 100644 --- a/SPECS/OpenIPMI/OpenIPMI.spec +++ b/SPECS/OpenIPMI/OpenIPMI.spec @@ -177,7 +177,7 @@ echo "disable ipmi.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-ip %{_mandir}/man5/ipmi_sim_cmd.5.gz %changelog -* Sat May 09 00:21:40 PST 2020 Nick Samson - 2.0.25-5 +* Sat May 09 2020 Nick Samson - 2.0.25-5 - Added %%license line automatically * Fri Apr 17 2020 Nicolas Ontiveros 2.0.25-4 diff --git a/SPECS/PyPAM/PyPAM.spec b/SPECS/PyPAM/PyPAM.spec index 6ee91fb1b09..1d972c89bd8 100644 --- a/SPECS/PyPAM/PyPAM.spec +++ b/SPECS/PyPAM/PyPAM.spec @@ -85,7 +85,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:39 PST 2020 Nick Samson - 0.5.0-8 +* Sat May 09 2020 Nick Samson - 0.5.0-8 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 0.5.0-7 diff --git a/SPECS/PyYAML/PyYAML.spec b/SPECS/PyYAML/PyYAML.spec index 16e3d9c20b2..66e3e90947f 100644 --- a/SPECS/PyYAML/PyYAML.spec +++ b/SPECS/PyYAML/PyYAML.spec @@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat May 09 00:21:38 PST 2020 Nick Samson - 3.13-5 +* Sat May 09 2020 Nick Samson - 3.13-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.13-4 diff --git a/SPECS/ant-contrib/ant-contrib.spec b/SPECS/ant-contrib/ant-contrib.spec index fce893bd698..c56e1f8e0ab 100644 --- a/SPECS/ant-contrib/ant-contrib.spec +++ b/SPECS/ant-contrib/ant-contrib.spec @@ -46,7 +46,7 @@ cd %{buildroot}/var/opt && tar xvzf %{_builddir}/%{name}/%{name}-%{version}-bin. %{_prefix}/lib/*.jar %changelog -* Sat May 09 00:20:49 PST 2020 Nick Samson - 1.0b3-18 +* Sat May 09 2020 Nick Samson - 1.0b3-18 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.0b3-17 diff --git a/SPECS/ant/ant.spec b/SPECS/ant/ant.spec index 8ff7a98b55c..8141834afc9 100644 --- a/SPECS/ant/ant.spec +++ b/SPECS/ant/ant.spec @@ -125,7 +125,7 @@ bootstrap/bin/ant -v run-tests - Updated to version 1.10.9 to resolve CVE-2020-11979 * Thu May 21 2020 Ruying Chen - 1.10.8-1 - Updated to version 1.10.8 to resolve CVE-2020-1945 -* Sat May 09 00:21:39 PST 2020 Nick Samson - 1.10.5-8 +* Sat May 09 2020 Nick Samson - 1.10.5-8 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.10.5-7 - Renaming apache-ant to ant diff --git a/SPECS/apr-util/apr-util.spec b/SPECS/apr-util/apr-util.spec index 93b6172a059..8462dafcf40 100644 --- a/SPECS/apr-util/apr-util.spec +++ b/SPECS/apr-util/apr-util.spec @@ -122,7 +122,7 @@ rm -rf %{buildroot} %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite* %changelog -* Sat May 09 00:21:10 PST 2020 Nick Samson - 1.6.1-4 +* Sat May 09 2020 Nick Samson - 1.6.1-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.6.1-3 diff --git a/SPECS/asciidoc/asciidoc.spec b/SPECS/asciidoc/asciidoc.spec index 93635d5f4ed..b7ae9df8242 100644 --- a/SPECS/asciidoc/asciidoc.spec +++ b/SPECS/asciidoc/asciidoc.spec @@ -55,7 +55,7 @@ python tests/testasciidoc.py run %{_mandir}/* %changelog -* Sat May 09 00:21:18 PST 2020 Nick Samson - 8.6.10-4 +* Sat May 09 2020 Nick Samson - 8.6.10-4 - Added %%license line automatically * Tue May 05 2020 Emre Girgin 8.6.10-3 diff --git a/SPECS/atftp/atftp.spec b/SPECS/atftp/atftp.spec index b6f4f916c30..66117817ef2 100644 --- a/SPECS/atftp/atftp.spec +++ b/SPECS/atftp/atftp.spec @@ -131,7 +131,7 @@ fi %changelog -* Sat May 09 00:21:18 PST 2020 Nick Samson - 0.7.2-3 +* Sat May 09 2020 Nick Samson - 0.7.2-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.7.2-2 diff --git a/SPECS/autogen/autogen.spec b/SPECS/autogen/autogen.spec index 04ab6f29323..cc7d0c9b6d0 100644 --- a/SPECS/autogen/autogen.spec +++ b/SPECS/autogen/autogen.spec @@ -79,7 +79,7 @@ make %{?_smp_mflags} check %exclude /usr/share/info/ %changelog -* Sat May 09 00:20:48 PST 2020 Nick Samson - 5.18.16-5 +* Sat May 09 2020 Nick Samson - 5.18.16-5 - Added %%license line automatically * Thu Feb 27 2020 Henry Beberman 5.18.16-4 diff --git a/SPECS/automake/automake.spec b/SPECS/automake/automake.spec index 5899d1ac669..2f547397c3b 100644 --- a/SPECS/automake/automake.spec +++ b/SPECS/automake/automake.spec @@ -43,7 +43,7 @@ make %{?_smp_mflags} check %{_defaultdocdir}/%{name}-%{version}/* %{_mandir}/*/* %changelog -* Sat May 09 00:21:00 PST 2020 Nick Samson - 1.16.1-3 +* Sat May 09 2020 Nick Samson - 1.16.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.16.1-2 diff --git a/SPECS/azure-iot-sdk-c/azure-iot-sdk-c.spec b/SPECS/azure-iot-sdk-c/azure-iot-sdk-c.spec index 16333026076..b4f081530a7 100644 --- a/SPECS/azure-iot-sdk-c/azure-iot-sdk-c.spec +++ b/SPECS/azure-iot-sdk-c/azure-iot-sdk-c.spec @@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT - Removing the Conflict reference to azure-iot-sdk-c-public-preview. * Sun May 31 2020 Henry Beberman 2020.02.04.1-5 - Add -Wno-error to cflags to fix compilation with updated -Werror default. -* Sat May 09 00:20:46 PST 2020 Nick Samson - 2020.02.04.1-4 +* Sat May 09 2020 Nick Samson - 2020.02.04.1-4 - Added %%license line automatically * Mon May 04 2020 Eric Li 2020.02.04.1-3 - Add #Source0: and license verified. diff --git a/SPECS/babel/babel.spec b/SPECS/babel/babel.spec index 1faf3c3ec87..0523b6a099e 100644 --- a/SPECS/babel/babel.spec +++ b/SPECS/babel/babel.spec @@ -95,7 +95,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:26 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 2.6.0-7 diff --git a/SPECS/bind/bind.spec b/SPECS/bind/bind.spec index 295a4b017ce..c969edc0951 100644 --- a/SPECS/bind/bind.spec +++ b/SPECS/bind/bind.spec @@ -95,7 +95,7 @@ fi - CVE-2020-8621, CVE-2020-8622, CVE-2020-8623, CVE-2020-8624 * Wed May 27 2020 Daniel McIlvaney - 9.16.3-1 - Update to version 9.16.3, fixes CVE-2018-5743, CVE-2018-5744, CVE-2019-6465, CVE-2019-6467, CVE-2019-6471, CVE-2020-8616, CVE-2020-8617 -* Sat May 09 00:21:20 PST 2020 Nick Samson - 9.13.3-4 +* Sat May 09 2020 Nick Samson - 9.13.3-4 - Added %%license line automatically * Fri May 1 2020 Emre Girgin 9.13.3-3 - Renaming bindutils to bind. diff --git a/SPECS/bison/bison.spec b/SPECS/bison/bison.spec index eceb3086f27..887c41ef0b4 100644 --- a/SPECS/bison/bison.spec +++ b/SPECS/bison/bison.spec @@ -52,7 +52,7 @@ make %{?_smp_mflags} check - Remove yacc command for compatibility with byacc package - Remove sha hash - License verified -* Sat May 09 00:21:04 PST 2020 Nick Samson 3.1-3 +* Sat May 09 2020 Nick Samson 3.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.1-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/blktrace/blktrace.spec b/SPECS/blktrace/blktrace.spec index 39019fe4b58..c356fd01651 100644 --- a/SPECS/blktrace/blktrace.spec +++ b/SPECS/blktrace/blktrace.spec @@ -37,7 +37,7 @@ rm -rf %{buildroot}/* %{_mandir} %changelog -* Sat May 09 00:21:09 PST 2020 Nick Samson - 1.2.0-5 +* Sat May 09 2020 Nick Samson - 1.2.0-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.2.0-4 diff --git a/SPECS/boost/boost.spec b/SPECS/boost/boost.spec index 0d153f69c35..d2bc79a5fd1 100644 --- a/SPECS/boost/boost.spec +++ b/SPECS/boost/boost.spec @@ -63,7 +63,7 @@ rm -rf %{buildroot}/* %{_libdir}/libboost_*.a %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 1.66.0-3 +* Sat May 09 2020 Nick Samson - 1.66.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.66.0-2 diff --git a/SPECS/bridge-utils/bridge-utils.spec b/SPECS/bridge-utils/bridge-utils.spec index b76b1f41b2f..9057394c74b 100644 --- a/SPECS/bridge-utils/bridge-utils.spec +++ b/SPECS/bridge-utils/bridge-utils.spec @@ -27,7 +27,7 @@ make DESTDIR=%{buildroot} install %{_mandir}/man8/* %changelog -* Sat May 09 00:20:34 PST 2020 Nick Samson - 1.6-4 +* Sat May 09 2020 Nick Samson - 1.6-4 - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 1.6-3 diff --git a/SPECS/btrfs-progs/btrfs-progs.spec b/SPECS/btrfs-progs/btrfs-progs.spec index 705f42cd0bc..6112432579e 100644 --- a/SPECS/btrfs-progs/btrfs-progs.spec +++ b/SPECS/btrfs-progs/btrfs-progs.spec @@ -75,7 +75,7 @@ rm -rf %{buildroot} %{_libdir}/libbtrfsutil.so %changelog -* Sat May 09 00:21:31 PST 2020 Nick Samson - 4.19-3 +* Sat May 09 2020 Nick Samson - 4.19-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.19-2 diff --git a/SPECS/bubblewrap/bubblewrap.spec b/SPECS/bubblewrap/bubblewrap.spec index d045075f003..14acb2242ac 100644 --- a/SPECS/bubblewrap/bubblewrap.spec +++ b/SPECS/bubblewrap/bubblewrap.spec @@ -54,7 +54,7 @@ rm -rf %{buildroot}/* * Thu May 21 2020 Ruying Chen - 0.3.0-5 - Fixed CVE-2019-12439 -* Sat May 09 00:21:04 PST 2020 Nick Samson - 0.3.0-4 +* Sat May 09 2020 Nick Samson - 0.3.0-4 - Added %%license line automatically * Tue Apr 21 2020 Emre Girgin 0.3.0-3 diff --git a/SPECS/bzip2/bzip2.spec b/SPECS/bzip2/bzip2.spec index e99c4118d4a..4aa3725bd31 100644 --- a/SPECS/bzip2/bzip2.spec +++ b/SPECS/bzip2/bzip2.spec @@ -102,7 +102,7 @@ make %{?_smp_mflags} check - Don't stomp on CFLAGS. * Tue May 26 2020 Emre Girgin 1.0.6-14 - Fix CVE-2019-12900. This was erroneously named CVE-2019-1353 before, which is not even related to bzip2. -* Sat May 09 00:21:38 PST 2020 Nick Samson - 1.0.6-13 +* Sat May 09 2020 Nick Samson - 1.0.6-13 - Added %%license line automatically * Wed Apr 22 2020 Emre Girgin 1.0.6-12 - Fix CVE-2019-1353. diff --git a/SPECS/cdrkit/cdrkit.spec b/SPECS/cdrkit/cdrkit.spec index f9f58e70370..668d5380d8c 100644 --- a/SPECS/cdrkit/cdrkit.spec +++ b/SPECS/cdrkit/cdrkit.spec @@ -45,7 +45,7 @@ ln -s genisoimage %{buildroot}%{_prefix}/bin/mkisofs %changelog * Sun May 31 2020 Henry Beberman - 1.1.11-8 - Add patch to fix format-security errors. -* Sat May 09 00:20:47 PST 2020 Nick Samson - 1.1.11-7 +* Sat May 09 2020 Nick Samson - 1.1.11-7 - Added %%license line automatically * Mon Apr 27 2020 Pawel Winogrodzki 1.1.11-6 - Fixed the 'Source0' tags. diff --git a/SPECS/check/check.spec b/SPECS/check/check.spec index cd5134cf1b1..ba1c6995ca8 100644 --- a/SPECS/check/check.spec +++ b/SPECS/check/check.spec @@ -45,7 +45,7 @@ make %{?_smp_mflags} check /usr/share/aclocal/* %changelog -* Sat May 09 00:21:19 PST 2020 Nick Samson - 0.12.0-4 +* Sat May 09 2020 Nick Samson - 0.12.0-4 - Added %%license line automatically * Thu Apr 23 2020 Pawel Winogrodzki 0.12.0-3 diff --git a/SPECS/chrpath/chrpath.spec b/SPECS/chrpath/chrpath.spec index 3e58c471c6c..c0c4ccb0991 100644 --- a/SPECS/chrpath/chrpath.spec +++ b/SPECS/chrpath/chrpath.spec @@ -35,7 +35,7 @@ rm -rf %{buildroot}/usr/doc %{_mandir}/man1/chrpath.1* %changelog -* Sat May 09 00:20:45 PST 2020 Nick Samson - 0.16-4 +* Sat May 09 2020 Nick Samson - 0.16-4 - Added %%license line automatically * Tue Apr 07 2020 Paul Monson 0.16-3 diff --git a/SPECS/clang/clang.spec b/SPECS/clang/clang.spec index 7f5072f0628..f4d6f875e27 100644 --- a/SPECS/clang/clang.spec +++ b/SPECS/clang/clang.spec @@ -85,7 +85,7 @@ rm -rf %{buildroot}/* - Enable RTTI (runtime type information) so other packages can depend on it. * Fri Jun 12 2020 Henry Beberman 8.0.1-3 - Temporarily disable generation of debug symbols. -* Sat May 09 00:21:24 PST 2020 Nick Samson - 8.0.1-2 +* Sat May 09 2020 Nick Samson - 8.0.1-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 8.0.1-1 - Update to 8.0.1. Fix Source0 URL. License verified. diff --git a/SPECS/cmake/cmake.spec b/SPECS/cmake/cmake.spec index ea06384ef5f..7f5f688473d 100644 --- a/SPECS/cmake/cmake.spec +++ b/SPECS/cmake/cmake.spec @@ -68,7 +68,7 @@ make %{?_smp_mflags} test - Update to version 3.17.3 * Fri Jun 12 2020 Henry Beberman 3.12.1-7 - Temporarily disable generation of debug symbols. -* Sat May 09 00:20:40 PST 2020 Nick Samson - 3.12.1-6 +* Sat May 09 2020 Nick Samson - 3.12.1-6 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.12.1-5 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/cppunit/cppunit.spec b/SPECS/cppunit/cppunit.spec index a8743156a36..500d353ae38 100644 --- a/SPECS/cppunit/cppunit.spec +++ b/SPECS/cppunit/cppunit.spec @@ -57,7 +57,7 @@ find %{buildroot} -name '*.la' -delete %changelog * Thu Jun 11 2020 Henry Beberman - 1.12.1-5 - Disable link as-needed to fix compilation errors updated ldflags. -* Sat May 09 00:21:26 PST 2020 Nick Samson - 1.12.1-4 +* Sat May 09 2020 Nick Samson - 1.12.1-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.12.1-3 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/cracklib/cracklib.spec b/SPECS/cracklib/cracklib.spec index 2a874160937..12a3b62dbb7 100644 --- a/SPECS/cracklib/cracklib.spec +++ b/SPECS/cracklib/cracklib.spec @@ -210,7 +210,7 @@ rm -f %{_datadir}/cracklib/pw_dict.pwi %{_datadir}/locale/* %changelog -* Sat May 09 00:21:00 PST 2020 Nick Samson - 2.9.7-2 +* Sat May 09 2020 Nick Samson - 2.9.7-2 - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 2.9.7-1 diff --git a/SPECS/createrepo_c/createrepo_c.spec b/SPECS/createrepo_c/createrepo_c.spec index f63cab741d6..dc5b6211fcc 100644 --- a/SPECS/createrepo_c/createrepo_c.spec +++ b/SPECS/createrepo_c/createrepo_c.spec @@ -78,7 +78,7 @@ ln -sf %{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %{_lib64dir}/pkgconfig/%{name}.pc %changelog -* Sat May 09 00:21:36 PST 2020 Nick Samson - 0.11.1-6 +* Sat May 09 2020 Nick Samson - 0.11.1-6 - Added %%license line automatically * Thu Apr 23 2020 Andrew Phelps 0.11.1-5 diff --git a/SPECS/cronie/cronie.spec b/SPECS/cronie/cronie.spec index 24d547e5c28..351ecd84d76 100644 --- a/SPECS/cronie/cronie.spec +++ b/SPECS/cronie/cronie.spec @@ -120,7 +120,7 @@ make %{?_smp_mflags} check %ghost %attr(0600,root,root) %{_localstatedir}/spool/anacron/cron.weekly %changelog -* Sat May 09 00:21:34 PST 2020 Nick Samson - 1.5.2-3 +* Sat May 09 2020 Nick Samson - 1.5.2-3 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 1.5.2-2 diff --git a/SPECS/ctags/ctags.spec b/SPECS/ctags/ctags.spec index 83033a3bb1c..bb7cc69610e 100644 --- a/SPECS/ctags/ctags.spec +++ b/SPECS/ctags/ctags.spec @@ -46,7 +46,7 @@ rm -rf %{buildroot} %changelog * Sun May 31 2020 Henry Beberman - 5.8-5 - Add patch to fix format-security errors. -* Sat May 09 00:20:47 PST 2020 Nick Samson - 5.8-4 +* Sat May 09 2020 Nick Samson - 5.8-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 5.8-3 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/curl/curl.spec b/SPECS/curl/curl.spec index c691e75c93b..739288b0a43 100644 --- a/SPECS/curl/curl.spec +++ b/SPECS/curl/curl.spec @@ -132,7 +132,7 @@ rm -rf %{buildroot}/* * Thu May 14 2020 Nicolas Ontiveros 7.66.0-1 - Upgrade to version 7.66.0, which fixes CVE-2018-16890 and CVE-2019-3822/3833. -* Sat May 09 00:21:39 PST 2020 Nick Samson - 7.61.1-6 +* Sat May 09 2020 Nick Samson - 7.61.1-6 - Added %%license line automatically * Wed May 06 2020 Pawel Winogrodzki 7.61.1-5 diff --git a/SPECS/dbus-glib/dbus-glib.spec b/SPECS/dbus-glib/dbus-glib.spec index 73f84c2c426..07f70227079 100644 --- a/SPECS/dbus-glib/dbus-glib.spec +++ b/SPECS/dbus-glib/dbus-glib.spec @@ -64,7 +64,7 @@ make %{?_smp_mflags} check %changelog -* Sat May 09 00:21:38 PST 2020 Nick Samson - 0.110-3 +* Sat May 09 2020 Nick Samson - 0.110-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.110-2 diff --git a/SPECS/dejagnu/dejagnu.spec b/SPECS/dejagnu/dejagnu.spec index ae244a270e5..e2e8d6cb875 100644 --- a/SPECS/dejagnu/dejagnu.spec +++ b/SPECS/dejagnu/dejagnu.spec @@ -62,7 +62,7 @@ make DESTDIR=%{buildroot} install %{_includedir}/* %changelog -* Sat May 09 00:21:41 PST 2020 Nick Samson - 1.6.2-2 +* Sat May 09 2020 Nick Samson - 1.6.2-2 - Added %%license line automatically * Mon Apr 13 2020 Emre Girgin 1.6.2-1 diff --git a/SPECS/dhcp/dhcp.spec b/SPECS/dhcp/dhcp.spec index ce75f4121ee..b0fa87b7b84 100644 --- a/SPECS/dhcp/dhcp.spec +++ b/SPECS/dhcp/dhcp.spec @@ -175,7 +175,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/dhclient/ * Thu May 28 2020 Nicolas Ontiveros 4.4.2-1 - Update to version 4.4.2, which fixes CVE-2017-3144 and CVE-2018-5733. - License verified. -* Sat May 09 00:21:03 PST 2020 Nick Samson 4.3.6-2 +* Sat May 09 2020 Nick Samson 4.3.6-2 - Added %%license line automatically * Thu Mar 26 2020 Nicolas Ontiveros 4.3.6-1 - Update version to 4.3.6. License verified. URL updated. diff --git a/SPECS/dialog/dialog.spec b/SPECS/dialog/dialog.spec index abf5a860dfa..933368b88ec 100644 --- a/SPECS/dialog/dialog.spec +++ b/SPECS/dialog/dialog.spec @@ -85,7 +85,7 @@ chmod +x %{buildroot}%{_libdir}/* %{_mandir}/man3/dialog.* %changelog -* Sat May 09 00:20:59 PST 2020 Nick Samson - 1.3-3.20180621 +* Sat May 09 2020 Nick Samson - 1.3-3.20180621 - Added %%license line automatically * Thu Apr 16 2020 Nick Samson 1.3-2 diff --git a/SPECS/diffutils/diffutils.spec b/SPECS/diffutils/diffutils.spec index a377e6c1083..0065bea588e 100644 --- a/SPECS/diffutils/diffutils.spec +++ b/SPECS/diffutils/diffutils.spec @@ -42,7 +42,7 @@ make %{?_smp_mflags} check %{_mandir}/*/* %changelog -* Sat May 09 00:20:58 PST 2020 Nick Samson - 3.6-4 +* Sat May 09 2020 Nick Samson - 3.6-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.6-3 diff --git a/SPECS/dkms/dkms.spec b/SPECS/dkms/dkms.spec index a8f0847aacf..071a616b158 100644 --- a/SPECS/dkms/dkms.spec +++ b/SPECS/dkms/dkms.spec @@ -58,7 +58,7 @@ echo "disable dkms.service" > %{buildroot}/usr/lib/systemd/system-preset/50-dkms %{_localstatedir}/lib/dkms/dkms_dbversion %changelog -* Sat May 09 00:21:19 PST 2020 Nick Samson - 2.8.1-3 +* Sat May 09 2020 Nick Samson - 2.8.1-3 - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 2.8.1-2 diff --git a/SPECS/dmidecode/dmidecode.spec b/SPECS/dmidecode/dmidecode.spec index 143df14aca2..5820962de82 100644 --- a/SPECS/dmidecode/dmidecode.spec +++ b/SPECS/dmidecode/dmidecode.spec @@ -25,7 +25,7 @@ make DESTDIR=%{buildroot} prefix=%{_prefix} install %{_mandir}/man8/* %changelog -* Sat May 09 00:21:29 PST 2020 Nick Samson - 3.2-2 +* Sat May 09 2020 Nick Samson - 3.2-2 - Added %%license line automatically * Thu Mar 19 2020 Nicolas Ontiveros 3.2-1 diff --git a/SPECS/docbook-style-xsl/docbook-style-xsl.spec b/SPECS/docbook-style-xsl/docbook-style-xsl.spec index c45f297cc69..e692f0c7673 100644 --- a/SPECS/docbook-style-xsl/docbook-style-xsl.spec +++ b/SPECS/docbook-style-xsl/docbook-style-xsl.spec @@ -91,7 +91,7 @@ fi %{_docdir}/* %changelog -* Sat May 09 00:20:40 PST 2020 Nick Samson - 1.79.1-10 +* Sat May 09 2020 Nick Samson - 1.79.1-10 - Added %%license line automatically * Tue May 05 2020 Emre Girgin 1.79.1-9 diff --git a/SPECS/dosfstools/dosfstools.spec b/SPECS/dosfstools/dosfstools.spec index 185e7fc6ae4..555af907dc2 100644 --- a/SPECS/dosfstools/dosfstools.spec +++ b/SPECS/dosfstools/dosfstools.spec @@ -28,7 +28,7 @@ rm -rf %{buildroot}/* %{_mandir}/man8/* %{_docdir}/dosfstools/* %changelog -* Sat May 09 00:21:25 PST 2020 Nick Samson - 4.1-4 +* Sat May 09 2020 Nick Samson - 4.1-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.1-3 diff --git a/SPECS/dstat/dstat.spec b/SPECS/dstat/dstat.spec index f3c53f79747..b95f083dc71 100644 --- a/SPECS/dstat/dstat.spec +++ b/SPECS/dstat/dstat.spec @@ -31,7 +31,7 @@ Dstat gives you detailed selective information in columns and clearly indicates %{_datadir}/dstat/ %changelog -* Sat May 09 00:21:38 PST 2020 Nick Samson - 0.7.4-2 +* Sat May 09 2020 Nick Samson - 0.7.4-2 - Added %%license line automatically * Mon Apr 27 2020 Pawel Winogrodzki 0.7.4-1 diff --git a/SPECS/e2fsprogs/e2fsprogs.spec b/SPECS/e2fsprogs/e2fsprogs.spec index 1b1f93f078c..95dac7df483 100644 --- a/SPECS/e2fsprogs/e2fsprogs.spec +++ b/SPECS/e2fsprogs/e2fsprogs.spec @@ -138,7 +138,7 @@ make %{?_smp_mflags} check * Fri Jul 31 2020 Leandro Pereira - 1.44.6-3 - Don't stomp on CFLAGS. -* Sat May 09 00:21:25 PST 2020 Nick Samson - 1.44.6-2 +* Sat May 09 2020 Nick Samson - 1.44.6-2 - Added %%license line automatically * Thu Mar 19 2020 Nicolas Ontiveros 1.44.6-1 diff --git a/SPECS/efibootmgr/efibootmgr.spec b/SPECS/efibootmgr/efibootmgr.spec index 67859e34a20..2e4230ba525 100644 --- a/SPECS/efibootmgr/efibootmgr.spec +++ b/SPECS/efibootmgr/efibootmgr.spec @@ -35,7 +35,7 @@ rm -rf %{buildroot}/* %{_sbindir}/* %{_mandir}/man8/* %changelog -* Sat May 09 00:21:06 PST 2020 Nick Samson - 16-2 +* Sat May 09 2020 Nick Samson - 16-2 - Added %%license line automatically * Wed Mar 18 2020 Nicolas Ontiveros 16-1 diff --git a/SPECS/efivar/efivar.spec b/SPECS/efivar/efivar.spec index 0f26c652899..7d19ccd372f 100644 --- a/SPECS/efivar/efivar.spec +++ b/SPECS/efivar/efivar.spec @@ -53,7 +53,7 @@ rm -rf %{buildroot}/* %{_mandir}/man3/* %changelog -* Sat May 09 00:21:41 PST 2020 Nick Samson - 37-3 +* Sat May 09 2020 Nick Samson - 37-3 - Added %%license line automatically * Tue Mar 24 2020 Henry Beberman 37-2 diff --git a/SPECS/erlang/erlang.spec b/SPECS/erlang/erlang.spec index 5fa47b88544..eb8bb731dea 100644 --- a/SPECS/erlang/erlang.spec +++ b/SPECS/erlang/erlang.spec @@ -39,7 +39,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %exclude %{_libdir}/debug %changelog -* Sat May 09 00:20:44 PST 2020 Nick Samson - 22.0.7-2 +* Sat May 09 2020 Nick Samson - 22.0.7-2 - Added %%license line automatically * Thu Mar 19 2020 Henry Beberman 22.0.7-1 diff --git a/SPECS/ethtool/ethtool.spec b/SPECS/ethtool/ethtool.spec index 600e54010f0..a3cfecbc7b6 100644 --- a/SPECS/ethtool/ethtool.spec +++ b/SPECS/ethtool/ethtool.spec @@ -38,7 +38,7 @@ rm -rf %{buildroot}/* %{_mandir} %changelog -* Sat May 09 00:21:41 PST 2020 Nick Samson - 5.0-2 +* Sat May 09 2020 Nick Samson - 5.0-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 5.0-1 diff --git a/SPECS/expat/expat.spec b/SPECS/expat/expat.spec index 48585b04841..1e5bf4138ce 100644 --- a/SPECS/expat/expat.spec +++ b/SPECS/expat/expat.spec @@ -66,7 +66,7 @@ rm -rf %{buildroot}/* %{_libdir}/libexpat.so.* %changelog -* Sat May 09 00:21:10 PST 2020 Nick Samson - 2.2.6-4 +* Sat May 09 2020 Nick Samson - 2.2.6-4 - Added %%license line automatically * Wed Apr 22 2020 Nicolas Ontiveros 2.2.6-3 diff --git a/SPECS/expect/expect.spec b/SPECS/expect/expect.spec index eac8bcfc13b..f2c51eaf43a 100644 --- a/SPECS/expect/expect.spec +++ b/SPECS/expect/expect.spec @@ -58,7 +58,7 @@ make %{?_smp_mflags} test %changelog * Sun May 31 2020 Henry Beberman - 5.45.4-4 - Add patch to fix format-security errors. -* Sat May 09 00:21:13 PST 2020 Nick Samson - 5.45.4-3 +* Sat May 09 2020 Nick Samson - 5.45.4-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 5.45.4-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/fcgi/fcgi.spec b/SPECS/fcgi/fcgi.spec index 5935133e493..d852e5efbbc 100644 --- a/SPECS/fcgi/fcgi.spec +++ b/SPECS/fcgi/fcgi.spec @@ -57,7 +57,7 @@ make check %{_includedir}/* %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 2.4.0-7 +* Sat May 09 2020 Nick Samson - 2.4.0-7 - Added %%license line automatically * Mon Apr 27 2020 Pawel Winogrodzki 2.4.0-6 diff --git a/SPECS/findutils/findutils.spec b/SPECS/findutils/findutils.spec index c53fb397c6b..0b3878d7227 100644 --- a/SPECS/findutils/findutils.spec +++ b/SPECS/findutils/findutils.spec @@ -62,7 +62,7 @@ make %{?_smp_mflags} check %defattr(-,root,root) %changelog -* Sat May 09 00:20:51 PST 2020 Nick Samson - 4.6.0-7 +* Sat May 09 2020 Nick Samson - 4.6.0-7 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.6.0-6 diff --git a/SPECS/fping/fping.spec b/SPECS/fping/fping.spec index 22753476787..d8879fde64c 100644 --- a/SPECS/fping/fping.spec +++ b/SPECS/fping/fping.spec @@ -39,7 +39,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man8/fping.8* %changelog -* Sat May 09 00:20:36 PST 2020 Nick Samson - 4.2-2 +* Sat May 09 2020 Nick Samson - 4.2-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 4.2-1 diff --git a/SPECS/freefont/freefont.spec b/SPECS/freefont/freefont.spec index ec598201b61..6da65a9e506 100644 --- a/SPECS/freefont/freefont.spec +++ b/SPECS/freefont/freefont.spec @@ -31,7 +31,7 @@ mv *.ttf %{buildroot}%{_fontdir}/ %{_fontdir}/*.ttf %changelog -* Sat May 09 00:20:57 PST 2020 Nick Samson - 20120503-2 +* Sat May 09 2020 Nick Samson - 20120503-2 - Added %%license line automatically * Wed Apr 29 2020 Mateusz Malisz 20120503-1 diff --git a/SPECS/freetype/freetype.spec b/SPECS/freetype/freetype.spec index 8d67d1385b5..8c413d960af 100644 --- a/SPECS/freetype/freetype.spec +++ b/SPECS/freetype/freetype.spec @@ -56,7 +56,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:21:42 PST 2020 Nick Samson - 2.9.1-4 +* Sat May 09 2020 Nick Samson - 2.9.1-4 - Added %%license line automatically * Fri Apr 17 2020 Nicolas Ontiveros 2.9.1-3 diff --git a/SPECS/fuse/fuse.spec b/SPECS/fuse/fuse.spec index a5041846025..63043fa8e6b 100644 --- a/SPECS/fuse/fuse.spec +++ b/SPECS/fuse/fuse.spec @@ -71,7 +71,7 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/pkgconfig/fuse.pc %changelog -* Sat May 09 00:20:38 PST 2020 Nick Samson - 2.9.7-7 +* Sat May 09 2020 Nick Samson - 2.9.7-7 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.9.7-6 diff --git a/SPECS/gcc/gcc.spec b/SPECS/gcc/gcc.spec index b0be941d8b2..f99617cedc3 100644 --- a/SPECS/gcc/gcc.spec +++ b/SPECS/gcc/gcc.spec @@ -220,7 +220,7 @@ make %{?_smp_mflags} check-gcc * Thu Jun 11 2020 Henry Beberman - 9.1.0-5 - Disable -Werror=format-security to build with hardened cflags -* Sat May 09 00:21:12 PST 2020 Nick Samson - 9.1.0-4 +* Sat May 09 2020 Nick Samson - 9.1.0-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin - 9.1.0-3 diff --git a/SPECS/gdbm/gdbm.spec b/SPECS/gdbm/gdbm.spec index 6193ebf3706..a1b8b70c88a 100644 --- a/SPECS/gdbm/gdbm.spec +++ b/SPECS/gdbm/gdbm.spec @@ -70,7 +70,7 @@ make %{?_smp_mflags} check %{_mandir}/man3/* %changelog -* Sat May 09 00:21:30 PST 2020 Nick Samson - 1.18-3 +* Sat May 09 2020 Nick Samson - 1.18-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.18-2 diff --git a/SPECS/gettext/gettext.spec b/SPECS/gettext/gettext.spec index 6e53957d69f..50c896e347c 100644 --- a/SPECS/gettext/gettext.spec +++ b/SPECS/gettext/gettext.spec @@ -63,7 +63,7 @@ make %{?_smp_mflags} check - Remove sha1. License verified. * Thu Jun 11 2020 Henry Beberman 0.19.8.1-3 - Disable -Wno-error=format-security to build with hardened cflags -* Sat May 09 00:21:19 PST 2020 Nick Samson 0.19.8.1-2 +* Sat May 09 2020 Nick Samson 0.19.8.1-2 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 19.8.1-1 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/git/git.spec b/SPECS/git/git.spec index 7667ede1cfd..bf26002952a 100644 --- a/SPECS/git/git.spec +++ b/SPECS/git/git.spec @@ -93,7 +93,7 @@ rm -rf %{buildroot}/* - Fix check test * Thu May 21 2020 Suresh Babu Chalamalasetty 2.23.3-1 - Update to version 2.23.3 for fix CVE-2020-11008 and CVE-2020-5260. -* Sat May 09 00:21:41 PST 2020 Nick Samson - 2.20.2-2 +* Sat May 09 2020 Nick Samson - 2.20.2-2 - Added %%license line automatically * Mon Apr 06 2020 Emre Girgin 2.20.2-1 diff --git a/SPECS/glib-networking/glib-networking.spec b/SPECS/glib-networking/glib-networking.spec index 412a4c27054..0dc280a7815 100644 --- a/SPECS/glib-networking/glib-networking.spec +++ b/SPECS/glib-networking/glib-networking.spec @@ -76,7 +76,7 @@ ninja test - Bump release to rebuild with new nettle (3.7.2) * Tue Aug 18 2020 Henry Beberman - 2.59.1-6 - Backport patch for CVE-2020-13645 -* Sat May 09 00:20:40 PST 2020 Nick Samson - 2.59.1-5 +* Sat May 09 2020 Nick Samson - 2.59.1-5 - Added %%license line automatically, updated license line * Wed May 06 2020 Pawel Winogrodzki 2.59.1-4 - Removing *Requires for "ca-certificates". diff --git a/SPECS/glibmm24/glibmm24.spec b/SPECS/glibmm24/glibmm24.spec index ead1511dd0f..c48ba0365e3 100644 --- a/SPECS/glibmm24/glibmm24.spec +++ b/SPECS/glibmm24/glibmm24.spec @@ -67,7 +67,7 @@ export GIO_EXTRA_MODULES=/usr/lib/gio/modules; make check %{_datadir}/* %changelog -* Sat May 09 00:20:49 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 2.56.0-6 diff --git a/SPECS/gmp/gmp.spec b/SPECS/gmp/gmp.spec index c5c28c9b92e..87469a2577f 100644 --- a/SPECS/gmp/gmp.spec +++ b/SPECS/gmp/gmp.spec @@ -63,7 +63,7 @@ make %{?_smp_mflags} check %{_docdir}/%{name}-%{version}/isa_abi_headache %changelog -* Sat May 09 00:21:12 PST 2020 Nick Samson - 6.1.2-5 +* Sat May 09 2020 Nick Samson - 6.1.2-5 - Added %%license line automatically * Fri Feb 14 2020 Andrew Phelps 6.1.2-4 diff --git a/SPECS/gnome-common/gnome-common.spec b/SPECS/gnome-common/gnome-common.spec index e65865b2d58..0a72ab6381a 100644 --- a/SPECS/gnome-common/gnome-common.spec +++ b/SPECS/gnome-common/gnome-common.spec @@ -39,7 +39,7 @@ make %{?_smp_mflags} check %{_datadir}/aclocal/*.m4 %changelog -* Sat May 09 00:21:20 PST 2020 Nick Samson - 3.18.0-6 +* Sat May 09 2020 Nick Samson - 3.18.0-6 - Added %%license line automatically * Mon Apr 27 2020 Pawel Winogrodzki 3.18.0-5 diff --git a/SPECS/gnuplot/gnuplot.spec b/SPECS/gnuplot/gnuplot.spec index 451badc298d..05fff460764 100644 --- a/SPECS/gnuplot/gnuplot.spec +++ b/SPECS/gnuplot/gnuplot.spec @@ -36,7 +36,7 @@ make DESTDIR=%{buildroot} install %changelog -* Sat May 09 00:21:32 PST 2020 Nick Samson - 5.2.4-4 +* Sat May 09 2020 Nick Samson - 5.2.4-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 5.2.4-3 diff --git a/SPECS/gperf/gperf.spec b/SPECS/gperf/gperf.spec index 021556e8a20..20498202a00 100644 --- a/SPECS/gperf/gperf.spec +++ b/SPECS/gperf/gperf.spec @@ -43,7 +43,7 @@ make %{?_smp_mflags} check %{_bindir}/* %changelog -* Sat May 09 00:20:56 PST 2020 Nick Samson - 3.1-3 +* Sat May 09 2020 Nick Samson - 3.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.1-2 diff --git a/SPECS/gptfdisk/gptfdisk.spec b/SPECS/gptfdisk/gptfdisk.spec index 32aa4d67b2f..13229031c9a 100644 --- a/SPECS/gptfdisk/gptfdisk.spec +++ b/SPECS/gptfdisk/gptfdisk.spec @@ -40,7 +40,7 @@ rm -rf %{buildroot}/* /sbin/* %{_mandir}/man8/* %changelog -* Sat May 09 00:21:01 PST 2020 Nick Samson - 1.0.4-3 +* Sat May 09 2020 Nick Samson - 1.0.4-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.0.4-2 diff --git a/SPECS/grep/grep.spec b/SPECS/grep/grep.spec index 9e8a48c3017..176a7c095ca 100644 --- a/SPECS/grep/grep.spec +++ b/SPECS/grep/grep.spec @@ -49,7 +49,7 @@ make %{?_smp_mflags} check %changelog * Tue Jan 05 2021 Andrew Phelps 3.1-4 - Fix test issue by configuring "--with-included-regex". Remove sha1. -* Sat May 09 00:20:53 PST 2020 Nick Samson - 3.1-3 +* Sat May 09 2020 Nick Samson - 3.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.1-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/gtest/gtest.spec b/SPECS/gtest/gtest.spec index 177ea74f213..6eae56df8a2 100644 --- a/SPECS/gtest/gtest.spec +++ b/SPECS/gtest/gtest.spec @@ -103,7 +103,7 @@ find %{buildroot} -name '*.la' -delete %{_lib64dir}/libgtest_main.a %changelog -* Sat May 09 00:20:49 PST 2020 Nick Samson - 1.8.1-5 +* Sat May 09 2020 Nick Samson - 1.8.1-5 - Added %%license line automatically * Thu Apr 23 2020 Andrew Phelps 1.8.1-4 diff --git a/SPECS/gtk-doc/gtk-doc.spec b/SPECS/gtk-doc/gtk-doc.spec index 825f0e79092..75b41774b14 100644 --- a/SPECS/gtk-doc/gtk-doc.spec +++ b/SPECS/gtk-doc/gtk-doc.spec @@ -51,7 +51,7 @@ cd tests && make check-TESTS %{_libdir}/cmake/ %changelog -* Sat May 09 00:20:38 PST 2020 Nick Samson - 1.29-6 +* Sat May 09 2020 Nick Samson - 1.29-6 - Added %%license line automatically * Tue May 05 2020 Emre Girgin 1.29-5 diff --git a/SPECS/guile/guile.spec b/SPECS/guile/guile.spec index 4dff23d5aa1..936c54505ba 100644 --- a/SPECS/guile/guile.spec +++ b/SPECS/guile/guile.spec @@ -67,7 +67,7 @@ make %{?_smp_mflags} check %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:20:35 PST 2020 Nick Samson - 2.0.14-2 +* Sat May 09 2020 Nick Samson - 2.0.14-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 2.0.14-1 diff --git a/SPECS/gzip/gzip.spec b/SPECS/gzip/gzip.spec index 123ffd27c0d..5ff62174584 100644 --- a/SPECS/gzip/gzip.spec +++ b/SPECS/gzip/gzip.spec @@ -42,7 +42,7 @@ make %{?_smp_mflags} check %changelog * Tue Oct 20 2020 Andrew Phelps 1.9-5 - Fix check test -* Sat May 09 00:21:13 PST 2020 Nick Samson - 1.9-4 +* Sat May 09 2020 Nick Samson - 1.9-4 - Added %%license line automatically * Fri Mar 03 2020 Jon Slobodzian 1.9-3 - Fixed reference URL. Verified license. diff --git a/SPECS/haproxy/haproxy.spec b/SPECS/haproxy/haproxy.spec index b55313ae6f7..a8d533fce2b 100644 --- a/SPECS/haproxy/haproxy.spec +++ b/SPECS/haproxy/haproxy.spec @@ -63,7 +63,7 @@ install -vDm644 examples/transparent_proxy.cfg %{buildroot}/%{_sysconfdir}/hapr * Tue May 19 2020 Nicolas Ontiveros 1.9.6-5 - Fix CVE-2019-14241. - Fix CVE-2020-11100. -* Sat May 09 00:20:35 PST 2020 Nick Samson 1.9.6-4 +* Sat May 09 2020 Nick Samson 1.9.6-4 - Added %%license line automatically * Tue Apr 21 2020 Nicolas Ontiveros 1.9.6-3 - Fix CVE-2019-19330. diff --git a/SPECS/harfbuzz/harfbuzz.spec b/SPECS/harfbuzz/harfbuzz.spec index a3134a55198..67a4eb80d91 100644 --- a/SPECS/harfbuzz/harfbuzz.spec +++ b/SPECS/harfbuzz/harfbuzz.spec @@ -58,7 +58,7 @@ make %{?_smp_mflags} -k check %{_libdir}/cmake/harfbuzz/harfbuzz-config.cmake %changelog -* Sat May 09 00:20:48 PST 2020 Nick Samson - 1.9.0-4 +* Sat May 09 2020 Nick Samson - 1.9.0-4 - Added %%license line automatically * Mon Apr 20 2020 Nicolas Ontiveros 1.9.0-3 diff --git a/SPECS/haveged/haveged.spec b/SPECS/haveged/haveged.spec index 7154700c9ee..f47f0c626c2 100644 --- a/SPECS/haveged/haveged.spec +++ b/SPECS/haveged/haveged.spec @@ -106,7 +106,7 @@ rm -rf %{buildroot} %changelog -* Sat May 09 00:21:04 PST 2020 Nick Samson - 1.9.8-2 +* Sat May 09 2020 Nick Samson - 1.9.8-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 1.9.8-1 diff --git a/SPECS/hdparm/hdparm.spec b/SPECS/hdparm/hdparm.spec index 2b28524fd04..31ab304e62a 100644 --- a/SPECS/hdparm/hdparm.spec +++ b/SPECS/hdparm/hdparm.spec @@ -32,7 +32,7 @@ make DESTDIR=%{buildroot} binprefix=%{_prefix} install %changelog * Sun May 31 2020 Henry Beberman - 9.56-4 - Update make to explicitly consume cflags and ldflags. -* Sat May 09 00:21:36 PST 2020 Nick Samson - 9.56-3 +* Sat May 09 2020 Nick Samson - 9.56-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 9.56-2 diff --git a/SPECS/http-parser/http-parser.spec b/SPECS/http-parser/http-parser.spec index afe9638f85b..4b2ad540152 100644 --- a/SPECS/http-parser/http-parser.spec +++ b/SPECS/http-parser/http-parser.spec @@ -43,7 +43,7 @@ make PREFIX="%{_prefix}" DESTDIR="%{buildroot}" install %changelog * Sun May 31 2020 Henry Beberman - 2.8.1-5 - Update make to explicitly consume cflags -* Sat May 09 00:21:11 PST 2020 Nick Samson - 2.8.1-4 +* Sat May 09 2020 Nick Samson - 2.8.1-4 - Added %%license line automatically * Tue Apr 14 2020 Nick Samson 2.8.1-3 - Updated Source0, License verified. diff --git a/SPECS/i2c-tools/i2c-tools.spec b/SPECS/i2c-tools/i2c-tools.spec index 5bd5a285839..f2c5710d419 100644 --- a/SPECS/i2c-tools/i2c-tools.spec +++ b/SPECS/i2c-tools/i2c-tools.spec @@ -50,7 +50,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install %{_libdir}/libi2c.so %changelog -* Sat May 09 00:21:01 PST 2020 Nick Samson - 4.1-3 +* Sat May 09 2020 Nick Samson - 4.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.1-2 diff --git a/SPECS/inotify-tools/inotify-tools.spec b/SPECS/inotify-tools/inotify-tools.spec index 26d3db120bf..eebb23db465 100644 --- a/SPECS/inotify-tools/inotify-tools.spec +++ b/SPECS/inotify-tools/inotify-tools.spec @@ -60,7 +60,7 @@ make %{?_smp_mflags} check /%{_libdir}/libinotifytools.la %changelog -* Sat May 09 00:21:22 PST 2020 Nick Samson - 3.14-2 +* Sat May 09 2020 Nick Samson - 3.14-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 3.14-1 diff --git a/SPECS/intltool/intltool.spec b/SPECS/intltool/intltool.spec index b2aea749395..388efda2642 100644 --- a/SPECS/intltool/intltool.spec +++ b/SPECS/intltool/intltool.spec @@ -36,7 +36,7 @@ make %{?_smp_mflags} check %{_mandir}/man8/* %changelog -* Sat May 09 00:21:18 PST 2020 Nick Samson - 0.51.0-7 +* Sat May 09 2020 Nick Samson - 0.51.0-7 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 0.51.0-6 diff --git a/SPECS/iotop/iotop.spec b/SPECS/iotop/iotop.spec index e8384658c2f..db3b1347c0d 100644 --- a/SPECS/iotop/iotop.spec +++ b/SPECS/iotop/iotop.spec @@ -47,7 +47,7 @@ rm -rf %{buildroot}/* %changelog -* Sat May 09 00:21:23 PST 2020 Nick Samson - 0.6-7 +* Sat May 09 2020 Nick Samson - 0.6-7 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.6-6 diff --git a/SPECS/iperf3/iperf3.spec b/SPECS/iperf3/iperf3.spec index f04ac166b7b..96610bf7f61 100644 --- a/SPECS/iperf3/iperf3.spec +++ b/SPECS/iperf3/iperf3.spec @@ -68,7 +68,7 @@ make %{?_smp_mflags} check %{_mandir}/man3/libiperf.3.gz %changelog -* Sat May 09 00:21:29 PST 2020 Nick Samson - 3.6-5 +* Sat May 09 2020 Nick Samson - 3.6-5 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 3.6-4 diff --git a/SPECS/iproute/iproute.spec b/SPECS/iproute/iproute.spec index f281f1156e2..7f42c00950c 100644 --- a/SPECS/iproute/iproute.spec +++ b/SPECS/iproute/iproute.spec @@ -69,7 +69,7 @@ cd .. %{_mandir}/man3/* %changelog -* Sat May 09 00:20:46 PST 2020 Nick Samson - 4.18.0-5 +* Sat May 09 2020 Nick Samson - 4.18.0-5 - Added %%license line automatically * Mon Apr 13 2020 Emre Girgin 4.18.0-4 diff --git a/SPECS/ipset/ipset.spec b/SPECS/ipset/ipset.spec index 3d273049e46..7302986307f 100644 --- a/SPECS/ipset/ipset.spec +++ b/SPECS/ipset/ipset.spec @@ -75,7 +75,7 @@ rm -rf %{buildroot}/* %{_libdir}/pkgconfig/libipset.pc %changelog -* Sat May 09 00:20:42 PST 2020 Nick Samson - 7.1-2 +* Sat May 09 2020 Nick Samson - 7.1-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 7.1-1 diff --git a/SPECS/iptables/iptables.spec b/SPECS/iptables/iptables.spec index d3446e64540..ef5e4356bd6 100644 --- a/SPECS/iptables/iptables.spec +++ b/SPECS/iptables/iptables.spec @@ -98,7 +98,7 @@ rm -rf %{buildroot}/* * Thu Mar 11 2021 Rachel Menge - 1.8.3-4 - Add ssh brute force prevention to ip4save and ip6save - License verified -* Sat May 09 00:21:34 PST 2020 Nick Samson - 1.8.3-3 +* Sat May 09 2020 Nick Samson - 1.8.3-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.8.3-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/ipvsadm/ipvsadm.spec b/SPECS/ipvsadm/ipvsadm.spec index be3b719ea60..2bb6ac731d6 100644 --- a/SPECS/ipvsadm/ipvsadm.spec +++ b/SPECS/ipvsadm/ipvsadm.spec @@ -34,7 +34,7 @@ rm -rf %{buildroot}/* %{_mandir}/* %changelog -* Sat May 09 00:20:53 PST 2020 Nick Samson - 1.29-5 +* Sat May 09 2020 Nick Samson - 1.29-5 - Added %%license line automatically * Thu Apr 30 2020 Nicolas Ontiveros 1.29-4 diff --git a/SPECS/ipxe/ipxe.spec b/SPECS/ipxe/ipxe.spec index 8b4ced11ce9..0f77e8cc160 100644 --- a/SPECS/ipxe/ipxe.spec +++ b/SPECS/ipxe/ipxe.spec @@ -62,7 +62,7 @@ install -vDm 644 src/bin/*.{rom,mrom} %{buildroot}/usr/share/ipxe/ /usr/share/ipxe/rtl8139.rom %changelog -* Sat May 09 00:21:22 PST 2020 Nick Samson - 1.20.1-3 +* Sat May 09 2020 Nick Samson - 1.20.1-3 - Added %%license line automatically * Mon May 04 2020 Emre Girgin 1.20.1-2 diff --git a/SPECS/irqbalance/irqbalance.spec b/SPECS/irqbalance/irqbalance.spec index 57585ce59bf..80098915f27 100644 --- a/SPECS/irqbalance/irqbalance.spec +++ b/SPECS/irqbalance/irqbalance.spec @@ -59,7 +59,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_datadir}/* %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 1.6.0-3 +* Sat May 09 2020 Nick Samson - 1.6.0-3 - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 1.6.0-2 diff --git a/SPECS/itstool/itstool.spec b/SPECS/itstool/itstool.spec index 4e64fcaca56..fafb2711a10 100644 --- a/SPECS/itstool/itstool.spec +++ b/SPECS/itstool/itstool.spec @@ -37,7 +37,7 @@ make DESTDIR=%{buildroot} install /usr/share/%{name}/* %{_mandir}/man1/* %changelog -* Sat May 09 00:20:54 PST 2020 Nick Samson - 2.0.6-3 +* Sat May 09 2020 Nick Samson - 2.0.6-3 - Added %%license line automatically * Tue May 05 2020 Emre Girgin 2.0.6-2 diff --git a/SPECS/jansson/jansson.spec b/SPECS/jansson/jansson.spec index 2f75d64e252..06a7a4954f6 100644 --- a/SPECS/jansson/jansson.spec +++ b/SPECS/jansson/jansson.spec @@ -58,7 +58,7 @@ rm -rf %{buildroot}/* %{_libdir}/pkgconfig/%{name}.pc %changelog -* Sat May 09 00:20:58 PST 2020 Nick Samson - 2.11-3 +* Sat May 09 2020 Nick Samson - 2.11-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.11-2 diff --git a/SPECS/jna/jna.spec b/SPECS/jna/jna.spec index f2fd2df700c..c0644327695 100644 --- a/SPECS/jna/jna.spec +++ b/SPECS/jna/jna.spec @@ -92,7 +92,7 @@ ant %changelog * Sun May 31 2020 Henry Beberman - 4.5.2-9 - Fix libffi static link in configure -* Sat May 09 00:20:54 PST 2020 Nick Samson - 4.5.2-8 +* Sat May 09 2020 Nick Samson - 4.5.2-8 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 4.5.2-7 - Renaming apache-ant to ant diff --git a/SPECS/jq/jq.spec b/SPECS/jq/jq.spec index 71a90ad5342..805d1db2a3b 100644 --- a/SPECS/jq/jq.spec +++ b/SPECS/jq/jq.spec @@ -64,7 +64,7 @@ rm -rf %{buildroot}/* %{_includedir}/* %changelog -* Sat May 09 00:21:44 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.5-5 diff --git a/SPECS/kbd/kbd.spec b/SPECS/kbd/kbd.spec index 670c26851cf..d58ce699e06 100644 --- a/SPECS/kbd/kbd.spec +++ b/SPECS/kbd/kbd.spec @@ -51,7 +51,7 @@ make %{?_smp_mflags} check %{_mandir}/*/* %changelog -* Sat May 09 00:20:58 PST 2020 Nick Samson - 2.0.4-5 +* Sat May 09 2020 Nick Samson - 2.0.4-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.0.4-4 diff --git a/SPECS/kmod/kmod.spec b/SPECS/kmod/kmod.spec index 01eb0ebcf7f..f2ad662a9e9 100644 --- a/SPECS/kmod/kmod.spec +++ b/SPECS/kmod/kmod.spec @@ -60,7 +60,7 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/*.so %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 25-4 +* Sat May 09 2020 Nick Samson - 25-4 - Added %%license line automatically * Tue Jan 21 2020 Andrew Phelps 25-3 diff --git a/SPECS/krb5/krb5.spec b/SPECS/krb5/krb5.spec index 815f7f3dfce..399a9b149c6 100644 --- a/SPECS/krb5/krb5.spec +++ b/SPECS/krb5/krb5.spec @@ -124,9 +124,9 @@ rm -rf %{buildroot}/* %changelog * Mon Oct 19 2020 Andrew Phelps - 1.17-4 - Fix check tests by adding iana-etc which supplies required /etc/services file -* Fri Jul 31 12:53:00 PST 2020 Leandro Pereira - 1.17-3 +* Fri Jul 31 2020 Leandro Pereira - 1.17-3 - Don't stomp on CPPFLAGS -* Sat May 09 00:21:22 PST 2020 Nick Samson - 1.17-2 +* Sat May 09 2020 Nick Samson - 1.17-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 1.17-1 diff --git a/SPECS/lapack/lapack.spec b/SPECS/lapack/lapack.spec index 7ed7546defc..41aa09b27fe 100644 --- a/SPECS/lapack/lapack.spec +++ b/SPECS/lapack/lapack.spec @@ -68,7 +68,7 @@ mv %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/lapacke/. %exclude %{_libdir}/cmake/* %changelog -* Sat May 09 00:20:43 PST 2020 Nick Samson - 3.8.0-3 +* Sat May 09 2020 Nick Samson - 3.8.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.8.0-2 diff --git a/SPECS/less/less.spec b/SPECS/less/less.spec index 1f353f9781e..ac82525ad1b 100644 --- a/SPECS/less/less.spec +++ b/SPECS/less/less.spec @@ -34,7 +34,7 @@ make DESTDIR=%{buildroot} install %{_mandir}/*/* %changelog -* Sat May 09 00:20:49 PST 2020 Nick Samson - 530-2 +* Sat May 09 2020 Nick Samson - 530-2 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 530-2 diff --git a/SPECS/libassuan/libassuan.spec b/SPECS/libassuan/libassuan.spec index 7565c3898f1..b731c595dfe 100644 --- a/SPECS/libassuan/libassuan.spec +++ b/SPECS/libassuan/libassuan.spec @@ -41,7 +41,7 @@ make %{?_smp_mflags} check %{_libdir}/*.so* %{_datadir}/aclocal/* %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 2.5.1-3 +* Sat May 09 2020 Nick Samson - 2.5.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.5.1-2 diff --git a/SPECS/libatomic_ops/libatomic_ops.spec b/SPECS/libatomic_ops/libatomic_ops.spec index dfff7f78bee..eacd9e70f7a 100644 --- a/SPECS/libatomic_ops/libatomic_ops.spec +++ b/SPECS/libatomic_ops/libatomic_ops.spec @@ -66,7 +66,7 @@ rm -rf %{buildroot}/* %{_libdir}/pkgconfig/atomic_ops.pc %changelog -* Sat May 09 00:21:13 PST 2020 Nick Samson - 7.6.6-3 +* Sat May 09 2020 Nick Samson - 7.6.6-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 7.6.6-2 diff --git a/SPECS/libcap/libcap.spec b/SPECS/libcap/libcap.spec index 59bfc1f2d5a..c0ffae3c075 100644 --- a/SPECS/libcap/libcap.spec +++ b/SPECS/libcap/libcap.spec @@ -54,7 +54,7 @@ sed -i "s|pass_capsh --chroot=\$(/bin/pwd) ==||g" quicktest.sh %{_mandir}/man3/* %changelog -* Sat May 09 00:21:44 PST 2020 Nick Samson - 2.26-2 +* Sat May 09 2020 Nick Samson - 2.26-2 - Added %%license line automatically * Mon Mar 16 2020 Andrew Phelps 2.26-1 diff --git a/SPECS/libconfig/libconfig.spec b/SPECS/libconfig/libconfig.spec index 6fb97d828bc..babbd77c53d 100644 --- a/SPECS/libconfig/libconfig.spec +++ b/SPECS/libconfig/libconfig.spec @@ -49,7 +49,7 @@ cd .. %{_libdir}/cmake/libconfig*/*.cmake %changelog -* Sat May 09 00:21:35 PST 2020 Nick Samson - 1.7.2-2 +* Sat May 09 2020 Nick Samson - 1.7.2-2 - Added %%license line automatically * Mon Apr 20 2020 Nick Samson 1.7.2-1 diff --git a/SPECS/libdb/libdb.spec b/SPECS/libdb/libdb.spec index e847e2f82bc..c1885793464 100644 --- a/SPECS/libdb/libdb.spec +++ b/SPECS/libdb/libdb.spec @@ -67,7 +67,7 @@ rm -rf %{buildroot} %{_includedir}/* %changelog -* Sat May 09 00:20:43 PST 2020 Nick Samson - 5.3.28-4 +* Sat May 09 2020 Nick Samson - 5.3.28-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 5.3.28-3 diff --git a/SPECS/libdnet/libdnet.spec b/SPECS/libdnet/libdnet.spec index eb099195428..4e3c5bb13c5 100644 --- a/SPECS/libdnet/libdnet.spec +++ b/SPECS/libdnet/libdnet.spec @@ -51,7 +51,7 @@ make %{?_smp_mflags} check %{_libdir}/libdnet.a %changelog -* Sat May 09 00:21:38 PST 2020 Nick Samson - 1.12-2 +* Sat May 09 2020 Nick Samson - 1.12-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 1.12-1 diff --git a/SPECS/libev/libev.spec b/SPECS/libev/libev.spec index b75b85ea79e..22b9cfdae1f 100644 --- a/SPECS/libev/libev.spec +++ b/SPECS/libev/libev.spec @@ -49,7 +49,7 @@ make %{?_smp_mflags} -k check %{_libdir}/*.so %changelog -* Sat May 09 00:21:43 PST 2020 Nick Samson - 4.24-4 +* Sat May 09 2020 Nick Samson - 4.24-4 - Added %%license line automatically * Wed Apr 08 2020 Joe Schmitt 4.24-3 diff --git a/SPECS/libevent/libevent.spec b/SPECS/libevent/libevent.spec index b602fb7f2ff..2282734f7a0 100644 --- a/SPECS/libevent/libevent.spec +++ b/SPECS/libevent/libevent.spec @@ -59,7 +59,7 @@ make %{?_smp_mflags} -k check %{_libdir}/pkgconfig/libevent_extra.pc %changelog -* Sat May 09 00:21:17 PST 2020 Nick Samson - 2.1.8-3 +* Sat May 09 2020 Nick Samson - 2.1.8-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.1.8-2 diff --git a/SPECS/libfastjson/libfastjson.spec b/SPECS/libfastjson/libfastjson.spec index ea31d0a2555..28375f81c06 100644 --- a/SPECS/libfastjson/libfastjson.spec +++ b/SPECS/libfastjson/libfastjson.spec @@ -54,7 +54,7 @@ make check %changelog -* Sat May 09 00:21:44 PST 2020 Nick Samson - 0.99.8-4 +* Sat May 09 2020 Nick Samson - 0.99.8-4 - Added %%license line automatically * Tue Apr 21 2020 Eric Li 0.99.8-3 diff --git a/SPECS/libgpg-error/libgpg-error.spec b/SPECS/libgpg-error/libgpg-error.spec index c8acf090d0c..7c054b13a5a 100644 --- a/SPECS/libgpg-error/libgpg-error.spec +++ b/SPECS/libgpg-error/libgpg-error.spec @@ -71,7 +71,7 @@ make %{?_smp_mflags} check %defattr(-,root,root) %changelog -* Sat May 09 00:21:43 PST 2020 Nick Samson - 1.32-4 +* Sat May 09 2020 Nick Samson - 1.32-4 - Added %%license line automatically * Thu Apr 23 2020 Nick Samson 1.32-3 diff --git a/SPECS/libgssglue/libgssglue.spec b/SPECS/libgssglue/libgssglue.spec index 61867443813..a9e3bfbc8ca 100644 --- a/SPECS/libgssglue/libgssglue.spec +++ b/SPECS/libgssglue/libgssglue.spec @@ -44,7 +44,7 @@ find %{buildroot}/%{_libdir} -name '*.la' -delete %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:21:01 PST 2020 Nick Samson - 0.4-5 +* Sat May 09 2020 Nick Samson - 0.4-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.4-4 diff --git a/SPECS/libgsystem/libgsystem.spec b/SPECS/libgsystem/libgsystem.spec index a0b6baad877..61688c406cf 100644 --- a/SPECS/libgsystem/libgsystem.spec +++ b/SPECS/libgsystem/libgsystem.spec @@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gir-*/*.gir %changelog -* Sat May 09 00:20:37 PST 2020 Nick Samson - 2015.2-5 +* Sat May 09 2020 Nick Samson - 2015.2-5 - Added %%license line automatically * Wed Apr 08 2020 Pawel Winogrodzki 2015.2-4 diff --git a/SPECS/libgudev/libgudev.spec b/SPECS/libgudev/libgudev.spec index 334976873ba..09ea33d1098 100644 --- a/SPECS/libgudev/libgudev.spec +++ b/SPECS/libgudev/libgudev.spec @@ -59,7 +59,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_libdir}/pkgconfig/gudev-1.0.pc %changelog -* Sat May 09 00:21:28 PST 2020 Nick Samson - 232-4 +* Sat May 09 2020 Nick Samson - 232-4 - Added %%license line automatically * Mon Apr 13 2020 Eric Li 232-3 diff --git a/SPECS/libjpeg-turbo/libjpeg-turbo.spec b/SPECS/libjpeg-turbo/libjpeg-turbo.spec index 1afb36355f9..83e17754de3 100644 --- a/SPECS/libjpeg-turbo/libjpeg-turbo.spec +++ b/SPECS/libjpeg-turbo/libjpeg-turbo.spec @@ -62,7 +62,7 @@ make DESTDIR=%{buildroot} install %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:20:53 PST 2020 Nick Samson - 2.0.0-6 +* Sat May 09 2020 Nick Samson - 2.0.0-6 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.0.0-5 diff --git a/SPECS/libksba/libksba.spec b/SPECS/libksba/libksba.spec index 7752b7a6584..6d77d13ae4e 100644 --- a/SPECS/libksba/libksba.spec +++ b/SPECS/libksba/libksba.spec @@ -46,7 +46,7 @@ make %{?_smp_mflags} -k check %exclude %{_datadir}/info/dir %changelog -* Sat May 09 00:20:39 PST 2020 Nick Samson - 1.3.5-3 +* Sat May 09 2020 Nick Samson - 1.3.5-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.3.5-2 diff --git a/SPECS/libmbim/libmbim.spec b/SPECS/libmbim/libmbim.spec index b5ae9813d19..c6e377856b8 100644 --- a/SPECS/libmbim/libmbim.spec +++ b/SPECS/libmbim/libmbim.spec @@ -55,7 +55,7 @@ make %{?_smp_mflags} check %{_datadir}/gtk-doc/* %changelog -* Sat May 09 00:21:05 PST 2020 Nick Samson - 1.18.2-2 +* Sat May 09 2020 Nick Samson - 1.18.2-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 1.18.2-1 diff --git a/SPECS/libmnl/libmnl.spec b/SPECS/libmnl/libmnl.spec index 901058844bf..6b1dba72727 100644 --- a/SPECS/libmnl/libmnl.spec +++ b/SPECS/libmnl/libmnl.spec @@ -55,7 +55,7 @@ rm -rf %{buildroot}/* %{_libdir}/pkgconfig/* %changelog -* Sat May 09 00:20:39 PST 2020 Nick Samson - 1.0.4-5 +* Sat May 09 2020 Nick Samson - 1.0.4-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.0.4-4 diff --git a/SPECS/libmpc/libmpc.spec b/SPECS/libmpc/libmpc.spec index e21e0c76a4d..4803498538b 100644 --- a/SPECS/libmpc/libmpc.spec +++ b/SPECS/libmpc/libmpc.spec @@ -44,7 +44,7 @@ make %{?_smp_mflags} check %{_libdir}/*.so.* %changelog -* Sat May 09 00:20:44 PST 2020 Nick Samson - 1.1.0-5 +* Sat May 09 2020 Nick Samson - 1.1.0-5 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.1.0-4 diff --git a/SPECS/libmspack/libmspack.spec b/SPECS/libmspack/libmspack.spec index fe7281bcd39..000afce61a6 100644 --- a/SPECS/libmspack/libmspack.spec +++ b/SPECS/libmspack/libmspack.spec @@ -53,7 +53,7 @@ cd test %{_libdir}/*.so %changelog -* Sat May 09 00:21:33 PST 2020 Nick Samson - 0.7.1alpha-3 +* Sat May 09 2020 Nick Samson - 0.7.1alpha-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.7.1alpha-2 diff --git a/SPECS/libnetfilter_conntrack/libnetfilter_conntrack.spec b/SPECS/libnetfilter_conntrack/libnetfilter_conntrack.spec index aeace18b6e6..b3b7fa3ba0f 100644 --- a/SPECS/libnetfilter_conntrack/libnetfilter_conntrack.spec +++ b/SPECS/libnetfilter_conntrack/libnetfilter_conntrack.spec @@ -53,7 +53,7 @@ make %{?_smp_mflags} %{_libdir}/*.la %changelog -* Sat May 09 00:21:18 PST 2020 Nick Samson - 1.0.7-4 +* Sat May 09 2020 Nick Samson - 1.0.7-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.0.7-3 diff --git a/SPECS/libnetfilter_cthelper/libnetfilter_cthelper.spec b/SPECS/libnetfilter_cthelper/libnetfilter_cthelper.spec index fd85a09245a..cf91cea4393 100644 --- a/SPECS/libnetfilter_cthelper/libnetfilter_cthelper.spec +++ b/SPECS/libnetfilter_cthelper/libnetfilter_cthelper.spec @@ -54,7 +54,7 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' %{_libdir}/*.so %changelog -* Sat May 09 00:20:44 PST 2020 Nick Samson - 1.0.0-4 +* Sat May 09 2020 Nick Samson - 1.0.0-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.0.0-3 diff --git a/SPECS/libnetfilter_cttimeout/libnetfilter_cttimeout.spec b/SPECS/libnetfilter_cttimeout/libnetfilter_cttimeout.spec index e2950b3fe3b..edad82b6576 100644 --- a/SPECS/libnetfilter_cttimeout/libnetfilter_cttimeout.spec +++ b/SPECS/libnetfilter_cttimeout/libnetfilter_cttimeout.spec @@ -53,7 +53,7 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' %{_libdir}/*.so %changelog -* Sat May 09 00:21:31 PST 2020 Nick Samson - 1.0.0-4 +* Sat May 09 2020 Nick Samson - 1.0.0-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.0.0-3 diff --git a/SPECS/libnetfilter_queue/libnetfilter_queue.spec b/SPECS/libnetfilter_queue/libnetfilter_queue.spec index ae96c13137c..bbbc51b976f 100644 --- a/SPECS/libnetfilter_queue/libnetfilter_queue.spec +++ b/SPECS/libnetfilter_queue/libnetfilter_queue.spec @@ -54,7 +54,7 @@ make %{?_smp_mflags} %{_libdir}/*.la %changelog -* Sat May 09 00:21:27 PST 2020 Nick Samson - 1.0.3-4 +* Sat May 09 2020 Nick Samson - 1.0.3-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.0.3-3 diff --git a/SPECS/libnfnetlink/libnfnetlink.spec b/SPECS/libnfnetlink/libnfnetlink.spec index 618d632ab3e..18424f9d21a 100644 --- a/SPECS/libnfnetlink/libnfnetlink.spec +++ b/SPECS/libnfnetlink/libnfnetlink.spec @@ -51,7 +51,7 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' %{_libdir}/*.so %changelog -* Sat May 09 00:21:29 PST 2020 Nick Samson - 1.0.1-4 +* Sat May 09 2020 Nick Samson - 1.0.1-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.0.1-3 diff --git a/SPECS/libnftnl/libnftnl.spec b/SPECS/libnftnl/libnftnl.spec index 8bdf8fd8a1e..04e3a632c35 100644 --- a/SPECS/libnftnl/libnftnl.spec +++ b/SPECS/libnftnl/libnftnl.spec @@ -57,7 +57,7 @@ find %{buildroot} -name '*.la' -delete %{_includedir}/%{name} %changelog -* Sat May 09 00:21:00 PST 2020 Nick Samson - 1.1.1-3 +* Sat May 09 2020 Nick Samson - 1.1.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.1.1-2 diff --git a/SPECS/libnl3/libnl3.spec b/SPECS/libnl3/libnl3.spec index 071b063a545..e0915c99c53 100644 --- a/SPECS/libnl3/libnl3.spec +++ b/SPECS/libnl3/libnl3.spec @@ -75,7 +75,7 @@ make %{?_smp_mflags} check * Fri Aug 28 2020 Thomas Crain - 3.4.0-6 - Add pkg-config provides to devel package - License verified -* Sat May 09 00:21:15 PST 2020 Nick Samson - 3.4.0-5 +* Sat May 09 2020 Nick Samson - 3.4.0-5 - Added %%license line automatically * Thu Apr 30 2020 Nicolas Ontiveros - 3.4.0-4 - Rename from libnl to libnl3. diff --git a/SPECS/libnsl2/libnsl2.spec b/SPECS/libnsl2/libnsl2.spec index 18d35f5f27a..997cf607ab3 100644 --- a/SPECS/libnsl2/libnsl2.spec +++ b/SPECS/libnsl2/libnsl2.spec @@ -56,7 +56,7 @@ make install DESTDIR=%{buildroot} %{_libdir}/*.la %changelog -* Sat May 09 00:21:34 PST 2020 Nick Samson - 1.2.0-4 +* Sat May 09 2020 Nick Samson - 1.2.0-4 - Added %%license line automatically * Fri Apr 17 2020 Nicolas Ontiveros 1.2.0-3 diff --git a/SPECS/libpcap/libpcap.spec b/SPECS/libpcap/libpcap.spec index 5d6f90df4f3..b3a4893bec7 100644 --- a/SPECS/libpcap/libpcap.spec +++ b/SPECS/libpcap/libpcap.spec @@ -68,7 +68,7 @@ make DESTDIR=%{buildroot} install %{_mandir}/man7/* %changelog -* Sat May 09 00:20:50 PST 2020 Nick Samson - 1.9.1-2 +* Sat May 09 2020 Nick Samson - 1.9.1-2 - Added %%license line automatically * Fri May 01 2020 Pawel Winogrodzki 1.9.1-1 diff --git a/SPECS/libpng/libpng.spec b/SPECS/libpng/libpng.spec index 1794e95d33c..9248ac3a06b 100644 --- a/SPECS/libpng/libpng.spec +++ b/SPECS/libpng/libpng.spec @@ -66,7 +66,7 @@ make %{?_smp_mflags} -k check * Tue Jan 19 2021 Pawel Winogrodzki - 1.6.37-3 - Moved "Provides" for "pkgconfig(*)" to the correct (-devel) subpackage. -* Sat May 09 00:20:35 PST 2020 Nick Samson - 1.6.37-2 +* Sat May 09 2020 Nick Samson - 1.6.37-2 - Added %%license line automatically * Fri May 08 2020 Nick Samson - 1.6.37-1 diff --git a/SPECS/libqmi/libqmi.spec b/SPECS/libqmi/libqmi.spec index 4f5e05c7442..2bcdaa8a35e 100644 --- a/SPECS/libqmi/libqmi.spec +++ b/SPECS/libqmi/libqmi.spec @@ -56,7 +56,7 @@ make %{?_smp_mflags} check %{_datadir}/gtk-doc/* %changelog -* Sat May 09 00:21:37 PST 2020 Nick Samson - 1.22.4-2 +* Sat May 09 2020 Nick Samson - 1.22.4-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 1.22.4-1 diff --git a/SPECS/libseccomp/libseccomp.spec b/SPECS/libseccomp/libseccomp.spec index 406372a0ecd..215622d65c6 100644 --- a/SPECS/libseccomp/libseccomp.spec +++ b/SPECS/libseccomp/libseccomp.spec @@ -64,7 +64,7 @@ make check %{_mandir}/man3/* %changelog -* Sat May 09 00:21:43 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 2.4.1-1 diff --git a/SPECS/libselinux/libselinux.spec b/SPECS/libselinux/libselinux.spec index 3c0c917e9b1..26e3f0723b6 100644 --- a/SPECS/libselinux/libselinux.spec +++ b/SPECS/libselinux/libselinux.spec @@ -133,7 +133,7 @@ rm -rf %{buildroot} %{python3_sitelib}/* %changelog -* Sat May 09 00:21:01 PST 2020 Nick Samson - 2.9-3 +* Sat May 09 2020 Nick Samson - 2.9-3 - Added %%license line automatically * Tue Mar 24 2020 Henry Beberman 2.9-2 diff --git a/SPECS/libsepol/libsepol.spec b/SPECS/libsepol/libsepol.spec index eb7148265af..195ca103a41 100644 --- a/SPECS/libsepol/libsepol.spec +++ b/SPECS/libsepol/libsepol.spec @@ -98,7 +98,7 @@ exit 0 - Remove unused "systemd-bootstrap" from requires. * Fri May 29 2020 Nicolas Ontiveros 2.9-4 - Use "systemd-bootstrap" to break circular dependencies. -* Sat May 09 00:21:36 PST 2020 Nick Samson 2.9-3 +* Sat May 09 2020 Nick Samson 2.9-3 - Added %%license line automatically * Tue Mar 24 2020 Henry Beberman 2.9-2 - Add cflags to make to fix gcc9 compatibility. diff --git a/SPECS/libsigc++20/libsigc++20.spec b/SPECS/libsigc++20/libsigc++20.spec index 7c40b6b2ac9..7147ef8bafa 100644 --- a/SPECS/libsigc++20/libsigc++20.spec +++ b/SPECS/libsigc++20/libsigc++20.spec @@ -45,7 +45,7 @@ make %{?_smp_mflags} check %{_datadir}/* %changelog -* Sat May 09 00:20:34 PST 2020 Nick Samson - 2.10.0-6 +* Sat May 09 2020 Nick Samson - 2.10.0-6 - Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 2.10.0-5 diff --git a/SPECS/libsoup/libsoup.spec b/SPECS/libsoup/libsoup.spec index d75f917b3c0..5c394f028f3 100644 --- a/SPECS/libsoup/libsoup.spec +++ b/SPECS/libsoup/libsoup.spec @@ -101,7 +101,7 @@ make check %defattr(-,root,root) %changelog -* Sat May 09 00:21:16 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Apr 21 2020 Eric Li 2.64.0-4 diff --git a/SPECS/libssh2/libssh2.spec b/SPECS/libssh2/libssh2.spec index 3a276084c9e..52818bed6f3 100644 --- a/SPECS/libssh2/libssh2.spec +++ b/SPECS/libssh2/libssh2.spec @@ -64,7 +64,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' - Update to version 1.9.0 * Tue May 12 2020 Paul Monson 1.8.0-4 - Remove support for MD5, RIPEMD, BF, RC4, CAST, and DES -* Sat May 09 00:20:35 PST 2020 Nick Samson - 1.8.0-4 +* Sat May 09 2020 Nick Samson - 1.8.0-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.8.0-3 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/libtar/libtar.spec b/SPECS/libtar/libtar.spec index 893d3eb5368..ddbfabc99b3 100644 --- a/SPECS/libtar/libtar.spec +++ b/SPECS/libtar/libtar.spec @@ -59,7 +59,7 @@ chmod +x %{buildroot}/%{_libdir}/libtar.so.* %{_libdir}/libtar.la %changelog -* Sat May 09 00:21:30 PST 2020 Nick Samson - 1.2.20-8 +* Sat May 09 2020 Nick Samson - 1.2.20-8 - Added %%license line automatically * Thu Apr 23 2020 Nick Samson 1.2.20-7 diff --git a/SPECS/libtasn1/libtasn1.spec b/SPECS/libtasn1/libtasn1.spec index 1a9aa471f16..5c6aab143c6 100644 --- a/SPECS/libtasn1/libtasn1.spec +++ b/SPECS/libtasn1/libtasn1.spec @@ -55,7 +55,7 @@ make %{?_smp_mflags} check %{_mandir}/man3/* %changelog -* Sat May 09 00:20:53 PST 2020 Nick Samson - 4.14-2 +* Sat May 09 2020 Nick Samson - 4.14-2 - Added %%license line automatically * Wed Apr 22 2020 Nicolas Ontiveros 4.14-1 diff --git a/SPECS/libtirpc/libtirpc.spec b/SPECS/libtirpc/libtirpc.spec index 0e378d07ca7..514d48e22bf 100644 --- a/SPECS/libtirpc/libtirpc.spec +++ b/SPECS/libtirpc/libtirpc.spec @@ -68,7 +68,7 @@ make install DESTDIR=%{buildroot} %{_libdir}/*.la %changelog -* Sat May 09 00:20:39 PST 2020 Nick Samson - 1.1.4-4 +* Sat May 09 2020 Nick Samson - 1.1.4-4 - Added %%license line automatically * Wed Apr 08 2020 Pawel Winogrodzki 1.1.4-3 diff --git a/SPECS/libtool/libtool.spec b/SPECS/libtool/libtool.spec index 8fee3397564..0152165f585 100644 --- a/SPECS/libtool/libtool.spec +++ b/SPECS/libtool/libtool.spec @@ -79,7 +79,7 @@ make %{?_smp_mflags} check %{_libdir}/libltdl.so.7.3.1 %changelog -* Sat May 09 00:21:36 PST 2020 Nick Samson - 2.4.6-5 +* Sat May 09 2020 Nick Samson - 2.4.6-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.4.6-4 diff --git a/SPECS/libunwind/libunwind.spec b/SPECS/libunwind/libunwind.spec index b0e228c3403..94fa247d6c0 100644 --- a/SPECS/libunwind/libunwind.spec +++ b/SPECS/libunwind/libunwind.spec @@ -44,7 +44,7 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/pkgconfig/libunwind* %changelog -* Sat May 09 00:21:12 PST 2020 Nick Samson - 1.2-4 +* Sat May 09 2020 Nick Samson - 1.2-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.2-3 diff --git a/SPECS/libusb/libusb.spec b/SPECS/libusb/libusb.spec index d026d7d47c7..c3de39346eb 100644 --- a/SPECS/libusb/libusb.spec +++ b/SPECS/libusb/libusb.spec @@ -55,7 +55,7 @@ popd %{_libdir}/pkgconfig/* %changelog -* Sat May 09 00:20:44 PST 2020 Nick Samson - 1.0.22-3 +* Sat May 09 2020 Nick Samson - 1.0.22-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.0.22-2 diff --git a/SPECS/libvirt/libvirt.spec b/SPECS/libvirt/libvirt.spec index a63ede26795..c82253d0da6 100644 --- a/SPECS/libvirt/libvirt.spec +++ b/SPECS/libvirt/libvirt.spec @@ -133,7 +133,7 @@ make check - Patch CVE-2020-25637 * Fri May 29 2020 Emre Girgin 6.1.0-1 - Upgrade to 6.1.0. -* Sat May 09 00:21:42 PST 2020 Nick Samson - 4.7.0-5 +* Sat May 09 2020 Nick Samson - 4.7.0-5 - Added %%license line automatically * Fri Apr 17 2020 Nicolas Ontiveros 4.7.0-4 - Rename libnl to libnl3. diff --git a/SPECS/libxslt/libxslt.spec b/SPECS/libxslt/libxslt.spec index 25d8071b186..95b92ac7316 100644 --- a/SPECS/libxslt/libxslt.spec +++ b/SPECS/libxslt/libxslt.spec @@ -73,7 +73,7 @@ rm -rf %{buildroot}/* - License verified. * Tue May 12 2020 Paul Monson 1.1.32-4 - Add patch for CVE-2019-5815 -* Sat May 09 00:21:44 PST 2020 Nick Samson - 1.1.32-3 +* Sat May 09 2020 Nick Samson - 1.1.32-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.1.32-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/libyaml/libyaml.spec b/SPECS/libyaml/libyaml.spec index 128948ff494..6945dca82bd 100644 --- a/SPECS/libyaml/libyaml.spec +++ b/SPECS/libyaml/libyaml.spec @@ -58,7 +58,7 @@ make %{?_smp_mflags} check %exclude %{_libdir}/*.la %changelog -* Sat May 09 00:20:44 PST 2020 Nick Samson - 0.2.1-3 +* Sat May 09 2020 Nick Samson - 0.2.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.2.1-2 diff --git a/SPECS/lldb/lldb.spec b/SPECS/lldb/lldb.spec index a20a0db4596..5c338451b8b 100644 --- a/SPECS/lldb/lldb.spec +++ b/SPECS/lldb/lldb.spec @@ -100,7 +100,7 @@ rm -rf %{buildroot}/* %changelog * Fri Jun 12 2020 Henry Beberman 8.0.1-3 - Temporarily disable generation of debug symbols. -* Sat May 09 00:21:04 PST 2020 Nick Samson - 8.0.1-2 +* Sat May 09 2020 Nick Samson - 8.0.1-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 8.0.1-1 - Update to 8.0.1. Source0 URL fixed. License verified. diff --git a/SPECS/llvm/llvm.spec b/SPECS/llvm/llvm.spec index a3c6f169b19..a9f77d0df6c 100644 --- a/SPECS/llvm/llvm.spec +++ b/SPECS/llvm/llvm.spec @@ -102,7 +102,7 @@ rm -rf %{buildroot}/* - Switch to ninja-build to use LLVM_PARALLEL_LINK_JOBS=1 to reduce - fatal OOM errors during linking phase. - Temporarily disable generation of debug symbols. -* Sat May 09 00:21:29 PST 2020 Nick Samson - 8.0.1-2 +* Sat May 09 2020 Nick Samson - 8.0.1-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 8.0.1-1 - Update to 8.0.1. URL Fixed. Source0 URL Fixed. License verified. diff --git a/SPECS/lmdb/lmdb.spec b/SPECS/lmdb/lmdb.spec index a944788f864..d3d009ff8c0 100644 --- a/SPECS/lmdb/lmdb.spec +++ b/SPECS/lmdb/lmdb.spec @@ -73,7 +73,7 @@ rm -rf %{buildroot}/* %{_libdir}/*.so %changelog -* Sat May 09 00:20:56 PST 2020 Nick Samson - 0.9.23-2 +* Sat May 09 2020 Nick Samson - 0.9.23-2 - Added %%license line automatically * Tue Mar 17 2020 Henry Beberman 0.9.23-1 diff --git a/SPECS/log4cpp/log4cpp.spec b/SPECS/log4cpp/log4cpp.spec index f92f6041c7d..8591469f09b 100644 --- a/SPECS/log4cpp/log4cpp.spec +++ b/SPECS/log4cpp/log4cpp.spec @@ -60,7 +60,7 @@ make DESTDIR=%{buildroot} install %_prefix/share/aclocal/*.m4 %changelog -* Sat May 09 00:21:30 PST 2020 Nick Samson - 1.1.3-6 +* Sat May 09 2020 Nick Samson - 1.1.3-6 - Added %%license line automatically * Mon May 04 2020 Emre Girgin 1.1.3-5 diff --git a/SPECS/logrotate/logrotate.spec b/SPECS/logrotate/logrotate.spec index 2b3564fd4ad..90a1dc065fb 100644 --- a/SPECS/logrotate/logrotate.spec +++ b/SPECS/logrotate/logrotate.spec @@ -48,7 +48,7 @@ touch %{buildroot}%{_localstatedir}/lib/logrotate/logrotate.status /var/lib/logrotate/logrotate.status %changelog -* Sat May 09 00:21:41 PST 2020 Nick Samson - 3.16.0-2 +* Sat May 09 2020 Nick Samson - 3.16.0-2 - Added %%license line automatically * Fri Apr 24 2020 Pawel Winogrodzki 3.16.0-1 diff --git a/SPECS/lshw/lshw.spec b/SPECS/lshw/lshw.spec index dbf48813219..c40e3334c52 100644 --- a/SPECS/lshw/lshw.spec +++ b/SPECS/lshw/lshw.spec @@ -42,7 +42,7 @@ make DESTDIR=%{buildroot} install /usr/share/* %changelog -* Sat May 09 00:21:24 PST 2020 Nick Samson - B.02.18-3 +* Sat May 09 2020 Nick Samson - B.02.18-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz B.02.18-2 diff --git a/SPECS/lsof/lsof.spec b/SPECS/lsof/lsof.spec index 8f6e2395330..8a075297521 100644 --- a/SPECS/lsof/lsof.spec +++ b/SPECS/lsof/lsof.spec @@ -39,7 +39,7 @@ install -v -m 0644 Lsof.8 %{buildroot}%{_mandir}/man8/lsof.8 %changelog * Wed Jul 01 2020 Henry Beberman - 4.93.2-3 - Fix license to point to 00README which contains the license. Removes false dependency on /bin/ksh -* Sat May 09 00:20:40 PST 2020 Nick Samson - 4.93.2-2 +* Sat May 09 2020 Nick Samson - 4.93.2-2 - Added %%license line automatically * Mon Apr 27 2020 Pawel Winogrodzki 4.93.2-1 - Bumping up the version to 4.93.2. diff --git a/SPECS/lsscsi/lsscsi.spec b/SPECS/lsscsi/lsscsi.spec index 849a2ac3d94..2542352b035 100644 --- a/SPECS/lsscsi/lsscsi.spec +++ b/SPECS/lsscsi/lsscsi.spec @@ -32,7 +32,7 @@ make %{?_smp_mflags} -k check %{_mandir}/* %changelog -* Sat May 09 00:21:07 PST 2020 Nick Samson - 0.30-3 +* Sat May 09 2020 Nick Samson - 0.30-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.30-2 diff --git a/SPECS/ltrace/ltrace.spec b/SPECS/ltrace/ltrace.spec index 1d76e28b1d2..bd6f66867d9 100644 --- a/SPECS/ltrace/ltrace.spec +++ b/SPECS/ltrace/ltrace.spec @@ -52,7 +52,7 @@ rm -rf %{buildroot}/* %{_bindir}/* %{_datadir} %changelog -* Sat May 09 00:21:21 PST 2020 Nick Samson - 0.7.3-6 +* Sat May 09 2020 Nick Samson - 0.7.3-6 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.7.3-5 diff --git a/SPECS/lvm2/lvm2.spec b/SPECS/lvm2/lvm2.spec index 8632fade8d1..55feb991858 100644 --- a/SPECS/lvm2/lvm2.spec +++ b/SPECS/lvm2/lvm2.spec @@ -304,7 +304,7 @@ echo "disable lvm2-lvmeatd.service" >> %{buildroot}%{_libdir}/systemd/system-pre - Remove systemd-bootstrap from Requires, which fixes chroot install issue. * Fri May 29 2020 Nicolas Ontiveros 2.03.05-4 - Use systemd-bootstrap to break circular dependencies. -* Sat May 09 00:20:52 PST 2020 Nick Samson 2.03.05-3 +* Sat May 09 2020 Nick Samson 2.03.05-3 - Added %%license line automatically * Wed Apr 08 2020 Nicolas Ontiveros 2.03.05-2 - Remove thin-provisioning-tools from build requires. diff --git a/SPECS/lzo/lzo.spec b/SPECS/lzo/lzo.spec index 96ae332780c..068d450fde3 100644 --- a/SPECS/lzo/lzo.spec +++ b/SPECS/lzo/lzo.spec @@ -93,7 +93,7 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/lzo2.pc %changelog -* Sat May 09 00:21:12 PST 2020 Nick Samson - 2.10-3 +* Sat May 09 2020 Nick Samson - 2.10-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.10-2 diff --git a/SPECS/m4/m4.spec b/SPECS/m4/m4.spec index c09532699ac..3f4a9d3421e 100644 --- a/SPECS/m4/m4.spec +++ b/SPECS/m4/m4.spec @@ -40,7 +40,7 @@ make %{?_smp_mflags} check %{_mandir}/*/* %changelog -* Sat May 09 00:21:28 PST 2020 Nick Samson - 1.4.18-4 +* Sat May 09 2020 Nick Samson - 1.4.18-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.4.18-3 diff --git a/SPECS/man-db/man-db.spec b/SPECS/man-db/man-db.spec index 69285e38aa7..cf04fd93f50 100644 --- a/SPECS/man-db/man-db.spec +++ b/SPECS/man-db/man-db.spec @@ -76,7 +76,7 @@ fi %{_libdir}/tmpfiles.d/man-db.conf %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Fri Apr 17 2020 Emre Girgin 2.8.4-4 diff --git a/SPECS/man-pages/man-pages.spec b/SPECS/man-pages/man-pages.spec index e85ec39b228..268586377a9 100644 --- a/SPECS/man-pages/man-pages.spec +++ b/SPECS/man-pages/man-pages.spec @@ -37,7 +37,7 @@ rm -vf %{buildroot}%{_mandir}/man5/passwd.5 %{_mandir}/man8/* %changelog -* Sat May 09 00:20:51 PST 2020 Nick Samson - 4.16-4 +* Sat May 09 2020 Nick Samson - 4.16-4 - Added %%license line automatically and updated licenses. * Wed Apr 15 2020 Nick Samson 4.16-3 diff --git a/SPECS/mc/mc.spec b/SPECS/mc/mc.spec index c963199a4e0..24fd3fede19 100644 --- a/SPECS/mc/mc.spec +++ b/SPECS/mc/mc.spec @@ -41,7 +41,7 @@ make %{?_smp_mflags} -k check %exclude /usr/src %changelog -* Sat May 09 00:21:37 PST 2020 Nick Samson - 4.8.21-4 +* Sat May 09 2020 Nick Samson - 4.8.21-4 - Added %%license line automatically * Tue Apr 21 2020 Eric Li 4.8.21-3 diff --git a/SPECS/mlocate/mlocate.spec b/SPECS/mlocate/mlocate.spec index e2c75125017..3b8e048f36a 100644 --- a/SPECS/mlocate/mlocate.spec +++ b/SPECS/mlocate/mlocate.spec @@ -48,7 +48,7 @@ mv %{buildroot}/%{_mandir}/man1/locate.1 %{buildroot}/%{_mandir}/man1/%{name}.1 %{_localstatedir}/* %changelog -* Sat May 09 00:20:54 PST 2020 Nick Samson - 0.26-4 +* Sat May 09 2020 Nick Samson - 0.26-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.26-3 diff --git a/SPECS/mpfr/mpfr.spec b/SPECS/mpfr/mpfr.spec index 2f77f2ad350..08b19ade1e6 100644 --- a/SPECS/mpfr/mpfr.spec +++ b/SPECS/mpfr/mpfr.spec @@ -65,7 +65,7 @@ make %{?_smp_mflags} check %{_docdir}/mpfr-%{version}/COPYING %changelog -* Sat May 09 00:20:52 PST 2020 Nick Samson - 4.0.1-3 +* Sat May 09 2020 Nick Samson - 4.0.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.0.1-2 diff --git a/SPECS/nano/nano.spec b/SPECS/nano/nano.spec index 99835bfbf9b..90113ec8781 100644 --- a/SPECS/nano/nano.spec +++ b/SPECS/nano/nano.spec @@ -53,7 +53,7 @@ make %{?_smp_mflags} check %{_datadir}/doc/%{name}-%{version}/* %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson - 3.0-3 +* Sat May 09 2020 Nick Samson - 3.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.0-2 diff --git a/SPECS/nasm/nasm.spec b/SPECS/nasm/nasm.spec index 1f82e1b7a1a..aef62e8e17a 100644 --- a/SPECS/nasm/nasm.spec +++ b/SPECS/nasm/nasm.spec @@ -27,7 +27,7 @@ make %{?_smp_mflags} -k test %{_bindir}/* %{_datadir}/* %changelog -* Sat May 09 00:21:14 PST 2020 Nick Samson - 2.13.03-5 +* Sat May 09 2020 Nick Samson - 2.13.03-5 - Added %%license line automatically * Mon May 04 2020 Emre Girgin 2.13.03-4 diff --git a/SPECS/net-snmp/net-snmp.spec b/SPECS/net-snmp/net-snmp.spec index 4e63bdd2fb2..14c4790f208 100644 --- a/SPECS/net-snmp/net-snmp.spec +++ b/SPECS/net-snmp/net-snmp.spec @@ -118,7 +118,7 @@ rm -rf %{buildroot}/* - Removed %%sha1 macro. - Updating whitespaces to fix issues reported by the linter. -* Sat May 09 00:20:48 PST 2020 Nick Samson - 5.8-4 +* Sat May 09 2020 Nick Samson - 5.8-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz - 5.8-3 diff --git a/SPECS/net-tools/net-tools.spec b/SPECS/net-tools/net-tools.spec index fcf7786a4d6..c221053e80e 100644 --- a/SPECS/net-tools/net-tools.spec +++ b/SPECS/net-tools/net-tools.spec @@ -105,7 +105,7 @@ rm -rf %{buildroot}/* %{_mandir}/man8/* %changelog -* Sat May 09 00:21:01 PST 2020 Nick Samson - 1.60-14 +* Sat May 09 2020 Nick Samson - 1.60-14 - Added %%license line automatically * Mon Apr 13 2020 Eric Li 1.60-13 diff --git a/SPECS/nettle/nettle.spec b/SPECS/nettle/nettle.spec index 541ddd4f069..46515f77461 100644 --- a/SPECS/nettle/nettle.spec +++ b/SPECS/nettle/nettle.spec @@ -65,7 +65,7 @@ make %{?_smp_mflags} check %changelog * Mon Apr 12 2021 Rachel Menge - 3.7.2-1 - Update to 3.7.2 for CVE-2021-20305 -* Sat May 09 00:20:58 PST 2020 Nick Samson - 3.4.1-2 +* Sat May 09 2020 Nick Samson - 3.4.1-2 - Added %%license line automatically * Mon Mar 16 2020 Henry Beberman 3.4.1-1 - Update to 3.4.1. Licence verified. diff --git a/SPECS/nghttp2/nghttp2.spec b/SPECS/nghttp2/nghttp2.spec index 7c263598974..31fdedfa0eb 100644 --- a/SPECS/nghttp2/nghttp2.spec +++ b/SPECS/nghttp2/nghttp2.spec @@ -63,7 +63,7 @@ rm %{buildroot}/%{_libdir}/*.la - License verified. - Removed %%sha1 macro. -* Sat May 09 00:20:46 PST 2020 Nick Samson - 1.33.0-3 +* Sat May 09 2020 Nick Samson - 1.33.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz - 1.33.0-2 diff --git a/SPECS/nginx/nginx.spec b/SPECS/nginx/nginx.spec index 65fbb727013..dd126f1bd27 100644 --- a/SPECS/nginx/nginx.spec +++ b/SPECS/nginx/nginx.spec @@ -86,7 +86,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_lib}/systemd/system/nginx.service - Used autosetup - Added patch to resolve CVE-2019-20372 -* Sat May 09 00:21:09 PST 2020 Nick Samson - 1.16.1-2 +* Sat May 09 2020 Nick Samson - 1.16.1-2 - Added %%license line automatically * Fri Mar 13 2020 Paul Monson 1.16.1-1 diff --git a/SPECS/nodejs/nodejs-8.11.4.spec b/SPECS/nodejs/nodejs-8.11.4.spec index 2357171bc8b..9366aa0c1fc 100644 --- a/SPECS/nodejs/nodejs-8.11.4.spec +++ b/SPECS/nodejs/nodejs-8.11.4.spec @@ -75,7 +75,7 @@ make cctest %{_datadir}/systemtap/tapset/node.stp %changelog -* Sat May 09 00:21:43 PST 2020 Nick Samson - 8.11.4-7 +* Sat May 09 2020 Nick Samson - 8.11.4-7 - Added %%license line automatically * Mon May 04 2020 Paul Monson 8.11.4-6 - Add patch that enables building openssl without TLS versions less 1.2 diff --git a/SPECS/nodejs/nodejs-9.11.2.spec b/SPECS/nodejs/nodejs-9.11.2.spec index 253cc264097..4225218a1fe 100644 --- a/SPECS/nodejs/nodejs-9.11.2.spec +++ b/SPECS/nodejs/nodejs-9.11.2.spec @@ -75,7 +75,7 @@ make cctest %{_datadir}/systemtap/tapset/node.stp %changelog -* Sat May 09 00:21:42 PST 2020 Nick Samson - 9.11.2-7 +* Sat May 09 2020 Nick Samson - 9.11.2-7 - Added %%license line automatically * Mon May 04 2020 Paul Monson 9.11.2-6 - Add patch that enables building openssl without TLS versions less 1.2 diff --git a/SPECS/npth/npth.spec b/SPECS/npth/npth.spec index 8c2fb6cd0ca..dae3b4f0be1 100644 --- a/SPECS/npth/npth.spec +++ b/SPECS/npth/npth.spec @@ -58,7 +58,7 @@ make %{?_smp_mflags} -k check %{_datadir}/aclocal/* %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson - 1.6-3 +* Sat May 09 2020 Nick Samson - 1.6-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.6-2 diff --git a/SPECS/nspr/nspr.spec b/SPECS/nspr/nspr.spec index e8905e3a9e7..9f65c9b121c 100644 --- a/SPECS/nspr/nspr.spec +++ b/SPECS/nspr/nspr.spec @@ -58,7 +58,7 @@ make DESTDIR=%{buildroot} install %{_datarootdir}/aclocal/* %changelog -* Sat May 09 00:21:34 PST 2020 Nick Samson - 4.21-2 +* Sat May 09 2020 Nick Samson - 4.21-2 - Added %%license line automatically * Tue Mar 17 2020 Andrew Phelps 4.21-1 diff --git a/SPECS/nss-altfiles/nss-altfiles.spec b/SPECS/nss-altfiles/nss-altfiles.spec index a4adfa2a178..47eaf228e6b 100644 --- a/SPECS/nss-altfiles/nss-altfiles.spec +++ b/SPECS/nss-altfiles/nss-altfiles.spec @@ -37,7 +37,7 @@ rm -rf %{buildroot}%{_infodir} %{_libdir}/*.so.* %changelog -* Sat May 09 00:21:33 PST 2020 Nick Samson - 2.23.0-4 +* Sat May 09 2020 Nick Samson - 2.23.0-4 - Added %%license line automatically * Tue Apr 07 2020 Paul Monson 2.23.0-3 diff --git a/SPECS/ntp/ntp.spec b/SPECS/ntp/ntp.spec index ec2d5e33a1f..3011a02a3d6 100644 --- a/SPECS/ntp/ntp.spec +++ b/SPECS/ntp/ntp.spec @@ -177,7 +177,7 @@ rm -rf %{buildroot}/* %{_mandir}/man8/ntpstat.8* %changelog -* Sat May 09 00:21:37 PST 2020 Nick Samson - 4.2.8p13-3 +* Sat May 09 2020 Nick Samson - 4.2.8p13-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.2.8p13-2 diff --git a/SPECS/nvme-cli/nvme-cli.spec b/SPECS/nvme-cli/nvme-cli.spec index 013aa85a1e0..9ee12144d1f 100644 --- a/SPECS/nvme-cli/nvme-cli.spec +++ b/SPECS/nvme-cli/nvme-cli.spec @@ -30,7 +30,7 @@ make install PREFIX=%{_prefix} DESTDIR=%{buildroot} %{_mandir}/man1/* %changelog -* Sat May 09 00:20:54 PST 2020 Nick Samson - 1.8.1-3 +* Sat May 09 2020 Nick Samson - 1.8.1-3 - Added %%license line automatically * Tue Mar 24 2020 Paul Monson 1.8.1-2 diff --git a/SPECS/openldap/openldap.spec b/SPECS/openldap/openldap.spec index 3589272ef01..a28aa28b035 100644 --- a/SPECS/openldap/openldap.spec +++ b/SPECS/openldap/openldap.spec @@ -93,7 +93,7 @@ rm -rf %{buildroot}/* - Upgrade to version 2.4.50, which resolves CVE-2020-12243. * Tue May 12 2020 Nicolas Ontiveros 2.4.48-1 - Upgrade to version 2.4.48, which fixes CVE-2019-13057 and CVE-2019-13565. -* Sat May 09 00:20:53 PST 2020 Nick Samson - 2.4.46-6 +* Sat May 09 2020 Nick Samson - 2.4.46-6 - Added %%license line automatically * Thu Apr 23 2020 Pawel Winogrodzki 2.4.46-5 - License verified. diff --git a/SPECS/openscap/openscap.spec b/SPECS/openscap/openscap.spec index 0800594bd7b..7991a823eff 100644 --- a/SPECS/openscap/openscap.spec +++ b/SPECS/openscap/openscap.spec @@ -102,7 +102,7 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/python2.7/* %changelog -* Sat May 09 00:20:55 PST 2020 Nick Samson - 1.3.1-3 +* Sat May 09 2020 Nick Samson - 1.3.1-3 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.3.1-2 diff --git a/SPECS/openvswitch/openvswitch.spec b/SPECS/openvswitch/openvswitch.spec index 1c335b9f624..36e4d44e71e 100644 --- a/SPECS/openvswitch/openvswitch.spec +++ b/SPECS/openvswitch/openvswitch.spec @@ -298,7 +298,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} * Mon Feb 22 2021 Emre Girgin - 2.12.0-3 - Fix CVE-2020-35498. -* Sat May 09 00:21:27 PST 2020 Nick Samson - 2.12.0-2 +* Sat May 09 2020 Nick Samson - 2.12.0-2 - Added %%license line automatically * Tue Mar 31 2020 Henry Beberman 2.12.0-1 diff --git a/SPECS/pciutils/pciutils.spec b/SPECS/pciutils/pciutils.spec index 35dcaaade12..15f264c796d 100644 --- a/SPECS/pciutils/pciutils.spec +++ b/SPECS/pciutils/pciutils.spec @@ -53,7 +53,7 @@ rm -rf %{buildroot}/* %{_includedir}/* %changelog -* Sat May 09 00:21:41 PST 2020 Nick Samson - 3.6.2-3 +* Sat May 09 2020 Nick Samson - 3.6.2-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.6.2-2 diff --git a/SPECS/perl-Canary-Stability/perl-Canary-Stability.spec b/SPECS/perl-Canary-Stability/perl-Canary-Stability.spec index d7abba3daa1..30391cd4e0d 100644 --- a/SPECS/perl-Canary-Stability/perl-Canary-Stability.spec +++ b/SPECS/perl-Canary-Stability/perl-Canary-Stability.spec @@ -41,7 +41,7 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 2012-4 +* Sat May 09 2020 Nick Samson - 2012-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2012-3 diff --git a/SPECS/perl-DBD-SQLite/perl-DBD-SQLite.spec b/SPECS/perl-DBD-SQLite/perl-DBD-SQLite.spec index 98badb6749b..56a391dd468 100644 --- a/SPECS/perl-DBD-SQLite/perl-DBD-SQLite.spec +++ b/SPECS/perl-DBD-SQLite/perl-DBD-SQLite.spec @@ -46,7 +46,7 @@ make test %{_mandir}/man3/* %changelog -* Sat May 09 00:20:39 PST 2020 Nick Samson - 1.62-3 +* Sat May 09 2020 Nick Samson - 1.62-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.62-2 diff --git a/SPECS/perl-DBI/perl-DBI.spec b/SPECS/perl-DBI/perl-DBI.spec index 5750dd476ff..750c388dd06 100644 --- a/SPECS/perl-DBI/perl-DBI.spec +++ b/SPECS/perl-DBI/perl-DBI.spec @@ -87,7 +87,7 @@ make test %{_mandir}/man3/*.3* %changelog -* Sat May 09 00:21:23 PST 2020 Nick Samson - 1.641-3 +* Sat May 09 2020 Nick Samson - 1.641-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.641-2 diff --git a/SPECS/perl-Exporter-Tiny/perl-Exporter-Tiny.spec b/SPECS/perl-Exporter-Tiny/perl-Exporter-Tiny.spec index b39b70e3c34..b46b7388c60 100644 --- a/SPECS/perl-Exporter-Tiny/perl-Exporter-Tiny.spec +++ b/SPECS/perl-Exporter-Tiny/perl-Exporter-Tiny.spec @@ -56,7 +56,7 @@ rm -rf %{buildroot} %{_mandir}/man3/Exporter::Tiny::Manual* %changelog -* Sat May 09 00:21:23 PST 2020 Nick Samson - 1.002001-3 +* Sat May 09 2020 Nick Samson - 1.002001-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.002001-2 diff --git a/SPECS/perl-File-HomeDir/perl-File-HomeDir.spec b/SPECS/perl-File-HomeDir/perl-File-HomeDir.spec index 6be112e8496..fbff18a9c3e 100644 --- a/SPECS/perl-File-HomeDir/perl-File-HomeDir.spec +++ b/SPECS/perl-File-HomeDir/perl-File-HomeDir.spec @@ -59,7 +59,7 @@ make test %{_mandir}/man3/File::HomeDir::Windows.3.gz %changelog -* Sat May 09 00:21:38 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.004-2 diff --git a/SPECS/perl-File-Which/perl-File-Which.spec b/SPECS/perl-File-Which/perl-File-Which.spec index 8608cac820b..ff11915ccbe 100644 --- a/SPECS/perl-File-Which/perl-File-Which.spec +++ b/SPECS/perl-File-Which/perl-File-Which.spec @@ -53,7 +53,7 @@ make test %changelog -* Sat May 09 00:21:42 PST 2020 Nick Samson - 1.22-3 +* Sat May 09 2020 Nick Samson - 1.22-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.22-2 diff --git a/SPECS/perl-JSON-Any/perl-JSON-Any.spec b/SPECS/perl-JSON-Any/perl-JSON-Any.spec index ece266419ae..77337d111dc 100644 --- a/SPECS/perl-JSON-Any/perl-JSON-Any.spec +++ b/SPECS/perl-JSON-Any/perl-JSON-Any.spec @@ -44,7 +44,7 @@ make test * Fri Nov 13 2020 Pawel Winogrodzki - 1.39-7 - Adding 'local::lib' perl5 library to fix test dependencies. -* Sat May 09 00:20:40 PST 2020 Nick Samson - 1.39-6 +* Sat May 09 2020 Nick Samson - 1.39-6 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.39-5 diff --git a/SPECS/perl-JSON-XS/perl-JSON-XS.spec b/SPECS/perl-JSON-XS/perl-JSON-XS.spec index 88c9929f801..4846700fcc0 100644 --- a/SPECS/perl-JSON-XS/perl-JSON-XS.spec +++ b/SPECS/perl-JSON-XS/perl-JSON-XS.spec @@ -52,7 +52,7 @@ make test %{_mandir}/man[13]/* %changelog -* Sat May 09 00:21:43 PST 2020 Nick Samson - 1:3.04-3 +* Sat May 09 2020 Nick Samson - 1:3.04-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.04-2 diff --git a/SPECS/perl-List-MoreUtils/perl-List-MoreUtils.spec b/SPECS/perl-List-MoreUtils/perl-List-MoreUtils.spec index abcb0a94da1..57195090f9e 100644 --- a/SPECS/perl-List-MoreUtils/perl-List-MoreUtils.spec +++ b/SPECS/perl-List-MoreUtils/perl-List-MoreUtils.spec @@ -55,7 +55,7 @@ make test - Removed %%sha1 macro. - License verified and extended %%license macro to include all license files. -* Sat May 09 00:21:01 PST 2020 Nick Samson - 0.428-4 +* Sat May 09 2020 Nick Samson - 0.428-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.428-3 diff --git a/SPECS/perl-Module-Build/perl-Module-Build.spec b/SPECS/perl-Module-Build/perl-Module-Build.spec index e3c44213e5c..953155408a9 100644 --- a/SPECS/perl-Module-Build/perl-Module-Build.spec +++ b/SPECS/perl-Module-Build/perl-Module-Build.spec @@ -46,7 +46,7 @@ LANG=C TEST_SIGNATURE=1 MB_TEST_EXPERIMENTAL=1 ./Build test %{_mandir}/man3/* %changelog -* Sat May 09 00:20:53 PST 2020 Nick Samson - 0.4224-3 +* Sat May 09 2020 Nick Samson - 0.4224-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.4224-2 diff --git a/SPECS/perl-Module-Install/perl-Module-Install.spec b/SPECS/perl-Module-Install/perl-Module-Install.spec index 833ea882121..8f766608e0b 100644 --- a/SPECS/perl-Module-Install/perl-Module-Install.spec +++ b/SPECS/perl-Module-Install/perl-Module-Install.spec @@ -50,7 +50,7 @@ make %{?_smp_mflags} test AUTOMATED_TESTING=1 %{_mandir}/man3/* %changelog -* Sat May 09 00:20:49 PST 2020 Nick Samson - 1.19-3 +* Sat May 09 2020 Nick Samson - 1.19-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.19-2 diff --git a/SPECS/perl-Module-ScanDeps/perl-Module-ScanDeps.spec b/SPECS/perl-Module-ScanDeps/perl-Module-ScanDeps.spec index 95e68eb9d60..3ad2473df1c 100644 --- a/SPECS/perl-Module-ScanDeps/perl-Module-ScanDeps.spec +++ b/SPECS/perl-Module-ScanDeps/perl-Module-ScanDeps.spec @@ -45,7 +45,7 @@ make %{?_smp_mflags} test %{_mandir}/man3/* %changelog -* Sat May 09 00:21:28 PST 2020 Nick Samson - 1.25-3 +* Sat May 09 2020 Nick Samson - 1.25-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.25-2 diff --git a/SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec b/SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec index 69f39f79e79..d4ac1870524 100644 --- a/SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec +++ b/SPECS/perl-Net-SSLeay/perl-Net-SSLeay.spec @@ -61,7 +61,7 @@ make test * Fri Nov 13 2020 Pawel Winogrodzki - 1.88-3 - Adding 'local::lib' perl5 library to fix test dependencies. -* Sat May 09 00:21:16 PST 2020 Nick Samson - 1.88-2 +* Sat May 09 2020 Nick Samson - 1.88-2 - Added %%license line automatically * Fri Mar 13 2020 Paul Monson 1.88-1 diff --git a/SPECS/perl-NetAddr-IP/perl-NetAddr-IP.spec b/SPECS/perl-NetAddr-IP/perl-NetAddr-IP.spec index 71ddf6083fd..8c96a6d3379 100644 --- a/SPECS/perl-NetAddr-IP/perl-NetAddr-IP.spec +++ b/SPECS/perl-NetAddr-IP/perl-NetAddr-IP.spec @@ -36,7 +36,7 @@ make test %{_mandir}/man3/* %changelog -* Sat May 09 00:21:00 PST 2020 Nick Samson - 4.079-3 +* Sat May 09 2020 Nick Samson - 4.079-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.079-2 diff --git a/SPECS/perl-Path-Class/perl-Path-Class.spec b/SPECS/perl-Path-Class/perl-Path-Class.spec index abe5fb4d9f1..cf87e504248 100644 --- a/SPECS/perl-Path-Class/perl-Path-Class.spec +++ b/SPECS/perl-Path-Class/perl-Path-Class.spec @@ -39,7 +39,7 @@ make test %{_mandir}/man?/* %changelog -* Sat May 09 00:20:47 PST 2020 Nick Samson - 0.37-5 +* Sat May 09 2020 Nick Samson - 0.37-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.37-4 diff --git a/SPECS/perl-Types-Serialiser/perl-Types-Serialiser.spec b/SPECS/perl-Types-Serialiser/perl-Types-Serialiser.spec index 0b7e5bbb001..64f33fc853d 100644 --- a/SPECS/perl-Types-Serialiser/perl-Types-Serialiser.spec +++ b/SPECS/perl-Types-Serialiser/perl-Types-Serialiser.spec @@ -54,7 +54,7 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog -* Sat May 09 00:21:01 PST 2020 Nick Samson - 1.0-5 +* Sat May 09 2020 Nick Samson - 1.0-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.0-4 diff --git a/SPECS/perl-WWW-Curl/perl-WWW-Curl.spec b/SPECS/perl-WWW-Curl/perl-WWW-Curl.spec index 3d999b35eda..2e2224f1cfe 100644 --- a/SPECS/perl-WWW-Curl/perl-WWW-Curl.spec +++ b/SPECS/perl-WWW-Curl/perl-WWW-Curl.spec @@ -81,7 +81,7 @@ make test - License verified. - Updated the 'Source0' and 'URL' tags. -* Sat May 09 00:20:47 PST 2020 Nick Samson - 4.17-7 +* Sat May 09 2020 Nick Samson - 4.17-7 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz - 4.17-6 diff --git a/SPECS/perl-YAML-Tiny/perl-YAML-Tiny.spec b/SPECS/perl-YAML-Tiny/perl-YAML-Tiny.spec index 5dba1967a75..ef35a780869 100644 --- a/SPECS/perl-YAML-Tiny/perl-YAML-Tiny.spec +++ b/SPECS/perl-YAML-Tiny/perl-YAML-Tiny.spec @@ -39,7 +39,7 @@ make test %{_mandir}/man3/YAML::Tiny.3* %changelog -* Sat May 09 00:21:15 PST 2020 Nick Samson - 1.73-3 +* Sat May 09 2020 Nick Samson - 1.73-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.73-2 diff --git a/SPECS/perl-YAML/perl-YAML.spec b/SPECS/perl-YAML/perl-YAML.spec index 3b7284da6ad..32c4b4b0379 100644 --- a/SPECS/perl-YAML/perl-YAML.spec +++ b/SPECS/perl-YAML/perl-YAML.spec @@ -88,7 +88,7 @@ make %{?_smp_mflags} test * Fri Nov 13 2020 Pawel Winogrodzki - 1.26-4 - Adding 'local::lib' perl5 library to fix test dependencies. -* Sat May 09 00:21:35 PST 2020 Nick Samson - 1.26-3 +* Sat May 09 2020 Nick Samson - 1.26-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.26-2 diff --git a/SPECS/perl-common-sense/perl-common-sense.spec b/SPECS/perl-common-sense/perl-common-sense.spec index 6c09a69491a..336f16ec8f1 100644 --- a/SPECS/perl-common-sense/perl-common-sense.spec +++ b/SPECS/perl-common-sense/perl-common-sense.spec @@ -69,7 +69,7 @@ rm -rf %{buildroot} %{_mandir}/man3/common::sense.3* %changelog -* Sat May 09 00:21:32 PST 2020 Nick Samson - 3.74-5 +* Sat May 09 2020 Nick Samson - 3.74-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.74-4 diff --git a/SPECS/perl-libintl-perl/perl-libintl-perl.spec b/SPECS/perl-libintl-perl/perl-libintl-perl.spec index 35ad3721c78..3ba1d751214 100644 --- a/SPECS/perl-libintl-perl/perl-libintl-perl.spec +++ b/SPECS/perl-libintl-perl/perl-libintl-perl.spec @@ -44,7 +44,7 @@ make test %{_mandir}/man?/* %changelog -* Sat May 09 00:21:07 PST 2020 Nick Samson - 1.29-4 +* Sat May 09 2020 Nick Samson - 1.29-4 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.29-3 diff --git a/SPECS/pgbouncer/pgbouncer.spec b/SPECS/pgbouncer/pgbouncer.spec index ffc20c609d9..80400d9c2a8 100644 --- a/SPECS/pgbouncer/pgbouncer.spec +++ b/SPECS/pgbouncer/pgbouncer.spec @@ -80,7 +80,7 @@ fi /usr/share/doc/pgbouncer/* %changelog -* Sat May 09 00:21:33 PST 2020 Nick Samson - 1.11.0-2 +* Sat May 09 2020 Nick Samson - 1.11.0-2 - Added %%license line automatically * Fri Mar 13 2020 Paul Monson 1.11.0-1 diff --git a/SPECS/pinentry/pinentry.spec b/SPECS/pinentry/pinentry.spec index 3af5516affa..250a8cbd13e 100644 --- a/SPECS/pinentry/pinentry.spec +++ b/SPECS/pinentry/pinentry.spec @@ -41,7 +41,7 @@ make DESTDIR=%{buildroot} install %exclude %{_infodir}/dir %changelog -* Sat May 09 00:21:30 PST 2020 Nick Samson - 1.1.0-3 +* Sat May 09 2020 Nick Samson - 1.1.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.1.0-2 diff --git a/SPECS/pixman/pixman.spec b/SPECS/pixman/pixman.spec index 548210f52f3..ad0ae469892 100644 --- a/SPECS/pixman/pixman.spec +++ b/SPECS/pixman/pixman.spec @@ -57,7 +57,7 @@ make %{?_smp_mflags} -k check %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson - 0.36.0-2 +* Sat May 09 2020 Nick Samson - 0.36.0-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 0.36.0-1 diff --git a/SPECS/pkg-config/pkg-config.spec b/SPECS/pkg-config/pkg-config.spec index 0e9b4485a8f..256d4934355 100644 --- a/SPECS/pkg-config/pkg-config.spec +++ b/SPECS/pkg-config/pkg-config.spec @@ -46,7 +46,7 @@ make %{?_smp_mflags} check %{_docdir}/pkg-config-*/pkg-config-guide.html %{_mandir}/man1/pkg-config.1.gz %changelog -* Sat May 09 00:20:57 PST 2020 Nick Samson - 0.29.2-4 +* Sat May 09 2020 Nick Samson - 0.29.2-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.29.2-3 diff --git a/SPECS/popt/popt.spec b/SPECS/popt/popt.spec index 4cf17c7abf3..b1b42b6f431 100644 --- a/SPECS/popt/popt.spec +++ b/SPECS/popt/popt.spec @@ -60,7 +60,7 @@ make %{?_smp_mflags} check %defattr(-,root,root) %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson - 1.16-7 +* Sat May 09 2020 Nick Samson - 1.16-7 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.16-6 diff --git a/SPECS/procps-ng/procps-ng.spec b/SPECS/procps-ng/procps-ng.spec index 382dee32fb9..a9adebc3e4f 100644 --- a/SPECS/procps-ng/procps-ng.spec +++ b/SPECS/procps-ng/procps-ng.spec @@ -101,7 +101,7 @@ make %{?_smp_mflags} check %defattr(-,root,root) %changelog -* Sat May 09 00:21:44 PST 2020 Nick Samson - 3.3.15-3 +* Sat May 09 2020 Nick Samson - 3.3.15-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.3.15-2 diff --git a/SPECS/protobuf-c/protobuf-c.spec b/SPECS/protobuf-c/protobuf-c.spec index 50dac444821..1d7a439d3fe 100644 --- a/SPECS/protobuf-c/protobuf-c.spec +++ b/SPECS/protobuf-c/protobuf-c.spec @@ -73,7 +73,7 @@ make DESTDIR=%{buildroot} install %{_libdir}/libprotobuf-c.a %changelog -* Sat May 09 00:21:08 PST 2020 Nick Samson - 1.3.1-4 +* Sat May 09 2020 Nick Samson - 1.3.1-4 - Added %%license line automatically * Fri Mar 03 2020 Jon Slobodzian 1.20.2-3 diff --git a/SPECS/protobuf/protobuf.spec b/SPECS/protobuf/protobuf.spec index f370e6dde9d..4e0160724d2 100644 --- a/SPECS/protobuf/protobuf.spec +++ b/SPECS/protobuf/protobuf.spec @@ -157,7 +157,7 @@ popd %{_libdir}/java/protobuf/*.jar %changelog -* Sat May 09 00:20:36 PST 2020 Nick Samson - 3.6.1-8 +* Sat May 09 2020 Nick Samson - 3.6.1-8 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 3.6.1-7 diff --git a/SPECS/psmisc/psmisc.spec b/SPECS/psmisc/psmisc.spec index e7634076f45..510e01ff2d7 100644 --- a/SPECS/psmisc/psmisc.spec +++ b/SPECS/psmisc/psmisc.spec @@ -37,7 +37,7 @@ make %{?_smp_mflags} check %{_bindir}/* %{_mandir}/*/* %changelog -* Sat May 09 00:20:46 PST 2020 Nick Samson - 23.2-4 +* Sat May 09 2020 Nick Samson - 23.2-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 23.2-3 diff --git a/SPECS/pth/pth.spec b/SPECS/pth/pth.spec index d712678b05d..e67bc4e4243 100644 --- a/SPECS/pth/pth.spec +++ b/SPECS/pth/pth.spec @@ -59,7 +59,7 @@ make %{?_smp_mflags} -k check %{_datadir}/aclocal/* %changelog -* Sat May 09 00:20:43 PST 2020 Nick Samson - 2.0.7-4 +* Sat May 09 2020 Nick Samson - 2.0.7-4 - Added %%license line automatically * Mon Apr 27 2020 Nick Samson 2.0.7-3 diff --git a/SPECS/pyOpenSSL/pyOpenSSL.spec b/SPECS/pyOpenSSL/pyOpenSSL.spec index 9c5fd7b4947..6bd04f83b48 100644 --- a/SPECS/pyOpenSSL/pyOpenSSL.spec +++ b/SPECS/pyOpenSSL/pyOpenSSL.spec @@ -112,7 +112,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:13 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 18.0.0-5 diff --git a/SPECS/pyasn1-modules/pyasn1-modules.spec b/SPECS/pyasn1-modules/pyasn1-modules.spec index acb0cc8d508..2f408141745 100644 --- a/SPECS/pyasn1-modules/pyasn1-modules.spec +++ b/SPECS/pyasn1-modules/pyasn1-modules.spec @@ -93,7 +93,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:32 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 0.2.2-4 diff --git a/SPECS/pygobject3/pygobject3.spec b/SPECS/pygobject3/pygobject3.spec index 7783723e6b9..0913ed5354b 100644 --- a/SPECS/pygobject3/pygobject3.spec +++ b/SPECS/pygobject3/pygobject3.spec @@ -81,7 +81,7 @@ rm -rf %{buildroot} %{_includedir}/* %changelog -* Sat May 09 00:20:43 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Apr 29 2020 Nicolas Ontiveros 3.30.1-5 diff --git a/SPECS/pytest/pytest.spec b/SPECS/pytest/pytest.spec index 8f1dc414f3f..c9e98ddfcaa 100644 --- a/SPECS/pytest/pytest.spec +++ b/SPECS/pytest/pytest.spec @@ -100,7 +100,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{python3_sitelib}/* %changelog -* Sat May 09 00:21:35 PST 2020 Nick Samson - 3.8.2-6 +* Sat May 09 2020 Nick Samson - 3.8.2-6 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 3.8.2-5 diff --git a/SPECS/python-attrs/python-attrs.spec b/SPECS/python-attrs/python-attrs.spec index 573344382be..62f59fbc227 100644 --- a/SPECS/python-attrs/python-attrs.spec +++ b/SPECS/python-attrs/python-attrs.spec @@ -82,7 +82,7 @@ LANG=en_US.UTF-8 tox -e py37 - Use tox to run tests. * Wed Jul 08 2020 Henry Beberman 18.2.0-6 - Fix typo in BuildRequires for python3-zope-interface -* Sat May 09 00:20:45 PST 2020 Nick Samson 18.2.0-5 +* Sat May 09 2020 Nick Samson 18.2.0-5 - Added %%license line automatically * Fri Apr 24 2020 Nick Samson 18.2.0-4 - Updated Source0, license verified. Removed %%define sha1 diff --git a/SPECS/python-boto3/python-boto3.spec b/SPECS/python-boto3/python-boto3.spec index 71cf127f8dd..fbfdad78552 100644 --- a/SPECS/python-boto3/python-boto3.spec +++ b/SPECS/python-boto3/python-boto3.spec @@ -79,7 +79,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:11 PST 2020 Nick Samson - 1.10.21-2 +* Sat May 09 2020 Nick Samson - 1.10.21-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 1.10.21-1 diff --git a/SPECS/python-botocore/python-botocore.spec b/SPECS/python-botocore/python-botocore.spec index b31b68750ba..165812f47dd 100644 --- a/SPECS/python-botocore/python-botocore.spec +++ b/SPECS/python-botocore/python-botocore.spec @@ -84,7 +84,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:35 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 1.13.21-1 diff --git a/SPECS/python-certifi/python-certifi.spec b/SPECS/python-certifi/python-certifi.spec index 623957e12ad..ceafb187cbe 100644 --- a/SPECS/python-certifi/python-certifi.spec +++ b/SPECS/python-certifi/python-certifi.spec @@ -67,7 +67,7 @@ python3 setup.py test %changelog * Tue Oct 20 2020 Andrew Phelps 2018.10.15-5 - Fix check test -* Sat May 09 00:20:57 PST 2020 Nick Samson 2018.10.15-4 +* Sat May 09 2020 Nick Samson 2018.10.15-4 - Added %%license line automatically * Wed May 06 2020 Pawel Winogrodzki 2018.10.15-3 - Removing *Requires for "ca-certificates". diff --git a/SPECS/python-chardet/python-chardet.spec b/SPECS/python-chardet/python-chardet.spec index 8a1b8e14dda..cc21599495b 100644 --- a/SPECS/python-chardet/python-chardet.spec +++ b/SPECS/python-chardet/python-chardet.spec @@ -72,7 +72,7 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{_bindir}/chardetect %changelog -* Sat May 09 00:21:23 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 3.0.4-4 diff --git a/SPECS/python-constantly/python-constantly.spec b/SPECS/python-constantly/python-constantly.spec index 8671c30143b..86ffcf1bfe7 100644 --- a/SPECS/python-constantly/python-constantly.spec +++ b/SPECS/python-constantly/python-constantly.spec @@ -73,7 +73,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:41 PST 2020 Nick Samson - 15.1.0-5 +* Sat May 09 2020 Nick Samson - 15.1.0-5 - Added %%license line automatically * Wed Apr 09 2020 Pawel Winogrodzki 15.1.0-4 diff --git a/SPECS/python-coverage/python-coverage.spec b/SPECS/python-coverage/python-coverage.spec index 7b735ff12d0..07d0168f454 100644 --- a/SPECS/python-coverage/python-coverage.spec +++ b/SPECS/python-coverage/python-coverage.spec @@ -88,7 +88,7 @@ popd %{_bindir}/coverage-%{python3_version} %changelog -* Sat May 09 00:21:28 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 4.5.1-3 diff --git a/SPECS/python-cryptography/python-cryptography.spec b/SPECS/python-cryptography/python-cryptography.spec index 384e1c2dd4d..148be9314b5 100644 --- a/SPECS/python-cryptography/python-cryptography.spec +++ b/SPECS/python-cryptography/python-cryptography.spec @@ -105,7 +105,7 @@ python3 setup.py test * Wed Jan 20 2021 Henry Beberman 2.3.1-4 - Patch CVE-2020-25659 - License verified -* Sat May 09 00:20:51 PST 2020 Nick Samson 2.3.1-3 +* Sat May 09 2020 Nick Samson 2.3.1-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.3.1-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/python-daemon/python-daemon.spec b/SPECS/python-daemon/python-daemon.spec index 636b74a5831..0db1212da89 100644 --- a/SPECS/python-daemon/python-daemon.spec +++ b/SPECS/python-daemon/python-daemon.spec @@ -86,7 +86,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:37 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.2.0-3 diff --git a/SPECS/python-dateutil/python-dateutil.spec b/SPECS/python-dateutil/python-dateutil.spec index 2635223107a..a0839dca732 100644 --- a/SPECS/python-dateutil/python-dateutil.spec +++ b/SPECS/python-dateutil/python-dateutil.spec @@ -75,7 +75,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:42 PST 2020 Nick Samson - 2.7.3-4 +* Sat May 09 2020 Nick Samson - 2.7.3-4 - Added %%license line automatically * Thu Apr 23 2020 Pawel Winogrodzki 2.7.3-3 diff --git a/SPECS/python-defusedxml/python-defusedxml.spec b/SPECS/python-defusedxml/python-defusedxml.spec index b54d4e2757b..5a72125a07d 100644 --- a/SPECS/python-defusedxml/python-defusedxml.spec +++ b/SPECS/python-defusedxml/python-defusedxml.spec @@ -80,7 +80,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:56 PST 2020 Nick Samson - 0.6.0-2 +* Sat May 09 2020 Nick Samson - 0.6.0-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 0.6.0-1 diff --git a/SPECS/python-docopt/python-docopt.spec b/SPECS/python-docopt/python-docopt.spec index 15b3842a4b7..3e5b3f2acb7 100644 --- a/SPECS/python-docopt/python-docopt.spec +++ b/SPECS/python-docopt/python-docopt.spec @@ -73,7 +73,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:40 PST 2020 Nick Samson - 0.6.2-5 +* Sat May 09 2020 Nick Samson - 0.6.2-5 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 0.6.2-4 diff --git a/SPECS/python-docutils/python-docutils.spec b/SPECS/python-docutils/python-docutils.spec index b3a26bc4b18..0c91899408b 100644 --- a/SPECS/python-docutils/python-docutils.spec +++ b/SPECS/python-docutils/python-docutils.spec @@ -139,7 +139,7 @@ popd - Follow the Fedora convention of providing a suffix-less binary name - License verified -* Sat May 09 00:21:15 PST 2020 Nick Samson - 0.14-3 +* Sat May 09 2020 Nick Samson - 0.14-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.14-2 diff --git a/SPECS/python-ecdsa/python-ecdsa.spec b/SPECS/python-ecdsa/python-ecdsa.spec index e9474a7580b..96c3d74f4d1 100644 --- a/SPECS/python-ecdsa/python-ecdsa.spec +++ b/SPECS/python-ecdsa/python-ecdsa.spec @@ -75,7 +75,7 @@ rm -rf %{buildroot} - Add openssl to BR - Disable OpenSSL NIST192 tests since OpenSSL no longer supports NIST192 EC. -* Sat May 09 00:21:04 PST 2020 Nick Samson - 0.13.3-3 +* Sat May 09 2020 Nick Samson - 0.13.3-3 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 0.13.3-2 diff --git a/SPECS/python-enum34/python-enum34.spec b/SPECS/python-enum34/python-enum34.spec index 794bcfdecd3..6dd71214cda 100644 --- a/SPECS/python-enum34/python-enum34.spec +++ b/SPECS/python-enum34/python-enum34.spec @@ -45,7 +45,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %{python2_sitelib}/* %changelog -* Sat May 09 00:20:57 PST 2020 Nick Samson - 1.1.6-4 +* Sat May 09 2020 Nick Samson - 1.1.6-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.1.6-3 diff --git a/SPECS/python-futures/python-futures.spec b/SPECS/python-futures/python-futures.spec index 085f9e39c07..4ce824f6fb8 100644 --- a/SPECS/python-futures/python-futures.spec +++ b/SPECS/python-futures/python-futures.spec @@ -37,7 +37,7 @@ easy_install py %{python2_sitelib}/* %changelog -* Sat May 09 00:21:20 PST 2020 Nick Samson - 3.2.0-4 +* Sat May 09 2020 Nick Samson - 3.2.0-4 - Added %%license line automatically * Mon Apr 27 2020 Nick Samson 3.2.0-3 diff --git a/SPECS/python-gevent/python-gevent.spec b/SPECS/python-gevent/python-gevent.spec index afd63a552a0..1bc855d76b0 100644 --- a/SPECS/python-gevent/python-gevent.spec +++ b/SPECS/python-gevent/python-gevent.spec @@ -94,7 +94,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:06 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 1.3.6-4 diff --git a/SPECS/python-greenlet/python-greenlet.spec b/SPECS/python-greenlet/python-greenlet.spec index 1c70c9eb2a4..9df54b04cfc 100644 --- a/SPECS/python-greenlet/python-greenlet.spec +++ b/SPECS/python-greenlet/python-greenlet.spec @@ -65,7 +65,7 @@ python2 setup.py test /usr/include/python3.7m/greenlet/greenlet.h %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson - 0.4.15-5 +* Sat May 09 2020 Nick Samson - 0.4.15-5 - Added %%license line automatically * Tue Apr 14 2020 Nick Samson 0.4.15-4 diff --git a/SPECS/python-hyperlink/python-hyperlink.spec b/SPECS/python-hyperlink/python-hyperlink.spec index 4338809fd34..dec1879d90b 100644 --- a/SPECS/python-hyperlink/python-hyperlink.spec +++ b/SPECS/python-hyperlink/python-hyperlink.spec @@ -83,7 +83,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:33 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 19.0.0-1 diff --git a/SPECS/python-hypothesis/python-hypothesis.spec b/SPECS/python-hypothesis/python-hypothesis.spec index eccf0355dc2..b7d710d0060 100644 --- a/SPECS/python-hypothesis/python-hypothesis.spec +++ b/SPECS/python-hypothesis/python-hypothesis.spec @@ -72,7 +72,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{python3_sitelib}/* %changelog -* Sat May 09 00:20:36 PST 2020 Nick Samson - 3.71.0-4 +* Sat May 09 2020 Nick Samson - 3.71.0-4 - Added %%license line automatically * Mon Apr 13 2020 Jon Slobodizan 3.71.0-3 diff --git a/SPECS/python-idna/python-idna.spec b/SPECS/python-idna/python-idna.spec index aea0553138a..6438e060352 100644 --- a/SPECS/python-idna/python-idna.spec +++ b/SPECS/python-idna/python-idna.spec @@ -78,7 +78,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 2.7-4 +* Sat May 09 2020 Nick Samson - 2.7-4 - Added %%license line automatically * Thu Apr 09 2020 Joe Schmitt 2.7-3 diff --git a/SPECS/python-incremental/python-incremental.spec b/SPECS/python-incremental/python-incremental.spec index f5da5003ff1..a08b150c46a 100644 --- a/SPECS/python-incremental/python-incremental.spec +++ b/SPECS/python-incremental/python-incremental.spec @@ -63,7 +63,7 @@ python3 setup.py test %{python3_sitelib}/* %changelog -* Sat May 09 00:21:31 PST 2020 Nick Samson - 17.5.0-4 +* Sat May 09 2020 Nick Samson - 17.5.0-4 - Added %%license line automatically * Fri Apr 24 2020 Andrew Phelps 17.5.0-3 diff --git a/SPECS/python-iniparse/python-iniparse.spec b/SPECS/python-iniparse/python-iniparse.spec index 99163cacb9f..00d0636708e 100644 --- a/SPECS/python-iniparse/python-iniparse.spec +++ b/SPECS/python-iniparse/python-iniparse.spec @@ -87,7 +87,7 @@ popd %changelog -* Sat May 09 00:20:46 PST 2020 Nick Samson - 0.4-9 +* Sat May 09 2020 Nick Samson - 0.4-9 - Added %%license line automatically * Tue Apr 14 2020 Nick Samson 0.4-8 diff --git a/SPECS/python-ipaddress/python-ipaddress.spec b/SPECS/python-ipaddress/python-ipaddress.spec index 7f59cf98886..0724dae886e 100644 --- a/SPECS/python-ipaddress/python-ipaddress.spec +++ b/SPECS/python-ipaddress/python-ipaddress.spec @@ -41,7 +41,7 @@ python2 setup.py test %{python2_sitelib}/* %changelog -* Sat May 09 00:21:32 PST 2020 Nick Samson - 1.0.22-5 +* Sat May 09 2020 Nick Samson - 1.0.22-5 - Added %%license line automatically * Fri Apr 24 2020 Andrew Phelps 1.0.22-4 diff --git a/SPECS/python-jmespath/python-jmespath.spec b/SPECS/python-jmespath/python-jmespath.spec index 9b9d404ec06..044d416983e 100644 --- a/SPECS/python-jmespath/python-jmespath.spec +++ b/SPECS/python-jmespath/python-jmespath.spec @@ -83,7 +83,7 @@ popd %{_bindir}/jp.py-%{python3_version} %changelog -* Sat May 09 00:21:44 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.9.3-3 diff --git a/SPECS/python-jsonpatch/python-jsonpatch.spec b/SPECS/python-jsonpatch/python-jsonpatch.spec index f84443510aa..27e63f497ba 100644 --- a/SPECS/python-jsonpatch/python-jsonpatch.spec +++ b/SPECS/python-jsonpatch/python-jsonpatch.spec @@ -70,7 +70,7 @@ popd %{_bindir}/jsonpatch3 %changelog -* Sat May 09 00:20:54 PST 2020 Nick Samson - 1.23-4 +* Sat May 09 2020 Nick Samson - 1.23-4 - Added %%license line automatically * Tue Apr 21 2020 Eric Li 1.23-3 diff --git a/SPECS/python-jsonschema/python-jsonschema.spec b/SPECS/python-jsonschema/python-jsonschema.spec index fb184e4dab1..8a89f3434f9 100644 --- a/SPECS/python-jsonschema/python-jsonschema.spec +++ b/SPECS/python-jsonschema/python-jsonschema.spec @@ -70,7 +70,7 @@ popd %{_bindir}/jsonschema3 %changelog -* Sat May 09 00:20:37 PST 2020 Nick Samson - 2.6.0-5 +* Sat May 09 2020 Nick Samson - 2.6.0-5 - Added %%license line automatically * Wed May 06 2020 Paul Monson 2.6.0-4 - Restore python-vcversioner to enable build without internet access. diff --git a/SPECS/python-lockfile/python-lockfile.spec b/SPECS/python-lockfile/python-lockfile.spec index 586a1fd2162..1a404db2354 100644 --- a/SPECS/python-lockfile/python-lockfile.spec +++ b/SPECS/python-lockfile/python-lockfile.spec @@ -72,7 +72,7 @@ popd %{python3_sitelib}/lockfile %changelog -* Sat May 09 00:20:56 PST 2020 Nick Samson - 0.12.2-5 +* Sat May 09 2020 Nick Samson - 0.12.2-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.12.2-4 diff --git a/SPECS/python-lxml/python-lxml.spec b/SPECS/python-lxml/python-lxml.spec index 37618ce158c..a2e6721b11b 100644 --- a/SPECS/python-lxml/python-lxml.spec +++ b/SPECS/python-lxml/python-lxml.spec @@ -62,7 +62,7 @@ rm -rf %{buildroot} * Wed Aug 26 2020 Thomas Crain 4.2.4-7 - Remove python2 support. - License verified. -* Sat May 09 00:20:50 PST 2020 Nick Samson 4.2.4-6 +* Sat May 09 2020 Nick Samson 4.2.4-6 - Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 4.2.4-5 - Renaming cython to Cython diff --git a/SPECS/python-m2r/python-m2r.spec b/SPECS/python-m2r/python-m2r.spec index 4b0e12ecdcb..6d6e90102c2 100644 --- a/SPECS/python-m2r/python-m2r.spec +++ b/SPECS/python-m2r/python-m2r.spec @@ -96,7 +96,7 @@ popd %{_bindir}/m2r3 %changelog -* Sat May 09 00:21:14 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 0.2.0-4 diff --git a/SPECS/python-markupsafe/python-markupsafe.spec b/SPECS/python-markupsafe/python-markupsafe.spec index aa6bb4e8351..e8f473b8980 100644 --- a/SPECS/python-markupsafe/python-markupsafe.spec +++ b/SPECS/python-markupsafe/python-markupsafe.spec @@ -66,7 +66,7 @@ python3 setup.py test - Remove inline sha1 - Lint to Mariner style -* Sat May 09 00:21:01 PST 2020 Nick Samson - 1.0-5 +* Sat May 09 2020 Nick Samson - 1.0-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz - 1.0-4 diff --git a/SPECS/python-mistune/python-mistune.spec b/SPECS/python-mistune/python-mistune.spec index 6c62172c715..7830855cab1 100644 --- a/SPECS/python-mistune/python-mistune.spec +++ b/SPECS/python-mistune/python-mistune.spec @@ -74,7 +74,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:37 PST 2020 Nick Samson - 0.8.3-3 +* Sat May 09 2020 Nick Samson - 0.8.3-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.8.3-2 diff --git a/SPECS/python-msgpack/python-msgpack.spec b/SPECS/python-msgpack/python-msgpack.spec index 0de09a7f523..20dc803003a 100644 --- a/SPECS/python-msgpack/python-msgpack.spec +++ b/SPECS/python-msgpack/python-msgpack.spec @@ -63,7 +63,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:41 PST 2020 Nick Samson - 0.6.2-2 +* Sat May 09 2020 Nick Samson - 0.6.2-2 - Added %%license line automatically * Wed Mar 18 2020 Paul Monson 0.6.2-1 diff --git a/SPECS/python-netifaces/python-netifaces.spec b/SPECS/python-netifaces/python-netifaces.spec index 8898929bf36..0bc0553719e 100644 --- a/SPECS/python-netifaces/python-netifaces.spec +++ b/SPECS/python-netifaces/python-netifaces.spec @@ -64,7 +64,7 @@ rm -rf %{buildroot}/* %{python3_sitelib}/* %changelog -* Sat May 09 00:21:19 PST 2020 Nick Samson - 0.10.9-3 +* Sat May 09 2020 Nick Samson - 0.10.9-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.10.9-2 diff --git a/SPECS/python-oauthlib/python-oauthlib.spec b/SPECS/python-oauthlib/python-oauthlib.spec index 07d49d8f61d..1f891a444ba 100644 --- a/SPECS/python-oauthlib/python-oauthlib.spec +++ b/SPECS/python-oauthlib/python-oauthlib.spec @@ -75,7 +75,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:27 PST 2020 Nick Samson - 2.1.0-4 +* Sat May 09 2020 Nick Samson - 2.1.0-4 - Added %%license line automatically * Mon Apr 13 2020 Jon Slobodzian 2.1.0-3 diff --git a/SPECS/python-packaging/python-packaging.spec b/SPECS/python-packaging/python-packaging.spec index 26f64465e3f..c429179b838 100644 --- a/SPECS/python-packaging/python-packaging.spec +++ b/SPECS/python-packaging/python-packaging.spec @@ -89,7 +89,7 @@ PYTHONPATH=./ pytest %{python3_sitelib}/* %changelog -* Sat May 09 00:20:36 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Fri Apr 17 2020 Nicolas Ontiveros 17.1-5 diff --git a/SPECS/python-pam/python-pam.spec b/SPECS/python-pam/python-pam.spec index 5d3a42454c8..fc986f52303 100644 --- a/SPECS/python-pam/python-pam.spec +++ b/SPECS/python-pam/python-pam.spec @@ -73,7 +73,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:23 PST 2020 Nick Samson - 1.8.4-2 +* Sat May 09 2020 Nick Samson - 1.8.4-2 - Added %%license line automatically * Wed Mar 18 2020 Paul Monson 1.8.4-1 diff --git a/SPECS/python-prettytable/python-prettytable.spec b/SPECS/python-prettytable/python-prettytable.spec index 462406c2edc..7eefc55f82d 100644 --- a/SPECS/python-prettytable/python-prettytable.spec +++ b/SPECS/python-prettytable/python-prettytable.spec @@ -78,7 +78,7 @@ popd %changelog -* Sat May 09 00:21:31 PST 2020 Nick Samson - 0.7.2-8 +* Sat May 09 2020 Nick Samson - 0.7.2-8 - Added %%license line automatically * Mon Apr 13 2020 Nick Samson 0.7.2-7 diff --git a/SPECS/python-psutil/python-psutil.spec b/SPECS/python-psutil/python-psutil.spec index 60cca52e3de..e77a634e8d4 100644 --- a/SPECS/python-psutil/python-psutil.spec +++ b/SPECS/python-psutil/python-psutil.spec @@ -95,7 +95,7 @@ LANG=en_US.UTF-8 make test PYTHON=python%{python3_version} %{python3_sitelib}/* %changelog -* Sat May 09 00:20:46 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Apr 14 2020 Emre Girgin 5.6.3-3 diff --git a/SPECS/python-psycopg2/python-psycopg2.spec b/SPECS/python-psycopg2/python-psycopg2.spec index 3fd98bda295..027c480b86c 100644 --- a/SPECS/python-psycopg2/python-psycopg2.spec +++ b/SPECS/python-psycopg2/python-psycopg2.spec @@ -95,7 +95,7 @@ rm -r /home/postgres/data &>/dev/null ||: %{python3_sitelib}/* %changelog -* Sat May 09 00:21:14 PST 2020 Nick Samson - 2.7.5-4 +* Sat May 09 2020 Nick Samson - 2.7.5-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.7.5-3 diff --git a/SPECS/python-pyasn1/python-pyasn1.spec b/SPECS/python-pyasn1/python-pyasn1.spec index 521b8087898..9b94f063940 100644 --- a/SPECS/python-pyasn1/python-pyasn1.spec +++ b/SPECS/python-pyasn1/python-pyasn1.spec @@ -70,7 +70,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:24 PST 2020 Nick Samson - 0.4.4-3 +* Sat May 09 2020 Nick Samson - 0.4.4-3 - Added %%license line automatically. * Tue Apr 07 2020 Pawel Winogrodzki 0.4.4-2 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/python-pycparser/python-pycparser.spec b/SPECS/python-pycparser/python-pycparser.spec index 99c54835198..b73e0edfbb6 100644 --- a/SPECS/python-pycparser/python-pycparser.spec +++ b/SPECS/python-pycparser/python-pycparser.spec @@ -61,7 +61,7 @@ python2 all_tests.py %{python3_sitelib}/* %changelog -* Sat May 09 00:20:51 PST 2020 Nick Samson - 2.18-3 +* Sat May 09 2020 Nick Samson - 2.18-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.18-2 diff --git a/SPECS/python-pyvmomi/python-pyvmomi.spec b/SPECS/python-pyvmomi/python-pyvmomi.spec index cdd635ce120..720028ad38a 100644 --- a/SPECS/python-pyvmomi/python-pyvmomi.spec +++ b/SPECS/python-pyvmomi/python-pyvmomi.spec @@ -67,7 +67,7 @@ python3 setup.py test %{python3_sitelib}/* %changelog -* Sat May 09 00:20:41 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Wed Mar 18 2020 Paul Monson 6.7.3-1 diff --git a/SPECS/python-setuptools/python-setuptools.spec b/SPECS/python-setuptools/python-setuptools.spec index e64aae15d72..81fd7bca0c5 100644 --- a/SPECS/python-setuptools/python-setuptools.spec +++ b/SPECS/python-setuptools/python-setuptools.spec @@ -58,7 +58,7 @@ python2 setup.py test * Mon Nov 16 2020 Pawel Winogrodzki - 40.2.0-6 - Adding explicit runtime dependency on 'python-xml'. -* Sat May 09 00:21:39 PST 2020 Nick Samson - 40.2.0-5 +* Sat May 09 2020 Nick Samson - 40.2.0-5 - Added %%license line automatically * Tue Apr 07 2020 Pawel Winogrodzki 40.2.0-4 diff --git a/SPECS/python-setuptools_scm/python-setuptools_scm.spec b/SPECS/python-setuptools_scm/python-setuptools_scm.spec index 3d4aeba0c1f..fc593b7a193 100644 --- a/SPECS/python-setuptools_scm/python-setuptools_scm.spec +++ b/SPECS/python-setuptools_scm/python-setuptools_scm.spec @@ -74,7 +74,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:21:33 PST 2020 Nick Samson - 3.1.0-3 +* Sat May 09 2020 Nick Samson - 3.1.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.1.0-2 diff --git a/SPECS/python-simplejson/python-simplejson.spec b/SPECS/python-simplejson/python-simplejson.spec index e55a3b89369..bc1ef76def5 100644 --- a/SPECS/python-simplejson/python-simplejson.spec +++ b/SPECS/python-simplejson/python-simplejson.spec @@ -59,7 +59,7 @@ python3 setup.py test %{python3_sitelib}/* %changelog -* Sat May 09 00:21:11 PST 2020 Nick Samson - 3.17.0-2 +* Sat May 09 2020 Nick Samson - 3.17.0-2 - Added %%license line automatically * Thu Mar 19 2020 Paul Monson 3.17.0-1 diff --git a/SPECS/python-snowballstemmer/python-snowballstemmer.spec b/SPECS/python-snowballstemmer/python-snowballstemmer.spec index ce76163a0a3..ca16dde6a5d 100644 --- a/SPECS/python-snowballstemmer/python-snowballstemmer.spec +++ b/SPECS/python-snowballstemmer/python-snowballstemmer.spec @@ -83,7 +83,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{python3_sitelib}/* %changelog -* Sat May 09 00:21:18 PST 2020 Nick Samson - 1.2.1-4 +* Sat May 09 2020 Nick Samson - 1.2.1-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.2.1-3 diff --git a/SPECS/python-sphinx-theme-alabaster/python-sphinx-theme-alabaster.spec b/SPECS/python-sphinx-theme-alabaster/python-sphinx-theme-alabaster.spec index 3bbf4b7525f..24b4ae09dd5 100644 --- a/SPECS/python-sphinx-theme-alabaster/python-sphinx-theme-alabaster.spec +++ b/SPECS/python-sphinx-theme-alabaster/python-sphinx-theme-alabaster.spec @@ -66,7 +66,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{python3_sitelib}/* %changelog -* Sat May 09 00:21:16 PST 2020 Nick Samson - 0.7.11-5 +* Sat May 09 2020 Nick Samson - 0.7.11-5 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 0.7.11-4 diff --git a/SPECS/python-twisted/python-twisted.spec b/SPECS/python-twisted/python-twisted.spec index 9226f25167c..a62b6efbd0a 100644 --- a/SPECS/python-twisted/python-twisted.spec +++ b/SPECS/python-twisted/python-twisted.spec @@ -128,7 +128,7 @@ popd %{_bindir}/cftp3 %changelog -* Sat May 09 00:21:10 PST 2020 Nick Samson - 19.2.1-5 +* Sat May 09 2020 Nick Samson - 19.2.1-5 - Added %%license line automatically * Wed Apr 29 2020 Emre Girgin 19.2.1-4 diff --git a/SPECS/python-virtualenv/python-virtualenv.spec b/SPECS/python-virtualenv/python-virtualenv.spec index ee752629448..193c5f15c86 100644 --- a/SPECS/python-virtualenv/python-virtualenv.spec +++ b/SPECS/python-virtualenv/python-virtualenv.spec @@ -74,7 +74,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:41 PST 2020 Nick Samson - 16.0.0-5 +* Sat May 09 2020 Nick Samson - 16.0.0-5 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 16.0.0-4 diff --git a/SPECS/python-wcwidth/python-wcwidth.spec b/SPECS/python-wcwidth/python-wcwidth.spec index 03831e0c5f3..c76a1c8fe36 100644 --- a/SPECS/python-wcwidth/python-wcwidth.spec +++ b/SPECS/python-wcwidth/python-wcwidth.spec @@ -72,7 +72,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:59 PST 2020 Nick Samson - 0.1.7-4 +* Sat May 09 2020 Nick Samson - 0.1.7-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 0.1.7-3 diff --git a/SPECS/python-webob/python-webob.spec b/SPECS/python-webob/python-webob.spec index 7136f94a7fa..ed09a668ad9 100644 --- a/SPECS/python-webob/python-webob.spec +++ b/SPECS/python-webob/python-webob.spec @@ -79,7 +79,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:48 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 1.8.5-2 diff --git a/SPECS/python3/python3.spec b/SPECS/python3/python3.spec index 0a4079b7ad4..8ff288c41ec 100644 --- a/SPECS/python3/python3.spec +++ b/SPECS/python3/python3.spec @@ -289,7 +289,7 @@ make %{?_smp_mflags} test * Wed May 20 2020 Paul Monson - 3.7.3-8 - Fix variable use. -* Sat May 09 00:20:54 PST 2020 Nick Samson - 3.7.3-7 +* Sat May 09 2020 Nick Samson - 3.7.3-7 - Added %%license line automatically * Wed May 06 2020 Paul Monson - 3.7.3-6 diff --git a/SPECS/pytz/pytz.spec b/SPECS/pytz/pytz.spec index e6ecb3fa175..a98278137bc 100644 --- a/SPECS/pytz/pytz.spec +++ b/SPECS/pytz/pytz.spec @@ -87,7 +87,7 @@ popd %{python3_sitelib}/* %changelog -* Sat May 09 00:20:48 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 2018.5-4 diff --git a/SPECS/qemu-kvm/qemu-kvm.spec b/SPECS/qemu-kvm/qemu-kvm.spec index 78389df851b..c5aa0741134 100644 --- a/SPECS/qemu-kvm/qemu-kvm.spec +++ b/SPECS/qemu-kvm/qemu-kvm.spec @@ -295,7 +295,7 @@ fi * Thu May 21 2020 Suresh Babu Chalamalasetty - 4.2.0-8 - Fix CVE-2020-1711 and CVE-2020-7211. -* Sat May 09 00:20:51 PST 2020 Nick Samson - 4.2.0-7 +* Sat May 09 2020 Nick Samson - 4.2.0-7 - Added %%license line automatically * Fri May 1 2020 Emre Girgin - 4.2.0-6 diff --git a/SPECS/readline/readline.spec b/SPECS/readline/readline.spec index 77b56170eff..8b0073a6a9d 100644 --- a/SPECS/readline/readline.spec +++ b/SPECS/readline/readline.spec @@ -97,7 +97,7 @@ make %{?_smp_mflags} check %{_mandir}/man3/history.3.gz %{_mandir}/man3/readline.3.gz %changelog -* Sat May 09 00:20:46 PST 2020 Nick Samson - 7.0-4 +* Sat May 09 2020 Nick Samson - 7.0-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 7.0-3 diff --git a/SPECS/rpcbind/rpcbind.spec b/SPECS/rpcbind/rpcbind.spec index cea1f0232f7..900f8f37153 100644 --- a/SPECS/rpcbind/rpcbind.spec +++ b/SPECS/rpcbind/rpcbind.spec @@ -93,7 +93,7 @@ fi rm -rf %{buildroot}/* %changelog -* Sat May 09 00:20:40 PST 2020 Nick Samson - 1.2.5-3 +* Sat May 09 2020 Nick Samson - 1.2.5-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.2.5-2 diff --git a/SPECS/rpcsvc-proto/rpcsvc-proto.spec b/SPECS/rpcsvc-proto/rpcsvc-proto.spec index c47c07565bd..bff8c30f97e 100644 --- a/SPECS/rpcsvc-proto/rpcsvc-proto.spec +++ b/SPECS/rpcsvc-proto/rpcsvc-proto.spec @@ -43,7 +43,7 @@ make install DESTDIR=%{buildroot} %{_includedir}/rpcsvc/* %changelog -* Sat May 09 00:21:05 PST 2020 Nick Samson - 1.4-3 +* Sat May 09 2020 Nick Samson - 1.4-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.4-2 diff --git a/SPECS/rpm/rpm.spec b/SPECS/rpm/rpm.spec index 01915ee1cbb..b914f04981d 100644 --- a/SPECS/rpm/rpm.spec +++ b/SPECS/rpm/rpm.spec @@ -294,7 +294,7 @@ rm -rf %{buildroot} * Wed May 20 2020 Henry Beberman - 4.14.2-7 - Add BuildRequires and Requires for zstd support. -* Sat May 09 00:20:45 PST 2020 Nick Samson - 4.14.2-6 +* Sat May 09 2020 Nick Samson - 4.14.2-6 - Added %%license line automatically * Wed May 06 2020 Emre Girgin 4.14.2-5 diff --git a/SPECS/rrdtool/rrdtool.spec b/SPECS/rrdtool/rrdtool.spec index 3a32408649c..cf2f7c8bf78 100644 --- a/SPECS/rrdtool/rrdtool.spec +++ b/SPECS/rrdtool/rrdtool.spec @@ -79,7 +79,7 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:21:18 PST 2020 Nick Samson - 1.7.0-5 +* Sat May 09 2020 Nick Samson - 1.7.0-5 - Added %%license line automatically * Thu Apr 30 2020 Nicolas Ontiveros 1.7.0-4 diff --git a/SPECS/rsync/rsync.spec b/SPECS/rsync/rsync.spec index 4788594c63a..3ac3d9192fe 100644 --- a/SPECS/rsync/rsync.spec +++ b/SPECS/rsync/rsync.spec @@ -58,7 +58,7 @@ make %{?_smp_mflags} check %{_libdir}/systemd/system/rsyncd.service %{_sysconfdir}/rsyncd.conf %changelog -* Sat May 09 00:20:50 PST 2020 Nick Samson - 3.1.3-5 +* Sat May 09 2020 Nick Samson - 3.1.3-5 - Added %%license line automatically * Wed Apr 22 2020 Nicolas Ontiveros 3.1.3-4 diff --git a/SPECS/rsyslog/rsyslog.spec b/SPECS/rsyslog/rsyslog.spec index 50345fbf98d..19bbba6913f 100644 --- a/SPECS/rsyslog/rsyslog.spec +++ b/SPECS/rsyslog/rsyslog.spec @@ -80,7 +80,7 @@ make %{?_smp_mflags} check %{_sysconfdir}/systemd/journald.conf.d/* %{_sysconfdir}/rsyslog.conf %changelog -* Sat May 09 00:21:21 PST 2020 Nick Samson - 8.37.0-4 +* Sat May 09 2020 Nick Samson - 8.37.0-4 - Added %%license line automatically * Thu Apr 09 2020 Nicolas Ontiveros 8.37.0-3 diff --git a/SPECS/ruby/ruby.spec b/SPECS/ruby/ruby.spec index 3a70ef3c277..e91627df908 100644 --- a/SPECS/ruby/ruby.spec +++ b/SPECS/ruby/ruby.spec @@ -78,7 +78,7 @@ sudo -u test make test TESTS="-v" * Thu Oct 15 2020 Emre Girgin - 2.6.6-1 - Upgrade to 2.6.6 to resolve CVEs. -* Sat May 09 00:20:42 PST 2020 Nick Samson - 2.6.3-3 +* Sat May 09 2020 Nick Samson - 2.6.3-3 - Added %%license line automatically * Wed May 06 2020 Pawel Winogrodzki - 2.6.3-2 diff --git a/SPECS/rust/rust.spec b/SPECS/rust/rust.spec index 60df6419801..09f8810ca43 100644 --- a/SPECS/rust/rust.spec +++ b/SPECS/rust/rust.spec @@ -133,7 +133,7 @@ rm %{buildroot}%{_docdir}/%{name}/*.old * Thu May 28 2020 Chris Co - 1.39.0-5 - Update source checkout and prep steps -* Sat May 09 00:20:39 PST 2020 Nick Samson - 1.39.0-4 +* Sat May 09 2020 Nick Samson - 1.39.0-4 - Added %%license line automatically * Mon May 4 2020 Nicolas Guibourge - 1.39.0-3 diff --git a/SPECS/scons/scons.spec b/SPECS/scons/scons.spec index e9ce9928f68..19214d8611d 100644 --- a/SPECS/scons/scons.spec +++ b/SPECS/scons/scons.spec @@ -45,7 +45,7 @@ rm -rf %{buildroot} %{_datadir}/* %changelog -* Sat May 09 00:21:02 PST 2020 Nick Samson - 3.0.1-4 +* Sat May 09 2020 Nick Samson - 3.0.1-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 3.0.1-3 diff --git a/SPECS/sed/sed.spec b/SPECS/sed/sed.spec index b5b5b011c8e..da3c3d3fd7d 100644 --- a/SPECS/sed/sed.spec +++ b/SPECS/sed/sed.spec @@ -52,7 +52,7 @@ make check %defattr(-,root,root) %changelog -* Sat May 09 00:21:19 PST 2020 Nick Samson - 4.5-3 +* Sat May 09 2020 Nick Samson - 4.5-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.5-2 diff --git a/SPECS/sg3_utils/sg3_utils.spec b/SPECS/sg3_utils/sg3_utils.spec index 550f4be5cba..d4795bb9875 100644 --- a/SPECS/sg3_utils/sg3_utils.spec +++ b/SPECS/sg3_utils/sg3_utils.spec @@ -54,7 +54,7 @@ install -m 755 scripts/rescan-scsi-bus.sh %{buildroot}/%{_bindir} %{_includedir}/scsi/* %changelog -* Sat May 09 00:21:08 PST 2020 Nick Samson - 1.44-2 +* Sat May 09 2020 Nick Samson - 1.44-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 1.44-1 diff --git a/SPECS/shadow-utils/shadow-utils.spec b/SPECS/shadow-utils/shadow-utils.spec index f96e625ff83..79c9bd1209f 100644 --- a/SPECS/shadow-utils/shadow-utils.spec +++ b/SPECS/shadow-utils/shadow-utils.spec @@ -148,7 +148,7 @@ make %{?_smp_mflags} check * Mon Dec 14 2020 Suresh Babu Chalamalasetty - 4.6-9 - Remove PASS_MAX_DAYS customized value 90 to set default value -* Sat May 09 00:20:53 PST 2020 Nick Samson - 4.6-8 +* Sat May 09 2020 Nick Samson - 4.6-8 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 4.6-7 diff --git a/SPECS/slang/slang.spec b/SPECS/slang/slang.spec index 0d0406d9d8e..af751bbf790 100644 --- a/SPECS/slang/slang.spec +++ b/SPECS/slang/slang.spec @@ -62,7 +62,7 @@ make check %{_libdir}/pkgconfig/*.pc %changelog -* Sat May 09 00:21:27 PST 2020 Nick Samson - 2.3.2-3 +* Sat May 09 2020 Nick Samson - 2.3.2-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.3.2-2 diff --git a/SPECS/snappy/snappy.spec b/SPECS/snappy/snappy.spec index 2c7296e7a6f..0410e07944e 100644 --- a/SPECS/snappy/snappy.spec +++ b/SPECS/snappy/snappy.spec @@ -66,7 +66,7 @@ make test %{_lib64dir}/libsnappy.so %changelog -* Sat May 09 00:21:08 PST 2020 Nick Samson - 1.1.7-5 +* Sat May 09 2020 Nick Samson - 1.1.7-5 - Added %%license line automatically * Fri Apr 10 2020 Nick Samson 1.1.7-4 diff --git a/SPECS/socat/socat.spec b/SPECS/socat/socat.spec index 1fa068e3f17..071e3b85b20 100644 --- a/SPECS/socat/socat.spec +++ b/SPECS/socat/socat.spec @@ -39,7 +39,7 @@ rm -rf %{buildroot}/* %{_mandir}/man1/* %changelog -* Sat May 09 00:21:12 PST 2020 Nick Samson - 1.7.3.4-2 +* Sat May 09 2020 Nick Samson - 1.7.3.4-2 - Added %%license line automatically * Tue Mar 24 2020 Henry Beberman 1.7.3.4-1 diff --git a/SPECS/sshpass/sshpass.spec b/SPECS/sshpass/sshpass.spec index 83683c029af..450a9063ac4 100644 --- a/SPECS/sshpass/sshpass.spec +++ b/SPECS/sshpass/sshpass.spec @@ -35,7 +35,7 @@ rm -rf %{buildroot}/* %{_mandir}/man1 %changelog -* Sat May 09 00:21:39 PST 2020 Nick Samson - 1.06-3 +* Sat May 09 2020 Nick Samson - 1.06-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.06-2 diff --git a/SPECS/swupdate/swupdate.spec b/SPECS/swupdate/swupdate.spec index dca1ce95e9b..2f9a30efb96 100644 --- a/SPECS/swupdate/swupdate.spec +++ b/SPECS/swupdate/swupdate.spec @@ -146,7 +146,7 @@ fi * Thu May 28 2020 Emre Girgin 2019.11-4 - Remove the ifarch clause around Patch0 to unify the SRPM files accross architectures. -* Sat May 09 00:20:47 PST 2020 Nick Samson - 2019.11-3 +* Sat May 09 2020 Nick Samson - 2019.11-3 - Added %%license line automatically * Thu Apr 23 2020 Pawel Winogrodzki 2019.11-2 diff --git a/SPECS/syslinux/syslinux.spec b/SPECS/syslinux/syslinux.spec index d717c09eaec..c39f58dd31f 100644 --- a/SPECS/syslinux/syslinux.spec +++ b/SPECS/syslinux/syslinux.spec @@ -68,7 +68,7 @@ rm %{buildroot}/%{_bindir}/sha1pass %changelog * Thu Jun 11 2020 Henry Beberman 6.04-9 - Disable hardened ldflags to fix build. -* Sat May 09 00:20:51 PST 2020 Nick Samson - 6.04-8 +* Sat May 09 2020 Nick Samson - 6.04-8 - Added %%license line automatically * Mon May 04 2020 Emre Girgin 6.04-7 - Replace BuildArch with ExclusiveArch diff --git a/SPECS/systemtap/systemtap.spec b/SPECS/systemtap/systemtap.spec index 4ac78f52413..7e1e20eadd8 100644 --- a/SPECS/systemtap/systemtap.spec +++ b/SPECS/systemtap/systemtap.spec @@ -357,7 +357,7 @@ fi %{_mandir}/man8/systemtap-service.8* %changelog -* Sat May 09 00:20:54 PST 2020 Nick Samson - 4.1-5 +* Sat May 09 2020 Nick Samson - 4.1-5 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 4.1-4 diff --git a/SPECS/tcl/tcl.spec b/SPECS/tcl/tcl.spec index 38cac940097..5953d19dbc7 100644 --- a/SPECS/tcl/tcl.spec +++ b/SPECS/tcl/tcl.spec @@ -99,7 +99,7 @@ make test %changelog -* Sat May 09 00:20:55 PST 2020 Nick Samson - 8.6.8-3 +* Sat May 09 2020 Nick Samson - 8.6.8-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 8.6.8-2 diff --git a/SPECS/tcpdump/tcpdump.spec b/SPECS/tcpdump/tcpdump.spec index 15082341742..e647b9e13d7 100644 --- a/SPECS/tcpdump/tcpdump.spec +++ b/SPECS/tcpdump/tcpdump.spec @@ -42,7 +42,7 @@ make %{?_smp_mflags} check - Patch CVE-2020-8037 - Lint to Mariner style -* Sat May 09 00:21:40 PST 2020 Nick Samson - 4.9.3-2 +* Sat May 09 2020 Nick Samson - 4.9.3-2 - Added %%license line automatically * Tue Apr 21 2020 Emre Girgin - 4.9.3-1 diff --git a/SPECS/tdnf/tdnf.spec b/SPECS/tdnf/tdnf.spec index c85d454e534..8fe1ed32cd1 100644 --- a/SPECS/tdnf/tdnf.spec +++ b/SPECS/tdnf/tdnf.spec @@ -223,7 +223,7 @@ find %{buildroot} -name '*.pyc' -delete - Upgrade to 2.1.0. - Add support for multiple gpgkeys in the .repo file. -* Sat May 09 00:21:26 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Apr 07 2020 Nicolas Ontiveros - 2.0.0-16 diff --git a/SPECS/texinfo/texinfo.spec b/SPECS/texinfo/texinfo.spec index 20dda30e819..f5e34b9853d 100644 --- a/SPECS/texinfo/texinfo.spec +++ b/SPECS/texinfo/texinfo.spec @@ -56,7 +56,7 @@ rm -rf %{buildroot}%{_infodir} %{_libdir}/texinfo/* %changelog -* Sat May 09 00:20:40 PST 2020 Nick Samson - 6.5-7 +* Sat May 09 2020 Nick Samson - 6.5-7 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin 6.5-6 diff --git a/SPECS/tmux/tmux.spec b/SPECS/tmux/tmux.spec index 2331d4470e2..870661a3ea3 100644 --- a/SPECS/tmux/tmux.spec +++ b/SPECS/tmux/tmux.spec @@ -33,7 +33,7 @@ make %{?_smp_mflags} check /usr/share/* %exclude /usr/src %changelog -* Sat May 09 00:20:46 PST 2020 Nick Samson - 2.7-3 +* Sat May 09 2020 Nick Samson - 2.7-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.7-2 diff --git a/SPECS/traceroute/traceroute.spec b/SPECS/traceroute/traceroute.spec index 84e64353511..ad9a5bd5e64 100644 --- a/SPECS/traceroute/traceroute.spec +++ b/SPECS/traceroute/traceroute.spec @@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat May 09 00:21:24 PST 2020 Nick Samson - 2.1.0-5 +* Sat May 09 2020 Nick Samson - 2.1.0-5 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.1.0-4 diff --git a/SPECS/tree/tree.spec b/SPECS/tree/tree.spec index 97eb51fbcd6..0ef40da59d4 100644 --- a/SPECS/tree/tree.spec +++ b/SPECS/tree/tree.spec @@ -31,7 +31,7 @@ make install BINDIR=%{buildroot}%{_bindir} \ %{_mandir}/man1/* %changelog -* Sat May 09 00:21:03 PST 2020 Nick Samson - 1.7.0-3 +* Sat May 09 2020 Nick Samson - 1.7.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.7.0-2 diff --git a/SPECS/tzdata/tzdata.spec b/SPECS/tzdata/tzdata.spec index 91406d29cf1..41ffeda6cb5 100644 --- a/SPECS/tzdata/tzdata.spec +++ b/SPECS/tzdata/tzdata.spec @@ -47,7 +47,7 @@ ln -svf %{_datarootdir}/zoneinfo/UTC %{buildroot}%{_sysconfdir}/localtime - Update to version "2021a". - Removed 'pacificnew' and 'systemv' from parsed zone info, since they have been removed from the sources. -* Sat May 09 00:21:12 PST 2020 Nick Samson - 2019c-3 +* Sat May 09 2020 Nick Samson - 2019c-3 - Added %%license line automatically * Tue Apr 07 2020 Paul Monson 2019c-2 diff --git a/SPECS/unixODBC/unixODBC.spec b/SPECS/unixODBC/unixODBC.spec index 8c95da4074b..9d6c7cb04c5 100644 --- a/SPECS/unixODBC/unixODBC.spec +++ b/SPECS/unixODBC/unixODBC.spec @@ -71,7 +71,7 @@ rm -rf %{buildroot}%{_datadir}/libtool %{_libdir}/pkgconfig %changelog -* Sat May 09 00:20:58 PST 2020 Nick Samson - 2.3.7-3 +* Sat May 09 2020 Nick Samson - 2.3.7-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.3.7-2 diff --git a/SPECS/unzip/unzip.spec b/SPECS/unzip/unzip.spec index b4d0c63df69..0bf9fd001c4 100644 --- a/SPECS/unzip/unzip.spec +++ b/SPECS/unzip/unzip.spec @@ -82,7 +82,7 @@ make %{?_smp_mflags} check - Add patches for CVE-2014-8139, CVE-2014-8140, CVE-2014-8141, CVE-2019-13232 - Fix detection for CVE-2015-7696, CVE-2015-7697, CVE-2018-18384 - Rename CVE-2014-9844 patch to CVE-2016-9844 -* Sat May 09 00:21:29 PST 2020 Nick Samson - 6.0-13 +* Sat May 09 2020 Nick Samson - 6.0-13 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 6.0-12 - Initial CBL-Mariner import from Photon (license: Apache2). diff --git a/SPECS/userspace-rcu/userspace-rcu.spec b/SPECS/userspace-rcu/userspace-rcu.spec index 9b80ba6f25b..233de9b6880 100644 --- a/SPECS/userspace-rcu/userspace-rcu.spec +++ b/SPECS/userspace-rcu/userspace-rcu.spec @@ -58,7 +58,7 @@ make %{?_smp_mflags} check %changelog -* Sat May 09 00:21:25 PST 2020 Nick Samson - 0.10.1-4 +* Sat May 09 2020 Nick Samson - 0.10.1-4 - Added %%license line automatically * Tue Apr 07 2020 Joe Schmitt 0.10.1-3 diff --git a/SPECS/utf8proc/utf8proc.spec b/SPECS/utf8proc/utf8proc.spec index 8495f5defaf..b87a0f66931 100644 --- a/SPECS/utf8proc/utf8proc.spec +++ b/SPECS/utf8proc/utf8proc.spec @@ -58,7 +58,7 @@ make check %{_libdir}/libutf8proc.so %changelog -* Sat May 09 00:21:13 PST 2020 Nick Samson - 2.2.0-3 +* Sat May 09 2020 Nick Samson - 2.2.0-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.2.0-2 diff --git a/SPECS/util-linux/util-linux.spec b/SPECS/util-linux/util-linux.spec index 1e3ddae380f..cbbfa01e2ba 100644 --- a/SPECS/util-linux/util-linux.spec +++ b/SPECS/util-linux/util-linux.spec @@ -101,7 +101,7 @@ rm -rf %{buildroot}/lib/systemd/system %{_mandir}/man3/* %changelog -* Sat May 09 00:20:52 PST 2020 Nick Samson +* Sat May 09 2020 Nick Samson - Added %%license line automatically * Tue Apr 14 2020 Emre Girgin 2.32.1-2 diff --git a/SPECS/valgrind/valgrind.spec b/SPECS/valgrind/valgrind.spec index d39ad2597c5..4d9ba1eb842 100644 --- a/SPECS/valgrind/valgrind.spec +++ b/SPECS/valgrind/valgrind.spec @@ -48,7 +48,7 @@ make %{?_smp_mflags} -k check %changelog * Mon Jun 01 2020 Henry Beberman - 3.15.0-3 - Fix compilation by disabling -fstack-protector-strong -* Sat May 09 00:21:13 PST 2020 Nick Samson - 3.15.0-2 +* Sat May 09 2020 Nick Samson - 3.15.0-2 - Added %%license line automaticall * Wed Mar 18 2020 Henry Beberman 3.15.0-1 - Update to 3.15.0. Fix Source0 URL. Removed patch fixed upstream. License verified. diff --git a/SPECS/vsftpd/vsftpd.spec b/SPECS/vsftpd/vsftpd.spec index cac7a18a47a..c365462de22 100644 --- a/SPECS/vsftpd/vsftpd.spec +++ b/SPECS/vsftpd/vsftpd.spec @@ -85,7 +85,7 @@ fi %{_datadir}/* %changelog -* Sat May 09 00:20:57 PST 2020 Nick Samson - 3.0.3-10 +* Sat May 09 2020 Nick Samson - 3.0.3-10 - Added %%license line automatically * Tue Apr 28 2020 Emre Girgin 3.0.3-9 diff --git a/SPECS/which/which.spec b/SPECS/which/which.spec index e52a89c2528..154025719a6 100644 --- a/SPECS/which/which.spec +++ b/SPECS/which/which.spec @@ -26,7 +26,7 @@ rm -rf %{buildroot}%{_infodir} %{_bindir}/* %{_mandir}/man1/* %changelog -* Sat May 09 00:21:25 PST 2020 Nick Samson - 2.21-7 +* Sat May 09 2020 Nick Samson - 2.21-7 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 2.21-6 diff --git a/SPECS/wpa_supplicant/wpa_supplicant.spec b/SPECS/wpa_supplicant/wpa_supplicant.spec index 09fb3f0ca09..3dd42b305e1 100644 --- a/SPECS/wpa_supplicant/wpa_supplicant.spec +++ b/SPECS/wpa_supplicant/wpa_supplicant.spec @@ -112,7 +112,7 @@ EOF - Update version to 2.9. - Add patch for CVE-2019-16275. -* Sat May 09 00:20:37 PST 2020 Nick Samson - 2.7-4 +* Sat May 09 2020 Nick Samson - 2.7-4 - Added %%license line automatically * Fri Apr 17 2020 Nicolas Ontiveros - 2.7-3 diff --git a/SPECS/xfsprogs/xfsprogs.spec b/SPECS/xfsprogs/xfsprogs.spec index 0ccc6fff3a7..38f836297a7 100644 --- a/SPECS/xfsprogs/xfsprogs.spec +++ b/SPECS/xfsprogs/xfsprogs.spec @@ -87,7 +87,7 @@ rm -rf %{buildroot}/* %defattr(-,root,root) %changelog -* Sat May 09 00:21:13 PST 2020 Nick Samson - 5.0.0-2 +* Sat May 09 2020 Nick Samson - 5.0.0-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 5.0.0-1 diff --git a/SPECS/xinetd/xinetd.spec b/SPECS/xinetd/xinetd.spec index eacbda24004..b8f54a20f47 100644 --- a/SPECS/xinetd/xinetd.spec +++ b/SPECS/xinetd/xinetd.spec @@ -71,7 +71,7 @@ rm -rf %{buildroot} %{_libdir}/systemd/system-preset/50-xinetd.preset %changelog -* Sat May 09 00:21:40 PST 2020 Nick Samson - 2.3.15-12 +* Sat May 09 2020 Nick Samson - 2.3.15-12 - Added %%license line automatically * Tue Apr 07 2020 Joe Schmitt 2.3.15-11 diff --git a/SPECS/xmlsec1/xmlsec1.spec b/SPECS/xmlsec1/xmlsec1.spec index 1f1faa6144e..3ae377eff60 100644 --- a/SPECS/xmlsec1/xmlsec1.spec +++ b/SPECS/xmlsec1/xmlsec1.spec @@ -84,7 +84,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_prefix}/share/man/man1/xmlsec1-config.1.gz %changelog -* Sat May 09 00:21:10 PST 2020 Nick Samson - 1.2.26-5 +* Sat May 09 2020 Nick Samson - 1.2.26-5 - Added %%license line automatically * Fri Apr 24 2020 Pawel Winogrodzki 1.2.26-4 diff --git a/SPECS/xmlto/xmlto.spec b/SPECS/xmlto/xmlto.spec index 4946570ad05..1c5db231263 100644 --- a/SPECS/xmlto/xmlto.spec +++ b/SPECS/xmlto/xmlto.spec @@ -48,7 +48,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} %{_datadir}/xmlto/* %changelog -* Sat May 09 00:21:23 PST 2020 Nick Samson - 0.0.28-5 +* Sat May 09 2020 Nick Samson - 0.0.28-5 - Added %%license line automatically * Tue May 05 2020 Emre Girgin 0.0.28-4 diff --git a/SPECS/xz/xz.spec b/SPECS/xz/xz.spec index 52cd1bc675e..746d2247692 100644 --- a/SPECS/xz/xz.spec +++ b/SPECS/xz/xz.spec @@ -97,7 +97,7 @@ make %{?_smp_mflags} check %defattr(-,root,root) %changelog -* Sat May 09 00:21:42 PST 2020 Nick Samson - 5.2.4-3 +* Sat May 09 2020 Nick Samson - 5.2.4-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 5.2.4-2 diff --git a/SPECS/zeromq/zeromq.spec b/SPECS/zeromq/zeromq.spec index fb74d313ac7..4170ac1fd72 100644 --- a/SPECS/zeromq/zeromq.spec +++ b/SPECS/zeromq/zeromq.spec @@ -56,7 +56,7 @@ make check %{_includedir}/ %changelog -* Sat May 09 00:20:47 PST 2020 Nick Samson - 4.3.2-2 +* Sat May 09 2020 Nick Samson - 4.3.2-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 4.3.2-1 diff --git a/SPECS/zlib/zlib.spec b/SPECS/zlib/zlib.spec index 5bcf169e18f..c027f38a28b 100644 --- a/SPECS/zlib/zlib.spec +++ b/SPECS/zlib/zlib.spec @@ -47,7 +47,7 @@ make %{?_smp_mflags} check %{_mandir}/man3/zlib.3.gz %changelog -* Sat May 09 00:20:52 PST 2020 Nick Samson - 1.2.11-3 +* Sat May 09 2020 Nick Samson - 1.2.11-3 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 1.2.11-2 diff --git a/SPECS/zsh/zsh.spec b/SPECS/zsh/zsh.spec index 1b20d91adb2..6379006bfb1 100644 --- a/SPECS/zsh/zsh.spec +++ b/SPECS/zsh/zsh.spec @@ -140,7 +140,7 @@ fi - Adding a patch to skip globbing test if ran as root. - Removing redundant 'sed' and 'chmod' commands in %%install. -* Sat May 09 00:20:44 PST 2020 Nick Samson - 5.8-3 +* Sat May 09 2020 Nick Samson - 5.8-3 - Added %%license line automatically * Thu Apr 30 2020 Emre Girgin - 5.8-2 From 1a8fe5b4ca5d618e1560895ed2d344038741866c Mon Sep 17 00:00:00 2001 From: Nick Samson Date: Thu, 3 Jun 2021 16:32:57 -0700 Subject: [PATCH 80/83] Updated zeromq to 4.3.4 to address CVE-2021-20236 (#1014) * Updated zeromq to 4.3.4 to address CVE-2021-20236 * Updated cgmanifest for zeromq upgrade * Applied spec linter changes to zeromq spec --- SPECS/zeromq/zeromq.signatures.json | 4 ++-- SPECS/zeromq/zeromq.spec | 29 ++++++++++++++++++++--------- cgmanifest.json | 4 ++-- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/SPECS/zeromq/zeromq.signatures.json b/SPECS/zeromq/zeromq.signatures.json index 1ad8074056e..30157d315d6 100644 --- a/SPECS/zeromq/zeromq.signatures.json +++ b/SPECS/zeromq/zeromq.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libzmq-4.3.2.tar.gz": "02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb" + "zeromq-4.3.4.tar.gz": "c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5" } -} \ No newline at end of file +} diff --git a/SPECS/zeromq/zeromq.spec b/SPECS/zeromq/zeromq.spec index 4170ac1fd72..ea89579dee3 100644 --- a/SPECS/zeromq/zeromq.spec +++ b/SPECS/zeromq/zeromq.spec @@ -1,13 +1,13 @@ Summary: library for fast, message-based applications Name: zeromq -Version: 4.3.2 -Release: 2%{?dist} -URL: https://www.zeromq.org +Version: 4.3.4 +Release: 1%{?dist} License: LGPLv3+ -Group: System Environment/Libraries Vendor: Microsoft Corporation Distribution: Mariner -Source0: https://github.com/zeromq/libzmq/archive/v%{version}/libzmq-%{version}.tar.gz +Group: System Environment/Libraries +URL: https://www.zeromq.org +Source0: https://github.com/zeromq/libzmq/releases/download/v%{version}/zeromq-%{version}.tar.gz Requires: libstdc++ %description @@ -18,24 +18,27 @@ queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more. %package devel -Summary: Header and development files for zeromq -Requires: %{name} = %{version} +Summary: Header and development files for zeromq +Requires: %{name} = %{version} + %description devel It contains the libraries and header files to create applications %prep -%setup -q -n libzmq-%{version} +%autosetup -n zeromq-%{version} -p1 + %build ./autogen.sh ./configure \ --prefix=%{_prefix} \ --with-libsodium=no \ + --without-docs \ --disable-static make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install -find %{buildroot}%{_libdir} -name '*.la' -delete +find %{buildroot} -type f -name "*.la" -delete -print %check make check @@ -56,18 +59,26 @@ make check %{_includedir}/ %changelog +* Thu Jun 03 2021 Nick Samson - 4.3.4-1 +- Upgraded to 4.3.4 to address CVE-2021-20236, updated URL + * Sat May 09 2020 Nick Samson - 4.3.2-2 - Added %%license line automatically * Wed Mar 18 2020 Henry Beberman 4.3.2-1 - Update to 4.3.2. Source0 URL fixed. License verified. + * Tue Sep 03 2019 Mateusz Malisz 4.2.3-2 - Initial CBL-Mariner import from Photon (license: Apache2). + * Thu Sep 13 2018 Siju Maliakkal 4.2.3-1 - Updated to latest version + * Fri Sep 15 2017 Bo Gan 4.1.4-3 - Remove devpts mount + * Mon Aug 07 2017 Chang Lee 4.1.4-2 - Fixed %check + * Thu Apr 13 2017 Dheeraj Shetty 4.1.4-1 - Initial build. First version diff --git a/cgmanifest.json b/cgmanifest.json index e4f97df0741..7c79dc6c21d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -7625,8 +7625,8 @@ "type": "other", "other": { "name": "zeromq", - "version": "4.3.2", - "downloadUrl": "https://github.com/zeromq/libzmq/archive/v4.3.2/libzmq-4.3.2.tar.gz" + "version": "4.3.4", + "downloadUrl": "https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz" } } }, From cfcca07fd0fdfa0e9a3737025971e4c78fb4cb7f Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Thu, 3 Jun 2021 17:12:10 -0700 Subject: [PATCH 81/83] Update Mariner Release for May Update (#1012) --- SPECS/mariner-release/mariner-release.spec | 4 +++- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 2 +- toolkit/resources/manifests/package/toolchain_x86_64.txt | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SPECS/mariner-release/mariner-release.spec b/SPECS/mariner-release/mariner-release.spec index 278180e207c..3bf8b44101c 100644 --- a/SPECS/mariner-release/mariner-release.spec +++ b/SPECS/mariner-release/mariner-release.spec @@ -1,7 +1,7 @@ Summary: CBL-Mariner release files Name: mariner-release Version: 1.0 -Release: 16%{?dist} +Release: 17%{?dist} License: MIT Group: System Environment/Base URL: https://aka.ms/cbl-mariner @@ -67,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/issue.net %changelog +* Thu Jun 3 2021 Jon Slobodzian - 1.0-17 +- Updating version for May update * Wed Apr 27 2021 Jon Slobodzian - 1.0-16 - Updating version for April update * Tue Mar 30 2021 Jon Slobodzian - 1.0-15 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index d7ea77b730b..88a8ac019c2 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -58,7 +58,7 @@ findutils-lang-4.6.0-7.cm1.aarch64.rpm gettext-0.19.8.1-4.cm1.aarch64.rpm gzip-1.9-5.cm1.aarch64.rpm make-4.2.1-5.cm1.aarch64.rpm -mariner-release-1.0-16.cm1.noarch.rpm +mariner-release-1.0-17.cm1.noarch.rpm patch-2.7.6-7.cm1.aarch64.rpm util-linux-2.32.1-3.cm1.aarch64.rpm util-linux-devel-2.32.1-3.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index b12158721a7..fc3312750f7 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -58,7 +58,7 @@ findutils-lang-4.6.0-7.cm1.x86_64.rpm gettext-0.19.8.1-4.cm1.x86_64.rpm gzip-1.9-5.cm1.x86_64.rpm make-4.2.1-5.cm1.x86_64.rpm -mariner-release-1.0-16.cm1.noarch.rpm +mariner-release-1.0-17.cm1.noarch.rpm patch-2.7.6-7.cm1.x86_64.rpm util-linux-2.32.1-3.cm1.x86_64.rpm util-linux-devel-2.32.1-3.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 0b820464c7c..6d76730f2b7 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -240,7 +240,7 @@ m4-debuginfo-1.4.18-4.cm1.aarch64.rpm make-4.2.1-5.cm1.aarch64.rpm make-debuginfo-4.2.1-5.cm1.aarch64.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm -mariner-release-1.0-16.cm1.noarch.rpm +mariner-release-1.0-17.cm1.noarch.rpm mariner-repos-1.0-13.cm1.noarch.rpm mariner-repos-extras-1.0-13.cm1.noarch.rpm mariner-repos-extras-preview-1.0-13.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index d08ab8319fe..6f67f81a5bb 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -240,7 +240,7 @@ m4-debuginfo-1.4.18-4.cm1.x86_64.rpm make-4.2.1-5.cm1.x86_64.rpm make-debuginfo-4.2.1-5.cm1.x86_64.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm -mariner-release-1.0-16.cm1.noarch.rpm +mariner-release-1.0-17.cm1.noarch.rpm mariner-repos-1.0-13.cm1.noarch.rpm mariner-repos-extras-1.0-13.cm1.noarch.rpm mariner-repos-extras-preview-1.0-13.cm1.noarch.rpm From acdb3bf2d1e50536f0cb8266d540f59d2baca875 Mon Sep 17 00:00:00 2001 From: Mateusz Malisz Date: Thu, 3 Jun 2021 18:45:13 -0700 Subject: [PATCH 82/83] Update libxml2 to 2.9.12-1 * Update libxml2 * Update manifests * Update changelog * Update cgmanifest --- SPECS/libxml2/CVE-2019-20388.patch | 32 ----------------- SPECS/libxml2/CVE-2020-24977.patch | 35 ------------------- SPECS/libxml2/CVE-2020-7595.patch | 31 ---------------- SPECS/libxml2/libxml2.signatures.json | 4 +-- SPECS/libxml2/libxml2.spec | 10 +++--- cgmanifest.json | 4 +-- .../manifests/package/pkggen_core_aarch64.txt | 4 +-- .../manifests/package/pkggen_core_x86_64.txt | 4 +-- .../manifests/package/toolchain_aarch64.txt | 10 +++--- .../manifests/package/toolchain_x86_64.txt | 10 +++--- 10 files changed, 23 insertions(+), 121 deletions(-) delete mode 100644 SPECS/libxml2/CVE-2019-20388.patch delete mode 100644 SPECS/libxml2/CVE-2020-24977.patch delete mode 100644 SPECS/libxml2/CVE-2020-7595.patch diff --git a/SPECS/libxml2/CVE-2019-20388.patch b/SPECS/libxml2/CVE-2019-20388.patch deleted file mode 100644 index d62751f6bda..00000000000 --- a/SPECS/libxml2/CVE-2019-20388.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Tue, 20 Aug 2019 16:33:06 +0800 -Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream - -When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun -alloc a new schema for ctxt->schema and set vctxt->xsiAssemble -to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize -vctxt->xsiAssemble to 0 again which cause the alloced schema -can not be freed anymore. - -Found with libFuzzer. - -Signed-off-by: Zhipeng Xie ---- - xmlschemas.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c84499..39d92182f 100644 ---- a/xmlschemas.c -+++ b/xmlschemas.c -@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { - vctxt->nberrors = 0; - vctxt->depth = -1; - vctxt->skipDepth = -1; -- vctxt->xsiAssemble = 0; - vctxt->hasKeyrefs = 0; - #ifdef ENABLE_IDC_NODE_TABLES_TEST - vctxt->createIDCNodeTables = 1; --- -GitLab diff --git a/SPECS/libxml2/CVE-2020-24977.patch b/SPECS/libxml2/CVE-2020-24977.patch deleted file mode 100644 index f8ad63065c5..00000000000 --- a/SPECS/libxml2/CVE-2020-24977.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 7 Aug 2020 21:54:27 +0200 -Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout' - -Make sure that truncated UTF-8 sequences don't cause an out-of-bounds -array access. - -Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for -the report. - -Fixes #178. ---- - xmllint.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xmllint.c b/xmllint.c -index f6a8e4636..c647486f3 100644 ---- a/xmllint.c -+++ b/xmllint.c -@@ -528,6 +528,12 @@ static void - xmlHTMLEncodeSend(void) { - char *result; - -+ /* -+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might -+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid -+ * an out-of-bounds read. -+ */ -+ memset(&buffer[sizeof(buffer)-4], 0, 4); - result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); - if (result) { - xmlGenericError(xmlGenericErrorContext, "%s", result); --- -GitLab diff --git a/SPECS/libxml2/CVE-2020-7595.patch b/SPECS/libxml2/CVE-2020-7595.patch deleted file mode 100644 index b639483f355..00000000000 --- a/SPECS/libxml2/CVE-2020-7595.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Thu, 12 Dec 2019 17:30:55 +0800 -Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities - -When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef -return NULL which cause a infinite loop in xmlStringLenDecodeEntities - -Found with libFuzzer. - -Signed-off-by: Zhipeng Xie ---- - parser.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index d1c319631..a34bb6cdd 100644 ---- a/parser.c -+++ b/parser.c -@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - else - c = 0; - while ((c != 0) && (c != end) && /* non input consuming loop */ -- (c != end2) && (c != end3)) { -+ (c != end2) && (c != end3) && -+ (ctxt->instate != XML_PARSER_EOF)) { - - if (c == 0) break; - if ((c == '&') && (str[1] == '#')) { --- -GitLab diff --git a/SPECS/libxml2/libxml2.signatures.json b/SPECS/libxml2/libxml2.signatures.json index 6b4f7588d14..042e089dbc7 100644 --- a/SPECS/libxml2/libxml2.signatures.json +++ b/SPECS/libxml2/libxml2.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libxml2-2.9.10.tar.gz": "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f" + "libxml2-2.9.12.tar.gz": "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92" } -} \ No newline at end of file +} diff --git a/SPECS/libxml2/libxml2.spec b/SPECS/libxml2/libxml2.spec index 5e0a590ebee..119cd06f55a 100644 --- a/SPECS/libxml2/libxml2.spec +++ b/SPECS/libxml2/libxml2.spec @@ -2,17 +2,14 @@ %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} Summary: Libxml2 Name: libxml2 -Version: 2.9.10 -Release: 4%{?dist} +Version: 2.9.12 +Release: 1%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/General Libraries URL: http://www.xmlsoft.org/ Source0: ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz -Patch0: CVE-2019-20388.patch -Patch1: CVE-2020-7595.patch -Patch2: CVE-2020-24977.patch BuildRequires: python2-devel BuildRequires: python2-libs BuildRequires: python3-devel @@ -105,6 +102,9 @@ rm -rf %{buildroot}/* %{_libdir}/cmake/libxml2/libxml2-config.cmake %changelog +* Thu May 27 2021 Mateusz Malisz - 2.9.12-1 +- Update to version 2.9.12 to fix CVE-2021-3517, CVE-2021-3518 and CVE-2021-3537 + * Wed Mar 03 2021 Andrew Phelps - 2.9.10-4 - Skip python tests which are known to be broken. diff --git a/cgmanifest.json b/cgmanifest.json index 7c79dc6c21d..1c2fa07dffb 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3195,8 +3195,8 @@ "type": "other", "other": { "name": "libxml2", - "version": "2.9.10", - "downloadUrl": "ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz" + "version": "2.9.12", + "downloadUrl": "ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 88a8ac019c2..40a8346bd85 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -137,8 +137,8 @@ tdnf-cli-libs-2.1.0-6.cm1.aarch64.rpm tdnf-devel-2.1.0-6.cm1.aarch64.rpm tdnf-plugin-repogpgcheck-2.1.0-6.cm1.aarch64.rpm createrepo_c-0.11.1-6.cm1.aarch64.rpm -libxml2-2.9.10-4.cm1.aarch64.rpm -libxml2-devel-2.9.10-4.cm1.aarch64.rpm +libxml2-2.9.12-1.cm1.aarch64.rpm +libxml2-devel-2.9.12-1.cm1.aarch64.rpm glib-2.58.0-9.cm1.aarch64.rpm libltdl-2.4.6-5.cm1.aarch64.rpm libltdl-devel-2.4.6-5.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index fc3312750f7..5d50c211835 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -137,8 +137,8 @@ tdnf-cli-libs-2.1.0-6.cm1.x86_64.rpm tdnf-devel-2.1.0-6.cm1.x86_64.rpm tdnf-plugin-repogpgcheck-2.1.0-6.cm1.x86_64.rpm createrepo_c-0.11.1-6.cm1.x86_64.rpm -libxml2-2.9.10-4.cm1.x86_64.rpm -libxml2-devel-2.9.10-4.cm1.x86_64.rpm +libxml2-2.9.12-1.cm1.x86_64.rpm +libxml2-devel-2.9.12-1.cm1.x86_64.rpm glib-2.58.0-9.cm1.x86_64.rpm libltdl-2.4.6-5.cm1.x86_64.rpm libltdl-devel-2.4.6-5.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 6d76730f2b7..7904ff02c42 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -218,10 +218,10 @@ libtasn1-debuginfo-4.14-2.cm1.aarch64.rpm libtasn1-devel-4.14-2.cm1.aarch64.rpm libtool-2.4.6-5.cm1.aarch64.rpm libtool-debuginfo-2.4.6-5.cm1.aarch64.rpm -libxml2-2.9.10-4.cm1.aarch64.rpm -libxml2-debuginfo-2.9.10-4.cm1.aarch64.rpm -libxml2-devel-2.9.10-4.cm1.aarch64.rpm -libxml2-python-2.9.10-4.cm1.aarch64.rpm +libxml2-2.9.12-1.cm1.aarch64.rpm +libxml2-debuginfo-2.9.12-1.cm1.aarch64.rpm +libxml2-devel-2.9.12-1.cm1.aarch64.rpm +libxml2-python-2.9.12-1.cm1.aarch64.rpm libxslt-1.1.34-2.cm1.aarch64.rpm libxslt-debuginfo-1.1.34-2.cm1.aarch64.rpm libxslt-devel-1.1.34-2.cm1.aarch64.rpm @@ -331,7 +331,7 @@ python2-test-2.7.18-6.cm1.aarch64.rpm python2-tools-2.7.18-6.cm1.aarch64.rpm python3-cracklib-2.9.7-2.cm1.aarch64.rpm python3-gpg-1.13.1-6.cm1.aarch64.rpm -python3-libxml2-2.9.10-4.cm1.aarch64.rpm +python3-libxml2-2.9.12-1.cm1.aarch64.rpm python3-pwquality-1.4.2-6.cm1.aarch64.rpm python3-rpm-4.14.2-11.cm1.aarch64.rpm python-curses-2.7.18-6.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 6f67f81a5bb..46c2c1d3fb5 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -218,10 +218,10 @@ libtasn1-debuginfo-4.14-2.cm1.x86_64.rpm libtasn1-devel-4.14-2.cm1.x86_64.rpm libtool-2.4.6-5.cm1.x86_64.rpm libtool-debuginfo-2.4.6-5.cm1.x86_64.rpm -libxml2-2.9.10-4.cm1.x86_64.rpm -libxml2-debuginfo-2.9.10-4.cm1.x86_64.rpm -libxml2-devel-2.9.10-4.cm1.x86_64.rpm -libxml2-python-2.9.10-4.cm1.x86_64.rpm +libxml2-2.9.12-1.cm1.x86_64.rpm +libxml2-debuginfo-2.9.12-1.cm1.x86_64.rpm +libxml2-devel-2.9.12-1.cm1.x86_64.rpm +libxml2-python-2.9.12-1.cm1.x86_64.rpm libxslt-1.1.34-2.cm1.x86_64.rpm libxslt-debuginfo-1.1.34-2.cm1.x86_64.rpm libxslt-devel-1.1.34-2.cm1.x86_64.rpm @@ -331,7 +331,7 @@ python2-test-2.7.18-6.cm1.x86_64.rpm python2-tools-2.7.18-6.cm1.x86_64.rpm python3-cracklib-2.9.7-2.cm1.x86_64.rpm python3-gpg-1.13.1-6.cm1.x86_64.rpm -python3-libxml2-2.9.10-4.cm1.x86_64.rpm +python3-libxml2-2.9.12-1.cm1.x86_64.rpm python3-pwquality-1.4.2-6.cm1.x86_64.rpm python3-rpm-4.14.2-11.cm1.x86_64.rpm python-curses-2.7.18-6.cm1.x86_64.rpm From a5478dd37f107e5935acf8b5a68c5211189776d7 Mon Sep 17 00:00:00 2001 From: Mateusz Malisz Date: Thu, 3 Jun 2021 19:03:45 -0700 Subject: [PATCH 83/83] Implement tooling changes to support delta builds (#998) --- toolkit/Makefile | 1 + toolkit/scripts/download-packages.sh | 99 +++++++++++++++++++ toolkit/scripts/filter-packages.sh | 76 ++++++++++++++ toolkit/scripts/pkggen.mk | 4 +- toolkit/scripts/srpm_pack.mk | 29 ++++++ toolkit/scripts/toolchain.mk | 27 +++-- toolkit/scripts/toolkit.mk | 3 + toolkit/scripts/tools.mk | 6 +- .../tools/graphpkgfetcher/graphpkgfetcher.go | 1 + 9 files changed, 229 insertions(+), 17 deletions(-) create mode 100755 toolkit/scripts/download-packages.sh create mode 100755 toolkit/scripts/filter-packages.sh diff --git a/toolkit/Makefile b/toolkit/Makefile index 250e46bf86d..804d62ab533 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -23,6 +23,7 @@ INCREMENTAL_TOOLCHAIN ?= n UPDATE_TOOLCHAIN_LIST ?= n REBUILD_PACKAGES ?= y DOWNLOAD_SRPMS ?= n +ALLOW_SRPM_DOWNLOAD_FAIL ?= n REBUILD_TOOLS ?= n RUN_CHECK ?= n USE_UPDATE_REPO ?= y diff --git a/toolkit/scripts/download-packages.sh b/toolkit/scripts/download-packages.sh new file mode 100755 index 00000000000..a8d50190f77 --- /dev/null +++ b/toolkit/scripts/download-packages.sh @@ -0,0 +1,99 @@ +#!/bin/bash -e + +function get_packages { + # First argument is an URL to a directory containing packages + download_url="$1" + + # wget -nv -O - "$download_url" -- Download HTML of package directory and send to stdout (-nv reduces verbosity) + # | grep 'a href' -- Filter out lines that are not links (we're looking for links to rpms) + # | sed -E -e 's: space-separated list of directories in the RPM repository (passed with the -u) (e.g. "base update")' + echo '[OPTIONAL] -h -> print this help dialogue and exit' + echo '[MANDATORY] -t TYPE -> select which type of packages to download. Can provide more than one type, separated by space. The valid types are: x86_64 aarch64 srpms' + echo '[MANDATORY] -u URL -> URL to a root directory of a repository (e.g. https://packages.microsoft.com/cbl-mariner/1.0/prod/)' + echo '[OPTIONAL] -z -> create a tarball for each downloaded package type and clean up' +} + +repository_url= +packages_types= +directories= +tar_packages=0 + +while getopts "d:ht:u:z" OPTIONS; do + case ${OPTIONS} in + d ) directories="$OPTARG" ;; + h ) help; exit 0 ;; + t ) packages_types="$OPTARG" ;; + u ) repository_url=$OPTARG ;; + z ) tar_packages=1 ;; + ? ) echo -e "ERROR: INVALID OPTION.\n\n"; help; exit 1 ;; + esac +done + +if [[ -z "$directories" ]] || [[ -z "$packages_types" ]] || [[ -z "$repository_url" ]]; then + echo -e "ERROR: Arguments '-d', '-t' and '-u' are mandatory!\n\n" + help + exit 2 +fi + +# Remove trailing directory separator, if any +if [[ $repository_url =~ ^.+/$ ]]; then + echo "-- Removing trailing directory separator from $repository_url" + repository_url=`echo $repository_url | head -c -2` +fi + +# For benchmark purposes +before_run=$(date +%s) + +# Iterate over directories and types, downloading the files +for directory in $directories; do + echo "-- Downloading directory $directory..." + for package_type in $packages_types; do + echo "-- Downloading type $package_type for directory $directory..." + + # If these are not srpms, there is additional directory to skip + appendix= + if [[ ! "$package_type" == "srpms" ]]; then + echo "-- Downloading RPMS - adding additional directory." + appendix="/rpms" + fi + + # Appendix contains the slash, if needed. + get_packages "$repository_url"/"$directory"/"$package_type""$appendix" + done +done + +if [[ 1 == $tar_packages ]]; then + make_tarball +fi + +echo "Total execution time:" +after_run=$(date +%s) +date -d@$((before_run - now)) -u +%H:%M:%S diff --git a/toolkit/scripts/filter-packages.sh b/toolkit/scripts/filter-packages.sh new file mode 100755 index 00000000000..ddbab175058 --- /dev/null +++ b/toolkit/scripts/filter-packages.sh @@ -0,0 +1,76 @@ +#!/bin/bash -e + +function filter_packages { + # First argument is a path to the packages directory + rpms_directory="$1" + + # Used later + fields_cutoff=2 + if [[ $ignore_versions -eq 1 ]]; then + fields_cutoff=3 + fi + + duplicates_list=$(find "$rpms_directory" -name '*.rpm' -exec basename {} \; | # Find all the rpms leaving only file names + sort -V | # Sort to stack duplicates together. Sort like version numbers (-V) + rev | # Read backwards to inverse the order of the fields + cut -d'-' -f ${fields_cutoff}- | # Separate into fields by '-' skipping the first two (in case of ignore_versions - 3) + # (actually last - we're inversed) fields (filters out release and extension) + # in case of -i being passed, ignore versions as well. + rev | # Return to normal order + uniq -d | # Print only duplicates + awk '{print}' ORS=' ') # Join lines with space instead of newline + + remove_function="rm -v" + if [[ $pretend -eq 1 ]]; then + remove_function="echo Would remove: " + fi + + for duplicate in $duplicates_list; do + echo "Processing package '$duplicate'." + name_search="${duplicate}-[0-9]*" + + # and remove them (explicitly list removed items) + packages_to_remove=$(find "$rpms_directory" -name "$name_search" |# Find all the RPM files with the same name (different versions treated as different names without -i) + sort -V -r | # Read backwards and sort a version numbers (-V) and print in reverse(-r) to have the latest version at the top. + tail -n +2) # After the sort, the first path is of the latest version. Get a list of all the other RPMs (duplicates), starting line 2. + + for package in $packages_to_remove; do + $remove_function "$package" + done + + # Run a more advanced query again to work correctly when doing a -p run + echo "Left:" $(find "$rpms_directory" -name "$name_search" | sort -V -r | awk '{print}' ORS=' ' | cut -d' ' -f1 ) + echo #newline + done +} + +function help { + echo "Package filter. Filter out (remove) duplicate packages." + echo "Usage:" + echo '[MANDATORY] -d DIR -> path to the directory which contains RPMS (this will) affect all subdirectories' + echo '[OPTIONAL] -h -> print this help dialogue and exit' + echo '[OPTIONAL] -i -> ignore version numbers when looking for the duplicates.' + echo '[OPTIONAL] -p -> pretend mode - just print the packages without removing them' +} + +directory= +pretend=0 +ignore_versions=0 + +while getopts "d:hpi" OPTIONS; do + case ${OPTIONS} in + d ) directory="$OPTARG" ;; + h ) help; exit 0 ;; + i ) ignore_versions=1 ;; + p ) pretend=1 ;; + ? ) echo -e "ERROR: INVALID OPTION.\n\n"; help; exit 1 ;; + esac +done + +if [[ -z "$directory" ]]; then + echo -e "ERROR: Argument '-d' is mandatory!\n\n" + help + exit 2 +fi + +filter_packages "$directory" diff --git a/toolkit/scripts/pkggen.mk b/toolkit/scripts/pkggen.mk index 5a63a941c69..8d4f87ad399 100644 --- a/toolkit/scripts/pkggen.mk +++ b/toolkit/scripts/pkggen.mk @@ -182,13 +182,13 @@ endif $(call print_error,Failed to build: $$(cat $(LOGS_DIR)/pkggen/failures.txt)); } && \ touch $@ -# use temp tarball to avoid tar warning "file changed as we read it" +# use temp tarball to avoid tar warning "file changed as we read it" # that can sporadically occur when tarball is the dir that is compressed compress-rpms: tar -I $(ARCHIVE_TOOL) -cvp -f $(BUILD_DIR)/temp_rpms_tarball.tar.gz -C $(RPMS_DIR)/.. $(notdir $(RPMS_DIR)) mv $(BUILD_DIR)/temp_rpms_tarball.tar.gz $(pkggen_archive) -# use temp tarball to avoid tar warning "file changed as we read it" +# use temp tarball to avoid tar warning "file changed as we read it" # that can sporadically occur when tarball is the dir that is compressed compress-srpms: tar -I $(ARCHIVE_TOOL) -cvp -f $(BUILD_DIR)/temp_srpms_tarball.tar.gz -C $(SRPMS_DIR)/.. $(notdir $(SRPMS_DIR)) diff --git a/toolkit/scripts/srpm_pack.mk b/toolkit/scripts/srpm_pack.mk index 29d5966bcbd..80fc42ccc35 100644 --- a/toolkit/scripts/srpm_pack.mk +++ b/toolkit/scripts/srpm_pack.mk @@ -38,6 +38,33 @@ $(BUILD_SRPMS_DIR): $(STATUS_FLAGS_DIR)/build_srpms.flag @echo Finished updating $@ ifeq ($(DOWNLOAD_SRPMS),y) + +.SILENT: $(STATUS_FLAGS_DIR)/build_srpms.flag + +ifeq ($(ALLOW_SRPM_DOWNLOAD_FAIL),y) +$(STATUS_FLAGS_DIR)/build_srpms.flag: $(local_specs) $(local_spec_dirs) $(SPECS_DIR) $(LOGS_DIR)/pkggen + for spec in $(local_specs); do \ + spec_file=$${spec} && \ + spec_name=$$(basename "$${spec_file}") && \ + srpm_file=$$(rpmspec -q $${spec_file} --srpm --define='with_check 1' --define='dist $(DIST_TAG)' --queryformat %{NAME}-%{VERSION}-%{RELEASE}.src.rpm 2>"$(LOGS_DIR)/pkggen/$${spec_name}") && \ + log_file="$(LOGS_DIR)/pkggen/$$srpm_file.log" && \ + mkdir -p $(BUILD_SRPMS_DIR) && \ + cd $(BUILD_SRPMS_DIR) && \ + touch $(BUILD_SRPMS_DIR)/$${srpm_file} && \ + for url in $(SRPM_URL_LIST); do \ + wget $${url}/$${srpm_file} \ + $(if $(TLS_CERT),--certificate=$(TLS_CERT)) \ + $(if $(TLS_KEY),--private-key=$(TLS_KEY)) \ + -a $$log_file && \ + break; \ + done && echo "Downloaded $${url}/$${srpm_file}"; \ + done ; \ + echo "Removing empty (failed) SRPMS: " + find $(BUILD_SRPMS_DIR) -type f -empty -delete -print | tee $(LOGS_DIR)/pkggen/deleted-srpms.log + echo "Removed all empty SRPMS. Finished packing." + touch $@ + +else $(STATUS_FLAGS_DIR)/build_srpms.flag: $(local_specs) $(local_spec_dirs) $(SPECS_DIR) for spec in $(local_specs); do \ spec_file=$${spec} && \ @@ -56,6 +83,8 @@ $(STATUS_FLAGS_DIR)/build_srpms.flag: $(local_specs) $(local_spec_dirs) $(SPECS_ $(call print_error,Failed to download $${srpm_file}); } \ done || $(call print_error,Loop in $@ failed) ; \ touch $@ +endif + else $(STATUS_FLAGS_DIR)/build_srpms.flag: $(local_specs) $(local_spec_dirs) $(local_sources) $(SPECS_DIR) $(go-srpmpacker) $(go-srpmpacker) \ diff --git a/toolkit/scripts/toolchain.mk b/toolkit/scripts/toolchain.mk index 7e47e3dd40c..610be490e05 100644 --- a/toolkit/scripts/toolchain.mk +++ b/toolkit/scripts/toolchain.mk @@ -25,15 +25,15 @@ toolchain_files = \ $(shell find $(SCRIPTS_DIR)/toolchain/SCRIPTS ) \ $(SCRIPTS_DIR)/toolchain/container/Dockerfile -toolchain_manifest = $(TOOLCHAIN_MANIFESTS_DIR)/toolchain_$(build_arch).txt +TOOLCHAIN_MANIFEST ?= $(TOOLCHAIN_MANIFESTS_DIR)/toolchain_$(build_arch).txt # Find the *.rpm corresponding to each of the entries in the manifest # regex operation: (.*\.([^\.]+)\.rpm) extracts *.().rpm" to determine # the exact path of the required rpm # Outputs: $(toolchain_rpms_dir)//..rpm sed_regex_full_path = 's`(.*\.([^\.]+)\.rpm)`$(toolchain_rpms_dir)/\2/\1`p' -toolchain_rpms := $(shell sed -nr $(sed_regex_full_path) < $(toolchain_manifest)) -toolchain_rpms_buildarch := $(shell grep $(build_arch) $(toolchain_manifest)) -toolchain_rpms_noarch := $(shell grep noarch $(toolchain_manifest)) +toolchain_rpms := $(shell sed -nr $(sed_regex_full_path) < $(TOOLCHAIN_MANIFEST)) +toolchain_rpms_buildarch := $(shell grep $(build_arch) $(TOOLCHAIN_MANIFEST)) +toolchain_rpms_noarch := $(shell grep noarch $(TOOLCHAIN_MANIFEST)) $(call create_folder,$(toolchain_build_dir)) $(call create_folder,$(toolchain_downloads_logs_dir)) @@ -165,7 +165,7 @@ ifeq ($(REBUILD_TOOLCHAIN),y) # The basic set of RPMs can always be produced by bootstrapping the toolchain. # Try to skip extracting individual RPMS if the toolchain step has already placed # them into the RPM folder. -$(toolchain_rpms): $(toolchain_manifest) | $(final_toolchain) +$(toolchain_rpms): $(TOOLCHAIN_MANIFEST) | $(final_toolchain) @echo Extracting RPM $@ from toolchain && \ if [ ! -f $@ -o $(final_toolchain) -nt $@ ]; then \ mkdir -p $(dir $@) && \ @@ -185,7 +185,7 @@ $(STATUS_FLAGS_DIR)/toolchain_local_temp.flag: $(TOOLCHAIN_ARCHIVE) $(shell find touch $(BUILD_DIR)/toolchain_temp/* && \ touch $@ -$(toolchain_rpms): $(toolchain_manifest) $(toolchain_local_temp) +$(toolchain_rpms): $(TOOLCHAIN_MANIFEST) $(toolchain_local_temp) tempFile=$(toolchain_local_temp)/$(notdir $@) && \ if [ ! -f $@ -o $(TOOLCHAIN_ARCHIVE) -nt $@ ]; then \ echo Extracting RPM $@ from toolchain && \ @@ -197,7 +197,7 @@ $(toolchain_rpms): $(toolchain_manifest) $(toolchain_local_temp) else # Download from online package server $(toolchain_rpms): - @rpm_filename="$(notdir $@)" && \ + rpm_filename="$(notdir $@)" && \ rpm_dir="$(dir $@)" && \ log_file="$(toolchain_downloads_logs_dir)/$$rpm_filename.log" && \ echo "Downloading toolchain RPM: $$rpm_filename" | tee "$$log_file" && \ @@ -207,15 +207,14 @@ $(toolchain_rpms): wget $$url/$$rpm_filename \ $(if $(TLS_CERT),--certificate=$(TLS_CERT)) \ $(if $(TLS_KEY),--private-key=$(TLS_KEY)) \ - -a $$log_file \ - && \ + -a $$log_file && \ echo "Downloaded toolchain RPM: $$rpm_filename" >> $$log_file && \ break; \ done || { \ - echo "\nERROR: Failed to download toolchain package: $$rpm_filename." && \ - echo "ERROR: Last $(toolchain_log_tail_length) lines from log '$$log_file':\n" && \ - tail -n$(toolchain_log_tail_length) $$log_file | sed 's/^/\t/' && \ - $(call print_error,\nToolchain download failed. See above errors for more details.) \ - } + echo "\nERROR: Failed to download toolchain package: $$rpm_filename." && \ + echo "ERROR: Last $(toolchain_log_tail_length) lines from log '$$log_file':\n" && \ + tail -n$(toolchain_log_tail_length) $$log_file | sed 's/^/\t/' && \ + $(call print_error,\nToolchain download failed. See above errors for more details.) \ + } endif endif diff --git a/toolkit/scripts/toolkit.mk b/toolkit/scripts/toolkit.mk index 4a8d79634af..926d96e9ffe 100644 --- a/toolkit/scripts/toolkit.mk +++ b/toolkit/scripts/toolkit.mk @@ -42,3 +42,6 @@ package-toolkit: go-tools echo "$(toolkit_version)" > $(toolkit_release_file) && \ rm -rf $(toolkit_build_dir)/out && \ tar -I $(ARCHIVE_TOOL) -cvp -f $(toolkit_archive) -C $(toolkit_build_dir)/.. $(notdir $(toolkit_build_dir)) + +print-build-summary: + sed -E -n 's:^.+level=info msg="Built \(([^\)]+)\) -> \[(.+)\].+$:\1\t\2:gp' $(LOGS_DIR)/pkggen/rpmbuilding/* | tee $(LOGS_DIR)/pkggen/build-summary.csv diff --git a/toolkit/scripts/tools.mk b/toolkit/scripts/tools.mk index 47ed0924fcc..9830b9659a2 100644 --- a/toolkit/scripts/tools.mk +++ b/toolkit/scripts/tools.mk @@ -125,7 +125,11 @@ clean-chroot-tools: rm -rf $(BUILD_DIR)/worker && \ rm -rf $(BUILD_DIR)/validatechroot -worker_chroot_manifest = $(TOOLCHAIN_MANIFESTS_DIR)/pkggen_core_$(build_arch).txt +# Worker chroot manifest is a file corresponding to the TOOLCHAIN_MANIFEST name. +toolchain_config_name=$(notdir $(TOOLCHAIN_MANIFEST)) +worker_manifest_name=$(shell echo "$(toolchain_config_name)" | sed -E 's:^toolchain:pkggen_core:' ) +worker_chroot_manifest = $(TOOLCHAIN_MANIFESTS_DIR)/$(worker_manifest_name) +#$(TOOLCHAIN_MANIFESTS_DIR)/pkggen_core_$(build_arch).txt # Find the *.rpm corresponding to each of the entries in the manifest # regex operation: (.*\.([^\.]+)\.rpm) extracts *.().rpm" to determine # the exact path of the required rpm diff --git a/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go b/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go index dbd68437008..aa47bfe7dfb 100644 --- a/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go +++ b/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go @@ -163,6 +163,7 @@ func resolveSingleNode(cloner *rpmrepocloner.RpmRepoCloner, node *pkggraph.PkgNo if err != nil { logger.Log.Errorf("Failed to clone %s from RPM repo. Error: %s", node, err) } else { + logger.Log.Debugf("Successfully cloned %s.", node) node.State = pkggraph.StateCached } return