[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/04: Merge branch 'staging' into core-updates |
|
Date: |
Wed, 20 Feb 2019 11:28:08 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 901236474a9523595c0bdefd5ac22366e78b9e61
Merge: 63d4ef5 64766d5
Author: Marius Bakke <address@hidden>
Date: Wed Feb 20 17:19:00 2019 +0100
Merge branch 'staging' into core-updates
HACKING | 7 +-
build-aux/run-system-tests.scm | 2 +-
doc/guix.texi | 2741 +--
gnu/installer/connman.scm | 2 +-
gnu/installer/newt/keymap.scm | 2 +-
gnu/installer/newt/page.scm | 2 +-
gnu/installer/newt/timezone.scm | 5 +-
gnu/installer/newt/utils.scm | 2 +-
gnu/installer/newt/wifi.scm | 8 +-
gnu/installer/parted.scm | 6 +-
gnu/installer/timezone.scm | 10 +-
gnu/local.mk | 26 +-
gnu/packages.scm | 53 +-
gnu/packages/admin.scm | 54 +-
gnu/packages/aidc.scm | 29 +-
gnu/packages/algebra.scm | 146 +-
gnu/packages/assembly.scm | 12 +-
gnu/packages/audio.scm | 38 +-
.../aux-files/chromium/master-preferences.json | 26 +
gnu/packages/backup.scm | 44 +-
gnu/packages/base.scm | 5 +-
gnu/packages/bioconductor.scm | 23 +
gnu/packages/bioinformatics.scm | 306 +-
gnu/packages/bittorrent.scm | 22 +-
gnu/packages/bootloaders.scm | 12 +-
gnu/packages/busybox.scm | 6 +-
gnu/packages/check.scm | 32 +-
gnu/packages/chez.scm | 155 +-
gnu/packages/chromium.scm | 705 +
gnu/packages/compression.scm | 77 +-
gnu/packages/conky.scm | 18 +-
gnu/packages/coq.scm | 81 +-
gnu/packages/cran.scm | 150 +-
gnu/packages/crypto.scm | 6 +-
gnu/packages/cups.scm | 52 +
gnu/packages/curl.scm | 10 +-
gnu/packages/databases.scm | 37 +-
gnu/packages/debug.scm | 36 +
gnu/packages/dictionaries.scm | 2 +-
gnu/packages/disk.scm | 32 +-
gnu/packages/dlang.scm | 4 +-
gnu/packages/dns.scm | 28 +-
gnu/packages/docker.scm | 13 +-
gnu/packages/documentation.scm | 13 +-
gnu/packages/efi.scm | 10 +-
gnu/packages/emacs-xyz.scm | 183 +-
gnu/packages/engineering.scm | 9 +-
gnu/packages/file-systems.scm | 4 +-
gnu/packages/finance.scm | 168 +-
gnu/packages/flashing-tools.scm | 20 +-
gnu/packages/fonts.scm | 51 +
gnu/packages/ftp.scm | 8 +-
gnu/packages/game-development.scm | 12 +-
gnu/packages/games.scm | 74 +-
gnu/packages/gd.scm | 11 +
gnu/packages/genimage.scm | 194 +
gnu/packages/geo.scm | 27 +-
gnu/packages/gimp.scm | 16 +-
gnu/packages/gl.scm | 6 +-
gnu/packages/gnome.scm | 334 +-
gnu/packages/gnupg.scm | 19 +-
gnu/packages/gnuzilla.scm | 4 +-
gnu/packages/gtk.scm | 29 +-
gnu/packages/guile-xyz.scm | 101 +-
gnu/packages/hardware.scm | 12 +-
gnu/packages/ibus.scm | 145 +-
gnu/packages/image-processing.scm | 8 +-
gnu/packages/image-viewers.scm | 6 +-
gnu/packages/image.scm | 42 +-
gnu/packages/irc.scm | 8 +-
gnu/packages/java.scm | 41 +-
gnu/packages/kde-frameworks.scm | 337 +-
gnu/packages/kde-plasma.scm | 228 +
gnu/packages/kde.scm | 101 +-
gnu/packages/kodi.scm | 6 +-
gnu/packages/libffi.scm | 6 +-
gnu/packages/libreoffice.scm | 36 +-
gnu/packages/linux.scm | 42 +-
gnu/packages/lisp.scm | 15 +-
gnu/packages/llvm.scm | 88 +-
gnu/packages/lxqt.scm | 2 +-
gnu/packages/machine-learning.scm | 3 -
gnu/packages/magic-wormhole.scm | 160 +
gnu/packages/mail.scm | 42 +-
gnu/packages/maths.scm | 110 +-
gnu/packages/maven.scm | 12 +-
gnu/packages/mpi.scm | 27 +-
gnu/packages/multiprecision.scm | 15 +-
gnu/packages/music.scm | 18 +-
gnu/packages/musl.scm | 12 +-
gnu/packages/ncdu.scm | 6 +-
gnu/packages/ncurses.scm | 8 +-
gnu/packages/netpbm.scm | 4 +-
gnu/packages/networking.scm | 46 +-
gnu/packages/ocaml.scm | 228 +-
gnu/packages/package-management.scm | 87 +-
gnu/packages/parallel.scm | 6 +-
.../patches/allegro4-mesa-18.2.5-and-later.patch | 41 -
.../patches/clang-7.0-libc-search-path.patch | 82 +
gnu/packages/patches/dealii-mpi-deprecations.patch | 28 +
gnu/packages/patches/doxygen-test.patch | 8 +-
gnu/packages/patches/gd-CVE-2019-6977.patch | 36 +
gnu/packages/patches/gd-CVE-2019-6978.patch | 301 +
gnu/packages/patches/glibc-CVE-2018-11236.patch | 149 +
gnu/packages/patches/glibc-CVE-2018-11237.patch | 55 +
gnu/packages/patches/kio-search-smbd-on-PATH.patch | 2 +-
.../patches/ledger-revert-boost-python-fix.patch | 39 -
...8.0-fix-variable-length-integer-receiving.patch | 15 +
gnu/packages/patches/pius.patch | 38 -
gnu/packages/patches/qtbase-old-kernel.patch | 25 +
.../red-eclipse-remove-gamma-name-hack.patch | 52 +
.../patches/ruby-safe-yaml-add-require-time.patch | 19 +
gnu/packages/patches/runc-CVE-2019-5736.patch | 343 +
.../patches/scalapack-blacs-mpi-deprecations.patch | 170 +
.../soundconverter-remove-gconf-dependency.patch | 104 +-
gnu/packages/patches/tomsfastmath-constness.patch | 76 -
.../patches/xf86-video-i128-remove-mibstore.patch | 23 -
gnu/packages/patches/xmodmap-asprintf.patch | 14 -
gnu/packages/pdf.scm | 17 +-
gnu/packages/perl.scm | 17 +-
gnu/packages/python-crypto.scm | 82 +-
gnu/packages/python-web.scm | 116 +-
gnu/packages/python-xyz.scm | 189 +-
gnu/packages/python.scm | 62 +
gnu/packages/qt.scm | 33 +-
gnu/packages/rails.scm | 372 +
gnu/packages/rdesktop.scm | 26 +-
gnu/packages/rrdtool.scm | 6 +-
gnu/packages/ruby.scm | 1895 +-
gnu/packages/rust.scm | 16 +-
gnu/packages/sagemath.scm | 59 +-
gnu/packages/sdl.scm | 48 +-
gnu/packages/search.scm | 6 +-
gnu/packages/security-token.scm | 8 +-
gnu/packages/simh.scm | 19 +-
gnu/packages/skarnet.scm | 6 +-
gnu/packages/statistics.scm | 23 +-
gnu/packages/suckless.scm | 4 +-
gnu/packages/sync.scm | 43 +-
gnu/packages/terminals.scm | 55 +-
gnu/packages/textutils.scm | 4 +-
gnu/packages/tls.scm | 24 +-
gnu/packages/tmux.scm | 23 +-
gnu/packages/tor.scm | 7 +-
gnu/packages/version-control.scm | 19 +-
gnu/packages/video.scm | 62 +-
gnu/packages/vim.scm | 12 +-
gnu/packages/virtualization.scm | 16 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 103 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 66 +-
gnu/packages/xdisorg.scm | 53 +-
gnu/packages/xml.scm | 36 +-
gnu/packages/xorg.scm | 123 +-
gnu/services/desktop.scm | 109 +-
gnu/services/xorg.scm | 121 +-
gnu/system/vm.scm | 6 +-
guix/build/ruby-build-system.scm | 53 +-
guix/git.scm | 8 +
guix/gnu-maintenance.scm | 3 +-
guix/inferior.scm | 26 +
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 2 +-
guix/scripts/copy.scm | 2 +-
guix/scripts/environment.scm | 55 +-
guix/scripts/pack.scm | 6 +-
guix/scripts/package.scm | 3 +-
guix/scripts/pull.scm | 65 +-
guix/scripts/system.scm | 22 +-
guix/self.scm | 20 +-
guix/status.scm | 3 +
guix/ui.scm | 11 +-
po/guix/da.po | 1439 +-
po/guix/de.po | 1464 +-
po/packages/da.po | 8631 ++++---
po/packages/de.po | 22429 ++++++++++++++++++-
tests/guix-environment.sh | 15 +-
tests/inferior.scm | 22 +-
tests/packages.scm | 3 +-
180 files changed, 39084 insertions(+), 8943 deletions(-)
diff --cc gnu/local.mk
index 3f66bea,131bbef..e239c76
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -814,10 -818,9 +821,12 @@@ dist_patch_DATA =
%D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \
+ %D%/packages/patches/glibc-CVE-2018-11236.patch \
+ %D%/packages/patches/glibc-CVE-2018-11237.patch \
%D%/packages/patches/glibc-allow-kernel-2.6.32.patch \
+ %D%/packages/patches/glibc-boot-2.16.0.patch \
+ %D%/packages/patches/glibc-boot-2.2.5.patch \
+ %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \
%D%/packages/patches/glibc-bootstrap-system.patch \
%D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \
%D%/packages/patches/glibc-hurd-magic-pid.patch \
diff --cc gnu/packages/base.scm
index c3db665,db9cca6..289631a
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -860,7 -893,9 +860,10 @@@ with the Linux kernel."
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
- "glibc-supported-locales.patch"))))))
++ "glibc-supported-locales.patch"
+ "glibc-CVE-2018-11236.patch"
+ "glibc-CVE-2018-11237.patch"))))
+ (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ;
glibc-2.27-git-fixes
(define-public glibc-2.26
(package
diff --cc gnu/packages/gnupg.scm
index 2ef1659,c5c99bf..e0a763d
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -13,9 -13,8 +13,9 @@@
;;; Copyright © 2016 Troy Sankey <address@hidden>
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2017 Petter <address@hidden>
- ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2018 Björn Höfling <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/tls.scm
index a90cf0b,c10b1a5..f4ae7fb
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -268,13 -277,13 +268,13 @@@ required structures."
(uri (list (string-append
"https://www.openssl.org/source/openssl-";
version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/";
- name "-" version ".tar.gz")
+ "openssl-" version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/old/";
(string-trim-right version
char-set:letter)
- "/" name "-" version ".tar.gz")))
+ "/openssl-" version ".tar.gz")))
(sha256
(base32
- "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah"))
+ "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p"))
(patches (search-patches "openssl-runpath.patch"
"openssl-c-rehash-in.patch"))))
(build-system gnu-build-system)