diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-17 01:18:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-17 01:18:37 -0400 |
| commit | 9f388b1ee1733d84edff7f473cbcbc4ab42b7128 (patch) | |
| tree | 27bd5e908f732a1cddca4b9ef93ee1981d3b0095 /gnu/local.mk | |
| parent | 2857e527de058d9e7f4efea50d381a449a1b6641 (diff) | |
| parent | 9f375a4c0f55238614e047448c8e878b9829f918 (diff) | |
| download | patches-9f388b1ee1733d84edff7f473cbcbc4ab42b7128.tar patches-9f388b1ee1733d84edff7f473cbcbc4ab42b7128.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 25a6b3b763..b979d90fa7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1073,6 +1073,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 \ @@ -1125,6 +1126,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 \ |