[packages/libarchive] rel 2; improves changes made by user who bacdoored xz - https://github.com/libarchive/libarchive/pul

arekm arekm at pld-linux.org
Sat Mar 30 01:51:34 CET 2024


commit fc32b80ff1cface8d591d8847c1448d553118b11
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 30 01:51:10 2024 +0100

    rel 2; improves changes made by user who bacdoored xz - https://github.com/libarchive/libarchive/pull/1609

 errno.patch     | 27 +++++++++++++++++++++++++++
 libarchive.spec |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/libarchive.spec b/libarchive.spec
index bd6a266..31e5f12 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -6,7 +6,7 @@ Summary:	Multi-format archive and compression library
 Summary(pl.UTF-8):	Biblioteka do archiwizacji i kompresji w wielu formatach
 Name:		libarchive
 Version:	3.7.2
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 # see main page, downloads index may be out of date
@@ -14,6 +14,7 @@ Group:		Libraries
 Source0:	https://www.libarchive.org/downloads/%{name}-%{version}.tar.xz
 # Source0-md5:	4f4ef6a17c7b0b484aa2c95aa6deefac
 Patch0:		%{name}-man_progname.patch
+Patch1:		errno.patch
 URL:		http://www.libarchive.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -143,6 +144,7 @@ bsdunzip - implementacja programu unzip(1), oparta na libarchive.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/errno.patch b/errno.patch
new file mode 100644
index 0000000..6a351ba
--- /dev/null
+++ b/errno.patch
@@ -0,0 +1,27 @@
+From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001
+From: Ed Maste <emaste at 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 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;
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list