[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/07: Merge branch 'master' into staging |
|
Date: |
Wed, 20 Sep 2017 13:48:32 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 58366883f2f1516a4a02f5b4e2a70e86481827b5
Merge: f40aef6 9a1c4a9
Author: Marius Bakke <address@hidden>
Date: Wed Sep 20 18:49:26 2017 +0200
Merge branch 'master' into staging
Makefile.am | 4 +
build-aux/compile-all.scm | 3 +-
configure.ac | 2 +-
doc/contributing.texi | 32 +-
doc/guix.texi | 179 +++++-
gnu/bootloader/grub.scm | 4 +-
gnu/build/file-systems.scm | 130 +----
gnu/build/marionette.scm | 7 +-
gnu/build/vm.scm | 53 +-
gnu/local.mk | 30 +-
gnu/packages/admin.scm | 11 +-
gnu/packages/audio.scm | 16 +-
gnu/packages/backup.scm | 9 +-
gnu/packages/base.scm | 14 +
gnu/packages/bioinformatics.scm | 30 +-
gnu/packages/bootloaders.scm | 69 +++
gnu/packages/build-tools.scm | 23 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 24 +
gnu/packages/ci.scm | 13 +-
gnu/packages/cobol.scm | 59 ++
gnu/packages/code.scm | 8 +-
gnu/packages/commencement.scm | 8 +-
gnu/packages/compression.scm | 18 +-
gnu/packages/cran.scm | 290 +++++++++-
gnu/packages/crypto.scm | 31 ++
gnu/packages/cups.scm | 122 ++++-
gnu/packages/databases.scm | 57 +-
gnu/packages/disk.scm | 21 +
gnu/packages/django.scm | 4 +-
gnu/packages/ebook.scm | 12 +-
gnu/packages/emacs.scm | 188 ++++++-
gnu/packages/enlightenment.scm | 18 +-
gnu/packages/file.scm | 11 +-
gnu/packages/finance.scm | 188 ++++++-
gnu/packages/freedesktop.scm | 73 ++-
gnu/packages/ftp.scm | 4 +-
gnu/packages/game-development.scm | 108 +++-
gnu/packages/gcc.scm | 112 +++-
gnu/packages/gdb.scm | 4 +-
gnu/packages/gnome.scm | 149 +++--
gnu/packages/gnupg.scm | 83 ++-
gnu/packages/gnuzilla.scm | 8 +-
gnu/packages/graphics.scm | 40 +-
gnu/packages/gstreamer.scm | 28 +-
gnu/packages/gtk.scm | 26 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 9 +-
gnu/packages/imagemagick.scm | 11 +-
gnu/packages/java.scm | 4 +
gnu/packages/libffcall.scm | 4 +-
gnu/packages/libidn.scm | 15 +
gnu/packages/libreoffice.scm | 78 +++
gnu/packages/linux.scm | 77 ++-
gnu/packages/mail.scm | 90 +--
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 88 +++
gnu/packages/mate.scm | 604 +++++++++++++++++++++
gnu/packages/maths.scm | 86 +++
gnu/packages/mes.scm | 9 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/mpi.scm | 23 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/password-utils.scm | 98 ++++
gnu/packages/patches/bluez-CVE-2017-1000250.patch | 42 ++
gnu/packages/patches/calibre-drop-unrar.patch | 49 --
gnu/packages/patches/csound-header-ordering.patch | 20 -
.../emacs-unsafe-enriched-mode-translations.patch | 85 +++
gnu/packages/patches/file-CVE-2017-1000249.patch | 27 +
.../patches/foomatic-filters-CVE-2015-8327.patch | 14 +
.../patches/foomatic-filters-CVE-2015-8560.patch | 13 +
...phicsmagick-CVE-2017-11403+CVE-2017-14103.patch | 137 +++++
.../patches/graphicsmagick-CVE-2017-14042.patch | 80 +++
.../patches/graphicsmagick-CVE-2017-14165.patch | 72 +++
gnu/packages/patches/httpd-CVE-2017-9798.patch | 22 +
.../patches/libarchive-CVE-2017-14166.patch | 45 ++
gnu/packages/patches/libzip-CVE-2017-12858.patch | 45 --
gnu/packages/patches/meson-for-build-rpath.patch | 24 +
.../patches/newsbeuter-CVE-2017-14500.patch | 43 ++
gnu/packages/patches/openfoam-4.1-cleanup.patch | 243 +++++++++
gnu/packages/patches/openjpeg-CVE-2017-14151.patch | 46 ++
gnu/packages/patches/openjpeg-CVE-2017-14152.patch | 38 ++
gnu/packages/patches/openjpeg-CVE-2017-14164.patch | 89 +++
...ext-markdown-discount-use-system-markdown.patch | 32 ++
.../python-acme-dont-use-openssl-rand.patch | 28 +
gnu/packages/patches/qemu-CVE-2017-13711.patch | 89 +++
gnu/packages/patches/qemu-CVE-2017-14167.patch | 69 +++
.../patches/ruby-2.2.7-rubygems-2613-ruby22.patch | 355 ------------
.../patches/ruby-2.3.4-rubygems-2613-ruby23.patch | 355 ------------
.../patches/ruby-rubygems-2612-ruby24.patch | 437 ---------------
.../patches/ruby-rubygems-2613-ruby24.patch | 355 ------------
gnu/packages/perl.scm | 494 +++++++++++++++++
gnu/packages/photo.scm | 4 +-
gnu/packages/python.scm | 227 +++++---
gnu/packages/ruby.scm | 31 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/simulation.scm | 212 ++++++++
gnu/packages/statistics.scm | 57 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/syndication.scm | 5 +-
gnu/packages/terminals.scm | 2 +-
gnu/packages/texinfo.scm | 16 +-
gnu/packages/time.scm | 59 +-
gnu/packages/tls.scm | 14 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 36 ++
gnu/packages/video.scm | 19 +-
gnu/packages/virtualization.scm | 23 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 135 ++++-
gnu/packages/webkit.scm | 17 +-
gnu/packages/xml.scm | 8 +-
gnu/packages/xorg.scm | 31 +-
gnu/services.scm | 37 +-
gnu/services/base.scm | 100 +++-
gnu/services/cuirass.scm | 2 +-
gnu/services/desktop.scm | 3 +-
gnu/services/networking.scm | 55 +-
gnu/services/web.scm | 8 +-
gnu/services/xorg.scm | 1 +
gnu/system.scm | 72 ++-
gnu/system/examples/bare-bones.tmpl | 4 +-
gnu/system/file-systems.scm | 26 +-
gnu/system/install.scm | 17 +-
gnu/system/mapped-devices.scm | 7 +-
gnu/system/uuid.scm | 265 +++++++++
gnu/system/vm.scm | 79 ++-
gnu/tests/base.scm | 15 +-
gnu/tests/desktop.scm | 105 ++++
gnu/tests/install.scm | 110 +++-
guix/build-system/meson.scm | 178 ++++++
guix/build/download.scm | 179 +++---
guix/build/meson-build-system.scm | 150 +++++
guix/cve.scm | 17 +-
guix/download.scm | 4 +-
guix/gnu-maintenance.scm | 36 +-
guix/http-client.scm | 44 +-
guix/import/cpan.scm | 2 +-
guix/scripts/download.scm | 2 +-
guix/scripts/lint.scm | 7 +-
guix/scripts/package.scm | 21 +-
guix/scripts/size.scm | 2 +-
guix/scripts/substitute.scm | 207 ++++---
guix/scripts/system.scm | 19 +-
guix/scripts/system/search.scm | 144 +++++
guix/store.scm | 6 +-
guix/ui.scm | 44 ++
guix/utils.scm | 36 +-
po/guix/POTFILES.in | 1 +
po/packages/POTFILES.in | 2 +
tests/cpan.scm | 2 +-
tests/file-systems.scm | 26 -
tests/guix-system.sh | 6 +-
tests/substitute.scm | 193 ++++++-
tests/uuid.scm | 56 ++
156 files changed, 7450 insertions(+), 2645 deletions(-)
diff --cc gnu/packages/gtk.scm
index 9de7c5b,d7c18f9..0d3da63
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -427,7 -427,8 +427,8 @@@ highlighting and other features typica
(define-public gdk-pixbuf
(package
(name "gdk-pixbuf")
+ (version "2.36.9")
+ (replacement gdk-pixbuf-2.36.10)
- (version "2.36.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
diff --cc gnu/packages/linux.scm
index 01e895f,8a69f0d..4be6f5e
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -3021,7 -3022,8 +3022,8 @@@ Bluetooth audio output devices like hea
(define-public bluez
(package
(name "bluez")
- (version "5.45")
+ (version "5.46")
+ (replacement bluez/fixed)
(source (origin
(method url-fetch)
(uri (string-append
@@@ -3083,6 -3085,20 +3085,20 @@@
is flexible, efficient and uses a modular implementation.")
(license license:gpl2+)))
+ (define bluez/fixed
+ (package
+ (inherit bluez)
- (version "5.45")
++ (version "5.46")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kernel.org/linux/bluetooth/bluez-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "1sb4aflgyrl7apricjipa8wx95qm69yja0lmn2f19g560c3v1b2c"))
++ "0a4fj343bdqsfyv12hmj9nym0ilsf0bvm54a4apbiby16ww3vayx"))
+ (patches (search-patches "bluez-CVE-2017-1000250.patch"))))))
+
(define-public fuse-exfat
(package
(name "fuse-exfat")
- branch staging updated (f40aef6 -> 7c9b876), Marius Bakke, 2017/09/20
- 06/07: gnu: gtk+: Update to 3.22.21., Marius Bakke, 2017/09/20
- 03/07: gnu: gdk-pixbuf: Remove graft for 2.36.10., Marius Bakke, 2017/09/20
- 02/07: gnu: bluez: Update to 5.47., Marius Bakke, 2017/09/20
- 05/07: gnu: ruby: Remove graft for 2.4.2., Marius Bakke, 2017/09/20
- 01/07: Merge branch 'master' into staging,
Marius Bakke <=
- 07/07: gnu: harfbuzz: Update to 1.5.1., Marius Bakke, 2017/09/20
- 04/07: gnu: gd: Remove graft for 2.2.5., Marius Bakke, 2017/09/20