02/02: Merge branch 'master' into staging

[Marius Bakke]

mbakke pushed a commit to branch staging
in repository guix.

commit 6a317919cf0f9dbc651a4a41f9ed99c49bf2d543
Merge: 6893281 8bde6a5
Author: Marius Bakke <address@hidden>
Date:   Fri Oct 6 11:03:27 2017 +0200

    Merge branch 'master' into staging

 gnu/build/file-systems.scm                         |  4 +-
 gnu/local.mk                                       |  6 --
 gnu/packages/assembly.scm                          |  4 +-
 gnu/packages/benchmark.scm                         | 67 +++++++++++++++-
 gnu/packages/curl.scm                              | 14 ++++
 gnu/packages/gnome.scm                             | 12 +--
 gnu/packages/golang.scm                            |  4 +-
 gnu/packages/gstreamer.scm                         |  4 +-
 gnu/packages/image.scm                             | 15 ++--
 gnu/packages/imagemagick.scm                       |  4 +-
 gnu/packages/maths.scm                             | 17 ++++-
 gnu/packages/patches/openjpeg-CVE-2017-12982.patch | 28 -------
 gnu/packages/patches/openjpeg-CVE-2017-14040.patch | 83 --------------------
 gnu/packages/patches/openjpeg-CVE-2017-14041.patch | 25 ------
 gnu/packages/patches/openjpeg-CVE-2017-14151.patch | 46 -----------
 gnu/packages/patches/openjpeg-CVE-2017-14152.patch | 38 ---------
 gnu/packages/patches/openjpeg-CVE-2017-14164.patch | 89 ----------------------
 gnu/packages/python.scm                            | 33 ++++++--
 gnu/packages/ssh.scm                               | 38 +++++++++
 gnu/packages/tls.scm                               |  6 +-
 gnu/packages/tor.scm                               |  8 +-
 gnu/system/file-systems.scm                        |  6 +-
 gnu/system/uuid.scm                                | 13 ++++
 guix/scripts/publish.scm                           | 15 ++--
 guix/scripts/system.scm                            | 65 ++++++++++++++++
 tests/publish.scm                                  |  4 +-
 tests/uuid.scm                                     |  6 ++
 27 files changed, 291 insertions(+), 363 deletions(-)

diff --cc gnu/packages/curl.scm
index 9408af7,ef1b6c7..30e03e6
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -42,7 -42,8 +42,8 @@@
  (define-public curl
    (package
     (name "curl")
 +   (version "7.55.1")
+    (replacement curl-7.56.0)
 -   (version "7.54.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://curl.haxx.se/download/curl-";