synchronized texlive 68925.

clerkma · Nov 21, 2023 · 0fa87fb · 0fa87fb
1 parent a605157
commit 0fa87fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/texlive/texk/web2c/ChangeLog b/texlive/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/texlive/texk/web2c/luatexdir/ChangeLog b/texlive/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/texlive/texk/web2c/luatexdir/luazlib/lzlib.c b/texlive/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);