[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: libarchive: update to 3.7.7
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sun Oct 20 09:15:37 UTC 2024
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
ae1fe0e3 by Steve Lhomme at 2024-10-20T07:51:12+00:00
contrib: libarchive: update to 3.7.7
Security fixes:
- gzip: prevent a hang when processing a malformed gzip inside a gzip (2366, OSS-Fuzz)
- tar: don't crash on truncated tar archives (2364, OSS-Fuzz)
- tar: fix two leaks in tar header parsing (2377)
Important bugfixes:
- 7-zip: read/write symlink paths as UTF-8 (2252)
- cpio: exit with an error code if an entry could not be extracted (2371)
- rar5: report encrypted entries (2096)
- tar: fix truncation of entry pathnames in specific archives (2360)
- windows: fix ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (2363)
(cherry picked from commit 784b7c5978efc8df13732b8d3f9a2b45c809344e) (edited)
edited:
- 3.0 doesn't use GITHUB for the tarball
- 3.0 had a patch for WinXP that has been merged
- - - - -
3 changed files:
- − contrib/src/libarchive/0001-Don-t-use-Windows-bcrypt-when-building-for-Windows-X.patch
- contrib/src/libarchive/SHA512SUMS
- contrib/src/libarchive/rules.mak
Changes:
=====================================
contrib/src/libarchive/0001-Don-t-use-Windows-bcrypt-when-building-for-Windows-X.patch deleted
=====================================
@@ -1,78 +0,0 @@
-From fec1c63a2bb6dc7667baf57b2c36766676184e48 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Tue, 8 Oct 2024 13:18:27 +0200
-Subject: [PATCH] Don't use Windows bcrypt when building for Windows XP or
- older
-
-The header may be detected but we can't use the calls.
----
- libarchive/archive_cryptor.c | 4 ++--
- libarchive/archive_cryptor_private.h | 2 +-
- libarchive/archive_hmac.c | 2 +-
- libarchive/archive_hmac_private.h | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libarchive/archive_cryptor.c b/libarchive/archive_cryptor.c
-index 437dba06..1825af4d 100644
---- a/libarchive/archive_cryptor.c
-+++ b/libarchive/archive_cryptor.c
-@@ -57,7 +57,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
- return 0;
- }
-
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
- #ifdef _MSC_VER
- #pragma comment(lib, "Bcrypt.lib")
- #endif
-@@ -197,7 +197,7 @@ aes_ctr_release(archive_crypto_ctx *ctx)
- return 0;
- }
-
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
-
- static int
- aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
-diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
-index 16b6d16f..c13f2926 100644
---- a/libarchive/archive_cryptor_private.h
-+++ b/libarchive/archive_cryptor_private.h
-@@ -62,7 +62,7 @@ typedef struct {
- unsigned encr_pos;
- } archive_crypto_ctx;
-
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
- #include <bcrypt.h>
-
- /* Common in other bcrypt implementations, but missing from VS2008. */
-diff --git a/libarchive/archive_hmac.c b/libarchive/archive_hmac.c
-index edb3bf5a..210cca70 100644
---- a/libarchive/archive_hmac.c
-+++ b/libarchive/archive_hmac.c
-@@ -74,7 +74,7 @@ __hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
- memset(ctx, 0, sizeof(*ctx));
- }
-
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
-
- #ifndef BCRYPT_HASH_REUSABLE_FLAG
- # define BCRYPT_HASH_REUSABLE_FLAG 0x00000020
-diff --git a/libarchive/archive_hmac_private.h b/libarchive/archive_hmac_private.h
-index d0fda7f9..1b24ddd1 100644
---- a/libarchive/archive_hmac_private.h
-+++ b/libarchive/archive_hmac_private.h
-@@ -52,7 +52,7 @@ int __libarchive_hmac_build_hack(void);
-
- typedef CCHmacContext archive_hmac_sha1_ctx;
-
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
- #include <bcrypt.h>
-
- typedef struct {
---
-2.45.0.windows.1
-
=====================================
contrib/src/libarchive/SHA512SUMS
=====================================
@@ -1 +1 @@
-d55483de313e00b3855ea535dfeeb78dcfdaa48ae6d17589dbb419ead2eb5818e7a8617b73b93c810402a9ece65b416e2d73b09efbc39c02916d80b180f4200b libarchive-3.7.6.tar.gz
+cce6eecfcd33d228bd1b1162a90bad63750adb53ac4edcaed34e2fdc30b6ba211cf1fd25d4b8761373949ceec266478b09bd70ffa4e374803a29e8573d6d149e libarchive-3.7.7.tar.gz
=====================================
contrib/src/libarchive/rules.mak
=====================================
@@ -1,5 +1,5 @@
# LIBARCHIVE
-LIBARCHIVE_VERSION := 3.7.6
+LIBARCHIVE_VERSION := 3.7.7
LIBARCHIVE_URL := http://www.libarchive.org/downloads/libarchive-$(LIBARCHIVE_VERSION).tar.gz
PKGS += libarchive
@@ -44,7 +44,6 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
$(UNPACK)
$(APPLY) $(SRC)/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch
- $(APPLY) $(SRC)/libarchive/0001-Don-t-use-Windows-bcrypt-when-building-for-Windows-X.patch
$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
$(MOVE)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ae1fe0e3f754cc4bf5bdd278a609f2c43a309dae
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ae1fe0e3f754cc4bf5bdd278a609f2c43a309dae
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list