diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
| commit | b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60 (patch) | |
| tree | 707c6a5e18474b410e39fa6892521c9f47518ccc /gnu/local.mk | |
| parent | 97127431ee9133626fea62449706d729d80b73f6 (diff) | |
| parent | 5b63a8568b39c019970569773bace18fab17a157 (diff) | |
| download | guix-patches-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar guix-patches-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9ec0e54b00..faa6e535ef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -297,6 +297,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/rdesktop.scm \ %D%/packages/rdf.scm \ %D%/packages/readline.scm \ + %D%/packages/regex.scm \ %D%/packages/rrdtool.scm \ %D%/packages/rsync.scm \ %D%/packages/ruby.scm \ @@ -523,7 +524,6 @@ dist_patch_DATA = \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghostscript-CVE-2015-3228.patch \ %D%/packages/patches/ghostscript-runpath.patch \ - %D%/packages/patches/gimp-CVE-2016-4994.patch \ %D%/packages/patches/glib-networking-ssl-cert-file.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ @@ -668,6 +668,8 @@ dist_patch_DATA = \ %D%/packages/patches/mplayer2-theora-fix.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ + %D%/packages/patches/mupdf-CVE-2016-6265.patch \ + %D%/packages/patches/mupdf-CVE-2016-6525.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/mysql-fix-failing-test.patch \ @@ -851,7 +853,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-intel-glibc-2.20.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ %D%/packages/patches/xf86-video-nv-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-openchrome-glibc-2.20.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 \ |