Sync from SUSE:SLFO:Main texlive revision f46a3f993ac7510fc58a587bbd2a5e6a

This commit is contained in:
Adrian Schröter 2024-05-04 01:08:34 +02:00
commit 842356a344
35 changed files with 10020 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

View File

@ -0,0 +1,29 @@
From: Jason Teplitz <jason@tensyr.com>
Date: Mon, 9 Oct 2017 23:03:09 +0000
Subject: Fix register allocation bug in arm64
---
src/lj_asm_arm64.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h
index 8fd92e7..549f8a6 100644
--- a/src/lj_asm_arm64.h
+++ b/src/lj_asm_arm64.h
@@ -871,7 +871,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
int bigofs = !emit_checkofs(A64I_LDRx, ofs);
RegSet allow = RSET_GPR;
Reg dest = (ra_used(ir) || bigofs) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
- Reg node = ra_alloc1(as, ir->op1, allow);
+ Reg node = ra_alloc1(as, ir->op1, ra_hasreg(dest) ? rset_clear(allow, dest) : allow);
Reg key = ra_scratch(as, rset_clear(allow, node));
Reg idx = node;
uint64_t k;
@@ -879,7 +879,6 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
rset_clear(allow, key);
if (bigofs) {
idx = dest;
- rset_clear(allow, dest);
kofs = (int32_t)offsetof(Node, key);
} else if (ra_hasreg(dest)) {
emit_opk(as, A64I_ADDx, dest, node, ofs, allow);

27
_constraints Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0"?>
<constraints>
<hostlabel exclude="true">SLOW_CPU</hostlabel>
<hardware>
<disk>
<size unit="G">4</size>
</disk>
<physicalmemory>
<size unit="G">4</size>
</physicalmemory>
<processors>4</processors>
</hardware>
<overwrite>
<conditions>
<arch>x86_64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>aarch64</arch>
</conditions>
<hardware>
<memory>
<size unit="G">6</size>
</memory>
<processors>8</processors>
</hardware>
</overwrite>
</constraints>

BIN
biber-2.19.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

26
biber-certs.dif Normal file
View File

@ -0,0 +1,26 @@
---
Build.PL | 1 -
bin/biber | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
--- Build.PL
+++ Build.PL 2021-04-07 10:33:36.151418110 +0000
@@ -55,7 +55,6 @@ my $builder = $class->new(
'List::AllUtils' => 0,
'List::MoreUtils' => 0,
'List::MoreUtils::XS' => 0,
- 'Mozilla::CA' => '20160104',
'Regexp::Common' => 0,
'Log::Log4perl' => 0,
'Unicode::Collate' => '1.29',
--- bin/biber
+++ bin/biber 2021-04-07 10:32:14.806230488 +0000
@@ -130,6 +130,8 @@ GetOptions(
) or pod2usage(-verbose => 0,
-exitval => EXIT_ERROR);
+$opts->{'ssl-nointernalca'} = 1;
+
# verbose > 1 uses external perldoc, this doesn't work with PAR::Packer binaries
# so use "-noperldoc" to use built-in POD::Text
if (exists $opts->{'help'}) {

39
biber-perl-5.18.2.dif Normal file
View File

@ -0,0 +1,39 @@
With perl-5.18.2 macros like
{\v S}
\s S
do not work.
---
t/tdata/names.bib | 4 ++--
t/utils.t | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- t/utils.t
+++ t/utils.t 2016-02-03 11:03:21.266959058 +0000
@@ -66,7 +66,7 @@ eq_or_diff(File::Spec->canonpath(locate_
eq_or_diff(normalise_string('"a, bc: d" ', 1), 'a bc d', 'normalise_string' );
Biber::Config->setoption('output_encoding', 'UTF-8');
-eq_or_diff(NFC(normalise_string_underscore(latex_decode('\c Se\x{c}\"ok-\foo{a}, N\`i\~no
+eq_or_diff(NFC(normalise_string_underscore(latex_decode('\c{S}e\x{c}\"ok-\foo{a}, N\`i\~no
$§+ :-) '), 0)), 'Şecöka_Nìño', 'normalise_string_underscore 1' );
eq_or_diff(normalise_string_underscore('{Foo de Bar, Graf Ludwig}', 1), 'Foo_de_Bar_Graf_Ludwig', 'normalise_string_underscore 3');
--- t/tdata/names.bib
+++ t/tdata/names.bib 2016-02-03 11:33:24.475937720 +0000
@@ -87,11 +87,11 @@
}
@BOOK{L21,
- AUTHOR = {{\v S}omeone Smith},
+ AUTHOR = {\v{S}omeone Smith},
}
@BOOK{L22,
- AUTHOR = {Someone {\v S}mith},
+ AUTHOR = {Someone \v{S}mith},
}
@BOOK{L23,

BIN
biblatex-biber-ms.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

36
biblatex-encoding.dif Normal file
View File

@ -0,0 +1,36 @@
---
lib/Biber/Output/base.pm | 1 +
lib/Biber/Output/bbl.pm | 1 +
lib/Biber/Output/dot.pm | 1 +
3 files changed, 3 insertions(+)
--- lib/Biber/Output/base.pm
+++ lib/Biber/Output/base.pm 2017-05-30 13:14:49.503601586 +0000
@@ -7,6 +7,7 @@ use Biber::Entry;
use Biber::Utils;
use Encode;
use IO::File;
+use PerlIO::encoding;
use Text::Wrap;
$Text::Wrap::columns = 80;
use Log::Log4perl qw( :no_extra_logdie_message );
--- lib/Biber/Output/bbl.pm
+++ lib/Biber/Output/bbl.pm 2017-05-30 13:19:08.950366953 +0000
@@ -12,6 +12,7 @@ use Biber::Utils;
use Encode;
use List::AllUtils qw( :all );
use IO::File;
+use PerlIO::encoding;
use Log::Log4perl qw( :no_extra_logdie_message );
use Scalar::Util qw(looks_like_number);
use Text::Wrap;
--- lib/Biber/Output/dot.pm
+++ lib/Biber/Output/dot.pm 2017-05-30 13:14:50.359610708 +0000
@@ -10,6 +10,7 @@ use Biber::Entry;
use Biber::Utils;
use List::AllUtils qw( :all );
use IO::File;
+use PerlIO::encoding;
use Log::Log4perl qw( :no_extra_logdie_message );
use Unicode::Normalize;
my $logger = Log::Log4perl::get_logger('main');

25
biblatex-ms-encoding.dif Normal file
View File

@ -0,0 +1,25 @@
---
lib/Biber/Output/base.pm | 1 +
lib/Biber/Output/bbl.pm | 1 +
2 files changed, 2 insertions(+)
--- lib/Biber/Output/base.pm
+++ lib/Biber/Output/base.pm 2017-05-30 13:14:49.503601586 +0000
@@ -7,6 +7,7 @@ use Biber::Entry;
use Biber::Utils;
use Encode;
use IO::File;
+use PerlIO::encoding;
use Text::Wrap;
$Text::Wrap::columns = 80;
use Log::Log4perl qw( :no_extra_logdie_message );
--- lib/Biber/Output/bbl.pm
+++ lib/Biber/Output/bbl.pm 2017-05-30 13:19:08.950366953 +0000
@@ -12,6 +12,7 @@ use Biber::Utils;
use Encode;
use List::AllUtils qw( :all );
use IO::File;
+use PerlIO::encoding;
use Log::Log4perl qw( :no_extra_logdie_message );
use Scalar::Util qw(looks_like_number);
use Text::Wrap;

40
biblatex-ms-missing.dif Normal file
View File

@ -0,0 +1,40 @@
---
t/tdata/multiscript.bltxml | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
--- t/tdata/multiscript.bltxml
+++ t/tdata/multiscript.bltxml 2023-02-24 09:55:19.295728427 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="biblatexml.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<bltx:entries xmlns:bltx="http://biblatex-biber.sourceforge.net/biblatexml">
+ <bltx:entry id="bltx1" entrytype="book">
+ <bltx:names type="author" morenames="1" useprefix="true">
+ <bltx:name gender="sm">
+ <bltx:namepart type="given">
+ <bltx:namepart initial="П">Павел</bltx:namepart>
+ <bltx:namepart initial="Г">Георгиевич</bltx:namepart>
+ </bltx:namepart>
+ <bltx:namepart type="family">Булгаков</bltx:namepart>
+ </bltx:name>
+ <bltx:name>
+ <bltx:namepart type="given">Bill</bltx:namepart>
+ <bltx:namepart type="family">Smith</bltx:namepart>
+ </bltx:name>
+ </bltx:names>
+ <bltx:names type="author" msform="transliteration" mslang="ru-Grek">
+ <bltx:name gender="sm">
+ <bltx:namepart type="given">Παύλος</bltx:namepart>
+ <bltx:namepart type="family">Μπουλγκάκοφ</bltx:namepart>
+ </bltx:name>
+ <bltx:name>
+ <bltx:namepart type="given">Bill</bltx:namepart>
+ <bltx:namepart type="family">Smith</bltx:namepart>
+ </bltx:name>
+ </bltx:names>
+ <bltx:title>Мухаммад ибн муса ал-Хорезми. Около 783 около 850</bltx:title>
+ <bltx:location>Москва and London</bltx:location>
+ <bltx:annotation field="author" name="mslang" item="1">ru-Cyrl</bltx:annotation>
+ <bltx:annotation field="author" msform="transliteration" mslang="ru-Grek" name="mslang" item="2">en-US</bltx:annotation>
+ </bltx:entry>
+</bltx:entries>

33
cnf-to-paths.awk Normal file
View File

@ -0,0 +1,33 @@
/^[ \t]*[A-Z0-9_]+[ \t]*=/ {
ident = $0
sub(/^[[:blank:]]*/, "", ident)
sub(/[[:blank:]]*=.*/, "", ident)
val = $0
sub(/^.*=[[:blank:]]*/, "", val)
sub(/[[:blank:]]*$/, "", val)
gsub(/;/, ":", val)
VAR[ident] = val
}
END {
for (ident in VAR) {
val = VAR[ident]
split(val, pieces, /[:,]/)
for (one in pieces) {
match(pieces[one], /\$\{?([[:upper:]]+)\}?/, arr)
if (RSTART == 0)
continue
if (arr[1] ~ /OSFONTDIR/)
continue
if (VAR[arr[1]] ~ /\$/)
continue
gsub(/\$\{?arr[1]\}?/, VAR[arr[1]], val)
}
print "#ifndef DEFAULT_" ident
print "#define DEFAULT_" ident " \"" val "\""
print "#endif"
print ""
}
}

BIN
luametatex-230310.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

17
luametatex.dif Normal file
View File

@ -0,0 +1,17 @@
---
source/libraries/decnumber/decNumber.h | 2 ++
1 file changed, 2 insertions(+)
--- source/libraries/decnumber/decNumber.h
+++ source/libraries/decnumber/decNumber.h 2023-03-28 09:48:50.820268040 +0000
@@ -40,8 +40,10 @@
/* constant. This must not be changed without recompiling the */
/* decNumber library modules. */
+ #ifndef DECDPUN
#define DECDPUN 3 /* DECimal Digits Per UNit [must be >0 */
/* and <10; 3 or powers of 2 are best]. */
+ #endif
/* DECNUMDIGITS is the default number of digits that can be held in */
/* the structure. If undefined, 1 is assumed and it is assumed */

57
public.8 Normal file
View File

@ -0,0 +1,57 @@
'\" -*- coding: UTF-8 -*-
.\" Copyright (C) 2010,2012 Werner Fink
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
.\" the Free Software Foundation; either version 2 of the License, or
.\" (at your option) any later version.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.\"
.TH NOBODY 8 "Apr 27, 2012" "" "Linux System Administrator's Manual"
.SH NAME
public \- for user root run specific TeX programs as user \fImktex\fP
.br
public \- for all users run specific TeX programs as group \fImktex\fP
.SH SYNOPSIS
.B public
.RB \->\ [ texhash | mktexlsr | mktexmf | mktexpk | mktextfm ]
.SH DESCRIPTION
.B Public
drops its privileges if called by the user
.I root
by switching over to the user
.I nobdy
in a clean environment. For all users the group
.I mktex
is used.
Currently the following programs are supported:
.IP \fBtexhash\fP
\- create ls-R databases
.IP \fBmktexlsr\fP
\- create ls-R databases
.IP \fBmktexmf\fP
\- create a Metafont source file
.IP \fBmktexpk\fP
\- create a PK file for a font
.IP \fBmktextfm\fP
\- create a TFM file for a font
.SH NOTES
The umask changed to allow members of the group
.I mktex
to read and write files.
.SH AUTHOR
2012 Werner Fink
.SH "SEE ALSO"
.BR texhash (1),
.BR mktexmf (1),
.BR mktexpk (1),
.BR mktextfm (1),
.BR sudo (8).

198
public.c Normal file
View File

@ -0,0 +1,198 @@
/*
* Public For user root run a specific program as user mktex
* for user root and others use group public and umask 0002
*
* Usage: public -> [texhash|mktexlsr|mktexmf|mktexpk|mktextfm]
*
* Note: This program has to set sgid public!
*
* Copyright (C) 2010,2012 Werner Fink
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include <errno.h>
#include <limits.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifndef TEXGRP
# define TEXGRP "mktex"
#endif
#ifndef TEXUSR
# define TEXUSR "mktex"
#endif
#ifndef MKTEX
# define "/usr/lib/mktex"
#endif
extern char **environ;
/*
* This list is used to authenticate the program running.
* It is fixed at compile time to avoid a full class of
* dangers ...
*/
static struct {
const char *prog;
const char *run;
} *lp, list[] =
{ /* prog run */
{ "texhash", MKTEX "/mktexlsr" },
{ "mktexlsr", MKTEX "/mktexlsr" },
{ "mktexmf", MKTEX "/mktexmf" },
{ "mktexpk", MKTEX "/mktexpk" },
{ "mktextex", MKTEX "/mktextex" },
{ "mktextfm", MKTEX "/mktextfm" },
{ "false", "/bin/false" },
{ "true", "/bin/true" },
{ "public", "/bin/true" },
#ifdef DEBUG
{ "id", "/usr/bin/id" },
{ "printenv", "/usr/bin/printenv" },
#endif
{ 0, 0, }};
static struct {
const char *name;
const char *value;
} *ep, envp[] =
{ { "TERM", 0 },
{ "PATH", "/bin:/usr/bin" },
{ "POSIXLY_CORRECT",0 },
{ "NLSPATH", 0 },
{ "LANG", 0 },
{ "LC_ALL", 0 },
{ "LC_CTYPE", 0 },
{ "LC_COLLATE", 0 },
{ "LC_MESSAGES", 0 },
{ "COLUMNS", 0 },
{ "TABSIZE", 0 },
{ "TIME_STYLE", 0 },
{ "LS_COLORS", 0 },
{ "LS_BLOCK_SIZE", 0 },
{ "BLOCK_SIZE", 0 },
{ "BLOCKSIZE", 0 },
{ 0, 0 }};
int main(int argc, char *argv[])
{
char *program_name, *slash;
struct passwd *pwd;
struct group *grp;
uid_t ruid = getuid();
uid_t euid = geteuid();
gid_t rgid = getgid();
gid_t egid = getegid();
if ((slash = strrchr(argv[0], '/'))) {
program_name = ++slash;
} else {
program_name = argv[0];
}
for (lp = list; lp->prog && strcmp(program_name, lp->prog); lp++) ;
if (!lp->prog) {
errno = EBADRQC;
fprintf(stderr, "public: Usage:\n");
fprintf(stderr, " public linked to one of [");
for (lp = list; lp->prog; lp++)
fprintf(stderr, "%s%c", lp->prog, (lp+1)->prog ? '|' : '\0');
fprintf(stderr, "] names\n");
goto err;
}
if ((grp = getgrnam(TEXGRP)) == (struct group*)0)
goto err;
if (ruid == 0 || euid == 0) { /* If user is root switch over to mktex:mktex */
int initgrp = 0;
char *cwd;
if ((pwd = getpwnam(TEXUSR)) == (struct passwd*)0)
goto err;
if (ruid != pwd->pw_uid)
ruid = pwd->pw_uid;
if (rgid != grp->gr_gid || egid != grp->gr_gid) {
initgrp = 1;
rgid = grp->gr_gid;
}
if (setregid(rgid, pwd->pw_gid))
goto err;
if (initgrp && initgroups(pwd->pw_name, rgid))
goto err;
if (setreuid(ruid, pwd->pw_uid))
goto err;
for (ep = envp; ep->name; ep++) {
if (ep->value)
continue;
ep->value = getenv(ep->name);
}
clearenv();
if (setenv("HOME", pwd->pw_dir, 1) < 0)
goto err;
if (setenv("USER", pwd->pw_name, 1) < 0)
goto err;
if (setenv("LOGNAME", pwd->pw_name, 1) < 0)
goto err;
if (setenv("GROUP", pwd->pw_name, 1) < 0)
goto err;
if (setenv("SHELL", pwd->pw_shell, 1) < 0)
goto err;
for (ep = envp; ep->name; ep++) {
if (!ep->value)
continue;
setenv(ep->name, ep->value, 1);
}
if ((cwd = getcwd(NULL, 0))) {
if (access(cwd, X_OK) < 0) {
int ret = chdir(pwd->pw_dir);
if (ret < 0)
fprintf(stderr, "public: %s: %m\n", pwd->pw_dir);
}
free(cwd);
}
} else if (rgid != grp->gr_gid && egid == grp->gr_gid) {
rgid = grp->gr_gid;
if (setregid(rgid, grp->gr_gid))
goto err;
}
umask(0002);
execve(lp->run, argv, environ);
err:
fprintf(stderr, "public: ");
perror(program_name);
return 1;
}

31
source-64.dif Normal file
View File

@ -0,0 +1,31 @@
---
configure | 4 ++++
m4/libtool.m4 | 4 ++++
2 files changed, 8 insertions(+)
--- configure
+++ configure 2018-04-10 08:58:00.463820598 +0000
@@ -22157,6 +22157,10 @@ fi
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
+ if test -n "$ARCH_LIB" ; then
+ sys_lib_search_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+ sys_lib_dlsearch_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+ fi
dynamic_linker='GNU/Linux ld.so'
;;
--- m4/libtool.m4
+++ m4/libtool.m4 2018-04-10 08:58:00.463820598 +0000
@@ -2884,6 +2884,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
+ if test -n "$ARCH_LIB" ; then
+ sys_lib_search_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+ sys_lib_dlsearch_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+ fi
dynamic_linker='GNU/Linux ld.so'
;;

15
source-a2ping.dif Normal file
View File

@ -0,0 +1,15 @@
---
texk/texlive/linked_scripts/a2ping/a2ping.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- texk/texlive/linked_scripts/a2ping/a2ping.pl
+++ texk/texlive/linked_scripts/a2ping/a2ping.pl 2018-04-10 09:00:52.856579965 +0000
@@ -1677,7 +1677,7 @@ showpage quit
## print STDERR $res;
error $?==11 ? "segmentation fault in $GS" : "not a GS output from $GS ($?)"
if !defined $res # BUGFIX at Sun Mar 7 18:51:34 CET 2004
- or $res!~s/\A(?:\w+ Ghostscript \d|Copyright .* artofcode ).*\n// # AFPL Ghostscript 6.50 (2000-12-02)
+ or $res!~s/\A(?:\w+ Ghostscript +\d|Copyright .* artofcode ).*\n// # AFPL Ghostscript 6.50 (2000-12-02)
or $res!~s/.*?^bbox-begin\n//m;
if ($res!~s/\nbbox-success\n\Z(?!\n)/\n/) {
warning # not `error', mpost(1) `prologues:=0; ... btex fonts' output won't compile

17
source-arraysubs.dif Normal file
View File

@ -0,0 +1,17 @@
---
texk/web2c/bibtex.web | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- texk/web2c/bibtex.web
+++ texk/web2c/bibtex.web 2009-11-12 11:50:52.000000000 +0000
@@ -4315,9 +4315,9 @@ special markers |quote_next_fn| and |end
|wiz_functions| array.
@d insert_fn_loc(#) == begin
- singl_function[single_ptr] := #;
if (single_ptr = single_fn_space) then
singl_fn_overflow;
+ singl_function[single_ptr] := #;
incr(single_ptr);
end

52
source-configure.dif Normal file
View File

@ -0,0 +1,52 @@
---
configure.ac | 3 ---
m4/kpse-setup.m4 | 3 ++-
texk/dvipdfm-x/configure.ac | 2 +-
texk/dvisvgm/configure.ac | 1 +
4 files changed, 4 insertions(+), 5 deletions(-)
--- configure.ac
+++ configure.ac 2022-04-05 13:23:04.125421650 +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])
fi
-if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
-fi
KPSE_RESTORE_FLAGS
AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
--- m4/kpse-setup.m4
+++ m4/kpse-setup.m4 2022-04-05 13:23:04.201420256 +0000
@@ -30,7 +30,8 @@ AC_ARG_ENABLE([native-texlive-build],
AS_HELP_STRING([--disable-native-texlive-build],
[do not build for the TeX Live binary distribution]))[]dnl
AS_CASE([$enable_native_texlive_build],
- [yes | no], [:],
+ [yes | no], [
+ ac_configure_args="$ac_configure_args '--enable-native-texlive-build=$enable_native_texlive_build'"],
[enable_native_texlive_build=yes
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'"])
AS_CASE([$enable_largefile],
--- texk/dvipdfm-x/configure.ac
+++ texk/dvipdfm-x/configure.ac 2022-04-05 13:26:16.097900669 +0000
@@ -8,7 +8,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)], [20220710], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm (TeX Live)], [20220710], [dvipdfmx@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
--- texk/dvisvgm/configure.ac
+++ texk/dvisvgm/configure.ac 2022-04-05 13:23:04.449415706 +0000
@@ -61,6 +61,7 @@ if test "x$enable_native_texlive_build"
HAVE_LIBGS=0
else
have_libgs=yes
+ HAVE_LIBGS=$have_libgs
AC_CHECK_HEADER([ghostscript/iapi.h],
[AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])],
[have_libgs=no])

34
source-decNumber.dif Normal file
View File

@ -0,0 +1,34 @@
---
libs/icu/icu-src/source/i18n/decNumber.h | 2 ++
texk/web2c/mplibdir/decNumber.h | 2 ++
2 files changed, 4 insertions(+)
--- libs/icu/icu-src/source/i18n/decNumber.h
+++ libs/icu/icu-src/source/i18n/decNumber.h 2023-03-28 09:46:06.783388026 +0000
@@ -53,11 +53,13 @@
/* constant. This must not be changed without recompiling the */
/* decNumber library modules. */
+ #ifndef DECDPUN
/* For ICU, use one digit per byte, to make it easier to emulate the
* old DigitList interface on top of a decNumber
*/
#define DECDPUN 1 /* DECimal Digits Per UNit [must be >0 */
/* and <10; 3 or powers of 2 are best]. */
+ #endif
/* DECNUMDIGITS is the default number of digits that can be held in */
/* the structure. If undefined, 1 is assumed and it is assumed */
--- texk/web2c/mplibdir/decNumber.h
+++ texk/web2c/mplibdir/decNumber.h 2023-03-28 09:46:33.962871087 +0000
@@ -40,8 +40,10 @@
/* constant. This must not be changed without recompiling the */
/* decNumber library modules. */
+ #ifndef DECDPUN
#define DECDPUN 3 /* DECimal Digits Per UNit [must be >0 */
/* and <10; 3 or powers of 2 are best]. */
+ #endif
/* DECNUMDIGITS is the default number of digits that can be held in */
/* the structure. If undefined, 1 is assumed and it is assumed */

15
source-dvipng.dif Normal file
View File

@ -0,0 +1,15 @@
---
texk/dvipng/dvipng-src/vf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- texk/dvipng/dvipng-src/vf.c
+++ 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));
DEBUG_PRINT(DEBUG_VF,(" (%d)",tcharptr->tfmw));
- if (c >= NFNTCHARS) /* Only positive for now */
+ if (c < 0 || c >= NFNTCHARS) /* Only positive for now */
Fatal("VF font %s exceeds char numbering limit",tfontp->name);
tfontp->chr[c] = tcharptr;
tcharptr->data=position;

580
source-dviutils.dif Normal file
View File

@ -0,0 +1,580 @@
---
m4/kpse-kpathsea-flags.m4 | 2 +-
texk/seetexk/a4toa5 | 26 ++++++++++++++++++++++++++
texk/seetexk/configure | 2 +-
texk/seetexk/dvibook.c | 7 +++----
texk/seetexk/dviconcat.c | 6 ++----
texk/seetexk/dviselect.c | 8 +++-----
texk/seetexk/dvitodvi.c | 41 ++++++++++++++++++++++++++++++++---------
texk/seetexk/error.c | 14 +++++---------
texk/seetexk/gripes.h | 21 +++++++++++----------
texk/seetexk/gripes0.c | 12 +++++-------
texk/seetexk/gripes1.c | 17 +++++++++--------
texk/seetexk/mydvichk | 12 ++++++++++++
texk/seetexk/odd2even | 22 ++++++++++++++++++++++
texk/seetexk/search.c | 5 +----
texk/seetexk/seek.c | 11 +++++------
texk/seetexk/tempfile.c | 5 ++---
texk/seetexk/types.h | 2 +-
17 files changed, 141 insertions(+), 72 deletions(-)
--- m4/kpse-kpathsea-flags.m4
+++ m4/kpse-kpathsea-flags.m4 2021-04-07 09:56:20.318745619 +0000
@@ -16,7 +16,7 @@
AC_DEFUN([KPSE_KPATHSEA_FLAGS], [dnl
AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
_KPSE_TEXLIB_FLAGS([kpathsea], [kpathsea], [lt],
- [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
+ [-IBLD/texk/kpathsea -ISRC/texk/kpathsea -IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
[${top_srcdir}/../kpathsea/*.[ch]],
[${top_builddir}/../kpathsea/paths.h])
m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
--- texk/seetexk/a4toa5
+++ texk/seetexk/a4toa5 2021-04-07 09:56:20.322745677 +0000
@@ -0,0 +1,26 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
+#
+
+if (${#argv} <= 1) then
+ echo " ${0}: Usage: infile outfile"
+ exit
+endif
+
+set NumP=`mydvichk $1 | sed -e 's/totalpages=//g'`
+
+if (${NumP} % 2) then
+ echo " Odd number of pages --- this doesn't work"
+ echo " Please use odd2even: This gives an additional first pages"
+ echo " Or"
+ echo " use dvibook: It sort the pages in book form"
+ exit
+endif
+
+echo "${0}: For Printing: dvips -t landscape outfile"
+echo "${0}: For Viewing: xdvi -paper a4r outfile"
+
+#
+#exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(204mm,-10mm)' $1 $2
+#
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/configure
+++ texk/seetexk/configure 2021-04-07 09:56:20.322745677 +0000
@@ -15586,7 +15586,7 @@ elif test "x$need_kpathsea:$with_system_
as_fn_error $? "did not find kpathsea" "$LINENO" 5
fi
else
- KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk"
+ KPATHSEA_INCLUDES="-I$kpse_BLD/texk/kpathsea -I$kpse_SRC/texk/kpathsea -I$kpse_BLD/texk -I$kpse_SRC/texk"
KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la"
KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
KPATHSEA_RULE='# Rebuild libkpathsea
--- texk/seetexk/dvibook.c
+++ texk/seetexk/dvibook.c 2021-04-07 09:59:15.141300494 +0000
@@ -46,6 +46,7 @@ extern char *optarg;
extern int optind;
#endif
+#include <stdlib.h>
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -54,6 +55,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <ctype.h>
#include "seek.h"
#include "common.h"
@@ -123,10 +126,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
-#ifndef KPATHSEA
-void *malloc(), *realloc();
-void free();
-#endif
/*
* 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 2021-04-07 09:56:20.322745677 +0000
@@ -43,6 +43,8 @@ extern char *optarg;
extern int optind;
#endif
+#include <stdlib.h>
+#include <string.h>
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -110,10 +112,6 @@ char writeerr[] = "error writing DVI fil
static void HandleDVIFile(void);
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif
-
/* extern int getopt(int, char **, char*); */
/*
--- texk/seetexk/dviselect.c
+++ texk/seetexk/dviselect.c 2021-04-07 09:59:54.141870365 +0000
@@ -57,6 +57,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
#include "common.h"
@@ -173,10 +175,6 @@ static void HandleDVIFile(void);
static void PutFontSelector(i32);
static void WritePreAmble(void);
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif /* not KPATHSEA */
-
/*
* You may get lint warnings about sprintf's return value.
* Older versions of 4BSD have `char *sprintf()'. ANSI and
@@ -633,7 +631,7 @@ Usage: %s [-s] [-i infile] [-o outfile]
static struct pagelist *
InstallPL(struct pagesel *ps, int n, int absolute)
{
- register struct pagelist *pl;
+ struct pagelist *pl;
pl = (struct pagelist *)malloc(sizeof *pl);
if (pl == NULL)
--- texk/seetexk/dvitodvi.c
+++ texk/seetexk/dvitodvi.c 2021-04-07 10:02:34.816217795 +0000
@@ -46,6 +46,7 @@ extern char *optarg;
extern int optind;
#endif
+#include <stdlib.h>
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -54,6 +55,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <ctype.h>
#include "seek.h"
#include "common.h"
@@ -89,6 +92,7 @@ struct fontinfo {
i32 Width; /* width of page */
i32 Height; /* height of page */
i32 Magnification; /* Magnification of pages */
+i32 MyMag;
int Modulo; /* page spec modulo */
struct pagespec *PageSpecs; /* page specification list */
@@ -128,10 +132,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
-#ifndef KPATHSEA
-void *malloc(), *realloc();
-void free();
-#endif
static void WriteFont(struct fontinfo *fi);
static void PutFontSelector(i32 index);
@@ -192,6 +192,15 @@ scale(i32 whole, int num, int den, i32 s
return (v) ;
}
+i32 myscale(i32 whole, i32 verus, i32 sf)
+{
+ i32 v;
+
+ v = (i32) (( (double)whole * ( (double)sf / (double)verus ) ) + 0.5 );
+ return(v);
+}
+
+
struct pagespec {
int reversed, pageno, add;
i32 xoff, yoff;
@@ -299,6 +308,8 @@ parsedimen(char **sp)
fac = Height;
s++;
}
+ if (MyMag)
+ fac = myscale(fac,MyMag,1000);
whole = scale(whole, num, den, fac) ;
*sp = s;
return (neg ? -whole : whole);
@@ -501,9 +512,15 @@ HandlePostAmble(void)
PutLong(outf, Denominator);
PutLong(outf, DVIMag);
c = GetLong(inf);
- PutLong(outf, c); /* tallest page height */
+ if ( c >= Height )
+ PutLong(outf, c); /* tallest page height */
+ else
+ PutLong(outf, Height);
c = GetLong(inf);
- PutLong(outf, c); /* widest page width */
+ if ( c >= Width )
+ PutLong(outf, c); /* widest page width */
+ else
+ PutLong(outf, Width);
c = GetWord(inf)+1;
PutWord(outf, c); /* DVI stack size */
PutWord(outf, NumberOfOutputPages);
@@ -601,7 +618,8 @@ HandlePreAmble(void)
DVIFileName, DVI_VERSION);
Numerator = GetLong(inf);
Denominator = GetLong(inf);
- DVIMag = GetLong(inf) * Magnification / 1000;
+ MyMag = GetLong(inf);
+ DVIMag = MyMag * Magnification / 1000;
putbyte(outf, DVI_PRE);
putbyte(outf, DVI_VERSION);
PutLong(outf, Numerator);
@@ -639,6 +657,7 @@ main(int argc, char **argv)
Width = 0;
Height = 0;
Magnification = 1000;
+ MyMag = 0;
Modulo = 1;
ProgName = *argv;
@@ -750,12 +769,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 */
- Height = GetLong(inf);
+ Height = myscale(GetLong(inf),1000,MyMag);
else
(void) GetLong(inf); /* ignore height */
if (Width == 0) /* get width from postamble */
- Width = GetLong(inf);
+ Width = myscale(GetLong(inf),1000,MyMag);
+ else
+ (void) GetLong(inf);
PageSpecs = ParseSpecs(specstring, 1);
+ Height = myscale(Height,MyMag,1000);
+ Width = myscale(Width,MyMag,1000);
HandleDVIFile();
free(StartOfPage);
--- texk/seetexk/error.c
+++ texk/seetexk/error.c 2021-04-07 09:56:20.326745736 +0000
@@ -29,7 +29,12 @@
#include <config.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <c-auto.h>
+#include <errno.h>
#include "types.h"
#include "error.h"
@@ -37,20 +42,11 @@
extern char *ProgName; /* program name from argv[0] */
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
static FILE *trap_file; /* error diversion file, if any */
static void (*trap_fn)(int, const char *); /* trap function */
static char *trap_buf; /* buffer for trapped error strings */
static int trap_size; /* size of trap_buf */
-#ifndef KPATHSEA
-extern char *malloc(), *realloc();
-#endif
-
#if !defined (HAVE_STRERROR) && !defined (strerror)
static char *
strerror (int errnum)
--- texk/seetexk/gripes.h
+++ texk/seetexk/gripes.h 2021-04-07 09:56:20.326745736 +0000
@@ -28,16 +28,17 @@ extern const char *DVIFileName;
* Declarations for the various gripes.
*/
-void GripeOutOfMemory(int n, const char *why);
+#define __NR__ __attribute__ ((noreturn))
+void GripeOutOfMemory(int n, const char *why) __NR__;
void GripeCannotGetFont(const char *name, i32 mag, i32 dsz, const char *dev, const char *fullname);
void GripeDifferentChecksums(const char *font, i32 tfmsum, i32 fontsum);
-void GripeMissingFontsPreventOutput(int n);
-void GripeNoSuchFont(i32 n);
-void GripeFontAlreadyDefined(i32 n);
-void GripeUnexpectedDVIEOF(void);
-void GripeUnexpectedOp(const char *s);
-void GripeMissingOp(const char *s);
-void GripeCannotFindPostamble(void);
-void GripeMismatchedValue(const char *s);
-void GripeUndefinedOp(int n);
+void GripeMissingFontsPreventOutput(int n) __NR__;
+void GripeNoSuchFont(i32 n) __NR__;
+void GripeFontAlreadyDefined(i32 n) __NR__;
+void GripeUnexpectedDVIEOF(void) __NR__;
+void GripeUnexpectedOp(const char *s) __NR__;
+void GripeMissingOp(const char *s) __NR__;
+void GripeCannotFindPostamble(void) __NR__;
+void GripeMismatchedValue(const char *s) __NR__;
+void GripeUndefinedOp(int n) __NR__;
void GripeBadGlyph(i32 c, struct font *f);
--- texk/seetexk/gripes0.c
+++ texk/seetexk/gripes0.c 2021-04-07 09:56:20.326745736 +0000
@@ -28,10 +28,8 @@
#include "error.h"
#include "gripes.h"
#include <stdio.h>
-
-#ifndef WIN32
-extern int errno;
-#endif
+#include <stdlib.h>
+#include <errno.h>
/*
* Cannot allocate memory.
@@ -41,7 +39,7 @@ GripeOutOfMemory(int n, const char *why)
{
error(1, -1, "ran out of memory allocating %d bytes for %s", n, why);
- /* NOTREACHED */
+ exit(-1); /* NOTREACHED */
}
/*
@@ -86,7 +84,7 @@ WARNING: TeX and I have different checks
\t\"%s\"\n\
\tPlease notify your TeX maintainer\n\
\t(TFM checksum = 0%lo, my checksum = 0%lo)",
- font, (long)tfmsum, (long)fontsum);
+ font ? font : "", (long)tfmsum, (long)fontsum);
}
/*
@@ -99,5 +97,5 @@ GripeMissingFontsPreventOutput(int n)
error(1, 0, "%d missing font%s prevent%s output (sorry)", n,
n > 1 ? s : &s[1], n == 1 ? s : &s[1]);
- /* NOTREACHED */
+ exit(0); /* NOTREACHED */
}
--- texk/seetexk/gripes1.c
+++ texk/seetexk/gripes1.c 2021-04-07 09:56:20.326745736 +0000
@@ -29,6 +29,7 @@
#include "font.h"
#include "gripes.h"
#include <stdio.h>
+#include <stdlib.h>
static const char *
dfn(void)
@@ -40,7 +41,7 @@ dfn(void)
/*
* Save string space by declaring these here.
*/
-#if __STDC__ >= 1
+#if 0
static const char dfl[] = "DVI file";
static const char areyousure[] = "(are you sure %s is a %s?)";
#else
@@ -57,7 +58,7 @@ GripeNoSuchFont(i32 n)
error(0, 0, "%s wants font %ld, which it never defined", dfl, (long)n);
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
@@ -69,7 +70,7 @@ GripeFontAlreadyDefined(i32 n)
error(0, 0, "%s redefines font %ld", dfl, n);
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
@@ -92,7 +93,7 @@ GripeUnexpectedOp(const char *s)
error(0, 0, "unexpected %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
@@ -104,7 +105,7 @@ GripeMissingOp(const char *s)
error(0, 0, "missing %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
@@ -116,7 +117,7 @@ GripeCannotFindPostamble(void)
error(0, 0, "cannot find postamble");
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
@@ -128,7 +129,7 @@ GripeMismatchedValue(const char *s)
error(0, 0, "mismatched %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
@@ -140,7 +141,7 @@ GripeUndefinedOp(int n)
error(0, 0, "undefined DVI opcode %d", n);
error(1, 0, areyousure, dfn(), dfl);
- /* NOTREACHED */
+ exit (0); /* NOTREACHED */
}
/*
--- texk/seetexk/mydvichk
+++ texk/seetexk/mydvichk 2021-04-07 09:56:20.326745736 +0000
@@ -0,0 +1,12 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
+#
+dvitype ${1} <<DONE |& tr " " "\012" | fgrep totalpages
+0
+
+
+
+0
+DONE
+
+exit(0)
--- texk/seetexk/odd2even
+++ texk/seetexk/odd2even 2021-04-07 09:56:20.330745794 +0000
@@ -0,0 +1,22 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
+#
+
+if (${#argv} <= 1) then
+ echo " ${0}: Usage: infile outfile"
+ exit
+endif
+
+set NumP=`mydvichk $1 | sed -e 's/totalpages=//g'`
+
+if (${NumP} % 2) then
+ dviselect -s '=1' $1 | \
+ dvibook -q | \
+ dviselect -s '=1' | \
+ dviconcat -o $2 - $1 >& /dev/null
+ echo " ${0}: ready"
+else
+ echo " ${0}: even number of pages --- nothing to do"
+endif
+
+exit 0
--- texk/seetexk/search.c
+++ texk/seetexk/search.c 2021-04-07 09:56:20.330745794 +0000
@@ -34,6 +34,7 @@
* it runs in increasing-key-value sequence).
*/
+#include <stdlib.h>
#include "types.h"
#include "search.h"
@@ -45,10 +46,6 @@
static int DOffset; /* part of alignment code */
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif
-
struct search *
SCreate(unsigned int dsize)
{
--- texk/seetexk/seek.c
+++ texk/seetexk/seek.c 2021-04-07 09:56:20.330745794 +0000
@@ -43,6 +43,10 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <errno.h>
#include "types.h" /* for BSD_FILE_SYSTEM */
#include "seek.h"
#include "tempfile.h"
@@ -55,12 +59,7 @@
#endif
#include <sys/stat.h>
-#ifndef KPATHSEA
-long lseek();
-char *malloc();
-
-extern int errno;
-#endif
+extern int MakeRWTempFile();
/*
* Make and return a version of `f' on which fseek works (unconditionally).
--- texk/seetexk/tempfile.c
+++ texk/seetexk/tempfile.c 2021-04-07 09:56:20.330745794 +0000
@@ -25,6 +25,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
@@ -39,9 +40,7 @@
#include "types.h"
#else
#include <sys/file.h>
-
-char *getenv();
-
+#include <unistd.h>
#endif
#include "tempfile.h"
--- texk/seetexk/types.h
+++ texk/seetexk/types.h 2021-04-07 09:56:20.330745794 +0000
@@ -58,7 +58,7 @@
*
* (The bcopy provided in lib/bcopy.c does handle overlap.)
*/
-/* #define BLOCK_COPY(from, to, len) memmove(to, from, len) */
+#include <string.h>
#define BLOCK_COPY(from, to, len) memmove(to, from, len)
/*

14
source-lacheck.dif Normal file
View File

@ -0,0 +1,14 @@
---
utils/lacheck/lacheck.l | 1 +
1 file changed, 1 insertion(+)
--- utils/lacheck/lacheck.l
+++ utils/lacheck/lacheck.l 2016-01-28 12:07:17.472961598 +0000
@@ -126,6 +126,7 @@
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
/* #include <sys/param.h> */

70
source-ppc64.dif Normal file
View File

@ -0,0 +1,70 @@
---
libs/luajit/configure | 9 +++++++++
libs/luajit/m4/lj-system.m4 | 8 +++++++-
texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h | 6 +++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- libs/luajit/configure
+++ libs/luajit/configure 2020-04-30 15:42:15.998038368 +0000
@@ -15205,6 +15205,15 @@ fi
if test "x$LJHOST" = xPS3
then :
echo '-D PPE -D TOC' >>dynasm_flags
+fi
+ if grep 'LJ_ARCH_PPC_OPD 1' conftest.i >/dev/null 2>&1; then :
+ echo '-D OPD' >>dynasm_flags
+fi
+ if grep 'LJ_ARCH_PPC_OPDENV 1' conftest.i >/dev/null 2>&1; then :
+ echo '-D OPDENV' >>dynasm_flags
+fi
+ if grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1; then :
+ echo '-D ELFV2' >>dynasm_flags
fi ;; #(
*) :
;;
--- libs/luajit/m4/lj-system.m4
+++ libs/luajit/m4/lj-system.m4 2020-04-30 15:42:03.782274022 +0000
@@ -87,7 +87,13 @@ AS_CASE([$LJARCH],
AS_IF([grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1],
[DASM_ARCH=ppc64])
AS_IF([test "x$LJHOST" = xPS3],
- [echo '-D PPE -D TOC' >>dynasm_flags])])
+ [echo '-D PPE -D TOC' >>dynasm_flags])
+ AS_IF([grep 'LJ_ARCH_PPC_OPD 1' conftest.i >/dev/null 2>&1],
+ [echo '-D OPD' >>dynasm_flags])
+ AS_IF([grep 'LJ_ARCH_PPC_OPDENV 1' conftest.i >/dev/null 2>&1],
+ [echo '-D OPDENV' >>dynasm_flags])
+ AS_IF([grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1],
+ [echo '-D ELFV2' >>dynasm_flags])])
AS_IF([test "x$build" != "x$host"],
[AS_CASE([$LJHOST],
--- texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h
+++ texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h 2022-10-28 08:55:05.465324386 +0000
@@ -4128,7 +4128,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
const void* XXH_RESTRICT secret)
{
/* presumed aligned */
- unsigned long long* const xacc = (unsigned long long*) acc;
+ unsigned int* const xacc = (unsigned int*) acc;
xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */
xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */
xxh_u64x2 const v32 = { 32, 32 };
@@ -4144,7 +4144,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
/* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */
xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled);
/* acc_vec = xacc[i]; */
- xxh_u64x2 acc_vec = vec_xl(0, xacc + 2 * i);
+ xxh_u64x2 acc_vec = (xxh_u64x2)vec_xl(0, xacc + 2 * i);
acc_vec += product;
/* swap high and low halves */
@@ -4154,7 +4154,7 @@ XXH3_accumulate_512_vsx( void* XXH_REST
acc_vec += vec_xxpermdi(data_vec, data_vec, 2);
#endif
/* xacc[i] = acc_vec; */
- vec_xst(acc_vec, 0, xacc + 2 * i);
+ vec_xst((xxh_u32x4)acc_vec, 0, xacc + 2 * i);
}
}

View File

@ -0,0 +1,42 @@
---
texk/psutils/tests/playnup.2 | 8 ++++++++
texk/psutils/tests/playnup1.2 | 8 ++++++++
texk/psutils/tests/playps.2 | 8 ++++++++
3 files changed, 24 insertions(+)
--- texk/psutils/tests/playnup.2
+++ texk/psutils/tests/playnup.2 2020-03-20 12:06:37.965805617 +0000
@@ -1 +1,9 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
[1] [2] [3] [4] [5] [6] Wrote 6 pages, 16644 bytes
--- texk/psutils/tests/playnup1.2
+++ texk/psutils/tests/playnup1.2 2020-03-20 12:07:21.136995637 +0000
@@ -1 +1,9 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
[1] Wrote 1 pages, 19503 bytes
--- texk/psutils/tests/playps.2
+++ texk/psutils/tests/playps.2 2020-03-20 12:08:02.816213645 +0000
@@ -1 +1,9 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
[1] [2] [3] [4] [5] [6] Wrote 6 pages, 16696 bytes

33
source-psutils.dif Normal file
View File

@ -0,0 +1,33 @@
---
texk/psutils/psutils-src/epsffit.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--- texk/psutils/psutils-src/epsffit.c
+++ texk/psutils/psutils-src/epsffit.c 2009-08-28 14:47:37.000000000 +0000
@@ -147,9 +147,14 @@ main(int argc, char **argv)
yoffset -= lly * yscale;
}
fputs("%%EndComments\n", output);
- if (showpage)
- fputs("save /showpage{}def /copypage{}def /erasepage{}def\n", output);
- else
+ if (showpage) {
+ fputs("/startEpsffit {\n", output);
+ fputs(" /EpsffitSave {save} def\n", output);
+ fputs(" userdict 200 dict begin\n", output);
+ fputs(" /showpage{}def /copypage{}def /erasepage{}def\n", output);
+ fputs("}def\n", output);
+ fputs("startEpsffit\n", output);
+ } else
fputs("%%BeginProcSet: epsffit 1 0\n", output);
fputs("gsave\n", output);
fprintf(output, "%.3f %.3f translate\n", xoffset, yoffset);
@@ -165,7 +170,7 @@ main(int argc, char **argv)
if (bbfound) {
fputs("grestore\n", output);
if (showpage)
- fputs("restore showpage\n", output); /* just in case */
+ fputs("end EpsffitSave restore showpage\n", output); /* just in case */
} else
die("no %%%%BoundingBox:");

27
source-texdoc.dif Normal file
View File

@ -0,0 +1,27 @@
---
utils/texdoctk/texdoctk.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- utils/texdoctk/texdoctk.pl
+++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
@@ -1476,7 +1476,7 @@ sub writerc {
mv $myrc,"$myrc.save" if (-e $myrc);
open(MYRC,">$myrc");
print MYRC "# user's .texdocrc, generated by program\n
-# root of user's doc directory (from \$HOMETEXMF)
+# root of user's doc directory (from \$TEXMFHOME)
# can be left empty if \$TEXMFHOME is undefined
HOMEDOCPATH=$homedocpath_tmp
# general viewer behaviour (y or yes to make active)
@@ -1639,9 +1639,9 @@ sub readrc {
$localdocpath="$texmflocal/$localdocpath";
}
}
-# find user's $HOMETEXMF/doc, if there is one
+# find user's $TEXMFHOME/doc, if there is one
if ($icall == 2 || $pathflagh == 1) {
- $texmfhome=`kpsewhich --expand-path=${qq}\$HOMETEXMF${qq}`;
+ $texmfhome=`kpsewhich --expand-path=${qq}\$TEXMFHOME${qq}`;
chomp $texmfhome;
if (length $texmfhome) {
# if HOMEDOCPATH is not explicitly defined, it equals TEXDOCPATH

209
source-warns.dif Normal file
View File

@ -0,0 +1,209 @@
---
libs/gmp/Makefile.in | 2 +-
libs/lua53/Makefile.in | 4 ++--
libs/mpfr/Makefile.in | 2 +-
libs/teckit/TECkit-src/source/Compiler.cpp | 12 +++++++-----
texk/makeindexk/genind.h | 16 +++++++++++++++-
texk/makeindexk/mkind.h | 20 +++++++++++++++++---
texk/makeindexk/scanid.h | 16 +++++++++++++++-
texk/makeindexk/scanst.h | 16 +++++++++++++++-
8 files changed, 73 insertions(+), 15 deletions(-)
--- libs/gmp/Makefile.in
+++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -485,7 +485,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) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
--- libs/lua53/Makefile.in
+++ libs/lua53/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -238,11 +238,11 @@ am__depfiles_remade = ./$(DEPDIR)/luates
@LUA53_TREE@/src/$(DEPDIR)/lzio.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+ $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
--- libs/mpfr/Makefile.in
+++ libs/mpfr/Makefile.in 2016-06-07 13:29:33.925651292 +0000
@@ -345,7 +345,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) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
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-src/source/Compiler.cpp
+++ libs/teckit/TECkit-src/source/Compiler.cpp 2020-03-19 13:42:03.021195717 +0000
@@ -1451,11 +1451,13 @@ Compiler::Compiler(const char* txt, UInt
if (result == Z_OK) {
destLen += 8;
dest = static_cast<Byte*>(realloc(dest, destLen)); // shrink dest to fit
- WRITE(reinterpret_cast<FileHeader*>(dest)->type, kMagicNumberCmp);
- WRITE(reinterpret_cast<FileHeader*>(dest)->version, compiledSize);
- free(compiledTable);
- compiledTable = dest;
- compiledSize = destLen;
+ if (dest != NULL) {
+ WRITE(reinterpret_cast<FileHeader*>(dest)->type, kMagicNumberCmp);
+ WRITE(reinterpret_cast<FileHeader*>(dest)->version, compiledSize);
+ free(compiledTable);
+ compiledTable = dest;
+ compiledSize = destLen;
+ }
}
else
free(dest);
--- texk/makeindexk/genind.h
+++ texk/makeindexk/genind.h 2016-06-07 13:29:37.209589558 +0000
@@ -25,6 +25,20 @@
*
*/
+#ifndef __has_idx_printf
+#define __has_idx_printf
+#include <stdarg.h>
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
+{
+ int ret;
+ va_list ap;
+ va_start(ap, format);
+ ret = vfprintf(stream, format, ap);
+ va_end(ap);
+ return ret;
+}
+#endif
+
#define IND_ERROR(F) { \
if (idx_dot) { \
fprintf(ilg_fp, "\n"); \
@@ -45,7 +59,7 @@
fprintf(ilg_fp, \
"## Warning (input = %s, line = %d; output = %s, line = %d):\n -- ", \
curr->fn, curr->lc, ind_fn, ind_lc+1); \
- fprintf(ilg_fp, F, D); \
+ idx_printf(ilg_fp, F, D); \
ind_ec++; \
}
--- texk/makeindexk/mkind.h
+++ 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)
+#ifndef __has_idx_printf
+#define __has_idx_printf
+#include <stdarg.h>
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
+{
+ int ret;
+ va_list ap;
+ va_start(ap, format);
+ ret = vfprintf(stream, format, ap);
+ va_end(ap);
+ return ret;
+}
+#endif
+
#define MESSAGE(F) { \
if (verbose) \
fprintf(stderr, F); \
@@ -252,8 +266,8 @@ extern int mk_getc (FILE *str);
#define MESSAGE1(F, S) { \
if (verbose) \
- fprintf(stderr, F, S); \
- fprintf(ilg_fp, F, S); \
+ idx_printf(stderr, F, S); \
+ idx_printf(ilg_fp, F, S); \
}
#if USE_KPATHSEA /* kpathsea defines a different FATAL */
@@ -271,7 +285,7 @@ extern int mk_getc (FILE *str);
#endif
#define FATAL1(F, S) { \
- fprintf(stderr, F, S); \
+ idx_printf(stderr, F, S); \
fprintf(stderr, USAGE, pgm_fn); \
EXIT(1); \
}
--- texk/makeindexk/scanid.h
+++ texk/makeindexk/scanid.h 2016-06-07 13:29:37.209589558 +0000
@@ -118,6 +118,20 @@
idx_ec++; \
}
+#ifndef __has_idx_printf
+#define __has_idx_printf
+#include <stdarg.h>
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
+{
+ int ret;
+ va_list ap;
+ va_start(ap, format);
+ ret = vfprintf(stream, format, ap);
+ va_end(ap);
+ return ret;
+}
+#endif
+
#define IDX_ERROR1(F, D) { \
if (idx_dot) { \
fprintf(ilg_fp, "\n"); \
@@ -125,7 +139,7 @@
} \
fprintf(ilg_fp, "!! Input index error (file = %s, line = %d):\n -- ", \
idx_fn, idx_lc); \
- fprintf(ilg_fp, F, D); \
+ idx_printf(ilg_fp, F, D); \
idx_ec++; \
}
--- texk/makeindexk/scanst.h
+++ texk/makeindexk/scanst.h 2016-06-07 13:29:37.209589558 +0000
@@ -158,6 +158,20 @@
put_dot = FALSE; \
}
+#ifndef __has_idx_printf
+#define __has_idx_printf
+#include <stdarg.h>
+static __inline__ int idx_printf(FILE *stream, const char *format, ...)
+{
+ int ret;
+ va_list ap;
+ va_start(ap, format);
+ ret = vfprintf(stream, format, ap);
+ va_end(ap);
+ return ret;
+}
+#endif
+
#define STY_ERROR1(F, D) { \
if (idx_dot) { \
fprintf(ilg_fp, "\n"); \
@@ -165,7 +179,7 @@
} \
fprintf(ilg_fp, "** Input style error (file = %s, line = %d):\n -- ", \
sty_fn, sty_lc); \
- fprintf(ilg_fp, F, D); \
+ idx_printf(ilg_fp, F, D); \
sty_ec++; \
put_dot = FALSE; \
}

19
source-x11r7.dif Normal file
View File

@ -0,0 +1,19 @@
---
texk/xdvik/xdvi.h | 6 ++++++
1 file changed, 6 insertions(+)
--- texk/xdvik/xdvi.h
+++ texk/xdvik/xdvi.h 2016-01-28 12:20:33.976881969 +0000
@@ -182,6 +182,12 @@ extern unsigned long time_start, time_en
#include <inttypes.h>
#endif
+/* redefine X11 macros for our own usage, see below */
+#ifdef __STDC__
+# undef NeedFunctionPrototypes
+# undef NeedWidePrototypes
+#endif
+
/* for unused parameters */
#ifndef UNUSED
# define UNUSED(x) ((void)(x))

20
source-xdvizilla.dif Normal file
View File

@ -0,0 +1,20 @@
---
texk/xdvik/xdvizilla | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
--- texk/xdvik/xdvizilla
+++ texk/xdvik/xdvizilla 2008-09-25 10:38:16.000000000 +0000
@@ -89,12 +89,7 @@ trap 'do_cleanup' 1 2 3 7 13 15
### create a temporary directory only read/writable by user
### try mktemp if it's available
TMP_DIR=${TMPDIR-${TEMP-${TMP-/tmp}}}/${progname}.XXXXXX
-TMP_DIR=`mktemp -d "$TMP_DIR" 2> /dev/null`
-if [ $? -ne 0 ]; then
- ### fall back to unsafe creation
- TMP_DIR=${TMPDIR-${TEMP-${TMP-/tmp}}}/${progname}.$$
- (umask 077; mkdir "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'"
-fi
+TMP_DIR=$(mktemp -d "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'"
### we hard-wire the magic for DVI files here since some "file" implementations
### (e.g. on Solaris 9) don't recognize DVI files (bug #1508963)

750
source.dif Normal file
View File

@ -0,0 +1,750 @@
---
libs/icu/icu-src/source/common/Makefile.in | 2
reautoconf | 2
texk/bibtex-x/Makefile.in | 2
texk/dviljk/dvi2xx.c | 11
texk/kpathsea/c-fopen.h | 6
texk/kpathsea/c-memstr.h | 3
texk/kpathsea/cnf-to-paths.awk | 2
texk/kpathsea/db.c | 13 -
texk/kpathsea/progname.c | 4
texk/kpathsea/texmf.cnf | 140 +++++++-----
texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc | 3
texk/ps2pk/pk2bm.c | 2
texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 +
texk/texlive/linked_scripts/texlive/fmtutil-sys.sh | 1
texk/texlive/linked_scripts/texlive/fmtutil.pl | 24 +-
texk/texlive/linked_scripts/texlive/updmap-sys.sh | 1
texk/web2c/Makefile.in | 7
texk/web2c/uptexdir/tests/gkhugeng.err | 8
texk/web2c/window/regis.c | 8
texk/web2c/window/x11-Xlib.c | 8
texk/web2c/window/x11-Xt.c | 4
texk/xdvik/psgs.c | 22 +
texk/xdvik/xdvi-sh.in | 19 +
23 files changed, 225 insertions(+), 84 deletions(-)
--- reautoconf
+++ reautoconf 2022-04-05 13:46:43.207504121 +0000
@@ -94,7 +94,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here
# and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
-$do_cmd sleep 4
+# $do_cmd sleep 4
$do_say "$0: starting at `date`."
AUTOCONF=$TL_AUTOCONF
--- libs/icu/icu-src/source/common/Makefile.in
+++ libs/icu/icu-src/source/common/Makefile.in 2021-04-07 10:14:44.202880715 +0000
@@ -69,7 +69,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUUC)
# for plugin configuration
-CPPFLAGS += "-DDEFAULT_ICU_PLUGINS=\"$(libdir)/icu\" "
+CPPFLAGS += "-DDEFAULT_ICU_PLUGINS=\"/usr/lib/icu\" "
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- texk/bibtex-x/Makefile.in
+++ texk/bibtex-x/Makefile.in 2023-04-12 13:47:24.619293127 +0000
@@ -13,7 +13,7 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
+.NOTPARALLEL:
VPATH = @srcdir@
am__is_gnu_make = { \
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2021-04-07 10:14:44.206880772 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
setbuf(ERR_STREAM, NULL);
#ifdef KPATHSEA
+# if defined(LJ)
kpse_set_program_name(argv[0], "dvilj");
+# endif
+# if defined(LJ2P)
+ kpse_set_program_name(argv[0], "dvilj2p");
+# endif
+# if defined(LJ4) && !defined(LJ4L)
+ kpse_set_program_name(argv[0], "dvilj4");
+# endif
+# if defined(LJ4) && defined(LJ4L)
+ kpse_set_program_name(argv[0], "dvilj4l");
+# endif
kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
G_progname = kpse_program_name;
#else
--- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2021-04-07 10:14:44.206880772 +0000
@@ -38,17 +38,17 @@
/* How to open a binary file for reading: */
#ifndef FOPEN_RBIN_MODE
-#define FOPEN_RBIN_MODE "rb"
+#define FOPEN_RBIN_MODE "r"
#endif /* not FOPEN_RBIN_MODE */
/* How to open a binary file for writing: */
#ifndef FOPEN_WBIN_MODE
-#define FOPEN_WBIN_MODE "wb"
+#define FOPEN_WBIN_MODE "w"
#endif /* not FOPEN_WBIN_MODE */
/* How to open a binary file for appending: */
#ifndef FOPEN_ABIN_MODE
-#define FOPEN_ABIN_MODE "ab"
+#define FOPEN_ABIN_MODE "a"
#endif /* not FOPEN_ABIN_MODE */
/* How to switch an already open file handle to binary mode.
--- texk/kpathsea/c-memstr.h
+++ texk/kpathsea/c-memstr.h 2021-04-07 10:14:44.206880772 +0000
@@ -37,6 +37,7 @@
/* For ancient systems that lack the system V/ANSI version of the
string functions we express them in terms of the BSD versions. */
+#ifndef __GNUC__
#if !defined(HAVE_STRCHR) && !defined(strchr)
#define strchr index
#endif
@@ -60,4 +61,6 @@ extern char *strstr ();
#endif
#endif
+#endif /* not __GNUC__ */
+
#endif /* not KPATHSEA_C_MEMSTR_H */
--- texk/kpathsea/cnf-to-paths.awk
+++ texk/kpathsea/cnf-to-paths.awk 2021-04-07 10:14:44.206880772 +0000
@@ -40,7 +40,7 @@
val = $0;
sub(/^.*=[ \t]*/, "", val);
sub(/[ \t]*$/, "", val);
- #print "got ident", ident, "and val", val >"/dev/stderr";
+print "got ident", ident, "and val", val >"/dev/stderr";
if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2021-04-07 10:14:44.206880772 +0000
@@ -93,7 +93,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);
string cur_dir = NULL; /* First thing in ls-R might be a filename. */
- FILE *db_file = fopen (db_filename, FOPEN_R_MODE);
+ struct stat statdb;
+ FILE *db_file;
#if defined(MONOCASE_FILENAMES)
string pp;
#endif /* MONOCASE_FILENAMES */
@@ -101,7 +102,15 @@ db_build (kpathsea kpse, hash_table_type
strncpy (top_dir, db_filename, len);
top_dir[len] = 0;
- if (db_file) {
+ if ((getenv("MKTEXLSR") == NULL) &&
+ (stat(db_filename, &statdb) < 0 || statdb.st_size == 0)) {
+ char buf[PATH_MAX+1];
+ snprintf(buf, PATH_MAX, "mktexlsr %s", top_dir);
+ xputenv("MKTEXLSR", "true"); /* fork loop detection */
+ system (buf);
+ }
+
+ if ((db_file = fopen (db_filename, FOPEN_R_MODE))) {
while ((line = read_line (db_file)) != NULL) {
len = strlen (line);
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2021-04-07 10:14:44.206880772 +0000
@@ -662,9 +662,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. */
kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
- sdir_parent = xdirname (sdir);
+ sdir_parent = xdirname ("/usr/share");
kpathsea_xputenv (kpse, "SELFAUTODIR", fix_selfdir (sdir_parent));
- sdir_grandparent = xdirname (sdir_parent);
+ sdir_grandparent = xdirname ("/usr/share/texmf");
kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2022-04-05 13:47:33.158601044 +0000
@@ -62,20 +62,20 @@
TEXMFROOT = $SELFAUTOPARENT
% The main tree of distributed packages and programs:
-TEXMFDIST = $TEXMFROOT/texmf-dist
+TEXMFDIST = /usr/share/texmf
% We used to have a separate /texmf tree with some core programs and files.
% Keep the variable name.
TEXMFMAIN = $TEXMFDIST
% Local additions to the distribution trees.
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
+TEXMFLOCAL = /usr/local/share/texmf
% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = $TEXMFROOT/texmf-var
+TEXMFSYSVAR = /var/lib/texmf
% TEXMFSYSCONFIG, where *-sys store configuration data.
-TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
+TEXMFSYSCONFIG = /etc/texmf
% Per-user texmf tree(s) -- organized per the TDS, as usual. To define
% more than one per-user tree, set this to a list of directories in
@@ -84,10 +84,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2023/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2023/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% This is the value manipulated by tlmgr's auxtrees subcommand in the
% root texmf.cnf. Kpathsea warns about a literally empty string for a
@@ -108,7 +108,7 @@ TEXMFAUXTREES = {}
% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
% ever defined (the 99% common case), no extra elements will be added to
% the search paths. tlmgr takes care to end any value with a trailing comma.
-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
% Where to look for, and where mktexlsr creates, ls-R files. By default,
% this is all and only the !! elements of TEXMF, so that mktexlsr does not
@@ -116,24 +116,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX
% present, it will be used, and the disk will not (usually) be searched,
% regardless of !!. Although in principle a directory listed here need
% not contain an ls-R file, in practice they all should.
-TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE
% The system trees. These are the trees that are shared by all users.
% If a tree appears in this list, the mktex* scripts will use
% VARTEXFONTS for generated files, if the original tree isn't writable;
% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
+SYSTEXMF = $TEXMFSYSCONFIG;$TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
% 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
% from texmfcnf.lua; therefore the two values should be kept in sync.
% (As should everything else in texmf.cnf <-> texmfcnf.lua.)
-TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
+TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR;$HOMECACHE
% 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.
-VARTEXFONTS = $TEXMFVAR/fonts
% 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
@@ -144,7 +143,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
%
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
% one of the TEXMF directories (avoids overlapping ls-R files).
-
+VARTEXFONTS = /var/cache/texmf/fonts
+HOMECACHE = ${HOME}/.cache/texmf/fonts
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables.
@@ -152,7 +152,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them.
-WEB2C = $TEXMF/web2c
+WEB2C = ${TEXMFHOME}/web2c;${TEXMFSYSCONFIG}/web2c;${TEXMFSYSVAR}/web2c;$TEXMF/web2c
% This variable exists only to be redefined; it is used in nearly all
% search paths. If a document has source files not only in the current
@@ -304,7 +304,7 @@ TEXINPUTS.frpdftex = $TEXMFDOTDIR;$
TEXINPUTS = $TEXMFDOTDIR;$TEXMF/tex/{$progname,generic,latex,}//
% Metafont, MetaPost inputs.
-MFINPUTS = $TEXMFDOTDIR;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+MFINPUTS = $TEXMFDOTDIR;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source//
MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost//
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
@@ -314,31 +314,31 @@ MPINPUTS = $TEXMFDOTDIR;$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.
-TEXFORMATS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}
-MFBASES = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}
-MPMEMS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}
+TEXFORMATS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}//
+MFBASES = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}//
+MPMEMS = $TEXMFDOTDIR;$TEXMF/web2c{/$engine,}//
%
% As of 2008, pool files don't exist any more (the strings are compiled
% into the binaries), but just in case something expects to find these:
-TEXPOOL = $TEXMFDOTDIR;$TEXMF/web2c
+TEXPOOL = $TEXMFDOTDIR;$WEB2C
MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL}
% support the original xdvi. Must come before the generic settings.
-PKFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
+PKFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s;{$HOMECACHE,$VARTEXFONTS}/pk/{%m,modeless}//
VFFONTS.XDvi = $TEXMFDOTDIR;$TEXMF/%s
PSHEADERS.XDvi = $TEXMFDOTDIR;$TEXMF/%q{dvips,fonts/type1}//
TEXPICTS.XDvi = $TEXMFDOTDIR;$TEXMF/%q{dvips,tex}//
% Device-independent font metric files.
VFFONTS = $TEXMFDOTDIR;$TEXMF/fonts/vf//
-TFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
+TFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/tfm//
% The $MAKETEX_MODE below means the drivers will not use a cx font when
% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init
% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual.
% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
+PKFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
% Similarly for the GF format, which only remains in existence because
% Metafont outputs it (and MF isn't going to change).
@@ -446,8 +446,8 @@ MPSUPPORT = $TEXMFDOTDIR;$TEXMF/metapost
% 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.)
-MIMELIBDIR = $TEXMFROOT/etc
-MAILCAPLIBDIR = $TEXMFROOT/etc
+MIMELIBDIR = /etc
+MAILCAPLIBDIR = /etc
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
@@ -471,10 +471,10 @@ WEBINPUTS = $TEXMFDOTDIR;$TEXMF/web//
CWEBINPUTS = $TEXMFDOTDIR;$TEXMF/cweb//
% Omega-related fonts and other files.
-OFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
+OFMFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ofm,tfm}//
+OPLFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/opl//
+OVFFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}//
+OVPFONTS = $TEXMFDOTDIR;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp//
OTPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/otp//
OCPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/ocp//
@@ -570,32 +570,38 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scrip
% explicitly list every directory. Arguably more understandable anyway.
%
TEXMFCNF = {\
-$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
-$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,\
-$SELFAUTOLOC/texmf-dist/web2c,\
-$SELFAUTOLOC/texmf/web2c,\
-\
-$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,\
-$SELFAUTODIR/texmf-dist/web2c,\
-$SELFAUTODIR/texmf/web2c,\
-\
-$SELFAUTOGRANDPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT,\
-\
-$SELFAUTOPARENT/share/texmf-local/web2c,\
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
-$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT/texmf-dist/web2c,\
-$SELFAUTOPARENT/texmf/web2c\
+/etc/texmf,\
+/etc/texmf/web2c,\
+/var/lib/texmf/web2c,\
+/usr/share/texmf/web2c\
}
+%TEXMFCNF = {\
+%$SELFAUTOLOC,\
+%$SELFAUTOLOC/share/texmf-local/web2c,\
+%$SELFAUTOLOC/share/texmf-dist/web2c,\
+%$SELFAUTOLOC/share/texmf/web2c,\
+%$SELFAUTOLOC/texmf-local/web2c,\
+%$SELFAUTOLOC/texmf-dist/web2c,\
+%$SELFAUTOLOC/texmf/web2c,\
+%\
+%$SELFAUTODIR,\
+%$SELFAUTODIR/share/texmf-local/web2c,\
+%$SELFAUTODIR/share/texmf-dist/web2c,\
+%$SELFAUTODIR/share/texmf/web2c,\
+%$SELFAUTODIR/texmf-local/web2c,\
+%$SELFAUTODIR/texmf-dist/web2c,\
+%$SELFAUTODIR/texmf/web2c,\
+%\
+%$SELFAUTOGRANDPARENT/texmf-local/web2c,\
+%$SELFAUTOPARENT,\
+%\
+%$SELFAUTOPARENT/share/texmf-local/web2c,\
+%$SELFAUTOPARENT/share/texmf-dist/web2c,\
+%$SELFAUTOPARENT/share/texmf/web2c,\
+%$SELFAUTOPARENT/texmf-local/web2c,\
+%$SELFAUTOPARENT/texmf-dist/web2c,\
+%$SELFAUTOPARENT/texmf/web2c\
+%}
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -921,3 +927,33 @@ guess_input_kanji_encoding = 1
% command_line_encoding = none
% in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf.
command_line_encoding = utf-8
+
+% These are xmltex specific
+main_memory.xmltex = 2500000
+param_size.xmltex = 1500
+stack_size.xmltex = 1500
+hash_extra.xmltex = 50000
+string_vacancies.xmltex = 45000
+pool_free.xmltex = 47500
+nest_size.xmltex = 500
+save_size.xmltex = 10000
+pool_size.xmltex = 500000
+max_strings.xmltex = 55000
+
+% These are pdfxmltex specific
+main_memory.pdfxmltex = 2500000
+param_size.pdfxmltex = 1500
+stack_size.pdfxmltex = 1500
+hash_extra.pdfxmltex = 50000
+string_vacancies.pdfxmltex = 45000
+pool_free.pdfxmltex = 47500
+nest_size.pdfxmltex = 500
+save_size.pdfxmltex = 10000
+pool_size.pdfxmltex = 500000
+max_strings.pdfxmltex = 55000
+
+% These are jadetex specific
+main_memory.jadetex = 499999
+hash_extra.jadetex = 25000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
--- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2021-04-07 10:14:44.206880772 +0000
@@ -67,6 +67,9 @@
# include <io.h>
#endif
+#undef SHAREDIR
+#define SHAREDIR "/usr/share/texmf/fonts/map/glyphlist"
+
using namespace Efont;
#define VERSION_OPT 301
--- texk/ps2pk/pk2bm.c
+++ texk/ps2pk/pk2bm.c 2021-04-07 10:23:07.138231549 +0000
@@ -103,7 +103,7 @@ invalid:
}
}
- if (argc == 0) {
+ if (argc != 1) {
msg ("pk2bm (ps2pk) version " PACKAGE_VERSION " (" TL_VERSION ")\n");
msg ("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT);
--- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2022-04-05 13:52:00.765759055 +0000
@@ -226,16 +226,27 @@ end
local dvips = "dvips -e0"
-- option -e0 suppresses dvips "feature" of adjusting location to align
-- characters in words of text
+local base=string.explode(arg[0], "/+")
+base=string.explode(base[#base], ".+")
+base=base[1]
function defaults()
xml2pmx = "xml2pmx"
prepmx = "prepmx"
pmx = "pmxab"
autosp = "autosp"
- tex = "etex"
+ if base == "pdfmusixtex" then
+ tex = "pdfetex"
+ dvips = ""
+ dvi = ""
+ ps2pdf = ""
+ else
+ tex = "etex"
+ dvips = "dvips -e0"
+ dvi = dvips
+ ps2pdf = "ps2pdf"
+ end
musixflx = "musixflx"
- dvi = dvips
- ps2pdf = "ps2pdf"
cleanup = true -- clean up intermediate and log files
index = false
latex = false
--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2021-04-07 10:14:44.206880772 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2022-04-05 13:53:52.711731787 +0000
@@ -10,16 +10,16 @@
# History:
# Original shell script 2001 Thomas Esser, public domain
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
require "mktexlsr.pl";
TeX::Update->import();
}
@@ -76,7 +76,7 @@ TeXLive::TLUtils::prepend_own_path();
# this function checks by itself whether it is running on windows or not
reset_root_home();
-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -413,7 +413,14 @@ sub callback_build_formats {
TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
}
} else {
+ my ($uid, $gid);
$tmpdir = File::Temp::tempdir(CLEANUP => 1);
+ if ($> == 0 && ($uid=getpwnam("mktex")) && ($gid=getgrnam("mktex"))) {
+ my $cnt = chown $uid, $gid, $tmpdir;
+ 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
@@ -726,6 +733,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
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
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.
@@ -785,11 +793,15 @@ sub rebuild_one_format {
",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
return $FMT_NOTAVAIL;
} else {
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_error("not building $fmt due to missing engine: $eng\n");
return $FMT_FAILURE;
}
}
+ if ($ENV{batchmode} and $ENV{batchmode} eq "yes") {
+ $texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
+ }
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 2021-04-07 10:14:44.210880832 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec updmap --sys ${1+"$@"}
--- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2021-04-07 10:14:44.210880832 +0000
@@ -5597,7 +5597,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5
md5main_SOURCES = libmd5/md5main.c
md5main_LDADD = libmd5.a
-all: ff-config.h
+all: ff-config.h w2c/config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -5644,6 +5644,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
+.PHONY: w2c/config.h
+w2c/config.h:
+ $(MKDIR_P) w2c
+ cp $(srcdir)/w2c/config.h $@
+
$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f w2c/stamp-h1
--- texk/web2c/uptexdir/tests/gkhugeng.err
+++ texk/web2c/uptexdir/tests/gkhugeng.err 2021-04-07 10:14:44.214880889 +0000
@@ -1,3 +1,11 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
Input file is in YOKO-kumi kanji tfm format.
The fifth byte of the input file exceeds 127!
Sorry, but I can't go on; are you sure this is a TFM?
--- texk/web2c/window/regis.c
+++ texk/web2c/window/regis.c 2021-04-07 10:14:44.214880889 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
screenrow top,
screenrow bottom)
{
- printf(
+ const char *format =
#ifdef WRITEWHITE
- "%cPpP[%d,%d]W(I0)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I3)%c\\",
+ "%cPpP[%d,%d]W(I0)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I3)%c\\"
#else
- "%cPpP[%d,%d]W(I3)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I0)%c\\",
+ "%cPpP[%d,%d]W(I3)W(S1)V[%d,%d]V[%d,%d]V[%d,%d]V[%d,%d]W(S0)W(I0)%c\\"
#endif
+ ;
+ printf(format,
ESCAPE,left,bottom,right,bottom,right,top,left,top,
left,bottom,ESCAPE);
}
--- texk/web2c/window/x11-Xlib.c
+++ texk/web2c/window/x11-Xlib.c 2021-04-07 10:14:44.214880889 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
#define BORDER_WIDTH 1 /* Should get this from resource. */
#define DEFAULT_X_POSITION 0
#define DEFAULT_Y_POSITION 0
+#define DEFAULT_WIDTH 450
+#define DEFAULT_DEPTH 500
#include <mfdisplay.h>
@@ -101,12 +103,12 @@ mf_x11_initscreen(void)
sizehints.x = DEFAULT_X_POSITION;
sizehints.y = DEFAULT_Y_POSITION;
- sizehints.width = screenwidth;
- sizehints.height = screendepth;
+ sizehints.width = DEFAULT_WIDTH;
+ sizehints.height = DEFAULT_DEPTH;
sizehints.flags = PPosition|PSize;
sprintf (default_geometry, "%ux%u+%u+%u",
- (unsigned int) screenwidth, (unsigned int) screendepth,
+ (unsigned int) DEFAULT_WIDTH, (unsigned int) DEFAULT_DEPTH,
DEFAULT_X_POSITION, DEFAULT_Y_POSITION);
/* Look up the geometry for this window. (Section 10.2 Obtaining X
--- texk/web2c/window/x11-Xt.c
+++ texk/web2c/window/x11-Xt.c 2021-04-07 10:14:44.214880889 +0000
@@ -18,8 +18,8 @@
#define PLANE 0
-static unsigned int mf_defwidth = 0;
-static unsigned int mf_defheight = 0;
+static unsigned int mf_defwidth = 450;;
+static unsigned int mf_defheight = 500;
static Display *mf_display;
static Window mf_window;
--- texk/xdvik/psgs.c
+++ texk/xdvik/psgs.c 2021-04-07 10:14:44.214880889 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h> /* for timeval */
#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
/* Condition for retrying a write */
#include <errno.h>
@@ -619,6 +621,26 @@ initGS(void)
perror("[xdvik] pipe");
return False;
}
+
+ if (GS_pid > 0) { /* Check if we've a running ghostscript */
+ int status, n = 0;
+ errno = 0;
+retry:
+ switch (waitpid(GS_pid, &status, WNOHANG)) {
+ case -1:
+ if (errno == EINTR)
+ goto retry;
+ return False;
+ case 0:
+ break;
+ default:
+ if (WIFEXITED(status) && WEXITSTATUS(status))
+ return False;
+ if (WIFSIGNALED(status))
+ return False;
+ break; /* Not reached */
+ }
+ }
fflush(stderr); /* to avoid double flushing */
GS_pid = vfork();
if (GS_pid == 0) { /* child */
--- texk/xdvik/xdvi-sh.in
+++ texk/xdvik/xdvi-sh.in 2021-04-07 10:14:44.214880889 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This is the xdvi wrapper script for teTeX, version 0.2.
# Copyright Thomas Esser, 1998. Permission to distribute under the terms
@@ -50,4 +50,19 @@ if test -n "$xdviappfile"; then
XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
fi
-exec @final_exec_name@ $NAMEOPT ${1+"$@"}
+uncompress=
+filename="${1+"$@"}"
+case "${filename}" in
+ *.gz) uncompress="gzip -d -c $filename" ;;
+ *.bz2) uncompress="bzip2 -d -c $filename" ;;
+esac
+if test -n "$uncompress" -a -r "$filename" ; then
+ filename="${filename##*/}"
+ tmpfile="`mktemp ${TMPDIR-/tmp}/${filename%.*}.XXXXXX`" || exit 1
+ trap 'rc=$?; rm -f $tmpfile; exit $rc' 0 1 2 3 6 13 15
+ $uncompress > $tmpfile
+ exec -a xdvi @final_exec_name@ $NAMEOPT $tmpfile
+else
+ exec -a xdvi @final_exec_name@ $NAMEOPT ${1+"$@"}
+fi
+

BIN
texlive-20230311-source.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

26
texlive-rpmlintrc Normal file
View File

@ -0,0 +1,26 @@
addFilter(".*texlive-(collection|scheme)-.*\.noarch:.*suse-filelist-empty.*")
addFilter(".*texlive-(extratools|devel)\..*:.*suse-filelist-empty.*")
addFilter(".*texlive-bin-devel\..*:.*suse-filelist-empty.*")
addFilter(".*texlive.src:.*:.*macro-in-comment.*")
addFilter(".*texlive-scheme-.*.noarch:.*:-*summary-not-capitalized.*")
addFilter(".*texlive-.*noarch:.*:.*filename-too-long-for-joliet.*")
addFilter(".*texlive-.*:.*:.*description-shorter-than-summary.*")
addFilter(".*texlive-.*-devel\..*:.*:.*no-dependency-on.*")
addFilter(".*texlive\..*no-manual-page-for-binary.*nobody.*")
addFilter(".*texlive-.*-bin\..*no-manual-page-for-binary.*")
addFilter(".*world-writable.*/var/lib/texmf/ls-R.*")
addFilter(".*world-writable.*/var/lib/texmf/db/ls-R.*")
addFilter(".*world-writable.*/var/cache/fonts/ls-R.*")
addFilter(".*world-writable.*/var/lib/texmf/.*/ls-R.*")
addFilter(".*incorrect-fsf-address.*")
addFilter(".*name-repeated-in-summary.*")
addFilter(".*non-conffile-in-etc.*/etc/texmf/ls-R.*")
addFilter(".*rpm-buildroot-usage.*")
addFilter(".*binary-or-shlib-calls-gethostbyname.*")
addFilter(".*zero-length.*")
addFilter(".*dangling-symlink.*/usr/lib/mktex/public.*")
addFilter(".*dangling-symlink.*/usr/libexec/mktex/public.*")
addFilter(".*devel-dependency.*texlive-lua-visual-debug.*")
addFilter(".*obsolete-not-provided.*")
addFilter(".*position-independent-executable-suggested.*")
addFilter(".*shared-lib-calls-exit.*")

1436
texlive.changes Normal file

File diff suppressed because it is too large Load Diff

6068
texlive.spec Normal file

File diff suppressed because it is too large Load Diff