Merge branch 'master' into staging
[jackhill/guix/guix.git] / gnu / local.mk
index f1ac975..3bdab4f 100644 (file)
@@ -4,7 +4,7 @@
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
-# Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
+# Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
 # Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 # Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -88,6 +88,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/packages/chez.scm                                \
   %D%/packages/ci.scm                          \
   %D%/packages/cmake.scm                       \
+  %D%/packages/cobol.scm                       \
   %D%/packages/code.scm                                \
   %D%/packages/commencement.scm                        \
   %D%/packages/compression.scm                 \
@@ -196,6 +197,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gv.scm                          \
   %D%/packages/gxmessage.scm                   \
   %D%/packages/haskell.scm                     \
+  %D%/packages/ham-radio.scm                   \
   %D%/packages/hexedit.scm                     \
   %D%/packages/hugs.scm                                \
   %D%/packages/hurd.scm                                \
@@ -362,6 +364,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/shells.scm                      \
   %D%/packages/shellutils.scm                  \
   %D%/packages/simh.scm                                \
+  %D%/packages/simulation.scm                  \
   %D%/packages/skarnet.scm                     \
   %D%/packages/skribilo.scm                    \
   %D%/packages/slang.scm                       \
@@ -426,6 +429,7 @@ GNU_SYSTEM_MODULES =                                \
                                                \
   %D%/services.scm                             \
   %D%/services/admin.scm                       \
+  %D%/services/audio.scm                        \
   %D%/services/avahi.scm                       \
   %D%/services/base.scm                                \
   %D%/services/configuration.scm               \
@@ -438,6 +442,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/dns.scm                         \
   %D%/services/kerberos.scm                    \
   %D%/services/lirc.scm                                \
+  %D%/services/virtualization.scm              \
   %D%/services/mail.scm                                \
   %D%/services/mcron.scm                       \
   %D%/services/messaging.scm                   \
@@ -465,6 +470,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/system/nss.scm                           \
   %D%/system/pam.scm                           \
   %D%/system/shadow.scm                                \
+  %D%/system/uuid.scm                          \
   %D%/system/vm.scm                            \
                                                \
   %D%/build/activation.scm                     \
@@ -481,8 +487,10 @@ GNU_SYSTEM_MODULES =                               \
                                                \
   %D%/tests.scm                                        \
   %D%/tests/admin.scm                          \
+  %D%/tests/audio.scm                          \
   %D%/tests/base.scm                           \
   %D%/tests/databases.scm                      \
+  %D%/tests/desktop.scm                                \
   %D%/tests/dict.scm                           \
   %D%/tests/nfs.scm                            \
   %D%/tests/install.scm                                \
@@ -490,6 +498,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/tests/messaging.scm                      \
   %D%/tests/networking.scm                     \
   %D%/tests/ssh.scm                            \
+  %D%/tests/virtualization.scm                 \
   %D%/tests/web.scm
 
 # Modules that do not need to be compiled.
@@ -525,20 +534,23 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/awesome-reproducible-png.patch          \
   %D%/packages/patches/azr3.patch                              \
   %D%/packages/patches/bash-completion-directories.patch       \
+  %D%/packages/patches/bcftools-regidx-unsigned-char.patch     \
   %D%/packages/patches/binutils-ld-new-dtags.patch             \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blast+-fix-makefile.patch               \
+  %D%/packages/patches/bluez-CVE-2017-1000250.patch            \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/cairo-CVE-2016-9082.patch                       \
-  %D%/packages/patches/calibre-drop-unrar.patch                        \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/calibre-use-packaged-feedparser.patch   \
+  %D%/packages/patches/catdoc-CVE-2017-11110.patch             \
   %D%/packages/patches/cdparanoia-fpic.patch                   \
   %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch     \
   %D%/packages/patches/ceph-disable-cpu-optimizations.patch    \
   %D%/packages/patches/ceph-disable-unittest-throttle.patch    \
   %D%/packages/patches/ceph-skip-collect-sys-info-test.patch   \
   %D%/packages/patches/ceph-skip-unittest_blockdev.patch       \
+  %D%/packages/patches/python-acme-dont-use-openssl-rand.patch \
   %D%/packages/patches/chicken-CVE-2017-6949.patch             \
   %D%/packages/patches/chicken-CVE-2017-11343.patch            \
   %D%/packages/patches/chmlib-inttypes.patch                   \
@@ -560,9 +572,10 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/crawl-upgrade-saves.patch               \
   %D%/packages/patches/crda-optional-gcrypt.patch              \
   %D%/packages/patches/crossmap-allow-system-pysam.patch       \
-  %D%/packages/patches/csound-header-ordering.patch            \
   %D%/packages/patches/clucene-contribs-lib.patch               \
+  %D%/packages/patches/curl-bounds-check.patch                 \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
+  %D%/packages/patches/cvs-2017-12836.patch                    \
   %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch          \
   %D%/packages/patches/dblatex-remove-multirow.patch           \
   %D%/packages/patches/dbus-helper-search-path.patch           \
@@ -573,6 +586,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
+  %D%/packages/patches/e2fsprogs-32bit-quota-warnings.patch    \
   %D%/packages/patches/elfutils-tests-ptrace.patch             \
   %D%/packages/patches/elixir-disable-failing-tests.patch      \
   %D%/packages/patches/einstein-build.patch                    \
@@ -580,6 +594,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch  \
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
+  %D%/packages/patches/emacs-unsafe-enriched-mode-translations.patch   \
   %D%/packages/patches/erlang-man-path.patch                   \
   %D%/packages/patches/eudev-rules-directory.patch             \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
@@ -593,6 +608,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/fasthenry-spFactor.patch                        \
   %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch            \
   %D%/packages/patches/fcgi-2.4.0-poll.patch                   \
+  %D%/packages/patches/file-CVE-2017-1000249.patch             \
   %D%/packages/patches/findutils-localstatedir.patch           \
   %D%/packages/patches/findutils-gnulib-multi-core.patch       \
   %D%/packages/patches/findutils-test-xargs.patch              \
@@ -600,6 +616,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/fltk-shared-lib-defines.patch           \
   %D%/packages/patches/fltk-xfont-on-demand.patch              \
   %D%/packages/patches/fontforge-svg-modtime.patch             \
+  %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch    \
+  %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch    \
   %D%/packages/patches/freeimage-CVE-2015-0852.patch           \
   %D%/packages/patches/freeimage-CVE-2016-5684.patch           \
   %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch    \
@@ -620,8 +638,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gcc-6-cross-environment-variables.patch \
   %D%/packages/patches/gcr-disable-failing-tests.patch         \
   %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch      \
-  %D%/packages/patches/gdk-pixbuf-list-dir.patch               \
-  %D%/packages/patches/gd-CVE-2017-7890.patch          \
   %D%/packages/patches/gd-fix-gd2-read-test.patch              \
   %D%/packages/patches/gd-fix-tests-on-i686.patch              \
   %D%/packages/patches/gd-freetype-test-failure.patch          \
@@ -664,6 +680,14 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch          \
   %D%/packages/patches/gobject-introspection-girepository.patch        \
+  %D%/packages/patches/graphicsmagick-CVE-2017-11403+CVE-2017-14103.patch      \
+  %D%/packages/patches/graphicsmagick-CVE-2017-12935.patch     \
+  %D%/packages/patches/graphicsmagick-CVE-2017-12936.patch     \
+  %D%/packages/patches/graphicsmagick-CVE-2017-12937.patch     \
+  %D%/packages/patches/graphicsmagick-CVE-2017-13775.patch     \
+  %D%/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch      \
+  %D%/packages/patches/graphicsmagick-CVE-2017-14042.patch     \
+  %D%/packages/patches/graphicsmagick-CVE-2017-14165.patch     \
   %D%/packages/patches/graphite2-ffloat-store.patch            \
   %D%/packages/patches/grep-gnulib-lock.patch                   \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
@@ -700,6 +724,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/heimdal-CVE-2017-11103.patch            \
   %D%/packages/patches/hmmer-remove-cpu-specificity.patch      \
   %D%/packages/patches/higan-remove-march-native-flag.patch    \
+  %D%/packages/patches/httpd-CVE-2017-9798.patch               \
   %D%/packages/patches/hubbub-sort-entities.patch              \
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
@@ -739,6 +764,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/liba52-link-with-libm.patch             \
   %D%/packages/patches/liba52-set-soname.patch                 \
   %D%/packages/patches/liba52-use-mtune-not-mcpu.patch         \
+  %D%/packages/patches/libarchive-CVE-2017-14166.patch         \
   %D%/packages/patches/libbase-fix-includes.patch              \
   %D%/packages/patches/libbase-use-own-logging.patch           \
   %D%/packages/patches/libbonobo-activation-test-race.patch    \
@@ -791,6 +817,11 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/libxcb-python-3.5-compat.patch          \
   %D%/packages/patches/libxml2-CVE-2016-4658.patch             \
   %D%/packages/patches/libxml2-CVE-2016-5131.patch             \
+  %D%/packages/patches/libxml2-CVE-2017-0663.patch             \
+  %D%/packages/patches/libxml2-CVE-2017-7375.patch             \
+  %D%/packages/patches/libxml2-CVE-2017-7376.patch             \
+  %D%/packages/patches/libxml2-CVE-2017-9047+CVE-2017-9048.patch       \
+  %D%/packages/patches/libxml2-CVE-2017-9049+CVE-2017-9050.patch       \
   %D%/packages/patches/libxslt-generated-ids.patch             \
   %D%/packages/patches/libxslt-CVE-2016-4738.patch             \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
@@ -816,7 +847,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/lvm2-static-link.patch                  \
   %D%/packages/patches/lxsession-use-gapplication.patch         \
   %D%/packages/patches/lxterminal-CVE-2016-10369.patch         \
-  %D%/packages/patches/lz4-fix-test-failures.patch             \
   %D%/packages/patches/make-impure-dirs.patch                  \
   %D%/packages/patches/mars-install.patch                      \
   %D%/packages/patches/mars-sfml-2.3.patch                     \
@@ -827,9 +857,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch                      \
   %D%/packages/patches/mesa-skip-disk-cache-test.patch         \
   %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch       \
-  %D%/packages/patches/metabat-remove-compilation-date.patch   \
+  %D%/packages/patches/meson-for-build-rpath.patch             \
   %D%/packages/patches/metabat-fix-compilation.patch           \
-  %D%/packages/patches/metabat-fix-boost-issue.patch           \
   %D%/packages/patches/mhash-keygen-test-segfault.patch                \
   %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch                \
   %D%/packages/patches/mpc123-initialize-ao.patch              \
@@ -840,7 +869,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/mozjs38-shell-version.patch             \
   %D%/packages/patches/mozjs38-tracelogger.patch               \
   %D%/packages/patches/mozjs38-version-detection.patch         \
-  %D%/packages/patches/multiqc-fix-git-subprocess-error.patch  \
   %D%/packages/patches/mumps-build-parallelism.patch           \
   %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch     \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
@@ -853,9 +881,10 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/netsurf-system-utf8proc.patch           \
   %D%/packages/patches/netsurf-y2038-tests.patch               \
   %D%/packages/patches/netsurf-longer-test-timeout.patch       \
+  %D%/packages/patches/newsbeuter-CVE-2017-12904.patch         \
+  %D%/packages/patches/newsbeuter-CVE-2017-14500.patch         \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
   %D%/packages/patches/ninja-zero-mtime.patch                  \
-  %D%/packages/patches/node-9077.patch                         \
   %D%/packages/patches/nss-increase-test-timeout.patch         \
   %D%/packages/patches/nss-pkgconfig.patch                     \
   %D%/packages/patches/nvi-assume-preserve-path.patch          \
@@ -870,8 +899,13 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/ola-readdir-r.patch                     \
   %D%/packages/patches/openscenegraph-ffmpeg3.patch             \
   %D%/packages/patches/openexr-missing-samples.patch           \
-  %D%/packages/patches/openjpeg-CVE-2016-9850-CVE-2016-9851.patch              \
-  %D%/packages/patches/openjpeg-CVE-2016-9572-CVE-2016-9573.patch              \
+  %D%/packages/patches/openfoam-4.1-cleanup.patch                      \
+  %D%/packages/patches/openjpeg-CVE-2017-12982.patch           \
+  %D%/packages/patches/openjpeg-CVE-2017-14040.patch           \
+  %D%/packages/patches/openjpeg-CVE-2017-14041.patch           \
+  %D%/packages/patches/openjpeg-CVE-2017-14151.patch           \
+  %D%/packages/patches/openjpeg-CVE-2017-14152.patch           \
+  %D%/packages/patches/openjpeg-CVE-2017-14164.patch           \
   %D%/packages/patches/openldap-CVE-2017-9287.patch            \
   %D%/packages/patches/openocd-nrf52.patch                     \
   %D%/packages/patches/openssl-runpath.patch                   \
@@ -945,11 +979,11 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-genshi-fix-tests-on-python-3.5.patch     \
   %D%/packages/patches/python-genshi-isstring-helper.patch     \
   %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch     \
+  %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
   %D%/packages/patches/python-parse-too-many-fields.patch      \
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   %D%/packages/patches/python-statsmodels-fix-tests.patch      \
   %D%/packages/patches/python-configobj-setuptools.patch       \
-  %D%/packages/patches/python-cython-fix-tests-32bit.patch     \
   %D%/packages/patches/python-faker-fix-build-32bit.patch      \
   %D%/packages/patches/python-pandas-skip-failing-tests.patch  \
   %D%/packages/patches/python-paste-remove-website-test.patch  \
@@ -960,13 +994,8 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch   \
-  %D%/packages/patches/qemu-CVE-2017-7493.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-8112.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-8309.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-8379.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-8380.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-9524.patch                        \
-  %D%/packages/patches/qemu-CVE-2017-11334.patch               \
+  %D%/packages/patches/qemu-CVE-2017-13711.patch               \
+  %D%/packages/patches/qemu-CVE-2017-14167.patch               \
   %D%/packages/patches/qt4-ldflags.patch                       \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
@@ -982,7 +1011,6 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/reptyr-fix-gcc-7.patch                  \
   %D%/packages/patches/ripperx-missing-file.patch              \
   %D%/packages/patches/rpcbind-CVE-2017-8779.patch             \
-  %D%/packages/patches/rpm-CVE-2014-8118.patch                 \
   %D%/packages/patches/rsem-makefile.patch                     \
   %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch        \
   %D%/packages/patches/ruby-concurrent-test-arm.patch          \
@@ -1052,6 +1080,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/util-linux-tests.patch                  \
   %D%/packages/patches/upower-builddir.patch                   \
   %D%/packages/patches/valgrind-enable-arm.patch               \
+  %D%/packages/patches/vinagre-revert-1.patch                   \
+  %D%/packages/patches/vinagre-revert-2.patch                   \
   %D%/packages/patches/virglrenderer-CVE-2017-6386.patch       \
   %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch          \
   %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch                \
@@ -1076,13 +1106,13 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch                 \
   %D%/packages/patches/xcb-proto-python3-print.patch           \
   %D%/packages/patches/xcb-proto-python3-whitespace.patch      \
-  %D%/packages/patches/wxwidgets-fix-windowGTK.patch           \
   %D%/packages/patches/xdotool-fix-makefile.patch               \
   %D%/packages/patches/xf86-video-ark-remove-mibstore.patch    \
   %D%/packages/patches/xf86-video-ast-remove-mibstore.patch    \
   %D%/packages/patches/xf86-video-geode-glibc-2.20.patch       \
   %D%/packages/patches/xf86-video-i128-remove-mibstore.patch   \
   %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch      \
+  %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
   %D%/packages/patches/xf86-video-tga-remove-mibstore.patch    \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
   %D%/packages/patches/xfce4-session-fix-xflock4.patch         \