Accepting request 1073545 from home:msmeissn:branches:security

- swtpm-fix-build.patch: disable -Wstack-protector, it fails on s390x

OBS-URL: https://build.opensuse.org/request/show/1073545
OBS-URL: https://build.opensuse.org/package/show/security/swtpm?expand=0&rev=33
This commit is contained in:
Marcus Meissner 2023-03-21 12:51:07 +00:00 committed by Git OBS Bridge
parent 93f24082f9
commit 8828873bbc
3 changed files with 25 additions and 0 deletions

19
swtpm-fix-build.patch Normal file
View File

@ -0,0 +1,19 @@
Index: swtpm-0.8.0/configure.ac
===================================================================
--- swtpm-0.8.0.orig/configure.ac
+++ swtpm-0.8.0/configure.ac
@@ -418,11 +418,11 @@ if test "x$enable_hardening" != "xno"; t
# Some versions of gcc fail with -Wstack-protector,
# some with -Wstack-protector-strong enabled
if ! $CC -fstack-protector-strong -Wstack-protector $srcdir/include/swtpm/tpm_ioctl.h 2>/dev/null; then
- if $CC -fstack-protector -Wstack-protector $srcdir/include/swtpm/tpm_ioctl.h 2>/dev/null; then
- HARDENING_CFLAGS="-fstack-protector -Wstack-protector"
+ if $CC -fstack-protector $srcdir/include/swtpm/tpm_ioctl.h 2>/dev/null; then
+ HARDENING_CFLAGS="-fstack-protector"
fi
else
- HARDENING_CFLAGS="-fstack-protector-strong -Wstack-protector"
+ HARDENING_CFLAGS="-fstack-protector-strong"
fi
dnl Only support -D_FORTIFY_SOURCE=2 and have higher levels passed in by user

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 21 12:45:54 UTC 2023 - Marcus Meissner <meissner@suse.com>
- swtpm-fix-build.patch: disable -Wstack-protector, it fails on s390x
-------------------------------------------------------------------
Mon Mar 6 20:21:50 UTC 2023 - Alberto Planas Dominguez <aplanas@suse.com>

View File

@ -32,6 +32,7 @@ Group: System/Base
URL: https://github.com/stefanberger/swtpm
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Source100: swtpm-rpmlintrc
Patch0: swtpm-fix-build.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: expect