summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-06-29 03:10:30 -0400
committerLeo Famulari <leo@famulari.name>2017-06-29 16:40:10 -0400
commit95bbaa02aa63bc5eae36f686f1ed9915663aa4cf (patch)
tree1a0b36bfc151ef33bec2e5e32c9fc4f652f697ee
parent1b6d3b7a23d7f0b0dda18f3edeb8c5007ca61cc3 (diff)
downloadguix-95bbaa02aa63bc5eae36f686f1ed9915663aa4cf.tar.gz
gnu: poppler: Fix CVE-2017-{9775,9776}.
* gnu/packages/pdf.scm (poppler)[replacement]: New field.
(poppler-0.56.0): New variable.
(poppler-qt4, poppler-qt5): Use 'package/inherit'.
-rw-r--r--gnu/packages/pdf.scm17
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 5ccaa38eea..dce02a7b57 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -76,6 +76,7 @@
 (define-public poppler
   (package
    (name "poppler")
+   (replacement poppler-0.56.0)
    (version "0.52.0")
    (source (origin
             (method url-fetch)
@@ -129,15 +130,27 @@
    (license license:gpl2+)
    (home-page "https://poppler.freedesktop.org/")))
 
-(define-public poppler-qt4
+(define poppler-0.56.0
   (package (inherit poppler)
+  (version "0.56.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append "https://poppler.freedesktop.org/poppler-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6"))))))
+
+(define-public poppler-qt4
+  (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)))