gnu: texlive: Update to 2017.

* gnu/packages/tex.scm (texlive, texlive-texmf): Update to 2017.
(texlive-texmf-src): Update to 20170524. Remove
'texlive-texmf-CVE-2016-10243.patch'.
(texlive-bin, texlive-extra-src): Update to 20170524.
* gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Leo Famulari 2017-08-05 17:56:49 -04:00 committed by Ricardo Wurmus
parent f167595ba1
commit 149f668821
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
3 changed files with 11 additions and 30 deletions

View File

@ -1022,7 +1022,6 @@ dist_patch_DATA = \
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
%D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \
%D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \
%D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \
%D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-document-encoding.patch \
%D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/texi2html-i18n.patch \
%D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/thefuck-test-environ.patch \

View File

@ -1,18 +0,0 @@
Fix CVE-2016-10243:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10243
Patch adapted from upstream commit:
https://www.tug.org/svn/texlive?view=revision&revision=42605
--- trunk/Master/texmf-dist/web2c/texmf.cnf 2016/11/29 23:10:33 42604
+++ trunk/Master/texmf-dist/web2c/texmf.cnf 2016/11/29 23:27:53 42605
@@ -568,7 +568,6 @@ extractbb,\
gregorio,\
kpsewhich,\
makeindex,\
-mpost,\
repstopdf,\
% we'd like to allow:

View File

@ -7,6 +7,7 @@
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -66,29 +67,28 @@
(define texlive-extra-src (define texlive-extra-src
(origin (origin
(method url-fetch) (method url-fetch)
(uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523-extra.tar.xz") (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-extra.tar.xz")
(sha256 (base32 (sha256 (base32
"0q4a92zmwhn4ry6xgrp4k8wq11ax2sg9rg9yrsrdkr719y0x887a")))) "0zvd2zskk78ig114mfj24g15qys41hzqv59fmqpirdbgq9c9gr5g"))))
(define texlive-texmf-src (define texlive-texmf-src
(origin (origin
(method url-fetch) (method url-fetch)
(uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-texmf.tar.xz") (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-texmf.tar.xz")
(patches (search-patches "texlive-texmf-CVE-2016-10243.patch"))
(patch-flags '("-p2"))
(sha256 (base32 (sha256 (base32
"1dv8vgfzpczqw82hv9g7a8djhhyzywljmrarlcyy6g2qi5q51glr")))) "1v69y3kgkbk24f7s4dfkknwd317mqmck5jgpyb35wqgqfy5p0qrz"))))
(define-public texlive-bin (define-public texlive-bin
(package (package
(name "texlive-bin") (name "texlive-bin")
(version "2016") (version "20170524")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-source.tar.xz") (uri (string-append "ftp://tug.org/historic/systems/texlive/2017/"
"texlive-" version "-source.tar.xz"))
(sha256 (base32 (sha256 (base32
"1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8")))) "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("texlive-extra-src" ,texlive-extra-src) `(("texlive-extra-src" ,texlive-extra-src)
@ -3808,7 +3808,7 @@ directly generate PDF documents instead of DVI.")
(define texlive-texmf (define texlive-texmf
(package (package
(name "texlive-texmf") (name "texlive-texmf")
(version "2016") (version "2017")
(source texlive-texmf-src) (source texlive-texmf-src)
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -3880,7 +3880,7 @@ This package contains the complete tree of texmf-dist data.")
(define-public texlive (define-public texlive
(package (package
(name "texlive") (name "texlive")
(version "2016") (version "2017")
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs `(("bash" ,bash) ; for wrap-program (inputs `(("bash" ,bash) ; for wrap-program