From f115919db1446a03398af4d3febec88629ffa0c2 Mon Sep 17 00:00:00 2001 From: Steve Lhomme <robux4@ycbcr.xyz> Date: Thu, 25 May 2023 13:42:56 +0200 Subject: [PATCH 1/2] contrib: libarchive: download tarball from GitHub The hash is unchanged (good). (cherry picked from commit c340f0b0ae77df1cd89123404f4c052d6c17873c) (rebased) rebased: - the 3.7.7 had already been cherry-picked without this patch --- contrib/src/libarchive/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak index fc3f3fb63e9e..e2763b402861 100644 --- a/contrib/src/libarchive/rules.mak +++ b/contrib/src/libarchive/rules.mak @@ -1,6 +1,6 @@ # LIBARCHIVE LIBARCHIVE_VERSION := 3.7.7 -LIBARCHIVE_URL := http://www.libarchive.org/downloads/libarchive-$(LIBARCHIVE_VERSION).tar.gz +LIBARCHIVE_URL := $(GITHUB)/libarchive/libarchive/releases/download/v$(LIBARCHIVE_VERSION)/libarchive-$(LIBARCHIVE_VERSION).tar.gz PKGS += libarchive ifeq ($(call need_pkg,"libarchive >= 3.2.0"),) -- GitLab From b342676852145fcc1e640630e6617e7628b7fe88 Mon Sep 17 00:00:00 2001 From: Steve Lhomme <robux4@ycbcr.xyz> Date: Thu, 20 Mar 2025 11:28:34 +0100 Subject: [PATCH 2/2] contrib: libarchive: update to 3.7.8 Fixes some CVE's [^1]. [^1]: https://github.com/libarchive/libarchive/releases/tag/v3.7.8 (cherry picked from commit 2804dc2688b0ca6eb7dca7c15b34cbf44f56d729) --- contrib/src/libarchive/SHA512SUMS | 2 +- contrib/src/libarchive/rules.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/libarchive/SHA512SUMS b/contrib/src/libarchive/SHA512SUMS index 2d7c0d326b0a..ac126f7a8d0a 100644 --- a/contrib/src/libarchive/SHA512SUMS +++ b/contrib/src/libarchive/SHA512SUMS @@ -1 +1 @@ -cce6eecfcd33d228bd1b1162a90bad63750adb53ac4edcaed34e2fdc30b6ba211cf1fd25d4b8761373949ceec266478b09bd70ffa4e374803a29e8573d6d149e libarchive-3.7.7.tar.gz +dcc90cc0597c14867c094aaf13bb1ec4d6b2fee7f0d6d714a909f42085cc99f7e49ac78a51e312df39b5db57aa8d17bc794f1d8d7b1c8fb65bc598ff88eb5158 libarchive-3.7.8.tar.gz diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak index e2763b402861..d0155cf2991b 100644 --- a/contrib/src/libarchive/rules.mak +++ b/contrib/src/libarchive/rules.mak @@ -1,5 +1,5 @@ # LIBARCHIVE -LIBARCHIVE_VERSION := 3.7.7 +LIBARCHIVE_VERSION := 3.7.8 LIBARCHIVE_URL := $(GITHUB)/libarchive/libarchive/releases/download/v$(LIBARCHIVE_VERSION)/libarchive-$(LIBARCHIVE_VERSION).tar.gz PKGS += libarchive -- GitLab