On Sun, Aug 06, 2017 at 11:44:41AM +0200, Ricardo Wurmus wrote:
> Leo Famulari <l...@famulari.name> writes:
> > The attached patches update texlive to 2017 and remove biber-2.5.
> > Ricardo, can you check if biber@2.7 works with these patches?
> 
> These patches don’t apply cleanly to core-updates since the merge of
> master a couple of hours ago.  I cannot rebase and test them today, but
> I can give it a try on Monday.

I've attached an updated patch series.
From 02c2c1b2b4ffc9b95652b70b96967340c40ee800 Mon Sep 17 00:00:00 2001
From: Leo Famulari <l...@famulari.name>
Date: Sat, 5 Aug 2017 17:56:49 -0400
Subject: [PATCH 1/3] 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.
---
 gnu/local.mk                                       |  1 -
 .../patches/texlive-texmf-CVE-2016-10243.patch     | 18 ------------------
 gnu/packages/tex.scm                               | 22 +++++++++++-----------
 3 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index acdadd629..e7a870549 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1022,7 +1022,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch       \
   %D%/packages/patches/teensy-loader-cli-help.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-i18n.patch                    \
   %D%/packages/patches/thefuck-test-environ.patch              \
diff --git a/gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch 
b/gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch
deleted file mode 100644
index 3a9ae993f..000000000
--- a/gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch
+++ /dev/null
@@ -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:
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 729f9c01b..60b4a837b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2016 Federico Beffa <be...@fbengineering.ch>
 ;;; Copyright © 2016 Thomas Danckaert <p...@thomasdanckaert.be>
 ;;; Copyright © 2016, 2017 Ricardo Wurmus <rek...@elephly.net>
+;;; Copyright © 2017 Leo Famulari <l...@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -66,29 +67,28 @@
 (define texlive-extra-src
   (origin
     (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
-              "0q4a92zmwhn4ry6xgrp4k8wq11ax2sg9rg9yrsrdkr719y0x887a"))))
+              "0zvd2zskk78ig114mfj24g15qys41hzqv59fmqpirdbgq9c9gr5g"))))
 
 (define texlive-texmf-src
   (origin
     (method url-fetch)
-    (uri 
"ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-texmf.tar.xz";)
-    (patches (search-patches "texlive-texmf-CVE-2016-10243.patch"))
-    (patch-flags '("-p2"))
+    (uri 
"ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-texmf.tar.xz";)
     (sha256 (base32
-              "1dv8vgfzpczqw82hv9g7a8djhhyzywljmrarlcyy6g2qi5q51glr"))))
+              "1v69y3kgkbk24f7s4dfkknwd317mqmck5jgpyb35wqgqfy5p0qrz"))))
 
 (define-public texlive-bin
   (package
    (name "texlive-bin")
-   (version "2016")
+   (version "20170524")
    (source
     (origin
      (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
-               "1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8"))))
+               "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"))))
    (build-system gnu-build-system)
    (inputs
     `(("texlive-extra-src" ,texlive-extra-src)
@@ -3808,7 +3808,7 @@ directly generate PDF documents instead of DVI.")
 (define texlive-texmf
   (package
    (name "texlive-texmf")
-   (version "2016")
+   (version "2017")
    (source texlive-texmf-src)
    (build-system gnu-build-system)
    (inputs
@@ -3880,7 +3880,7 @@ This package contains the complete tree of texmf-dist 
data.")
 (define-public texlive
   (package
    (name "texlive")
-   (version "2016")
+   (version "2017")
    (source #f)
    (build-system trivial-build-system)
    (inputs `(("bash" ,bash) ; for wrap-program
-- 
2.13.3

From c1c741ba33cb89337dbe5779c519f88c1b45e862 Mon Sep 17 00:00:00 2001
From: Leo Famulari <l...@famulari.name>
Date: Sat, 5 Aug 2017 18:34:51 -0400
Subject: [PATCH 2/3] gnu: biber: Update to 2.7.

* gnu/packages/tex.scm (biber)[name]: Rename to 'biber'.
(biber-2.5): Remove variable.
---
 gnu/packages/tex.scm | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 60b4a837b..db08ed864 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4058,7 +4058,7 @@ values (strings, macros, or numbers) pasted together.")
 
 (define-public biber
   (package
-    (name "biber-next")
+    (name "biber")
     (version "2.7")
     (source (origin
               (method url-fetch)
@@ -4136,33 +4136,6 @@ values (strings, macros, or numbers) pasted together.")
 other things it comes with full Unicode support.")
     (license license:artistic2.0)))
 
-;; Our version of texlive comes with biblatex 3.4, which is only compatible
-;; with biber 2.5 according to the compatibility matrix in the biber
-;; documentation.
-(define-public biber-2.5
-  (package (inherit biber)
-    (name "biber")
-    (version "2.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/plk/biber/archive/v";
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "163sd343wkrzwnvj2003m2j0kz517jmjr4savw6f8bjxhj8fdrqv"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments biber)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (add-before 'check 'delete-failing-test
-             (lambda _
-               (delete-file "t/sort-order.t")
-               #t))))))
-    (inputs
-     `(("perl-date-simple" ,perl-date-simple)
-       ,@(package-inputs biber)))))
-
 (define-public rubber
   (package
     (name "rubber")
-- 
2.13.3

From e91b3a68050b40cdd0f1e76052e416674c8d5cf3 Mon Sep 17 00:00:00 2001
From: Leo Famulari <l...@famulari.name>
Date: Sun, 6 Aug 2017 16:26:49 -0400
Subject: [PATCH 3/3] gnu: texlive: Remove texlive-minimal.

This package is superseded by the modular TeX Live distribution.

* gnu/packages/tex.scm (texlive-minimal, texlive-texmf-minimal): Remove
variables.
---
 gnu/packages/tex.scm | 75 ----------------------------------------------------
 1 file changed, 75 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index db08ed864..f12746c83 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3939,81 +3939,6 @@ This package contains the complete TeX Live 
distribution.")
    (license (license:fsf-free "https://www.tug.org/texlive/copying.html";))
    (home-page "https://www.tug.org/texlive/";)))
 
-
-;; texlive-texmf-minimal is a pruned, small version of the texlive tree,
-;; in particular dropping documentation and fonts.  It weighs in at 470 MiB
-;; instead of 4 GiB.
-(define texlive-texmf-minimal
-  (package (inherit texlive-texmf)
-   (name "texlive-texmf-minimal")
-   (arguments
-    (substitute-keyword-arguments
-     (package-arguments texlive-texmf)
-     ((#:modules modules)
-      `((ice-9 ftw)
-        (srfi srfi-1)
-        ,@modules))
-     ((#:phases phases)
-      `(modify-phases ,phases
-         (add-after 'unpack 'prune
-           (lambda _
-             (define (delete subdir exclude)
-               "Delete all files and directories in SUBDIR except for those
-given in the list EXCLUDE."
-               (with-directory-excursion subdir
-                 (for-each delete-file-recursively
-                           (lset-difference equal?
-                                            (scandir ".")
-                                            (append '("." "..")
-                                                    exclude)))))
-             (with-directory-excursion "texmf-dist"
-               (for-each delete-file-recursively
-                         '("doc" "source" "tex4ht"))
-               ;; Delete all subdirectories of "fonts", except for "tfm" and
-               ;; any directories named "cm".
-               (delete "fonts" '("afm" "map" "pk" "source" "tfm" "type1"))
-               (delete "fonts/afm" '("public"))
-               (delete "fonts/afm/public" '("amsfonts"))
-               (delete "fonts/afm/public/amsfonts" '("cm"))
-               (delete "fonts/map" '("dvips"))
-               (delete "fonts/map/dvips" '("cm"))
-               (delete "fonts/source" '("public"))
-               (delete "fonts/source/public" '("cm"))
-               (delete "fonts/tfm" '("public"))
-               (delete "fonts/type1" '("public"))
-               (delete "fonts/type1/public" '("amsfonts"))
-               (delete "fonts/type1/public/amsfonts" '("cm")))
-             #t))))))
-   (description
-    "TeX Live provides a comprehensive TeX document production system.
-It includes all the major TeX-related programs, macro packages, and fonts
-that are free software, including support for many languages around the
-world.
-
-This package contains a small subset of the texmf-dist data.")))
-
-
-;; texlive-minimal is the same as texlive, but using texlive-texmf-minimal
-;; instead of the full texlive-texmf. It can be used, for instance, as a
-;; native input to packages that need texlive to build their documentation.
-(define-public texlive-minimal
-  (package (inherit texlive)
-   (name "texlive-minimal")
-   (inputs
-    `(("texlive-texmf" ,texlive-texmf-minimal)
-      ,@(alist-delete "texlive-texmf" (package-inputs texlive))))
-   (native-search-paths
-    (list (search-path-specification
-           (variable "TEXMFLOCAL")
-           (files '("share/texmf-local")))))
-   (description
-    "TeX Live provides a comprehensive TeX document production system.
-It includes all the major TeX-related programs, macro packages, and fonts
-that are free software, including support for many languages around the
-world.
-
-This package contains a small working part of the TeX Live distribution.")))
-
 (define-public perl-text-bibtex
   (package
     (name "perl-text-bibtex")
-- 
2.13.3

Attachment: signature.asc
Description: PGP signature

Reply via email to