mbakke pushed a commit to branch core-updates
in repository guix.
commit 99cfdfb10c7bf42911f2ff59ef3489761ebc063d
Author: Marius Bakke <[email protected]>
Date: Tue Jul 24 20:42:48 2018 +0200
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.
---
gnu/packages/ghostscript.scm | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index bc14fd0..cd7cd60 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -132,7 +132,6 @@ printing, and psresize, for adjusting page sizes.")
(define-public ghostscript
(package
(name "ghostscript")
- (replacement ghostscript/fixed)
(version "9.23")
(source
(origin
@@ -145,6 +144,7 @@ printing, and psresize, for adjusting page sizes.")
(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 @@ output file formats and printers.")
(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"))
