gnu: zziplib: Incorporate grafted changes.

* gnu/packages/compression.scm (zziplib)[replacement]: Remove.
[source](patches): New field.
(zziplib/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2020-03-05 17:19:54 +01:00
parent ebb7cf9e21
commit e6bd8b5e1d
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -1580,13 +1580,13 @@ (define-public zziplib
(package
(name "zziplib")
(version "0.13.69")
(replacement zziplib/fixed)
(home-page "https://github.com/gdraheim/zziplib")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(patches (search-patches "zziplib-CVE-2018-16548.patch"))
(sha256
(base32
"0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92"))))
@ -1618,13 +1618,6 @@ (define-public zziplib
;; files carry the Zlib license; see "docs/copying.html" for details.
(license (list license:lgpl2.0+ license:mpl1.1))))
(define zziplib/fixed
(package
(inherit zziplib)
(source (origin
(inherit (package-source zziplib))
(patches (search-patches "zziplib-CVE-2018-16548.patch"))))))
(define-public libzip
(package
(name "libzip")