Skip to content

gh-140849: Update bundled liblzma to 5.8.1 on Windows #141022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+14 −17
Open

gh-140849: Update bundled liblzma to 5.8.1 on Windows #141022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c8d361
gh-140849: Update bundled liblzma to 5.8.1 on Windows
zooba Nov 4, 2025
3e65a23
Update filters
zooba Nov 4, 2025
37a6245
Update xz sbom entry
zooba Nov 4, 2025
8fa2f5c
Remove lzip decoder
zooba Nov 5, 2025
d6a667b
SBOM and extra file
zooba Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2025-11-04-19-20-05.gh-issue-140849.YjB2ZZ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update bundled liblzma to version 5.8.1.
8 changes: 4 additions & 4 deletions Misc/externals.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,21 @@
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "a15c168e39e87d750c3dc766edc7f19bdda57dacf01e509678467eace91ad282"
"checksumValue": "1bfaba0ccacc6681d3ba85335cc7f49c24cf6f9d16f848cbd153b896d8a7d631"
}
],
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/xz-5.2.5.tar.gz",
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/xz-5.8.1.1.tar.gz",
"externalRefs": [
{
"referenceCategory": "SECURITY",
"referenceLocator": "cpe:2.3:a:tukaani:xz:5.2.5:*:*:*:*:*:*:*",
"referenceLocator": "cpe:2.3:a:tukaani:xz:5.8.1.1:*:*:*:*:*:*:*",
"referenceType": "cpe23Type"
}
],
"licenseConcluded": "NOASSERTION",
"name": "xz",
"primaryPackagePurpose": "SOURCE",
"versionInfo": "5.2.5"
"versionInfo": "5.8.1.1"
},
{
"SPDXID": "SPDXRef-PACKAGE-zlib-ng",
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ set libraries=%libraries% mpdecimal-4.0.0
set libraries=%libraries% sqlite-3.50.4.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0
set libraries=%libraries% xz-5.2.5
set libraries=%libraries% xz-5.8.1.1
set libraries=%libraries% zlib-ng-2.2.4
set libraries=%libraries% zstd-1.5.7

Expand Down
7 changes: 3 additions & 4 deletions PCbuild/liblzma.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-deprecated-declarations</AdditionalOptions>
</ClCompile>
Expand All @@ -102,9 +102,7 @@
<ClCompile Include="$(lzmaDir)src\common\tuklib_physmem.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\check\check.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc32_fast.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc32_table.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc64_fast.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc64_table.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\check\sha256.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\common\alone_decoder.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\common\alone_encoder.c" />
Expand Down Expand Up @@ -163,6 +161,7 @@
<ClCompile Include="$(lzmaDir)src\liblzma\lz\lz_encoder_mf.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\rangecoder\price_table.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\simple\arm.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\simple\arm64.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\simple\armthumb.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\simple\ia64.c" />
<ClCompile Include="$(lzmaDir)src\liblzma\simple\powerpc.c" />
Expand Down Expand Up @@ -239,7 +238,7 @@
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_decoder.h" />
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_encoder.h" />
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_private.h" />
<ClInclude Include="$(lzmaDir)windows\vs2019\config.h" />
<ClInclude Include="$(lzmaDir)windows\config.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
11 changes: 4 additions & 7 deletions PCbuild/liblzma.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<ClCompile Include="$(lzmaDir)src\liblzma\simple\arm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(lzmaDir)src\liblzma\simple\arm64.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(lzmaDir)src\liblzma\simple\armthumb.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -54,15 +57,9 @@
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc32_fast.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc32_table.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc64_fast.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(lzmaDir)src\liblzma\check\crc64_table.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(lzmaDir)src\liblzma\delta\delta_common.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -428,7 +425,7 @@
<ClInclude Include="$(lzmaDir)src\liblzma\simple\simple_private.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(lzmaDir)windows\vs2019\config.h">
<ClInclude Include="$(lzmaDir)windows\config.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<PropertyGroup>
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.50.4.0\</sqlite3Dir>
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.8.1.1\</lzmaDir>
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
Expand Down
Loading