v1.6.0
This commit is contained in:
Peter Robinson
parent
e968dfa6ab
commit
8cae92f9c8
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (tpm2-pkcs11-1.5.0.tar.gz) = 999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0
|
||||
SHA512 (tpm2-pkcs11-1.5.0.tar.gz.asc) = 80e5c62f5abf9045693fb4cbceb96abb1896a604ea3b32ea90e5e411c19859ebf94451feb612e72027879f809ad65d9962f17917185094233eab88decf0bd400
|
||||
SHA512 (tpm2-pkcs11-1.6.0.tar.gz) = db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea
|
||||
SHA512 (tpm2-pkcs11-1.6.0.tar.gz.asc) = c341080aa6294927f3e97798218fde811525fe30ba79e134a497e989aff5b414fcecc0d24b4aa2a810ffc30901cf8f7129a10c520eb8687e8d5a09f6c4e54e66
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
From 78f4e2b47d02cb8215f252e77c68a81dfe4afa30 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?SZ=20Lin=20=28=E6=9E=97=E4=B8=8A=E6=99=BA=29?=
|
||||
<szlin@debian.org>
|
||||
Date: Fri, 22 Jan 2021 14:38:03 +0800
|
||||
Subject: [PATCH] Fix endian issue on s390x platform
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
7 tests from test_db.c used an int type for sqlite3_last_insert_rowid,
|
||||
which caused endian issue and test failed on s390 platform
|
||||
|
||||
Signed-off-by: SZ Lin (林上智) <szlin@debian.org>
|
||||
Link: https://buildd.debian.org/status/fetch.php?pkg=tpm2-pkcs11&arch=s390x&ver=1.5.0-3&stamp=1611234144&raw=0
|
||||
---
|
||||
test/unit/test_db.c | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/test/unit/test_db.c b/test/unit/test_db.c
|
||||
index 7f11a487..d490d02f 100644
|
||||
--- a/test/unit/test_db.c
|
||||
+++ b/test/unit/test_db.c
|
||||
@@ -2503,7 +2503,7 @@ static void test_db_add_token_sqlite3_finalize_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_ERROR }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_OK }, /* TRANSACTION_END */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
@@ -2544,7 +2544,7 @@ static void test_db_add_token_sqlite3_prepare_v2_2_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_ERROR }, /* sqlite3_prepare_v2 */
|
||||
{ .rc = SQLITE_OK }, /* TRANSACTION_END */
|
||||
@@ -2586,7 +2586,7 @@ static void test_db_add_token_sqlite3_bind_int_2_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_prepare_v2 */
|
||||
{ .rc = SQLITE_ERROR }, /* sqlite3_bind_int */
|
||||
@@ -2631,7 +2631,7 @@ static void test_db_add_token_sqlite3_bind_text_3_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_prepare_v2 */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_int */
|
||||
@@ -2687,7 +2687,7 @@ static void test_db_add_token_sqlite3_bind_blob_1_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_prepare_v2 */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_int */
|
||||
@@ -2746,7 +2746,7 @@ static void test_db_add_token_sqlite3_bind_blob_2_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_prepare_v2 */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_int */
|
||||
@@ -2807,7 +2807,7 @@ static void test_db_add_token_sqlite3_step_2_fail(void **state) {
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_text */
|
||||
{ .rc = SQLITE_DONE }, /* sqlite3_step */
|
||||
- { .rc = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
+ { .u64 = 42 }, /* sqlite3_last_insert_rowid*/
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_finalize */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_prepare_v2 */
|
||||
{ .rc = SQLITE_OK }, /* sqlite3_bind_int */
|
||||
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
#global candidate RC0
|
||||
|
||||
Name: tpm2-pkcs11
|
||||
Version: 1.5.0
|
||||
Release: 4%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 1.6.0
|
||||
Release: 1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: PKCS#11 interface for TPM 2.0 hardware
|
||||
|
||||
License: BSD
|
||||
|
|
@ -17,8 +17,6 @@ Source1: https://github.com/tpm2-software/%{name}/releases/download/%{version}%{
|
|||
# William Roberts (Bill Roberts) key from pgp.mit.edu
|
||||
Source2: gpgkey-8E1F50C1.gpg
|
||||
Patch0: tpm2-pkcs11-gcc11.patch
|
||||
# https://github.com/tpm2-software/tpm2-pkcs11/commit/78f4e2b47d02cb8215f252e77c68a81dfe4afa30
|
||||
Patch1: tpm2-pkcs11-s390x.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
|
|
@ -102,6 +100,9 @@ cd tools
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue May 25 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.6.0-1
|
||||
- Update to 1.6.0
|
||||
|
||||
* Mon Feb 01 2021 Jakub Jelen <jjelen@redhat.com> - 1.5.0-4}
|
||||
- Unbreak the build on s390x (#1923383)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue