diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 01:09:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 01:09:25 +0100 |
| commit | 7ace97395feedc4b3ec23be65f2ed63f29aac9a9 (patch) | |
| tree | 768956fa30fc7b21e4e4715eafbb10dab32b2847 /gnu/local.mk | |
| parent | a248a9ac6a67213b177ab5ba9ec270638c9dd002 (diff) | |
| parent | be5ed142135e939cd23fcfe88c553fd28b32ac53 (diff) | |
| download | patches-7ace97395feedc4b3ec23be65f2ed63f29aac9a9.tar patches-7ace97395feedc4b3ec23be65f2ed63f29aac9a9.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 297f19b54d..61566d57d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -50,6 +50,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/accessibility.scm \ %D%/packages/acct.scm \ %D%/packages/acl.scm \ + %D%/packages/ada.scm \ %D%/packages/admin.scm \ %D%/packages/adns.scm \ %D%/packages/agda.scm \ @@ -120,6 +121,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/datastructures.scm \ %D%/packages/dav.scm \ %D%/packages/dc.scm \ + %D%/packages/debian.scm \ %D%/packages/debug.scm \ %D%/packages/dejagnu.scm \ %D%/packages/dico.scm \ @@ -409,6 +411,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tcl.scm \ %D%/packages/telephony.scm \ %D%/packages/terminals.scm \ + %D%/packages/terraform.scm \ %D%/packages/texinfo.scm \ %D%/packages/tex.scm \ %D%/packages/textutils.scm \ @@ -786,7 +789,9 @@ dist_patch_DATA = \ %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-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ + %D%/packages/patches/java-simple-xml-fix-tests.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 \ @@ -886,6 +891,7 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-for-extempore.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ + %D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ %D%/packages/patches/lua-pkgconfig.patch \ %D%/packages/patches/lua51-liblua-so.patch \ @@ -1080,6 +1086,7 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-test-threading.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ + %D%/packages/patches/shadow-CVE-2018-7169.patch \ %D%/packages/patches/shepherd-close-fds.patch \ %D%/packages/patches/shepherd-herd-status-sorted.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ @@ -1132,6 +1139,7 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-overflow-long-fsize.patch \ %D%/packages/patches/unzip-remove-build-date.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ + %D%/packages/patches/util-linux-CVE-2018-7738.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ @@ -1183,7 +1191,9 @@ 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/zathura-plugindir-environment-variable.patch \ + %D%/packages/patches/zsh-CVE-2018-7548.patch \ + %D%/packages/patches/zsh-CVE-2018-7549.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in |