commit: c16718077011876e531ca9d5ff6fdeaf55175038 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Fri Apr 2 16:39:25 2021 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Fri Apr 2 16:39:25 2021 +0000 URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=c1671807
commit patches for texlive 2021 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> ...0001-texlive-2021-unbundle-linked_scripts.patch | 206 +++++++++++++++++++++ 2021/patchea/0002-normalize-all-updmap-path.patch | 29 +++ .../0003-fix-a2ping-invocation-and-shebang.patch | 29 +++ .../0004-remove-luazlib-zlib-header-check.patch | 35 ++++ ...mx-src-libf2c-f2c.h-remove-unnecesary-mac.patch | 40 ++++ .../0006-latex2man-use-predictable-tmp.patch | 46 +++++ 6 files changed, 385 insertions(+) diff --git a/2021/patchea/0001-texlive-2021-unbundle-linked_scripts.patch b/2021/patchea/0001-texlive-2021-unbundle-linked_scripts.patch new file mode 100644 index 0000000..5e5c36c --- /dev/null +++ b/2021/patchea/0001-texlive-2021-unbundle-linked_scripts.patch @@ -0,0 +1,206 @@ +From feb238621b5b5128e45f69935e1c94a21fcd5a3b Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Fri, 2 Apr 2021 19:22:52 +0300 +Subject: [PATCH] texlive-2021: unbundle linked_scripts + +Signed-off-by: Mikle Kolyada <[email protected]> +--- + texk/texlive/linked_scripts/Makefile.in | 66 +------------------------ + 1 file changed, 2 insertions(+), 64 deletions(-) + +diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in +index e64e311..8b898a1 100644 +--- a/texk/texlive/linked_scripts/Makefile.in ++++ b/texk/texlive/linked_scripts/Makefile.in +@@ -269,14 +269,12 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \ + texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts + texmf_shell_scripts = \ + adhocfilelist/adhocfilelist.sh \ +- bibexport/bibexport.sh \ + checklistings/checklistings.sh \ + ctanbib/ctanbib \ + dtxgen/dtxgen \ + git-latexdiff/git-latexdiff \ + installfont/installfont-tl \ + latexfileversion/latexfileversion \ +- listbib/listbib \ + listings-ext/listings-ext.sh \ + ltxfileinfo/ltxfileinfo \ + pdfbook2/pdfbook2 \ +@@ -284,18 +282,14 @@ texmf_shell_scripts = \ + pdftex-quiet/pdftex-quiet \ + pdfxup/pdfxup \ + pst-pdf/ps4pdf \ +- simpdftex/simpdftex \ + texlive-extra/allcm.sh \ + texlive-extra/allneeded.sh \ + texlive-extra/dvi2fax.sh \ + texlive-extra/dvired.sh \ +- texlive-extra/fontinst.sh \ + texlive-extra/kpsetool.sh \ + texlive-extra/kpsewhere.sh \ + texlive-extra/ps2frag.sh \ + texlive-extra/pslatex.sh \ +- texlive-extra/rubibtex.sh \ +- texlive-extra/rumakeindex.sh \ + texlive-extra/texconfig-dialog.sh \ + texlive-extra/texconfig-sys.sh \ + texlive-extra/texconfig.sh \ +@@ -304,64 +298,41 @@ texmf_shell_scripts = \ + texosquery/texosquery-jre5.sh \ + texosquery/texosquery-jre8.sh \ + tikztosvg/tikztosvg \ +- typeoutfileinfo/typeoutfileinfo.sh \ +- wordcount/wordcount.sh ++ typeoutfileinfo/typeoutfileinfo.sh + + texmf_other_scripts = \ + a2ping/a2ping.pl \ +- accfonts/mkt1font \ +- accfonts/vpl2ovp \ +- accfonts/vpl2vpl \ + albatross/albatross.sh \ + arara/arara.sh \ +- attachfile2/pdfatfi.pl \ +- authorindex/authorindex \ + bib2gls/bib2gls.sh \ + bib2gls/convertgls2bib.sh \ + bundledoc/arlatex \ + bundledoc/bundledoc \ + cachepic/cachepic.tlu \ +- checkcites/checkcites.lua \ + chklref/chklref.pl \ +- cjk-gs-integrate/cjk-gs-integrate.pl \ + clojure-pamphlet/pamphletangler \ + cluttex/cluttex.lua \ +- context/perl/mptopdf.pl \ +- convbkmk/convbkmk.rb \ + crossrefware/bbl2bib.pl \ +- crossrefware/bibdoiadd.pl \ + crossrefware/bibmradd.pl \ + crossrefware/biburl2doi.pl \ +- crossrefware/bibzbladd.pl \ +- crossrefware/ltx2crossrefxml.pl \ + ctan-o-mat/ctan-o-mat.pl \ + ctanify/ctanify \ + ctanupload/ctanupload.pl \ + de-macro/de-macro \ +- diadia/diadia.lua \ + dosepsbin/dosepsbin.pl \ + dviasm/dviasm.py \ + dviinfox/dviinfox.pl \ +- ebong/ebong.py \ + epspdf/epspdf.tlu \ + epspdf/epspdftk.tcl \ + epstopdf/epstopdf.pl \ +- exceltex/exceltex \ + fig4latex/fig4latex \ + findhyph/findhyph \ +- fontools/afm2afm \ +- fontools/autoinst \ +- fontools/ot2kpx \ + fragmaster/fragmaster.pl \ + getmap/getmapdl.lua \ + glossaries/makeglossaries \ + glossaries/makeglossaries-lite.lua \ + hyperxmp/hyperxmp-add-bytecount.pl \ +- jfmutil/jfmutil.pl \ + ketcindy/ketcindy.pl \ +- kotex-utils/jamo-normalize.pl \ +- kotex-utils/komkindex.pl \ +- kotex-utils/ttf2kotexfont.pl \ + l3build/l3build.lua \ + latex-git-log/latex-git-log \ + latex-papersize/latex-papersize.py \ +@@ -371,32 +342,24 @@ texmf_other_scripts = \ + latexdiff/latexdiff.pl \ + latexdiff/latexrevise.pl \ + latexindent/latexindent.pl \ +- latexmk/latexmk.pl \ + latexpand/latexpand \ + light-latex-make/llmk.lua \ + lilyglyphs/lily-glyph-commands.py \ + lilyglyphs/lily-image-commands.py \ + lilyglyphs/lily-rebuild-pdfs.py \ + ltximg/ltximg.pl \ +- luaotfload/luaotfload-tool.lua \ +- lwarp/lwarpmk.lua \ + m-tx/m-tx.lua \ +- makedtx/makedtx.pl \ + make4ht/make4ht \ + match_parens/match_parens \ + mathspic/mathspic.pl \ +- mf2pt1/mf2pt1.pl \ +- mkgrkindex/mkgrkindex \ + mkjobtexmf/mkjobtexmf.pl \ + mkpic/mkpic \ +- multibibliography/multibibliography.pl \ + musixtex/musixflx.lua \ + musixtex/musixtex.lua \ + pax/pdfannotextractor.pl \ + pdfcrop/pdfcrop.pl \ + pdflatexpicscale/pdflatexpicscale.pl \ + pedigree-perl/pedigree.pl \ +- perltex/perltex.pl \ + petri-nets/pn2pdf \ + pfarrei/a5toa4.tlu \ + pfarrei/pfarrei.tlu \ +@@ -404,21 +367,12 @@ texmf_other_scripts = \ + pkfix/pkfix.pl \ + pmxchords/pmxchords.lua \ + pst2pdf/pst2pdf.pl \ +- ptex-fontmaps/kanji-config-updmap-sys.sh \ +- ptex-fontmaps/kanji-config-updmap-user.sh \ +- ptex-fontmaps/kanji-config-updmap.pl \ +- ptex-fontmaps/kanji-fontmap-creator.pl \ +- ptex2pdf/ptex2pdf.lua \ + purifyeps/purifyeps \ +- pygmentex/pygmentex.py \ + pythontex/depythontex.py \ + pythontex/pythontex.py \ +- rubik/rubikrotation.pl \ + spix/spix.py \ +- splitindex/splitindex.pl \ + srcredact/srcredact.pl \ + sty2dtx/sty2dtx.pl \ +- svn-multi/svn-multi.pl \ + tex4ebook/tex4ebook \ + texcount/texcount.pl \ + texdef/texdef.pl \ +@@ -434,7 +388,6 @@ texmf_other_scripts = \ + texlive/mktexpk \ + texlive/mktextfm \ + texlive/rungs.tlu \ +- texlive/tlmgr.pl \ + texlive/updmap-sys.sh \ + texlive/updmap-user.sh \ + texlive/updmap.pl \ +@@ -442,24 +395,9 @@ texmf_other_scripts = \ + texliveonfly/texliveonfly.py \ + texloganalyser/texloganalyser \ + texplate/texplate.sh \ +- thumbpdf/thumbpdf.pl \ + tlcockpit/tlcockpit.sh \ +- tlshell/tlshell.tcl \ + ulqda/ulqda.pl \ +- urlbst/urlbst \ +- vpe/vpe.pl \ +- webquiz/webquiz.py \ +- xindex/xindex.lua \ +- yplan/yplan +- +-texmf_context_scripts = \ +- context/stubs/unix/context \ +- context/stubs/unix/contextjit \ +- context/stubs/unix/luatools \ +- context/stubs/unix/mtxrun \ +- context/stubs/unix/mtxrunjit \ +- context/stubs/unix/texexec \ +- context/stubs/unix/texmfstart ++ xindex/xindex.lua + + nobase_dist_texmf_scripts_SCRIPTS = \ + $(texmf_shell_scripts) \ +-- +2.26.3 + diff --git a/2021/patchea/0002-normalize-all-updmap-path.patch b/2021/patchea/0002-normalize-all-updmap-path.patch new file mode 100644 index 0000000..4067716 --- /dev/null +++ b/2021/patchea/0002-normalize-all-updmap-path.patch @@ -0,0 +1,29 @@ +From 7dfce929c2a21d56677695b42953b6f42b05d99d Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Sun, 2 Jun 2019 13:50:24 +0300 +Subject: [PATCH 2/6] normalize all updmap path + +https://bugs.gentoo.org/show_bug.cgi?id=428350 +Normalize the path here too otherwise it may fail. + +Signed-off-by: Mikle Kolyada <[email protected]> +--- + texk/texlive/linked_scripts/texlive/updmap.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/texk/texlive/linked_scripts/texlive/updmap.pl b/texk/texlive/linked_scripts/texlive/updmap.pl +index d1cfe6c5..f0ad22e2 100755 +--- a/texk/texlive/linked_scripts/texlive/updmap.pl ++++ b/texk/texlive/linked_scripts/texlive/updmap.pl +@@ -1491,7 +1491,7 @@ sub setOptions { + + sub enable_disable_maps { + my (@what) = @_; +- my $tc = $alldata->{'changes_config'}; ++ my $tc = Cwd::abs_path($alldata->{'changes_config'}); + die "$prg: top config file $tc has not been read." + if (!defined($alldata->{'updmap'}{$tc})); + +-- +2.21.0 + diff --git a/2021/patchea/0003-fix-a2ping-invocation-and-shebang.patch b/2021/patchea/0003-fix-a2ping-invocation-and-shebang.patch new file mode 100644 index 0000000..39c5902 --- /dev/null +++ b/2021/patchea/0003-fix-a2ping-invocation-and-shebang.patch @@ -0,0 +1,29 @@ +From d30f80744348fedb7ac0f1d0ff0af4cee8a4ecf2 Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Sun, 2 Jun 2019 14:08:29 +0300 +Subject: [PATCH 3/6] fix a2ping invocation and shebang + +Signed-off-by: Mikle Kolyada <[email protected]> +--- + texk/texlive/linked_scripts/a2ping/a2ping.pl | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/texk/texlive/linked_scripts/a2ping/a2ping.pl b/texk/texlive/linked_scripts/a2ping/a2ping.pl +index 2f1a3bda..d0275dca 100755 +--- a/texk/texlive/linked_scripts/a2ping/a2ping.pl ++++ b/texk/texlive/linked_scripts/a2ping/a2ping.pl +@@ -1,9 +1,5 @@ +-#! /bin/sh +-eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \ +-;exec perl -x -- "$0" ${1+"$@"};#'if 0; +-eval 'setenv PERL_BADLANG x;exec perl -x -- "$0" $argv:q;#'.q+ +-#!perl -w +-package Htex::a2ping; $0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1; ++#! /usr/bin/perl ++package Htex::a2ping; + # Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib + # + # This program is free software, licensed under the GNU GPL, >=2.0. +-- +2.21.0 + diff --git a/2021/patchea/0004-remove-luazlib-zlib-header-check.patch b/2021/patchea/0004-remove-luazlib-zlib-header-check.patch new file mode 100644 index 0000000..f6c1fd3 --- /dev/null +++ b/2021/patchea/0004-remove-luazlib-zlib-header-check.patch @@ -0,0 +1,35 @@ +From 47ca872d418772a227f143ec17fe4341a7afaf75 Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Sun, 2 Jun 2019 14:16:09 +0300 +Subject: [PATCH 4/6] remove luazlib zlib header check + +https://bugs.gentoo.org/show_bug.cgi?id=310487 +https://bugs.gentoo.org/show_bug.cgi?id=605766 + +Signed-off-by: Mikle Kolyada <[email protected]> +--- + texk/web2c/luatexdir/luazlib/lzlib.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/texk/web2c/luatexdir/luazlib/lzlib.c b/texk/web2c/luatexdir/luazlib/lzlib.c +index e61f92d5..b03e14d4 100644 +--- a/texk/web2c/luatexdir/luazlib/lzlib.c ++++ b/texk/web2c/luatexdir/luazlib/lzlib.c +@@ -544,14 +544,6 @@ LUALIB_API int luaopen_zlib(lua_State *L) + + /* ====================================================================== */ + +- /* make sure header and library version are consistent */ +- const char* version = zlibVersion(); +- if (strncmp(version, ZLIB_VERSION, 4)) +- { +- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version); +- lua_error(L); +- } +- + /* create new metatable for zlib compression structures */ + luaL_newmetatable(L, ZSTREAMMETA); + lua_pushliteral(L, "__index"); +-- +2.21.0 + diff --git a/2021/patchea/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch b/2021/patchea/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch new file mode 100644 index 0000000..015bba9 --- /dev/null +++ b/2021/patchea/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch @@ -0,0 +1,40 @@ +From 166153198502454a8373e941b80c21ede38ddf3f Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Sun, 2 Jun 2019 14:38:31 +0300 +Subject: [PATCH 5/6] utils/pmx/pmx-src/libf2c/f2c.h: remove unnecesary macro + for abs() + +On POSIX systems, abs() is a function provided by your C Standard library, +so we don't need to define it as a macro. It is dangerous to do so because +if f2c.h is included before stdlib.h, then then macro breaks the function +prototype. + +See + +https://bugs.gentoo.org/show_bug.cgi?id=510770 + +Signed-off-by: Felix Janda <[email protected]> +Signed-off-by: Anthony G. Basile <[email protected]> +Signed-off-by: Mikle Kolyada <[email protected]> +--- + utils/pmx/pmx-src/libf2c/f2c.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/utils/pmx/pmx-src/libf2c/f2c.h b/utils/pmx/pmx-src/libf2c/f2c.h +index a8d13f6b..22c439c6 100644 +--- a/utils/pmx/pmx-src/libf2c/f2c.h ++++ b/utils/pmx/pmx-src/libf2c/f2c.h +@@ -162,8 +162,8 @@ struct Namelist { + }; + typedef struct Namelist Namelist; + +-#define abs(x) ((x) >= 0 ? (x) : -(x)) +-#define dabs(x) (doublereal)abs(x) ++extern int abs(int x); ++#define dabs(x) ((doublereal)((x) >= 0 ? (x) : -(x))) + #undef min + #undef max + #define min(a,b) ((a) <= (b) ? (a) : (b)) +-- +2.21.0 + diff --git a/2021/patchea/0006-latex2man-use-predictable-tmp.patch b/2021/patchea/0006-latex2man-use-predictable-tmp.patch new file mode 100644 index 0000000..581b0be --- /dev/null +++ b/2021/patchea/0006-latex2man-use-predictable-tmp.patch @@ -0,0 +1,46 @@ +From 5dd262d2db90dc44097131fb8f160772aed407ad Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <[email protected]> +Date: Sun, 2 Jun 2019 14:50:27 +0300 +Subject: [PATCH 6/6] latex2man: use predictable tmp + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668779 +https://bugs.gentoo.org/show_bug.cgi?id=432144 +CVE-2012-2120 (http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2120) +--- + texk/texlive/linked_scripts/latex2man/latex2man | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/texk/texlive/linked_scripts/latex2man/latex2man b/texk/texlive/linked_scripts/latex2man/latex2man +index e117d337..285c19fd 100755 +--- a/texk/texlive/linked_scripts/latex2man/latex2man ++++ b/texk/texlive/linked_scripts/latex2man/latex2man +@@ -31,8 +31,6 @@ sub date2str; + $VERSION = "1.29"; + $DATE = date2str ('$Date: 2018/11/25 13:05:37 $' =~ m|(\d+/\d+/\d+)|); + +-$tmp = "/tmp/$CMD.$$"; +- + ################################################################## + # check option and arguments + ################################################################## +@@ -153,7 +151,7 @@ $first_word = 1; # true, if the next word to be processed is the first + $list_nest = 0; # counts nesting of itemize/enumerate/description envrionments + $cur_list[0] = "";# array, indexed with list_nest, indicates kind of list: + # values are: 'enum' / 'descr' / 'item' +-$item_nr[0] = 0; # array, indexed with list_nest, counts the number of \item in the ++$item_nr[0] = 0; # array, indexed with list_nest, counts the number of W\item in the + # list + $manRS = 0; # true, if for Man a .RS was given after a \item + +@@ -2018,6 +2016,8 @@ if ($opt_t) { + open (my $SRC, "<$SrcFile") || die "$CMD: Can't open file \`$SrcFile' for reading.\n"; + if ($opt_H || $opt_T) { + # DestFile will be written in the postprocess ++ $tmp = `mktemp` || die; ++ chomp $tmp; + open (DEST, ">$tmp") || die "$CMD: Can't open file \`$tmp' for writing.\n"; + } else { + open (DEST, ">$DestFile") || die "$CMD: Can't open file \`$DestFile' for writing.\n"; +-- +2.21.0 +
