aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2020-04-11 19:05:15 +0300
committerMikle Kolyada <zlogene@gentoo.org>2020-04-11 19:09:48 +0300
commit0587f1e3cef04051db114a0f9a1cfc7b71148fe1 (patch)
tree197d40e594409834d540589826cb371cf5e56744
parentAdd poppler-0.87 compat patch (texlive-core-2020) (diff)
downloadtex-0587f1e3cef04051db114a0f9a1cfc7b71148fe1.tar.gz
tex-0587f1e3cef04051db114a0f9a1cfc7b71148fe1.tar.bz2
tex-0587f1e3cef04051db114a0f9a1cfc7b71148fe1.zip
2020/patches: restore some patches from tl-2019
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
-rw-r--r--2020/patches/0002-normalize-all-updmap-path.patch29
-rw-r--r--2020/patches/0003-fix-a2ping-invocation-and-shebang.patch29
-rw-r--r--2020/patches/0004-remove-luazlib-zlib-header-check.patch35
-rw-r--r--2020/patches/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch40
-rw-r--r--2020/patches/0006-latex2man-use-predictable-tmp.patch46
5 files changed, 179 insertions, 0 deletions
diff --git a/2020/patches/0002-normalize-all-updmap-path.patch b/2020/patches/0002-normalize-all-updmap-path.patch
new file mode 100644
index 0000000..4067716
--- /dev/null
+++ b/2020/patches/0002-normalize-all-updmap-path.patch
@@ -0,0 +1,29 @@
+From 7dfce929c2a21d56677695b42953b6f42b05d99d Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+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 <zlogene@gentoo.org>
+---
+ 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/2020/patches/0003-fix-a2ping-invocation-and-shebang.patch b/2020/patches/0003-fix-a2ping-invocation-and-shebang.patch
new file mode 100644
index 0000000..39c5902
--- /dev/null
+++ b/2020/patches/0003-fix-a2ping-invocation-and-shebang.patch
@@ -0,0 +1,29 @@
+From d30f80744348fedb7ac0f1d0ff0af4cee8a4ecf2 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Jun 2019 14:08:29 +0300
+Subject: [PATCH 3/6] fix a2ping invocation and shebang
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ 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/2020/patches/0004-remove-luazlib-zlib-header-check.patch b/2020/patches/0004-remove-luazlib-zlib-header-check.patch
new file mode 100644
index 0000000..f6c1fd3
--- /dev/null
+++ b/2020/patches/0004-remove-luazlib-zlib-header-check.patch
@@ -0,0 +1,35 @@
+From 47ca872d418772a227f143ec17fe4341a7afaf75 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+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 <zlogene@gentoo.org>
+---
+ 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/2020/patches/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch b/2020/patches/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch
new file mode 100644
index 0000000..015bba9
--- /dev/null
+++ b/2020/patches/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 <zlogene@gentoo.org>
+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 <felix.janda@posteo.de>
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ 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/2020/patches/0006-latex2man-use-predictable-tmp.patch b/2020/patches/0006-latex2man-use-predictable-tmp.patch
new file mode 100644
index 0000000..581b0be
--- /dev/null
+++ b/2020/patches/0006-latex2man-use-predictable-tmp.patch
@@ -0,0 +1,46 @@
+From 5dd262d2db90dc44097131fb8f160772aed407ad Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+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
+