From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddKXW-00059b-SN for guix-patches@gnu.org; Thu, 03 Aug 2017 14:08:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddKXS-0005Yb-MX for guix-patches@gnu.org; Thu, 03 Aug 2017 14:08:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddKXS-0005YK-J7 for guix-patches@gnu.org; Thu, 03 Aug 2017 14:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ddKXS-0005hP-Di for guix-patches@gnu.org; Thu, 03 Aug 2017 14:08:02 -0400 Subject: [bug#27936] [PATCH] gnu: libunwind: Update to 1.2.1. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddKWp-0004rj-Qm for guix-patches@gnu.org; Thu, 03 Aug 2017 14:07:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddKWl-0004nD-Jt for guix-patches@gnu.org; Thu, 03 Aug 2017 14:07:23 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34231) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddKWl-0004mm-F3 for guix-patches@gnu.org; Thu, 03 Aug 2017 14:07:19 -0400 Received: from jasmine.lan (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 2CC347E464 for ; Thu, 3 Aug 2017 14:07:18 -0400 (EDT) From: Leo Famulari Date: Thu, 3 Aug 2017 14:07:11 -0400 Message-Id: <3541360f4242bb05f7386646bcc2993fd0c498a8.1501783631.git.leo@famulari.name> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27936@debbugs.gnu.org * 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 | 10 +++++----- gnu/packages/patches/libunwind-CVE-2015-3239.patch | 17 ----------------- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/libunwind-CVE-2015-3239.patch diff --git a/gnu/local.mk b/gnu/local.mk index f4fef78f3..207470ac7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -800,7 +800,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/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libxcb-python-3.5-compat.patch \ diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm index cda83b2bc..ce75322e1 100644 --- a/gnu/packages/libunwind.scm +++ b/gnu/packages/libunwind.scm @@ -27,19 +27,19 @@ (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. - ;; Report them upstream. + ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are + ;; expected to fail). + ;; Report it upstream. '(#:tests? #f)) (home-page "http://www.nongnu.org/libunwind") (synopsis "Determining the call chain of a program") 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 3f11ac733..000000000 --- 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 -- 2.13.3