summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-12-02 21:46:49 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-12-03 08:59:40 +0200
commit6b7c483328801af1bcafe5e87eeac1b1a7819f66 (patch)
treed0c88af6b129c46602ecf0bc221a84d9caeda61e
parenta5de7312acaa23a5f1052cdca2ba7e018f55ad5b (diff)
gnu: google-brotli: Update to 1.0.9 (Fixes CVE-2020-8927).
* gnu/packages/compression.scm (google-brotli): Update to 1.0.9. [source]: Add snippet to remove unrecognized '-R' flag from pkg-config files.
-rw-r--r--gnu/packages/compression.scm12
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 79300bbb92..5b96dd63ee 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1898,7 +1898,7 @@ non-Windows systems without running the actual installer using wine.")
(define-public google-brotli
(package
(name "google-brotli")
- (version "1.0.7")
+ (version "1.0.9")
(source
(origin
(method git-fetch)
@@ -1907,7 +1907,15 @@ non-Windows systems without running the actual installer using wine.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"))))
+ (base32 "1fikasxf7r2dwlk8mv8w7nmjkn0jw5ic31ky3mvpkdzwgd4xfndl"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Cherry-picked from upstream since the latest release
+ ;; https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc
+ (substitute* (find-files "scripts" "^lib.*pc\\.in")
+ (("-R\\$\\{libdir\\} ") ""))
+ #t))))
(build-system cmake-build-system)
(arguments
`(#:phases