summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-20 23:05:35 +0000
committerKarl Berry <karl@freefriends.org>2023-11-20 23:05:35 +0000
commita7ae2bcb44a1a717e35b52cdecc59dd9aa1e819a (patch)
treea06f22ea4af233021ea8ed7eaf9d35ec200a4a35 /Build
parent7fa20d9814929e9b699f1a7d28687f8567ddcc2c (diff)
relax zlib check to just major version, following debian
git-svn-id: svn://tug.org/texlive/trunk@68922 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog2
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog9
-rw-r--r--Build/source/texk/web2c/luatexdir/luazlib/lzlib.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 06b9647abec..c55fe973f75 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -2,7 +2,7 @@
* tex.ch,
* mf.ch (Undump the dynamic memory): improve fmt/base corruption
- tests, from DRF.
+ checks, from DRF.
2023-11-19 Andreas Scherer <https://ascherer.github.io>
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 3fef4a3a73a..710f2ad5b84 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,12 @@
+2023-11-20 Karl Berry <karl@freefriends.org>
+
+ * luazlib/lzlib.c: relax zlib version check to just checking
+ the major version, since (it turns out) zlib 1.3 is compatible
+ with 1.2.
+ https://github.com/TeX-Live/texlive-source/pull/62
+ https://lists.debian.org/debian-tex-maint/2010/06/msg00074.html
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581818
+
2023-10-04 Karl Berry <karl@freefriends.org>
* luaoutputdir.test: new test for Lua-level reading from a given
diff --git a/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c b/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c
index e61f92d580e..ea123e54126 100644
--- a/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c
+++ b/Build/source/texk/web2c/luatexdir/luazlib/lzlib.c
@@ -546,7 +546,7 @@ 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))
+ if (strncmp(version, ZLIB_VERSION, 2))
{
lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
lua_error(L);