[Reproducible-commits] [texlive-bin] 41/400: include upstream fix

[Maria Valentina Marin Rodrigues]

This is an automated email from the git hooks/post-receive script.

akira-guest pushed a commit to branch master
in repository texlive-bin.

commit 212a5129487e989559432d103cd70406950ec1bf
Author: Norbert Preining <preining at debian.org>
Date:   Thu Mar 8 23:38:01 2012 +0000

    include upstream fix
---
 debian/changelog                         |  8 ++++
 debian/patches/series                    |  1 +
 debian/patches/upstream-r25581-eptex-fix | 65 ++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0cd4833..86ab236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+texlive-bin (2011.20120307-2) experimental; urgency=low
+
+  * UNRELEASED
+  * debian/patches/upstream-r25581-eptex-fix
+    include upstream fix for eptex and euptex segfault
+
+ -- Norbert Preining <preining at debian.org>  Fri, 09 Mar 2012 08:37:10 +0900
+
 texlive-bin (2011.20120307-1) experimental; urgency=low
 
   * new release, based on preliminary TL2012 status (TL2012/dev!)
diff --git a/debian/patches/series b/debian/patches/series
index e336743..65daf68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@ xdvik-22.84.16-open-mode.patch
 #2011# not necessary anymore, different fix upstream # unstymie-xetex-with-zlib-1.2.6.patch
 debian-no-linked-scripts
 build-wovp2ovf
+upstream-r25581-eptex-fix
diff --git a/debian/patches/upstream-r25581-eptex-fix b/debian/patches/upstream-r25581-eptex-fix
new file mode 100644
index 0000000..8f524a1
--- /dev/null
+++ b/debian/patches/upstream-r25581-eptex-fix
@@ -0,0 +1,65 @@
+Fix a bug in eptex and euptex
+included upstream in revision 25581
+see http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=782
+---
+ texk/web2c/ptexdir/ChangeLog    |    4 ++++
+ texk/web2c/ptexdir/ptex-base.ch |    2 +-
+ texk/web2c/uptexdir/ChangeLog   |    4 ++++
+ texk/web2c/uptexdir/uptex-m.ch  |    4 ++--
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+Index: texlive-bin-2011.20120307/texk/web2c/ptexdir/ChangeLog
+===================================================================
+--- texlive-bin-2011.20120307.orig/texk/web2c/ptexdir/ChangeLog	2012-03-05 17:50:28.000000000 +0900
++++ texlive-bin-2011.20120307/texk/web2c/ptexdir/ChangeLog	2012-03-09 08:31:25.965656225 +0900
+@@ -1,3 +1,7 @@
++2012-03-08  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
++
++	* ptex-base.ch: fix a long-remained bug in show_context.
++
+ 2012-03-04  Peter Breitenlohner  <peb at mppmu.mpg.de>
+ 
+ 	Avoid 'differ in signedness' warnings.
+Index: texlive-bin-2011.20120307/texk/web2c/ptexdir/ptex-base.ch
+===================================================================
+--- texlive-bin-2011.20120307.orig/texk/web2c/ptexdir/ptex-base.ch	2012-03-05 17:50:28.000000000 +0900
++++ texlive-bin-2011.20120307/texk/web2c/ptexdir/ptex-base.ch	2012-03-09 08:31:25.965656225 +0900
+@@ -1549,7 +1549,7 @@
+   begin  if (token_type=backed_up)and(loc<>null) then
+     begin  if (link(start)=null)and(check_kanji(info(start))) then {|wchar_token|}
+       begin cur_input:=input_stack[base_ptr-1];
+-      s:=get_avail; info(s):=Lo(buffer[loc]);
++      s:=get_avail; info(s):=Lo(info(loc));
+       cur_input:=input_stack[base_ptr];
+       link(start):=s;
+       show_token_list(start,loc,100000);
+Index: texlive-bin-2011.20120307/texk/web2c/uptexdir/ChangeLog
+===================================================================
+--- texlive-bin-2011.20120307.orig/texk/web2c/uptexdir/ChangeLog	2012-03-05 17:50:28.000000000 +0900
++++ texlive-bin-2011.20120307/texk/web2c/uptexdir/ChangeLog	2012-03-09 08:31:25.969656212 +0900
+@@ -1,3 +1,7 @@
++2012-03-08  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
++
++	* uptex-m.ch: fix a long-remained bug in show_context.
++
+ 2012-03-04  Peter Breitenlohner  <peb at mppmu.mpg.de>
+ 
+ 	Avoid 'differ in signedness' warnings.
+Index: texlive-bin-2011.20120307/texk/web2c/uptexdir/uptex-m.ch
+===================================================================
+--- texlive-bin-2011.20120307.orig/texk/web2c/uptexdir/uptex-m.ch	2012-03-05 17:50:28.000000000 +0900
++++ texlive-bin-2011.20120307/texk/web2c/uptexdir/uptex-m.ch	2012-03-09 08:31:25.965656225 +0900
+@@ -352,11 +352,11 @@
+ @x
+     begin  if (link(start)=null)and(check_kanji(info(start))) then {|wchar_token|}
+       begin cur_input:=input_stack[base_ptr-1];
+-      s:=get_avail; info(s):=Lo(buffer[loc]);
++      s:=get_avail; info(s):=Lo(info(loc));
+ @y
+     begin  if (link(start)=null)and(check_kanji(info(start))) then {|wchar_token|}
+       begin cur_input:=input_stack[base_ptr-1];
+-      s:=get_avail; info(s):=(buffer[loc] mod max_char_val);
++      s:=get_avail; info(s):=(info(loc) mod max_char_val);
+ @z
+ 
+ @x

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git