mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
gnu: mupdf, cups-filters: Incorporated grafted changes.
* gnu/packages/pdf.scm (mupdf)[replacement]: Remove field. [source]: Add 'mupdf-mujs-CVE-2016-10132.patch' and 'mupdf-mujs-CVE-2016-10133.patch'. (mupdf/fixed): Remove variable. * gnu/packages/cups.scm (cups-filters)[replacement]: Remove field. (mupdf/fixed-instead-of-mupdf),(cups-filters/fixed): Remove variables.
This commit is contained in:
parent
5a64a79131
commit
ef00f3ebae
2 changed files with 3 additions and 22 deletions
|
@ -52,7 +52,6 @@
|
||||||
(define-public cups-filters
|
(define-public cups-filters
|
||||||
(package
|
(package
|
||||||
(name "cups-filters")
|
(name "cups-filters")
|
||||||
(replacement cups-filters/fixed)
|
|
||||||
(version "1.13.1")
|
(version "1.13.1")
|
||||||
(source(origin
|
(source(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -135,13 +134,6 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
|
||||||
license:lgpl2.0+
|
license:lgpl2.0+
|
||||||
license:expat))))
|
license:expat))))
|
||||||
|
|
||||||
(define mupdf/fixed-instead-of-mupdf
|
|
||||||
(package-input-rewriting `((,mupdf . ,(@@ (gnu packages pdf) mupdf/fixed)))))
|
|
||||||
|
|
||||||
;;; Fix CVE-2016-10132 and CVE-2016-10133. See mupdf/fixed for more information.
|
|
||||||
(define cups-filters/fixed
|
|
||||||
(mupdf/fixed-instead-of-mupdf cups-filters))
|
|
||||||
|
|
||||||
;; CUPS on non-MacOS systems requires cups-filters. Since cups-filters also
|
;; CUPS on non-MacOS systems requires cups-filters. Since cups-filters also
|
||||||
;; depends on CUPS libraries and binaries, cups-minimal has been added to
|
;; depends on CUPS libraries and binaries, cups-minimal has been added to
|
||||||
;; satisfy this dependency.
|
;; satisfy this dependency.
|
||||||
|
|
|
@ -481,7 +481,6 @@ extracting content or merging files.")
|
||||||
(define-public mupdf
|
(define-public mupdf
|
||||||
(package
|
(package
|
||||||
(name "mupdf")
|
(name "mupdf")
|
||||||
(replacement mupdf/fixed)
|
|
||||||
(version "1.10a")
|
(version "1.10a")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -491,7 +490,9 @@ extracting content or merging files.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"))
|
"0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"))
|
||||||
(patches (search-patches "mupdf-build-with-openjpeg-2.1.patch"))
|
(patches (search-patches "mupdf-build-with-openjpeg-2.1.patch"
|
||||||
|
"mupdf-mujs-CVE-2016-10132.patch"
|
||||||
|
"mupdf-mujs-CVE-2016-10133.patch"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
;; Delete all the bundled libraries except for mujs, which is
|
;; Delete all the bundled libraries except for mujs, which is
|
||||||
|
@ -540,18 +541,6 @@ line tools for batch rendering (pdfdraw), rewriting files (pdfclean),
|
||||||
and examining the file structure (pdfshow).")
|
and examining the file structure (pdfshow).")
|
||||||
(license license:agpl3+)))
|
(license license:agpl3+)))
|
||||||
|
|
||||||
(define mupdf/fixed
|
|
||||||
(package
|
|
||||||
(inherit mupdf)
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(inherit (package-source mupdf))
|
|
||||||
(patches
|
|
||||||
(append
|
|
||||||
(origin-patches (package-source mupdf))
|
|
||||||
(search-patches "mupdf-mujs-CVE-2016-10132.patch"
|
|
||||||
"mupdf-mujs-CVE-2016-10133.patch")))))))
|
|
||||||
|
|
||||||
(define-public qpdf
|
(define-public qpdf
|
||||||
(package
|
(package
|
||||||
(name "qpdf")
|
(name "qpdf")
|
||||||
|
|
Loading…
Reference in a new issue