Add patch headers for our patches now I've pushed PRs

2 files changed, 72 insertions, 0 deletions

diff --git a/debian/patches/fix-32b-format-strings.patch b/debian/patches/fix-32b-format-strings.patch
index 5dcbb55b..df2f8633 100644
--- a/debian/patches/fix-32b-format-strings.patch
+++ b/debian/patches/fix-32b-format-strings.patch
@@ -1,3 +1,28 @@
+PR submitted at https://github.com/rhboot/shim/pull/464
+
+commit 88d5a4be2ccd2a75f96177682bc20d7dc4391291
+Author: Steve McIntyre <steve@einval.com>
+Date:   Thu Apr 28 11:37:12 2022 +0100
+
+    post-process-pe: Fix format string warnings on 32-bit platforms
+    
+    With -Werror these were causing build failures with stricter gcc:
+    
+    .../post-process-pe.c: In function 'load_pe':
+    .../post-process-pe.c:177:55: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
+    .../post-process-pe.c:192:56: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'UINT64' {aka 'long long unsigned int'} [-Werror=format=]
+    .../post-process-pe.c:236:31: error: format '%zu' expects argument of type 'size_t', but argument 2 has type 'UINT64' {aka 'long long unsigned int'} [-Werror=format=]
+    .../post-process-pe.c:39:32: note: in definition of macro 'debug'
+    .../post-process-pe.c:236:60: note: format string is defined here
+    .../post-process-pe.c:240:31: error: format '%zu' expects argument of type 'size_t', but argument 2 has type 'UINT64' {aka 'long long unsigned int'} [-Werror=format=]
+    .../post-process-pe.c:39:32: note: in definition of macro 'debug'
+    .../post-process-pe.c:240:60: note: format string is defined here
+    .../post-process-pe.c:274:30: error: format '%zu' expects argument of type 'size_t', but argument 2 has type 'UINTN' {aka 'long unsigned int'} [-Werror=format=]
+    .../post-process-pe.c:39:32: note: in definition of macro 'debug'
+    .../post-process-pe.c:274:34: note: format string is defined here
+    
+    Signed-off-by: Steve McIntyre <steve@einval.com>
+
 diff --git a/post-process-pe.c b/post-process-pe.c
 index 8414a5fa..e8c05486 100644
 --- a/post-process-pe.c
diff --git a/debian/patches/fix-test-includes.patch b/debian/patches/fix-test-includes.patch
index 5c76ba42..5cca825d 100644
--- a/debian/patches/fix-test-includes.patch
+++ b/debian/patches/fix-test-includes.patch
@@ -1,3 +1,50 @@
+PR submitted at https://github.com/rhboot/shim/pull/466
+
+commit 5ebbaf70ab4332d11a4f03f5b178e8055ba8cbce
+Author: Steve McIntyre <steve@einval.com>
+Date:   Thu Apr 28 12:32:18 2022 +0100
+
+    tests: also look for system headers in multi-arch directories
+    
+    On Debian(-derived) systems low-level system headers are under
+    /usr/include/<multi-arch path>, so look there too.
+    
+    Otherwise we see stuff like:
+    
+    gcc -O2 -fno-diagnostics-color -ggdb -std=gnu11 -isystem <foo>/shim.git/include/system -I<foo>/shim.git/gnu-efi/inc -I<foo>/shim.git/gnu-efi/inc/ia32 -I<foo>/shim.git/gnu-efi/inc/protocol -Iinclude -iquote . -isystem /usr/include -isystem /usr/lib/gcc/i686-linux-gnu/11/include -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args  -m32 -DMDE_CPU_IA32 -DPAGE_SIZE=4096   -fshort-wchar -fno-builtin -rdynamic -fno-inline -fno-eliminate-unused-debug-types -fno-eliminate-unused-debug-symbols -gpubnames -grecord-gcc-switches  -Wall -Wextra -Wno-missing-field-initializers -Wsign-compare -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-unused-variable -Wno-pointer-sign -Werror -Werror=nonnull -Werror=nonnull-compare  -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DPAGE_SIZE=4096 -DSHIM_UNIT_TEST -DDEFAULT_DEBUG_PRINT_STATE=0 -isystem include-fixed -o test-csv csv.c test-csv.c test.c libefi-test.a -lefivar
+    In file included from /usr/include/bits/errno.h:26,
+                     from /usr/include/errno.h:28,
+                     from /usr/include/efivar/efivar.h:24,
+                     from include/test.h:51,
+                     from shim.h:68,
+                     from csv.c:6:
+    /usr/include/linux/errno.h:1:10: fatal error: asm/errno.h: No such file or directory
+        1 | #include <asm/errno.h>
+          |          ^~~~~~~~~~~~~
+    compilation terminated.
+    In file included from /usr/include/bits/errno.h:26,
+                     from /usr/include/errno.h:28,
+                     from /usr/include/efivar/efivar.h:24,
+                     from include/test.h:51,
+                     from shim.h:68,
+                     from test-csv.c:9:
+    /usr/include/linux/errno.h:1:10: fatal error: asm/errno.h: No such file or directory
+        1 | #include <asm/errno.h>
+          |          ^~~~~~~~~~~~~
+    compilation terminated.
+    In file included from /usr/include/bits/errno.h:26,
+                     from /usr/include/errno.h:28,
+                     from /usr/include/efivar/efivar.h:24,
+                     from include/test.h:51,
+                     from shim.h:68,
+                     from test.c:7:
+    /usr/include/linux/errno.h:1:10: fatal error: asm/errno.h: No such file or directory
+        1 | #include <asm/errno.h>
+          |          ^~~~~~~~~~~~~
+    compilation terminated.
+    
+    Signed-off-by: Steve McIntyre <steve@einval.com>
+
 diff --git a/include/test.mk b/include/test.mk
 index 1a4fc220..e965c600 100644
 --- a/include/test.mk