[packages/libarchive] up to 3.8.7 (security fixes)

[atler]

commit 79a2dcc87c9bfc9ccfeffb289d7904dd0a53282f
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Apr 14 15:55:41 2026 +0200

    up to 3.8.7 (security fixes)

 libarchive-nettle.patch | 50 -------------------------------------------------
 libarchive.spec         | 10 ++++------
 2 files changed, 4 insertions(+), 56 deletions(-)
---
diff --git a/libarchive.spec b/libarchive.spec
index 72c5655..323ae2d 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -5,17 +5,16 @@
 Summary:	Multi-format archive and compression library
 Summary(pl.UTF-8):	Biblioteka do archiwizacji i kompresji w wielu formatach
 Name:		libarchive
-Version:	3.8.5
+Version:	3.8.7
 Release:	1
 License:	BSD
 Group:		Libraries
 # see main page, downloads index may be out of date
 #Source0Download: http://www.libarchive.org/
 Source0:	https://www.libarchive.org/downloads/%{name}-%{version}.tar.xz
-# Source0-md5:	2cd5a73ed7fe7f9da22d34ac1048534e
+# Source0-md5:	dd48e73d519e309ce08ce76a004fb0e0
 Patch0:		%{name}-man_progname.patch
-Patch1:		%{name}-nettle.patch
-Patch2:		%{name}-nettle2.patch
+Patch1:		%{name}-nettle2.patch
 URL:		http://www.libarchive.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -147,8 +146,7 @@ bsdunzip - implementacja programu unzip(1), oparta na libarchive.
 %prep
 %setup -q
 %patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1 -b .orig
+%patch -P1 -p1 -b .orig
 
 %build
 %{__libtoolize}
diff --git a/libarchive-nettle.patch b/libarchive-nettle.patch
deleted file mode 100644
index a8d8b15..0000000
--- a/libarchive-nettle.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6a3d059507dd23e981090909e6f42f79f6de2a39 Mon Sep 17 00:00:00 2001
-From: FooIbar <118464521+FooIbar at users.noreply.github.com>
-Date: Fri, 6 Feb 2026 20:52:25 +0800
-Subject: [PATCH] Fix incompatibility with Nettle 4.x
-
----
- libarchive/archive_cryptor_private.h | 4 ++++
- libarchive/archive_hmac.c            | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
-index 367d7c3bc9..069eccd994 100644
---- a/libarchive/archive_cryptor_private.h
-+++ b/libarchive/archive_cryptor_private.h
-@@ -109,6 +109,10 @@ typedef struct {
- #include <nettle/version.h>
- #define	ARCHIVE_CRYPTOR_USE_NETTLE 1
- 
-+#ifndef AES_MAX_KEY_SIZE
-+#define AES_MAX_KEY_SIZE AES256_KEY_SIZE
-+#endif
-+
- typedef struct {
- #if NETTLE_VERSION_MAJOR < 3
- 	struct aes_ctx	ctx;
-diff --git a/libarchive/archive_hmac.c b/libarchive/archive_hmac.c
-index edb3bf5abd..e1e8f05ff0 100644
---- a/libarchive/archive_hmac.c
-+++ b/libarchive/archive_hmac.c
-@@ -198,6 +198,7 @@ static void __hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
- }
- 
- #elif defined(HAVE_LIBNETTLE) && defined(HAVE_NETTLE_HMAC_H)
-+#include <nettle/version.h>
- 
- static int
- __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
-@@ -216,7 +217,12 @@ __hmac_sha1_update(archive_hmac_sha1_ctx *ctx, const uint8_t *data,
- static void
- __hmac_sha1_final(archive_hmac_sha1_ctx *ctx, uint8_t *out, size_t *out_len)
- {
-+#if NETTLE_VERSION_MAJOR < 4
- 	hmac_sha1_digest(ctx, (unsigned)*out_len, out);
-+#else
-+	hmac_sha1_digest(ctx, out);
-+	*out_len = SHA1_DIGEST_SIZE;
-+#endif
- }
- 
- static void
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libarchive.git/commitdiff/79a2dcc87c9bfc9ccfeffb289d7904dd0a53282f