diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
| commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
| tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/packages/base.scm | |
| parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
| parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
| download | guix-6901878894e9c6405fa811c512a32f448e8b9fa2.tar guix-6901878894e9c6405fa811c512a32f448e8b9fa2.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 67fab7c114..db9cca6faf 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -892,7 +892,10 @@ with the Linux kernel.") "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-CVE-2018-11236.patch" + "glibc-CVE-2018-11237.patch")))) + (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes (define-public glibc-2.26 (package |