01/01: Merge branch 'master' into security-updates

[Mark H. Weaver]

mhw pushed a commit to branch security-updates
in repository guix.

commit 0ea7fc788af4be5ed0dc785d604e785cf7cb164a
Merge: f809cc8 4c28ca1
Author: Mark H Weaver <address@hidden>
Date:   Tue Feb 2 20:56:39 2016 -0500

    Merge branch 'master' into security-updates

 Makefile.am                                        |    6 +-
 build-aux/compile-all.scm                          |   20 +-
 doc.am                                             |    6 +-
 doc/guix.texi                                      |  405 +-
 emacs/guix-command.el                              |    5 +-
 gnu-system.am                                      |    6 +-
 gnu/packages/aspell.scm                            |   10 +
 gnu/packages/bioinformatics.scm                    |    4 +-
 gnu/packages/ccache.scm                            |    7 +-
 gnu/packages/dav.scm                               |    8 +-
 gnu/packages/freedesktop.scm                       |    3 +
 gnu/packages/games.scm                             |   40 +-
 gnu/packages/gnome.scm                             |   10 +-
 gnu/packages/linux-libre-4.1-i686.conf             | 8314 ++++++++++++++++++++
 gnu/packages/linux-libre-4.1-x86_64.conf           | 8114 +++++++++++++++++++
 gnu/packages/linux.scm                             |   70 +-
 gnu/packages/networking.scm                        |    4 +-
 gnu/packages/ntp.scm                               |    4 +-
 gnu/packages/password-utils.scm                    |    5 +-
 .../patches/linux-libre-CVE-2016-0728.patch        |   84 -
 gnu/packages/patches/pinball-const-fix.patch       |   11 +
 gnu/packages/patches/pinball-cstddef.patch         |   38 +
 .../patches/pinball-missing-separators.patch       |  101 +
 gnu/packages/patches/pinball-src-deps.patch        |   24 +
 gnu/packages/patches/pinball-system-ltdl.patch     |   18 +
 gnu/packages/python.scm                            |  270 +-
 gnu/packages/tls.scm                               |    7 +-
 gnu/packages/webkit.scm                            |    4 +-
 gnu/services/base.scm                              |    4 +-
 gnu/system.scm                                     |    5 +-
 gnu/system/install.scm                             |    3 +-
 guix/build-system/python.scm                       |   13 +-
 guix/licenses.scm                                  |    7 +
 guix/scripts/build.scm                             |  211 +-
 guix/scripts/package.scm                           |   16 +-
 tests/guix-build.sh                                |   14 +-
 tests/scripts-build.scm                            |   88 +
 37 files changed, 17553 insertions(+), 406 deletions(-)

diff --cc gnu/packages/tls.scm
index 4407fa3,821156c..abf81e7
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -180,14 -180,17 +180,17 @@@ required structures."
  (define-public openssl
    (package
     (name "openssl")
 -   (version "1.0.2e")
 +   (version "1.0.2f")
     (source (origin
              (method url-fetch)
-             (uri (string-append "ftp://ftp.openssl.org/source/openssl-"; 
version
-                                 ".tar.gz"))
+             (uri (list (string-append "ftp://ftp.openssl.org/source/";
+                                       name "-" version ".tar.gz")
+                        (string-append "ftp://ftp.openssl.org/source/old/";
+                                       (string-take version 5) "/"
+                                       name "-" version ".tar.gz")))
              (sha256
               (base32
 -              "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"))
 +              "171fkdg9v6j29d962nh6kb79kfm8kkhy7n9makw39d7jvvj4wawk"))
              (patches (map search-patch
                            '("openssl-runpath.patch"
                              "openssl-c-rehash.patch")))))