Remove all out outstanding patches

 * cast-CHAR8-string-handling.patch no longer needed
 * fix-Make.coverity-bashisms.patch went upstream

diff --git a/debian/patches/cast-CHAR8-string-handling.patch b/debian/patches/cast-CHAR8-string-handling.patch
deleted file mode 100644 (file)
index e92c853..0000000
--- 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 (file)
index c1cdeb9..0000000
--- 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 (file)
index b14293c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-Make.coverity-bashisms.patch
-cast-CHAR8-string-handling.patch