Bug#769773: unblock: texlive-bin/2014.20140926.35254-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
here a bit more difficult unblock request for
texlive-bin
The last update I uploaded missed the freeze, but contains several pulls
from upstream svn that would be very useful to have in the next stable
release. The changelog lists the upstream changes:
+ * cherrypick fixes from upstream svn:
+ - fix enctex reading \^^ab control sequences
+ - fix mpost reading fontmap file multiple times (Closes: #767967)
+ - dvipdfmx fixes:
+ . fix pk support
+ . correct behaviour for subtractions in pkfont.c
+ . fix crash when gqpn is unset
+ . support for ghostscript 9.15
+ . fix bug in spc_dvips_at_end_page (wrong logic)
+ * bump standards version, no changes necessary
(full debdiff attached)
All of these fixes are properly documented in the ChangeLog files changed
by the respective patches in debian/patches/upstream-svnNNNNN-<desc>
Thanks for your consideration
Norbert
unblock texlive-bin/2014.20140926.35254-3
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.18.0-rc4+ (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru texlive-bin-2014.20140926.35254/debian/changelog texlive-bin-2014.20140926.35254/debian/changelog
--- texlive-bin-2014.20140926.35254/debian/changelog 2014-10-02 14:26:56.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/changelog 2014-11-06 09:37:43.000000000 +0900
@@ -1,3 +1,18 @@
+texlive-bin (2014.20140926.35254-3) unstable; urgency=medium
+
+ * cherrypick fixes from upstream svn:
+ - fix enctex reading \^^ab control sequences
+ - fix mpost reading fontmap file multiple times (Closes: #767967)
+ - dvipdfmx fixes:
+ . fix pk support
+ . correct behaviour for subtractions in pkfont.c
+ . fix crash when gqpn is unset
+ . support for ghostscript 9.15
+ . fix bug in spc_dvips_at_end_page (wrong logic)
+ * bump standards version, no changes necessary
+
+ -- Norbert Preining <preining@debian.org> Thu, 06 Nov 2014 09:37:33 +0900
+
texlive-bin (2014.20140926.35254-2) unstable; urgency=medium
* remove libxp build dep (Closes: #763304)
diff -Nru texlive-bin-2014.20140926.35254/debian/control texlive-bin-2014.20140926.35254/debian/control
--- texlive-bin-2014.20140926.35254/debian/control 2014-10-02 14:26:56.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/control 2014-11-06 09:37:43.000000000 +0900
@@ -4,7 +4,7 @@
Maintainer: Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@kuesterei.ch>
Build-Depends: debhelper (>= 7.0.50~), sharutils, libncurses5-dev | libncurses-dev, libxaw7-dev, zlib1g-dev | libz-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite2-dev, libgs-dev, libpixman-1-dev (>= 0.32.4), libzzip-dev (>= 0.12), libharfbuzz-dev (>= 0.9.18-3), libicu-dev, recode, texinfo, automake (>= 1:1.13.1), autoconf (>= 2.69), libtool (>= 2.4.2), m4 (>= 1.4.16), libpotrace-dev (>= 1.11), libxi-dev, libpaper-dev, libmpfr-dev, libgmp-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.tug.org/texlive/
Vcs-Git: git://anonscm.debian.org/debian-tex/texlive-bin.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-tex/texlive-bin.git
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/series texlive-bin-2014.20140926.35254/debian/patches/series
--- texlive-bin-2014.20140926.35254/debian/patches/series 2014-10-02 14:26:56.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/series 2014-11-06 09:37:43.000000000 +0900
@@ -12,3 +12,9 @@
upupstream-fix-math-list-crash-svn5019
upupstream-bug907-svn5024
libpng-arm64-neon-fix
+upstream-svn35304-dvipdfmx-bug-spc-dvips-end-page
+upstream-svn35312-dvipdfmx-ghostscript-fix
+upstream-svn35457-enctex-chars
+upstream-svn35461-dvipdfmx-pk-support
+upstream-svn35516-dvipdfmx-fix-crash-missing-fontmap
+upstream-svn35518-mpost-fontmap-warnings
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35304-dvipdfmx-bug-spc-dvips-end-page texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35304-dvipdfmx-bug-spc-dvips-end-page
--- texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35304-dvipdfmx-bug-spc-dvips-end-page 1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35304-dvipdfmx-bug-spc-dvips-end-page 2014-11-06 09:37:43.000000000 +0900
@@ -0,0 +1,27 @@
+---
+ texk/dvipdfm-x/ChangeLog | 5 +++++
+ texk/dvipdfm-x/spc_dvips.c | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- texlive-bin.orig/texk/dvipdfm-x/spc_dvips.c
++++ texlive-bin/texk/dvipdfm-x/spc_dvips.c
+@@ -914,7 +914,7 @@
+ spc_dvips_at_end_page (void)
+ {
+ mps_eop_cleanup();
+- if (!temporary_defs) {
++ if (temporary_defs) {
+ dpx_delete_temp_file(temporary_defs, true);
+ temporary_defs = 0;
+ }
+--- texlive-bin.orig/texk/dvipdfm-x/ChangeLog
++++ texlive-bin/texk/dvipdfm-x/ChangeLog
+@@ -1,3 +1,8 @@
++2014-10-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
++
++ * spc_dvips.c: Fix a bug in spc_dvips_at_end_page (void), that is
++ change "if (!temporary_defs)" to "if (temporary_defs)".
++
+ 2014-09-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * {bmp,jp2,jpeg,png}image.[ch], xbb.c: More cleanup (whitespace
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35312-dvipdfmx-ghostscript-fix texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35312-dvipdfmx-ghostscript-fix
--- texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35312-dvipdfmx-ghostscript-fix 1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35312-dvipdfmx-ghostscript-fix 2014-11-06 09:37:43.000000000 +0900
@@ -0,0 +1,47 @@
+---
+ texk/dvipdfm-x/ChangeLog | 6 ++++++
+ texk/dvipdfm-x/spc_dvips.c | 14 ++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+--- texlive-bin.orig/texk/dvipdfm-x/spc_dvips.c
++++ texlive-bin/texk/dvipdfm-x/spc_dvips.c
+@@ -596,6 +596,13 @@
+ }
+ }
+ #endif
++/*
++ Ghostscript 9.15 needs showpage
++*/
++ fp = fopen(gs_in, "ab");
++ fprintf(fp, " showpage\n");
++ fclose(fp);
++
+ error = dpx_file_apply_filter(distiller_template, gs_in, gs_out,
+ (unsigned char) pdf_get_version());
+ if (error) {
+@@ -683,6 +690,13 @@
+ }
+ }
+ #endif
++/*
++ Ghostscript 9.15 needs showpage
++*/
++ fp = fopen(gs_in, "ab");
++ fprintf(fp, " showpage\n");
++ fclose(fp);
++
+ error = dpx_file_apply_filter(distiller_template, gs_in, gs_out,
+ (unsigned char) pdf_get_version());
+ if (error) {
+--- texlive-bin.orig/texk/dvipdfm-x/ChangeLog
++++ texlive-bin/texk/dvipdfm-x/ChangeLog
+@@ -1,3 +1,9 @@
++2014-10-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
++
++ * spc_dvips.c: Add " showpage\n" to a temporary file gs_in because
++ Ghostscript 9.15 gives an empty pdf without it
++ in dpx_file_apply_filter().
++
+ 2014-10-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * spc_dvips.c: Fix a bug in spc_dvips_at_end_page (void), that is
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35457-enctex-chars texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35457-enctex-chars
--- texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35457-enctex-chars 1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35457-enctex-chars 2014-11-06 09:37:43.000000000 +0900
@@ -0,0 +1,80 @@
+[24.355]: deactivate enctex when reading \^^ab control sequences.
+(Following full description from Petr is slightly edited for English).
+
+Date: Wed, 30 Jul 2014 10:08:40 +0200
+From: Petr Olsak
+To: Karl Berry
+
+Consider this input file:
+
+\catcode`\{=1 \catcode`\}=2 \catcode`^=7
+
+\mubyte A XY\endmubyte
+\mubytein=1 \mubyteout=0 \mubytelog=0
+\def\a{\^^58YZ \XYZ XYZ}
+\show\a
+
+\end
+
+Then run pdftex -ini -enc ./file.tex
+
+The buggy behavior is:
+ \a=macro:
+->\AZ \AZ AZ.
+
+because encTeX's conversion XY -> A have to be done *before* tokenisation
+as the manual says. I.e., ^^58 -> X is done *after* encTeX's level
+and the good result would be:
+ \a=macro:
+->\XYZ \AZ AZ.
+The consequence of this curious bug is the question at
+http://tex.stackexchange.com/questions/191002/csplain-and-url-package-not-workin
+g-with-pdftex
+
+Removing this bug isn't trivial because of the bad concept of TeX source
+in \S 355 where is "goto start_cs" which returns the reading of the control
+sequence to the start and reads again. But the buffer includes the result of
+^^ab conversion which is again transformed by encTeX.
+
+I decided to do only a simple correction which supposes that there are
+"normal" control sequences and two other types: with encTeX's output in
+their names or with ^^ab in their names. Mixing these types is still not
+allowed because the implementation needs new data structures and much
+code. IMHO: 1) probability of such mix is almost zero,
+2) I don't want to add much code only because of a bad concept
+with "goto" in the TeX original code.
+
+The change is "robust" for the case where encTeX isn't in use, because
+there is the conditional "if mubyte_in>0" which is false when encTeX
+isn't activated.
+---
+ texk/web2c/ChangeLog | 4 ++++
+ texk/web2c/enctex.ch | 7 +++++++
+ 2 files changed, 11 insertions(+)
+
+--- texlive-bin.orig/texk/web2c/ChangeLog
++++ texlive-bin/texk/web2c/ChangeLog
+@@ -1,3 +1,7 @@
++2014-10-28 Karl Berry <karl@tug.org>
++
++ * enctex.ch: patch for \^^ab control sequences from Petr Olsak.
++
+ 2014-09-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * w2c/config.h: Bug fix: integer64 must always be a 64bit type,
+--- texlive-bin.orig/texk/web2c/enctex.ch
++++ texlive-bin/texk/web2c/enctex.ch
+@@ -315,6 +315,13 @@
+ end;
+ @z
+
++@x [24.355] - encTeX: deactivated when reading such \^^ab control sequences
++ limit:=limit-d; first:=first-d;
++@y
++ limit:=limit-d; first:=first-d;
++ if mubyte_in>0 then mubyte_keep := k-loc;
++@z
++
+ @x [24.356] - encTeX: access the buffer via read_buffer
+ begin repeat cur_chr:=buffer[k]; cat:=cat_code(cur_chr); incr(k);
+ until (cat<>letter)or(k>limit);
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35461-dvipdfmx-pk-support texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35461-dvipdfmx-pk-support
--- texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35461-dvipdfmx-pk-support 1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35461-dvipdfmx-pk-support 2014-11-06 09:37:43.000000000 +0900
@@ -0,0 +1,29 @@
+---
+ texk/dvipdfm-x/ChangeLog | 5 +++++
+ texk/dvipdfm-x/pkfont.c | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- texlive-bin.orig/texk/dvipdfm-x/ChangeLog
++++ texlive-bin/texk/dvipdfm-x/ChangeLog
+@@ -1,3 +1,8 @@
++2014-10-29 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
++
++ * pkfont.c: Cast unsigned integers when they appear in subtractions
++ to obtain results in double.
++
+ 2014-10-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * spc_dvips.c: Add " showpage\n" to a temporary file gs_in because
+--- texlive-bin.orig/texk/dvipdfm-x/pkfont.c
++++ texlive-bin/texk/dvipdfm-x/pkfont.c
+@@ -613,8 +613,8 @@
+
+ /* Update font BBox info */
+ bbox.llx = MIN(bbox.llx, -pkh.bm_hoff);
+- bbox.lly = MIN(bbox.lly, pkh.bm_voff - pkh.bm_ht);
+- bbox.urx = MAX(bbox.urx, pkh.bm_wd - pkh.bm_hoff);
++ bbox.lly = MIN(bbox.lly, (double)pkh.bm_voff - (double)pkh.bm_ht);
++ bbox.urx = MAX(bbox.urx, (double)pkh.bm_wd - (double)pkh.bm_hoff);
+ bbox.ury = MAX(bbox.ury, pkh.bm_voff);
+
+ pkt_ptr = NEW(pkh.pkt_len, unsigned char);
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35516-dvipdfmx-fix-crash-missing-fontmap texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35516-dvipdfmx-fix-crash-missing-fontmap
--- texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35516-dvipdfmx-fix-crash-missing-fontmap 1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35516-dvipdfmx-fix-crash-missing-fontmap 2014-11-06 09:37:43.000000000 +0900
@@ -0,0 +1,31 @@
+---
+ texk/dvipdfm-x/ChangeLog | 5 +++++
+ texk/dvipdfm-x/dpxfile.c | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+--- texlive-bin.orig/texk/dvipdfm-x/ChangeLog
++++ texlive-bin/texk/dvipdfm-x/ChangeLog
+@@ -1,3 +1,8 @@
++2014-11-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
++
++ * dpxfile.c: Check if fqpn == NULL in dpx_open_file(), because
++ MESG (fqpn) crashes if fqpn == NULL.
++
+ 2014-10-29 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * pkfont.c: Cast unsigned integers when they appear in subtractions
+--- texlive-bin.orig/texk/dvipdfm-x/dpxfile.c
++++ texlive-bin/texk/dvipdfm-x/dpxfile.c
+@@ -413,8 +413,10 @@
+ switch (type) {
+ case DPX_RES_TYPE_FONTMAP:
+ fqpn = dpx_find_fontmap_file(filename);
+- if (verbose)
+- MESG(fqpn);
++ if (verbose) {
++ if (fqpn != NULL)
++ MESG(fqpn);
++ }
+ break;
+ case DPX_RES_TYPE_T1FONT:
+ fqpn = dpx_find_type1_file(filename);
diff -Nru texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35518-mpost-fontmap-warnings texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35518-mpost-fontmap-warnings
--- texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35518-mpost-fontmap-warnings 1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2014.20140926.35254/debian/patches/upstream-svn35518-mpost-fontmap-warnings 2014-11-06 09:37:43.000000000 +0900
@@ -0,0 +1,46 @@
+---
+ texk/web2c/mplibdir/ChangeLog | 5 +++++
+ texk/web2c/mplibdir/psout.w | 10 +++++++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+--- texlive-bin.orig/texk/web2c/mplibdir/ChangeLog
++++ texlive-bin/texk/web2c/mplibdir/ChangeLog
+@@ -1,3 +1,8 @@
++2014-11-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
++
++ * psout.w: Sync with the trunk. Luigi fixes to avoid enormouos lines
++ of warnings.
++
+ 2014-09-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mp.w: Fixed an error message typo.
+--- texlive-bin.orig/texk/web2c/mplibdir/psout.w
++++ texlive-bin/texk/web2c/mplibdir/psout.w
+@@ -1,4 +1,4 @@
+-% $Id: psout.w 2037 2014-09-02 14:59:07Z luigi $
++% $Id: psout.w 2045 2014-11-05 11:33:13Z luigi $
+ % This file is part of MetaPost;
+ % the MetaPost program is in the public domain.
+ % See the <Show version...> code in mpost.w for more info.
+@@ -1585,6 +1585,7 @@
+ void mp_read_psname_table (MP mp) {
+ font_number k;
+ char *s;
++ static boolean isread = false;
+ if (mp->ps->mitem == NULL) {
+ mp->ps->mitem = mp_xmalloc (mp,1,sizeof(mapitem));
+ mp->ps->mitem->mode = FM_DUPIGNORE;
+@@ -1592,8 +1593,11 @@
+ mp->ps->mitem->map_line = NULL;
+ }
+ s = mp_xstrdup (mp,ps_tab_name);
+- mp->ps->mitem->map_line = s;
+- fm_read_info (mp);
++ mp->ps->mitem->map_line = s;
++ if (!isread) {
++ isread = true;
++ fm_read_info (mp);
++ }
+ for (k=mp->last_ps_fnum+1;k<=mp->last_fnum;k++) {
+ if (mp_has_fm_entry(mp, k, NULL)) {
+ mp_xfree(mp->font_ps_name[k]);
Reply to: