Skip to content

Commit 2ca3c85

Browse files
Update documented minimum required zlib library version (#140116)
1 parent c50d794 commit 2ca3c85

File tree

4 files changed

+20
-24
lines changed

4 files changed

+20
-24
lines changed

Doc/library/zlib.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99

1010
For applications that require data compression, the functions in this module
1111
allow compression and decompression, using the zlib library. The zlib library
12-
has its own home page at https://www.zlib.net. There are known
13-
incompatibilities between the Python module and versions of the zlib library
14-
earlier than 1.1.3; 1.1.3 has a `security vulnerability <https://zlib.net/zlib_faq.html#faq33>`_, so we recommend using
15-
1.1.4 or later.
12+
has its own home page at https://www.zlib.net. zlib 1.2.2.1 is the minium
13+
supported version.
1614

1715
zlib's functions have many options and often need to be used in a particular
1816
order. This documentation doesn't attempt to cover all of the permutations;

Doc/using/configure.rst

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,26 @@ To build optional modules:
2626

2727
* `libbz2 <https://sourceware.org/bzip2/>`_ for the :mod:`bz2` module.
2828

29-
* `libb2 <https://github.com/BLAKE2/libb2>`_ (:ref:`BLAKE2 <hashlib-blake2>`),
30-
used by :mod:`hashlib` module.
29+
* `libb2 <https://github.com/BLAKE2/libb2>`_ (:ref:`BLAKE2 <hashlib-blake2>`)
30+
for the :mod:`hashlib` module.
3131

3232
* `libffi <https://sourceware.org/libffi/>`_ 3.3.0 is the recommended
3333
minimum version for the :mod:`ctypes` module.
3434

35-
* ``liblzma``, for the :mod:`lzma` module.
35+
* ``liblzma`` for the :mod:`lzma` module.
3636

3737
* `libmpdec <https://www.bytereef.org/mpdecimal/doc/libmpdec/>`_ 2.5.0
3838
for the :mod:`decimal` module.
3939

40-
* ``libncurses`` or ``libncursesw``,
41-
for the :mod:`curses` module.
40+
* ``libncurses`` or ``libncursesw`` for the :mod:`curses` module.
4241

43-
* ``libpanel`` or ``libpanelw``,
44-
for the :mod:`curses.panel` module.
42+
* ``libpanel`` or ``libpanelw`` for the :mod:`curses.panel` module.
4543

4644
* `libreadline <https://tiswww.case.edu/php/chet/readline/rltop.html>`_ or
4745
`libedit <https://www.thrysoee.dk/editline/>`_
4846
for the :mod:`readline` module.
4947

50-
* `libuuid <https://linux.die.net/man/3/libuuid>`_, for the :mod:`uuid` module.
48+
* `libuuid <https://linux.die.net/man/3/libuuid>`_ for the :mod:`uuid` module.
5149

5250
* `OpenSSL <https://www.openssl.org/>`_ 1.1.1 is the minimum version and
5351
OpenSSL 3.0.18 is the recommended minimum version for the
@@ -57,7 +55,7 @@ To build optional modules:
5755

5856
* `Tcl/Tk <https://www.tcl-lang.org/>`_ 8.5.12 for the :mod:`tkinter` module.
5957

60-
* `zlib <https://www.zlib.net>`_ 1.1.4 is the reccomended minimum version for the
58+
* `zlib <https://www.zlib.net>`_ 1.2.2.1 is the minimum version for the
6159
:mod:`zlib` module.
6260

6361
* `zstd <https://facebook.github.io/zstd/>`_ 1.4.5 is the minimum version for

configure

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5424,7 +5424,7 @@ AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy])
54245424
dnl detect zlib from Emscripten emport
54255425
PY_CHECK_EMSCRIPTEN_PORT([ZLIB], [-sUSE_ZLIB])
54265426

5427-
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
5427+
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.2.1], [
54285428
have_zlib=yes
54295429
dnl zlib 1.2.0 (2003) added inflateCopy
54305430
AC_DEFINE([HAVE_ZLIB_COPY], [1])

0 commit comments

Comments
 (0)