From ceef666d69583a109a6e06de2f3ba0b68a5e10a3 Mon Sep 17 00:00:00 2001
From: Erik Larsson <who+github@cnackers.org>
Date: Sat, 2 Oct 2021 12:06:11 +0200
Subject: [PATCH] testing/tpm2-tools: add patch - fix wide character
error/warning
---
testing/tpm2-tools/APKBUILD | 15 ++++++++++-----
testing/tpm2-tools/char16_t.patch | 13 +++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 testing/tpm2-tools/char16_t.patch
diff --git a/testing/tpm2-tools/APKBUILD b/testing/tpm2-tools/APKBUILD
index a9311d49b93b..072f8c37d9f6 100644
--- a/testing/tpm2-tools/APKBUILD
+++ b/testing/tpm2-tools/APKBUILD
@@ -2,16 +2,18 @@
# Maintainer: Alexander Sack <asac@pantacor.com>
pkgname=tpm2-tools
pkgver=5.2
-pkgrel=0
+pkgrel=1
pkgdesc="TPM2 Tools"
url="https://github.com/tpm2-software/tpm2-tools/"
-arch="all !x86" # warnings prevents build
+arch="all"
license="BSD-2-Clause"
makedepends="tpm2-tss-dev openssl1.1-compat-dev curl-dev util-linux-dev libtool
autoconf automake"
subpackages="$pkgname-bash-completion"
source="https://github.com/tpm2-software/tpm2-tools/releases/download/$pkgver/tpm2-tools-$pkgver.tar.gz
- dont-generate-manpages-without-pandoc.patch"
+ dont-generate-manpages-without-pandoc.patch
+ char16_t.patch
+ "
options="!check"
prepare() {
@@ -32,5 +34,8 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b tpm2-tools-5.2.tar.gz
-2e0862c3c5d07cd40f655fa762a881a243fcf63c966f9867032057f7d7373fea94785929d8ef8bba8961bafa7d4549ebb3b90a09b15d6cfd8d3f08acfd488364 dont-generate-manpages-without-pandoc.patch"
+sha512sums="
+9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b tpm2-tools-5.2.tar.gz
+2e0862c3c5d07cd40f655fa762a881a243fcf63c966f9867032057f7d7373fea94785929d8ef8bba8961bafa7d4549ebb3b90a09b15d6cfd8d3f08acfd488364 dont-generate-manpages-without-pandoc.patch
+a88ad5447a0f7b6f2e591a90376a699b5ea4f1b16b66a86ec7c5f196b239b7be73f6090e4181d36c9d7c12487532e86b7265c7c3f534fb1a57c55d3fb2fec12a char16_t.patch
+"
diff --git a/testing/tpm2-tools/char16_t.patch b/testing/tpm2-tools/char16_t.patch
new file mode 100644
index 000000000000..0173547a4ac7
--- /dev/null
+++ b/testing/tpm2-tools/char16_t.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/tpm2_eventlog_yaml.c b/lib/tpm2_eventlog_yaml.c
+index 6e6923e5..9b048db1 100644
+--- a/lib/tpm2_eventlog_yaml.c
++++ b/lib/tpm2_eventlog_yaml.c
+@@ -475,7 +475,7 @@ static bool yaml_uefi_var(UEFI_VARIABLE_DATA *data, size_t size, UINT32 type,
+ tpm2_tool_output(" Description: \"");
+ int i;
+ for (i = 0; (wchar_t)loadopt->Description[i] != 0; i++) {
+- wchar_t c = (wchar_t)loadopt->Description[i];
++ char16_t c = (char16_t)loadopt->Description[i];
+ tpm2_tool_output("%lc", c);
+ }
+ tpm2_tool_output("\"\n");
--
GitLab