ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mupdf, cups-filters: Incorporated grafted changes.

Browse source 
* 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:
Leo Famulari 2017-01-25 13:42:46 -05:00
parent 5a64a79131
commit ef00f3ebae
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
2 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/cups.scm
View file

@ -52,7 +52,6 @@ (define ghostscript/cups
(define-public cups-filters
(package
(name "cups-filters")
(replacement cups-filters/fixed)
(version "1.13.1")
(source(origin
(method url-fetch)
@ -135,13 +134,6 @@ (define-public cups-filters
license:lgpl2.0+
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
;; depends on CUPS libraries and binaries, cups-minimal has been added to
;; satisfy this dependency.

17
gnu/packages/pdf.scm
View file

@ -481,7 +481,6 @@ (define-public podofo
(define-public mupdf
(package
(name "mupdf")
(replacement mupdf/fixed)
(version "1.10a")
(source
(origin
@ -491,7 +490,9 @@ (define-public mupdf
(sha256
(base32
"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)))
(snippet
;; Delete all the bundled libraries except for mujs, which is
@ -540,18 +541,6 @@ (define-public mupdf
and examining the file structure (pdfshow).")
(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
(package
(name "qpdf")