[main] [tpm2-tools] [tpm2-abrmd] [tpm2-tss] Update tpm2-* packages (#1972)

* Update tpm2-abrmd to 2.4.0

* Update tpm2-tools to 4.3.2

* Update tpm2-tss to 2.4.6

* update cgmanifest.json

* Apply linter suggestions

* Verified licenses

* Fix changelog whitespace
This commit is contained in:
Daniel McIlvaney 2022-01-24 12:27:11 -08:00 коммит произвёл GitHub
Родитель 10f5bfc84c
Коммит 3d198c6ab6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 125 добавлений и 87 удалений

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"tpm2-abrmd-2.3.3.tar.gz": "1e587808c6739079d59f124d9c1a0058f8d34dd84f1f656c946667fa0a181c48"
"tpm2-abrmd-2.4.0.tar.gz": "044522f1568f3d5334878f0564f808ec9fdd6a4ac5d0f3bd75ae6f2c7551a96c"
}
}

Просмотреть файл

@ -1,32 +1,39 @@
Summary: TPM2 Access Broker & Resource Management Daemon implementing the TCG spec
Name: tpm2-abrmd
Version: 2.3.3
Release: 1%{?dist}
License: BSD 2-Clause
URL: https://github.com/tpm2-software/tpm2-abrmd/releases/
Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz
Group: System Environment/Security
Summary: TPM2 Access Broker & Resource Management Daemon implementing the TCG spec
Name: tpm2-abrmd
Version: 2.4.0
Release: 1%{?dist}
License: BSD 2-Clause
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Security
URL: https://github.com/tpm2-software/tpm2-abrmd/releases/
Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: dbus-devel
BuildRequires: glib-devel
BuildRequires: tpm2-tss-devel
BuildRequires: which
Requires: dbus
Requires: glib
Requires: tpm2-tss
BuildRequires: which dbus-devel glib-devel tpm2-tss-devel
Requires: dbus glib tpm2-tss
%description
TPM2 Access Broker & Resource Management Daemon implementing the TCG spec
%package devel
Summary: The libraries and header files needed for TSS2 ABRMD development.
Requires: %{name} = %{version}-%{release}
Summary: The libraries and header files needed for TSS2 ABRMD development.
Requires: %{name} = %{version}-%{release}
%description devel
The libraries and header files needed for TSS2 ABRMD development.
%prep
%setup -q
%build
%configure \
--disable-static \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-dbuspolicydir=/etc/dbus-1/system.d
--with-systemdsystemunitdir=%{_libdir}/systemd/system \
--with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d
make %{?_smp_mflags}
@ -58,13 +65,20 @@ make DESTDIR=%{buildroot} install
%{_mandir}/man7
%changelog
* Sun Sep 27 2020 Daniel McIlvaney <damcilva@microsoft.com> 2.3.3-1
- Update to 2.3.3 to solve incompatibility with tpm2-tss 2.4.0
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.1.1-2
- Added %%license line automatically
* Wed Mar 18 2020 Henry Beberman <henry.beberman@microsoft.com> 2.1.1-1
- Update to 2.1.1. Fix URL. Fix Source0 URL. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.1.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 2.1.0-1
- Initial build. First version
* Tue Jan 18 2022 Daniel McIlvaney <damcilva@microsoft.com> - 2.4.0-1
- Update to version 2.4.0
* Sun Sep 27 2020 Daniel McIlvaney <damcilva@microsoft.com> 2.3.3-1
- Update to 2.3.3 to solve incompatibility with tpm2-tss 2.4.0
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.1.1-2
- Added %%license line automatically
* Wed Mar 18 2020 Henry Beberman <henry.beberman@microsoft.com> 2.1.1-1
- Update to 2.1.1. Fix URL. Fix Source0 URL. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.1.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 2.1.0-1
- Initial build. First version

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"tpm2-tools-4.2.tar.gz": "1baaccd8bd663e9dd70cf6d8f99f16897ea32b9106860967ebb259d81954f904"
"tpm2-tools-4.3.2.tar.gz": "e2802d4093a24b2c65b1f913d0f4c68eadde9b8fd8a9b7a3b17a6e50765e8350"
}
}

Просмотреть файл

@ -1,25 +1,27 @@
Summary: The source repository for the TPM (Trusted Platform Module) 2 tools
Name: tpm2-tools
Version: 4.2
Release: 2%{?dist}
License: BSD 3-Clause
URL: https://github.com/tpm2-software/tpm2-tools
Group: System Environment/Security
Version: 4.3.2
Release: 1%{?dist}
License: BSD
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Security
URL: https://github.com/tpm2-software/tpm2-tools
Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: CVE-2021-3565.patch
BuildRequires: openssl-devel
BuildRequires: curl-devel
BuildRequires: openssl-devel
BuildRequires: tpm2-tss-devel >= 2.3.0
Requires: openssl curl
Requires: tpm2-tss >= 2.3.0
Requires: /bin/awk
Requires: curl
Requires: openssl
Requires: tpm2-tss >= 2.3.0
%description
The source repository for the TPM (Trusted Platform Module) 2 tools
%prep
%autosetup -p1
%build
%configure \
--disable-static
@ -38,16 +40,24 @@ make DESTDIR=%{buildroot} install
%{_datarootdir}/bash-completion/completions/tss2_*
%changelog
* Tue Jun 22 2021 Suresh Babu Chalamalasetty <schalam@microsoft.com> 4.2-2
- CVE-2021-3565 fix
* Tue Jan 18 2022 Daniel McIlvaney <damcilva@microsoft.com> - 4.3.2-1
- Update to 4.3.2.
- Verified license
* Tue Aug 25 2020 Daniel McIlvaney <damcilva@microsoft.com> 4.2-1
- Update to 4.2.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.1.4-2
- Added %%license line automatically
* Fri Mar 13 2020 Paul Monson <paulmon@microsoft.com> 3.1.4-1
- Update to version 3.1.4.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.1.3-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 3.1.3-1
- Initial build. First version
* Tue Jun 22 2021 Suresh Babu Chalamalasetty <schalam@microsoft.com> 4.2-2
- CVE-2021-3565 fix
* Tue Aug 25 2020 Daniel McIlvaney <damcilva@microsoft.com> 4.2-1
- Update to 4.2.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.1.4-2
- Added %%license line automatically
* Fri Mar 13 2020 Paul Monson <paulmon@microsoft.com> 3.1.4-1
- Update to version 3.1.4.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.1.3-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 3.1.3-1
- Initial build. First version

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"tpm2-tss-2.4.0.tar.gz": "81c548a73adf584a5ad306b5d4318140b298e724510e5883277fea4df9652e87"
"tpm2-tss-2.4.6.tar.gz": "20e6da532a7ef90c8e50cca51f276053ec505eee0167c18e2b07c1e747118b58"
}
}

Просмотреть файл

@ -1,35 +1,40 @@
Summary: OSS implementation of the TCG TPM2 Software Stack (TSS2)
Name: tpm2-tss
Version: 2.4.0
Release: 2%{?dist}
License: BSD
URL: https://github.com/tpm2-software/tpm2-tss
Group: System Environment/Security
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: openssl-devel
BuildRequires: json-c-devel
Requires: openssl
Requires: json-c
Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
Summary: OSS implementation of the TCG TPM2 Software Stack (TSS2)
Name: tpm2-tss
Version: 2.4.6
Release: 1%{?dist}
License: BSD
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Security
URL: https://github.com/tpm2-software/tpm2-tss
Source0: https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: json-c-devel
BuildRequires: openssl-devel
Requires: json-c
Requires: openssl
Requires(postun): %{_sbindir}/groupdel
Requires(postun): %{_sbindir}/userdel
Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd
%description
OSS implementation of the TCG TPM2 Software Stack (TSS2)
%package devel
Summary: The libraries and header files needed for TSS2 development.
Requires: %{name} = %{version}-%{release}
Summary: The libraries and header files needed for TSS2 development.
Requires: %{name} = %{version}-%{release}
%description devel
The libraries and header files needed for TSS2 development.
%prep
%setup -q
%build
%configure \
--disable-static \
--disable-doxygen-doc \
--with-udevrulesdir=/etc/udev/rules.d
--with-udevrulesdir=%{_sysconfdir}/udev/rules.d
make %{?_smp_mflags}
@ -39,14 +44,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
%post
/sbin/ldconfig
mkdir -p /var/lib/tpm
mkdir -p %{_sharedstatedir}/tpm
if [ $1 -eq 1 ]; then
# this is initial installation
if ! getent group tss >/dev/null; then
groupadd tss
fi
if ! getent passwd tss >/dev/null; then
useradd -c "TCG Software Stack" -d /var/lib/tpm -g tss \
useradd -c "TCG Software Stack" -d %{_sharedstatedir}/tpm -g tss \
-s /bin/false tss
fi
fi
@ -78,20 +83,29 @@ fi
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%{_libdir}/*.so.0
%{_mandir}/man3
%{_mandir}/man7
%{_mandir}/man3/*
%{_mandir}/man5/*
%{_mandir}/man7/*
%changelog
* Tue Jan 18 2022 Daniel McIlvaney <damcilva@microsoft.com> - 2.4.6-1
- Update to version 2.4.6
- Verified license
* Fri Sep 10 2021 Thomas Crain <thcrain@microsoft.com> - 2.4.0-2
- Remove libtool archive files from final packaging
* Tue Aug 25 2020 Daniel McIlvaney <damcilva@microsoft.com> 2.4.0-1
- Update to 2.4.0.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 2.2.0-4
- Added %%license line automatically
* Fri Apr 10 2020 Nick Samson <nisamson@microsoft.com> 2.2.0-3
- Updated Source0. Removed %%define sha1. Updated license abbreviation and validated license.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.2.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 2.2.0-1
- Initial build. First version
* Tue Aug 25 2020 Daniel McIlvaney <damcilva@microsoft.com> 2.4.0-1
- Update to 2.4.0.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 2.2.0-4
- Added %%license line automatically
* Fri Apr 10 2020 Nick Samson <nisamson@microsoft.com> 2.2.0-3
- Updated Source0. Removed %%define sha1. Updated license abbreviation and validated license.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.2.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Feb 21 2019 Alexey Makhalov <amakhalov@vmware.com> 2.2.0-1
- Initial build. First version

Просмотреть файл

@ -28417,8 +28417,8 @@
"type": "other",
"other": {
"name": "tpm2-abrmd",
"version": "2.3.3",
"downloadUrl": "https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.3.3/tpm2-abrmd-2.3.3.tar.gz"
"version": "2.4.0",
"downloadUrl": "https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.4.0/tpm2-abrmd-2.4.0.tar.gz"
}
}
},
@ -28437,8 +28437,8 @@
"type": "other",
"other": {
"name": "tpm2-tools",
"version": "4.2",
"downloadUrl": "https://github.com/tpm2-software/tpm2-tools/releases/download/4.2/tpm2-tools-4.2.tar.gz"
"version": "4.3.2",
"downloadUrl": "https://github.com/tpm2-software/tpm2-tools/releases/download/4.3.2/tpm2-tools-4.3.2.tar.gz"
}
}
},
@ -28447,8 +28447,8 @@
"type": "other",
"other": {
"name": "tpm2-tss",
"version": "2.4.0",
"downloadUrl": "https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.0/tpm2-tss-2.4.0.tar.gz"
"version": "2.4.6",
"downloadUrl": "https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.6/tpm2-tss-2.4.6.tar.gz"
}
}
},