diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-12-11 23:21:27 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-11 23:21:27 +0100 |
commit | 9b601fc2110193435e61955c04499fed019aac62 (patch) | |
tree | 37cca3a505989485fcfb653ebcb0dd8ee55d5308 /gnu/local.mk | |
parent | 939c5b2cb6952cd8549bf17d6fd3bcbfb582f0bd (diff) | |
parent | 27664ea0f08e6c207b7b61c1fd7b8446dce98478 (diff) | |
download | patches-9b601fc2110193435e61955c04499fed019aac62.tar patches-9b601fc2110193435e61955c04499fed019aac62.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 21102514a9..4d89f17bbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1179,6 +1179,7 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ + %D%/packages/patches/nss-CVE-2019-11745.patch \ %D%/packages/patches/nss-freebl-stubs.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ |