forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert [liblzma] update to version 5.6.0 (microsoft#37199) (microsoft…
…#37841) Resolves microsoft#37839 Reverts microsoft#37199 See https://www.openwall.com/lists/oss-security/2024/03/29/4 Note that the version database is unmodified, only the baseline is changed. Because vcpkg builds liblzma from cmake sources downloaded from github and this backdoor required modifications only present in the release tarballs, it is our belief that vcpkg customers are not affected by this problem. However, we are reverting this version out of an abundance of caution as the threat actor clearly has broad access to liblzma infrastructure, and because we believe customers will start flagging this package by version as being a problem.
- Loading branch information
1 parent
6c296b9
commit ce19164
Showing
6 changed files
with
27 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,20 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 52439b3..0b5e371 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1555,6 +1555,7 @@ if(HAVE_DECODERS AND (NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900)) | ||
@@ -574,6 +574,7 @@ if(HAVE_GETOPT_LONG) | ||
|
||
install(TARGETS "${XZDEC}" | ||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
COMPONENT "${XZDEC}_Runtime") | ||
endforeach() | ||
|
||
@@ -1618,6 +1619,7 @@ if(HAVE_DECODERS AND (NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900)) | ||
|
||
install(TARGETS lzmainfo | ||
install(TARGETS xzdec | ||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
COMPONENT lzmainfo_Runtime) | ||
COMPONENT xzdec) | ||
|
||
if(UNIX) | ||
@@ -1827,6 +1829,7 @@ if(NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900) | ||
# builds because the generated cmake_install.cmake executes serially. | ||
@@ -701,6 +702,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) | ||
|
||
install(TARGETS xz | ||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
COMPONENT xz_Runtime) | ||
COMPONENT xz) | ||
|
||
if(UNIX) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 03b8301..820d08e 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1438,7 +1443,7 @@ function(my_install_man COMPONENT SRC_FILE LINK_NAMES) | ||
endif() | ||
endfunction() | ||
@@ -584,6 +584,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblzma-config.cmake" | ||
COMPONENT liblzma_Development) | ||
|
||
|
||
- | ||
+if(BUILD_TOOLS) | ||
############################################################################# | ||
# libgnu (getopt_long) | ||
# getopt_long | ||
############################################################################# | ||
@@ -1853,7 +1858,7 @@ if(NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900) | ||
my_install_man(xz_Documentation src/xz/xz.1 "${XZ_LINKS}") | ||
@@ -793,6 +794,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) | ||
endforeach() | ||
endif() | ||
endif() | ||
- | ||
+endif(BUILD_TOOLS) | ||
+endif() | ||
|
||
############################################################################# | ||
# Scripts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,17 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 0c6d4b7..62a824a 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1273,10 +1273,15 @@ set_target_properties(liblzma PROPERTIES | ||
@@ -868,8 +868,11 @@ set_target_properties(liblzma PROPERTIES | ||
|
||
# It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. | ||
# Avoid the name lzma.dll because it would conflict with LZMA SDK. | ||
- PREFIX "" | ||
+ OUTPUT_NAME lzma | ||
IMPORT_PREFIX "" | ||
) | ||
|
||
+if(WIN32 AND NOT MINGW) | ||
+ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) | ||
+endif() | ||
+ | ||
+ | ||
|
||
# Create liblzma-config-version.cmake. | ||
# | ||
# FIXME: SameMajorVersion is correct for stable releases but it is wrong |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters