Request 1395 (new)

Overview

Request 1395 (new)

Created by sgzdzh 2 months ago
In state new

Delete cpio

_service:tar_scm:cpio.spec Deleted

@@ -1,179 +0,0 @@
-Name:           cpio
-Version:        2.14
-Release:        3
-Summary:        A GNU archiving program
-
-License:        GPLv3+
-URL:            https://www.gnu.org/software/cpio
-Source0:        https://ftp.gnu.org/gnu/cpio/%{name}-%{version}.tar.bz2
-
-Patch0:         cpio-2.9-rh.patch
-Patch1:         cpio-2.13-exitCode.patch
-Patch2:         cpio-2.13-dev_number.patch
-Patch3:         cpio-2.9.90-defaultremoteshell.patch
-Patch4:         cpio-2.10-patternnamesigsegv.patch
-Patch5:         cpio-2.10-longnames-split.patch
-Patch6:         cpio-2.11-crc-fips-nit.patch
-Patch7:         backport-restore-access-and-modification-times-of-symlinks.patch
-Patch8:         backport-fix-operation-of-no-absolute-filenames-make-director.patch
-Patch9:         backport-Do-not-set-exit-code-to-2-when-failing-to-create-symlink.patch
-
-Patch9000:      add-option-to-add-metadata-in-copy-out-mode.patch
-Patch9001:      Fix-use-after-free-and-return-appropriate-error.patch
-
-Provides:       bundled(gnulib)
-Provides:       /bin/cpio
-BuildRequires:  gcc texinfo gettext gettext-devel rmt autoconf automake
-
-%description
-GNU cpio copies files into or out of a cpio or tar archive.
-The archive can be another file on the disk, a magnetic
-tape, or a pipe.
-
-%package_help
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-autoreconf -fi
-%configure --with-rmt="%{_sysconfdir}/rmt"
-%make_build
-
-%install
-%make_install
-rm -rf %{buildroot}/usr/share/man/man8*
-rm -rf %{buildroot}/usr/libexec/
-rm -rf %{buildroot}/usr/share/info/dir
-
-%check
-make check
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog README
-%license COPYING
-%{_bindir}/%{name}*
-%{_datadir}/info/*.info*
-%{_datadir}/locale/*/LC_MESSAGES/cpio.mo
-
-%files help
-%doc NEWS TODO THANKS
-%{_datadir}/man/man1/%{name}.1.gz
-
-%changelog
-* Mon Aug 21 2023 fuanan <fuanan3@h-partners.com> - 2.14-3
-- Type:CVE
-- ID:CVE-2015-1197
-- SUG:NA
-- DESC:Fix CVE-2015-1197
-
-* Wed Jul 26 2023 zhangruifang <zhangruifang1@h-partners.com> - 2.14-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:revert CVE-2015-1197 fix for --no-absolute-filenames
-
-* Mon Jul 17 2023 zhangruifang <zhangruifang1@h-partners.com> - 2.14-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 2.14
-
-* Tue Jun 20 2023 fuanan <fuanan3@h-partners.com> - 2.13-9
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:revert fix CVE-2015-1197 because it causes AT testcases problems
-
-* Sat May 27 2023 fuanan <fuanan3@h-partners.com> - 2.13-8
-- Type:CVE
-- ID:CVE-2015-1197
-- SUG:NA
-- DESC:Fix CVE-2015-1197
-
-* Thu Oct 27 2022 dongyuzhen <dongyuzhen@h-partners.com> - 2.13-7
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Rebuild for next release
-
-* Tue Aug 24 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 2.13-6
-- Type:CVE
-- ID:CVE-2021-38185
-- SUG:NA
-- DESC:Fix CVE-2021-38185
-
-* Fri Jul 30 2021 yixiangzhike <zhangxingliang3@huawei.com> - 2.13-5
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Solve mutiple definition compilation error
-
-* Fri Jun 4 2021 fuanan <fuanan3@huawei.com> - 2.13-4
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:add 'autoconf automake' to BuildRequires to use autoreconf command
-
-* Thu Nov 26 2020 Liquor <lirui130@huawei.com> - 2.13-3
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:revert fix CVE-2015-1197 because it causes shutdowm problems
-
-* Wed Aug 12 2020 Liquor <lirui130@huawei.com> - 2.13-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:use /etc/rmt as default rmt command
-
-* Thu Jul 30 2020 Liquor <lirui130@huawei.com> - 2.13-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 2.13
-
-* Thu Jul 2 2020 Roberto Sassu<roberto.sassu@huawei.com> - 2.12-16
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix use after free and return appropriate errors
-
-* Thu Jul 2 2020 Anakin Zhang<benjamin93@163.com> - 2.12-15
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:add option to add file metadata in copy-out mode
-
-* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.12-14
-- Fix CVE-2019-14866
-
-* Tue Sep 24 2019 shenyangyang<shenyangyang4@huawei.com> - 2.12-13
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:add help package
-
-* Tue Aug 27 2019 openEuler Builteam <buildteam@openeuler.org> - 2.12-12
-- Type:NA
-- ID:NA
-- SUG:NA
-- DESC: Rewrite Spec File
-
-* Thu Mar 21 2019 Zhipeng Xie <xiezhipeng1@huawei.com> - 2.12-11
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:modify patch name
-
-* Fri Mar 15 2019 zhangyujing <zhangyujing1@huawei.com> - 2.12-10
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Fix out of bounds read
-        Fix signed integer overflow big block sizes
-
-* Thu Jul 12 2018 openEuler Builteam <buildteam@openeuler.org> - 2.12-9
-- Package  Initialization
-

_service:tar_scm:Fix-use-after-free-and-return-appropriate-error.patch Deleted

@@ -1,61 +0,0 @@
-From 356ad51812edb47fd76aa59b8c935d55b879541a Mon Sep 17 00:00:00 2001
-From: Roberto Sassu <roberto.sassu@huawei.com>
-Date: Thu, 2 Jul 2020 10:23:44 +0200
-Subject: PATCH cpio: fix use after free and return appropriate errors
-
----
- src/copyout.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/copyout.c b/src/copyout.c
-index 29d2198..7feed00 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -600,15 +600,19 @@ write_xattrs (int metadata_fd, char *path)
-   list_ptr = xattr_list = malloc(list_len);
-   if (!list_ptr) {
-     error (0, 0, _("out of memory"));
--    return ret;
-+    return -ENOMEM;
-   }
- 
-   len = llistxattr(path, xattr_list, list_len);
--  if (len != list_len)
-+  if (len != list_len) {
-+    ret = -EIO;
-     goto out;
-+  }
- 
--  if (ftruncate(metadata_fd, 0))
-+  if (ftruncate(metadata_fd, 0)) {
-+    ret = -EIO;
-     goto out;
-+  }
- 
-   lseek(metadata_fd, 0, SEEK_SET);
- 
-@@ -658,13 +662,16 @@ write_xattrs (int metadata_fd, char *path)
-   }
- 
-   free(xattr_value);
--out:
--  free(xattr_list);
- 
--  if (list_ptr != xattr_list + list_len)
--    return ret;
-+  if (list_ptr != xattr_list + list_len) {
-+    ret = -EINVAL;
-+    goto out;
-+  }
- 
--  return 0;
-+  ret = 0;
-+out:
-+  free(xattr_list);
-+  return ret;
- }
- 
- /* Read a list of file names from the standard input
--- 
-2.27.GIT
-

_service:tar_scm:add-option-to-add-metadata-in-copy-out-mode.patch Deleted

@@ -1,428 +0,0 @@
-From 531cabc88e9ecdc3231fad6e4856869baa9a91ef Mon Sep 17 00:00:00 2001
-From: Roberto Sassu <roberto.sassu@huawei.com>
-Date: Wed, 22 May 2019 09:04:39 +0200
-Subject: PATCH cpio: add option to add file metadata in copy-out mode
-
-This patch adds the -e <type> option to include file metadata in the
-image. At the moment, only the xattr type is supported.
-
-If the xattr type is selected, the patch includes an additional file for
-each file passed to stdin, with special name 'METADATA!!!'. The
-additional file might contain multiple metadata records. The format of
-each record is:
-
-<metadata len (ASCII, 8 chars)><version><type><metadata>
-
-The format of metadata for the xattr type is:
-
-<xattr name>\0<xattr value>
-
-Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
-
----
- doc/cpio.texi   |   3 ++
- src/copyout.c   | 138 +++++++++++++++++++++++++++++++++++++++++++++++-
- src/dstring.c   |  26 +++++++--
- src/dstring.h   |   1 +
- src/extern.h    |   2 +
- src/global.c    |   4 ++
- src/initramfs.h |  21 ++++++++
- src/main.c      |  22 ++++++++
- 8 files changed, 212 insertions(+), 5 deletions(-)
- create mode 100644 src/initramfs.h
-
-diff --git a/doc/cpio.texi b/doc/cpio.texi
-index bef7ba5..ea73a92 100644
---- a/doc/cpio.texi
-+++ b/doc/cpio.texi
-@@ -279,6 +279,9 @@ Set the I/O block size to the given @var{number} of bytes.
- @item -D @var{dir}
- @itemx --directory=@var{dir}
- Change to directory @var{dir}
-+@item -e @var{type}
-+@itemx --file-metadata=@var{type}
-+Include in the image file metadata with the specified type.
- @item --force-local
- Treat the archive file as local, even if its name contains colons.
- @item -F @var{user}@@@var{host}:@var{archive-file}
-diff --git a/src/copyout.c b/src/copyout.c
-index 6e82f4c..8ae1a48 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/xattr.h>
- #include "filetypes.h"
- #include "cpiohdr.h"
- #include "dstring.h"
-@@ -586,6 +587,94 @@ assign_string (char **pvar, char *value)
-   *pvar = p;
- }
- 
-+static int
-+write_xattrs (int metadata_fd, char *path)
-+{
-+  struct metadata_hdr hdr = { .c_version = 1, .c_type = TYPE_XATTR };
-+  char strsizeof(hdr.c_size) + 1;
-+  char *xattr_list = NULL;
-+  char *list_ptr = NULL;
-+  char *xattr_value = NULL;
-+  ssize_t list_len, name_len, value_len, len;
-+  int ret = -EINVAL;
-+
-+  if (metadata_fd < 0)
-+    return 0;
-+
-+  list_len = llistxattr(path, NULL, 0);
-+  if (list_len <= 0)
-+    return -ENOENT;
-+
-+  list_ptr = xattr_list = malloc(list_len);
-+  if (!list_ptr) {
-+    error (0, 0, _("out of memory"));
-+    return ret;
-+  }
-+
-+  len = llistxattr(path, xattr_list, list_len);
-+  if (len != list_len)
-+    goto out;
-+
-+  if (ftruncate(metadata_fd, 0))
-+    goto out;
-+
-+  lseek(metadata_fd, 0, SEEK_SET);
-+
-+  while (list_ptr < xattr_list + list_len) {
-+    name_len = strlen(list_ptr);
-+
-+    value_len = lgetxattr(path, list_ptr, NULL, 0);
-+    if (value_len < 0) {
-+      error (0, 0, _("cannot get xattrs"));
-+      break;
-+    }
-+
-+    if (value_len) {
-+      xattr_value = malloc(value_len);
-+      if (!xattr_value) {
-+	error (0, 0, _("out of memory"));
-+	break;
-+      }
-+    } else {
-+      xattr_value = NULL;
-+    }
-+
-+    len = lgetxattr(path, list_ptr, xattr_value, value_len);
-+    if (len != value_len)
-+      break;
-+
-+    snprintf(str, sizeof(str), "%.8lx",
-+	     sizeof(hdr) + name_len + 1 + value_len);
-+
-+    memcpy(hdr.c_size, str, sizeof(hdr.c_size));
-+
-+    if (write(metadata_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
-+      break;
-+
-+    if (write(metadata_fd, list_ptr, name_len + 1) != name_len + 1)
-+      break;
-+
-+    if (write(metadata_fd, xattr_value, value_len) != value_len)
-+      break;
-+
-+    if (fsync(metadata_fd))
-+      break;
-+
-+    list_ptr += name_len + 1;
-+    free(xattr_value);
-+    xattr_value = NULL;
-+  }
-+
-+  free(xattr_value);
-+out:
-+  free(xattr_list);
-+
-+  if (list_ptr != xattr_list + list_len)
-+    return ret;
-+
-+  return 0;
-+}
-+
- /* Read a list of file names from the standard input
-    and write a cpio collection on the standard output.
-    The format of the header depends on the compatibility (-c) flag.  */
-@@ -601,6 +690,8 @@ process_copy_out (void)
-   int in_file_des;		/* Source file descriptor.  */
-   int out_file_des;		/* Output file descriptor.  */
-   char *orig_file_name = NULL;
-+  char template = "/tmp/cpio-metadata-XXXXXX";
-+  int ret, metadata_fd, metadata = 0, old_metadata, hard_link;
- 
-   /* Initialize the copy out.  */
-   file_hdr.c_magic = 070707;
-@@ -632,9 +723,37 @@ process_copy_out (void)
-   else
-     change_dir ();
- 
-+  /* Create a temporary file to store file metadata */
-+  if (metadata_type != TYPE_NONE) {
-+    metadata_fd = mkstemp(template);
-+    if (metadata_fd < 0) {
-+      error (0, 0, _("cannot create temporary file"));
-+      return;
-+    }
-+  }
-+
-   /* Copy files with names read from stdin.  */
--  while (ds_fgetstr (stdin, &input_name, name_end) != NULL)
-+  while ((metadata_type != TYPE_NONE && metadata) ||
-+	 ds_fgetstr (stdin, &input_name, name_end) != NULL)
-     {
-+      old_metadata = metadata;
-+      hard_link = 0;
-+
-+      if (metadata) {
-+	metadata = 0;
-+
-+        if (metadata_type != TYPE_XATTR) {
-+	  error (0, 0, _("metadata type not supported"));
-+	  continue;
-+	}
-+
-+	ret = write_xattrs(metadata_fd, orig_file_name);
-+	if (ret < 0)
-+	  continue;
-+
-+	ds_sgetstr (template, &input_name, name_end);
-+      }
-+
-       /* Check for blank line.  */
-       if (input_name.ds_string0 == 0)
- 	{
-@@ -660,7 +779,14 @@ process_copy_out (void)
- 		}
- 	    }
- 
--	  assign_string (&orig_file_name, input_name.ds_string);
-+          if (old_metadata) {
-+	     assign_string (&orig_file_name, template);
-+	     ds_sgetstr (METADATA_FILENAME, &input_name, name_end);
-+	     file_hdr.c_mode |= 0x10000;
-+	  } else {
-+	     assign_string (&orig_file_name, input_name.ds_string);
-+	  }
-+
- 	  cpio_safer_name_suffix (input_name.ds_string, false,
- 				  !no_abs_paths_flag, true);
- 	  cpio_set_c_name (&file_hdr, input_name.ds_string);
-@@ -692,6 +818,7 @@ process_copy_out (void)
- 		  else
- 		    {
- 		      add_link_defer (&file_hdr);
-+		      hard_link = 1;
- 		      break;
- 		    }
- 		}
-@@ -830,6 +957,8 @@ process_copy_out (void)
- 	    fprintf (stderr, "%s\n", orig_file_name);
- 	  if (dot_flag)
- 	    fputc ('.', stderr);
-+	  if (metadata_type != TYPE_NONE && !old_metadata && !hard_link)
-+	    metadata = 1;
- 	}
-     }
- 
-@@ -870,4 +999,9 @@ process_copy_out (void)
-     }
-   cpio_file_stat_free (&file_hdr);
-   ds_free (&input_name);
-+
-+  if (metadata_type != TYPE_NONE) {
-+    close(metadata_fd);
-+    unlink(template);
-+  }
- }
-diff --git a/src/dstring.c b/src/dstring.c
-index b425121..f5d8ab5 100644
---- a/src/dstring.c
-+++ b/src/dstring.c
-@@ -73,8 +73,8 @@ ds_reset (dynamic_string *s, size_t len)
-    Return NULL if end of file is detected.  Otherwise,
-    Return a pointer to the null-terminated string in S.  */
- 
--char *
--ds_fgetstr (FILE *f, dynamic_string *s, char eos)
-+static char *
-+ds_fgetstr_common (FILE *f, char *input_string, dynamic_string *s, char eos)
- {
-   int next_ch;
- 
-@@ -82,10 +82,18 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos)
-   s->ds_idx = 0;
- 
-   /* Read the input string.  */
--  while ((next_ch = getc (f)) != eos && next_ch != EOF)
-+  if (input_string)
-+    next_ch = *input_string++;
-+  else
-+    next_ch = getc (f);
-+  while (next_ch != eos && next_ch != EOF)
-     {
-       ds_resize (s, 0);
-       s->ds_strings->ds_idx++ = next_ch;
-+      if (input_string)
-+        next_ch = *input_string++;
-+      else
-+        next_ch = getc (f);       
-     }
-   ds_resize (s, 0);
-   s->ds_strings->ds_idx = '\0';
-@@ -119,6 +127,12 @@ ds_concat (dynamic_string *s, char const *str)
-   s->ds_strings->ds_idx = 0;
- }
- 
-+char *
-+ds_fgetstr (FILE *f, dynamic_string *s, char eos)
-+{
-+  return ds_fgetstr_common (f, NULL, s, eos);
-+}
-+
- char *
- ds_fgets (FILE *f, dynamic_string *s)
- {
-@@ -131,6 +145,12 @@ ds_fgetname (FILE *f, dynamic_string *s)
-   return ds_fgetstr (f, s, '\0');
- }
- 
-+char *
-+ds_sgetstr (char *input_string, dynamic_string *s, char eos)
-+{
-+  return ds_fgetstr_common (NULL, input_string, s, eos);
-+}
-+
- /* Return true if the dynamic string S ends with character C. */
- int
- ds_endswith (dynamic_string *s, int c)
-diff --git a/src/dstring.h b/src/dstring.h
-index ac540be..d934d1d 100644
---- a/src/dstring.h
-+++ b/src/dstring.h
-@@ -40,6 +40,7 @@ void ds_reset (dynamic_string *s, size_t len);
- char *ds_fgetname (FILE *f, dynamic_string *s);
- char *ds_fgets (FILE *f, dynamic_string *s);
- char *ds_fgetstr (FILE *f, dynamic_string *s, char eos);
-+char *ds_sgetstr (char *input_string, dynamic_string *s, char eos);
- void ds_append (dynamic_string *s, int c);
- void ds_concat (dynamic_string *s, char const *str);
- 
-diff --git a/src/extern.h b/src/extern.h
-index 6afbdd2..49369ab 100644
---- a/src/extern.h
-+++ b/src/extern.h
-@@ -18,6 +18,7 @@
- 
- #include "paxlib.h"
- #include "quotearg.h"
-+#include "initramfs.h"
- #include "quote.h"
- #include "inttostr.h"
- 
-@@ -100,6 +101,7 @@ extern char output_is_seekable;
- extern int (*xstat) ();
- extern void (*copy_function) ();
- extern char *change_directory_option;
-+extern enum metadata_types metadata_type;
- 
- #define STRINGIFY_BIGINT(i, b) umaxtostr (i, b)
- enum { UINTMAX_STRSIZE_BOUND = INT_BUFSIZE_BOUND (intmax_t) };
-diff --git a/src/global.c b/src/global.c
-index 7c4bca8..bbd84fe 100644
---- a/src/global.c
-+++ b/src/global.c
-@@ -194,4 +194,8 @@ char *change_directory_option;
- 
- int renumber_inodes_option;
- int ignore_devno_option;
-+
-+/* include file metadata into the image */
-+enum metadata_types metadata_type = TYPE_NONE;
-+
- int ignore_dirnlink_option;
-diff --git a/src/initramfs.h b/src/initramfs.h
-new file mode 100644
-index 0000000..88abae7
---- /dev/null
-+++ b/src/initramfs.h
-@@ -0,0 +1,21 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * include/linux/initramfs.h
-+ *
-+ * Include file for file metadata in the initial ram disk.
-+ */
-+#ifndef _LINUX_INITRAMFS_H
-+#define _LINUX_INITRAMFS_H
-+
-+#define METADATA_FILENAME "METADATA!!!"
-+
-+enum metadata_types { TYPE_NONE, TYPE_XATTR, TYPE__LAST };
-+
-+struct metadata_hdr {
-+  char c_size8;     /* total size including c_size field */
-+  char c_version;     /* header version */
-+  char c_type;        /* metadata type */
-+  char c_metadata;  /* metadata */
-+} __attribute__((packed));
-+
-+#endif /*_LINUX_INITRAMFS_H*/
-diff --git a/src/main.c b/src/main.c
-index f9b4d85..8d5988e 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -202,6 +202,8 @@ static struct argp_option options = {
-   {"device-independent", DEVICE_INDEPENDENT_OPTION, NULL, 0,
-    N_("Create device-independent (reproducible) archives") },
-   {"reproducible", 0, NULL, OPTION_ALIAS },
-+  {"file-metadata", 'e', N_("TYPE"), 0,
-+   N_("Include file metadata"), GRID+1 },
- #undef GRID
- 
-   /* ********** */
-@@ -295,6 +297,22 @@ warn_control (char *arg)
-   return 1;
- }
- 
-+static enum metadata_types
-+parse_metadata_type(char *arg)
-+{
-+  static char *metadata_type_strTYPE__LAST = {
-+    TYPE_NONE = "none",
-+    TYPE_XATTR = "xattr",
-+  };
-+  int i;
-+
-+  for (i = 0; i < TYPE__LAST; i++)
-+    if (!strcmp (metadata_type_stri, arg))
-+      return i;
-+
-+  return TYPE_NONE;
-+}
-+
- static error_t
- parse_opt (int key, char *arg, struct argp_state *state)
- {
-@@ -357,6 +375,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
-       copy_matching_files = false;
-       break;
- 
-+    case 'e':		/* Metadata type.  */
-+      metadata_type = parse_metadata_type(arg);
-+      break;
-+
-     case 'E':		/* Pattern file name.  */
-       pattern_file_name = arg;
-       break;
--- 
-2.27.0
-

_service:tar_scm:backport-Do-not-set-exit-code-to-2-when-failing-to-create-symlink.patch Deleted

@@ -1,34 +0,0 @@
-From 2cf05f5a1826dd127d5c9063cc8cc7667746be38 Mon Sep 17 00:00:00 2001
-From: Ziyang Chen <chenziyang4@huawei.com>
-Date: Mon, 10 Jul 2023 20:19:27 +0800
-Subject: PATCH Do not set exit code to 2 when failing to create symlink
-
----
- src/copyin.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/copyin.c b/src/copyin.c
-index 2e72356..2b6b361 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -736,7 +736,7 @@ replace_symlink_placeholders (void)
- 		  res = UMASKED_SYMLINK (dl->source, dl->target, dl->mode);
- 		}
- 	      if (res < 0)
--		symlink_error (dl->source, dl->target);
-+		error (0, errno, _("%s: Cannot create symlink to %s"), quotearg_colon (dl->target), quote_n (1, dl->source));
- 	      else
- 		{
- 		  if (!no_chown_flag)
-@@ -789,7 +789,7 @@ copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
- 	  res = UMASKED_SYMLINK (link_name, file_hdr->c_name, file_hdr->c_mode);
- 	}
-       if (res < 0)
--	symlink_error (link_name, file_hdr->c_name);
-+	error (0, errno, _("%s: Cannot create symlink to %s"), quotearg_colon (file_hdr->c_name), quote_n (1, link_name));
-       else if (!no_chown_flag)
- 	{
- 	  uid_t uid = set_owner_flag ? set_owner : file_hdr->c_uid;
--- 
-2.27.0
-

_service:tar_scm:backport-fix-operation-of-no-absolute-filenames-make-director.patch Deleted

_service:tar_scm:backport-restore-access-and-modification-times-of-symlinks.patch Deleted

@@ -1,981 +0,0 @@
-From a3eb338a40750ecfd73de7054d44e69008866621 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Wed, 17 May 2023 18:59:58 +0300
-Subject: PATCH Restore access and modification times of symlinks in copy-in
- and copy-pass modes.
-
-* src/copyin.c: Update calls to set_file_times.
-(copyin_link,replace_symlink_placeholders): Call set_file_times if needed.
-* src/copyout.c: Update calls to set_file_times.
-* src/copypass.c (process_copy_pass): Update calls to set_file_times.
-Call set_file_times to restore times of extracted symlinks.
-* src/extern.h (set_file_times): Take additional argument.
-* src/util.c
-(set_file_times): Take additional argument.  Use fdutimensat to do the
-job.
-* tests/linktime.at: New file.
-* tests/linktime01.at: New file.
-* tests/Makefile.am: Add new files.
-* tests/testsuite.at: Include new tests.
----
- src/copyin.c        | 24 ++++++++++++-----
- src/copyout.c       |  4 +--
- src/copypass.c      | 11 ++++++--
- src/extern.h        |  2 +-
- src/util.c          |  7 ++---
- tests/Makefile.am   |  4 ++-
- tests/linktime.at   | 63 +++++++++++++++++++++++++++++++++++++++++++++
- tests/linktime01.at | 51 ++++++++++++++++++++++++++++++++++++
- tests/testsuite.at  |  3 +++
- 11 files changed, 155 insertions(+), 18 deletions(-)
- create mode 100644 tests/linktime.at
- create mode 100644 tests/linktime01.at
-
-diff --git a/gnu/Makefile.am b/gnu/Makefile.am
-index d63397e..a208b30 100644
---- a/gnu/Makefile.am
-+++ b/gnu/Makefile.am
-@@ -42,6 +42,7 @@
- #  configmake \
- #  dirname \
- #  error \
-+#  fdutimensat \
- #  fileblocks \
- #  fnmatch-gnu \
- #  fseeko \
-@@ -71,7 +72,6 @@
- #  strtoumax \
- #  timespec \
- #  unlocked-io \
--#  utimens \
- #  utimensat \
- #  version-etc-fsf \
- #  xalloc \
-@@ -683,6 +683,14 @@ EXTRA_DIST += dirent-private.h
- 
- ## end   gnulib module fdopendir
- 
-+## begin gnulib module fdutimensat
-+
-+libgnu_a_SOURCES += fdutimensat.c
-+
-+EXTRA_DIST += utimens.h
-+
-+## end   gnulib module fdutimensat
-+
- ## begin gnulib module fileblocks
- 
- if GL_COND_OBJ_FILEBLOCKS
-@@ -863,6 +871,14 @@ libgnu_a_SOURCES += full-write.h full-write.c
- 
- ## end   gnulib module full-write
- 
-+## begin gnulib module futimens
-+
-+if GL_COND_OBJ_FUTIMENS
-+libgnu_a_SOURCES += futimens.c
-+endif
-+
-+## end   gnulib module futimens
-+
- ## begin gnulib module gen-header
- 
- # In 'sed', replace the pattern space with a "DO NOT EDIT" comment.
-diff --git a/src/copyin.c b/src/copyin.c
-index f2babb7..29ac764 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -344,7 +344,7 @@ create_defered_links_to_skipped (struct cpio_file_stat *file_hdr,
-    empty links that are still on the deferments list.  */
- 
- static void
--create_final_defers ()
-+create_final_defers (void)
- {
-   struct deferment *d;
-   int	link_res;
-@@ -619,7 +619,7 @@ copyin_device (struct cpio_file_stat* file_hdr)
-     chmod_error_details (file_hdr->c_name, file_hdr->c_mode);
-   if (retain_time_flag)
-     set_file_times (-1, file_hdr->c_name, file_hdr->c_mtime,
--		    file_hdr->c_mtime);
-+		    file_hdr->c_mtime, 0);
- }
- &#xc;
- struct delayed_link
-@@ -737,12 +737,18 @@ replace_symlink_placeholders (void)
- 		}
- 	      if (res < 0)
- 		symlink_error (dl->source, dl->target);
--	      else if (!no_chown_flag)
-+	      else
- 		{
--		  uid_t uid = set_owner_flag ? set_owner : dl->uid;
--		  gid_t gid = set_group_flag ? set_group : dl->gid;
--		  if (lchown (dl->target, uid, gid) < 0 && errno != EPERM)
--		    chown_error_details (dl->target, uid, gid);
-+		  if (!no_chown_flag)
-+		    {
-+		      uid_t uid = set_owner_flag ? set_owner : dl->uid;
-+		      gid_t gid = set_group_flag ? set_group : dl->gid;
-+		      if (lchown (dl->target, uid, gid) < 0 && errno != EPERM)
-+			chown_error_details (dl->target, uid, gid);
-+		    }
-+		  if (retain_time_flag)
-+		    set_file_times (-1, dl->target, dl->mtime, dl->mtime,
-+				    AT_SYMLINK_NOFOLLOW);
- 		}
- 	    }
- 	}
-@@ -797,6 +803,10 @@ copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
- 	  if (lchown (file_hdr->c_name, uid, gid) < 0 && errno != EPERM)
- 	    chown_error_details (file_hdr->c_name, uid, gid);
- 	}
-+
-+      if (retain_time_flag)
-+	set_file_times (-1, file_hdr->c_name, file_hdr->c_mtime,
-+			file_hdr->c_mtime, AT_SYMLINK_NOFOLLOW);
-     }
-   free (link_name);
- }
-diff --git a/src/copyout.c b/src/copyout.c
-index 6e82f4c..8fae895 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -227,7 +227,7 @@ writeout_defered_file (struct cpio_file_stat *header, int out_file_des)
- 
-   if (reset_time_flag)
-     set_file_times (in_file_des, file_hdr.c_name, file_hdr.c_mtime,
--		    file_hdr.c_mtime);
-+		    file_hdr.c_mtime, 0);
-   if (close (in_file_des) < 0)
-     close_error (header->c_name);
- }
-@@ -725,7 +725,7 @@ process_copy_out (void)
- 	      if (reset_time_flag)
- 		set_file_times (in_file_des,
- 				orig_file_name,
--				file_stat.st_atime, file_stat.st_mtime);
-+				file_stat.st_atime, file_stat.st_mtime, 0);
- 	      if (close (in_file_des) < 0)
- 		close_error (orig_file_name);
- 	      break;
-diff --git a/src/copypass.c b/src/copypass.c
-index a8280ae..09ffebb 100644
---- a/src/copypass.c
-+++ b/src/copypass.c
-@@ -193,11 +193,13 @@ process_copy_pass (void)
- 		  set_file_times (in_file_des,
- 				  input_name.ds_string,
- 				  in_file_stat.st_atime,
--				  in_file_stat.st_mtime);
-+				  in_file_stat.st_mtime,
-+				  0);
- 		  set_file_times (out_file_des,
- 				  output_name.ds_string,
- 				  in_file_stat.st_atime,
--				  in_file_stat.st_mtime);
-+				  in_file_stat.st_mtime,
-+				  0);
- 		}
- 
- 	      if (close (in_file_des) < 0)
-@@ -300,6 +302,11 @@ process_copy_pass (void)
- 		  && errno != EPERM)
- 		chown_error_details (output_name.ds_string, uid, gid);
- 	    }
-+
-+	  if (retain_time_flag)
-+	    set_file_times (-1, output_name.ds_string,
-+			    in_file_stat.st_atime, in_file_stat.st_mtime,
-+			    AT_SYMLINK_NOFOLLOW);
- 	  free (link_name);
- 	}
- #endif
-diff --git a/src/extern.h b/src/extern.h
-index 6afbdd2..d7c31b4 100644
---- a/src/extern.h
-+++ b/src/extern.h
-@@ -204,7 +204,7 @@ void write_nuls_to_file (off_t num_bytes, int out_des,
- 
- void set_perms (int fd, struct cpio_file_stat *header);
- void set_file_times (int fd, const char *name, unsigned long atime,
--		     unsigned long mtime);
-+		     unsigned long mtime, int atflag);
- void stat_to_cpio (struct cpio_file_stat *hdr, struct stat *st);
- void cpio_to_stat (struct stat *st, struct cpio_file_stat *hdr);
- void cpio_safer_name_suffix (char *name, bool link_target,
-diff --git a/src/util.c b/src/util.c
-index 7415e10..bc1ffb8 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -1235,12 +1235,13 @@ set_perms (int fd, struct cpio_file_stat *header)
-   if (fchmod_or_chmod (fd, header->c_name, header->c_mode) < 0)
-     chmod_error_details (header->c_name, header->c_mode);
-   if (retain_time_flag)
--    set_file_times (fd, header->c_name, header->c_mtime, header->c_mtime);
-+    set_file_times (fd, header->c_name, header->c_mtime, header->c_mtime, 0);
- }
- 
- void
- set_file_times (int fd,
--		const char *name, unsigned long atime, unsigned long mtime)
-+		const char *name, unsigned long atime, unsigned long mtime,
-+		int atflag)
- {
-   struct timespec ts2;
- 
-@@ -1251,7 +1252,7 @@ set_file_times (int fd,
- 
-   /* Silently ignore EROFS because reading the file won't have upset its
-      timestamp if it's on a read-only filesystem. */
--  if (fdutimens (fd, name, ts) < 0 && errno != EROFS)
-+  if (fdutimensat (fd, AT_FDCWD, name, ts, atflag) < 0 && errno != EROFS)
-     utime_error (name);
- }
- 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 52503c9..28e259e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -57,7 +57,9 @@ TESTSUITE_AT = \
-  version.at\
-  big-block-size.at\
-  CVE-2015-1197.at\
-- CVE-2019-14866.at
-+ CVE-2019-14866.at\
-+ linktime.at\
-+ linktime01.at
- 
- TESTSUITE = $(srcdir)/testsuite
- 
-diff --git a/tests/testsuite.at b/tests/testsuite.at
-index c58cbb7..4dd2afc 100644
---- a/tests/testsuite.at
-+++ b/tests/testsuite.at
-@@ -45,3 +45,6 @@ m4_include(big-block-size.at)
- 
- m4_include(CVE-2015-1197.at)
- m4_include(CVE-2019-14866.at)
-+
-+m4_include(linktime.at)
-+m4_include(linktime01.at)
-diff --git a/m4/futimens.m4 b/m4/futimens.m4
-new file mode 100644
-index 0000000..dc0b21b
---- /dev/null
-+++ b/m4/futimens.m4
-@@ -0,0 +1,69 @@
-+# serial 11
-+# See if we need to provide futimens replacement.
-+
-+dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# Written by Eric Blake.
-+
-+AC_DEFUN(gl_FUNC_FUTIMENS,
-+
-+  AC_REQUIRE(gl_SYS_STAT_H_DEFAULTS)
-+  AC_REQUIRE(AC_CANONICAL_HOST) dnl for cross-compiles
-+  AC_REQUIRE(gl_USE_SYSTEM_EXTENSIONS)
-+  gl_CHECK_FUNCS_ANDROID(futimens, #include <sys/stat.h>)
-+  if test $ac_cv_func_futimens = no; then
-+    HAVE_FUTIMENS=0
-+    case "$gl_cv_onwards_func_futimens" in
-+      future*) REPLACE_FUTIMENS=1 ;;
-+    esac
-+  else
-+    AC_CACHE_CHECK(whether futimens works,
-+      gl_cv_func_futimens_works,
-+      AC_RUN_IFELSE(AC_LANG_PROGRAM(
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <errno.h>
-+GL_MDA_DEFINES,
-+     struct timespec ts2;
-+      int fd = creat ("conftest.file", 0600);
-+      struct stat st;
-+      if (fd < 0) return 1;
-+      ts0.tv_sec = 1;
-+      ts0.tv_nsec = UTIME_OMIT;
-+      ts1.tv_sec = 1;
-+      ts1.tv_nsec = UTIME_NOW;
-+      errno = 0;
-+      if (futimens (AT_FDCWD, NULL) == 0) return 2;
-+      if (errno != EBADF) return 3;
-+      if (futimens (fd, ts)) return 4;
-+      sleep (1);
-+      ts0.tv_nsec = UTIME_NOW;
-+      ts1.tv_nsec = UTIME_OMIT;
-+      if (futimens (fd, ts)) return 5;
-+      if (fstat (fd, &st)) return 6;
-+      if (st.st_ctime < st.st_atime) return 7;
-+      ),
-+         gl_cv_func_futimens_works=yes,
-+         gl_cv_func_futimens_works=no,
-+         case "$host_os" in
-+                           # Guess no on glibc systems.
-+            *-gnu* | gnu*) gl_cv_func_futimens_works="guessing no" ;;
-+                           # Guess no on musl systems.
-+            *-musl*)       gl_cv_func_futimens_works="guessing no" ;;
-+                           # Guess yes otherwise.
-+            *)             gl_cv_func_futimens_works="guessing yes" ;;
-+          esac
-+         )
-+      rm -f conftest.file)
-+    case "$gl_cv_func_futimens_works" in
-+      *yes) ;;
-+      *)
-+        REPLACE_FUTIMENS=1
-+        ;;
-+    esac
-+  fi
-+)
-diff --git a/tests/linktime.at b/tests/linktime.at
-new file mode 100644
-index 0000000..bcee241
---- /dev/null
-+++ b/tests/linktime.at
-@@ -0,0 +1,63 @@
-+# Process this file with autom4te to create testsuite.  -*- Autotest -*-
-+# Copyright (C) 2023 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License along
-+# with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+AT_SETUP(restoring symlink times)
-+AT_KEYWORDS(linktime copyin copypass)
-+
-+AT_DATA(filelist,file
-+symlink
-+)
-+
-+AT_DATA(filelist_rev,symlink
-+file
-+)
-+
-+AT_CHECK(
-+mkdir dir
-+cd dir
-+genfile --file file
-+ln -s file symlink || AT_SKIP_TEST
-+genfile -th --date '2 days ago' symlink || AT_SKIP_TEST
-+cd ..
-+)
-+
-+AT_CHECK(
-+time_orig=$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir --quiet -o < filelist > arc.cpio
-+cpio -m --quiet -i < arc.cpio
-+time=$(genfile -h -Smtime symlink)
-+test "$time" -eq "$time_orig"
-+)
-+
-+AT_CHECK(
-+time_orig=$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir --quiet -o < filelist_rev > arc.cpio
-+cpio -m --quiet -i < arc.cpio
-+time=$(genfile -h -Smtime symlink)
-+test "$time" -eq "$time_orig"
-+)
-+
-+AT_CHECK(
-+time_orig=$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir -m --quiet -p . < filelist 
-+time=$(genfile -h -Smtime symlink)
-+test "$time" -eq "$time_orig"
-+)
-+
-+AT_CLEANUP
-diff --git a/tests/linktime01.at b/tests/linktime01.at
-new file mode 100644
-index 0000000..9caa58f
---- /dev/null
-+++ b/tests/linktime01.at
-@@ -0,0 +1,51 @@
-+# Process this file with autom4te to create testsuite.  -*- Autotest -*-
-+# Copyright (C) 2023 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License along
-+# with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+AT_SETUP(restoring delayed symlink times)
-+AT_KEYWORDS(linktime copyin)
-+
-+AT_CHECK(
-+mkdir dir
-+genfile --file dir/file1
-+ln -s dir dirlink || AT_SKIP_TEST
-+genfile -th --date '2 days ago' dirlink || AT_SKIP_TEST
-+)
-+
-+AT_DATA(filelist,
-+dir
-+dir/file1
-+dirlink
-+)
-+
-+AT_CHECK(
-+time_orig=$(genfile -h -Smtime dirlink)
-+cpio --quiet -o < filelist > arc.cpio
-+mkdir extr
-+cpio -D extr --quiet --no-absolute-filenames -m -i < arc.cpio
-+find extr | sort
-+time=$(genfile -h -Smtime extr/dirlink)
-+test "$time" -eq "$time_orig"
-+,
-+0,
-+extr
-+extr/dir
-+extr/dir/file1
-+extr/dirlink
-+)
-+
-+AT_CLEANUP
-+
-+
-diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
-index ad10592..fa0c93e 100644
---- a/m4/gnulib-comp.m4
-+++ b/m4/gnulib-comp.m4
-@@ -98,6 +98,7 @@ AC_DEFUN(gl_EARLY,
-   # Code from module fd-hook:
-   # Code from module fd-safer-flag:
-   # Code from module fdopendir:
-+  # Code from module fdutimensat:
-   # Code from module fileblocks:
-   # Code from module filename:
-   # Code from module filenamecat-lgpl:
-@@ -114,6 +115,7 @@ AC_DEFUN(gl_EARLY,
-   # Code from module fstat:
-   # Code from module fstatat:
-   # Code from module full-write:
-+  # Code from module futimens:
-   # Code from module gen-header:
-   # Code from module getcwd:
-   # Code from module getcwd-lgpl:
-@@ -411,6 +413,7 @@ AC_DEFUN(gl_INIT,
-                  test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1)
-   gl_DIRENT_MODULE_INDICATOR(fdopendir)
-   gl_MODULE_INDICATOR(fdopendir)
-+  gl_MODULE_INDICATOR(fdutimensat)
-   gl_FILEBLOCKS
-   gl_CONDITIONAL(GL_COND_OBJ_FILEBLOCKS,
-                  test $ac_cv_member_struct_stat_st_blocks = no)
-@@ -475,6 +478,10 @@ AC_DEFUN(gl_INIT,
-   gl_CONDITIONAL(GL_COND_OBJ_FSTATAT,
-                  test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1)
-   gl_SYS_STAT_MODULE_INDICATOR(fstatat)
-+  gl_FUNC_FUTIMENS
-+  gl_CONDITIONAL(GL_COND_OBJ_FUTIMENS,
-+                 test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1)
-+  gl_SYS_STAT_MODULE_INDICATOR(futimens)
-   gl_FUNC_GETCWD
-   gl_CONDITIONAL(GL_COND_OBJ_GETCWD, test $REPLACE_GETCWD = 1)
-   AM_COND_IF(GL_COND_OBJ_GETCWD, 
-@@ -1278,6 +1285,7 @@ AC_DEFUN(gl_FILE_LIST, 
-   lib/fd-safer-flag.c
-   lib/fd-safer.c
-   lib/fdopendir.c
-+  lib/fdutimensat.c
-   lib/fileblocks.c
-   lib/filename.h
-   lib/filenamecat-lgpl.c
-@@ -1298,6 +1306,7 @@ AC_DEFUN(gl_FILE_LIST, 
-   lib/fstatat.c
-   lib/full-write.c
-   lib/full-write.h
-+  lib/futimens.c
-   lib/getcwd-lgpl.c
-   lib/getcwd.c
-   lib/getdelim.c
-@@ -1556,6 +1565,7 @@ AC_DEFUN(gl_FILE_LIST, 
-   m4/fseeko.m4
-   m4/fstat.m4
-   m4/fstatat.m4
-+  m4/futimens.m4
-   m4/getcwd-abort-bug.m4
-   m4/getcwd-path-max.m4
-   m4/getcwd.m4
-diff --git a/aclocal.m4 b/aclocal.m4
-index ce55bc1..d5bd65f 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1241,6 +1241,7 @@ m4_include(m4/fseek.m4)
- m4_include(m4/fseeko.m4)
- m4_include(m4/fstat.m4)
- m4_include(m4/fstatat.m4)
-+m4_include(m4/futimens.m4)
- m4_include(m4/getcwd-abort-bug.m4)
- m4_include(m4/getcwd-path-max.m4)
- m4_include(m4/getcwd.m4)
-diff --git a/gnu/fdutimensat.c b/gnu/fdutimensat.c
-new file mode 100644
-index 0000000..5b801e0
---- /dev/null
-+++ b/gnu/fdutimensat.c
-@@ -0,0 +1,57 @@
-+/* Set file access and modification times.
-+
-+   Copyright (C) 2009-2023 Free Software Foundation, Inc.
-+
-+   This program is free software: you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by the
-+   Free Software Foundation, either version 3 of the License, or any
-+   later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-+
-+/* Written by Eric Blake.  */
-+
-+/* derived from a function in utimens.c */
-+
-+#include <config.h>
-+
-+#include "utimens.h"
-+
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+
-+/* Set the access and modification timestamps of FD (a.k.a. FILE) to be
-+   TIMESPEC0 and TIMESPEC1, respectively; relative to directory DIR.
-+   FD must be either negative -- in which case it is ignored --
-+   or a file descriptor that is open on FILE.
-+   If FD is nonnegative, then FILE can be NULL, which means
-+   use just futimes (or equivalent) instead of utimes (or equivalent),
-+   and fail if on an old system without futimes (or equivalent).
-+   If TIMESPEC is null, set the timestamps to the current time.
-+   ATFLAG is passed to utimensat if FD is negative or futimens was
-+   unsupported, which can allow operation on FILE as a symlink.
-+   Return 0 on success, -1 (setting errno) on failure.  */
-+
-+int
-+fdutimensat (int fd, int dir, char const *file, struct timespec const ts2,
-+             int atflag)
-+{
-+  int result = 1;
-+  if (0 <= fd)
-+    result = futimens (fd, ts);
-+  if (file && (fd < 0 || (result == -1 && errno == ENOSYS)))
-+    result = utimensat (dir, file, ts, atflag);
-+  if (result == 1)
-+    {
-+      errno = EBADF;
-+      result = -1;
-+    }
-+  return result;
-+}
-diff --git a/gnu/futimens.c b/gnu/futimens.c
-new file mode 100644
-index 0000000..5bb3049
---- /dev/null
-+++ b/gnu/futimens.c
-@@ -0,0 +1,37 @@
-+/* Set the access and modification time of an open fd.
-+   Copyright (C) 2009-2023 Free Software Foundation, Inc.
-+
-+   This file is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU Lesser General Public License as
-+   published by the Free Software Foundation, either version 3 of the
-+   License, or (at your option) any later version.
-+
-+   This file is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-+
-+/* written by Eric Blake */
-+
-+#include <config.h>
-+
-+#include <sys/stat.h>
-+
-+#include "utimens.h"
-+
-+/* Set the access and modification timestamps of FD to be
-+   TIMESPEC0 and TIMESPEC1, respectively.
-+   Fail with ENOSYS on systems without futimes (or equivalent).
-+   If TIMESPEC is null, set the timestamps to the current time.
-+   Return 0 on success, -1 (setting errno) on failure.  */
-+int
-+futimens (int fd, struct timespec const times2)
-+{
-+  /* fdutimens also works around bugs in native futimens, when running
-+     with glibc compiled against newer headers but on a Linux kernel
-+     older than 2.6.32.  */
-+  return fdutimens (fd, NULL, times);
-+}
-diff --git a/tests/genfile.c b/tests/genfile.c
-index be4a2d3..0074c5c 100644
---- a/tests/genfile.c
-+++ b/tests/genfile.c
-@@ -77,7 +77,8 @@ enum genfile_mode
-     mode_generate,
-     mode_sparse,
-     mode_stat,
--    mode_exec
-+    mode_exec,
-+    mode_set_times
-   };
- 
- enum genfile_mode mode = mode_generate;
-@@ -106,6 +107,9 @@ int verbose;
- /* Quiet mode */
- int quiet;
- 
-+/* Don't dereference symlinks (for --stat) */
-+int no_dereference_option;
-+
- const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
- const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
- static char doc = N_("genfile manipulates data files for GNU paxutils test suite.\n"
-@@ -155,6 +159,14 @@ static struct argp_option options = {
-    N_("Print contents of struct stat for each given file. Default FORMAT is: ")
-    DEFAULT_STAT_FORMAT,
-    GRP+1 },
-+  {"no-dereference", 'h', NULL, 0,
-+   N_("stat symbolic links instead of referenced files"),
-+   GRP+1 },
-+
-+  {"set-times", 't', NULL, 0,
-+   N_("Set access and modification times of the files to the time supplied"
-+      " by --date option"),
-+   GRP+1 },
- 
- #undef GRP
- #define GRP 20
-@@ -348,6 +360,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
- 	stat_format = arg;
-       break;
- 
-+    case 't':
-+      mode = mode_set_times;
-+      break;
-+
-+    case 'h':
-+      no_dereference_option = 1;
-+      break;
-+
-     case 'r':
-       mode = mode_exec;
-       checkpoint_granularity = arg ? arg : "1";
-@@ -647,7 +667,7 @@ print_stat (const char *name)
-   char *fmt, *p;
-   struct stat st;
- 
--  if (stat (name, &st))
-+  if ((no_dereference_option ? lstat : stat) (name, &st))
-     {
-       error (0, errno, _("stat(%s) failed"), name);
-       return;
-@@ -725,6 +745,17 @@ print_stat (const char *name)
-   free (fmt);
- }
- 
-+void
-+set_times (char const *name)
-+{
-+  struct timespec ts2;
-+
-+  ts0 = ts1 = touch_time;
-+  if (utimensat (AT_FDCWD, name, ts, no_dereference_option ? AT_SYMLINK_NOFOLLOW : 0) != 0)
-+    {
-+      error (EXIT_FAILURE, errno, _("cannot set time on `%s'"), name);
-+    }
-+}
- &#xc;
- /* Exec Mode */
- 
-@@ -740,7 +771,7 @@ exec_checkpoint (struct action *p)
- 	struct timespec ts2;
- 
- 	ts0 = ts1 = p->ts;
--	if (utimensat (AT_FDCWD, p->name, ts, 0) != 0)
-+	if (utimensat (AT_FDCWD, p->name, ts, no_dereference_option ? AT_SYMLINK_NOFOLLOW : 0) != 0)
- 	  {
- 	    error (0, errno, _("cannot set time on `%s'"), p->name);
- 	    break;
-@@ -987,6 +1018,14 @@ main (int argc, char **argv)
- 	print_stat (*argv++);
-       break;
- 
-+    case mode_set_times:
-+      if (argc == 0)
-+	error (EXIT_USAGE, 0, _("--set-times requires file names"));
-+
-+      while (argc--)
-+	set_times (*argv++);
-+      break;
-+
-     case mode_sparse:
-       generate_sparse_file (argc, argv);
-       verify_file (file_name);
-diff --git a/tests/testsuite b/tests/testsuite
-index 10531d1..442ab00 100755
---- a/tests/testsuite
-+++ b/tests/testsuite
-@@ -625,6 +625,8 @@ at_help_all="1;version.at:19;cpio version;;
- 13;big-block-size.at:17;big block size;block integer overflow;
- 14;CVE-2015-1197.at:17;CVE-2015-1197 (--no-absolute-filenames for symlinks);;
- 15;CVE-2019-14866.at:17;CVE-2019-14866 (tar header size overflow);;
-+16;linktime.at:17;restoring symlink times;linktime copyin copypass;
-+17;linktime01.at:17;restoring delayed symlink times;linktime copyin;
- "
- # List of the all the test groups.
- at_groups_all=`printf "%s\n" "$at_help_all" | sed 's/;.*//'`
-@@ -638,7 +640,7 @@ at_fn_validate_ranges ()
-   for at_grp
-   do
-     eval at_value=\$$at_grp
--    if test $at_value -lt 1 || test $at_value -gt 15; then
-+    if test $at_value -lt 1 || test $at_value -gt 17; then
-       printf "%s\n" "invalid test group: $at_value" >&2
-       exit 1
-     fi
-@@ -2940,3 +2942,209 @@ $at_traceon; }
- ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
- read at_status <"$at_status_file"
- #AT_STOP_15
-+#AT_START_16
-+at_fn_group_banner 16 'linktime.at:17' \
-+  "restoring symlink times" "                        "
-+at_xfail=no
-+(
-+  printf "%s\n" "16. $at_setup_line: testing $at_desc ..."
-+  $at_traceon
-+
-+
-+
-+cat >filelist <<'_ATEOF'
-+file
-+symlink
-+_ATEOF
-+
-+
-+cat >filelist_rev <<'_ATEOF'
-+symlink
-+file
-+_ATEOF
-+
-+
-+{ set +x
-+printf "%s\n" "$at_srcdir/linktime.at:28: mkdir dir
-+cd dir
-+genfile --file file
-+ln -s file symlink || exit 77
-+genfile -th --date '2 days ago' symlink || exit 77
-+cd ..
-+"
-+at_fn_check_prepare_notrace 'an embedded newline' "linktime.at:28"
-+( $at_check_trace; mkdir dir
-+cd dir
-+genfile --file file
-+ln -s file symlink || exit 77
-+genfile -th --date '2 days ago' symlink || exit 77
-+cd ..
-+
-+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-+at_status=$? at_failed=false
-+$at_check_filter
-+at_fn_diff_devnull "$at_stderr" || at_failed=:
-+at_fn_diff_devnull "$at_stdout" || at_failed=:
-+at_fn_check_status 0 $at_status "$at_srcdir/linktime.at:28"
-+$at_failed && at_fn_log_failure
-+$at_traceon; }
-+
-+
-+{ set +x
-+printf "%s\n" "$at_srcdir/linktime.at:37: time_orig=\$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir --quiet -o < filelist > arc.cpio
-+cpio -m --quiet -i < arc.cpio
-+time=\$(genfile -h -Smtime symlink)
-+test \"\$time\" -eq \"\$time_orig\"
-+"
-+at_fn_check_prepare_notrace 'a $(...) command substitution' "linktime.at:37"
-+( $at_check_trace; time_orig=$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir --quiet -o < filelist > arc.cpio
-+cpio -m --quiet -i < arc.cpio
-+time=$(genfile -h -Smtime symlink)
-+test "$time" -eq "$time_orig"
-+
-+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-+at_status=$? at_failed=false
-+$at_check_filter
-+at_fn_diff_devnull "$at_stderr" || at_failed=:
-+at_fn_diff_devnull "$at_stdout" || at_failed=:
-+at_fn_check_status 0 $at_status "$at_srcdir/linktime.at:37"
-+$at_failed && at_fn_log_failure
-+$at_traceon; }
-+
-+
-+{ set +x
-+printf "%s\n" "$at_srcdir/linktime.at:46: time_orig=\$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir --quiet -o < filelist_rev > arc.cpio
-+cpio -m --quiet -i < arc.cpio
-+time=\$(genfile -h -Smtime symlink)
-+test \"\$time\" -eq \"\$time_orig\"
-+"
-+at_fn_check_prepare_notrace 'a $(...) command substitution' "linktime.at:46"
-+( $at_check_trace; time_orig=$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir --quiet -o < filelist_rev > arc.cpio
-+cpio -m --quiet -i < arc.cpio
-+time=$(genfile -h -Smtime symlink)
-+test "$time" -eq "$time_orig"
-+
-+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-+at_status=$? at_failed=false
-+$at_check_filter
-+at_fn_diff_devnull "$at_stderr" || at_failed=:
-+at_fn_diff_devnull "$at_stdout" || at_failed=:
-+at_fn_check_status 0 $at_status "$at_srcdir/linktime.at:46"
-+$at_failed && at_fn_log_failure
-+$at_traceon; }
-+
-+
-+{ set +x
-+printf "%s\n" "$at_srcdir/linktime.at:55: time_orig=\$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir -m --quiet -p . < filelist
-+time=\$(genfile -h -Smtime symlink)
-+test \"\$time\" -eq \"\$time_orig\"
-+"
-+at_fn_check_prepare_notrace 'a $(...) command substitution' "linktime.at:55"
-+( $at_check_trace; time_orig=$(genfile -h -Smtime dir/symlink)
-+rm -f file symlink
-+cpio -D dir -m --quiet -p . < filelist
-+time=$(genfile -h -Smtime symlink)
-+test "$time" -eq "$time_orig"
-+
-+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-+at_status=$? at_failed=false
-+$at_check_filter
-+at_fn_diff_devnull "$at_stderr" || at_failed=:
-+at_fn_diff_devnull "$at_stdout" || at_failed=:
-+at_fn_check_status 0 $at_status "$at_srcdir/linktime.at:55"
-+$at_failed && at_fn_log_failure
-+$at_traceon; }
-+
-+
-+  set +x
-+  $at_times_p && times >"$at_times_file"
-+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-+read at_status <"$at_status_file"
-+#AT_STOP_16
-+#AT_START_17
-+at_fn_group_banner 17 'linktime01.at:17' \
-+  "restoring delayed symlink times" "                "
-+at_xfail=no
-+(
-+  printf "%s\n" "17. $at_setup_line: testing $at_desc ..."
-+  $at_traceon
-+
-+
-+
-+{ set +x
-+printf "%s\n" "$at_srcdir/linktime01.at:20: mkdir dir
-+genfile --file dir/file1
-+ln -s dir dirlink || exit 77
-+genfile -th --date '2 days ago' dirlink || exit 77
-+"
-+at_fn_check_prepare_notrace 'an embedded newline' "linktime01.at:20"
-+( $at_check_trace; mkdir dir
-+genfile --file dir/file1
-+ln -s dir dirlink || exit 77
-+genfile -th --date '2 days ago' dirlink || exit 77
-+
-+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-+at_status=$? at_failed=false
-+$at_check_filter
-+at_fn_diff_devnull "$at_stderr" || at_failed=:
-+at_fn_diff_devnull "$at_stdout" || at_failed=:
-+at_fn_check_status 0 $at_status "$at_srcdir/linktime01.at:20"
-+$at_failed && at_fn_log_failure
-+$at_traceon; }
-+
-+
-+cat >filelist <<'_ATEOF'
-+dir
-+dir/file1
-+dirlink
-+_ATEOF
-+
-+
-+{ set +x
-+printf "%s\n" "$at_srcdir/linktime01.at:33: time_orig=\$(genfile -h -Smtime dirlink)
-+cpio --quiet -o < filelist > arc.cpio
-+mkdir extr
-+cpio -D extr --quiet --no-absolute-filenames -m -i < arc.cpio
-+find extr | sort
-+time=\$(genfile -h -Smtime extr/dirlink)
-+test \"\$time\" -eq \"\$time_orig\"
-+"
-+at_fn_check_prepare_notrace 'a $(...) command substitution' "linktime01.at:33"
-+( $at_check_trace; time_orig=$(genfile -h -Smtime dirlink)
-+cpio --quiet -o < filelist > arc.cpio
-+mkdir extr
-+cpio -D extr --quiet --no-absolute-filenames -m -i < arc.cpio
-+find extr | sort
-+time=$(genfile -h -Smtime extr/dirlink)
-+test "$time" -eq "$time_orig"
-+
-+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-+at_status=$? at_failed=false
-+$at_check_filter
-+at_fn_diff_devnull "$at_stderr" || at_failed=:
-+echo >>"$at_stdout"; printf "%s\n" "extr
-+extr/dir
-+extr/dir/file1
-+extr/dirlink
-+" | \
-+  $at_diff - "$at_stdout" || at_failed=:
-+at_fn_check_status 0 $at_status "$at_srcdir/linktime01.at:33"
-+$at_failed && at_fn_log_failure
-+$at_traceon; }
-+
-+
-+  set +x
-+  $at_times_p && times >"$at_times_file"
-+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-+read at_status <"$at_status_file"
-+#AT_STOP_17

_service:tar_scm:cpio-2.10-longnames-split.patch Deleted

_service:tar_scm:cpio-2.10-patternnamesigsegv.patch Deleted

@@ -1,40 +0,0 @@
-From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
-Date: Mon, 14 Sep 2015 09:47:05 +0200
-Subject: PATCH 5/7 fix segfault with nonexisting file with patternnames
- (#567022)
-
-diff --git a/src/copyin.c b/src/copyin.c
-index 5d88a23..f2babb7 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -948,21 +948,24 @@ read_pattern_file (void)
- 
-   pattern_fp = fopen (pattern_file_name, "r");
-   if (pattern_fp == NULL)
--    open_fatal (pattern_file_name);
--  while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
-+    open_error (pattern_file_name);
-+  else
-+  {
-+    while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
-     {
-       if (new_num_patterns == max_new_patterns)
--	new_save_patterns = x2nrealloc (new_save_patterns,
-+        new_save_patterns = x2nrealloc (new_save_patterns,
- 					&max_new_patterns,
- 					sizeof (new_save_patterns0));
-       new_save_patternsnew_num_patterns = xstrdup (pattern_name.ds_string);
-       ++new_num_patterns;
-     }
- 
--  ds_free (&pattern_name);
-+    ds_free (&pattern_name);
- 
--  if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
--    close_error (pattern_file_name);
-+    if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
-+      close_error (pattern_file_name);
-+  }
- 
-   for (i = 0; i < num_patterns; ++i)
-     new_save_patternsi = save_patternsi;

_service:tar_scm:cpio-2.11-crc-fips-nit.patch Deleted

_service:tar_scm:cpio-2.13-dev_number.patch Deleted

@@ -1,28 +0,0 @@
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 14 Sep 2015 09:37:15 +0200
-Subject: PATCH 3/7 Support major/minor device numbers over 127 (bz#450109)
-
-diff --git a/src/copyin.c b/src/copyin.c
-index 2e72356..5d88a23 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -1287,15 +1287,15 @@ read_in_binary (struct cpio_file_stat *file_hdr,
-       swab_array ((char *) short_hdr, 13);
-     }
- 
--  file_hdr->c_dev_maj = major (short_hdr->c_dev);
--  file_hdr->c_dev_min = minor (short_hdr->c_dev);
-+  file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev);
-+  file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev);
-   file_hdr->c_ino = short_hdr->c_ino;
-   file_hdr->c_mode = short_hdr->c_mode;
-   file_hdr->c_uid = short_hdr->c_uid;
-   file_hdr->c_gid = short_hdr->c_gid;
-   file_hdr->c_nlink = short_hdr->c_nlink;
--  file_hdr->c_rdev_maj = major (short_hdr->c_rdev);
--  file_hdr->c_rdev_min = minor (short_hdr->c_rdev);
-+  file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev);
-+  file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev);
-   file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes0 << 16
- 		      | short_hdr->c_mtimes1;
-   file_hdr->c_filesize = (unsigned long) short_hdr->c_filesizes0 << 16

_service:tar_scm:cpio-2.13-exitCode.patch Deleted

@@ -1,39 +0,0 @@
-Subject: PATCH 2/7 set exit code to 1 when cpio fails to store file > 4GB
- (#183224)
-
-diff --git a/src/copyout.c b/src/copyout.c
-index 8b0beb6..4b7336b 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -290,7 +290,7 @@ field_width_error (const char *filename, const char *fieldname,
- {
-   char valbufUINTMAX_STRSIZE_BOUND + 1;
-   char maxbufUINTMAX_STRSIZE_BOUND + 1;
--  error (0, 0, _("%s: value %s %s out of allowed range 0..%s"),
-+  error (1, 0, _("%s: value %s %s out of allowed range 0..%s"),
- 	 filename, fieldname,
- 	 STRINGIFY_BIGINT (value, valbuf),
- 	 STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8),
-diff --git a/tests/CVE-2019-14866.at b/tests/CVE-2019-14866.at
-index e877b39..50ad60b 100644
---- a/tests/CVE-2019-14866.at
-+++ b/tests/CVE-2019-14866.at
-@@ -30,6 +30,5 @@ fi
- 0,
- ,
- cpio: file: value size 17179869184 out of allowed range 0..8589934591
--2 blocks
- )
- AT_CLEANUP
-diff --git a/tests/testsuite b/tests/testsuite
-index b45c731..fd8454d 100755
---- a/tests/testsuite
-+++ b/tests/testsuite
-@@ -2885,7 +2885,6 @@ fi
- at_status=$? at_failed=false
- $at_check_filter
- echo >>"$at_stderr"; printf "%s\n" "cpio: file: value size 17179869184 out of allowed range 0..8589934591
--2 blocks
- " | \
-   $at_diff - "$at_stderr" || at_failed=:
- at_fn_diff_devnull "$at_stdout" || at_failed=:

_service:tar_scm:cpio-2.9-rh.patch Deleted

@@ -1,69 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Mon, 14 Sep 2015 09:27:21 +0200
-Subject: PATCH 1/7 make '-c' equivalent to '-H newc'
-
-diff --git a/doc/cpio.texi b/doc/cpio.texi
-index e631934..a788b5d 100644
---- a/doc/cpio.texi
-+++ b/doc/cpio.texi
-@@ -261,7 +261,8 @@ Sets the I/O block size to @var{block-size} * 512 bytes.
- @item -B
- Set the I/O block size to 5120 bytes.
- @item -c
--Use the old portable (ASCII) archive format.
-+Identical to "-H newc", use the new (SVR4) portable format.  If you wish the old
-+portable (ASCII) archive format, use "-H odc" instead.
- @item -C @var{number}
- @itemx --io-size=@var{number}
- Set the I/O block size to the given @var{number} of bytes.
-@@ -343,7 +344,8 @@ Equivalent to @option{-sS}.
- @item -B
- Set the I/O block size to 5120 bytes.
- @item -c
--Use the old portable (ASCII) archive format.
-+Identical to "-H newc", use the new (SVR4) portable format.  If you wish the old
-+portable (ASCII) archive format, use "-H odc" instead.
- @item -C @var{number}
- @itemx --io-size=@var{number}
- Set the I/O block size to the given @var{number} of bytes.
-@@ -454,7 +456,8 @@ Sets the I/O block size to @var{block-size} * 512 bytes.
- @item -B
- Set the I/O block size to 5120 bytes.
- @item -c
--Use the old portable (ASCII) archive format.
-+Identical to "-H newc", use the new (SVR4) portable format.  If you wish the old
-+portable (ASCII) archive format, use "-H odc" instead.
- @item -C @var{number}
- @itemx --io-size=@var{number}
- Set the I/O block size to the given @var{number} of bytes.
-@@ -600,7 +603,8 @@ block size is 512 bytes.
- 
- @item -c
- @ref{copy-in},@ref{copy-out},@ref{copy-pass}
--@*Use the old portable (ASCII) archive format.
-+@*Identical to "-H newc", use the new (SVR4) portable format.  If you wish the
-+old portable (ASCII) archive format, use "-H odc" instead.
- 
- @item -C @var{io-size}
- @itemx --io-size=@var{io-size}
-diff --git a/src/main.c b/src/main.c
-index a13861f..a875a13 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -124,7 +124,7 @@ static struct argp_option options = {
-   {"block-size", BLOCK_SIZE_OPTION, N_("BLOCK-SIZE"), 0,
-    N_("Set the I/O block size to BLOCK-SIZE * 512 bytes"), GRID+1 },
-   {NULL, 'c', NULL, 0,
--   N_("Use the old portable (ASCII) archive format"), GRID+1 },
-+   N_("Identical to \"-H newc\", use the new (SVR4) portable format. If you wish the old portable (ASCII) archive format, use \"-H odc\" instead."), GRID+1 },
-   {"dot", 'V', NULL, 0,
-    N_("Print a \".\" for each file processed"), GRID+1 },
-   {"io-size", 'C', N_("NUMBER"), 0,
-@@ -329,6 +329,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
-     case 'c':		/* Use the old portable ASCII format.  */
-       if (archive_format != arf_unknown)
- 	USAGE_ERROR ((0, 0, _("Archive format multiply defined")));
-+#define SVR4_COMPAT
- #ifdef SVR4_COMPAT
-       archive_format = arf_newascii; /* -H newc.  */
- #else

_service:tar_scm:cpio-2.9.90-defaultremoteshell.patch Deleted

_service Deleted

_service:tar_scm:cpio-2.14.tar.bz2 Deleted

_service:tar_scm:cpio.yaml Deleted

Build Results
RPM Lint

Refresh

Comments for request 1395 0

Request History

sgzdzh created request 2 months ago