Accepting request 412182 from Publishing:TeXLive

- Update biblatex-biber to version 2.5 as otherwise the biber indexing engine is not usable due version mismatch (boo#989486) - Avoid missing dependencies due upstream package splits - Use the latest revision of upmendex/fwrite.c (r.41498) to get stack smashing fixed as well as a working upmendex - Avoid stack smashing deteted on i586 in upmendex/fwrite.c - Add patch biber-perl-pre5.22.0.dif as with perl 5.18 and below fastsort does not work - Update to TeXLive 2016 * Remove the now included patches biber-perl-5.22.dif biber-perl-unicode-normalize.dif biber-skip-bibtex-forms.dif source-xdvik-events.dif * Adopted the following patches biber-certs.dif source-configure.dif source-dvipng.dif source-dviutils.dif source-missed-scripts.dif source-warns.dif source.dif OBS-URL: https://build.opensuse.org/request/show/412182 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=29
2016-07-26 10:57:39 +00:00 · 2016-07-26 10:57:39 +00:00 · 751eccd0c1
commit 751eccd0c1
parent ae32a7af10 c2382fa13b
20 changed files with 751 additions and 1151 deletions
--- a/biber-certs.dif
+++ b/biber-certs.dif
@ -6,7 +6,7 @@
 4 files changed, 2 insertions(+), 3 deletions(-)
 --- Build.PL
-+++ Build.PL	2016-01-29 09:02:36.740221776 +0000
+++ Build.PL	2016-06-07 14:11:47.318106451 +0000
@@ -53,7 +53,6 @@ my $builder = $class->new(
         'List::AllUtils' => 0,
         'List::MoreUtils' => 0,
@ -14,30 +14,30 @@
 -        'Mozilla::CA' =>  '20141217',
         'Regexp::Common' => 0,
         'Log::Log4perl' => 0,
-         'Unicode::Collate' => '1.12',
+         'Unicode::Collate' => '1.14',
 --- META.json
-+++ META.json	2016-01-29 09:03:02.755699411 +0000
+++ META.json	2016-06-07 14:12:02.509820834 +0000
-@@ -45,7 +45,6 @@
+@@ -48,7 +48,6 @@
             "List::MoreUtils" : "0",
             "List::MoreUtils::XS" : "0",
             "Log::Log4perl" : "0",
 -            "Mozilla::CA" : "20141217",
             "Regexp::Common" : "0",
-             "Text::BibTeX" : "0.70",
+             "Text::BibTeX" : "0.72",
             "Text::Roman" : "0",
 --- META.yml
-+++ META.yml	2016-01-29 09:03:12.131511153 +0000
+++ META.yml	2016-06-07 14:12:11.285655839 +0000
-@@ -115,7 +115,6 @@ requires:
+@@ -93,7 +93,6 @@ requires:
-   List::MoreUtils: 0
+   List::MoreUtils: '0'
-   List::MoreUtils::XS: 0
+   List::MoreUtils::XS: '0'
-   Log::Log4perl: 0
+   Log::Log4perl: '0'
-  Mozilla::CA: 20141217
+-  Mozilla::CA: '20141217'
-   Regexp::Common: 0
+   Regexp::Common: '0'
-   Text::BibTeX: 0.70
+   Text::BibTeX: '0.72'
-   Text::Roman: 0
+   Text::Roman: '0'
 --- bin/biber
-+++ bin/biber	2016-01-29 09:09:32.127880732 +0000
+++ bin/biber	2016-06-07 14:00:30.294825957 +0000
-@@ -93,6 +93,8 @@ GetOptions(
+@@ -104,6 +104,8 @@ GetOptions(
           ) or pod2usage(-verbose => 0,
                          -exitval => EXIT_ERROR);
--- a/biber-perl-5.22.dif
+++ b/biber-perl-5.22.dif
@ -1,636 +0,0 @@
 ---
 lib/Biber/Input/file/bibtex.pm |    6 +++---
 lib/Biber/LaTeX/Recode.pm      |    6 +++---
 lib/Biber/Utils.pm             |    2 +-
 t/basic-misc.t                 |    2 +-
 t/biblatexml.t                 |    2 +-
 t/bibtex-aliases.t             |    2 +-
 t/bibtex-output.t              |    2 +-
 t/crossrefs.t                  |    2 +-
 t/dm-constraints.t             |    2 +-
 t/dm-dateformats.t             |    2 +-
 t/encoding.t                   |    2 +-
 t/endnotexml.t                 |    2 +-
 t/extratitle.t                 |    2 +-
 t/extratitleyear.t             |    2 +-
 t/extrayear.t                  |    2 +-
 t/labelalpha.t                 |    2 +-
 t/labelname.t                  |    2 +-
 t/names.t                      |    2 +-
 t/options.t                    |    3 ++-
 t/related-entries.t            |    2 +-
 t/remote-files.t               |    2 +-
 t/ris.t                        |    2 +-
 t/sections-complex.t           |    2 +-
 t/sections.t                   |    2 +-
 t/set-dynamic.t                |    2 +-
 t/set-legacy.t                 |    2 +-
 t/set-static.t                 |    2 +-
 t/skips.t                      |    2 +-
 t/sort-case.t                  |    2 +-
 t/sort-complex.t               |    2 +-
 t/sort-order.t                 |    4 ++--
 t/sort-uc.t                    |    2 +-
 t/sorting.t                    |    2 +-
 t/tool-bltxml.t                |    2 +-
 t/tool.t                       |    2 +-
 t/uniqueness.t                 |   32 ++++++++++++++++----------------
 t/xdata.t                      |    2 +-
 t/zoterordfxml.t               |    2 +-
 38 files changed, 59 insertions(+), 58 deletions(-)
 --- lib/Biber/Input/file/bibtex.pm
 +++ lib/Biber/Input/file/bibtex.pm
@@ -759,7 +757,7 @@ sub _name {
     # Check for malformed names in names which aren't completely escaped
     # Too many commas
 -    unless ($name =~ m/\A{\X+}\z/xms) { # Ignore these tests for escaped names
 +    unless ($name =~ m/\A\{\X+\}\z/xms) { # Ignore these tests for escaped names
       my @commas = $name =~ m/,/g;
       if ($#commas > 1) {
         biber_warn("Name \"$name\" has too many commas: skipping name", $bibentry);
@@ -1262,8 +1260,8 @@ my %months = (
 sub _hack_month {
   my $in_month = shift;
 -  if ($in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
 -    return $months{lc(Unicode::GCString->new($1)->substr(0,3)->as_string)};
 +  if (my ($m) = $in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
 +    return $months{lc(Unicode::GCString->new($m)->substr(0,3)->as_string)};
   }
   else {
     return $in_month;
 --- lib/Biber/LaTeX/Recode.pm
 +++ lib/Biber/LaTeX/Recode.pm
@@ -230,13 +230,13 @@ sub latex_decode {
         $text =~ s/\\not\\($re)/$map->{$1}/ge;
       }
       elsif ($type eq 'superscripts') {
 -        $text =~ s/\\textsuperscript{($re)}/$map->{$1}/ge;
 +        $text =~ s/\\textsuperscript\{($re)\}/$map->{$1}/ge;
       }
       elsif ($type eq 'cmdsuperscripts') {
 -        $text =~ s/\\textsuperscript{\\($re)}/$map->{$1}/ge;
 +        $text =~ s/\\textsuperscript\{\\($re)\}/$map->{$1}/ge;
       }
       elsif ($type eq 'dings') {
 -        $text =~ s/\\ding{([2-9AF][0-9A-F])}/$map->{$1}/ge;
 +        $text =~ s/\\ding\{([2-9AF][0-9A-F])\}/$map->{$1}/ge;
       }
       elsif ($type eq 'letters') {
         $text =~ s/\\($re)(?:\{\}|\s+|\b)/$map->{$1}/ge;
 --- lib/Biber/Utils.pm
 +++ lib/Biber/Utils.pm
@@ -436,7 +436,7 @@ sub reduce_array {
 sub remove_outer {
   my $str = shift;
 -  $str =~ s/^{(\X+)}$/$1/;
 +  $str =~ s/^\{(\X+)\}$/$1/;
   return $str;
 }
 --- t/basic-misc.t
 +++ t/basic-misc.t
@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 Biber::Config->setblxoption('uniquelist', 1);
 Biber::Config->setblxoption('maxcitenames', 3);
 --- t/biblatexml.t
 +++ t/biblatexml.t
@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Now generate the information
 $biber->prepare;
 --- t/bibtex-aliases.t
 +++ t/bibtex-aliases.t
@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('validate_datamodel', 1);
 # THERE IS A MAPPING SECTION IN THE .bcf BEING USED TO TEST USER MAPS TOO!
 --- t/bibtex-output.t
 +++ t/bibtex-output.t
@@ -36,7 +36,7 @@ Log::Log4perl->init(\$l4pconf);
 # Biber options
 Biber::Config->setoption('output_resolve', 1);
 Biber::Config->setoption('output_format', 'bibtex');
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 $biber->parse_ctrlfile('bibtex-output.bcf');
 $biber->set_output_obj(Biber::Output::bibtex->new());
 --- t/crossrefs.t
 +++ t/crossrefs.t
@@ -40,8 +40,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('nodieonerror', 1); # because there is a failing cyclic crossref check
 # Now generate the information
 --- t/dm-constraints.t
 +++ t/dm-constraints.t
@@ -50,9 +50,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 Biber::Config->setoption('validate_datamodel', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Now generate the information
 $biber->prepare;
 --- t/dm-dateformats.t
 +++ t/dm-dateformats.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('validate_datamodel', 1);
 # Biblatex options
 --- t/encoding.t
 +++ t/encoding.t
@@ -30,8 +30,8 @@ my $l4pconf = qq|
 |;
 Log::Log4perl->init(\$l4pconf);
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 my $encode1 = q|    \entry{testŠ}{book}{}
       \name{author}{1}{}{%
 --- t/endnotexml.t
 +++ t/endnotexml.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
 --- t/extratitle.t
 +++ t/extratitle.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 --- t/extratitleyear.t
 +++ t/extratitleyear.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Now generate the information
 $biber->prepare;
 --- t/extrayear.t
 +++ t/extrayear.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 --- t/labelalpha.t
 +++ t/labelalpha.t
@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Biblatex options
 Biber::Config->setblxoption('maxalphanames', 1);
 --- t/labelname.t
 +++ t/labelname.t
@@ -27,8 +27,8 @@ my $l4pconf = qq|
 |;
 Log::Log4perl->init(\$l4pconf);
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 $biber->parse_ctrlfile("general1.bcf");
 $biber->set_output_obj(Biber::Output::bbl->new());
 --- t/names.t
 +++ t/names.t
@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('namesep', 'und'); # Testing custom name splitting string
 Biber::Config->setoption('others_string', 'andere'); # Testing custom implied "et al"
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setblxoption('mincitenames', 3);
 # Now generate the information
 --- t/options.t
 +++ t/options.t
@@ -34,8 +34,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +
 # Testing customg xsv format sep
 Biber::Config->setoption('xsvsep', '\s*\|\s*');
 --- t/related-entries.t
 +++ t/related-entries.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Now generate the information
 $biber->prepare;
 --- t/remote-files.t
 +++ t/remote-files.t
@@ -41,8 +41,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('quiet', 1);
 Biber::Config->setoption('nodieonerror', 1); # because the remote bibs might be messy
 --- t/ris.t
 +++ t/ris.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
 --- t/sections-complex.t
 +++ t/sections-complex.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 --- t/sections.t
 +++ t/sections.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 Biber::Config->setoption('output_safechars', 1);
 --- t/set-dynamic.t
 +++ t/set-dynamic.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Now generate the information
 $biber->prepare;
 --- t/set-legacy.t
 +++ t/set-legacy.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 # Now generate the information
 --- t/set-static.t
 +++ t/set-static.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 # Now generate the information
 --- t/skips.t
 +++ t/skips.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 # Now generate the information
 --- t/sort-case.t
 +++ t/sort-case.t
@@ -33,7 +33,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 Biber::Config->setoption('sortcase', 1);
 Biber::Config->setoption('sortupper', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 $S =  [
                                                 [
 --- t/sort-complex.t
 +++ t/sort-complex.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 # Biber options
 +Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 # Want to ignore SHORTHAND* fields for the first few tests
 Biber::Config->setoption('sourcemap', [
   {
 --- t/sort-order.t
 +++ t/sort-order.t
@@ -31,8 +31,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # 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', 'C');
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setblxoption('labelyear', undef);
 Biber::Config->setblxoption('labelalpha', 0);
 --- t/sort-uc.t
 +++ t/sort-uc.t
@@ -31,7 +31,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # 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', 'sv_SE');
 +Biber::Config->setoption('sortlocale', 'sv_SE.UTF-8');
 # U::C Swedish tailoring
 $biber->prepare;
 --- t/sorting.t
 +++ t/sorting.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 my $yearoff1    = 'mm,,Knuth!Donald E,Computers Typesetting,1984,0000';
 my $yearoff2    = 'mm,,Knuth!Donald E,Computers Typesetting,198,0000';
 --- t/tool-bltxml.t
 +++ t/tool-bltxml.t
@@ -44,7 +44,7 @@ $out->set_output_target_file(\$outvar);
 Biber::Config->setoption('tool', 1);
 Biber::Config->setoption('output_resolve', 1);
 Biber::Config->setoption('output_format', 'biblatexml');
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # THERE IS A CONFIG FILE BEING READ!
 --- t/tool.t
 +++ t/tool.t
@@ -38,7 +38,7 @@ $biber->set_output_obj(Biber::Output::bibtex->new());
 Biber::Config->setoption('tool', 1);
 Biber::Config->setoption('output_resolve', 1);
 Biber::Config->setoption('output_format', 'bibtex');
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # THERE IS A CONFIG FILE BEING READ!
 --- t/uniqueness.t
 +++ t/uniqueness.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
@@ -84,7 +84,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
@@ -111,7 +111,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 5);
@@ -138,7 +138,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 2);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -157,7 +157,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 1);
 Biber::Config->setblxoption('uniquelist', 1);
@@ -218,7 +218,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -247,7 +247,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 3);
 Biber::Config->setblxoption('mincitenames', 3);
@@ -317,7 +317,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 3);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -357,7 +357,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 2);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -393,7 +393,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -422,7 +422,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 3);
 Biber::Config->setblxoption('mincitenames', 2);
@@ -451,7 +451,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 1);
 Biber::Config->setblxoption('uniquelist', 0);
@@ -480,7 +480,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 2);
 Biber::Config->setblxoption('uniquelist', 1);
@@ -509,7 +509,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 0);
 Biber::Config->setblxoption('uniquelist', 0);
@@ -538,7 +538,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 3);
 Biber::Config->setblxoption('uniquelist', 1);
@@ -565,7 +565,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 4);
 Biber::Config->setblxoption('uniquelist', 1);
 --- t/xdata.t
 +++ t/xdata.t
@@ -44,7 +44,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('nodieonerror', 1); # because there is a cyclic xdata check
 # Now generate the information
 --- t/zoterordfxml.t
 +++ t/zoterordfxml.t
@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
 -Biber::Config->setoption('sortlocale', 'C');
 +Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Now generate the information
 $biber->prepare;
--- a/biber-perl-pre5.22.0.dif
+++ b/biber-perl-pre5.22.0.dif
@ -0,0 +1,53 @@
 Also fastsort causes trouble.
 ---
 t/sort-order.t |   24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
 --- 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 => [
                                                     [
--- a/biber-perl-unicode-normalize.dif
+++ b/biber-perl-unicode-normalize.dif
@ -1,15 +0,0 @@
 ---
 Build.PL  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 --- Build.PL
 +++ Build.PL	2016-01-29 09:48:51.588482256 +0000
@@ -56,7 +56,7 @@ my $builder = $class->new(
         'Regexp::Common' => 0,
         'Log::Log4perl' => 0,
         'Unicode::Collate' => '1.12',
 -        'Unicode::Normalize' => '<= 1.17',# 1.18 removes XS and is too slow
 +        'Unicode::Normalize' => '1.23',
         'Unicode::GCString' => 0,
         'Encode::EUCJPASCII' => 0,
         'Encode::JIS2K' => 0,
--- a/biber-skip-bibtex-forms.dif
+++ b/biber-skip-bibtex-forms.dif
@ -1,17 +0,0 @@
 Compare https://github.com/plk/biber/commit/a92bba540afb3b20826b405f09032dd908915391
 ---
 t/bcfvalidation.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 --- t/bcfvalidation.t
 +++ t/bcfvalidation.t	2016-01-29 10:30:28.006347949 +0000
@@ -4,7 +4,7 @@ use warnings;
 use utf8;
 no warnings 'utf8';
 -use Test::More tests => 44;
 +use Test::More tests => 43;
 use XML::LibXML;
 use Biber;
 chdir('t');
--- a/biblatex-biber-2.1.tar.xz
+++ b/biblatex-biber-2.1.tar.xz
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:bdfb11a432063bcb25fc7bf37a6701c1ae6e5850be387aafc35aaf6a4cd01223
 size 974108
--- a/biblatex-biber-2.5.tar.xz
+++ b/biblatex-biber-2.5.tar.xz
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:0e747ec163e2cee833bc7e93afb819249dbb8fedcb07bcfc19b784be7165d8ad
 size 269976
--- a/biblatex-encoding.dif
+++ b/biblatex-encoding.dif
@ -16,7 +16,7 @@
 use Log::Log4perl qw( :no_extra_logdie_message );
 --- lib/Biber/Output/bbl.pm
 +++ lib/Biber/Output/bbl.pm	2016-01-28 14:19:09.785831193 +0000
-@@ -11,6 +11,7 @@ use Biber::Utils;
+@@ -12,6 +12,7 @@ use Biber::Utils;
 use Encode;
 use List::AllUtils qw( :all );
 use IO::File;
--- a/source-configure.dif
+++ b/source-configure.dif
@ -3,14 +3,14 @@
 configure.ac                |    3 ---
 libs/configure              |    6 ------
 texk/configure              |    6 ------
- texk/dvipdfm-x/configure    |    2 +-
+ texk/dvipdfm-x/configure    |    8 ++++----
 texk/dvipdfm-x/configure.ac |    2 +-
 texk/dvisvgm/ac/libgs.ac    |    3 ---
 utils/configure             |    6 ------
- 8 files changed, 2 insertions(+), 35 deletions(-)
+ 8 files changed, 5 insertions(+), 38 deletions(-)
 --- configure.ac
-+++ configure.ac	2016-01-28 11:52:53.618390612 +0000
+++ configure.ac	2016-06-07 12:51:38.568729621 +0000
@@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
 if test "x$syslib_status" = xno; then
   AC_MSG_ERROR([some requested system libraries failed])
@ -22,8 +22,8 @@
 AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
 --- configure
-+++ configure	2016-01-28 11:52:53.622390531 +0000
+++ configure	2016-06-07 12:54:03.241986672 +0000
-@@ -5155,12 +5155,6 @@ if test "${with_libgs_libdir+set}" = set
+@@ -5273,12 +5273,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
@ -33,10 +33,10 @@
 -  as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
 -fi
 -
- ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
- ## configure options and TL libraries required for gsftopk
+ ## configure options and TL libraries required for gregorio
- # Check whether --enable-gsftopk was given.
+ # Check whether --enable-gregorio was given.
-@@ -22006,9 +22000,6 @@ fi
+@@ -22181,9 +22175,6 @@ fi
 if test "x$syslib_status" = xno; then
   as_fn_error $? "some requested system libraries failed" "$LINENO" 5
 fi
@ -47,8 +47,8 @@
 LIBS=$kpse_save_LIBS
 --- libs/configure
-+++ libs/configure	2016-01-28 11:52:53.622390531 +0000
+++ libs/configure	2016-06-07 12:54:22.137628386 +0000
-@@ -4399,12 +4399,6 @@ if test "${with_libgs_libdir+set}" = set
+@@ -4471,12 +4471,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
@ -58,12 +58,12 @@
 -  as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
 -fi
 -
- ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
- ## configure options and TL libraries required for gsftopk
+ ## configure options and TL libraries required for gregorio
- # Check whether --enable-gsftopk was given.
+ # Check whether --enable-gregorio was given.
 --- texk/configure
-+++ texk/configure	2016-01-28 11:52:53.626390451 +0000
+++ texk/configure	2016-06-07 12:54:40.781274871 +0000
-@@ -4409,12 +4409,6 @@ if test "${with_libgs_libdir+set}" = set
+@@ -4483,12 +4483,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
@ -73,33 +73,47 @@
 -  as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
 -fi
 -
- ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
- ## configure options and TL libraries required for gsftopk
+ ## configure options and TL libraries required for gregorio
- # Check whether --enable-gsftopk was given.
+ # Check whether --enable-gregorio was given.
 --- texk/dvipdfm-x/configure.ac
-+++ texk/dvipdfm-x/configure.ac	2016-01-28 11:55:07.943684633 +0000
+++ texk/dvipdfm-x/configure.ac	2016-06-07 12:55:15.332619702 +0000
-@@ -6,7 +6,7 @@ dnl   This file is free software; the co
+@@ -7,7 +7,7 @@ dnl   This file is free software; the co
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20150315], [tex-k@tug.org])
+-AC_INIT([dvipdfm-x (TeX Live)], [20160307], [tex-k@tug.org])
-+AC_INIT([dvipdfmx (TeX Live)], [20150315], [tex-k@tug.org])
+AC_INIT([dvipdfmx (TeX Live)], [20160307], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 --- texk/dvipdfm-x/configure
-+++ texk/dvipdfm-x/configure	2016-01-28 11:56:07.878477380 +0000
+++ texk/dvipdfm-x/configure	2016-06-07 12:56:53.574756684 +0000
-@@ -8082,7 +8082,7 @@ fi
+@@ -588,10 +588,10 @@ MFLAGS=
 MAKEFLAGS=
 # Identity of this package.
 -PACKAGE_NAME='dvipdfm-x (TeX Live)'
 -PACKAGE_TARNAME='dvipdfm-x--tex-live-'
 +PACKAGE_NAME='dvipdfmx (TeX Live)'
 +PACKAGE_TARNAME='dvipdfmx'
 PACKAGE_VERSION='20160307'
 -PACKAGE_STRING='dvipdfm-x (TeX Live) 20160307'
 +PACKAGE_STRING='dvipdfmx (TeX Live) 20160307'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
@@ -8074,7 +8074,7 @@ fi
 # Define the identity of the package.
 - PACKAGE='dvipdfm-x--tex-live-'
 + PACKAGE='dvipdfmx'
-  VERSION='20150315'
+  VERSION='20160307'
 --- texk/dvisvgm/ac/libgs.ac
-+++ texk/dvisvgm/ac/libgs.ac	2016-01-28 11:52:53.630390370 +0000
+++ texk/dvisvgm/ac/libgs.ac	2016-06-07 12:51:38.616728710 +0000
@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn
 dnl You may freely use, modify and/or distribute this file.
 dnl
@ -108,8 +122,8 @@
 -  AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
 -fi
 --- utils/configure
-+++ utils/configure	2016-01-28 11:52:53.630390370 +0000
+++ utils/configure	2016-06-07 12:57:20.806240245 +0000
-@@ -4391,12 +4391,6 @@ if test "${with_libgs_libdir+set}" = set
+@@ -4464,12 +4464,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
@ -119,6 +133,6 @@
 -  as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
 -fi
 -
- ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
- ## configure options and TL libraries required for gsftopk
+ ## configure options and TL libraries required for gregorio
- # Check whether --enable-gsftopk was given.
+ # Check whether --enable-gregorio was given.
--- a/source-dvipng.dif
+++ b/source-dvipng.dif
@ -1,9 +1,9 @@
 ---
- texk/dvipng/dvipng-1.15/vf.c |    2 +-
+ texk/dvipng/dvipng-src/vf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--- texk/dvipng/dvipng-1.15/vf.c
+--- texk/dvipng/dvipng-src/vf.c
-+++ texk/dvipng/dvipng-1.15/vf.c	2016-01-28 12:28:40.787060207 +0000
+++ texk/dvipng/dvipng-src/vf.c	2016-01-28 12:28:40.787060207 +0000
@@ -115,7 +115,7 @@ void InitVF(struct font_entry * tfontp)
     tcharptr->tfmw = (int32_t)
       ((int64_t) tcharptr->tfmw * tfontp->s / (1 << 20));
--- a/source-dviutils.dif
+++ b/source-dviutils.dif
@ -19,7 +19,7 @@
 17 files changed, 142 insertions(+), 70 deletions(-)
 --- m4/kpse-kpathsea-flags.m4
-+++ m4/kpse-kpathsea-flags.m4	2016-01-28 11:58:51.275186516 +0000
+++ m4/kpse-kpathsea-flags.m4	2016-06-07 13:37:06.329142840 +0000
@@ -16,7 +16,7 @@
 AC_DEFUN([KPSE_KPATHSEA_FLAGS], [dnl
 AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
@ -30,7 +30,7 @@
                    [${top_builddir}/../kpathsea/paths.h])
 m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
 --- texk/seetexk/a4toa5
-+++ texk/seetexk/a4toa5	2016-01-28 11:57:08.353259330 +0000
+++ texk/seetexk/a4toa5	2016-06-07 13:37:06.329142840 +0000
@@ -0,0 +1,26 @@
 +#!/bin/csh -f
 +# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -59,8 +59,8 @@
 +#
 +exec  dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
 --- texk/seetexk/configure
-+++ texk/seetexk/configure	2016-01-28 12:00:06.457668521 +0000
+++ texk/seetexk/configure	2016-06-07 13:37:06.333142765 +0000
-@@ -14881,7 +14881,7 @@ elif test "x$need_kpathsea:$with_system_
+@@ -14939,7 +14939,7 @@ elif test "x$need_kpathsea:$with_system_
   as_fn_error $? "did not find kpathsea" "$LINENO" 5
 fi
 else
@ -70,7 +70,7 @@
   KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
   KPATHSEA_RULE='# Rebuild libkpathsea
 --- texk/seetexk/dvibook.c
-+++ texk/seetexk/dvibook.c	2016-01-28 11:57:08.357259249 +0000
+++ texk/seetexk/dvibook.c	2016-06-07 13:37:06.333142765 +0000
@@ -43,6 +43,7 @@ extern char *optarg;
 extern int   optind;
 #endif
@ -99,7 +99,7 @@
  * You may get lint warnings about sprintf's return value.
  * Older versions of 4BSD have `char *sprintf()'.  ANSI and
 --- texk/seetexk/dviconcat.c
-+++ texk/seetexk/dviconcat.c	2016-01-28 11:57:08.357259249 +0000
+++ texk/seetexk/dviconcat.c	2016-06-07 13:37:06.333142765 +0000
@@ -40,6 +40,8 @@ extern char *optarg;
 extern int optind;
 #endif
@ -121,7 +121,7 @@
 /*
 --- texk/seetexk/dviselect.c
-+++ texk/seetexk/dviselect.c	2016-01-28 11:57:08.357259249 +0000
+++ texk/seetexk/dviselect.c	2016-06-07 13:37:06.333142765 +0000
@@ -54,7 +54,10 @@ extern int optind;
 #include "gripes.h"
 #include "search.h"
@ -154,7 +154,7 @@
 	pl = (struct pagelist *)malloc(sizeof *pl);
 	if (pl == NULL)
 --- texk/seetexk/dvitodvi.c
-+++ texk/seetexk/dvitodvi.c	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/dvitodvi.c	2016-06-07 13:37:06.333142765 +0000
@@ -43,6 +43,7 @@ extern char *optarg;
 extern int   optind;
 #endif
@ -215,7 +215,7 @@
    whole = scale(whole, num, den, fac) ;
    *sp = s;
    return (neg ? -whole : whole);
-@@ -493,9 +505,15 @@ HandlePostAmble(void)
+@@ -495,9 +507,15 @@ HandlePostAmble(void)
 	PutLong(outf, Denominator);
 	PutLong(outf, DVIMag);
 	c = GetLong(inf);
@ -233,7 +233,7 @@
 	c = GetWord(inf)+1;
 	PutWord(outf, c);	/* DVI stack size */
 	PutWord(outf, NumberOfOutputPages);
-@@ -588,7 +606,8 @@ HandlePreAmble(void)
+@@ -590,7 +608,8 @@ HandlePreAmble(void)
 		    DVIFileName, DVI_VERSION);
 	Numerator = GetLong(inf);
 	Denominator = GetLong(inf);
@ -243,7 +243,7 @@
 	putbyte(outf, DVI_PRE);
 	putbyte(outf, DVI_VERSION);
 	PutLong(outf, Numerator);
-@@ -615,6 +634,7 @@ main(int argc, char **argv)
+@@ -617,6 +636,7 @@ main(int argc, char **argv)
 	Width = 0;
 	Height = 0;
 	Magnification = 1000;
@ -251,7 +251,7 @@
 	Modulo = 1;
 	ProgName = *argv;
-@@ -711,12 +731,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
+@@ -713,12 +733,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
 	if (fseek(inf, 16L, 1) == -1)
 	        error(1, -1, "can't seek postamble");
 	if (Height == 0)         /* get height from postamble */
@ -271,7 +271,7 @@
 	HandleDVIFile();
 	if (WritingPage)
 --- texk/seetexk/error.c
-+++ texk/seetexk/error.c	2016-01-28 12:01:25.872063944 +0000
+++ texk/seetexk/error.c	2016-06-07 13:37:06.333142765 +0000
@@ -29,7 +29,12 @@
 #include <config.h>
 #endif
@ -307,7 +307,7 @@
 static char *
 strerror (int errnum)
 --- texk/seetexk/gripes.h
-+++ texk/seetexk/gripes.h	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/gripes.h	2016-06-07 13:37:06.333142765 +0000
@@ -28,16 +28,17 @@ extern const char *DVIFileName;
  * Declarations for the various gripes.
  */
@ -337,7 +337,7 @@
 +void GripeUndefinedOp(int n) __NR__;
 void GripeBadGlyph(i32 c, struct font *f);
 --- texk/seetexk/gripes0.c
-+++ texk/seetexk/gripes0.c	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/gripes0.c	2016-06-07 13:37:06.333142765 +0000
@@ -28,10 +28,8 @@
 #include "error.h"
 #include "gripes.h"
@ -377,7 +377,7 @@
 +	exit(0); /* NOTREACHED */
 }
 --- texk/seetexk/gripes1.c
-+++ texk/seetexk/gripes1.c	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/gripes1.c	2016-06-07 13:37:06.333142765 +0000
@@ -29,6 +29,7 @@
 #include "font.h"
 #include "gripes.h"
@ -459,7 +459,7 @@
 /*
 --- texk/seetexk/mydvichk
-+++ texk/seetexk/mydvichk	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/mydvichk	2016-06-07 13:37:06.333142765 +0000
@@ -0,0 +1,12 @@
 +#!/bin/csh -f
 +# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -474,7 +474,7 @@
 +
 +exit(0)
 --- texk/seetexk/odd2even
-+++ texk/seetexk/odd2even	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/odd2even	2016-06-07 13:37:06.333142765 +0000
@@ -0,0 +1,22 @@
 +#!/bin/csh -f
 +# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -499,7 +499,7 @@
 +
 +exit 0
 --- texk/seetexk/search.c
-+++ texk/seetexk/search.c	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/search.c	2016-06-07 13:37:06.333142765 +0000
@@ -34,6 +34,7 @@
  * it runs in increasing-key-value sequence).
  */
@ -520,7 +520,7 @@
 SCreate(unsigned int dsize)
 {
 --- texk/seetexk/seek.c
-+++ texk/seetexk/seek.c	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/seek.c	2016-06-07 13:37:06.333142765 +0000
@@ -43,6 +43,10 @@
 #endif
@ -547,7 +547,7 @@
 /*
  * Make and return a version of `f' on which fseek works (unconditionally).
 --- texk/seetexk/tempfile.c
-+++ texk/seetexk/tempfile.c	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/tempfile.c	2016-06-07 13:37:06.333142765 +0000
@@ -25,6 +25,7 @@
 #endif
@ -568,7 +568,7 @@
 #include "tempfile.h"
 --- texk/seetexk/types.h
-+++ texk/seetexk/types.h	2016-01-28 11:57:08.361259168 +0000
+++ texk/seetexk/types.h	2016-06-07 13:37:06.333142765 +0000
@@ -58,7 +58,7 @@
  *
  * (The bcopy provided in lib/bcopy.c does handle overlap.)
--- a/source-missed-scripts.dif
+++ b/source-missed-scripts.dif
@ -1,97 +1,11 @@
 ---
 texk/texlive/linked_scripts/Makefile.am                        |    5 
 texk/texlive/linked_scripts/Makefile.in                        |    5 
 texk/texlive/linked_scripts/diadia/diadia.lua                  |  298 ++++++
 texk/texlive/linked_scripts/glossaries/makeglossaries-lite.lua |  471 ++++++++++
 texk/texlive/linked_scripts/make4ht/make4ht                    |   62 +
 texk/texlive/linked_scripts/pdfbook2/pdfbook2                  |  237 +++++
 texk/texlive/linked_scripts/tex4ebook/tex4ebook                |  154 +++
- 7 files changed, 1232 insertions(+)
+ 5 files changed, 1222 insertions(+)
 --- texk/texlive/linked_scripts/Makefile.am
 +++ texk/texlive/linked_scripts/Makefile.am	2016-01-29 13:15:51.042911818 +0000
@@ -94,6 +94,7 @@ texmf_other_scripts = \
 	ctanify/ctanify \
 	ctanupload/ctanupload.pl \
 	de-macro/de-macro \
 +	diadia/diadia.lua \
 	dosepsbin/dosepsbin.pl \
 	dviasm/dviasm.py \
 	ebong/ebong.py \
@@ -109,6 +110,7 @@ texmf_other_scripts = \
 	fragmaster/fragmaster.pl \
 	getmap/getmapdl.lua \
 	glossaries/makeglossaries \
 +	glossaries/makeglossaries-lite.lua \
 	jfontmaps/kanji-fontmap-creator.pl \
 	jfontmaps/kanji-config-updmap.pl \
 	jfontmaps/kanji-config-updmap-sys.sh \
@@ -129,6 +131,7 @@ texmf_other_scripts = \
 	ltximg/ltximg.pl \
 	luaotfload/luaotfload-tool.lua \
 	m-tx/m-tx.lua \
 +	make4ht/make4ht \
 	match_parens/match_parens \
 	mathspic/mathspic.pl \
 	mf2pt1/mf2pt1.pl \
@@ -140,6 +143,7 @@ texmf_other_scripts = \
 	musixtex/musixtex.lua \
 	oberdiek/pdfatfi.pl \
 	pax/pdfannotextractor.pl \
 +	pdfbook2/pdfbook2 \
 	pdfcrop/pdfcrop.pl \
 	pedigree-perl/pedigree.pl \
 	perltex/perltex.pl \
@@ -159,6 +163,7 @@ texmf_other_scripts = \
 	splitindex/splitindex.pl \
 	sty2dtx/sty2dtx.pl \
 	svn-multi/svn-multi.pl \
 +	tex4ebook/tex4ebook \
 	texdoc/texdoc.tlu \
 	texcount/texcount.pl \
 	texdef/texdef.pl \
 --- texk/texlive/linked_scripts/Makefile.in
 +++ texk/texlive/linked_scripts/Makefile.in	2016-01-29 13:15:40.035132961 +0000
@@ -312,6 +312,7 @@ texmf_other_scripts = \
 	ctanify/ctanify \
 	ctanupload/ctanupload.pl \
 	de-macro/de-macro \
 +	diadia/diadia.lua \
 	dosepsbin/dosepsbin.pl \
 	dviasm/dviasm.py \
 	ebong/ebong.py \
@@ -327,6 +328,7 @@ texmf_other_scripts = \
 	fragmaster/fragmaster.pl \
 	getmap/getmapdl.lua \
 	glossaries/makeglossaries \
 +	glossaries/makeglossaries-lite.lua \
 	jfontmaps/kanji-fontmap-creator.pl \
 	jfontmaps/kanji-config-updmap.pl \
 	jfontmaps/kanji-config-updmap-sys.sh \
@@ -347,6 +349,7 @@ texmf_other_scripts = \
 	ltximg/ltximg.pl \
 	luaotfload/luaotfload-tool.lua \
 	m-tx/m-tx.lua \
 +	make4ht/make4ht \
 	match_parens/match_parens \
 	mathspic/mathspic.pl \
 	mf2pt1/mf2pt1.pl \
@@ -358,6 +361,7 @@ texmf_other_scripts = \
 	musixtex/musixtex.lua \
 	oberdiek/pdfatfi.pl \
 	pax/pdfannotextractor.pl \
 +	pdfbook2/pdfbook2 \
 	pdfcrop/pdfcrop.pl \
 	pedigree-perl/pedigree.pl \
 	perltex/perltex.pl \
@@ -377,6 +381,7 @@ texmf_other_scripts = \
 	splitindex/splitindex.pl \
 	sty2dtx/sty2dtx.pl \
 	svn-multi/svn-multi.pl \
 +	tex4ebook/tex4ebook \
 	texdoc/texdoc.tlu \
 	texcount/texcount.pl \
 	texdef/texdef.pl \
 --- texk/texlive/linked_scripts/diadia/diadia.lua
 +++ texk/texlive/linked_scripts/diadia/diadia.lua	2016-01-29 11:39:38.599088869 +0000
@@ -0,0 +1,298 @@
--- a/source-overflow.dif
+++ b/source-overflow.dif
@ -1,6 +1,7 @@
 ---
- utils/lacheck/lacheck.test |    3 ++-
+ texk/upmendex/fwrite.c     |   62 +++++++++++++++++++++++----------------------
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ utils/lacheck/lacheck.test |    3 +-
 2 files changed, 34 insertions(+), 31 deletions(-)
 |--- texk/web2c/eptexdir/eptex.ech
 |+++ texk/web2c/eptexdir/eptex.ech	2012-04-16 08:31:14.564665420 +0000
@ -29,3 +30,101 @@
 +test -e $srcdir/test.old || > $srcdir/test.old
 +diff $srcdir/test.old test.out || true
 --- texk/upmendex/fwrite.c
 +++ texk/upmendex/fwrite.c	2016-07-08 11:54:13.897971000 +0000
@@ -67,33 +67,38 @@ 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[3*INITIALLENGTH+1];
 +	UChar istr[INITIALLENGTH];
 	int olen, wclen;
 	UErrorCode perr;
 	if (len<0) {
 -		for (k=0; a[k] || k<4; k++) istr[k]=a[k];
 -		wclen=k;
 +		u_strcpy(istr,a);
 +		wclen=u_strlen(istr);
 	} else {
 -		wclen = is_surrogate_pair(a) ? 2 : 1;
 +		wclen=is_surrogate_pair(a) ? 2 : 1;
 			      istr[0]=a[0];
 		if (wclen==2) istr[1]=a[1];
 +		istr[wclen]=L'\0';
 	}
 -	istr[wclen]=L'\0';
 	if (mode==M_TO_UPPER) {
 -		perr = U_ZERO_ERROR;
 -		u_strToUpper(istr,5,istr,wclen,"",&perr);
 +		perr=U_ZERO_ERROR;
 +		olen=u_strToUpper(istr,INITIALLENGTH,istr,wclen,"",&perr);
 	} else if (mode==M_TO_LOWER) {
 -		perr = U_ZERO_ERROR;
 -		u_strToLower(istr,5,istr,wclen, istr[0]==0x130&&turkish_i?"tr":"", &perr);
 +		perr=U_ZERO_ERROR;
 +		olen=u_strToLower(istr,INITIALLENGTH,istr,wclen, istr[0]==0x130&&turkish_i?"tr":"", &perr);
 	} else if (mode==M_TO_TITLE) {
 -		perr = U_ZERO_ERROR;
 -		u_strToTitle(istr,5,istr,wclen,NULL,"",&perr);
 -	}
 -	perr = U_ZERO_ERROR;
 -	ret = u_strToUTF8(str, 15, &olen, istr, wclen, &perr);
 +		perr=U_ZERO_ERROR;
 +		olen=u_strToTitle(istr,INITIALLENGTH,istr,wclen,NULL,"",&perr);
 +	} else
 +		olen=wclen;
 +	if (olen>INITIALLENGTH) {
 +		warn_printf(efp, "\nWarning, Too long (%d) header.\n", olen);
 +		wclen=INITIALLENGTH;
 +	} else
 +		wclen=olen;
 +	perr=U_ZERO_ERROR;
 +	u_strToUTF8(str, 3*INITIALLENGTH+1, &olen, istr, wclen, &perr);
 	fprintf(fp,"%s",str);
 }
@@ -844,7 +849,7 @@ static int initial_cmp_char(UChar *ini,
 static int init_hanzi_header(void)
 {
 	UChar strX[2],*pch0,*pch1;
 -	int k, hzmode;
 +	int k, hzmode, len;
 	struct hanzi_index *hz_idx_init;
 	strX[0]=0x5B57;  strX[1]=L'\0';
@@ -878,21 +883,18 @@ static int init_hanzi_header(void)
 	for (k=0;k<hz_index_len;k++) {
 		if (u_strlen(pch0)==0) break;
 		if ((pch1=u_strchr(pch0,L';'))>0) {
 -			if (pch1-pch0>=INITIALLENGTH) {
 -				warn_printf(efp, "\nWarning, Too long hanzi header.\n");
 -				break;
 -			}
 -			u_strncpy(hz_index[k].idx,pch0,pch1-pch0);
 -			hz_index[k].idx[pch1-pch0]=L'\0';
 -			pch0=pch1+1;
 +			len=pch1-pch0;
 		} else {
 -			if (u_strlen(pch0)>=INITIALLENGTH) {
 -				warn_printf(efp, "\nWarning, Too long hanzi header.\n");
 -				break;
 -			}
 -			u_strcpy(hz_index[k].idx,pch0);
 -			break;
 +			len=u_strlen(pch0);
 		}
 +		if (len>=INITIALLENGTH) {
 +			warn_printf(efp, "\nWarning, Too long (%d) hanzi header.\n", len);
 +			len=INITIALLENGTH-1;
 +		}
 +		u_strncpy(hz_index[k].idx,pch0,len);
 +		hz_index[k].idx[len]=L'\0';
 +		if (pch1>0) pch0=pch1+1;
 +		else break;
 	}
 	return hzmode;
--- a/source-warns.dif
+++ b/source-warns.dif
@ -1,18 +1,18 @@
 ---
- libs/gmp/Makefile.in                         |    2 +-
+ libs/gmp/Makefile.in                       |    2 +-
- libs/icu/icu-55.1/source/i18n/decNumber.h    |   22 +++++++++++++---------
+ libs/icu/icu-src/source/i18n/decNumber.h   |   22 +++++++++++++---------
- libs/lua52/Makefile.in                       |    4 ++--
+ libs/lua52/Makefile.in                     |    4 ++--
- libs/mpfr/Makefile.in                        |    2 +-
+ libs/mpfr/Makefile.in                      |    2 +-
- libs/teckit/TECkit-2.5.4/source/Compiler.cpp |   17 ++++++++++-------
+ libs/teckit/TECkit-src/source/Compiler.cpp |   17 ++++++++++-------
- texk/makeindexk/genind.h                     |   16 +++++++++++++++-
+ texk/makeindexk/genind.h                   |   16 +++++++++++++++-
- texk/makeindexk/mkind.h                      |   20 +++++++++++++++++---
+ texk/makeindexk/mkind.h                    |   20 +++++++++++++++++---
- texk/makeindexk/scanid.h                     |   16 +++++++++++++++-
+ texk/makeindexk/scanid.h                   |   16 +++++++++++++++-
- texk/makeindexk/scanst.h                     |   16 +++++++++++++++-
+ texk/makeindexk/scanst.h                   |   16 +++++++++++++++-
 9 files changed, 89 insertions(+), 26 deletions(-)
 --- libs/gmp/Makefile.in
-+++ libs/gmp/Makefile.in	2016-01-29 14:37:58.791563686 +0000
+++ libs/gmp/Makefile.in	2016-06-07 13:29:33.925651292 +0000
-@@ -294,7 +294,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -298,7 +298,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -21,8 +21,8 @@
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
--- libs/icu/icu-55.1/source/i18n/decNumber.h
+--- libs/icu/icu-src/source/i18n/decNumber.h
-+++ libs/icu/icu-55.1/source/i18n/decNumber.h	2016-01-28 12:14:31.336201296 +0000
+++ libs/icu/icu-src/source/i18n/decNumber.h	2016-06-07 13:29:33.925651292 +0000
@@ -54,26 +54,30 @@
   /* For ICU, use one digit per byte, to make it easier to emulate the
    * old DigitList interface on top of a decNumber
@ -64,7 +64,7 @@
   #define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
 --- libs/lua52/Makefile.in
-+++ libs/lua52/Makefile.in	2016-01-28 12:16:33.057744260 +0000
+++ libs/lua52/Makefile.in	2016-06-07 13:29:33.925651292 +0000
@@ -201,11 +201,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@ -80,7 +80,7 @@
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 --- libs/mpfr/Makefile.in
-+++ libs/mpfr/Makefile.in	2016-01-29 14:38:34.666839862 +0000
+++ libs/mpfr/Makefile.in	2016-06-07 13:29:33.925651292 +0000
@@ -232,7 +232,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
@ -90,8 +90,8 @@
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
--- libs/teckit/TECkit-2.5.4/source/Compiler.cpp
+--- libs/teckit/TECkit-src/source/Compiler.cpp
-+++ libs/teckit/TECkit-2.5.4/source/Compiler.cpp	2016-01-28 12:14:31.340201216 +0000
+++ libs/teckit/TECkit-src/source/Compiler.cpp	2016-06-07 13:29:51.653318024 +0000
@@ -1449,13 +1449,16 @@ Compiler::Compiler(const char* txt, UInt
 				if (dest != 0) {
 					int	result = compress2(dest + 8, &destLen, compiledTable, compiledSize, Z_BEST_COMPRESSION);
@ -117,7 +117,7 @@
 					else
 						free(dest);
 --- texk/makeindexk/genind.h
-+++ texk/makeindexk/genind.h	2016-01-28 12:14:31.340201216 +0000
+++ texk/makeindexk/genind.h	2016-06-07 13:29:37.209589558 +0000
@@ -25,6 +25,20 @@
  *
  */
@ -149,7 +149,7 @@
 }
 --- texk/makeindexk/mkind.h
-+++ texk/makeindexk/mkind.h	2016-01-28 12:14:31.340201216 +0000
+++ texk/makeindexk/mkind.h	2016-06-07 13:29:37.209589558 +0000
@@ -244,6 +244,20 @@ extern int mk_getc (FILE *str);
 #define STREQ(A, B)  (strcmp(A, B) == 0)
 #define STRNEQ(A, B) (strcmp(A, B) != 0)
@ -192,7 +192,7 @@
     EXIT(1); \
 }
 --- texk/makeindexk/scanid.h
-+++ texk/makeindexk/scanid.h	2016-01-28 12:14:31.340201216 +0000
+++ texk/makeindexk/scanid.h	2016-06-07 13:29:37.209589558 +0000
@@ -112,6 +112,20 @@
     idx_ec++; \
 }
@ -224,7 +224,7 @@
 }
 --- texk/makeindexk/scanst.h
-+++ texk/makeindexk/scanst.h	2016-01-28 12:14:31.340201216 +0000
+++ texk/makeindexk/scanst.h	2016-06-07 13:29:37.209589558 +0000
@@ -158,6 +158,20 @@
     put_dot = FALSE; \
 }
--- a/source-xdvik-events.dif
+++ b/source-xdvik-events.dif
@ -1,20 +0,0 @@
 --- texk/xdvik/events.c	2014/04/17 07:12:06	1.413
 +++ texk/xdvik/events.c	2014/04/27 05:35:02	1.414
@@ -5306,7 +5306,7 @@
 		}
 		if (actp->proc == Act_wheel) {
 -#  if XAW
 +#  if !MOTIF
 		    if (globals.widgets.y_bar != NULL)
 			XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
 			  cast_int_to_XtPointer(dist));
@@ -5317,7 +5317,7 @@
 #  endif /* MOTIF */
 		}
 		else {	/* Act_hwheel */
 -#  if XAW
 +#  if !MOTIF
 		    if (globals.widgets.x_bar != NULL)
 			XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
 			  cast_int_to_XtPointer(dist));
--- a/source.dif
+++ b/source.dif
@ -1,36 +1,36 @@
 ---
- libs/icu/icu-55.1/source/common/Makefile.in                   |    2 
+ libs/icu/icu-src/source/common/Makefile.in                  |    2 
- reautoconf                                                    |    2 
+ reautoconf                                                  |    2 
- texk/dviljk/dvi2xx.c                                          |   11 
+ texk/dviljk/dvi2xx.c                                        |   11 
- texk/kpathsea/c-fopen.h                                       |    6 
+ texk/kpathsea/c-fopen.h                                     |    6 
- texk/kpathsea/c-memstr.h                                      |    3 
+ texk/kpathsea/c-memstr.h                                    |    3 
- texk/kpathsea/cnf-to-paths.awk                                |    2 
+ texk/kpathsea/cnf-to-paths.awk                              |    2 
- texk/kpathsea/db.c                                            |   13 
+ texk/kpathsea/db.c                                          |   13 
- texk/kpathsea/mktex.opt                                       |   39 +-
+ texk/kpathsea/mktex.opt                                     |   39 ++
- texk/kpathsea/mktexlsr                                        |   43 ++
+ texk/kpathsea/mktexlsr                                      |   43 ++
- texk/kpathsea/progname.c                                      |    4 
+ texk/kpathsea/progname.c                                    |    4 
- texk/kpathsea/texmf.cnf                                       |  173 +++++-----
+ texk/kpathsea/texmf.cnf                                     |  173 +++++++-----
- texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc |    3 
+ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc |    3 
- texk/ps2pk/pk2bm.c                                            |   34 +
+ texk/ps2pk/pk2bm.c                                          |   35 +-
- texk/texlive/linked_scripts/musixtex/musixtex.lua             |   19 -
+ texk/texlive/linked_scripts/musixtex/musixtex.lua           |   17 -
- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh            |    1 
+ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh          |    1 
- texk/texlive/linked_scripts/texlive/fmtutil.pl                |   12 
+ texk/texlive/linked_scripts/texlive/fmtutil.pl              |   24 +
- texk/texlive/linked_scripts/texlive/updmap-sys.sh             |    1 
+ texk/texlive/linked_scripts/texlive/updmap-sys.sh           |    1 
- texk/texlive/tl_scripts/fmtutil.cnf                           |   17 
+ texk/texlive/tl_scripts/fmtutil.cnf                         |   17 -
- texk/texlive/tl_scripts/texconfig-dialog.sh                   |   14 
+ texk/texlive/tl_scripts/texconfig-dialog.sh                 |   14 
- texk/texlive/tl_scripts/texconfig-sys.sh                      |    1 
+ texk/texlive/tl_scripts/texconfig-sys.sh                    |    1 
- texk/texlive/tl_scripts/texconfig.sh                          |   35 --
+ texk/texlive/tl_scripts/texconfig.sh                        |   35 --
- texk/texlive/tl_scripts/texlinks.sh                           |   53 ++-
+ texk/texlive/tl_scripts/texlinks.sh                         |   53 ++-
- texk/web2c/Makefile.in                                        |    7 
+ texk/web2c/Makefile.in                                      |    7 
- texk/web2c/window/regis.c                                     |    8 
+ texk/web2c/window/regis.c                                   |    8 
- texk/web2c/window/x11-Xlib.c                                  |    8 
+ texk/web2c/window/x11-Xlib.c                                |    8 
- texk/web2c/window/x11-Xt.c                                    |    4 
+ texk/web2c/window/x11-Xt.c                                  |    4 
- texk/xdvik/psgs.c                                             |   22 +
+ texk/xdvik/psgs.c                                           |   22 +
- texk/xdvik/xdvi-sh.in                                         |   19 -
+ texk/xdvik/xdvi-sh.in                                       |   19 +
- 28 files changed, 366 insertions(+), 190 deletions(-)
+ 28 files changed, 371 insertions(+), 196 deletions(-)
--- libs/icu/icu-55.1/source/common/Makefile.in
+--- libs/icu/icu-src/source/common/Makefile.in
-+++ libs/icu/icu-55.1/source/common/Makefile.in	2016-01-28 12:50:28.396797608 +0000
+++ libs/icu/icu-src/source/common/Makefile.in	2016-06-07 13:40:23.537446416 +0000
@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
 LDFLAGS += $(LDFLAGSICUUC)
@ -41,7 +41,7 @@
 # for icu data location
 ifeq ($(PKGDATA_MODE),common)
 --- reautoconf
-+++ reautoconf	2016-01-28 12:49:38.777793040 +0000
+++ reautoconf	2016-06-07 13:40:23.537446416 +0000
@@ -83,7 +83,7 @@ echo "$0:               TL_AUTOHEADER, T
 # Give users a chance to quit here
@ -52,7 +52,7 @@
 AUTOCONF=$TL_AUTOCONF
 AUTOHEADER=$TL_AUTOHEADER
 --- texk/dviljk/dvi2xx.c
-+++ texk/dviljk/dvi2xx.c	2016-01-28 12:50:28.396797608 +0000
+++ texk/dviljk/dvi2xx.c	2016-06-07 13:40:23.537446416 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
   setbuf(ERR_STREAM, NULL);
@ -73,7 +73,7 @@
   G_progname = kpse_program_name;
 #else
 --- texk/kpathsea/c-fopen.h
-+++ texk/kpathsea/c-fopen.h	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/c-fopen.h	2016-06-07 13:40:23.537446416 +0000
@@ -38,17 +38,17 @@
 /* How to open a binary file for reading:  */
@ -96,7 +96,7 @@
 /* How to switch an already open file handle to binary mode.
 --- texk/kpathsea/c-memstr.h
-+++ texk/kpathsea/c-memstr.h	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/c-memstr.h	2016-06-07 13:40:23.537446416 +0000
@@ -37,6 +37,7 @@
 /* For ancient systems that lack the system V/ANSI version of the
@ -113,7 +113,7 @@
 +
 #endif /* not KPATHSEA_C_MEMSTR_H */
 --- texk/kpathsea/cnf-to-paths.awk
-+++ texk/kpathsea/cnf-to-paths.awk	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/cnf-to-paths.awk	2016-06-07 13:40:23.537446416 +0000
@@ -37,7 +37,7 @@
   val = $0;
   sub(/^.*=[ \t]*/, "", val);
@ -124,7 +124,7 @@
   if (val ~ /\$SELFAUTO/) {
     # Replace all semicolons with colons in the SELFAUTO paths we're keeping.
 --- texk/kpathsea/db.c
-+++ texk/kpathsea/db.c	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/db.c	2016-06-07 13:40:23.537446416 +0000
@@ -92,7 +92,8 @@ db_build (kpathsea kpse, hash_table_type
   unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
   string top_dir = (string)xmalloc (len + 1);
@ -153,7 +153,7 @@
       len = strlen (line);
 --- texk/kpathsea/mktex.opt
-+++ texk/kpathsea/mktex.opt	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/mktex.opt	2016-06-07 13:40:23.537446416 +0000
@@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':';
 # TEMPDIR needs to be unique to each process because of the possibility of two
 # people running dvips (or whatever) simultaneously.
@ -231,7 +231,7 @@
 # Cache values that may be useful for recursive calls.
 export MT_MKTEX_OPT MT_MKTEX_CNF 
 --- texk/kpathsea/mktexlsr
-+++ texk/kpathsea/mktexlsr	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/mktexlsr	2016-06-07 13:40:23.537446416 +0000
@@ -58,6 +58,9 @@ if test "$DOSISH" = "no"; then SEP=':';
 # be done before kpsewhich can be called, and thus cannot be put into
 # mktex.opt.
@ -328,7 +328,7 @@
 done
 --- texk/kpathsea/progname.c
-+++ texk/kpathsea/progname.c	2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/progname.c	2016-06-07 13:40:23.537446416 +0000
@@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse
   /* SELFAUTODIR is actually the parent of the invocation directory,
      and SELFAUTOPARENT the grandparent.  This is how teTeX did it.  */
@ -342,8 +342,8 @@
   sdir_greatgrandparent = xdirname (sdir_grandparent);
   kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
 --- texk/kpathsea/texmf.cnf
-+++ texk/kpathsea/texmf.cnf	2016-01-28 12:57:16.760604615 +0000
+++ texk/kpathsea/texmf.cnf	2016-06-07 13:58:00.905630040 +0000
-@@ -54,32 +54,32 @@
+@@ -57,32 +57,32 @@
 TEXMFROOT = $SELFAUTOPARENT
 % The main tree of distributed packages and programs:
@ -374,16 +374,16 @@
 +TEXMFHOME = $HOME/texmf
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2015/texmf-var
+-TEXMFVAR = ~/.texlive2016/texmf-var
 +TEXMFVAR = ${TEXMFSYSVAR}
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2015/texmf-config
+-TEXMFCONFIG = ~/.texlive2016/texmf-config
 +TEXMFCONFIG = ${TEXMFSYSCONFIG}
 % List all the texmf trees. For an explanation of what they are, see the
 % TeX Live manual.
-@@ -91,7 +91,7 @@ TEXMFCONFIG = ~/.texlive2015/texmf-confi
+@@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2016/texmf-confi
 % should take precedence over distribution files -- although it is
 % generally a source of confusion to have different versions of a
 % package installed, whatever the trees, so try to avoid it.
@ -392,7 +392,7 @@
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.
-@@ -99,13 +99,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
+@@ -102,13 +102,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
 % does not create ls-R files in the non-!! elements -- because if an
 % ls-R is present, it will be used, and the disk will not be searched.
 % This is arguably a bug in kpathsea.
@ -408,7 +408,7 @@
 % First writable tree here is used by Lua(La)TeX for the font cache.
 % LuaLaTeX uses the value here, while ConTeXt uses the same variable but
-@@ -116,7 +116,6 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
+@@ -119,7 +119,6 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
 % Where generated fonts may be written.  This tree is used when the sources
 % were found in a system tree and either that tree wasn't writable, or the
 % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
@ -416,7 +416,7 @@
 % On some systems, there will be a system tree which contains all the font
 % files that may be created as well as the formats.  For example
-@@ -127,7 +126,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
+@@ -130,7 +129,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
 %
 % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
 % one of the TEXMF directories (avoids overlapping ls-R files).
@ -426,7 +426,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Usually you will not need to edit any of the following variables.
-@@ -135,7 +135,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
+@@ -138,7 +138,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
 % WEB2C is for Web2C specific files.  The current directory may not be
 % a good place to look for them.
@ -435,7 +435,7 @@
 % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
 % or \openin, including .sty, .eps, etc.  We specify paths for all known
-@@ -176,18 +176,18 @@ TEXINPUTS.elatex        = .;$TEXMF/tex/{
+@@ -179,18 +179,18 @@ TEXINPUTS.elatex        = .;$TEXMF/tex/{
 TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
 % pdfTeX.
@ -464,8 +464,8 @@
 % LuaTeX.
 TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-@@ -235,18 +235,18 @@ BSTINPUTS.pbibtex       = .;$TEXMF/{pbib
+@@ -238,18 +238,18 @@ BSTINPUTS.pbibtex       = .;$TEXMF/{pbib
- TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic}//
+ TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 % jadetex.
 -TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
@ -489,7 +489,7 @@
 % Earlier entries override later ones, so put this generic one last.
 TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-@@ -255,7 +255,7 @@ TEXINPUTS               = .;$TEXMF/tex/{
+@@ -258,7 +258,7 @@ TEXINPUTS               = .;$TEXMF/tex/{
 TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
 % Metafont, MetaPost inputs.
@ -498,7 +498,7 @@
 MPINPUTS = .;$TEXMF/metapost//
 % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-@@ -265,31 +265,31 @@ MPINPUTS = .;$TEXMF/metapost//
+@@ -268,31 +268,31 @@ MPINPUTS = .;$TEXMF/metapost//
 % We repeat the same definition three times because of the way fmtutil
 % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
 % will not be found.
@ -537,7 +537,7 @@
 % Similarly for the GF format, which only remains in existence because
 % Metafont outputs it (and MF isn't going to change).
-@@ -299,7 +299,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
+@@ -302,7 +302,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
 GLYPHFONTS = .;$TEXMF/fonts
 % A place to puth everything that doesn't fit the other font categories.
@ -546,7 +546,7 @@
 % font name map files.  This isn't just fonts/map// because ConTeXt
 % wants support for having files with the same name in the different
-@@ -381,8 +381,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
+@@ -384,8 +384,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
 % For xdvi to find mime.types and .mailcap, if they do not exist in
 % ~.  These are single directories, not paths.
 % (But the default mime.types, at least, may well suffice.)
@ -557,7 +557,7 @@
 % Default settings for the fontconfig library as used by the Windows
 % versions of xetex/xdvipdfmx.  Not used by xetex on Unixish systems.
-@@ -401,10 +401,10 @@ WEBINPUTS = .;$TEXMF/web//
+@@ -404,10 +404,10 @@ WEBINPUTS = .;$TEXMF/web//
 CWEBINPUTS = .;$TEXMF/cweb//
 % Omega-related fonts and other files.
@ -572,7 +572,7 @@
 OTPINPUTS = .;$TEXMF/omega/otp//
 OCPINPUTS = .;$TEXMF/omega/ocp//
-@@ -486,33 +486,34 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+@@ -489,33 +489,34 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
 % since we don't want to scatter ../'s throughout the value.  Hence we
 % explicitly list every directory.  Arguably more understandable anyway.
 %
@ -634,7 +634,7 @@
 %
 % For reference, here is the old brace-using definition:
 %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-@@ -789,3 +790,33 @@ max_cols.gftype = 8191
+@@ -791,3 +792,33 @@ max_cols.gftype = 8191
 % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
 % Default is 0, to not guess.
 guess_input_kanji_encoding = 1
@ -668,8 +668,8 @@
 +hash_extra.jadetex = 25000
 +pool_size.jadetex = 500000
 +save_size.jadetex = 15000
--- texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc
+--- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc
-+++ texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc	2016-01-28 12:50:28.404797448 +0000
+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc	2016-06-07 13:40:23.541446341 +0000
@@ -67,6 +67,9 @@
 # include <io.h>
 #endif
@ -681,7 +681,7 @@
 #define VERSION_OPT		301
 --- texk/ps2pk/pk2bm.c
-+++ texk/ps2pk/pk2bm.c	2016-01-28 12:50:43.484494922 +0000
+++ texk/ps2pk/pk2bm.c	2016-06-07 13:54:20.741760758 +0000
@@ -45,7 +45,6 @@
 static quarterword lsbf(quarterword u);
@ -748,52 +748,54 @@
 -   if (argc == 0) {
 +   if (argc != 1) {
        msg  ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n");
       printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
       exit(1);
-    }
+@@ -216,11 +225,3 @@ dots(quarterword u, int n)
-@@ -216,10 +225,3 @@ dots(quarterword u, int n)
+       bit>>=1;
    }
 }
- 
+-
 -static int
 -atoo(char *oct)
 -{
 -   int octal = 0;
 -   while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
-   return octal & 0xff;
+-   return octal;
 -}
 --- texk/texlive/linked_scripts/musixtex/musixtex.lua
-+++ texk/texlive/linked_scripts/musixtex/musixtex.lua	2016-01-28 12:53:55.300646630 +0000
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua	2016-06-07 13:53:04.291194597 +0000
-@@ -83,12 +83,23 @@ if #arg == 0 then
+@@ -172,14 +172,25 @@ end
-   os.exit(0)
+ --       possible by exploiting the the fact that Lua has two false values.
- end
+ --         dvi == nil    "do not produce a DVI file" (but maybe PDF)
- 
+ --         dvi == false  "do not process the DVI file" (but stop after TeX)
-+base=string.explode(arg[0], "/+")
+local base=string.explode(arg[0], "/+")
 +base=string.explode(base[#base], ".+")
 +base=base[1]
-+
+ local dvips = "dvips -e0"
- -- defaults:
+ function defaults()
-tex = "etex"  
+   prepmx = "prepmx"
-+if base == "pdfmusixtex" then
+   pmx = "pmxab"
-+  tex = "pdfetex"  
+-  tex = "etex"  
-+  dvips = ""
+  if base == "pdfmusixtex" then
-+  dvi = ""
+    tex = "pdfetex"  
-+  ps2pdf = ""
+    dvips = ""
-+else
+    dvi = ""
-+  tex = "etex"  
+    ps2pdf = ""
-+  dvips = "dvips -e0 "
+  else
-+  dvi = dvips
+    tex = "etex"  
-+  ps2pdf = "ps2pdf"
+    dvips = "dvips -e0"
-+end
+    dvi = dvips
- musixflx = "musixflx"
+    ps2pdf = "ps2pdf"
-dvips = "dvips -e0 "
+  end
-dvi = dvips
+   musixflx = "musixflx"
-ps2pdf = "ps2pdf"
+-  dvi = dvips
- intermediate = 1
+-  ps2pdf = "ps2pdf"
- passes = 2
+   cleanup = true  -- clean up intermediate and log files
- index = 0
+   index = false
   latex = false 
 --- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
-+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh	2016-01-28 12:52:30.270352571 +0000
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh	2016-06-07 13:40:23.541446341 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@ -801,10 +803,10 @@
 +umask 022
 exec fmtutil --sys ${1+"$@"}
 --- texk/texlive/linked_scripts/texlive/fmtutil.pl
-+++ texk/texlive/linked_scripts/texlive/fmtutil.pl	2016-01-28 14:13:50.388260141 +0000
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl	2016-06-07 13:47:22.161607756 +0000
-@@ -11,16 +11,16 @@
+@@ -10,16 +10,16 @@
 # History:
 # Original shell script (C) 2001 Thomas Esser, public domain
 #
 -my $TEXMFROOT;
 +my $TEXMFDIST;
@ -824,7 +826,7 @@
   require "mktexlsr.pl";
   TeX::Update->import();
 }
-@@ -73,7 +73,7 @@ my @deferred_stdout;
+@@ -67,7 +67,7 @@ my @deferred_stdout;
 # this function checks by itself whether it is running on windows or not
 reset_root_home();
@ -833,25 +835,22 @@
 chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
 chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
 chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
-@@ -283,10 +283,17 @@ sub callback_build_formats {
+@@ -346,7 +346,14 @@ sub callback_build_formats {
-   my $disabled = 0;
+       TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
-   my $nobuild = 0;
+     }
-   my $notavail = 0;
+   } else {
-+  my ($uid, $gid);
+    my ($uid, $gid);
-   #
+     $tmpdir = File::Temp::tempdir(CLEANUP => 1);
-   # set up a tmp dir
+    if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
-   my $tmpdir = File::Temp::tempdir(CLEANUP => 1);
+      my $cnt = chown $uid, $gid, $tmpdir;
-   #my $tmpdir = File::Temp::tempdir();
+      die "could not create directory $tmpdir" if $cnt <= 0;
-+  if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
+      $cnt = chmod 0770, $tmpdir;
-+    my $cnt = chown $uid, $gid, $tmpdir;
+      die "could not create directory $tmpdir" if $cnt <= 0;
-+    die "could not create directory $tmpdir" if $cnt <= 0;
+    }
-+    $cnt = chmod 0770, $tmpdir;
+   }
 +    die "could not create directory $tmpdir" if $cnt <= 0;
 +  }
   # set up destination directory
-   $opts{'fmtdir'} || ( $opts{'fmtdir'} = "$texmfvar/web2c" ) ;
+   $opts{'fmtdir'} ||= "$texmfvar/web2c";
-   TeXLive::TLUtils::mkdirhier($opts{'fmtdir'}) if (! -d $opts{'fmtdir'});
+@@ -559,6 +566,7 @@ sub rebuild_one_format {
@@ -443,6 +450,7 @@ sub rebuild_one_format {
   # check for existence of ini file before doing anything else
   if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
     # we didn't find the ini file, skip
@ -859,7 +858,7 @@
     print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
     # The original script just skipped it but in TeX Live we expect that
     # all activated formats are also buildable, thus return failure.
-@@ -493,11 +501,15 @@ sub rebuild_one_format {
+@@ -610,11 +618,15 @@ sub rebuild_one_format {
         ",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
       return $FMT_NOTAVAIL;
     } else {
@ -872,11 +871,11 @@
 +  if ($ENV{batchmode} eq "yes") {
 +    $texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
 +  }
-   print_verbose("running \`$eng -ini $tcxflag $jobswitch $prgswitch $texargs' ...\n");
+   my $cmdline = "$eng -ini $tcxflag $recorderswitch $jobswitch "
- 
+                   . "$prgswitch $texargs";
-   {
+   print_verbose("running \`$cmdline' ...\n");
 --- texk/texlive/linked_scripts/texlive/updmap-sys.sh
-+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh	2016-01-28 12:52:43.190093368 +0000
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh	2016-06-07 13:40:23.541446341 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@ -884,7 +883,7 @@
 +umask 022
 exec updmap --sys ${1+"$@"}
 --- texk/texlive/tl_scripts/fmtutil.cnf
-+++ texk/texlive/tl_scripts/fmtutil.cnf	2016-01-28 12:50:57.572212297 +0000
+++ texk/texlive/tl_scripts/fmtutil.cnf	2016-06-07 13:40:23.541446341 +0000
@@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc
 # from context:
 cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
@ -912,7 +911,7 @@
 #
 # from latex-bin:
 latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-@@ -133,5 +134,5 @@ xetex xetex language.def -etex xetex.ini
+@@ -131,5 +132,5 @@ xetex xetex language.def -etex xetex.ini
 xelatex xetex language.dat -etex xelatex.ini
 #
 # from xmltex:
@ -921,8 +920,8 @@
 +xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
 +pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
 --- texk/texlive/tl_scripts/texconfig-dialog.sh
-+++ texk/texlive/tl_scripts/texconfig-dialog.sh	2016-01-28 12:55:50.682331687 +0000
+++ texk/texlive/tl_scripts/texconfig-dialog.sh	2016-06-07 13:40:23.541446341 +0000
-@@ -154,7 +154,14 @@ termCtl()
+@@ -157,7 +157,14 @@ termCtl()
 ###############################################################################
 menuMain()
 {
@ -938,7 +937,7 @@
 	The interactive texconfig utility will be started now. Make sure
 	your screen has at least 24 rows and 80 columns. If texconfig
 	crashes now, you can still set up your TeX system using the
-@@ -166,8 +173,9 @@ menuMain()
+@@ -169,8 +176,9 @@ menuMain()
 	More likely these days, you're better off using tlmgr.
 	See http://tug.org/texlive/tlmgr.html.
@ -951,7 +950,7 @@
   while :; do
     logMessage='view logfile'
 --- texk/texlive/tl_scripts/texconfig-sys.sh
-+++ texk/texlive/tl_scripts/texconfig-sys.sh	2016-01-28 12:51:01.132140878 +0000
+++ texk/texlive/tl_scripts/texconfig-sys.sh	2016-06-07 13:40:23.541446341 +0000
@@ -30,4 +30,5 @@ TEXMFVAR="$v"
 TEXMFCONFIG="$c"
 export TEXMFVAR TEXMFCONFIG
@ -959,7 +958,7 @@
 +umask 022
 exec texconfig ${1+"$@"}
 --- texk/texlive/tl_scripts/texconfig.sh
-+++ texk/texlive/tl_scripts/texconfig.sh	2016-01-28 12:51:01.132140878 +0000
+++ texk/texlive/tl_scripts/texconfig.sh	2016-06-07 13:40:23.541446341 +0000
@@ -40,7 +40,7 @@ envVars="
   TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
   TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
@ -1024,7 +1023,7 @@
     # 
 --- texk/texlive/tl_scripts/texlinks.sh
-+++ texk/texlive/tl_scripts/texlinks.sh	2016-01-28 12:51:01.132140878 +0000
+++ texk/texlive/tl_scripts/texlinks.sh	2016-06-07 13:40:23.541446341 +0000
@@ -100,7 +100,7 @@ setupTmpDir()
   trap 'cleanup 1' 1 2 3 7 13 15
@ -1123,8 +1122,8 @@
       if test -f "$d/$engine$exeext"; then
         case $unlink in
 --- texk/web2c/Makefile.in
-+++ texk/web2c/Makefile.in	2016-01-28 12:51:34.395473549 +0000
+++ texk/web2c/Makefile.in	2016-06-07 13:40:23.545446266 +0000
-@@ -3656,7 +3656,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
+@@ -3816,7 +3816,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
 md5main_CPPFLAGS = -I$(srcdir)/libmd5
 md5main_SOURCES = libmd5/md5main.c
 md5main_LDADD = libmd5.a
@ -1133,7 +1132,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 .SUFFIXES:
-@@ -3703,6 +3703,11 @@ w2c/c-auto.h: w2c/stamp-h1
+@@ -3863,6 +3863,11 @@ w2c/c-auto.h: w2c/stamp-h1
 w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
 	@rm -f w2c/stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
@ -1146,7 +1145,7 @@
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f w2c/stamp-h1
 --- texk/web2c/window/regis.c
-+++ texk/web2c/window/regis.c	2016-01-28 12:51:34.399473469 +0000
+++ texk/web2c/window/regis.c	2016-06-07 13:40:23.545446266 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
                               screenrow top,
                               screenrow bottom)
@ -1166,7 +1165,7 @@
 		left,bottom,ESCAPE);
 }
 --- texk/web2c/window/x11-Xlib.c
-+++ texk/web2c/window/x11-Xlib.c	2016-01-28 12:51:34.411473228 +0000
+++ texk/web2c/window/x11-Xlib.c	2016-06-07 13:40:23.621444844 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
 #define BORDER_WIDTH 1 /* Should get this from resource. */
 #define DEFAULT_X_POSITION 0
@ -1193,7 +1192,7 @@
     /* Look up the geometry for this window. (Section 10.2 Obtaining X
 --- texk/web2c/window/x11-Xt.c
-+++ texk/web2c/window/x11-Xt.c	2016-01-28 12:51:34.411473228 +0000
+++ texk/web2c/window/x11-Xt.c	2016-06-07 13:40:23.621444844 +0000
@@ -18,8 +18,8 @@
 #define PLANE 0
@ -1206,7 +1205,7 @@
 static Display *mf_display;
 static Window mf_window;
 --- texk/xdvik/psgs.c
-+++ texk/xdvik/psgs.c	2016-01-28 12:51:34.415473148 +0000
+++ texk/xdvik/psgs.c	2016-06-07 13:40:23.621444844 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/time.h>	/* for timeval */
@ -1244,7 +1243,7 @@
     GS_pid = vfork();
     if (GS_pid == 0) {	/* child */
 --- texk/xdvik/xdvi-sh.in
-+++ texk/xdvik/xdvi-sh.in	2016-01-28 12:51:34.415473148 +0000
+++ texk/xdvik/xdvi-sh.in	2016-06-07 13:40:23.621444844 +0000
@@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
--- a/texlive-20150521-source.tar.xz
+++ b/texlive-20150521-source.tar.xz
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
 size 45459552
--- a/texlive-20160523-source.tar.xz
+++ b/texlive-20160523-source.tar.xz
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:fef57ed9aef8e3a93664c0d0f52aa2fd0faeb54acca9ebd38ce22a8ae55de64f
 size 47774684
--- a/texlive.changes
+++ b/texlive.changes
@ -1,3 +1,45 @@
 -------------------------------------------------------------------
 Tue Jul 19 11:48:39 UTC 2016 - werner@suse.de
 - Update biblatex-biber to version 2.5 as otherwise the biber
  indexing engine is not usable due version mismatch (boo#989486) 
 -------------------------------------------------------------------
 Fri Jul 15 10:02:40 UTC 2016 - werner@suse.de
 - Avoid missing dependencies due upstream package splits
 -------------------------------------------------------------------
 Fri Jul  8 12:06:53 UTC 2016 - werner@suse.de
 - Use the latest revision of upmendex/fwrite.c (r.41498) 
  to get stack smashing fixed as well as a working upmendex
 -------------------------------------------------------------------
 Tue Jun 14 13:03:21 UTC 2016 - werner@suse.de
 - Avoid stack smashing deteted on i586 in upmendex/fwrite.c
 - Add patch biber-perl-pre5.22.0.dif
  as with perl 5.18 and below fastsort does not work
 -------------------------------------------------------------------
 Tue Jun  7 11:35:15 UTC 2016 - werner@suse.de
 - Update to TeXLive 2016
  * Remove the now included patches
    biber-perl-5.22.dif
    biber-perl-unicode-normalize.dif
    biber-skip-bibtex-forms.dif
    source-xdvik-events.dif
  * Adopted the following patches
    biber-certs.dif
    source-configure.dif
    source-dvipng.dif
    source-dviutils.dif
    source-missed-scripts.dif
    source-warns.dif
    source.dif
 -------------------------------------------------------------------
 Wed Apr 13 13:59:41 UTC 2016 - werner@suse.de
--- a/texlive.spec
+++ b/texlive.spec