automatic version update by autodist [release 3.7.3-1mamba;Fri Apr 12 2024]

This commit is contained in:
Automatic Build System 2024-04-13 13:48:42 +02:00
parent 7b4b4208f7
commit e06b146d0a
2 changed files with 6 additions and 34 deletions

View File

@ -1,27 +0,0 @@
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 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;

View File

@ -1,6 +1,6 @@
Name: libarchive
Version: 3.7.2
Release: 2mamba
Version: 3.7.3
Release: 1mamba
Summary: Single library to read/write tar, cpio, pax, zip, iso9660, etc.
Group: System/Libraries
Vendor: openmamba
@ -8,7 +8,6 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://libarchive.org/
Source: https://github.com/libarchive/libarchive.git/v%{version}/libarchive-%{version}.tar.bz2
Patch0: libarchive-3.7.2-backport_bsdtar_make_error_reporting_more_robust.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -39,8 +38,7 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description devel
Libarchive is a programming library that can create and read several different streaming archive formats, including most popular tar variants, several cpio formats, and both BSD and GNU ar variants.
It can also write shar archives and read ISO9660 CDROM images and ZIP archives.
This package contains static libraries and header files need for development.
This package contains static libraries and header files needed for development.
%package tools
Group: Applications/Archiving
@ -60,8 +58,6 @@ This package contains the following programs built on libarchive:
%prep
%setup -q
%patch 0 -p1 -b .backport_bsdtar_make_error_reporting_more_robust
autoreconf -f -i
%build
@ -122,6 +118,9 @@ mv %{buildroot}%{_mandir}/man5/tar.5 %{buildroot}%{_mandir}/man5/archive_tar.5
%{_mandir}/man1/bsdunzip.1*
%changelog
* Fri Apr 12 2024 Automatic Build System <autodist@openmamba.org> 3.7.3-1mamba
- automatic version update by autodist
* Fri Apr 05 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 3.7.2-2mamba
- backport upstream patch to fix possibly malicious past commit (see https://github.com/libarchive/libarchive/pull/2101 )