diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-02-09 15:14:59 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-09 15:14:59 +0100 |
commit | 50a93adc05b611836e740c4b55571890f4c6770a (patch) | |
tree | db8dfcb8f1d07405a0b546672af116bf1b47a1ee /gnu/packages/tex.scm | |
parent | 722ac64cd7dc1f09fb77e2ae780427fa13c03110 (diff) | |
parent | 69fb26d4f51e9d22111cb1360e2941192afee5b9 (diff) | |
download | patches-50a93adc05b611836e740c4b55571890f4c6770a.tar patches-50a93adc05b611836e740c4b55571890f4c6770a.tar.gz |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/tex.scm')
-rw-r--r-- | gnu/packages/tex.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2a135080b5..5f294dc84c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -104,15 +104,19 @@ (patches (list ;; This is required for compatibility with Poppler 0.64.0 and to fix a - ;; segmentation fault in dvipdfm-x from XeTeX. + ;; segmentation fault in dvipdfm-x from XeTeX, and also contains a fix + ;; for CVE-2018-17407. (origin (method url-fetch) (uri (string-append "http://www.linuxfromscratch.org/patches/blfs/" - "svn/texlive-" version "-source-upstream_fixes-1.patch")) + "svn/texlive-" version "-source-upstream_fixes-2.patch")) (file-name "texlive-poppler-compat.patch") (sha256 (base32 - "0f8vhyj167y4xj0jx47vkybrcacfpxw0wdn1b777yq3xmhlahhlg"))))))) + "04sxy1qv9y575mxwyg3y7rx7mh540pfjqx7yni7ncb5wjbq9pq1a"))) + (search-patch "texlive-bin-luatex-poppler-compat.patch") + (search-patch "texlive-bin-pdftex-poppler-compat.patch") + (search-patch "texlive-bin-xetex-poppler-compat.patch"))))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) |