diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
| commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
| tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /gnu/local.mk | |
| parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
| parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
| download | patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9df027a8d7..3da59ec819 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -357,6 +357,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 \ @@ -997,6 +998,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.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 \ @@ -1045,11 +1047,6 @@ dist_patch_DATA = \ %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-concurrent-ignore-broken-test.patch \ %D%/packages/patches/ruby-concurrent-test-arm.patch \ @@ -1091,7 +1088,6 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ - %D%/packages/patches/transmission-fix-dns-rebinding-vuln.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tophat-build-with-later-seqan.patch \ |