Accepting request 1097979 from home:dspinella:branches:Archiving

- Backport upstream fix for --no-absolute-filenames --make-directories
  * fix-operation-no-absolute-filenames.patch

OBS-URL: https://build.opensuse.org/request/show/1097979
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=92
This commit is contained in:
Danilo Spinella 2023-07-10 14:58:59 +00:00 committed by Git OBS Bridge
parent c5e3d07b62
commit 481661b7ac
3 changed files with 41 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 10 14:52:48 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
- Backport upstream fix for --no-absolute-filenames --make-directories
* fix-operation-no-absolute-filenames.patch
-------------------------------------------------------------------
Fri Jun 23 13:02:55 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>

View File

@ -41,7 +41,9 @@ Patch20: cpio-close_files_after_copy.patch
Patch21: cpio-pattern-file-sigsegv.patch
Patch23: paxutils-rtapelib_mtget.patch
Patch25: cpio-fix_truncation_check.patch
BuildRequires: autoconf
# PATCH-FIX-UPSTREAM
Patch26: fix-operation-no-absolute-filenames.patch
BuildRequires: autoconf >= 2.71
BuildRequires: automake
#Requires(post): %{xinstall_info_prereq}
#Requires(preun): %{xinstall_info_prereq}
@ -81,6 +83,7 @@ This package includes the 'mt', a local tape drive control program.
%patch21 -p1
%patch23 -p1
%patch25 -p1
%patch26 -p1
%build
gettextize -f --no-changelog

View File

@ -0,0 +1,31 @@
From e3cc782c610729de7622a274e532817c18262a9d Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Thu, 18 May 2023 09:00:12 +0300
Subject: Fix operation of --no-absolute-filenames --make-directories
* src/copyin.c (symlink_placeholder): Try to create leading
directories if unable to create placeholder.
---
src/copyin.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/copyin.c b/src/copyin.c
index 1e4921f..08df12c 100644
--- a/src/copyin.c
+++ b/src/copyin.c
@@ -668,6 +668,12 @@ symlink_placeholder (char *oldpath, char *newpath, struct cpio_file_stat *file_s
struct delayed_link *p;
size_t newlen = strlen (newpath);
+ if (fd < 0 && create_dir_flag)
+ {
+ create_all_directories (newpath);
+ fd = open (newpath, O_WRONLY | O_CREAT | O_EXCL, 0);
+ }
+
if (fd < 0)
{
open_error (newpath);
--
cgit v1.1