From 84f8a525e2b7f097efa0065802286d59857225a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 24 Aug 2019 20:52:36 +0000 Subject: biber (24aug19) git-svn-id: svn://tug.org/texlive/trunk@51952 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/amd64-freebsd/biber | Bin 21506930 -> 0 bytes Master/bin/i386-cygwin/biber.exe | Bin 20371979 -> 20566862 bytes Master/bin/i386-freebsd/biber | Bin 19337585 -> 0 bytes Master/bin/i386-linux/biber | Bin 19990121 -> 20356305 bytes Master/bin/i386-solaris/biber | Bin 19001633 -> 19021669 bytes Master/bin/win32/biber.exe | Bin 27583030 -> 27689487 bytes Master/bin/x86_64-cygwin/biber.exe | Bin 20403490 -> 20583314 bytes Master/bin/x86_64-darwin/biber | Bin 20005438 -> 33243021 bytes Master/bin/x86_64-darwinlegacy/biber | Bin 20005438 -> 20101355 bytes Master/bin/x86_64-linux/biber | Bin 22168350 -> 22267153 bytes Master/bin/x86_64-linuxmusl/biber | Bin 0 -> 21389728 bytes Master/bin/x86_64-solaris/biber | Bin 20286400 -> 20307058 bytes Master/texmf-dist/doc/bibtex/biber/biber.pdf | Bin 263177 -> 263490 bytes Master/texmf-dist/source/bibtex/biber/Changes | 4 ++++ .../source/bibtex/biber/biblatex-biber.tar.gz | Bin 925940 -> 978273 bytes Master/tlpkg/libexec/ctan2tds | 24 ++++++++++----------- Master/tlpkg/tlpsrc/biber.tlpsrc | 3 ++- 17 files changed, 18 insertions(+), 13 deletions(-) delete mode 100755 Master/bin/amd64-freebsd/biber delete mode 100755 Master/bin/i386-freebsd/biber create mode 100755 Master/bin/x86_64-linuxmusl/biber (limited to 'Master') diff --git a/Master/bin/amd64-freebsd/biber b/Master/bin/amd64-freebsd/biber deleted file mode 100755 index 220c84d5c53..00000000000 Binary files a/Master/bin/amd64-freebsd/biber and /dev/null differ diff --git a/Master/bin/i386-cygwin/biber.exe b/Master/bin/i386-cygwin/biber.exe index d2d8bcc7364..505b55e231b 100755 Binary files a/Master/bin/i386-cygwin/biber.exe and b/Master/bin/i386-cygwin/biber.exe differ diff --git a/Master/bin/i386-freebsd/biber b/Master/bin/i386-freebsd/biber deleted file mode 100755 index 863f6ff9be1..00000000000 Binary files a/Master/bin/i386-freebsd/biber and /dev/null differ diff --git a/Master/bin/i386-linux/biber b/Master/bin/i386-linux/biber index 85ad0b0e720..81baa8f671b 100755 Binary files a/Master/bin/i386-linux/biber and b/Master/bin/i386-linux/biber differ diff --git a/Master/bin/i386-solaris/biber b/Master/bin/i386-solaris/biber index 8bbfe72774c..ddc0f89767a 100755 Binary files a/Master/bin/i386-solaris/biber and b/Master/bin/i386-solaris/biber differ diff --git a/Master/bin/win32/biber.exe b/Master/bin/win32/biber.exe index 766b710621c..99a2952dd08 100755 Binary files a/Master/bin/win32/biber.exe and b/Master/bin/win32/biber.exe differ diff --git a/Master/bin/x86_64-cygwin/biber.exe b/Master/bin/x86_64-cygwin/biber.exe index 902b3228741..4c1cdf32ad6 100755 Binary files a/Master/bin/x86_64-cygwin/biber.exe and b/Master/bin/x86_64-cygwin/biber.exe differ diff --git a/Master/bin/x86_64-darwin/biber b/Master/bin/x86_64-darwin/biber index 7ed67ae3e42..ae58872254b 100755 Binary files a/Master/bin/x86_64-darwin/biber and b/Master/bin/x86_64-darwin/biber differ diff --git a/Master/bin/x86_64-darwinlegacy/biber b/Master/bin/x86_64-darwinlegacy/biber index 7ed67ae3e42..c28096ec134 100755 Binary files a/Master/bin/x86_64-darwinlegacy/biber and b/Master/bin/x86_64-darwinlegacy/biber differ diff --git a/Master/bin/x86_64-linux/biber b/Master/bin/x86_64-linux/biber index 036cad7fd1d..14cd38c65d1 100755 Binary files a/Master/bin/x86_64-linux/biber and b/Master/bin/x86_64-linux/biber differ diff --git a/Master/bin/x86_64-linuxmusl/biber b/Master/bin/x86_64-linuxmusl/biber new file mode 100755 index 00000000000..662bd9db2b6 Binary files /dev/null and b/Master/bin/x86_64-linuxmusl/biber differ diff --git a/Master/bin/x86_64-solaris/biber b/Master/bin/x86_64-solaris/biber index 48923f161ec..d8b0e82a82b 100755 Binary files a/Master/bin/x86_64-solaris/biber and b/Master/bin/x86_64-solaris/biber differ diff --git a/Master/texmf-dist/doc/bibtex/biber/biber.pdf b/Master/texmf-dist/doc/bibtex/biber/biber.pdf index 31cc9692a6f..03cefc22c43 100644 Binary files a/Master/texmf-dist/doc/bibtex/biber/biber.pdf and b/Master/texmf-dist/doc/bibtex/biber/biber.pdf differ diff --git a/Master/texmf-dist/source/bibtex/biber/Changes b/Master/texmf-dist/source/bibtex/biber/Changes index e516af91459..1a13ebd07eb 100644 --- a/Master/texmf-dist/source/bibtex/biber/Changes +++ b/Master/texmf-dist/source/bibtex/biber/Changes @@ -1,5 +1,9 @@ Revision history for Biber +2.13 (2019-08-13) + * biber now exits with error on some very malformed names instead of + skipping them as this can lead to data loss in bibliographies. + * Support for named annotations 2.12 (2018-10-30) * Added support for biblatex literal and named annotation features * Added support for biblatex \ifnocite test diff --git a/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz b/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz index 1f70718f823..1b8856b983a 100644 Binary files a/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz and b/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz differ diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 3eb2575d1ab..5d1fd608ddf 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -5774,11 +5774,13 @@ sub POSTbiber { "cygwin32" => "i386-cygwin", "cygwin64" => "x86_64-cygwin", "darwin_x86_64" => "x86_64-darwin", + "darwinlegacy_x86_64"=> "x86_64-darwinlegacy", "i386-freebsd" => "i386-freebsd", "i386-pc-solaris2" => "i386-solaris", "linux_armel" => "armel-linux", "linux_x86_32" => "i386-linux", "linux_x86_64" => "x86_64-linux", + "linux_x86_64-musl" => "x86_64-linuxmusl", "x86_64-pc-solaris2" => "x86_64-solaris", ); @@ -5787,13 +5789,17 @@ sub POSTbiber { next if $archive =~ /freebsd[^7]\./; # we only want freebsd7 my $unarchiver = &unarchiver ($archive); - &SYSTEM ("$unarchiver $archive"); + &xsystem ("$unarchiver $archive"); # each .tar.gz unpacks into a single file named biber, # .zip unpacks into biber.exe. my $biber_binary = "biber"; $biber_binary .= ".exe" if $archive =~ /MSWIN|cygwin/i; + # musl tarball has wrong name, hopefully just once. + my $musl = "biber-linux_x86_64-musl"; + &xsystem ("$MV $musl $biber_binary") if -r $musl; + # Put the executable in the Master bin directory. (my $biber_platform = $archive) =~ s/biber-(.*?)\..*/$1/; my $tl_platform = $tl_platform{$biber_platform}; @@ -5801,21 +5807,15 @@ sub POSTbiber { # really need to do svn cp for this (in place, can't do it here). my $bindir = "$TOPDEST/bin/$tl_platform"; - &SYSTEM ("mkdir -p $bindir/"); - &SYSTEM ("$MV $biber_binary $bindir/") == 0 || die; + &xsystem ("mkdir -p $bindir/"); + &xsystem ("$MV $biber_binary $bindir/"); } - # Mac "legacy" doesn't need its own build. - my $topbin = "$TOPDEST/bin"; - my $legacybin = "$topbin/x86_64-darwinlegacy"; - &xmkdir ($legacybin); - &SYSTEM ("$CP $topbin/x86_64-darwin/biber $legacybin/biber"); - # don't keep binary archives around in Master tree. - &SYSTEM ("$RM biber[-.]*"); - + &xsystem ("$RM biber[-.]*"); + # # not meaningful info in TL. - &SYSTEM ("$RM README.FreeBSD"); + &xsystem ("$RM README.FreeBSD"); } # biber binaries are distributed in a variety of ways. The idea here is diff --git a/Master/tlpkg/tlpsrc/biber.tlpsrc b/Master/tlpkg/tlpsrc/biber.tlpsrc index 656c48ae36a..6e97ad0cb7e 100644 --- a/Master/tlpkg/tlpsrc/biber.tlpsrc +++ b/Master/tlpkg/tlpsrc/biber.tlpsrc @@ -3,8 +3,9 @@ docpattern +!d texmf-dist/doc/latex/biblatex # Not all platforms provide this. binpattern f/!\ aarch64-linux,\ +amd64-freebsd,\ amd64-netbsd,\ armhf-linux,\ +i386-freebsd,\ i386-netbsd,\ -x86_64-linuxmusl,\ bin/${ARCH}/biber -- cgit v1.2.3