8971d00f6c
* tar: clean up linkpath between entries
* tar: fix memory leaks when processing symlinks or parsing pax headers
* iso: be more cautious about parsing ISO-9660 timestamps
- Version 3.7.5 changes:
* fix multiple vulnerabilities identified by SAST
* cpio: ignore out-of-range gid/uid/size/ino and harden AFIO parsing
* lzop: prevent integer overflow
* rar4: protect copy_from_lzss_window_to_unp() (CVE-2024-20696, bsc#1225971)
* rar4: fix CVE-2024-26256 (CVE-2024-26256, bsc#1225972)
* rar4: fix OOB in delta and audio filter
* rar4: fix out of boundary access with large files
* rar4: add boundary checks to rgb filter
* rar4: fix OOB access with unicode filenames
* rar5: clear 'data ready' cache on window buffer reallocs
* rpm: calculate huge header sizes correctly
* unzip: unify EOF handling
* util: fix out of boundary access in mktemp functions
* uu: stop processing if lines are too long
* 7zip: fix issue when skipping first file in 7zip archive that is a multiple
of 65536 bytes
* ar: fix archive entries having no type
* lha: do not allow negative file sizes
* lha: fix integer truncation on 32-bit systems
* shar: check strdup return value
* rar5: don't try to read rediculously long names
* xar: fix another infinite loop and expat error handling
* many Windows fixes, cleanups and improvements
- Drop fix-soversion.patch, fix-bsdunzip-test.patch
* Fixed upstream
OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=128
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
Index: b/libarchive/CMakeLists.txt
|
|
===================================================================
|
|
--- a/libarchive/CMakeLists.txt
|
|
+++ b/libarchive/CMakeLists.txt
|
|
@@ -266,13 +266,13 @@ IF(ENABLE_INSTALL)
|
|
IF(BUILD_SHARED_LIBS)
|
|
INSTALL(TARGETS archive
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
|
ENDIF(BUILD_SHARED_LIBS)
|
|
INSTALL(TARGETS archive_static
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
|
INSTALL_MAN(${libarchive_MANS})
|
|
INSTALL(FILES ${include_HEADERS} DESTINATION include)
|
|
ENDIF()
|
|
Index: b/build/cmake/CreatePkgConfigFile.cmake
|
|
===================================================================
|
|
--- a/build/cmake/CreatePkgConfigFile.cmake
|
|
+++ b/build/cmake/CreatePkgConfigFile.cmake
|
|
@@ -4,7 +4,7 @@
|
|
# Set the required variables (we use the same input file as autotools)
|
|
SET(prefix ${CMAKE_INSTALL_PREFIX})
|
|
SET(exec_prefix \${prefix})
|
|
-SET(libdir \${exec_prefix}/lib)
|
|
+SET(libdir \${exec_prefix}/lib${LIB_SUFFIX})
|
|
SET(includedir \${prefix}/include)
|
|
# Now, this is not particularly pretty, nor is it terribly accurate...
|
|
# Loop over all our additional libs
|
|
@@ -29,5 +29,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
|
|
# And install it, of course ;).
|
|
IF(ENABLE_INSTALL)
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig/libarchive.pc
|
|
- DESTINATION "lib/pkgconfig")
|
|
+ DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
|
|
ENDIF()
|