https://github.com/python/cpython/commit/bd166022b1806582e3da00c9199a9fa31038811c commit: bd166022b1806582e3da00c9199a9fa31038811c branch: 3.15 author: Miss Islington (bot) <[email protected]> committer: zware <[email protected]> date: 2026-11-12T17:13:31Z summary:
[3.15] gh-161735: Update zlib-ng to 2.2.5 on Windows (GH-161883) (cherry picked from commit a969bcf0713caac7ad5366de1eb193cf4ba25a46) Co-authored-by: Zachary Ware <[email protected]> files: A Misc/NEWS.d/next/Windows/2026-11-11-10-44-20.gh-issue-161735.MZLRnD.rst M Misc/externals.spdx.json M PCbuild/get_externals.bat M PCbuild/python.props M PCbuild/readme.txt diff --git a/Misc/NEWS.d/next/Windows/2026-11-11-10-44-20.gh-issue-161735.MZLRnD.rst b/Misc/NEWS.d/next/Windows/2026-11-11-10-44-20.gh-issue-161735.MZLRnD.rst new file mode 100644 index 000000000000000..a824533a8caa9d6 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2026-11-11-10-44-20.gh-issue-161735.MZLRnD.rst @@ -0,0 +1 @@ +Updated bundled version of ``zlib-ng`` to v2.2.5. diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index 0800347e34016db..59fbb2056c7be0c 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -175,21 +175,21 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "00bbd88709bc416cb96160ab61d3e1c8f76e106799af7328d0fe434dc7dd5004" + "checksumValue": "a9734c94080792af0b50d9c51c2cc8845c2f8ecfa4db87f6462a9b260af67f96" } ], - "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/zlib-ng-2.2.4.tar.gz", + "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/zlib-ng-2.2.5.tar.gz", "externalRefs": [ { "referenceCategory": "SECURITY", - "referenceLocator": "cpe:2.3:a:zlib-ng:zlib-ng:2.2.4:*:*:*:*:*:*:*", + "referenceLocator": "cpe:2.3:a:zlib-ng:zlib-ng:2.2.5:*:*:*:*:*:*:*", "referenceType": "cpe23Type" } ], "licenseConcluded": "NOASSERTION", "name": "zlib-ng", "primaryPackagePurpose": "SOURCE", - "versionInfo": "2.2.4" + "versionInfo": "2.2.5" }, { "SPDXID": "SPDXRef-PACKAGE-zstd", diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index b5f070ca2d858d3..dca67e1e6c0a8ae 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -60,7 +60,7 @@ set libraries=%libraries% sqlite-3.53.4.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-9.0.4.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-9.0.4.1 set libraries=%libraries% xz-5.8.1.1 -set libraries=%libraries% zlib-ng-2.2.4 +set libraries=%libraries% zlib-ng-2.2.5 set libraries=%libraries% zstd-1.5.7 for %%e in (%libraries%) do ( diff --git a/PCbuild/python.props b/PCbuild/python.props index 4c49decd7490d1b..ef6f8a88d62d090 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -110,7 +110,7 @@ <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir> <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir> - <zlibNgDir Condition="$(zlibNgDir) == ''">$(ExternalsDir)\zlib-ng-2.2.4\</zlibNgDir> + <zlibNgDir Condition="$(zlibNgDir) == ''">$(ExternalsDir)\zlib-ng-2.2.5\</zlibNgDir> <zstdDir Condition="$(zstdDir) == ''">$(ExternalsDir)\zstd-1.5.7\</zstdDir> </PropertyGroup> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index ad71ffadf1d110f..aacf627d6509e1d 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -275,7 +275,7 @@ _zstd zlib-ng Compiles zlib-ng as a static library, which is later included by pythoncore.vcxproj. This was generated using CMake against zlib-ng - version 2.2.4, and should be minimally updated as needed to adapt + version 2.2.5, and should be minimally updated as needed to adapt to changes in their source layout. The zbuild.h, zconf.h and zconf-ng.h file in the PC directory were likewise generated and vendored. _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
