[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Mon, 23 Jan 2017 21:35:57 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 58ea4d407c2e4adbe51b2d7b71dc8bef095677c7
Merge: fcd75bd 84b60a7
Author: Ludovic Courtès <address@hidden>
Date: Mon Jan 23 22:33:10 2017 +0100
Merge branch 'master' into core-updates
.gitignore | 1 +
Makefile.am | 4 +-
configure.ac | 5 +
doc/contributing.texi | 28 +-
doc/guix.texi | 951 +++++++++++++++++++-
doc/local.mk | 3 +-
etc/indent-code.el.in | 114 +++
gnu/build/file-systems.scm | 196 ++--
gnu/local.mk | 46 +-
gnu/packages/abiword.scm | 9 +-
gnu/packages/admin.scm | 12 +-
gnu/packages/algebra.scm | 17 -
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audacity.scm | 14 +-
gnu/packages/audio.scm | 13 +-
gnu/packages/backup.scm | 28 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioinformatics.scm | 554 +++++++++++-
gnu/packages/bittorrent.scm | 40 +
gnu/packages/c.scm | 34 +-
gnu/packages/check.scm | 4 +-
gnu/packages/ci.scm | 16 +-
gnu/packages/compression.scm | 6 +-
gnu/packages/compton.scm | 106 +++
gnu/packages/connman.scm | 2 +
gnu/packages/crypto.scm | 38 +-
gnu/packages/cups.scm | 23 +-
gnu/packages/cyrus-sasl.scm | 4 +-
gnu/packages/databases.scm | 43 +-
gnu/packages/datamash.scm | 4 +-
gnu/packages/django.scm | 4 +-
gnu/packages/dns.scm | 16 +-
gnu/packages/education.scm | 56 +-
gnu/packages/emacs.scm | 116 ++-
gnu/packages/engineering.scm | 13 +-
gnu/packages/enlightenment.scm | 8 +-
gnu/packages/fcitx.scm | 36 +
gnu/packages/fonts.scm | 200 ++--
gnu/packages/freedesktop.scm | 91 +-
gnu/packages/games.scm | 77 +-
gnu/packages/gcal.scm | 6 +-
gnu/packages/gd.scm | 29 +-
gnu/packages/geo.scm | 93 +-
gnu/packages/ghostscript.scm | 9 +
gnu/packages/gimp.scm | 3 +-
gnu/packages/gl.scm | 10 +-
gnu/packages/glib.scm | 24 +-
gnu/packages/gnome.scm | 443 ++++++---
gnu/packages/gnucash.scm | 14 +-
gnu/packages/gnupg.scm | 12 +-
gnu/packages/gnuzilla.scm | 90 +-
gnu/packages/gsasl.scm | 2 +-
gnu/packages/gtk.scm | 67 +-
gnu/packages/guile.scm | 86 +-
gnu/packages/haskell.scm | 97 +-
gnu/packages/image.scm | 25 +
gnu/packages/imagemagick.scm | 7 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 2 +-
gnu/packages/kde-frameworks.scm | 4 +-
gnu/packages/kde.scm | 21 +-
gnu/packages/kerberos.scm | 187 ++++
...bre-4.8-i686.conf => linux-libre-4.9-i686.conf} | 208 +++--
...4.8-x86_64.conf => linux-libre-4.9-x86_64.conf} | 216 +++--
gnu/packages/linux.scm | 155 +++-
gnu/packages/lisp.scm | 4 +-
gnu/packages/lua.scm | 4 +-
gnu/packages/lxde.scm | 23 +-
gnu/packages/mail.scm | 71 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/maths.scm | 10 +-
gnu/packages/messaging.scm | 117 ++-
gnu/packages/mit-krb5.scm | 86 --
gnu/packages/mp3.scm | 4 +-
gnu/packages/music.scm | 141 +--
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 16 +-
gnu/packages/nfs.scm | 2 +-
gnu/packages/nim.scm | 59 ++
gnu/packages/ocaml.scm | 486 +++++++++-
gnu/packages/onc-rpc.scm | 4 +-
gnu/packages/openbox.scm | 37 +
gnu/packages/package-management.scm | 8 +-
gnu/packages/password-utils.scm | 15 +-
.../patches/cracklib-fix-buffer-overflow.patch | 39 +
.../patches/duplicity-piped-password.patch | 20 -
.../patches/duplicity-test_selection-tmp.patch | 18 -
.../patches/lcms-fix-out-of-bounds-read.patch | 34 +
gnu/packages/patches/libtiff-CVE-2016-10092.patch | 42 +
gnu/packages/patches/libtiff-CVE-2016-10093.patch | 53 ++
gnu/packages/patches/libtiff-CVE-2016-10094.patch | 34 +
gnu/packages/patches/libtiff-CVE-2017-5225.patch | 86 ++
.../patches/libtiff-assertion-failure.patch | 60 ++
.../patches/libtiff-divide-by-zero-ojpeg.patch | 63 ++
.../patches/libtiff-divide-by-zero-tiffcp.patch | 104 +++
.../patches/libtiff-divide-by-zero-tiffcrop.patch | 57 ++
gnu/packages/patches/libtiff-divide-by-zero.patch | 67 ++
.../libtiff-heap-overflow-pixarlog-luv.patch | 131 +++
.../libtiff-heap-overflow-tif-dirread.patch | 132 +++
.../patches/libtiff-heap-overflow-tiffcp.patch | 67 ++
.../patches/libtiff-heap-overflow-tiffcrop.patch | 60 ++
gnu/packages/patches/libtiff-invalid-read.patch | 64 ++
.../patches/libtiff-null-dereference.patch | 42 +
.../patches/libtiff-tiffcp-underflow.patch | 41 +
gnu/packages/patches/libxt-guix-search-paths.patch | 126 +++
.../patches/mupdf-mujs-CVE-2016-10132.patch | 188 ++++
.../patches/mupdf-mujs-CVE-2016-10133.patch | 36 +
.../python-pygpgme-fix-pinentry-tests.patch | 69 ++
gnu/packages/patches/qemu-CVE-2016-10155.patch | 49 +
gnu/packages/patches/qemu-CVE-2017-5525.patch | 55 ++
gnu/packages/patches/qemu-CVE-2017-5526.patch | 58 ++
gnu/packages/patches/qemu-CVE-2017-5552.patch | 44 +
.../ruby-yard-fix-skip-of-markdown-tests.patch | 17 -
gnu/packages/patches/tipp10-fix-compiling.patch | 213 +++++
.../patches/tipp10-remove-license-code.patch | 332 +++++++
gnu/packages/patches/totem-debug-format-fix.patch | 11 -
gnu/packages/patches/upower-builddir.patch | 2 +-
.../patches/xf86-video-glint-remove-mibstore.patch | 24 -
.../patches/xf86-video-nv-remove-mibstore.patch | 72 --
gnu/packages/pdf.scm | 45 +-
gnu/packages/perl.scm | 29 +-
gnu/packages/photo.scm | 12 +-
gnu/packages/popt.scm | 14 +-
gnu/packages/python.scm | 247 ++++-
gnu/packages/qemu.scm | 11 +-
gnu/packages/qt.scm | 269 +++++-
gnu/packages/ruby.scm | 109 ++-
gnu/packages/rust.scm | 14 +-
gnu/packages/screen.scm | 8 +-
gnu/packages/sdl.scm | 42 +-
gnu/packages/search.scm | 4 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/shells.scm | 52 +-
gnu/packages/shishi.scm | 70 --
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 170 +++-
gnu/packages/suckless.scm | 463 +++++++++-
gnu/packages/tls.scm | 29 +-
gnu/packages/upnp.scm | 11 +-
gnu/packages/version-control.scm | 18 +-
gnu/packages/video.scm | 23 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/vpn.scm | 5 +-
gnu/packages/web.scm | 10 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 67 +-
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xfce.scm | 7 +-
gnu/packages/xfig.scm | 155 ++--
gnu/packages/xorg.scm | 429 ++++-----
gnu/services.scm | 9 +-
gnu/services/configuration.scm | 3 +
gnu/services/cuirass.scm | 5 +
gnu/services/databases.scm | 81 +-
gnu/services/messaging.scm | 727 +++++++++++++++
gnu/services/networking.scm | 86 +-
gnu/services/vpn.scm | 491 ++++++++++
gnu/services/web.scm | 97 +-
gnu/system/file-systems.scm | 38 +-
gnu/system/linux-initrd.scm | 6 +
gnu/tests/base.scm | 22 +-
gnu/tests/install.scm | 82 +-
gnu/tests/web.scm | 146 +++
guix/build/syscalls.scm | 126 ++-
guix/derivations.scm | 17 +-
guix/git-download.scm | 3 +-
guix/grafts.scm | 8 +-
guix/http-client.scm | 33 +-
guix/import/github.scm | 20 +-
guix/licenses.scm | 10 +-
guix/profiles.scm | 1 +
guix/scripts/archive.scm | 38 +-
guix/scripts/build.scm | 21 +-
guix/scripts/challenge.scm | 185 ++--
guix/scripts/environment.scm | 8 +-
guix/scripts/lint.scm | 10 +-
guix/scripts/package.scm | 5 +-
guix/scripts/perform-download.scm | 37 +-
guix/store.scm | 34 +-
guix/ui.scm | 52 +-
guix/utils.scm | 10 +-
nix/libstore/build.cc | 15 +-
nix/libstore/builtins.cc | 10 +-
nix/libstore/builtins.hh | 5 +-
nix/libstore/worker-protocol.hh | 2 +-
nix/nix-daemon/guix-daemon.cc | 5 +-
nix/nix-daemon/nix-daemon.cc | 16 +-
tests/challenge.scm | 62 +-
tests/derivations.scm | 27 +-
tests/file-systems.scm | 24 +-
tests/guix-daemon.sh | 29 +-
tests/guix-environment.sh | 7 +-
tests/guix-package.sh | 10 +-
tests/store.scm | 27 +-
tests/syscalls.scm | 13 +-
195 files changed, 11386 insertions(+), 1973 deletions(-)
diff --cc gnu/local.mk
index ca14a85,26933d4..532ea51
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -840,7 -871,7 +868,6 @@@ dist_patch_DATA =
%D%/packages/patches/ruby-puma-ignore-broken-test.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
- %D%/packages/patches/ruby-yard-fix-skip-of-markdown-tests.patch \
- %D%/packages/patches/sed-hurd-path-max.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-test-threading.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
diff --cc gnu/packages/compression.scm
index 86cb147,2e4de81..873671c
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -57,28 -57,28 +57,28 @@@
(method url-fetch)
(uri (list (string-append "http://zlib.net/zlib-";
version ".tar.gz")
- (string-append "mirror://sourceforge/libpng/zlib-"
- version ".tar.gz")))
+ (string-append "mirror://sourceforge/libpng/zlib/"
+ version "/zlib-" version ".tar.gz")))
(sha256
(base32
- "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n"))))
+ "18dighcs333gsvajvvgqp8l4cx7h1x7yx9gd5xacnk80spyykrf3"))))
(build-system gnu-build-system)
(arguments
- `(#:phases (alist-replace
- 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Zlib's home-made `configure' fails when passed
- ;; extra flags like `--enable-fast-install', so we need to
- ;; invoke it with just what it understand.
- (let ((out (assoc-ref outputs "out")))
- ;; 'configure' doesn't understand '--host'.
- ,@(if (%current-target-system)
- `((setenv "CHOST" ,(%current-target-system)))
- '())
- (zero?
- (system* "./configure"
- (string-append "--prefix=" out)))))
- %standard-phases)))
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Zlib's home-made `configure' fails when passed
+ ;; extra flags like `--enable-fast-install', so we need to
+ ;; invoke it with just what it understand.
+ (let ((out (assoc-ref outputs "out")))
+ ;; 'configure' doesn't understand '--host'.
+ ,@(if (%current-target-system)
+ `((setenv "CHOST" ,(%current-target-system)))
+ '())
+ (zero?
+ (system* "./configure"
+ (string-append "--prefix=" out)))))))))
(home-page "http://zlib.net/";)
(synopsis "Compression library")
(description
diff --cc gnu/packages/kerberos.scm
index 0000000,b6d25f4..9f042bd
mode 000000,100644..100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@@ -1,0 -1,187 +1,187 @@@
+ ;;; GNU Guix --- Functional package management for GNU
+ ;;; Copyright © 2012, 2013 Andreas Enge <address@hidden>
+ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
+ ;;; Copyright © 2016 Leo Famulari <address@hidden>
+ ;;; Copyright © 2016 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2012, 2013 Nikita Karetnikov <address@hidden>
+ ;;; Copyright © 2012, 2017 Ludovic Courtès <address@hidden>
+ ;;;
+ ;;; This file is part of GNU Guix.
+ ;;;
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
+ ;;; under the terms of the GNU General Public License as published by
+ ;;; the Free Software Foundation; either version 3 of the License, or (at
+ ;;; your option) any later version.
+ ;;;
+ ;;; GNU Guix is distributed in the hope that it will be useful, but
+ ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+ ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ;;; GNU General Public License for more details.
+ ;;;
+ ;;; You should have received a copy of the GNU General Public License
+ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+ (define-module (gnu packages kerberos)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages gnupg)
+ #:use-module (gnu packages libidn)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages databases)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages tls)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix utils)
+ #:use-module (guix build-system gnu))
+
+ (define-public mit-krb5
+ (package
+ (name "mit-krb5")
- (version "1.14.3")
++ (version "1.14.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://web.mit.edu/kerberos/dist/krb5/";
+ (version-major+minor version)
+ "/krb5-" version ".tar.gz"))
+ (sha256
+ (base32
- "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind"))))
++ "158bgq9xcg5ljgzia1880ak7m9g6vf2r009rzdqif5n9h111m9h3"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("bison" ,bison)
+ ("perl" ,perl)))
+ (arguments
+ `(;; Work around "No rule to make target '../../include/gssapi/gssapi.h',
+ ;; needed by 'authgss_prot.so'."
+ #:parallel-build? #f
+
+ ;; Likewise with tests.
+ #:parallel-tests? #f
+
+ ;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call
+ ;; while running the tests in 'src/tests'.
+ #:tests? ,(string=? (%current-system) "x86_64-linux")
+
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'enter-source-directory
+ (lambda _
+ (chdir "src")
+ #t))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((perl (assoc-ref inputs "perl")))
+ (substitute* "plugins/kdb/db2/libdb2/test/run.test"
+ (("/bin/cat") (string-append perl "/bin/perl"))
- (("D/bin/sh") (string-append "D" (which "bash")))
++ (("D/bin/sh") (string-append "D" (which "sh")))
+ (("bindir=/bin/.") (string-append "bindir=" perl "/bin"))))
+
+ ;; avoid service names since /etc/services is unavailable
+ (substitute* "tests/resolve/Makefile"
+ (("-p telnet") "-p 23"))
+ #t)))))
+ (synopsis "MIT Kerberos 5")
+ (description
+ "Massachusetts Institute of Technology implementation of Kerberos.
+ Kerberos is a network authentication protocol designed to provide strong
+ authentication for client/server applications by using secret-key
+ cryptography.")
+ (license (license:non-copyleft "file://NOTICE"
+ "See NOTICE in the distribution."))
+ (home-page "http://web.mit.edu/kerberos/";)))
+
+ (define-public shishi
+ (package
+ (name "shishi")
+ (version "1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/shishi/shishi-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("gnutls" ,gnutls)
+ ("libidn" ,libidn)
+ ("linux-pam" ,linux-pam-1.2)
+ ("zlib" ,zlib)
+ ;; libgcrypt 1.6 fails because of the following test:
+ ;; #include <gcrypt.h>
+ ;; /* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
+ ;; will fail on startup if we don't have 1.4.4 or later, so
+ ;; test for it early. */
+ ;; #if !defined GCRY_MODULE_ID_USER
+ ;; error too old libgcrypt
+ ;; #endif
+ ("libgcrypt" ,libgcrypt-1.5)
+ ("libtasn1" ,libtasn1)))
+ (home-page "http://www.gnu.org/software/shishi/";)
+ (synopsis "Implementation of the Kerberos 5 network security system")
+ (description
+ "GNU Shishi is a free implementation of the Kerberos 5 network security
+ system. It is used to allow non-secure network nodes to communicate in a
+ secure manner through client-server mutual authentication via tickets.")
+ (license license:gpl3+)))
+
+ (define-public heimdal
+ (package
+ (name "heimdal")
+ (version "1.5.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.h5l.org/dist/src/heimdal-";
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"))
+ (modules '((guix build utils)))
+ (snippet
+ '(substitute* "configure"
+ (("User=.*$") "User=Guix\n")
+ (("Date=.*$") "Date=2017\n")))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:configure-flags (list
+ ;; Work around a linker error.
+ "CFLAGS=-pthread"
+
+ ;; Avoid 7 MiB of .a files.
+ "--disable-static"
+
+ ;; Do not build libedit.
+ (string-append
+ "--with-readline-lib="
+ (assoc-ref %build-inputs "readline") "/lib")
+ (string-append
+ "--with-readline-include="
+ (assoc-ref %build-inputs "readline") "/include"))
+
+ #:phases (modify-phases %standard-phases
+ (add-before 'check 'skip-tests
+ (lambda _
+ ;; The test simply runs 'ftp --version && ftp --help'
+ ;; but that fails in the chroot because 'ftp' tries to
+ ;; do a service lookup before printing the help/version.
+ (substitute* "appl/ftp/ftp/Makefile.in"
+ (("^CHECK_LOCAL =.*")
+ "CHECK_LOCAL = no-check-local\n"))
+ #t)))))
+ (native-inputs `(("e2fsprogs" ,e2fsprogs))) ;for 'compile_et'
+ (inputs `(("readline" ,readline)
+ ("bdb" ,bdb)
+ ("e2fsprogs" ,e2fsprogs))) ;for libcom_err
+ (home-page "http://www.h5l.org/";)
+ (synopsis "Kerberos 5 network authentication")
+ (description
+ "Heimdal is an implementation of Kerberos 5 network authentication
+ service.")
+ (license license:bsd-3)))
diff --cc gnu/packages/linux.scm
index 5e450a7,4d27544..aa49d40
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -17,8 -17,8 +17,9 @@@
;;; Copyright © 2016 John Darrington <address@hidden>
;;; Copyright © 2016 Marius Bakke <address@hidden>
;;; Copyright © 2016 Rene Saavedra <address@hidden>
+;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
+ ;;; Copyright © 2017 Leo Famulari <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/tls.scm
index 49d4c31,1198eb7..4a81250
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -211,6 -214,33 +213,19 @@@ required structures."
(properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls")))))
-(define gnutls-3.5.8 ;fixes GNUTLS-SA-2017-{1,2}
- (package
- (inherit gnutls)
- (version "3.5.8")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnupg/gnutls/v"
- (version-major+minor version)
- "/gnutls-" version ".tar.xz"))
- (sha256
- (base32
- "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf"))))
- (replacement #f)))
-
+ (define-public gnutls/guile-2.2
+ ;; GnuTLS for Guile 2.2. This is supported by GnuTLS >= 3.5.5.
+ (package
- (inherit gnutls-3.5.8)
++ (inherit gnutls)
+ (name "guile2.2-gnutls")
+ (arguments
+ ;; Remove '--with-guile-site-dir=…/2.0'.
- (substitute-keyword-arguments (package-arguments gnutls-3.5.8)
++ (substitute-keyword-arguments (package-arguments gnutls)
+ ((#:configure-flags flags)
+ `(cdr ,flags))))
+ (inputs `(("guile" ,guile-next)
- ,@(alist-delete "guile" (package-inputs gnutls-3.5.8))))))
++ ,@(alist-delete "guile" (package-inputs gnutls))))))
+
(define-public openssl
(package
(name "openssl")