ibmswtpm2: update to 1661

Drop patch now included in updated

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-05-08 22:21:51 +00:00
parent cb6b4ae505
commit ab9da58c3a
2 changed files with 4 additions and 33 deletions

View File

@@ -1,27 +0,0 @@
Fix strict aliasing issue of gcc10
fixes:
TpmFail.c: In function 'TpmLogFailure':
TpmFail.c:217:23: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
217 | s_failFunction = *(UINT32 *)&function; /* kgold */
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Upstream-Status: Submitted
Signed-off-by: Jens Rehsack <sno@NetBSD.org>
Index: src/TpmFail.c
===================================================================
--- src.orig/TpmFail.c 2020-09-10 15:43:57.085063875 +0200
+++ src/TpmFail.c 2020-09-10 15:48:35.563302634 +0200
@@ -214,7 +214,7 @@
// On a 64-bit machine, this may truncate the address of the string
// of the function name where the error occurred.
#if FAIL_TRACE
- s_failFunction = *(UINT32 *)&function; /* kgold */
+ memcpy(&s_failFunction, function, sizeof(uint32_t)); /* kgold */
s_failLine = line;
#else
s_failFunction = 0;

View File

@@ -17,13 +17,11 @@ DEPENDS = "openssl"
SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \ SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
file://tune-makefile.patch \ file://tune-makefile.patch \
file://fix-wrong-cast.patch \
" "
SRC_URI[md5sum] = "43b217d87056e9155633925eb6ef749c"
SRC_URI[sha256sum] = "dd3a4c3f7724243bc9ebcd5c39bbf87b82c696d1c1241cb8e5883534f6e2e327" SRC_URI[sha256sum] = "55145928ad2b24f34be6a0eacf9fb492e10e0ea919b8428c721fa970e85d6147"
SRC_URI[sha1sum] = "ab4b94079e57a86996991e8a2b749ce063e4ad3e"
SRC_URI[sha384sum] = "bbef16a934853ce78cba7ddc766aa9d7ef3cde3430a322b1be772bf3ad4bd6d413ae9c4de21bc1a4879d17dfe2aadc1d" UPSTREAM_CHECK_REGEX = "libtpm(?P<pver>).tar.gz"
SRC_URI[sha512sum] = "007aa415cccf19a2bcf789c426727dc4032dcb04cc9d11eedc231d2add708c1134d3d5ee5cfbe7de68307c95fff7a30bd306fbd8d53c198a5ef348440440a6ed"
S = "${WORKDIR}/src" S = "${WORKDIR}/src"