[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: gnu: unzip: Ungraft.
From: |
Mark H. Weaver |
Subject: |
01/07: gnu: unzip: Ungraft. |
Date: |
Sat, 17 Mar 2018 03:37:44 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 190376a1ca457ecce3f2bebe1d56392ac07929fd
Author: Mark H Weaver <address@hidden>
Date: Sat Mar 17 03:15:11 2018 -0400
gnu: unzip: Ungraft.
* gnu/packages/compression.scm (unzip)[replacement]: Remove field.
[arguments]: Add 'fortify' phase.
(unzip/fixed): Remove variable.
---
gnu/packages/compression.scm | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 3f486d3..dbf4f92 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -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")
- branch core-updates updated (9f388b1 -> 5a5b363), Mark H. Weaver, 2018/03/17
- 03/07: gnu: libtiff: Ungraft., Mark H. Weaver, 2018/03/17
- 05/07: gnu: libsndfile: Ungraft., Mark H. Weaver, 2018/03/17
- 04/07: gnu: freetype: Ungraft., Mark H. Weaver, 2018/03/17
- 07/07: gnu: guile-2.2/fixed: Remove vestigial (replacement #f)., Mark H. Weaver, 2018/03/17
- 02/07: gnu: curl: Ungraft., Mark H. Weaver, 2018/03/17
- 01/07: gnu: unzip: Ungraft.,
Mark H. Weaver <=
- 06/07: gnu: libvorbis: Ungraft., Mark H. Weaver, 2018/03/17