Sync from SUSE:SLFO:Main libarchive revision fc000718ef611c21825c7439fff6472e

This commit is contained in:
Adrian Schröter 2024-11-04 17:35:44 +01:00
parent 55025b12d0
commit b42d104211
9 changed files with 86 additions and 62 deletions

View File

@ -1,19 +0,0 @@
commit 64e2e88ec326dd37fcb85c9a9d21fa43444a0a59
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Wed May 22 10:13:47 2024 +0200
Fix test failure on openSUSE:Leap:15.5
diff --git a/unzip/test/test_I.c b/unzip/test/test_I.c
index 5d31ce8d..92e5ce59 100644
--- a/unzip/test/test_I.c
+++ b/unzip/test/test_I.c
@@ -45,7 +45,7 @@ DEFINE_TEST(test_I)
#endif
extract_reference_file(reffile);
- r = systemf("%s -I UTF-8 %s >test.out 2>test.err", testprog, reffile);
+ r = systemf("env -uLC_ALL LC_CTYPE=en_US.UTF-8 %s -I UTF-8 %s >test.out 2>test.err", testprog, reffile);
assertEqualInt(0, r);
assertNonEmptyFile("test.out");
assertEmptyFile("test.err");

View File

@ -1,13 +0,0 @@
Index: libarchive-3.4.0/CMakeLists.txt
===================================================================
--- libarchive-3.4.0.orig/CMakeLists.txt
+++ libarchive-3.4.0/CMakeLists.txt
@@ -71,7 +71,7 @@ SET(LIBARCHIVE_VERSION_STRING "${VERSIO
# libarchive 2.9 == interface version 11 = 2 + 9
# libarchive 3.0 == interface version 12
# libarchive 3.1 == interface version 13
-math(EXPR INTERFACE_VERSION "13 + ${_minor}")
+set(INTERFACE_VERSION "13")
# Set SOVERSION == Interface version
# ?? Should there be more here ??

View File

@ -1,8 +1,8 @@
Index: libarchive-3.7.0/libarchive/CMakeLists.txt
Index: b/libarchive/CMakeLists.txt
===================================================================
--- libarchive-3.7.0.orig/libarchive/CMakeLists.txt
+++ libarchive-3.7.0/libarchive/CMakeLists.txt
@@ -265,13 +265,13 @@ IF(ENABLE_INSTALL)
--- 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
@ -20,10 +20,19 @@ Index: libarchive-3.7.0/libarchive/CMakeLists.txt
INSTALL_MAN(${libarchive_MANS})
INSTALL(FILES ${include_HEADERS} DESTINATION include)
ENDIF()
Index: libarchive-3.7.0/build/cmake/CreatePkgConfigFile.cmake
Index: b/build/cmake/CreatePkgConfigFile.cmake
===================================================================
--- libarchive-3.7.0.orig/build/cmake/CreatePkgConfigFile.cmake
+++ libarchive-3.7.0/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)

BIN
libarchive-3.7.4.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -1,14 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQGzBAABCgAdFiEE2yx88bTCZfrvVuP8WEihi48UGEsFAmYre4IACgkQWEihi48U
GEvAuwwAmsnbql7+1CW9RuBHitOvHyIL6sHbjR0Hd3ruI9s3FMevMBzPjpb5MgOU
/D+o0amv1Tv/QSJAid1siZIumgur2hzqglNMK5FkoajpZ1UjYASHHxFoh5qkRKvW
Ws/ViXMVGB2DlyydzzjFwa0JAAK/IpD9uKPPr6rgt+cRBibkWXuJILbmzi/DF1XH
zlp/5FGwzY4/zhqbXgz11ZhX3gacdLd68+xsYbSII2JvZ2yb2zsS+0ia3skUawEj
QMKzdpErqO+RedsRiJG9fjA65Q1hKWpMoWMuKZWLX+v0iv/OHv57RzLelmPy6Ohw
0/PwCHFzFmOfu2LZd+mCWsrYaBrezGJq9tm+pAsCXSxcj3LuQwZ6d8/wgtS5CeNE
+LoHCbzAcI5WiyU3wbw1qvulVDewL+j0rQoj23Lj2z9ry2K94NMpYji3JMkWI8dS
QXitZd29uZ9l5Jf5Kz9BLHOoO1Q8bEOGB33dLpT+UIjFoJ6wqxNXef6OAECoHGH0
OnEtTuAX
=kNTk
-----END PGP SIGNATURE-----

BIN
libarchive-3.7.7.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,14 @@
-----BEGIN PGP SIGNATURE-----
iQGzBAABCgAdFiEE2yx88bTCZfrvVuP8WEihi48UGEsFAmcLhAYACgkQWEihi48U
GEvyiwv7B3V7pViPWDiSzWVz4ZDf2ooCr9T71z9VwMn/fJD9roMI8bxzgmCbsVcq
tFWsoQcFfB3pj2hfD/VL6yYclL8Wj+qYFap7iVqHW55yqL6EIiQcgrwbQp8VecL/
oRZaFngsNApR3DpaCespkga9JazyT6J9vUZkBZpYAWgk1hpUcGmFGquOM+6raadU
b7I6be+a1rSbg10cwFTzk0rdg3tenDSB+GfOVI0ifBmtTlfMxLgBBz45UBFg26Bi
FzIsRrbGXz7aM+Kq5Y9PHnbsxCQXhXdeNXanYtfdnf44nmHv+3DfM2d6KQGRr7Q9
M5g/OWvJxWyOYcNC14HGLMzAbY7nvQauOoFV4+QoXesSRnxmw/H8T6UNhsRv5kbr
okqmlofJmhn/xLgOzwsgHCwwRINh0iaEfxpXKyKGqAEcF8pUCFm40NDaNc+s19uo
W9oPYIVLEdQMZfUKdgRSjVYHVOmd/cBaQtqFlU9+WJeABVlq35u2fYb5ZmMUJ/Fh
43mpllMc
=9DT8
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Thu Oct 17 08:41:56 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 3.7.7:
* gzip: prevent a hang when processing a malformed gzip inside a gzip
* tar: don't crash on truncated tar archives
* tar: fix two leaks in tar header parsing
* 7-zip: read/write symlink paths as UTF-8
* cpio: exit with an error code if an entry could not be extracted
* rar5: report encrypted entries
* tar: fix truncation of entry pathnames in specific archives
-------------------------------------------------------------------
Fri Sep 27 19:15:54 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update to 3.7.6:
* 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
-------------------------------------------------------------------
Thu Jun 20 14:56:58 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
- Update lib-suffix.patch
* Add LIB_SUFFIX to libdir path in the pkg-config file
-------------------------------------------------------------------
Wed May 22 08:32:02 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>

View File

@ -30,7 +30,7 @@
%bcond_without ext2fs
%endif
Name: libarchive
Version: 3.7.4
Version: 3.7.7
Release: 0
Summary: Utility and C library to create and read several streaming archive formats
License: BSD-2-Clause
@ -41,11 +41,6 @@ Source1: https://github.com/libarchive/libarchive/releases/download/v%{ve
Source2: libarchive.keyring
Source1000: baselibs.conf
Patch1: lib-suffix.patch
Patch2: fix-soversion.patch
# PATCH-FIX-SUSE danilo.spinella@suse.com
# bsdunzip test fails because of a locale issue, set locale properly to fix it
# It will be fixed in the next release
Patch3: fix-bsdunzip-test.patch
BuildRequires: cmake
BuildRequires: libacl-devel
BuildRequires: libbz2-devel