diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
| commit | 9c2130757cc0ac20be3cb255c2c09ede45cc9826 (patch) | |
| tree | 2f06ff7fbde58022a6600f76f15d3734587f2ab0 /gnu/local.mk | |
| parent | e543c8a2c6bdc8f129d02a4b48ff336d0e7b529b (diff) | |
| parent | b38e97e03b92d54524953949934884828a1683c1 (diff) | |
| download | guix-9c2130757cc0ac20be3cb255c2c09ede45cc9826.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 7c44196e0d..d74081b673 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -386,6 +386,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/zip.scm \ \ %D%/services.scm \ + %D%/services/admin.scm \ %D%/services/avahi.scm \ %D%/services/base.scm \ %D%/services/databases.scm \ @@ -430,7 +431,8 @@ GNU_SYSTEM_MODULES = \ \ %D%/tests.scm \ %D%/tests/base.scm \ - %D%/tests/install.scm + %D%/tests/install.scm \ + %D%/tests/ssh.scm patchdir = $(guilemoduledir)/%D%/packages/patches @@ -528,6 +530,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ + %D%/packages/patches/gd-CVE-2016-7568.patch \ %D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gegl-CVE-2012-4433.patch \ @@ -620,6 +623,10 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ + %D%/packages/patches/libarchive-7zip-heap-overflow.patch \ + %D%/packages/patches/libarchive-fix-symlink-check.patch \ + %D%/packages/patches/libarchive-fix-filesystem-attacks.patch \ + %D%/packages/patches/libarchive-safe_fprintf-buffer-overflow.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libcmis-fix-test-onedrive.patch \ @@ -781,6 +788,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/ratpoison-shell.patch \ %D%/packages/patches/readline-link-ncurses.patch \ |