guix-commits
[Top][All Lists]
Advanced

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

01/09: Merge branch 'master' into core-updates


From: Leo Famulari
Subject: 01/09: Merge branch 'master' into core-updates
Date: Wed, 5 Oct 2016 23:42:59 +0000 (UTC)

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

commit b19c7989b770f47011cd531a13c89002374dc3e0
Merge: 6524c1c 1459476
Author: Leo Famulari <address@hidden>
Date:   Wed Oct 5 19:15:25 2016 -0400

    Merge branch 'master' into core-updates

 .dir-locals.el                                     |    1 +
 .mailmap                                           |    7 +-
 Makefile.am                                        |    4 +-
 doc/guix.texi                                      |    8 +-
 gnu/local.mk                                       |   14 +-
 gnu/packages/admin.scm                             |  100 ++++-
 gnu/packages/bioinformatics.scm                    |   31 +-
 gnu/packages/code.scm                              |    4 +-
 gnu/packages/cryptsetup.scm                        |   12 +-
 gnu/packages/games.scm                             |  134 +++++-
 gnu/packages/gcc.scm                               |    4 +-
 gnu/packages/gnucash.scm                           |    4 +-
 gnu/packages/gnunet.scm                            |   35 +-
 gnu/packages/gnuzilla.scm                          |    7 +-
 gnu/packages/grub.scm                              |   15 +-
 ...bre-4.7-i686.conf => linux-libre-4.8-i686.conf} |  172 +++++---
 ...4.7-x86_64.conf => linux-libre-4.8-x86_64.conf} |  171 +++++---
 gnu/packages/linux.scm                             |   14 +-
 gnu/packages/lisp.scm                              |   44 --
 gnu/packages/machine-learning.scm                  |   27 +-
 gnu/packages/maths.scm                             |   54 ++-
 gnu/packages/package-management.scm                |    2 +-
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/patches/cpio-gets-undeclared.patch    |   45 --
 gnu/packages/patches/gsl-test-i686.patch           |   17 +
 gnu/packages/patches/libx11-CVE-2016-7942.patch    |   76 ++++
 gnu/packages/patches/libx11-CVE-2016-7943.patch    |  113 +++++
 gnu/packages/patches/libxfixes-CVE-2016-7944.patch |   62 +++
 .../libxi-CVE-2016-7945-CVE-2016-7946.patch        |  420 ++++++++++++++++++
 .../libxrandr-CVE-2016-7947-CVE-2016-7948.patch    |  447 ++++++++++++++++++++
 .../patches/libxrender-CVE-2016-7949.patch         |   66 +++
 .../patches/libxrender-CVE-2016-7950.patch         |   73 ++++
 .../libxtst-CVE-2016-7951-CVE-2016-7952.patch      |  152 +++++++
 gnu/packages/patches/libxv-CVE-2016-5407.patch     |  162 +++++++
 gnu/packages/patches/libxvmc-CVE-2016-7953.patch   |   42 ++
 .../patches/metabat-remove-compilation-date.patch  |   16 +
 gnu/packages/patches/rush-CVE-2013-6889.patch      |   23 -
 gnu/packages/python.scm                            |    8 +-
 gnu/packages/ruby.scm                              |    2 +-
 gnu/packages/rush.scm                              |   12 +-
 gnu/packages/shells.scm                            |   17 +-
 gnu/packages/tls.scm                               |   32 +-
 gnu/packages/version-control.scm                   |    6 +-
 gnu/packages/video.scm                             |    4 +-
 gnu/packages/web.scm                               |   37 +-
 gnu/packages/wordnet.scm                           |   19 +-
 gnu/packages/xorg.scm                              |   66 +++
 gnu/system/mapped-devices.scm                      |    4 +-
 guix/build/graft.scm                               |   43 +-
 guix/scripts/lint.scm                              |   38 +-
 tests/grafts.scm                                   |   19 +
 tests/lint.scm                                     |   23 +
 52 files changed, 2510 insertions(+), 402 deletions(-)

diff --cc gnu/local.mk
index d74081b,867946d..db37622
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -668,8 -669,17 +668,18 @@@ dist_patch_DATA =                                
                
    %D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch       \
    %D%/packages/patches/libwmf-CVE-2015-4695.patch             \
    %D%/packages/patches/libwmf-CVE-2015-4696.patch             \
+   %D%/packages/patches/libx11-CVE-2016-7942.patch             \
+   %D%/packages/patches/libx11-CVE-2016-7943.patch             \
+   %D%/packages/patches/libxfixes-CVE-2016-7944.patch          \
+   %D%/packages/patches/libxi-CVE-2016-7945-CVE-2016-7946.patch        \
+   %D%/packages/patches/libxrandr-CVE-2016-7947-CVE-2016-7948.patch    \
+   %D%/packages/patches/libxrender-CVE-2016-7949.patch         \
+   %D%/packages/patches/libxrender-CVE-2016-7950.patch         \
+   %D%/packages/patches/libxtst-CVE-2016-7951-CVE-2016-7952.patch      \
+   %D%/packages/patches/libxv-CVE-2016-5407.patch              \
+   %D%/packages/patches/libxvmc-CVE-2016-7953.patch            \
    %D%/packages/patches/libxslt-generated-ids.patch            \
 +  %D%/packages/patches/linux-pam-no-setfsuid.patch            \
    %D%/packages/patches/lirc-localstatedir.patch                       \
    %D%/packages/patches/llvm-for-extempore.patch                       \
    %D%/packages/patches/lm-sensors-hwmon-attrs.patch           \
diff --cc gnu/packages/grub.scm
index bfc9d6f,ffce1bf..b920be9
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@@ -118,7 -128,8 +128,8 @@@
                       #t)))))
      (inputs
       `(;; ("lvm2" ,lvm2)
 +       ("gettext" ,gettext-minimal)
+        ("mdadm" ,mdadm)
 -       ("gettext" ,gnu-gettext)
         ("freetype" ,freetype)
         ;; ("libusb" ,libusb)
         ;; ("fuse" ,fuse)
diff --cc gnu/packages/xorg.scm
index 00f975b,aa2b99a..3dac36a
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -4823,7 -4848,8 +4848,8 @@@ an X Window System display."
  (define-public libxfixes
    (package
      (name "libxfixes")
+     (replacement libxfixes/fixed)
 -    (version "5.0.1")
 +    (version "5.0.2")
      (source
        (origin
          (method url-fetch)



reply via email to

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