gnu: ghostscript: Incorporate grafted changes.

* gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field.
(source)[patches]: Add 'ghostscript-CVE-2018-10194.patch'.
(ghostscript/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2018-07-24 20:42:48 +02:00
parent 5a0b3c3408
commit 99cfdfb10c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -132,7 +132,6 @@ (define-public psutils
(define-public ghostscript
(package
(name "ghostscript")
(replacement ghostscript/fixed)
(version "9.23")
(source
(origin
@ -145,6 +144,7 @@ (define-public ghostscript
(base32
"1ng8d9fm5lza7k1f7ybc791275c07z5hcmpkrl2i226nshkxrkhz"))
(patches (search-patches "ghostscript-runpath.patch"
"ghostscript-CVE-2018-10194.patch"
"ghostscript-no-header-creationdate.patch"
"ghostscript-no-header-id.patch"
"ghostscript-no-header-uuid.patch"))
@ -251,16 +251,6 @@ (define-public ghostscript
(home-page "https://www.ghostscript.com/")
(license license:agpl3+)))
(define-public ghostscript/fixed
(hidden-package
(package
(inherit ghostscript)
(source
(origin
(inherit (package-source ghostscript))
(patches (append (origin-patches (package-source ghostscript))
(search-patches "ghostscript-CVE-2018-10194.patch"))))))))
(define-public ghostscript/x
(package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x"))