From 44e2b8c1d49443e444e1b2c36c1d7d6bd6485f862f10f1faed533926fc4a7ee7 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 14 Jun 2016 14:29:44 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=224
---
 biber-perl-5.18.2.dif | 52 +++++++++++++++++++++++++++++++++++++++++--
 source-overflow.dif   | 21 +++++++++++++++++
 texlive.changes       |  6 +++++
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/biber-perl-5.18.2.dif b/biber-perl-5.18.2.dif
index 716cb4e..c72e6a7 100644
--- a/biber-perl-5.18.2.dif
+++ b/biber-perl-5.18.2.dif
@@ -3,12 +3,13 @@ With perl-5.18.2 macros like
    {\v S}
    \s S
 
-do not work.
+do not work. Also fastsort causes trouble.
 
 ---
+ t/sort-order.t    |   24 +-----------------------
  t/tdata/names.bib |    4 ++--
  t/utils.t         |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 3 files changed, 4 insertions(+), 26 deletions(-)
 
 --- t/utils.t
 +++ t/utils.t	2016-02-03 11:03:21.266959058 +0000
@@ -37,3 +38,50 @@ do not work.
  }
  
  @BOOK{L23,
+--- t/sort-order.t
++++ t/sort-order.t	2016-06-14 14:21:07.085073233 +0000
+@@ -4,7 +4,7 @@ use warnings;
+ use utf8;
+ no warnings 'utf8';
+ 
+-use Test::More tests => 15;
++use Test::More tests => 14;
+ 
+ use Biber;
+ use Biber::Output::bbl;
+@@ -32,7 +32,6 @@ $biber->set_output_obj(Biber::Output::bb
+ # Options - we could set these in the control file but it's nice to see what we're
+ # relying on here for tests
+ Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
+-Biber::Config->setoption('fastsort', 1);
+ Biber::Config->setblxoption('labelyear', undef);
+ Biber::Config->setblxoption('labelalpha', 0);
+ 
+@@ -482,27 +481,6 @@ $section = $biber->sections->get_section
+ is_deeply([$main->get_keys], ['L9','L6','L7','L8','L5','L4','L3','L2','L1B','L1A','L1'], 'nty with descending n');
+ 
+ 
+-# testing case sensitive with fastsort
+-# In alphabetic, all uppercase comes before lower so the
+-# "sortcase => 1" on location means that "edinburgh" sorts at the end after "London"
+-# Take this out of the location sorting spec and it fails as it should
+-$S = { spec => [
+-                                                    [
+-                                                     {sortcase => 1},
+-                                                     {'location'     => {}}
+-                                                    ]
+-                                                   ]};
+-
+-$main->set_sortscheme($S);
+-
+-$biber->set_output_obj(Biber::Output::bbl->new());
+-# Have to set locale to something which understands lexical/case differences for this test
+-# otherwise testing on Windows doesn't work ...
+-Biber::Config->setoption('sortlocale', 'C.UTF-8');
+-$biber->prepare;
+-$section = $biber->sections->get_section(0);
+-is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
+-
+ # Test nosort option
+ $S = { spec => [
+                                                     [
diff --git a/source-overflow.dif b/source-overflow.dif
index 50d9c32..837fd9c 100644
--- a/source-overflow.dif
+++ b/source-overflow.dif
@@ -29,3 +29,24 @@
 +test -e $srcdir/test.old || > $srcdir/test.old
 +diff $srcdir/test.old test.out || true
  
+--- texk/upmendex/fwrite.c
++++ texk/upmendex/fwrite.c	2016-06-14 12:59:55.681041860 +0000
+@@ -68,8 +68,8 @@ static inline int SAPPENDF(char *buf, co
+ static void fprint_uchar(FILE *fp, const UChar *a, const int mode, const int len)
+ {
+ 	int k;
+-	char str[15], *ret;
+-	UChar istr[5];
++	char str[16], *ret;
++	UChar istr[INITIALLENGTH+1];
+ 	int olen, wclen;
+ 	UErrorCode perr;
+ 
+@@ -92,6 +92,7 @@ static void fprint_uchar(FILE *fp, const
+ 		perr = U_ZERO_ERROR;
+ 		u_strToTitle(istr,5,istr,wclen,NULL,"",&perr);
+ 	}
++	memset(&str[0], 0, sizeof(str));
+ 	perr = U_ZERO_ERROR;
+ 	ret = u_strToUTF8(str, 15, &olen, istr, wclen, &perr);
+ 	fprintf(fp,"%s",str);
diff --git a/texlive.changes b/texlive.changes
index d7c1666..866d66c 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 14 13:03:21 UTC 2016 - werner@suse.de
+
+- Avoid stack smashing deteted on i586 in upmendex/fwrite.c
+- With perl 5.18 fastsort does not work
+
 -------------------------------------------------------------------
 Tue Jun  7 11:35:15 UTC 2016 - werner@suse.de