[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'staging' into core-updates |
|
Date: |
Fri, 1 Mar 2019 11:44:39 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit f5e563e50a232492e57d609a95d96081a060ea17
Merge: 1130929 1946417
Author: Marius Bakke <address@hidden>
Date: Fri Mar 1 17:40:51 2019 +0100
Merge branch 'staging' into core-updates
Makefile.am | 1 +
gnu/local.mk | 16 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 112 ++----
gnu/packages/backup.scm | 6 +-
gnu/packages/bioinformatics.scm | 122 +++++-
gnu/packages/code.scm | 4 +-
gnu/packages/crypto.scm | 50 ++-
gnu/packages/databases.scm | 21 +-
gnu/packages/disk.scm | 9 +-
gnu/packages/elf.scm | 4 +-
gnu/packages/emacs-xyz.scm | 53 ++-
gnu/packages/emacs.scm | 68 ++--
gnu/packages/emulators.scm | 6 +-
gnu/packages/fonts.scm | 22 +-
gnu/packages/freedesktop.scm | 8 +-
gnu/packages/games.scm | 74 ++--
gnu/packages/gcc.scm | 4 +-
gnu/packages/gnome.scm | 29 +-
gnu/packages/gnucash.scm | 4 +-
gnu/packages/gnuzilla.scm | 7 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/kde-frameworks.scm | 7 +-
gnu/packages/libedit.scm | 5 +-
gnu/packages/libffi.scm | 45 ++-
gnu/packages/libunwind.scm | 5 +-
gnu/packages/linux.scm | 50 +--
gnu/packages/lisp.scm | 4 +-
gnu/packages/lxqt.scm | 15 +-
gnu/packages/man.scm | 6 +-
gnu/packages/markup.scm | 2 +-
gnu/packages/mastodon.scm | 66 +++
gnu/packages/maths.scm | 7 +-
gnu/packages/mc.scm | 12 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/music.scm | 21 +-
gnu/packages/netpbm.scm | 3 +
gnu/packages/networking.scm | 18 +-
gnu/packages/opencl.scm | 2 +
gnu/packages/package-management.scm | 4 +-
.../patches/musescore-fix-use_webengine.patch | 165 --------
gnu/packages/patches/netpbm-CVE-2017-2586.patch | 21 +
gnu/packages/patches/netpbm-CVE-2017-2587.patch | 35 ++
gnu/packages/patches/openssl-CVE-2019-1559.patch | 60 +++
gnu/packages/patches/wesnoth-newer-boost.patch | 46 ---
.../patches/wpa-supplicant-CVE-2017-13082.patch | 182 ---------
.../patches/wpa-supplicant-CVE-2018-14526.patch | 53 ---
.../patches/wpa-supplicant-fix-key-reuse.patch | 448 ---------------------
.../patches/wpa-supplicant-fix-nonce-reuse.patch | 72 ----
.../patches/wpa-supplicant-fix-zeroed-keys.patch | 86 ----
.../patches/wpa-supplicant-krack-followups.patch | 275 -------------
gnu/packages/pciutils.scm | 4 +-
gnu/packages/plotutils.scm | 3 +-
gnu/packages/python-crypto.scm | 8 +-
gnu/packages/python-web.scm | 11 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/rsync.scm | 40 +-
gnu/packages/rust.scm | 5 +-
gnu/packages/simulation.scm | 4 +
gnu/packages/speech.scm | 101 ++++-
gnu/packages/spice.scm | 16 -
gnu/packages/ssh.scm | 15 +-
gnu/packages/tcl.scm | 8 +-
gnu/packages/tex.scm | 7 +
gnu/packages/textutils.scm | 35 ++
gnu/packages/tls.scm | 16 +-
gnu/packages/version-control.scm | 14 +-
gnu/packages/video.scm | 14 +-
gnu/packages/virtualization.scm | 91 +++--
gnu/packages/xdisorg.scm | 6 +-
gnu/services/desktop.scm | 1 +
guix/build-system/cargo.scm | 9 +-
guix/build/cargo-build-system.scm | 39 +-
guix/build/cargo-utils.scm | 67 +++
75 files changed, 1035 insertions(+), 1840 deletions(-)
diff --cc gnu/packages/tls.scm
index 8813083,6b13165..9cb2f7e
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -262,7 -271,8 +262,8 @@@ required structures."
(define-public openssl
(package
(name "openssl")
+ (replacement openssl/fixed)
- (version "1.0.2p")
+ (version "1.0.2q")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-";