01/01: gnu: libunwind: Update to 1.2.1.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 373cda6ac6293d2aa5273ac28a505a2f0beb09dc
Author: Leo Famulari <address@hidden>
Date:   Tue Sep 26 11:39:26 2017 -0400

    gnu: libunwind: Update to 1.2.1.
    
    * gnu/packages/libunwind.scm (libunwind): Upate to 1.2.1.
    [source]: Remove 'libunwind-CVE-2015-3239.patch'.
    * gnu/packages/patches/libunwind-CVE-2015-3239.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/libunwind.scm                         |  8 ++++----
 gnu/packages/patches/libunwind-CVE-2015-3239.patch | 17 -----------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 12a6681..bf03472 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -811,7 +811,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/libtirpc-CVE-2017-8779.patch            \
   %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
   %D%/packages/patches/libtool-skip-tests2.patch               \
-  %D%/packages/patches/libunwind-CVE-2015-3239.patch           \
   %D%/packages/patches/libunistring-gnulib-multi-core.patch    \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm
index cda83b2..e747d37 100644
--- a/gnu/packages/libunwind.scm
+++ b/gnu/packages/libunwind.scm
@@ -27,18 +27,18 @@
 (define-public libunwind
   (package
     (name "libunwind")
-    (version "1.1")
+    (version "1.2.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://savannah/libunwind/libunwind-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"))
-             (patches (search-patches "libunwind-CVE-2015-3239.patch"))))
+               "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz"))))
     (build-system gnu-build-system)
     (arguments
-     ;; FIXME: As of glibc 2.17, we get 3 out of 34 test failures.
+     ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are
+     ;; expected to fail).
      ;; Report them upstream.
      '(#:tests? #f))
     (home-page "http://www.nongnu.org/libunwind";)
diff --git a/gnu/packages/patches/libunwind-CVE-2015-3239.patch 
b/gnu/packages/patches/libunwind-CVE-2015-3239.patch
deleted file mode 100644
index 3f11ac7..0000000
--- a/gnu/packages/patches/libunwind-CVE-2015-3239.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Copied from Fedora.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1232265
-http://pkgs.fedoraproject.org/cgit/libunwind.git/tree/libunwind-1.1-fix-CVE-2015-3239.patch
-
-diff -up libunwind-1.1/include/dwarf_i.h.CVE20153239 
libunwind-1.1/include/dwarf_i.h
---- libunwind-1.1/include/dwarf_i.h.CVE20153239        2015-07-10 
13:38:36.404996748 -0400
-+++ libunwind-1.1/include/dwarf_i.h    2015-07-10 13:39:25.050707613 -0400
-@@ -20,7 +20,7 @@
- extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
- /* REG is evaluated multiple times; it better be side-effects free!  */
- # define dwarf_to_unw_regnum(reg)                                       \
--  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
-+  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
- #endif
- 
- #ifdef UNW_LOCAL_ONLY