diff options
Diffstat (limited to 'external/poky/meta/recipes-extended/zip')
3 files changed, 45 insertions, 1 deletions
diff --git a/external/poky/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch b/external/poky/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch new file mode 100644 index 00000000..244ddea3 --- /dev/null +++ b/external/poky/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch @@ -0,0 +1,19 @@ +From: Santiago Vila <sanvila@debian.org> +Subject: Remove (optional) build date to make the build reproducible +Bug-Debian: http://bugs.debian.org/779042 + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> + +--- a/unix/unix.c ++++ b/unix/unix.c +@@ -1020,7 +1020,7 @@ + + + /* Define the compile date string */ +-#ifdef __DATE__ ++#if 0 + # define COMPILE_DATE " on " __DATE__ + #else + # define COMPILE_DATE "" diff --git a/external/poky/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch b/external/poky/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch new file mode 100644 index 00000000..ce6caff8 --- /dev/null +++ b/external/poky/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch @@ -0,0 +1,22 @@ +Close the correct file descriptor + +https://bugs.archlinux.org/task/47713 + +Signed-off-by: Jate Sujjavanich <jatedev@gmail.com> + +Upstream-Status: Inappropriate [no upstream] + +diff --git a/zipnote.c b/zipnote.c +index 5e02cb6..996f012 100644 +--- a/zipnote.c ++++ b/zipnote.c +@@ -661,7 +661,7 @@ char **argv; /* command line tokens */ + if ((r = zipcopy(z)) != ZE_OK) + ziperr(r, "was copying an entry"); + } +- fclose(x); ++ fclose(in_file); + + /* Write central directory and end of central directory with new comments */ + if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */ + diff --git a/external/poky/meta/recipes-extended/zip/zip_3.0.bb b/external/poky/meta/recipes-extended/zip/zip_3.0.bb index de779e94..c00a9327 100644 --- a/external/poky/meta/recipes-extended/zip/zip_3.0.bb +++ b/external/poky/meta/recipes-extended/zip/zip_3.0.bb @@ -10,7 +10,10 @@ PR = "r2" S = "${WORKDIR}/zip30" SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \ - file://fix-security-format.patch" + file://fix-security-format.patch \ + file://10-remove-build-date.patch \ + file://zipnote-crashes-with-segfault.patch \ + " UPSTREAM_VERSION_UNKNOWN = "1" SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37" |