diff --git a/0000-disable-test_tpm2_swtpm_localca_pkcs11.test.patch b/0000-disable-test_tpm2_swtpm_localca_pkcs11.test.patch index 4fa3e4ab6398942cfdd6ff5eb57a9dd722d65105..4bc2ebf772e078260c49342ef49e55e8bb2416d4 100644 --- a/0000-disable-test_tpm2_swtpm_localca_pkcs11.test.patch +++ b/0000-disable-test_tpm2_swtpm_localca_pkcs11.test.patch @@ -1,15 +1,14 @@ -From 5f54b90c87da3954ae400b5219bcd9d2064ba4c8 Mon Sep 17 00:00:00 2001 -From: yezengruan -Date: Mon, 6 Feb 2023 10:56:44 +0800 +From 915896579018f2dcc025b13878811ca361bed3b8 Mon Sep 17 00:00:00 2001 +From: zhangxingrong +Date: Tue, 16 Jan 2024 16:17:44 +0800 Subject: [PATCH] disable test_tpm2_swtpm_localca_pkcs11.test -Signed-off-by: yezengruan --- tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4c601b8..2e523b5 100644 +index 9dd5d4d..5ab9955 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -94,7 +94,6 @@ TESTS += \ @@ -21,5 +20,5 @@ index 4c601b8..2e523b5 100644 if HAVE_TCSD -- -2.27.0 +2.33.0 diff --git a/0001-swtpm_setup-Initialized-argv-in-get_swtpm_capabiliti.patch b/0001-swtpm_setup-Initialized-argv-in-get_swtpm_capabiliti.patch deleted file mode 100644 index 7308c8f3c21ee8b20d298bae6a3567f75387f327..0000000000000000000000000000000000000000 --- a/0001-swtpm_setup-Initialized-argv-in-get_swtpm_capabiliti.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 72d9c031a01e567d4bb172ce4f33e97f5659b4f8 Mon Sep 17 00:00:00 2001 -From: Michal Privoznik -Date: Mon, 19 Dec 2022 09:27:57 +0100 -Subject: [PATCH] swtpm_setup: Initialized @argv in get_swtpm_capabilities() - -The compiler (though wrongly) identifies that the @argv variable -inside of get_swtpm_capabilities() function cam be used -uninitialized. While this is a spurious warning, it's common -practice to initialize g_autofree variables to NULL. - -Signed-off-by: Michal Privoznik ---- - src/swtpm_setup/swtpm_setup.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/swtpm_setup/swtpm_setup.c b/src/swtpm_setup/swtpm_setup.c -index 1b528c8..3570235 100644 ---- a/src/swtpm_setup/swtpm_setup.c -+++ b/src/swtpm_setup/swtpm_setup.c -@@ -937,7 +937,7 @@ static int get_swtpm_capabilities(gchar **swtpm_prg_l, gboolean is_tpm2, - gchar *my_argv[] = { "--print-capabilities", is_tpm2 ? "--tpm2" : NULL, NULL }; - g_autofree gchar *logop = NULL; - g_autoptr(GError) error = NULL; -- g_autofree gchar **argv; -+ g_autofree gchar **argv = NULL; - int exit_status = 0; - gboolean success; - int ret = 1; --- -2.41.0.windows.1 - diff --git a/swtpm-0.8.0.tar.gz b/swtpm-0.8.0.tar.gz deleted file mode 100644 index ee5865e2c325ed35e333c654e93455e0f01798ad..0000000000000000000000000000000000000000 Binary files a/swtpm-0.8.0.tar.gz and /dev/null differ diff --git a/swtpm-0.8.1.tar.gz b/swtpm-0.8.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a646b306fb960ae95c093f880e64e2799df9ce9a Binary files /dev/null and b/swtpm-0.8.1.tar.gz differ diff --git a/swtpm.spec b/swtpm.spec index 53ebfc0f3821277a90f5320e63bc0b3dc9887e63..1665af7dd3aed1e458ff14b9cbbaa8b73d882f5c 100644 --- a/swtpm.spec +++ b/swtpm.spec @@ -7,13 +7,12 @@ Summary: TPM Emulator Name: swtpm -Version: 0.8.0 -Release: 3 +Version: 0.8.1 +Release: 1 License: BSD Url: https://github.com/stefanberger/swtpm Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch00: 0000-disable-test_tpm2_swtpm_localca_pkcs11.test.patch -Patch01: 0001-swtpm_setup-Initialized-argv-in-get_swtpm_capabiliti.patch BuildRequires: automake BuildRequires: autoconf @@ -173,6 +172,9 @@ fi %attr( 750, tss, root) %{_localstatedir}/lib/swtpm-localca %changelog +* Tue Jan 16 2024 zhangxingrong - 0.8.1-1 +- upgrade to 0.8.1 + * Mon Aug 28 2023 Jiabo Feng - 0.8.0-3 - swtpm_setup: Initialized @argv in get_swtpm_capabilities()