guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/08: Merge remote-tracking branch 'origin/master' into core-updates


From: Efraim Flashner
Subject: 05/08: Merge remote-tracking branch 'origin/master' into core-updates
Date: Mon, 20 Feb 2017 06:05:18 -0500 (EST)

efraim pushed a commit to branch core-updates
in repository guix.

commit d15432ca9e9359b865aac63ae47863e94bbce0e4
Merge: def9716 3b254d7
Author: Efraim Flashner <address@hidden>
Date:   Mon Feb 20 12:56:14 2017 +0200

    Merge remote-tracking branch 'origin/master' into core-updates

 Makefile.am                                        |    4 +-
 doc/contributing.texi                              |   14 +-
 doc/guix.texi                                      |   17 +
 gnu/local.mk                                       |   17 +-
 gnu/packages/admin.scm                             |  113 +-
 gnu/packages/audio.scm                             |    4 +-
 gnu/packages/backup.scm                            |    4 +-
 gnu/packages/calendar.scm                          |    4 +-
 gnu/packages/crypto.scm                            |   10 +-
 gnu/packages/databases.scm                         |    8 +-
 gnu/packages/dav.scm                               |   25 +-
 gnu/packages/disk.scm                              |   14 +-
 gnu/packages/emacs.scm                             |   54 +-
 gnu/packages/fonts.scm                             |   48 +
 gnu/packages/games.scm                             |   61 +-
 gnu/packages/gnome.scm                             |    8 +-
 gnu/packages/golang.scm                            |   19 +-
 gnu/packages/guile.scm                             |  187 +-
 gnu/packages/haskell.scm                           |   32 +-
 gnu/packages/hurd.scm                              |    7 +-
 gnu/packages/inkscape.scm                          |    4 +-
 gnu/packages/irc.scm                               |    4 +-
 gnu/packages/java.scm                              |   18 +-
 gnu/packages/jemalloc.scm                          |   10 +-
 gnu/packages/libevent.scm                          |   10 +-
 gnu/packages/linux-libre-4.10-i686.conf            | 9159 ++++++++++++++++++++
 gnu/packages/linux-libre-4.10-x86_64.conf          | 9001 +++++++++++++++++++
 gnu/packages/linux.scm                             |   14 +-
 gnu/packages/maths.scm                             |   23 +
 gnu/packages/messaging.scm                         |   17 +-
 gnu/packages/mpd.scm                               |    8 +-
 gnu/packages/music.scm                             |    6 +-
 gnu/packages/networking.scm                        |   59 +
 gnu/packages/ocaml.scm                             |  255 +
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/patches/hubbub-sort-entities.patch    |   13 +
 gnu/packages/patches/netsurf-about.patch           |   26 -
 .../patches/netsurf-longer-test-timeout.patch      |   20 +
 gnu/packages/patches/netsurf-system-utf8proc.patch |   64 +
 gnu/packages/patches/netsurf-y2038-tests.patch     |   25 +
 gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch   |   33 +-
 gnu/packages/patches/qemu-CVE-2017-5667.patch      |   46 +
 gnu/packages/patches/qemu-CVE-2017-5898.patch      |   44 +
 gnu/packages/patches/qemu-CVE-2017-5931.patch      |   55 +
 gnu/packages/patches/screen-CVE-2017-5618.patch    |   40 +
 .../patches/shadow-4.4-su-snprintf-fix.patch       |   31 +
 .../slurm-configure-remove-nonfree-contribs.patch  |   22 +-
 gnu/packages/patches/spice-CVE-2016-9577.patch     |   33 +
 gnu/packages/patches/spice-CVE-2016-9578-1.patch   |   33 +
 gnu/packages/patches/spice-CVE-2016-9578-2.patch   |   38 +
 .../vdirsyncer-test-suite-slow-machines.patch      |   42 +
 gnu/packages/patches/vim-CVE-2017-5953.patch       |   24 +
 gnu/packages/perl.scm                              |   20 +
 gnu/packages/python.scm                            |  101 +-
 gnu/packages/qemu.scm                              |    5 +-
 gnu/packages/qt.scm                                |    5 +-
 gnu/packages/ruby.scm                              |    4 +-
 gnu/packages/scheme.scm                            |   41 +-
 gnu/packages/screen.scm                            |    2 +
 gnu/packages/search.scm                            |   11 +-
 gnu/packages/shells.scm                            |   63 +-
 gnu/packages/simh.scm                              |   96 +
 gnu/packages/spice.scm                             |   26 +-
 gnu/packages/telephony.scm                         |    7 +-
 gnu/packages/textutils.scm                         |   34 +-
 gnu/packages/tls.scm                               |    4 +-
 gnu/packages/version-control.scm                   |    7 +-
 gnu/packages/video.scm                             |   13 +-
 gnu/packages/vim.scm                               |    1 +
 gnu/packages/web.scm                               |  486 +-
 gnu/packages/webkit.scm                            |    6 +-
 gnu/packages/wget.scm                              |    4 +-
 gnu/packages/wm.scm                                |    4 +-
 gnu/packages/xdisorg.scm                           |    4 +-
 gnu/packages/xml.scm                               |   21 +-
 gnu/packages/xorg.scm                              |   26 -
 gnu/services/messaging.scm                         |    5 +-
 gnu/services/networking.scm                        |   64 +-
 gnu/services/xorg.scm                              |    2 -
 gnu/system/examples/bare-bones.tmpl                |    2 +-
 gnu/system/examples/desktop.tmpl                   |    2 +-
 gnu/system/examples/lightweight-desktop.tmpl       |    2 +-
 gnu/tests/messaging.scm                            |  194 +
 guix/build/dub-build-system.scm                    |    4 +-
 guix/import/stackage.scm                           |   10 +-
 guix/scripts/import/stackage.scm                   |   19 +-
 tests/cpan.scm                                     |    2 +-
 tests/crate.scm                                    |    2 +-
 tests/gem.scm                                      |    2 +-
 tests/pypi.scm                                     |    4 +-
 tests/syscalls.scm                                 |    3 +-
 91 files changed, 20731 insertions(+), 408 deletions(-)

diff --cc gnu/local.mk
index db15273,ca415ec..e7db9a6
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -879,8 -892,10 +887,9 @@@ 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/sed-hurd-path-max.patch                        \
    %D%/packages/patches/scheme48-tests.patch                   \
    %D%/packages/patches/scotch-test-threading.patch            \
+   %D%/packages/patches/screen-CVE-2017-5618.patch             \
    %D%/packages/patches/sdl-libx11-1.6.patch                   \
    %D%/packages/patches/seq24-rename-mutex.patch                       \
    %D%/packages/patches/serf-comment-style-fix.patch           \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]