gnu: file: Incorporate grafted changes.

* gnu/packages/file.scm (file)[replacement]: Remove.
[source](patches): New field.
(file/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2019-02-07 21:28:38 +01:00
parent 8ad8568bb5
commit cc43d807c0
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 8 deletions

View File

@ -31,11 +31,11 @@
(package (package
(name "file") (name "file")
(version "5.33") (version "5.33")
(replacement file/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.astron.com/pub/file/file-" (uri (string-append "ftp://ftp.astron.com/pub/file/file-"
version ".tar.gz")) version ".tar.gz"))
(patches (search-patches "file-CVE-2018-10360.patch"))
(sha256 (sha256
(base32 (base32
"1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw")))) "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw"))))
@ -53,10 +53,3 @@ extensions to tell you the type of a file, but looks at the actual contents
of the file. This package provides the libmagic library.") of the file. This package provides the libmagic library.")
(license bsd-2) (license bsd-2)
(home-page "https://www.darwinsys.com/file/"))) (home-page "https://www.darwinsys.com/file/")))
(define file/fixed
(package
(inherit file)
(source
(origin (inherit (package-source file))
(patches (search-patches "file-CVE-2018-10360.patch"))))))