diff options
author | Alexis Ballier <aballier@gentoo.org> | 2017-06-06 14:16:10 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2017-06-06 14:16:10 +0000 |
commit | ab8820a1e6ef2fe33c7cf67bb6b3ca8641d4fe22 (patch) | |
tree | 92404a8f010b745df565caf8faf4b1d97cabaab4 | |
parent | start adding tl2017 files (diff) | |
download | gentoo-ab8820a1e6ef2fe33c7cf67bb6b3ca8641d4fe22.tar.gz gentoo-ab8820a1e6ef2fe33c7cf67bb6b3ca8641d4fe22.tar.bz2 gentoo-ab8820a1e6ef2fe33c7cf67bb6b3ca8641d4fe22.zip |
start adding patches for tl2017
7 files changed, 339 insertions, 0 deletions
diff --git a/src/patchsets/texlive/2017/texlive-core/010_all_installedscripts.patch b/src/patchsets/texlive/2017/texlive-core/010_all_installedscripts.patch new file mode 100644 index 0000000000..0798d8e6ee --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/010_all_installedscripts.patch @@ -0,0 +1,208 @@ +Index: texlive-20170524-source/texk/texlive/tl_scripts/Makefile.in +=================================================================== +--- texlive-20170524-source.orig/texk/texlive/tl_scripts/Makefile.in ++++ texlive-20170524-source/texk/texlive/tl_scripts/Makefile.in +@@ -262,13 +262,8 @@ sh_scripts = \ + allneeded \ + dvi2fax \ + dvired \ +- fontinst \ + kpsetool \ + kpsewhere \ +- ps2frag \ +- pslatex \ +- rubibtex \ +- rumakeindex \ + texconfig-dialog \ + texconfig-sys \ + texconfig \ +@@ -292,13 +287,8 @@ dist_man_MANS = \ + e2pall.1 \ + fmtutil.1 \ + fmtutil.cnf.5 \ +- fontinst.1 \ + kpsetool.1 \ + kpsewhere.1 \ +- ps2frag.1 \ +- pslatex.1 \ +- rubibtex.1 \ +- rumakeindex.1 \ + texconfig.1 \ + texlinks.1 \ + updmap.1 \ +Index: texlive-20170524-source/texk/texlive/linked_scripts/Makefile.in +=================================================================== +--- texlive-20170524-source.orig/texk/texlive/linked_scripts/Makefile.in ++++ texlive-20170524-source/texk/texlive/linked_scripts/Makefile.in +@@ -268,31 +268,14 @@ EXTRA_DIST = scripts.lst context/stubs/u + texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts + texmf_shell_scripts = \ + adhocfilelist/adhocfilelist.sh \ +- bibexport/bibexport.sh \ + checklistings/checklistings.sh \ + dtxgen/dtxgen \ + installfont/installfont-tl \ + latexfileversion/latexfileversion \ +- listbib/listbib \ + listings-ext/listings-ext.sh \ + ltxfileinfo/ltxfileinfo \ +- lua2dox/lua2dox_filter \ + pdfbook2/pdfbook2 \ +- pdfjam/pdf180 \ +- pdfjam/pdf270 \ +- pdfjam/pdf90 \ +- pdfjam/pdfbook \ +- pdfjam/pdfflip \ +- pdfjam/pdfjam \ +- pdfjam/pdfjam-pocketmod \ +- pdfjam/pdfjam-slides3up \ +- pdfjam/pdfjam-slides6up \ +- pdfjam/pdfjoin \ +- pdfjam/pdfnup \ +- pdfjam/pdfpun \ + pdfxup/pdfxup \ +- pst-pdf/ps4pdf \ +- simpdftex/simpdftex \ + texosquery/texosquery.sh \ + texosquery/texosquery-jre5.sh \ + texosquery/texosquery-jre8.sh \ +@@ -300,101 +283,37 @@ texmf_shell_scripts = \ + + texmf_other_scripts = \ + a2ping/a2ping.pl \ +- accfonts/mkt1font \ +- accfonts/vpl2ovp \ +- accfonts/vpl2vpl \ +- arara/arara.sh \ +- authorindex/authorindex \ + bundledoc/arlatex \ + bundledoc/bundledoc \ +- cachepic/cachepic.tlu \ +- checkcites/checkcites.lua \ +- cjk-gs-integrate/cjk-gs-integrate.pl \ +- context/perl/mptopdf.pl \ +- convbkmk/convbkmk.rb \ + crossrefware/bbl2bib.pl \ +- crossrefware/bibdoiadd.pl \ + crossrefware/bibmradd.pl \ +- crossrefware/bibzbladd.pl \ +- crossrefware/ltx2crossrefxml.pl \ + ctanify/ctanify \ + ctanupload/ctanupload.pl \ + de-macro/de-macro \ +- diadia/diadia.lua \ +- dosepsbin/dosepsbin.pl \ + dviasm/dviasm.py \ +- 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 \ +- kotex-utils/jamo-normalize.pl \ +- kotex-utils/komkindex.pl \ +- kotex-utils/ttf2kotexfont.pl \ + latex-git-log/latex-git-log \ + latex-papersize/latex-papersize.py \ + latex2man/latex2man \ + latex2nemeth/latex2nemeth \ +- latexdiff/latexdiff-vc.pl \ +- latexdiff/latexdiff.pl \ +- latexdiff/latexrevise.pl \ + latexindent/latexindent.pl \ +- latexmk/latexmk.pl \ + latexpand/latexpand \ +- 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 \ +- oberdiek/pdfatfi.pl \ +- 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 \ + pkfix-helper/pkfix-helper \ + 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 \ +- splitindex/splitindex.pl \ + srcredact/srcredact.pl \ + sty2dtx/sty2dtx.pl \ +- svn-multi/svn-multi.pl \ + tex4ebook/tex4ebook \ + texcount/texcount.pl \ + texdef/texdef.pl \ +@@ -405,27 +324,13 @@ texmf_other_scripts = \ + texlive/fmtutil-sys.sh \ + texlive/fmtutil-user.sh \ + texlive/fmtutil.pl \ +- texlive/rungs.tlu \ +- texlive/tlmgr.pl \ + texlive/updmap-sys.sh \ + texlive/updmap-user.sh \ + texlive/updmap.pl \ + texliveonfly/texliveonfly.py \ +- texloganalyser/texloganalyser \ +- thumbpdf/thumbpdf.pl \ +- ulqda/ulqda.pl \ +- urlbst/urlbst \ +- vpe/vpe.pl \ +- yplan/yplan ++ texloganalyser/texloganalyser + +-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 ++texmf_context_scripts = + + nobase_dist_texmf_scripts_SCRIPTS = \ + $(texmf_shell_scripts) \ +@@ -433,7 +338,6 @@ nobase_dist_texmf_scripts_SCRIPTS = \ + $(texmf_context_scripts) + + bin_links = \ +- epstopdf:repstopdf \ + pdfcrop:rpdfcrop + + relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath diff --git a/src/patchsets/texlive/2017/texlive-core/020_all_a2ping_invocation.patch b/src/patchsets/texlive/2017/texlive-core/020_all_a2ping_invocation.patch new file mode 100644 index 0000000000..5fb4f9914f --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/020_all_a2ping_invocation.patch @@ -0,0 +1,32 @@ +Index: texlive-20170524-source/texk/texlive/linked_scripts/a2ping/a2ping.pl +=================================================================== +--- texlive-20170524-source.orig/texk/texlive/linked_scripts/a2ping/a2ping.pl ++++ texlive-20170524-source/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 -S -- "$0" ${1+"$@"};#'if 0; +-eval 'setenv PERL_BADLANG x;exec perl -x -S -- "$0" $argv:q;#'.q+ +-#!perl -w +-package Htex::a2ping; $0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1; ++#! /usr/bin/perl -w ++package Htex::a2ping; + # This Perl script was generated by JustLib2 at Wed Apr 23 09:14:13 2003. + # Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib + # +Index: texlive-20170524-source/texmf-dist/scripts/a2ping/a2ping.pl +=================================================================== +--- texlive-20170524-source.orig/texmf-dist/scripts/a2ping/a2ping.pl ++++ texlive-20170524-source/texmf-dist/scripts/a2ping/a2ping.pl +@@ -1,9 +1,5 @@ +-#! /bin/sh +-eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \ +-;exec perl -x -S -- "$0" ${1+"$@"};#'if 0; +-eval 'setenv PERL_BADLANG x;exec perl -x -S -- "$0" $argv:q;#'.q+ +-#!perl -w +-package Htex::a2ping; $0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1; ++#! /usr/bin/perl -w ++package Htex::a2ping; + # This Perl script was generated by JustLib2 at Wed Apr 23 09:14:13 2003. + # Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib + # diff --git a/src/patchsets/texlive/2017/texlive-core/030_all_updmap_normalize.patch b/src/patchsets/texlive/2017/texlive-core/030_all_updmap_normalize.patch new file mode 100644 index 0000000000..1652118d0c --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/030_all_updmap_normalize.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/show_bug.cgi?id=428350 +Normalize the path here too otherwise it may fail. + +Index: texlive-20170524-source/texmf-dist/scripts/texlive/updmap.pl +=================================================================== +--- texlive-20170524-source.orig/texmf-dist/scripts/texlive/updmap.pl ++++ texlive-20170524-source/texmf-dist/scripts/texlive/updmap.pl +@@ -1483,7 +1483,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})); + diff --git a/src/patchsets/texlive/2017/texlive-core/040_all_remove_define_abs.patch b/src/patchsets/texlive/2017/texlive-core/040_all_remove_define_abs.patch new file mode 100644 index 0000000000..2f4f30489d --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/040_all_remove_define_abs.patch @@ -0,0 +1,29 @@ +utils/pmx/pmx-2.7.0/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 <felix.janda@posteo.de> +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> + +Index: texlive-20170524-source/utils/pmx/pmx-src/libf2c/f2c.h +=================================================================== +--- texlive-20170524-source.orig/utils/pmx/pmx-src/libf2c/f2c.h ++++ texlive-20170524-source/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)) diff --git a/src/patchsets/texlive/2017/texlive-core/050_all_latex2man_predictable_tmp.patch b/src/patchsets/texlive/2017/texlive-core/050_all_latex2man_predictable_tmp.patch new file mode 100644 index 0000000000..615b5f771d --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/050_all_latex2man_predictable_tmp.patch @@ -0,0 +1,26 @@ +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) + +Index: texlive-20170524-source/texmf-dist/scripts/latex2man/latex2man +=================================================================== +--- texlive-20170524-source.orig/texmf-dist/scripts/latex2man/latex2man ++++ texlive-20170524-source/texmf-dist/scripts/latex2man/latex2man +@@ -29,8 +29,6 @@ sub date2str; + $VERSION = "1.25"; + $DATE = date2str ('$Date: 2017/06/06 14:16:10 $' =~ m|(\d+/\d+/\d+)|); + +-$tmp = "/tmp/$CMD.$$"; +- + ################################################################## + # check option and arguments + ################################################################## +@@ -2012,6 +2010,8 @@ if ($opt_t) { + + open (my $SRC, "<$SrcFile") || die "$CMD: Can't open file \`$SrcFile' for reading.\n"; + if ($opt_H || $opt_T) { ++ $tmp = `mktemp` || die; ++ chomp $tmp; + # DestFile will be written in the postprocess + open (DEST, ">$tmp") || die "$CMD: Can't open file \`$tmp' for writing.\n"; + } else { diff --git a/src/patchsets/texlive/2017/texlive-core/060_all_luatex_zlib.patch b/src/patchsets/texlive/2017/texlive-core/060_all_luatex_zlib.patch new file mode 100644 index 0000000000..deab74d315 --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/060_all_luatex_zlib.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/show_bug.cgi?id=310487 +https://bugs.gentoo.org/show_bug.cgi?id=605766 + +Index: texlive-20170524-source/texk/web2c/luatexdir/luazlib/lzlib.c +=================================================================== +--- texlive-20170524-source.orig/texk/web2c/luatexdir/luazlib/lzlib.c ++++ texlive-20170524-source/texk/web2c/luatexdir/luazlib/lzlib.c +@@ -549,14 +549,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"); diff --git a/src/patchsets/texlive/2017/texlive-core/series b/src/patchsets/texlive/2017/texlive-core/series new file mode 100644 index 0000000000..7d9ce22744 --- /dev/null +++ b/src/patchsets/texlive/2017/texlive-core/series @@ -0,0 +1,6 @@ +010_all_installedscripts.patch +020_all_a2ping_invocation.patch +030_all_updmap_normalize.patch +040_all_remove_define_abs.patch +050_all_latex2man_predictable_tmp.patch +060_all_luatex_zlib.patch |