aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCeleste <20312-Celeste@users.gitlab.alpinelinux.org>2024-04-16 08:06:47 +0000
committerJ0WI <1715-J0WI@users.gitlab.alpinelinux.org>2024-04-16 18:09:09 +0000
commit4598d4d7b715d60f0c970a8a0f0d2de25404d4eb (patch)
treea2cc3694e6630ccacb42a109a632c4b0498049be
parente3c2158bf56d80902620eb0cf6003bbad103ce15 (diff)
main/libarchive: upgrade to 3.7.3
-rw-r--r--main/libarchive/APKBUILD11
-rw-r--r--main/libarchive/tar-make-error-reporting-more-robust-and-use-correct-errno.patch26
2 files changed, 4 insertions, 33 deletions
diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD
index dd1044d6e8e..184bb58b397 100644
--- a/main/libarchive/APKBUILD
+++ b/main/libarchive/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libarchive
-pkgver=3.7.2
-pkgrel=1
+pkgver=3.7.3
+pkgrel=0
pkgdesc="library that can create and read several streaming archive formats"
url="https://libarchive.org/"
arch="all"
@@ -20,9 +20,7 @@ makedepends="
zstd-dev
"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://libarchive.org/downloads/libarchive-$pkgver.tar.xz
- tar-make-error-reporting-more-robust-and-use-correct-errno.patch
- "
+source="https://libarchive.org/downloads/libarchive-$pkgver.tar.xz"
options="!check"
# secfixes:
@@ -61,6 +59,5 @@ tools() {
}
sha512sums="
-a21bebb27b808cb7d2ed13a70739904a1b7b55661d8dea83c9897a0129cf71e20c962f13666c571782ff0f4f753ca885619c2097d9e7691c2dee4e6e4b9a2971 libarchive-3.7.2.tar.xz
-5ecfc835895b36b715a5e40094c6295d2580fed93f0cb3602dafcc177645458870091dbe70509ef880bd6a3cc43ef2e8166c155dfd64f801f40f54eb573c12c9 tar-make-error-reporting-more-robust-and-use-correct-errno.patch
+984e7c61010b9555bafe54d5f52ff2d089e28afe5cea3a14615e2aca8539075293789d18f17f8915882ec328bcbdca7b3d1536d6dc19620ca226e8b6d802ef63 libarchive-3.7.3.tar.xz
"
diff --git a/main/libarchive/tar-make-error-reporting-more-robust-and-use-correct-errno.patch b/main/libarchive/tar-make-error-reporting-more-robust-and-use-correct-errno.patch
deleted file mode 100644
index 4e6f70104c5..00000000000
--- a/main/libarchive/tar-make-error-reporting-more-robust-and-use-correct-errno.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e200fd8abfb4cf895a1cab4d89b67e6eefe83942 Mon Sep 17 00:00:00 2001
-From: Ed Maste <emaste@FreeBSD.org>
-Date: Fri, 29 Mar 2024 16:38:11 -0400
-Subject: [PATCH] tar: make error reporting more robust and use correct errno
-
-As discussed in #1609.
----
- tar/read.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tar/read.c b/tar/read.c
-index af3d3f423..a7f14a07b 100644
---- a/tar/read.c
-+++ b/tar/read.c
-@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
- if (r != ARCHIVE_OK) {
- if (!bsdtar->verbose)
- safe_fprintf(stderr, "%s", archive_entry_pathname(entry));
-- fprintf(stderr, ": %s: ", archive_error_string(a));
-- fprintf(stderr, "%s", strerror(errno));
-+ safe_fprintf(stderr, ": %s: %s",
-+ archive_error_string(a),
-+ strerror(archive_errno(a)));
- if (!bsdtar->verbose)
- fprintf(stderr, "\n");
- bsdtar->return_value = 1;