Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/tboot.git#f2bc8403f417e08982495461e83baaefc5811aab

tboot-gcc11.patch

@@ -67,16 +67,16 @@ index 2974602..8dbcc7c 100644
 +	    unsigned char [16]);
  
  #endif /* __RIJNDAEL_H */
-diff --git a/Config.mk b/Config.mk
-index 6d2fe14..8234edd 100644
---- a/Config.mk
-+++ b/Config.mk
-@@ -74,6 +74,8 @@ TARGET_ARCH  ?= $(shell uname -m | sed -e s/i.86/x86_32/ -e s/i86pc/x86_32/)
- CFLAGS += $(CFLAGS_WARN) -fno-strict-aliasing -std=gnu99
- # due to bug in gcc v4.2,3,?
- CFLAGS += $(call cc-option,$(CC),-Wno-array-bounds,)
-+# Due to a bug in gcc-11
-+CFLAGS += $(call cc-option,$(CC),-Wno-stringop-overflow,)
+diff --git a/tboot/common/loader.c b/tboot/common/loader.c
+index cbb7def..6169564 100644
+--- a/tboot/common/loader.c
++++ b/tboot/common/loader.c
+@@ -59,7 +59,7 @@
+ #include <tpm.h>
  
+ /* copy of kernel/VMM command line so that can append 'tboot=0x1234' */
+-static char *new_cmdline = (char *)TBOOT_KERNEL_CMDLINE_ADDR;
++static char * volatile new_cmdline = (char *)TBOOT_KERNEL_CMDLINE_ADDR;
  
- ifeq ($(debug),y)
+ /* MLE/kernel shared data page (in boot.S) */
+ extern tboot_shared_t _tboot_shared;

tboot.spec

@@ -1,7 +1,7 @@
 Summary:        Performs a verified launch using Intel TXT
 Name:           tboot
 Version:        1.9.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 
 License:        BSD
@@ -66,6 +66,10 @@ make debug=y DISTDIR=$RPM_BUILD_ROOT install
 /boot/tboot-syms
 
 %changelog
+* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 1:1.9.11-5
+- Re-enable -Wstringop-overflow and instead make the problematical
+  pointer volatile to avoid the false positive diagnostic
+
 * Thu Oct 29 2020 Jeff Law <law@redhat.com> - 1:1.9.11-4
 - Fix buglet exposed by gcc-11 -Warray-parameter
 - Temporarily disable -Wstringop-overflow due to false positive in gcc-11