From 45d66ce8e995761dcde73c7ae437e00ab91ab8d7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 Dec 2023 16:56:53 +0100 Subject: gnu: ghostscript: Ungraft. * gnu/packages/ghostscript.scm (ghostscript)[source]: Fold extra patches. [replacement]: Remove. (ghostscript/fixed): Remove. Change-Id: I116d49c308223207382337395a1c6cba83508a0e --- gnu/packages/ghostscript.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu/packages/ghostscript.scm') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 19389bed465..e95069cdd18 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2013, 2015-2017, 2019, 2023 Ludovic Courtès ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018, 2019, 2021, 2023 Efraim Flashner ;;; Copyright © 2017 Leo Famulari @@ -161,7 +161,6 @@ printing, and psresize, for adjusting page sizes.") (package (name "ghostscript") (version "9.56.1") - (replacement ghostscript/fixed) (source (origin (method url-fetch) @@ -174,7 +173,9 @@ printing, and psresize, for adjusting page sizes.") "1r5qash65m6ignki6z72q4rlai9ka99xrxnmqd19n02has00cd6l")) (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" - "ghostscript-no-header-uuid.patch")) + "ghostscript-no-header-uuid.patch" + "ghostscript-CVE-2023-36664.patch" + "ghostscript-CVE-2023-36664-fixup.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. The bundled OpenJPEG is a patched fork so @@ -293,12 +294,6 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define ghostscript/fixed - (package-with-patches - ghostscript - (search-patches "ghostscript-CVE-2023-36664.patch" - "ghostscript-CVE-2023-36664-fixup.patch"))) - (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) -- cgit v1.3