nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: unzip: Ungraft. 

* gnu/packages/compression.scm (unzip)[replacement]: Remove field.
[arguments]: Add 'fortify' phase.
(unzip/fixed): Remove variable.
This commit is contained in:
Mark H Weaver 2018-03-17 03:15:11 -04:00
parent 9f388b1ee1
commit 190376a1ca
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/compression.scm
View File

@ -1740,7 +1740,6 @@ 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
@ -1768,6 +1767,13 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'configure)
(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))
(replace 'build
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make"
@ -1791,20 +1797,6 @@ 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")