diff options
| author | Steve McIntyre <steve@einval.com> | 2021-03-23 23:38:30 +0000 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2021-03-23 23:38:30 +0000 |
| commit | f43e9abcc596c1b2934e7f43bddf173f74f3866c (patch) | |
| tree | 29d1ed14f561f417a71e837afecc4c01221db451 | |
| parent | e6b19d2db7be7f9535cc06ecb8493e1336c7b78d (diff) | |
| download | efi-boot-shim-f43e9abcc596c1b2934e7f43bddf173f74f3866c.tar.gz efi-boot-shim-f43e9abcc596c1b2934e7f43bddf173f74f3866c.zip | |
Remove all out outstanding patches
* cast-CHAR8-string-handling.patch no longer needed
* fix-Make.coverity-bashisms.patch went upstream
| -rw-r--r-- | debian/patches/cast-CHAR8-string-handling.patch | 25 | ||||
| -rw-r--r-- | debian/patches/fix-Make.coverity-bashisms.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 0 insertions, 53 deletions
diff --git a/debian/patches/cast-CHAR8-string-handling.patch b/debian/patches/cast-CHAR8-string-handling.patch deleted file mode 100644 index e92c8534..00000000 --- a/debian/patches/cast-CHAR8-string-handling.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/sbat.c b/sbat.c -index 446bed1a..0946dfbb 100644 ---- a/sbat.c -+++ b/sbat.c -@@ -154,7 +154,8 @@ verify_single_entry(struct sbat_entry *entry, struct sbat_var *sbat_var_entry) - { - UINT16 sbat_gen, sbat_var_gen; - -- if (strcmp(entry->component_name, sbat_var_entry->component_name) == 0) { -+ if (strcmp((const char *)entry->component_name, -+ (const char *)sbat_var_entry->component_name) == 0) { - dprint(L"component %a has a matching SBAT variable entry, verifying\n", - entry->component_name); - -@@ -162,8 +163,8 @@ verify_single_entry(struct sbat_entry *entry, struct sbat_var *sbat_var_entry) - * atoi returns zero for failed conversion, so essentially - * badly parsed component_generation will be treated as zero - */ -- sbat_gen = atoi(entry->component_generation); -- sbat_var_gen = atoi(sbat_var_entry->component_generation); -+ sbat_gen = atoi((const char *)entry->component_generation); -+ sbat_var_gen = atoi((const char *)sbat_var_entry->component_generation); - - if (sbat_gen < sbat_var_gen) { - dprint(L"component %a, generation %d, was revoked by SBAT variable", diff --git a/debian/patches/fix-Make.coverity-bashisms.patch b/debian/patches/fix-Make.coverity-bashisms.patch deleted file mode 100644 index c1cdeb96..00000000 --- a/debian/patches/fix-Make.coverity-bashisms.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Make.coverity b/Make.coverity -index 996e826e..a897aa0a 100644 ---- a/Make.coverity -+++ b/Make.coverity -@@ -12,7 +12,7 @@ cov-int-all : clean - - cov-clean : - @rm -vf $(NAME)-coverity-*.tar.* -- @if [[ -d cov-int ]]; then rm -rf cov-int && echo "removed 'cov-int'"; fi -+ @if [ -d cov-int ]; then rm -rf cov-int && echo "removed 'cov-int'"; fi - - cov-file : | $(COV_FILE) - -@@ -20,9 +20,9 @@ $(COV_FILE) : | cov-int - tar caf $@ cov-int - - cov-upload : -- @if [[ -n "$(COV_URL)" ]] && \ -- [[ -n "$(COV_TOKEN)" ]] && \ -- [[ -n "$(COV_EMAIL)" ]] ; \ -+ @if [ -n "$(COV_URL)" ] && \ -+ [ -n "$(COV_TOKEN)" ] && \ -+ [ -n "$(COV_EMAIL)" ] ; \ - then \ - echo curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(VERSION).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \ - curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(VERSION).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b14293cd..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-Make.coverity-bashisms.patch -cast-CHAR8-string-handling.patch |