diff options
| author | Steve McIntyre <steve@einval.com> | 2022-04-28 00:53:26 +0100 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2022-04-28 00:58:55 +0100 |
| commit | 9a9d0229ad28e216f9d79e0d0c3a303aa2f952a2 (patch) | |
| tree | b56461f3bb41a1e015d54ac209c57d37fb4c24a7 | |
| parent | c8efa9abf738076ed83ca56626d0bd127e001519 (diff) | |
| download | efi-boot-shim-9a9d0229ad28e216f9d79e0d0c3a303aa2f952a2.tar.gz efi-boot-shim-9a9d0229ad28e216f9d79e0d0c3a303aa2f952a2.zip | |
Try again on the string format fix
| -rw-r--r-- | debian/patches/fix-32b-format-strings.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/fix-32b-format-strings.patch b/debian/patches/fix-32b-format-strings.patch index 5f6769f4..5dcbb55b 100644 --- a/debian/patches/fix-32b-format-strings.patch +++ b/debian/patches/fix-32b-format-strings.patch @@ -1,5 +1,5 @@ diff --git a/post-process-pe.c b/post-process-pe.c -index 8414a5fa..7efba714 100644 +index 8414a5fa..e8c05486 100644 --- a/post-process-pe.c +++ b/post-process-pe.c @@ -174,7 +174,7 @@ load_pe(const char *const file, void *const data, const size_t datasize, @@ -11,15 +11,15 @@ index 8414a5fa..7efba714 100644 if (FileAlignment == 0) FileAlignment = 0x200; -@@ -189,7 +189,7 @@ load_pe(const char *const file, void *const data, const size_t datasize, - "Number of RVAs:%"PRIu64" EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES:%d\n", +@@ -190,7 +190,7 @@ load_pe(const char *const file, void *const data, const size_t datasize, ctx->NumberOfRvaAndSizes, EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES); if (EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES < ctx->NumberOfRvaAndSizes) -- errx(1, "%s: invalid number of RVAs (%lu entries, max is %d)", -+ errx(1, "%s: invalid number of RVAs (%llu entries, max is %d)", - file, ctx->NumberOfRvaAndSizes, + errx(1, "%s: invalid number of RVAs (%lu entries, max is %d)", +- file, ctx->NumberOfRvaAndSizes, ++ file, (unsigned long)ctx->NumberOfRvaAndSizes, EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES); + if (mul(sizeof(EFI_IMAGE_DATA_DIRECTORY), @@ -234,11 +234,11 @@ load_pe(const char *const file, void *const data, const size_t datasize, sizeof(EFI_IMAGE_DATA_DIRECTORY), &sz1)) debug(ERROR, |