diff options
| author | Leo Famulari <leo@famulari.name> | 2018-11-13 10:33:27 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-11-13 11:28:23 -0500 |
| commit | 021bf6af182099dbb0178e19a2f461aeb0eef686 (patch) | |
| tree | cee330cc2a6e8819ba612e9ecc70e947b07005c6 /gnu/packages/pdf.scm | |
| parent | 8263b9f71f2ee4f8b0d765b0c38b1d812ea8168c (diff) | |
| download | guix-021bf6af182099dbb0178e19a2f461aeb0eef686.tar guix-021bf6af182099dbb0178e19a2f461aeb0eef686.tar.gz | |
gnu: Poppler: Fix CVE-2018-19149.
* gnu/packages/patches/poppler-CVE-2018-19149.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/pdf.scm (poppler)[replacement]: New field.
(poppler/fixed): New variable.
(poppler-qt4, poppler-qt5): Use package/inherit.
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index dc966b64d8..9ffc5cb9bb 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -82,6 +82,7 @@ (define-public poppler (package (name "poppler") + (replacement poppler/fixed) (version "0.63.0") (source (origin (method url-fetch) @@ -127,6 +128,14 @@ (license license:gpl2+) (home-page "https://poppler.freedesktop.org/"))) +(define poppler/fixed + (package + (inherit poppler) + (source (origin + (inherit (package-source poppler)) + (patches (append (origin-patches (package-source poppler)) + (search-patches "poppler-CVE-2018-19149.patch"))))))) + (define-public poppler-data (package (name "poppler-data") @@ -158,14 +167,14 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") license:gpl2)))) (define-public poppler-qt4 - (package (inherit poppler) + (package/inherit poppler (name "poppler-qt4") (inputs `(("qt-4" ,qt-4) ,@(package-inputs poppler))) (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) (define-public poppler-qt5 - (package (inherit poppler) + (package/inherit poppler (name "poppler-qt5") (inputs `(("qtbase" ,qtbase) ,@(package-inputs poppler))) |