[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
02/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 24 Jan 2018 06:29:37 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 78dfc1613938fb9f975de8d61302f44be86df324
Merge: a102d35 a6af4d2
Author: Mark H Weaver <address@hidden>
Date: Wed Jan 24 06:18:08 2018 -0500
Merge branch 'master' into core-updates
gnu/local.mk | 2 -
gnu/packages/curl.scm | 14 ++
gnu/packages/gnuzilla.scm | 64 +++--
gnu/packages/linux.scm | 12 +-
.../icecat-bug-1427870-spectre-mitigation.patch | 49 ----
gnu/packages/patches/icecat-glibc-2.26.patch | 261 ---------------------
gnu/packages/qt.scm | 10 +-
gnu/packages/vim.scm | 10 +-
8 files changed, 69 insertions(+), 353 deletions(-)
diff --cc gnu/local.mk
index 9c44b2c,e86e7da..86b8216
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -762,8 -759,9 +762,6 @@@ dist_patch_DATA =
%D%/packages/patches/icecat-bug-1415133.patch \
%D%/packages/patches/icecat-bug-1414945.patch \
%D%/packages/patches/icecat-bug-1424373-pt2.patch \
- %D%/packages/patches/icecat-bug-1427870-spectre-mitigation.patch \
- %D%/packages/patches/icecat-glibc-2.26.patch \
- %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
- %D%/packages/patches/icu4c-CVE-2017-14952.patch \
- %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
diff --cc gnu/packages/curl.scm
index a586914,2ab1944..e51e014
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -46,7 -45,8 +46,8 @@@
(define-public curl
(package
(name "curl")
- (version "7.55.1")
+ (version "7.57.0")
+ (replacement curl-7.58.0)
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
diff --cc gnu/packages/gnuzilla.scm
index a0819b8,7d98a61..ecb3abd
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1,7 -1,7 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
- ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
+ ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Alex Griffin <address@hidden>