diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-23 22:57:16 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-23 22:57:16 +0100 |
| commit | db0e9fe42c419c8c8010dbad6080ed66028c03ec (patch) | |
| tree | 514a0d8fe5465db9a950ac20579e5d3e37bc385b /gnu/local.mk | |
| parent | 43190ac64c5181841d68beade4d19e792f4f38a2 (diff) | |
| parent | 82a2bd3a4ee09c04b51b948f1e952402d6a26f88 (diff) | |
| download | guix-db0e9fe42c419c8c8010dbad6080ed66028c03ec.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index af030781a5..6cd6a1c672 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -493,7 +493,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tex.scm \ %D%/packages/textutils.scm \ %D%/packages/text-editors.scm \ - %D%/packages/tigervnc.scm \ %D%/packages/time.scm \ %D%/packages/tls.scm \ %D%/packages/tmux.scm \ @@ -509,6 +508,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/video.scm \ %D%/packages/vim.scm \ %D%/packages/virtualization.scm \ + %D%/packages/vnc.scm \ %D%/packages/vpn.scm \ %D%/packages/vulkan.scm \ %D%/packages/w3m.scm \ @@ -1125,6 +1125,8 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-add-includes.patch \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ + %D%/packages/patches/libvnc-CVE-2018-20750.patch \ + %D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ @@ -1164,7 +1166,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ - %D%/packages/patches/mes-remove-store-name.patch \ + %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ |