aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Neukirchen <leah@vuxu.org>2024-04-06 16:29:53 +0000
committerLeah Neukirchen <leah@vuxu.org>2024-04-06 16:30:22 +0000
commit9e28dad91b85cf3b0e3c28dae1b6343924532911 (patch)
treed4c3922254890ab563521a1161bb5092a38161aa
parentd1a05c56ec8a5d3bd4bc79e974fb29649374ed67 (diff)
downloadvoid-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.tar
void-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.tar.gz
void-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.tar.bz2
void-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.tar.lz
void-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.tar.xz
void-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.tar.zst
void-packages-9e28dad91b85cf3b0e3c28dae1b6343924532911.zip
libarchive: backport "make error reporting more robust and use correct errno".
https://github.com/libarchive/libarchive/pull/2101
-rw-r--r--srcpkgs/libarchive/patches/fix-error-reporting.patch27
-rw-r--r--srcpkgs/libarchive/template2
2 files changed, 28 insertions, 1 deletions
diff --git a/srcpkgs/libarchive/patches/fix-error-reporting.patch b/srcpkgs/libarchive/patches/fix-error-reporting.patch
new file mode 100644
index 00000000000..57d2c8e32e2
--- /dev/null
+++ b/srcpkgs/libarchive/patches/fix-error-reporting.patch
@@ -0,0 +1,27 @@
+From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001
+From: Ed Maste <emaste@freebsd.org>
+Date: Fri, 29 Mar 2024 18:02:06 -0400
+Subject: [PATCH] tar: make error reporting more robust and use correct errno
+ (#2101)
+
+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 af3d3f423daff024791465bb9976a9b9a74b91ad..a7f14a07bb35602256b732cf3de96892e4280523 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;
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 2117ec670b8..0df543645d4 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
# Template file for 'libarchive'
pkgname=libarchive
version=3.7.2
-revision=2
+revision=3
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)