pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/libzip libzip: update to 1.6.0nb1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d292a6eb345b
branches:  trunk
changeset: 410829:d292a6eb345b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jan 29 21:54:31 2020 +0000

description:
libzip: update to 1.6.0nb1.

Add upstream patch avoiding a double-free in zipcmp.

diffstat:

 archivers/libzip/Makefile                   |   3 ++-
 archivers/libzip/distinfo                   |   3 ++-
 archivers/libzip/patches/patch-src_zipcmp.c |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 277bde4bddac -r d292a6eb345b archivers/libzip/Makefile
--- a/archivers/libzip/Makefile Wed Jan 29 21:52:26 2020 +0000
+++ b/archivers/libzip/Makefile Wed Jan 29 21:54:31 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2020/01/24 12:09:23 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2020/01/29 21:54:31 wiz Exp $
 
 DISTNAME=              libzip-1.6.0
+PKGREVISION=           1
 CATEGORIES=            archivers devel
 MASTER_SITES=          https://libzip.org/download/
 EXTRACT_SUFX=          .tar.xz
diff -r 277bde4bddac -r d292a6eb345b archivers/libzip/distinfo
--- a/archivers/libzip/distinfo Wed Jan 29 21:52:26 2020 +0000
+++ b/archivers/libzip/distinfo Wed Jan 29 21:54:31 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.32 2020/01/24 12:09:23 wiz Exp $
+$NetBSD: distinfo,v 1.33 2020/01/29 21:54:31 wiz Exp $
 
 SHA1 (libzip-1.6.0.tar.xz) = 794bb5a5d7656fccd1adaffa19ab1190c8471c1c
 RMD160 (libzip-1.6.0.tar.xz) = 6ca337891a48fc54ff350b4fba2d0a82aa65c5d4
 SHA512 (libzip-1.6.0.tar.xz) = a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8
 Size (libzip-1.6.0.tar.xz) = 732812 bytes
+SHA1 (patch-src_zipcmp.c) = 67862d766a88a588f594cd88ffa49ca54e852923
diff -r 277bde4bddac -r d292a6eb345b archivers/libzip/patches/patch-src_zipcmp.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/libzip/patches/patch-src_zipcmp.c       Wed Jan 29 21:54:31 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zipcmp.c,v 1.1 2020/01/29 21:54:31 wiz Exp $
+
+Avoid double free.
+https://github.com/nih-at/libzip/commit/bd9fb11fa88f6a95b8afbd53796934adf4e6e6bd
+
+--- src/zipcmp.c.orig  2020-01-24 11:03:14.000000000 +0000
++++ src/zipcmp.c
+@@ -248,7 +248,6 @@ compare_zip(char *const zn[]) {
+       }
+       for (j = 0; j < a[i].nentry; j++) {
+           free(a[i].entry[j].name);
+-          free(a[i].entry[j].extra_fields);
+       }
+       free(a[i].entry);
+     }



Home | Main Index | Thread Index | Old Index