02/02: gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107).

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 98df3a88b5e323087db6097094f119fa4663f6d3
Author: Efraim Flashner <address@hidden>
Date:   Wed Sep 6 14:19:50 2017 +0300

    gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107).
    
    * gnu/packages/compression.scm (libzip): Update to 1.3.0.
    [source]: Remove patch.
    [arguments]: Remove custom 'patch-perl phase.
    * gnu/packages/patches/libzip-CVE-2017-12858.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                     |  1 -
 gnu/packages/compression.scm                     | 14 ++------
 gnu/packages/patches/libzip-CVE-2017-12858.patch | 45 ------------------------
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 19dfa13..a38e4e2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -812,7 +812,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/libxslt-generated-ids.patch             \
   %D%/packages/patches/libxslt-CVE-2016-4738.patch             \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
-  %D%/packages/patches/libzip-CVE-2017-12858.patch             \
   %D%/packages/patches/lierolibre-check-unaligned-access.patch \
   %D%/packages/patches/lierolibre-is-free-software.patch       \
   %D%/packages/patches/lierolibre-newer-libconfig.patch                \
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index a6758e9..499c13a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1542,22 +1542,14 @@ manipulate, read, and write Zip archive files.")
 (define-public libzip
   (package
     (name "libzip")
-    (version "1.2.0")
+    (version "1.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "https://nih.at/libzip/libzip-"; version ".tar.gz"))
-              (patches (search-patches "libzip-CVE-2017-12858.patch"))
+                    "https://nih.at/libzip/libzip-"; version ".tar.xz"))
               (sha256
                (base32
-                "17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc"))))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-perl
-           (lambda _
-             (substitute* "regress/runtest.in"
-               (("/usr/bin/env perl") (which "perl"))))))))
+                "0wykw0q9dwdzx0gssi2dpgckx9ggr2spzc1amjnff6wi6kz6x4xa"))))
     (native-inputs
      `(("perl" ,perl)))
     (inputs
diff --git a/gnu/packages/patches/libzip-CVE-2017-12858.patch 
b/gnu/packages/patches/libzip-CVE-2017-12858.patch
deleted file mode 100644
index 8125173..0000000
--- a/gnu/packages/patches/libzip-CVE-2017-12858.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix CVE-2017-12858:
-
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-12858
-
-Patch copied from upstream source repository:
-
-https://github.com/nih-at/libzip/commit/2217022b7d1142738656d891e00b3d2d9179b796
-
-From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <address@hidden>
-Date: Mon, 14 Aug 2017 10:55:44 +0200
-Subject: [PATCH] Fix double free().
-
-Found by Brian 'geeknik' Carpenter using AFL.
----
- THANKS           | 1 +
- lib/zip_dirent.c | 3 ---
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/THANKS b/THANKS
-index be0cca9..a80ee1d 100644
---- a/THANKS
-+++ b/THANKS
-@@ -12,6 +12,7 @@ BALATON Zoltan <address@hidden>
- Benjamin Gilbert <address@hidden>
- Boaz Stolk <address@hidden>
- Bogdan <address@hidden>
-+Brian 'geeknik' Carpenter <address@hidden>
- Chris Nehren <address@hidden>
- Coverity <address@hidden>
- Dane Springmeyer <address@hidden>
-diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
-index a369900..e5a7cc9 100644
---- a/lib/zip_dirent.c
-+++ b/lib/zip_dirent.c
-@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, 
zip_buffer_t *buffer, boo
-     }
- 
-     if (!_zip_dirent_process_winzip_aes(zde, error)) {
--      if (!from_buffer) {
--          _zip_buffer_free(buffer);
--      }
-       return -1;
-     }
-