summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/zip
diff options
context:
space:
mode:
authorJate Sujjavanich <jatedev@gmail.com>2020-01-06 22:36:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commita2983a263548302821787683bc260af40e01ab11 (patch)
tree0dd765398b6c38b3360d943c7d7a60b31821b310 /meta/recipes-extended/zip
parentb1902afa4cc608b023ff7a8053c4987f0f7c6a6b (diff)
downloadpoky-a2983a263548302821787683bc260af40e01ab11.tar.gz
zip: Add patch fixing zipnote segfault
This patch has been applied in several Linux distributions (From OE-Core rev: 8e662fced80c98c5495d49c905cc0008cb812589) Signed-off-by: Jate Sujjavanich <jatedev@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/zip')
-rw-r--r--meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch22
-rw-r--r--meta/recipes-extended/zip/zip_3.0.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
new file mode 100644
index 0000000000..ce6caff83e
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
@@ -0,0 +1,22 @@
1Close the correct file descriptor
2
3https://bugs.archlinux.org/task/47713
4
5Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
6
7Upstream-Status: Inappropriate [no upstream]
8
9diff --git a/zipnote.c b/zipnote.c
10index 5e02cb6..996f012 100644
11--- a/zipnote.c
12+++ b/zipnote.c
13@@ -661,7 +661,7 @@ char **argv; /* command line tokens */
14 if ((r = zipcopy(z)) != ZE_OK)
15 ziperr(r, "was copying an entry");
16 }
17- fclose(x);
18+ fclose(in_file);
19
20 /* Write central directory and end of central directory with new comments */
21 if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */
22
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index a2cd7717ca..c00a932763 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -12,6 +12,7 @@ S = "${WORKDIR}/zip30"
12SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \
13 file://fix-security-format.patch \ 13 file://fix-security-format.patch \
14 file://10-remove-build-date.patch \ 14 file://10-remove-build-date.patch \
15 file://zipnote-crashes-with-segfault.patch \
15 " 16 "
16UPSTREAM_VERSION_UNKNOWN = "1" 17UPSTREAM_VERSION_UNKNOWN = "1"
17 18