gnu: Add perl-regexp-pattern-license.
[jackhill/guix/guix.git] / gnu / local.mk
index 051a9bb..a10f315 100644 (file)
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017 Andreas Enge <andreas@enge.fr>
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
@@ -9,14 +9,15 @@
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 # Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
-# Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
+# Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 # Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org>
 # Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
-# Copyright © 2017 Clément Lassieur <clement@lassieur.org>
+# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 # Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
 # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
+# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -141,6 +142,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/elixir.scm                      \
   %D%/packages/embedded.scm                    \
   %D%/packages/emacs.scm                       \
+  %D%/packages/emulators.scm                   \
   %D%/packages/enchant.scm                     \
   %D%/packages/engineering.scm                 \
   %D%/packages/enlightenment.scm               \
@@ -247,6 +249,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/libffcall.scm                   \
   %D%/packages/libffi.scm                      \
   %D%/packages/libftdi.scm                     \
+  %D%/packages/license.scm                     \
   %D%/packages/calendar.scm                    \
   %D%/packages/libidn.scm                      \
   %D%/packages/libphidget.scm                  \
@@ -345,6 +348,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/python.scm                      \
   %D%/packages/python-crypto.scm               \
   %D%/packages/python-web.scm                  \
+  %D%/packages/toys.scm                                \
   %D%/packages/tryton.scm                      \
   %D%/packages/qt.scm                          \
   %D%/packages/ragel.scm                       \
@@ -355,6 +359,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/re2c.scm                                \
   %D%/packages/readline.scm                    \
   %D%/packages/regex.scm                               \
+  %D%/packages/robotics.scm                    \
   %D%/packages/rrdtool.scm                     \
   %D%/packages/rsync.scm                       \
   %D%/packages/ruby.scm                                \
@@ -420,6 +425,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/vim.scm                         \
   %D%/packages/virtualization.scm              \
   %D%/packages/vpn.scm                         \
+  %D%/packages/vulkan.scm                      \
   %D%/packages/w3m.scm                         \
   %D%/packages/wdiff.scm                       \
   %D%/packages/web.scm                         \
@@ -455,6 +461,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/services/desktop.scm                     \
   %D%/services/dict.scm                                \
   %D%/services/dns.scm                         \
+  %D%/services/games.scm                       \
   %D%/services/kerberos.scm                    \
   %D%/services/lirc.scm                                \
   %D%/services/virtualization.scm              \
@@ -533,6 +540,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/a2ps-CVE-2014-0466.patch        \
   %D%/packages/patches/abiword-explictly-cast-bools.patch      \
   %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
+  %D%/packages/patches/acl-fix-perl-regex.patch                \
   %D%/packages/patches/acl-hurd-path-max.patch                 \
   %D%/packages/patches/aegis-constness-error.patch             \
   %D%/packages/patches/aegis-perl-tempdir1.patch               \
@@ -550,8 +558,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/ath9k-htc-firmware-objcopy.patch                \
   %D%/packages/patches/audacity-build-with-system-portaudio.patch \
   %D%/packages/patches/automake-skip-amhello-tests.patch       \
-  %D%/packages/patches/automake-regexp-syntax.patch            \
-  %D%/packages/patches/automake-test-gzip-warning.patch                \
   %D%/packages/patches/avahi-localstatedir.patch               \
   %D%/packages/patches/avidemux-install-to-lib.patch           \
   %D%/packages/patches/awesome-reproducible-png.patch          \
@@ -576,7 +582,11 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/chmlib-inttypes.patch                   \
   %D%/packages/patches/clang-libc-search-path.patch            \
   %D%/packages/patches/clang-3.8-libc-search-path.patch                \
+  %D%/packages/patches/clang-runtime-asan-build-fixes.patch    \
+  %D%/packages/patches/clang-runtime-esan-build-fixes.patch    \
+  %D%/packages/patches/clementine-remove-crypto++-dependency.patch     \
   %D%/packages/patches/clementine-use-openssl.patch            \
+  %D%/packages/patches/clisp-glibc-2.26.patch                  \
   %D%/packages/patches/clisp-remove-failing-test.patch         \
   %D%/packages/patches/clucene-pkgconfig.patch                 \
   %D%/packages/patches/clx-remove-demo.patch                   \
@@ -586,7 +596,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/cool-retro-term-fix-array-size.patch    \
   %D%/packages/patches/cool-retro-term-memory-leak-1.patch     \
   %D%/packages/patches/cool-retro-term-remove-non-free-fonts.patch     \
-  %D%/packages/patches/coreutils-cut-huge-range-test.patch     \
   %D%/packages/patches/cpio-CVE-2016-2037.patch                        \
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch          \
   %D%/packages/patches/cracklib-CVE-2016-6318.patch            \
@@ -594,7 +603,6 @@ 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/crypto++-fix-dos-in-asn.1-decoders.patch \
   %D%/packages/patches/clucene-contribs-lib.patch               \
   %D%/packages/patches/cube-nocheck.patch                      \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
@@ -605,16 +613,21 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
   %D%/packages/patches/dfu-programmer-fix-libusb.patch         \
   %D%/packages/patches/diffutils-gets-undeclared.patch         \
+  %D%/packages/patches/diffutils-getopt.patch                  \
+  %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch     \
   %D%/packages/patches/doc++-include-directives.patch          \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
+  %D%/packages/patches/dovecot-CVE-2017-15132.patch            \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
   %D%/packages/patches/eigen-arm-neon-fixes.patch              \
   %D%/packages/patches/elfutils-tests-ptrace.patch             \
   %D%/packages/patches/elixir-disable-failing-tests.patch      \
   %D%/packages/patches/einstein-build.patch                    \
+  %D%/packages/patches/emacs-browse-at-remote-cgit-gnu.patch   \
   %D%/packages/patches/emacs-exec-path.patch                   \
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch  \
+  %D%/packages/patches/emacs-json-reformat-fix-tests.patch     \
   %D%/packages/patches/emacs-highlight-stages-add-gexp.patch   \
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
@@ -634,23 +647,26 @@ dist_patch_DATA =                                         \
   %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              \
   %D%/packages/patches/flint-ldconfig.patch                    \
   %D%/packages/patches/fltk-shared-lib-defines.patch           \
   %D%/packages/patches/fltk-xfont-on-demand.patch              \
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch    \
   %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch    \
-  %D%/packages/patches/fossil-CVE-2017-17459.patch             \
+  %D%/packages/patches/fontconfig-remove-debug-printf.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    \
+  %D%/packages/patches/freetype-CVE-2018-6942.patch            \
   %D%/packages/patches/fuse-overlapping-headers.patch                          \
   %D%/packages/patches/gawk-shell.patch                                \
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
   %D%/packages/patches/gcc-arm-link-spec-fix.patch             \
-  %D%/packages/patches/gcc-asan-powerpc-missing-include.patch  \
+  %D%/packages/patches/gcc-asan-missing-include.patch          \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
+  %D%/packages/patches/gcc-fix-texi2pod.patch                  \
+  %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch          \
+  %D%/packages/patches/gcc-libsanitizer-fix.patch              \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
   %D%/packages/patches/gcc-4-compile-with-gcc-5.patch           \
@@ -670,10 +686,8 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/gegl-CVE-2012-4433.patch                        \
   %D%/packages/patches/gemma-intel-compat.patch                        \
   %D%/packages/patches/geoclue-config.patch                    \
-  %D%/packages/patches/gettext-multi-core.patch                \
-  %D%/packages/patches/gettext-gnulib-multi-core.patch          \
+  %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
   %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch     \
-  %D%/packages/patches/ghostscript-CVE-2017-8291.patch         \
   %D%/packages/patches/ghostscript-no-header-id.patch          \
   %D%/packages/patches/ghostscript-no-header-uuid.patch                \
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
@@ -684,6 +698,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gimp-CVE-2017-17787.patch               \
   %D%/packages/patches/gimp-CVE-2017-17789.patch               \
   %D%/packages/patches/glib-networking-ssl-cert-file.patch     \
+  %D%/packages/patches/glib-respect-datadir.patch              \
   %D%/packages/patches/glib-tests-timer.patch                  \
   %D%/packages/patches/glibc-CVE-2015-5180.patch               \
   %D%/packages/patches/glibc-CVE-2015-7547.patch               \
@@ -693,7 +708,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch                \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch                \
   %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch                \
-  %D%/packages/patches/glibc-CVE-2017-15670-15671.patch                \
   %D%/packages/patches/glibc-bootstrap-system.patch            \
   %D%/packages/patches/glibc-ldd-x86_64.patch                  \
   %D%/packages/patches/glibc-locales.patch                     \
@@ -712,8 +726,10 @@ 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/gpm-glibc-2.26.patch                    \
+  %D%/packages/patches/gpsbabel-minizip.patch                  \
+  %D%/packages/patches/gpsbabel-qstring.patch                  \
   %D%/packages/patches/graphite2-ffloat-store.patch            \
-  %D%/packages/patches/grep-gnulib-lock.patch                   \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
   %D%/packages/patches/groff-source-date-epoch.patch           \
   %D%/packages/patches/gsl-test-i686.patch                     \
@@ -729,9 +745,11 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch       \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtk2-theme-paths.patch                  \
+  %D%/packages/patches/gtk2-fix-failing-test.patch             \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch       \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
+  %D%/packages/patches/gzdoom-search-in-installed-share.patch  \
   %D%/packages/patches/handbrake-pkg-config-path.patch         \
   %D%/packages/patches/hdf4-architectures.patch                \
   %D%/packages/patches/hdf4-reproducibility.patch              \
@@ -748,30 +766,29 @@ 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/htop-fix-process-tree.patch             \
   %D%/packages/patches/hubbub-sort-entities.patch              \
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
+  %D%/packages/patches/hwloc-tests-without-sysfs.patch         \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch    \
   %D%/packages/patches/icecat-bug-1348660-pt5.patch            \
   %D%/packages/patches/icecat-bug-1415133.patch                        \
   %D%/packages/patches/icecat-bug-1414945.patch                        \
   %D%/packages/patches/icecat-bug-1424373-pt2.patch            \
-  %D%/packages/patches/icecat-bug-1427870-spectre-mitigation.patch     \
-  %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
-  %D%/packages/patches/icu4c-CVE-2017-14952.patch              \
-  %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
+  %D%/packages/patches/icecat-use-system-graphite2.patch       \
+  %D%/packages/patches/icecat-use-system-harfbuzz.patch                \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
   %D%/packages/patches/intltool-perl-compatibility.patch       \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
   %D%/packages/patches/jacal-fix-texinfo.patch                 \
   %D%/packages/patches/java-powermock-fix-java-files.patch             \
+  %D%/packages/patches/java-xerces-bootclasspath.patch \
+  %D%/packages/patches/java-xerces-build_dont_unzip.patch      \
+  %D%/packages/patches/java-xerces-xjavac_taskdef.patch        \
   %D%/packages/patches/jemalloc-arm-address-bits.patch         \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
-  %D%/packages/patches/jbig2dec-CVE-2016-9601.patch            \
-  %D%/packages/patches/jbig2dec-CVE-2017-7885.patch            \
-  %D%/packages/patches/jbig2dec-CVE-2017-7975.patch            \
-  %D%/packages/patches/jbig2dec-CVE-2017-7976.patch            \
   %D%/packages/patches/jq-CVE-2015-8863.patch                  \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
   %D%/packages/patches/khmer-use-libraries.patch                \
@@ -786,12 +803,10 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch       \
   %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch     \
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch    \
-  %D%/packages/patches/ktexteditor-5.39.0-autotests-dependencies.patch \
   %D%/packages/patches/laby-make-install.patch                 \
   %D%/packages/patches/lcms-CVE-2016-10165.patch               \
-  %D%/packages/patches/ldc-disable-tests.patch                 \
-  %D%/packages/patches/ldc-1.1.0-disable-dmd-tests.patch       \
-  %D%/packages/patches/ldc-1.1.0-disable-phobos-tests.patch    \
+  %D%/packages/patches/ldc-bootstrap-disable-tests.patch       \
+  %D%/packages/patches/ldc-1.7.0-disable-phobos-tests.patch    \
   %D%/packages/patches/ledger-fix-uninitialized.patch          \
   %D%/packages/patches/ledger-revert-boost-python-fix.patch    \
   %D%/packages/patches/liba52-enable-pic.patch                 \
@@ -814,10 +829,13 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch     \
   %D%/packages/patches/libevent-2.1-dns-tests.patch            \
   %D%/packages/patches/libevent-2.1-skip-failing-test.patch    \
+  %D%/packages/patches/libexif-CVE-2016-6328.patch             \
   %D%/packages/patches/libexif-CVE-2017-7544.patch             \
   %D%/packages/patches/libgit2-0.25.1-mtime-0.patch            \
   %D%/packages/patches/libgdata-fix-tests.patch                        \
   %D%/packages/patches/libgdata-glib-duplicate-tests.patch     \
+  %D%/packages/patches/libgnome-encoding.patch                 \
+  %D%/packages/patches/libgnomeui-utf8.patch                   \
   %D%/packages/patches/libgxps-CVE-2017-11590.patch            \
   %D%/packages/patches/libffi-3.2.1-complex-alpha.patch                \
   %D%/packages/patches/libjxr-fix-function-signature.patch     \
@@ -833,19 +851,17 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libsndfile-armhf-type-checks.patch      \
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch        \
   %D%/packages/patches/libsndfile-CVE-2017-8362.patch          \
+  %D%/packages/patches/libsndfile-CVE-2017-12562.patch         \
   %D%/packages/patches/libssh-hostname-parser-bug.patch                \
   %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch     \
   %D%/packages/patches/libtar-CVE-2013-4420.patch              \
   %D%/packages/patches/libtasn1-CVE-2017-10790.patch           \
+  %D%/packages/patches/libtasn1-CVE-2018-6003.patch            \
   %D%/packages/patches/libtheora-config-guess.patch            \
-  %D%/packages/patches/libtiff-CVE-2016-10688.patch            \
-  %D%/packages/patches/libtiff-CVE-2017-9936.patch             \
-  %D%/packages/patches/libtiff-tiffgetfield-bugs.patch         \
-  %D%/packages/patches/libtiff-tiffycbcrtorgb-integer-overflow.patch   \
-  %D%/packages/patches/libtiff-tiffycbcrtorgbinit-integer-overflow.patch       \
-  %D%/packages/patches/libtirpc-CVE-2017-8779.patch            \
+  %D%/packages/patches/libtirpc-missing-headers.patch          \
+  %D%/packages/patches/libtiff-CVE-2017-9935.patch             \
+  %D%/packages/patches/libtiff-CVE-2017-18013.patch            \
   %D%/packages/patches/libtool-skip-tests2.patch               \
-  %D%/packages/patches/libunistring-gnulib-multi-core.patch    \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libusb-for-axoloti.patch                        \
   %D%/packages/patches/libvdpau-va-gl-unbundle.patch           \
@@ -853,16 +869,7 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/libvorbis-CVE-2017-14633.patch          \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
   %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/libxslt-CVE-2017-5029.patch             \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
   %D%/packages/patches/lierolibre-check-unaligned-access.patch \
   %D%/packages/patches/lierolibre-is-free-software.patch       \
@@ -881,12 +888,11 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/lua51-pkgconfig.patch                    \
   %D%/packages/patches/lua-liblua-so.patch                      \
   %D%/packages/patches/luajit-no_ldconfig.patch                        \
-  %D%/packages/patches/luajit-symlinks.patch                   \
   %D%/packages/patches/luit-posix.patch                                \
   %D%/packages/patches/luminance-hdr-qt-printer.patch          \
   %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/mailutils-uninitialized-memory.patch    \
   %D%/packages/patches/make-impure-dirs.patch                  \
   %D%/packages/patches/mars-install.patch                      \
   %D%/packages/patches/mars-sfml-2.3.patch                     \
@@ -912,18 +918,17 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/mozjs38-version-detection.patch         \
   %D%/packages/patches/mumps-build-parallelism.patch           \
   %D%/packages/patches/mupdf-build-with-latest-openjpeg.patch  \
+  %D%/packages/patches/mupdf-CVE-2017-17858.patch              \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
   %D%/packages/patches/mutt-store-references.patch             \
-  %D%/packages/patches/ncurses-CVE-2017-10684-10685.patch      \
   %D%/packages/patches/net-tools-bitrot.patch                  \
   %D%/packages/patches/netcdf-date-time.patch                  \
   %D%/packages/patches/netcdf-tst_h_par.patch                  \
   %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/nfs-utils-missing-headers.patch         \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
-  %D%/packages/patches/ninja-zero-mtime.patch                  \
-  %D%/packages/patches/node-test-http2-server-rst-stream.patch \
   %D%/packages/patches/nss-increase-test-timeout.patch         \
   %D%/packages/patches/nss-pkgconfig.patch                     \
   %D%/packages/patches/nvi-assume-preserve-path.patch          \
@@ -937,27 +942,28 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch       \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/ola-readdir-r.patch                     \
-  %D%/packages/patches/openscenegraph-ffmpeg3.patch             \
+  %D%/packages/patches/opencascade-oce-glibc-2.26.patch                \
   %D%/packages/patches/openexr-missing-samples.patch           \
   %D%/packages/patches/openfoam-4.1-cleanup.patch                      \
   %D%/packages/patches/openldap-CVE-2017-9287.patch            \
   %D%/packages/patches/openocd-nrf52.patch                     \
+  %D%/packages/patches/openscenegraph-ffmpeg3.patch             \
   %D%/packages/patches/openssl-runpath.patch                   \
   %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch         \
   %D%/packages/patches/openssl-c-rehash-in.patch               \
-  %D%/packages/patches/optipng-CVE-2017-1000229.patch          \
   %D%/packages/patches/orpheus-cast-errors-and-includes.patch  \
   %D%/packages/patches/osip-CVE-2017-7853.patch                        \
   %D%/packages/patches/ots-no-include-missing-file.patch       \
   %D%/packages/patches/owncloud-disable-updatecheck.patch      \
-  %D%/packages/patches/p7zip-CVE-2016-9296.patch                       \
+  %D%/packages/patches/p7zip-CVE-2016-9296.patch               \
+  %D%/packages/patches/p7zip-CVE-2017-17969.patch              \
   %D%/packages/patches/p7zip-remove-unused-code.patch          \
+  %D%/packages/patches/password-store-gnupg-compat.patch       \
   %D%/packages/patches/patchelf-page-size.patch                        \
   %D%/packages/patches/patchelf-rework-for-arm.patch           \
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   %D%/packages/patches/patch-hurd-path-max.patch               \
   %D%/packages/patches/pcmanfm-CVE-2017-8934.patch             \
-  %D%/packages/patches/pcre-CVE-2017-7186.patch                        \
   %D%/packages/patches/pcre2-CVE-2017-7186.patch               \
   %D%/packages/patches/pcre2-CVE-2017-8786.patch               \
   %D%/packages/patches/perl-file-path-CVE-2017-6512.patch      \
@@ -986,9 +992,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/plink-endian-detection.patch            \
   %D%/packages/patches/plotutils-libpng-jmpbuf.patch           \
   %D%/packages/patches/polkit-drop-test.patch                  \
-  %D%/packages/patches/policycoreutils-make-sepolicy-use-python3.patch \
   %D%/packages/patches/portaudio-audacity-compat.patch         \
   %D%/packages/patches/portmidi-modular-build.patch            \
+  %D%/packages/patches/potrace-tests.patch                     \
   %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
   %D%/packages/patches/procmail-CVE-2014-3618.patch            \
   %D%/packages/patches/procmail-CVE-2017-16844.patch           \
@@ -1005,14 +1011,14 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/pygpgme-disable-problematic-tests.patch  \
   %D%/packages/patches/pyqt-configure.patch                    \
   %D%/packages/patches/python-2-deterministic-build-info.patch \
-  %D%/packages/patches/python-2.7-getentropy-on-old-kernels.patch      \
+  %D%/packages/patches/python-2.7-adjust-tests.patch           \
   %D%/packages/patches/python-2.7-search-paths.patch           \
   %D%/packages/patches/python-2.7-site-prefixes.patch          \
   %D%/packages/patches/python-2.7-source-date-epoch.patch      \
   %D%/packages/patches/python-3-deterministic-build-info.patch \
   %D%/packages/patches/python-3-search-paths.patch             \
-  %D%/packages/patches/python-3.5-fix-tests.patch              \
-  %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch      \
+  %D%/packages/patches/python-3-fix-tests.patch                        \
+  %D%/packages/patches/python-axolotl-AES-fix.patch            \
   %D%/packages/patches/python-dendropy-fix-tests.patch         \
   %D%/packages/patches/python-fix-tests.patch                  \
   %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch      \
@@ -1031,7 +1037,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch      \
   %D%/packages/patches/python-configobj-setuptools.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  \
   %D%/packages/patches/python-paste-remove-timing-test.patch   \
   %D%/packages/patches/python-pygit2-disable-network-tests.patch       \
@@ -1039,10 +1044,11 @@ 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/python2-unittest2-remove-argparse.patch \
-  %D%/packages/patches/qemu-CVE-2017-15038.patch               \
-  %D%/packages/patches/qemu-CVE-2017-15289.patch               \
+  %D%/packages/patches/python-unittest2-python3-compat.patch   \
+  %D%/packages/patches/python-unittest2-remove-argparse.patch  \
+  %D%/packages/patches/python-waitress-fix-tests.patch         \
   %D%/packages/patches/qt4-ldflags.patch                       \
+  %D%/packages/patches/qtbase-use-TZDIR.patch                  \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quassel-fix-tls-check.patch              \
@@ -1051,18 +1057,17 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/raptor2-heap-overflow.patch             \
   %D%/packages/patches/ratpoison-shell.patch                   \
   %D%/packages/patches/rcs-5.9.4-noreturn.patch                        \
+  %D%/packages/patches/rct-add-missing-headers.patch           \
   %D%/packages/patches/readline-link-ncurses.patch             \
   %D%/packages/patches/readline-6.2-CVE-2014-2524.patch                \
   %D%/packages/patches/readline-7.0-mingw.patch                        \
+  %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch     \
   %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/rsem-makefile.patch                     \
-  %D%/packages/patches/rsync-CVE-2017-16548.patch                      \
-  %D%/packages/patches/rsync-CVE-2017-17433.patch                      \
-  %D%/packages/patches/rsync-CVE-2017-17433-fix-tests.patch                    \
-  %D%/packages/patches/rsync-CVE-2017-17434-pt1.patch                  \
-  %D%/packages/patches/rsync-CVE-2017-17434-pt2.patch                  \
+  %D%/packages/patches/rtags-separate-rct.patch                        \
+  %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch      \
   %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch        \
   %D%/packages/patches/ruby-concurrent-test-arm.patch          \
   %D%/packages/patches/ruby-rack-ignore-failing-test.patch      \
@@ -1073,13 +1078,13 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seq24-rename-mutex.patch                        \
   %D%/packages/patches/shepherd-close-fds.patch                        \
+  %D%/packages/patches/shepherd-herd-status-sorted.patch       \
   %D%/packages/patches/shishi-fix-libgcrypt-detection.patch    \
   %D%/packages/patches/slim-session.patch                      \
   %D%/packages/patches/slim-config.patch                       \
   %D%/packages/patches/slim-sigusr1.patch                      \
   %D%/packages/patches/slim-reset.patch                                \
   %D%/packages/patches/slim-login.patch                                \
-  %D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
   %D%/packages/patches/sooperlooper-build-with-wx-30.patch     \
   %D%/packages/patches/steghide-fixes.patch                    \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
@@ -1091,7 +1096,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/t1lib-CVE-2011-1552+.patch              \
   %D%/packages/patches/tar-CVE-2016-6321.patch                 \
   %D%/packages/patches/tar-skip-unreliable-tests.patch         \
-  %D%/packages/patches/tcl-mkindex-deterministic.patch         \
   %D%/packages/patches/tclxml-3.2-install.patch                        \
   %D%/packages/patches/tcsh-fix-autotest.patch                 \
   %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch       \
@@ -1128,6 +1132,7 @@ 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/valgrind-glibc-compat.patch             \
   %D%/packages/patches/vinagre-revert-1.patch                   \
   %D%/packages/patches/vinagre-revert-2.patch                   \
   %D%/packages/patches/virglrenderer-CVE-2017-6386.patch       \
@@ -1137,7 +1142,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/vsearch-unbundle-cityhash.patch         \
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch                     \
   %D%/packages/patches/vte-CVE-2012-2738-pt2.patch                     \
-  %D%/packages/patches/webkitgtk-mitigate-spectre.patch                \
+  %D%/packages/patches/wavpack-CVE-2018-7253.patch             \
+  %D%/packages/patches/wavpack-CVE-2018-7254.patch             \
   %D%/packages/patches/weechat-python.patch                    \
   %D%/packages/patches/wicd-bitrate-none-fix.patch             \
   %D%/packages/patches/wicd-get-selected-profile-fix.patch     \
@@ -1172,13 +1178,7 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/xinetd-CVE-2013-4342.patch              \
   %D%/packages/patches/xmodmap-asprintf.patch                  \
   %D%/packages/patches/libyaml-CVE-2014-9130.patch             \
-  %D%/packages/patches/zathura-plugindir-environment-variable.patch    \
-  %D%/packages/patches/zziplib-CVE-2017-5974.patch             \
-  %D%/packages/patches/zziplib-CVE-2017-5975.patch             \
-  %D%/packages/patches/zziplib-CVE-2017-5976.patch             \
-  %D%/packages/patches/zziplib-CVE-2017-5978.patch             \
-  %D%/packages/patches/zziplib-CVE-2017-5979.patch             \
-  %D%/packages/patches/zziplib-CVE-2017-5981.patch
+  %D%/packages/patches/zathura-plugindir-environment-variable.patch
 
 MISC_DISTRO_FILES =                            \
   %D%/packages/ld-wrapper.in
@@ -1220,56 +1220,7 @@ dist_bootstrap_mips64el_linux_DATA =             \
   %D%/packages/bootstrap/mips64el-linux/tar    \
   %D%/packages/bootstrap/mips64el-linux/xz
 
-# Big bootstrap binaries are not included in the tarball.  Instead, they
-# are downloaded.
-nodist_bootstrap_x86_64_linux_DATA =                                   \
-  %D%/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_i686_linux_DATA =                                     \
-  %D%/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_armhf_linux_DATA =                                    \
-  %D%/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
-nodist_bootstrap_aarch64_linux_DATA =                                  \
-  %D%/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz
-nodist_bootstrap_mips64el_linux_DATA =                                 \
-  %D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
-
 # Those files must remain executable, so they remain executable once
 # imported into the store.
 set-bootstrap-executable-permissions:
        chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
-
-BOOTSTRAP_GUILE_TARBALLS =                     \
-  $(nodist_bootstrap_x86_64_linux_DATA)                \
-  $(nodist_bootstrap_i686_linux_DATA)          \
-  $(nodist_bootstrap_armhf_linux_DATA)         \
-  $(nodist_bootstrap_aarch64_linux_DATA)       \
-  $(nodist_bootstrap_mips64el_linux_DATA)
-
-DISTCLEANFILES = $(BOOTSTRAP_GUILE_TARBALLS)
-
-# Method to download a file from an external source.
-DOWNLOAD_FILE =                                                                \
-  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"        \
-  $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)"   \
-           "$(top_srcdir)/build-aux/download.scm"
-
-%D%/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
-%D%/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
-%D%/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
-%D%/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "3939909f24dcb955621aa7f81ecde6844bea8a083969c2d275c55699af123ebe"
-%D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"