summaryrefslogtreecommitdiff
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)
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 5ccaa38eead..dce02a7b575 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -76,6 +76,7 @@
76(define-public poppler 76(define-public poppler
77 (package 77 (package
78 (name "poppler") 78 (name "poppler")
79 (replacement poppler-0.56.0)
79 (version "0.52.0") 80 (version "0.52.0")
80 (source (origin 81 (source (origin
81 (method url-fetch) 82 (method url-fetch)
@@ -129,15 +130,27 @@
129 (license license:gpl2+) 130 (license license:gpl2+)
130 (home-page "https://poppler.freedesktop.org/"))) 131 (home-page "https://poppler.freedesktop.org/")))
131 132
132(define-public poppler-qt4 133(define poppler-0.56.0
133 (package (inherit poppler) 134 (package (inherit poppler)
135 (version "0.56.0")
136 (source
137 (origin
138 (method url-fetch)
139 (uri (string-append "https://poppler.freedesktop.org/poppler-"
140 version ".tar.xz"))
141 (sha256
142 (base32
143 "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6"))))))
144
145(define-public poppler-qt4
146 (package/inherit poppler
134 (name "poppler-qt4") 147 (name "poppler-qt4")
135 (inputs `(("qt-4" ,qt-4) 148 (inputs `(("qt-4" ,qt-4)
136 ,@(package-inputs poppler))) 149 ,@(package-inputs poppler)))
137 (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) 150 (synopsis "Qt4 frontend for the Poppler PDF rendering library")))
138 151
139(define-public poppler-qt5 152(define-public poppler-qt5
140 (package (inherit poppler) 153 (package/inherit poppler
141 (name "poppler-qt5") 154 (name "poppler-qt5")
142 (inputs `(("qtbase" ,qtbase) 155 (inputs `(("qtbase" ,qtbase)
143 ,@(package-inputs poppler))) 156 ,@(package-inputs poppler)))