diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-13 13:17:15 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-13 13:17:15 -0500 |
| commit | 288b8fd5e97c32d44a49612dbeef854c05ebc373 (patch) | |
| tree | 8a5021c9af2497c560ff94d37b8217d6187d8dbd /gnu/packages/compression.scm | |
| parent | a7fb29866520d5661e0ac8e47957c91a2a43e11e (diff) | |
| parent | acff6aa00473befac75f8120fc4299f4f265c258 (diff) | |
| download | patches-288b8fd5e97c32d44a49612dbeef854c05ebc373.tar patches-288b8fd5e97c32d44a49612dbeef854c05ebc373.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 86dc809adb..3bf2ec1617 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> @@ -1728,6 +1728,7 @@ Compression ratios of 2:1 to 3:1 are common for text files.") (define-public unzip (package (inherit zip) (name "unzip") + (replacement unzip/fixed) (version "6.0") (source (origin @@ -1778,6 +1779,20 @@ recreates the stored directory structure by default.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) +(define unzip/fixed + (package/inherit unzip + (arguments + (substitute-keyword-arguments (package-arguments unzip) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fortify + (lambda _ + ;; Mitigate CVE-2018-1000035, an exploitable buffer overflow. + ;; This environment variable is recommended in 'unix/Makefile' + ;; for passing flags to the C compiler. + (setenv "LOCAL_UNZIP" "-D_FORTIFY_SOURCE=1") + #t)))))))) + (define-public zziplib (package (name "zziplib") |