diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/buildid_write_return.patch | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 0 insertions, 38 deletions
diff --git a/debian/changelog b/debian/changelog index a849dca5..7048958f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,6 @@ shim (13-0ubuntu1) UNRELEASED; urgency=medium * debian/rules: clean up after *.signed files. * debian/shim.install: update paths in light of using shim's upstream install target. - * debian/patches/buildid_write_return.patch: workaround our strict compile - rules failing the build: make sure write calls check the return value. * debian/rules, debian/shim.install: make sure the 'make install' step does what it's meant to do by upstream: we can easily make use of the end result to have the files we need. diff --git a/debian/patches/buildid_write_return.patch b/debian/patches/buildid_write_return.patch deleted file mode 100644 index 268cbd33..00000000 --- a/debian/patches/buildid_write_return.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - buildid.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -Index: b/buildid.c -=================================================================== ---- a/buildid.c -+++ b/buildid.c -@@ -113,6 +113,7 @@ static void handle_one(char *f) - char *b = NULL; - size_t sz; - uint8_t *data; -+ ssize_t written; - - if (!strcmp(f, "-")) { - fd = STDIN_FILENO; -@@ -132,10 +133,14 @@ static void handle_one(char *f) - b = alloca(sz * 2 + 1); - data2hex(data, sz, b); - if (b) { -- write(1, f, strlen(f)); -- write(1, " ", 1); -- write(1, b, strlen(b)); -- write(1, "\n", 1); -+ written = write(1, f, strlen(f)); -+ if (written < 0) -+ errx(1, "Error writing build id"); -+ written = write(1, " ", 1); -+ written = write(1, b, strlen(b)); -+ if (written < 0) -+ errx(1, "Error writing build id"); -+ written = write(1, "\n", 1); - } - } - elf_end(elf); diff --git a/debian/patches/series b/debian/patches/series index db9eed12..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -buildid_write_return.patch |