Skip to content

Commit

Permalink
relax zlib check to just major version, following debian
Browse files Browse the repository at this point in the history
git-svn-id: svn://tug.org/texlive/trunk/Build/source@68922 c570f23f-e606-0410-a88d-b1316a301751
  • Loading branch information
kberry committed Nov 20, 2023
1 parent dbac930 commit 7fb47ba
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion texk/web2c/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
9 changes: 9 additions & 0 deletions texk/web2c/luatexdir/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion texk/web2c/luatexdir/luazlib/lzlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7fb47ba

Please sign in to comment.