[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Tue, 20 Jun 2017 00:32:20 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 9815739e9bc5de4a4fbcc710221c2cee377664d4
Merge: e46e957 16b0f20
Author: Mark H Weaver <address@hidden>
Date: Tue Jun 20 00:25:59 2017 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 2 +-
gnu/packages/connman.scm | 5 +-
gnu/packages/embedded.scm | 3 +-
gnu/packages/enlightenment.scm | 65 ++++++++++++++++------
gnu/packages/finance.scm | 4 +-
gnu/packages/gnome.scm | 6 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/linux.scm | 36 +++++++++++-
gnu/packages/mail.scm | 5 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/networking.scm | 31 ++++++++++-
gnu/packages/patches/exim-CVE-2017-1000369.patch | 59 ++++++++++++++++++++
gnu/packages/patches/miniupnpc-CVE-2017-8798.patch | 55 ------------------
gnu/packages/python.scm | 41 ++++++++++++++
gnu/packages/security-token.scm | 6 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/tex.scm | 12 ++--
gnu/packages/tls.scm | 41 +++++++-------
gnu/packages/upnp.scm | 5 +-
gnu/packages/version-control.scm | 9 ++-
gnu/packages/video.scm | 6 +-
gnu/packages/web.scm | 4 +-
guix/build-system/texlive.scm | 4 +-
guix/store.scm | 63 +++++++++++++++++++--
24 files changed, 335 insertions(+), 135 deletions(-)
diff --cc gnu/local.mk
index 4acc699,ae4a59a..1ae2a2d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -570,7 -572,10 +570,8 @@@ dist_patch_DATA =
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/eudev-rules-directory.patch \
- %D%/packages/patches/eudev-conflicting-declaration.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
- %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \
+ %D%/packages/patches/exim-CVE-2017-1000369.patch \
%D%/packages/patches/fabric-tests.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
%D%/packages/patches/fastcap-mulSetup.patch \