Skip to content

Commit bd16602

Browse files
miss-islingtonzware
miss-islington
and
zware
authored
[3.15] gh-161735: Update zlib-ng to 2.2.5 on Windows (GH-161883)
(cherry picked from commit a969bcf) Co-authored-by: Zachary Ware <[email protected]>
1 parent 27efd65 commit bd16602

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎Misc/NEWS.d/next/Windows/2026-11-11-10-44-20.gh-issue-161735.MZLRnD.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated bundled version of ``zlib-ng`` to v2.2.5.

‎Misc/externals.spdx.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,21 +175,21 @@
175175
"checksums": [
176176
{
177177
"algorithm": "SHA256",
178-
"checksumValue": "00bbd88709bc416cb96160ab61d3e1c8f76e106799af7328d0fe434dc7dd5004"
178+
"checksumValue": "a9734c94080792af0b50d9c51c2cc8845c2f8ecfa4db87f6462a9b260af67f96"
179179
}
180180
],
181-
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/zlib-ng-2.2.4.tar.gz",
181+
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/zlib-ng-2.2.5.tar.gz",
182182
"externalRefs": [
183183
{
184184
"referenceCategory": "SECURITY",
185-
"referenceLocator": "cpe:2.3:a:zlib-ng:zlib-ng:2.2.4:*:*:*:*:*:*:*",
185+
"referenceLocator": "cpe:2.3:a:zlib-ng:zlib-ng:2.2.5:*:*:*:*:*:*:*",
186186
"referenceType": "cpe23Type"
187187
}
188188
],
189189
"licenseConcluded": "NOASSERTION",
190190
"name": "zlib-ng",
191191
"primaryPackagePurpose": "SOURCE",
192-
"versionInfo": "2.2.4"
192+
"versionInfo": "2.2.5"
193193
},
194194
{
195195
"SPDXID": "SPDXRef-PACKAGE-zstd",

‎PCbuild/get_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ set libraries=%libraries% sqlite-3.53.4.0
6060
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-9.0.4.0
6161
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-9.0.4.1
6262
set libraries=%libraries% xz-5.8.1.1
63-
set libraries=%libraries% zlib-ng-2.2.4
63+
set libraries=%libraries% zlib-ng-2.2.5
6464
set libraries=%libraries% zstd-1.5.7
6565

6666
for %%e in (%libraries%) do (

‎PCbuild/python.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
111111
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
112112
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
113-
<zlibNgDir Condition="$(zlibNgDir) == ''">$(ExternalsDir)\zlib-ng-2.2.4\</zlibNgDir>
113+
<zlibNgDir Condition="$(zlibNgDir) == ''">$(ExternalsDir)\zlib-ng-2.2.5\</zlibNgDir>
114114
<zstdDir Condition="$(zstdDir) == ''">$(ExternalsDir)\zstd-1.5.7\</zstdDir>
115115
</PropertyGroup>
116116

‎PCbuild/readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ _zstd
275275
zlib-ng
276276
Compiles zlib-ng as a static library, which is later included by
277277
pythoncore.vcxproj. This was generated using CMake against zlib-ng
278-
version 2.2.4, and should be minimally updated as needed to adapt
278+
version 2.2.5, and should be minimally updated as needed to adapt
279279
to changes in their source layout. The zbuild.h, zconf.h and
280280
zconf-ng.h file in the PC directory were likewise generated and
281281
vendored.

0 commit comments

Comments
 (0)