diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-21 04:57:29 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-21 05:02:52 -0400 |
| commit | c52872bfc418c6b2273f973dff8003ca9e062792 (patch) | |
| tree | 4184a250e6d8363b3901aa2abe6910ff08ce08d4 /gnu/packages/compression.scm | |
| parent | 65bb22796f854cbc3eae053a80b1d64365dad376 (diff) | |
| parent | 3fe49e50153fec1dabac35e262a0888044f79aa6 (diff) | |
| download | guix-c52872bfc418c6b2273f973dff8003ca9e062792.tar guix-c52872bfc418c6b2273f973dff8003ca9e062792.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 79d47027c2..6f44c4fb02 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -545,6 +545,7 @@ decompressors when faced with corrupted input.") (method url-fetch) (uri (string-append "mirror://gnu/sharutils/sharutils-" version ".tar.xz")) + (patches (search-patches "sharutils-CVE-2018-1000097.patch")) (sha256 (base32 "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b")))) @@ -2118,14 +2119,14 @@ non-Windows systems without running the actual installer using wine.") (define-public google-brotli (package (name "google-brotli") - (version "1.0.2") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/google/brotli/archive/v" version ".tar.gz")) (sha256 (base32 - "08kl9gww2058p1p7j9xqmcmrabcfihhj3fq984d7fi3bchb2mky2")))) + "1hrpmz162k4x3xm6vmbpm443jlfr1kp536p8962y2dncy7gs6s12")))) (build-system cmake-build-system) (arguments `(#:phases |