Skip to content

Revert "Update tpm2 tools to 4.2, tss to 2.4.0" #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dmcilvaney wants to merge 1 commit into from
Closed

Revert "Update tpm2 tools to 4.2, tss to 2.4.0" #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SPECS/tpm2-tools/tpm2-tools.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"tpm2-tools-4.2.tar.gz": "1baaccd8bd663e9dd70cf6d8f99f16897ea32b9106860967ebb259d81954f904"
"tpm2-tools-3.1.4.tar.gz": "2f515200e9a7958ee13015150f7958c8a332eb071c2564c33f81ebe32c4f6033"
}
}
35 changes: 14 additions & 21 deletions SPECS/tpm2-tools/tpm2-tools.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
Summary: The source repository for the TPM (Trusted Platform Module) 2 tools
Name: tpm2-tools
Version: 4.2
Release: 1%{?dist}
License: BSD 2-Clause
URL: https://github.com/tpm2-software/tpm2-tools
Group: System Environment/Security
Summary: The source repository for the TPM (Trusted Platform Module) 2 tools
Name: tpm2-tools
Version: 3.1.4
Release: 2%{?dist}
License: BSD 2-Clause
URL: https://github.com/tpm2-software/tpm2-tools
Group: System Environment/Security
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: openssl-devel
BuildRequires: curl-devel
BuildRequires: tpm2-tss-devel >= 2.3.0
Requires: openssl curl
Requires: tpm2-tss >= 2.3.0
Requires: /bin/awk
Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: openssl-devel curl-devel tpm2-tss-devel
Requires: openssl curl tpm2-tss
%description
The source repository for the TPM (Trusted Platform Module) 2 tools

Expand All @@ -30,17 +26,14 @@ make DESTDIR=%{buildroot} install

%files
%defattr(-,root,root)
%license doc/LICENSE
%license LICENSE
%{_bindir}/*
%{_mandir}/man1
%{_datarootdir}/bash-completion/completions/tpm2_*
%{_datarootdir}/bash-completion/completions/tss2_*

%changelog
* 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
* Sat May 09 00:21:43 PST 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
Expand Down
2 changes: 1 addition & 1 deletion SPECS/tpm2-tss/tpm2-tss.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"tpm2-tss-2.4.0.tar.gz": "81c548a73adf584a5ad306b5d4318140b298e724510e5883277fea4df9652e87"
"tpm2-tss-2.2.0.tar.gz": "c9131eaf3a22affaad58688915957e855d23608eb1c007c0f1e00681f3e32583"
}
}
16 changes: 5 additions & 11 deletions SPECS/tpm2-tss/tpm2-tss.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
Summary: OSS implementation of the TCG TPM2 Software Stack (TSS2)
Name: tpm2-tss
Version: 2.4.0
Release: 1%{?dist}
Version: 2.2.0
Release: 4%{?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
%description
Expand Down Expand Up @@ -66,10 +64,7 @@ fi
%defattr(-,root,root)
%license LICENSE
%{_sysconfdir}/udev/rules.d/tpm-udev.rules
%{_sysconfdir}/tmpfiles.d/tpm2-tss-fapi.conf
%{_sysconfdir}/tpm2-tss/*
%{_libdir}/*.so.0.0.0
%exclude %{_sysconfdir}/sysusers.d/tpm2-tss.conf

%files devel
%defattr(-,root,root)
Expand All @@ -82,10 +77,9 @@ fi
%{_mandir}/man7

%changelog
* 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
* Sat May 09 00:21:09 PST 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
Expand Down
8 changes: 4 additions & 4 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5366,8 +5366,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": "3.1.4",
"downloadUrl": "https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.4/tpm2-tools-3.1.4.tar.gz"
}
}
},
Expand All @@ -5376,8 +5376,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.2.0",
"downloadUrl": "https://github.com/tpm2-software/tpm2-tss/releases/download/2.2.0/tpm2-tss-2.2.0.tar.gz"
}
}
},
Expand Down