package/zziplib: bump to version 0.13.71
PATCH 1/1 package/zziplib: bump to version 0.13.71
Remove upstream patches and CVE tags.
Switch the dependency to python3 added by [1].
Update indentation of hash file (two spaces).
[1] https://github.com/gdraheim/zziplib/commit/a144bec8d06302e7be11f0f46e02947b0becf574
Signed-off-by Romain Naour <[email protected]>
--- ...eak-from-__zzip_parse_root_directory.patch | 74 ---- ...k-from-__zzip_parse_root_directory-2.patch | 53 --- ...3-One-more-free-to-avoid-memory-leak.patch | 25 -- ...omponents-from-pathnames-of-extracte.patch | 344 ------------------ package/zziplib/zziplib.hash | 8 +- package/zziplib/zziplib.mk | 15 +- 6 files changed, 7 insertions(+), 512 deletions(-) delete mode 100644 package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch delete mode 100644 package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch delete mode 100644 package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch delete mode 100644 package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch
package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch deleted +0 -74
@@ -1,74 +0,0 @@ -From 9411bde3e4a70a81ff3ffd256b71927b2d90dcbb Mon Sep 17 00:00:00 2001 -From: jmoellers <[email protected]> -Date: Fri, 7 Sep 2018 11:32:04 +0200 -Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). - -[Retrieved (and slightly updated to remove test.zip) from: -https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - test/test.zip | Bin 1361 -> 1361 bytes - zzip/zip.c | 36 ++++++++++++++++++++++++++++++++++-- - 2 files changed, 34 insertions(+), 2 deletions(-) - -diff --git a/zzip/zip.c b/zzip/zip.c -index 88b833b..a685280 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -475,9 +475,15 @@ __zzip_parse_root_directory(int fd, - } else - { - if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0) -+ { -+ free(hdr0); - return ZZIP_DIR_SEEK; -+ } - if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) -+ { -+ free(hdr0); - return ZZIP_DIR_READ; -+ } - d = &dirent; - } - -@@ -577,12 +583,38 @@ __zzip_parse_root_directory(int fd, - - if (hdr_return) - *hdr_return = hdr0; -+ else -+ { -+ /* If it is not assigned to *hdr_return, it will never be free()'d */ -+ free(hdr0); -+ /* Make sure we don't free it again in case of error */ -+ hdr0 = NULL; -+ } - } /* else zero (sane) entries */ - # ifndef ZZIP_ALLOW_MODULO_ENTRIES -- return (entries != zz_entries ? ZZIP_CORRUPTED : 0); -+ if (entries != zz_entries) -+ { -+ /* If it was assigned to *hdr_return, undo assignment */ -+ if (p_reclen && hdr_return) -+ *hdr_return = NULL; -+ /* Free it, if it was not already free()'d */ -+ if (hdr0 != NULL) -+ free(hdr0); -+ return ZZIP_CORRUPTED; -+ } - # else -- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0); -+ if (((entries & (unsigned)0xFFFF) != zz_entries) -+ { -+ /* If it was assigned to *hdr_return, undo assignment */ -+ if (p_reclen && hdr_return) -+ *hdr_return = NULL; -+ /* Free it, if it was not already free()'d */ -+ if (hdr0 != NULL) -+ free(hdr0); -+ return ZZIP_CORRUPTED; -+ } - # endif -+ return 0; - } - - /* ------------------------- high-level interface ------------------------- */
package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch deleted +0 -53
53 lines not on this page · raw message
package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 0e1dadb05c1473b9df2d7b8f298dab801778ef99 Mon Sep 17 00:00:00 2001 -From: jmoellers <[email protected]> -Date: Fri, 7 Sep 2018 13:55:35 +0200 -Subject: [PATCH] One more free() to avoid memory leak. - -[Retrieved from: -https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - zzip/zip.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/zzip/zip.c b/zzip/zip.c -index 51a1a4d..bc6c080 100644 ---- a/zzip/zip.c -+++ b/zzip/zip.c -@@ -589,6 +589,8 @@ __zzip_parse_root_directory(int fd, - free(hdr0); - } - } /* else zero (sane) entries */ -+ else -+ free(hdr0); - # ifndef ZZIP_ALLOW_MODULO_ENTRIES - return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; - # else
package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch deleted +0 -344
344 lines not on this page · raw message
package/zziplib/zziplib.hash +4 -4
@@ -1,5 +1,5 @@ # sha256 locally computed -sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 zziplib-0.13.69.tar.gz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB -sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL -sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm +sha256 2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2 zziplib-0.13.71.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB +sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL +sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm
package/zziplib/zziplib.mk +3 -12
@@ -4,23 +4,14 @@ # ################################################################################ -ZZIPLIB_VERSION = 0.13.69 +ZZIPLIB_VERSION = 0.13.71 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm ZZIPLIB_INSTALL_STAGING = YES -# 0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch -# 0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch -# 0003-One-more-free-to-avoid-memory-leak.patch -ZZIPLIB_IGNORE_CVES += CVE-2018-16548 +ZZIPLIB_DEPENDENCIES = host-pkgconf host-python3 zlib -# 0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch -ZZIPLIB_IGNORE_CVES += CVE-2018-17828 - -ZZIPLIB_DEPENDENCIES = host-pkgconf host-python zlib - -# zziplib is not python3 friendly, so force the python interpreter -ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 $(eval $(autotools-package))
Signature · 1 line
2.25.4
Thomas Petazzoni
AppliedPATCH 1/1 package/zziplib: bump to version 0.13.71
Quoted 9 lines · On Mon, 4 May 2020 16:52:12 +0200 Romain Naour <[email protected]> wrote:
Remove upstream patches and CVE tags.
Switch the dependency to python3 added by [1].
Update indentation of hash file (two spaces).
[1] https://github.com/gdraheim/zziplib/commit/a144bec8d06302e7be11f0f46e02947b0becf574
Signed-off-by Romain Naour <[email protected]>
Quoted 12 lines
--- ...eak-from-__zzip_parse_root_directory.patch | 74 ---- ...k-from-__zzip_parse_root_directory-2.patch | 53 --- ...3-One-more-free-to-avoid-memory-leak.patch | 25 -- ...omponents-from-pathnames-of-extracte.patch | 344 ------------------ package/zziplib/zziplib.hash | 8 +- package/zziplib/zziplib.mk | 15 +- 6 files changed, 7 insertions(+), 512 deletions(-) delete mode 100644 package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch delete mode 100644 package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch delete mode 100644 package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch delete mode 100644 package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com