From 79b8f3a085b7cd66e21918ef3519da8ac29384ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 6 Apr 2025 13:55:13 -0400
Subject: [PATCH] contrib: update libarchive
Gitlab: #1122
Change-Id: I9d0aca488b52744c4b089c000f17a70d334eb54b
---
.../0001-disable-shared-library.patch | 38 -------------------
contrib/src/libarchive/SHA512SUMS | 2 +-
contrib/src/libarchive/rules.mak | 3 +-
3 files changed, 2 insertions(+), 41 deletions(-)
delete mode 100644 contrib/src/libarchive/0001-disable-shared-library.patch
diff --git a/contrib/src/libarchive/0001-disable-shared-library.patch b/contrib/src/libarchive/0001-disable-shared-library.patch
deleted file mode 100644
index 1ed5c730df..0000000000
--- a/contrib/src/libarchive/0001-disable-shared-library.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From be3942fe6fbad7de1bc47e4c2bc4b4eeb114c8da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
-Date: Mon, 10 May 2021 17:33:58 -0400
-Subject: [PATCH] disable shared library
-
----
- libarchive/CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index e1d76a51..76841623 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -237,12 +237,6 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
- LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
- ENDIF()
-
--# Libarchive is a shared library
--ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
--TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
--TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
--SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
--
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -255,7 +249,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
-
- IF(ENABLE_INSTALL)
- # How to install the libraries
-- INSTALL(TARGETS archive archive_static
-+ INSTALL(TARGETS archive_static
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
---
-2.31.1
-
diff --git a/contrib/src/libarchive/SHA512SUMS b/contrib/src/libarchive/SHA512SUMS
index 1427fda612..378c5681f3 100644
--- a/contrib/src/libarchive/SHA512SUMS
+++ b/contrib/src/libarchive/SHA512SUMS
@@ -1 +1 @@
-eeffec08a632cdf55d46b0f4b8261de20128163c39f63422aa5af081c9c5159a9445bca5f89ebaff984d9d5387b5c6901166949df09a2e46fe5adec31bfad0e5 libarchive-3.6.0.tar.xz
\ No newline at end of file
+d8918445e2536eb29c2d6a6c8cd3671a8525be1619009a2e7c3a9c2a821b51939172dfccc25bfd62fec2a17fb01796b4f522b0ba72b31e3de9b9658c44c46345 libarchive-3.7.9.tar.xz
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 3958c0854a..ebbb801802 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -1,5 +1,5 @@
# LIBARCHIVE
-LIBARCHIVE_VERSION := 3.6.0
+LIBARCHIVE_VERSION := 3.7.9
PKG_CPE += cpe:2.3:a:libarchive:libarchive:$(LIBARCHIVE_VERSION):*:*:*:*:*:*:*
LIBARCHIVE_URL := https://github.com/libarchive/libarchive/releases/download/v$(LIBARCHIVE_VERSION)/libarchive-$(LIBARCHIVE_VERSION).tar.xz
@@ -26,7 +26,6 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.xz:
libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive
$(UNPACK)
- $(APPLY) $(SRC)/libarchive/0001-disable-shared-library.patch
$(MOVE)
.libarchive: libarchive toolchain.cmake
--
GitLab