libarchive: backport upstream fix
This commit is contained in:
parent
7145c9be99
commit
0d4e350e18
|
@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library"
|
|||
TERMUX_PKG_LICENSE="BSD 2-Clause"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION="3.7.2"
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://github.com/libarchive/libarchive/releases/download/v$TERMUX_PKG_VERSION/libarchive-$TERMUX_PKG_VERSION.tar.gz
|
||||
TERMUX_PKG_SHA256=df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
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;
|
Loading…
Reference in New Issue