开源软件构建与测试

_service:extract_file:cpio.spec Deleted

@@ -1,145 +0,0 @@
-Name:           cpio
-Version:        2.13
-Release:        6
-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:		revert-CVE-2015-1197.patch
-Patch8:         backport-cpio-2.13-mutiple-definition.patch
-Patch9:         backport-0001-CVE-2021-38185-Rewrite-dynamic-string-support.patch
-Patch10:        backport-0002-CVE-2021-38185-Fix-previous-commit.patch
-Patch11:        backport-0003-CVE-2021-38185-Fix-dynamic-string-reallocations.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
-* 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:cpio.spec Added

@@ -0,0 +1,151 @@
+Name:           cpio
+Version:        2.13
+Release:        7
+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:		revert-CVE-2015-1197.patch
+Patch8:         backport-cpio-2.13-mutiple-definition.patch
+Patch9:         backport-0001-CVE-2021-38185-Rewrite-dynamic-string-support.patch
+Patch10:        backport-0002-CVE-2021-38185-Fix-previous-commit.patch
+Patch11:        backport-0003-CVE-2021-38185-Fix-dynamic-string-reallocations.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
+* 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:extract_file: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:extract_file:add-option-to-add-metadata-in-copy-out-mode.patch Deleted

@@ -1,430 +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   | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- src/dstring.c   |  26 +++++++++--
- src/dstring.h   |   1 +
- src/extern.h    |   4 +-
- src/global.c    |   2 +
- src/initramfs.h |  21 +++++++++
- src/main.c      |  22 +++++++++
- 8 files changed, 211 insertions(+), 8 deletions(-)
- create mode 100644 src/initramfs.h
-
-diff --git a/doc/cpio.texi b/doc/cpio.texi
-index 31a15fa..03d9585 100644
---- a/doc/cpio.texi
-+++ b/doc/cpio.texi
-@@ -276,6 +276,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 421d36d..4cd60a3 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -22,6 +22,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"
-@@ -589,6 +590,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.  */
-@@ -604,6 +693,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;
-@@ -635,9 +726,37 @@ process_copy_out (void)
-       prepare_append (out_file_des);
-     }
- 
-+  /* 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.  */

_service:extract_file:backport-0001-CVE-2021-38185-Rewrite-dynamic-string-support.patch Deleted

@@ -1,462 +0,0 @@
-From dd96882877721703e19272fe25034560b794061b Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Sat, 7 Aug 2021 12:52:21 +0300
-Subject: PATCH 11/13 Rewrite dynamic string support.
-
-* src/dstring.c (ds_init): Take a single argument.
-(ds_free): New function.
-(ds_resize): Take a single argument.  Use x2nrealloc to expand
-the storage.
-(ds_reset,ds_append,ds_concat,ds_endswith): New function.
-(ds_fgetstr): Rewrite.  In particular, this fixes integer overflow.
-* src/dstring.h (dynamic_string): Keep both the allocated length
-(ds_size) and index of the next free byte in the string (ds_idx).
-(ds_init,ds_resize): Change signature.
-(ds_len): New macro.
-(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos.
-* src/copyin.c: Use new ds_ functions.
-* src/copyout.c: Likewise.
-* src/copypass.c: Likewise.
-* src/util.c: Likewise.
----
- src/copyin.c   | 40 +++++++++++++-------------
- src/copyout.c  | 16 ++++-------
- src/copypass.c | 34 +++++++++++------------
- src/dstring.c  | 88 ++++++++++++++++++++++++++++++++++++++++++----------------
- src/dstring.h  | 31 ++++++++++-----------
- src/util.c     |  6 ++--
- 6 files changed, 123 insertions(+), 92 deletions(-)
-
-diff --git a/src/copyin.c b/src/copyin.c
-index bf3b0a8..c7f4b49 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out,
-   char *str_res;		/* Result for string function.  */
-   static dynamic_string new_name;	/* New file name for rename option.  */
-   static int initialized_new_name = false;
-+
-   if (!initialized_new_name)
--  {
--    ds_init (&new_name, 128);
--    initialized_new_name = true;
--  }
-+    {
-+      ds_init (&new_name);
-+      initialized_new_name = true;
-+    }
- 
-   if (rename_flag)
-     {
-@@ -778,39 +779,41 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name)
-    already in `save_patterns' (from the command line) are preserved.  */
- 
- static void
--read_pattern_file ()
-+read_pattern_file (void)
- {
--  int max_new_patterns;
--  char **new_save_patterns;
--  int new_num_patterns;
-+  char **new_save_patterns = NULL;
-+  size_t max_new_patterns;
-+  size_t new_num_patterns;
-   int i;
--  dynamic_string pattern_name;
-+  dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER;
-   FILE *pattern_fp;
- 
-   if (num_patterns < 0)
-     num_patterns = 0;
--  max_new_patterns = 1 + num_patterns;
--  new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *));
-   new_num_patterns = num_patterns;
--  ds_init (&pattern_name, 128);
-+  max_new_patterns = num_patterns;
-+  new_save_patterns = xcalloc (max_new_patterns, sizeof (new_save_patterns0));
- 
-   pattern_fp = fopen (pattern_file_name, "r");
-   if (pattern_fp == NULL)
-+  {
-     open_error (pattern_file_name);
-+    ds_free (&pattern_name);
-+  }
-   else
-   {
-     while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
-       {
--        if (new_num_patterns >= max_new_patterns)
--        {
--          max_new_patterns += 1;
--          new_save_patterns = (char **)
--          xrealloc ((char *) new_save_patterns,
--            max_new_patterns * sizeof (char *));
--        }
-+        if (new_num_patterns == max_new_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);
-+
-     if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
-       close_error (pattern_file_name);
-   }
-@@ -1198,7 +1201,7 @@ swab_array (char *ptr, int count)
-    in the file system.  */
- 
- void
--process_copy_in ()
-+process_copy_in (void)
- {
-   char done = false;		/* True if trailer reached.  */
-   FILE *tty_in = NULL;		/* Interactive file for rename option.  */
-diff --git a/src/copyout.c b/src/copyout.c
-index 4b7336b..421d36d 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -594,9 +594,10 @@ assign_string (char **pvar, char *value)
-    The format of the header depends on the compatibility (-c) flag.  */
- 
- void
--process_copy_out ()
-+process_copy_out (void)
- {
--  dynamic_string input_name;	/* Name of file read from stdin.  */
-+  dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
-+                                /* Name of file read from stdin.  */
-   struct stat file_stat;	/* Stat record for file.  */
-   struct cpio_file_stat file_hdr = CPIO_FILE_STAT_INITIALIZER;
-                                 /* Output header information.  */
-@@ -605,7 +606,6 @@ process_copy_out ()
-   char *orig_file_name = NULL;
- 
-   /* Initialize the copy out.  */
--  ds_init (&input_name, 128);
-   file_hdr.c_magic = 070707;
- 
-   /* Check whether the output file might be a tape.  */
-@@ -657,14 +657,9 @@ process_copy_out ()
- 	    {
- 	      if (file_hdr.c_mode & CP_IFDIR)
- 		{
--		  int len = strlen (input_name.ds_string);
- 		  /* Make sure the name ends with a slash */
--		  if (input_name.ds_stringlen-1 != '/')
--		    {
--		      ds_resize (&input_name, len + 2);
--		      input_name.ds_stringlen = '/';
--		      input_name.ds_stringlen+1 = 0;
--		    }
-+		  if (!ds_endswith (&input_name, '/'))
-+		    ds_append (&input_name, '/');
- 		}
- 	    }
- 	  
-@@ -875,6 +870,7 @@ process_copy_out ()
- 			 (unsigned long) blocks), (unsigned long) blocks);
-     }
-   cpio_file_stat_free (&file_hdr);
-+  ds_free (&input_name);
- }
- 
- 
-diff --git a/src/copypass.c b/src/copypass.c
-index dc13b5b..62f31c6 100644
---- a/src/copypass.c
-+++ b/src/copypass.c
-@@ -48,10 +48,12 @@ set_copypass_perms (int fd, const char *name, struct stat *st)
-    If `link_flag', link instead of copying.  */
- 
- void
--process_copy_pass ()
-+process_copy_pass (void)
- {
--  dynamic_string input_name;	/* Name of file from stdin.  */
--  dynamic_string output_name;	/* Name of new file.  */
-+  dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
-+                                /* Name of file from stdin.  */
-+  dynamic_string output_name = DYNAMIC_STRING_INITIALIZER;
-+                                /* Name of new file.  */
-   size_t dirname_len;		/* Length of `directory_name'.  */
-   int res;			/* Result of functions.  */
-   char *slash;			/* For moving past slashes in input name.  */
-@@ -65,25 +67,18 @@ process_copy_pass ()
- 				   created files  */
- 
-   /* Initialize the copy pass.  */
--  ds_init (&input_name, 128);
-   
-   dirname_len = strlen (directory_name);
-   if (change_directory_option && !ISSLASH (directory_name0))
-     {
-       char *pwd = xgetcwd ();
--
--      dirname_len += strlen (pwd) + 1;
--      ds_init (&output_name, dirname_len + 2);

_service:extract_file:backport-0002-CVE-2021-38185-Fix-previous-commit.patch Deleted

@@ -1,36 +0,0 @@
-From dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Wed, 11 Aug 2021 18:10:38 +0300
-Subject: PATCH 12/13 Fix previous commit
-
-* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a
-loop.
----
- src/dstring.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dstring.c b/src/dstring.c
-index 692d3e7..b7e0bb5 100644
---- a/src/dstring.c
-+++ b/src/dstring.c
-@@ -64,7 +64,7 @@ void
- ds_reset (dynamic_string *s, size_t len)
- {
-   while (len > s->ds_size)
--    ds_resize (s);
-+    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
-   s->ds_idx = len;
- }
- 
-@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str)
- {
-   size_t len = strlen (str);
-   while (len + 1 > s->ds_size)
--    ds_resize (s);
-+    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
-   memcpy (s->ds_string + s->ds_idx, str, len);
-   s->ds_idx += len;
-   s->ds_strings->ds_idx = 0;
--- 
-1.8.3.1
-

_service:extract_file:backport-0003-CVE-2021-38185-Fix-dynamic-string-reallocations.patch Deleted

@@ -1,78 +0,0 @@
-From 236684f6deb3178043fe72a8e2faca538fa2aae1 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Wed, 18 Aug 2021 09:41:39 +0300
-Subject: PATCH 13/13 Fix dynamic string reallocations
-
-* src/dstring.c (ds_resize): Take additional argument: number of
-bytes to leave available after ds_idx.  All uses changed.
----
- src/dstring.c | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/src/dstring.c b/src/dstring.c
-index b7e0bb5..fd4e030 100644
---- a/src/dstring.c
-+++ b/src/dstring.c
-@@ -49,9 +49,9 @@ ds_free (dynamic_string *string)
- /* Expand dynamic string STRING, if necessary.  */
- 
- void
--ds_resize (dynamic_string *string)
-+ds_resize (dynamic_string *string, size_t len)
- {
--  if (string->ds_idx == string->ds_size)
-+  while (len + string->ds_idx >= string->ds_size)
-     {
-       string->ds_string = x2nrealloc (string->ds_string, &string->ds_size,
- 				      1);
-@@ -63,8 +63,7 @@ ds_resize (dynamic_string *string)
- void
- ds_reset (dynamic_string *s, size_t len)
- {
--  while (len > s->ds_size)
--    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
-+  ds_resize (s, len);
-   s->ds_idx = len;
- }
- 
-@@ -86,10 +85,10 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos)
-   /* Read the input string.  */
-   while ((next_ch = getc (f)) != eos && next_ch != EOF)
-     {
--      ds_resize (s);
-+      ds_resize (s, 0);
-       s->ds_strings->ds_idx++ = next_ch;
-     }
--  ds_resize (s);
-+  ds_resize (s, 0);
-   s->ds_strings->ds_idx = '\0';
- 
-   if (s->ds_idx == 0 && next_ch == EOF)
-@@ -101,12 +100,12 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos)
- void
- ds_append (dynamic_string *s, int c)
- {
--  ds_resize (s);
-+  ds_resize (s, 0);
-   s->ds_strings->ds_idx = c;
-   if (c)
-     {
-       s->ds_idx++;
--      ds_resize (s);
-+      ds_resize (s, 0);
-       s->ds_strings->ds_idx = 0;
-     }      
- }
-@@ -115,8 +114,7 @@ void
- ds_concat (dynamic_string *s, char const *str)
- {
-   size_t len = strlen (str);
--  while (len + 1 > s->ds_size)
--    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
-+  ds_resize (s, len);
-   memcpy (s->ds_string + s->ds_idx, str, len);
-   s->ds_idx += len;
-   s->ds_strings->ds_idx = 0;
--- 
-1.8.3.1
-

_service:extract_file:backport-cpio-2.13-mutiple-definition.patch Deleted

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

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

@@ -1,49 +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 12bd27c..183b5b5 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -870,21 +870,24 @@ read_pattern_file ()
- 
-   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)
--    {
--      if (new_num_patterns >= max_new_patterns)
--	{
--	  max_new_patterns += 1;
--	  new_save_patterns = (char **)
--	    xrealloc ((char *) new_save_patterns,
--		      max_new_patterns * sizeof (char *));
--	}
--      new_save_patternsnew_num_patterns = xstrdup (pattern_name.ds_string);
--      ++new_num_patterns;
--    }
--  if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
--    close_error (pattern_file_name);
-+    open_error (pattern_file_name);
-+  else
-+  {
-+    while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
-+      {
-+        if (new_num_patterns >= max_new_patterns)
-+        {
-+          max_new_patterns += 1;
-+          new_save_patterns = (char **)
-+          xrealloc ((char *) new_save_patterns,
-+            max_new_patterns * sizeof (char *));
-+        }
-+        new_save_patternsnew_num_patterns = xstrdup (pattern_name.ds_string);
-+        ++new_num_patterns;
-+      }
-+    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:extract_file:cpio-2.11-crc-fips-nit.patch Deleted

_service:extract_file: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 b29f348..1142d6a 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -1123,15 +1123,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:extract_file: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"; $as_echo "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:extract_file: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:extract_file:cpio-2.9.90-defaultremoteshell.patch Deleted

_service:extract_file:revert-CVE-2015-1197.patch Deleted

@@ -1,109 +0,0 @@
-From 250cae97153b438f5644e5d96814a7f5cb8c80e5 Mon Sep 17 00:00:00 2001
-From: Liquor <lirui130@huawei.com>
-Date: Thu, 26 Nov 2020 19:13:13 +0800
-Subject: PATCH revert "CVE-2015-1197"
-
-reason:https://lists.gnu.org/archive/html/bug-cpio/2019-11/msg00016.html
----
- src/copyin.c           |  5 ++---
- tests/CVE-2015-1197.at | 43 ------------------------------------------
- tests/Makefile.am      |  1 -
- tests/testsuite.at     |  1 -
- 4 files changed, 2 insertions(+), 48 deletions(-)
- delete mode 100644 tests/CVE-2015-1197.at
-
-diff --git a/src/copyin.c b/src/copyin.c
-index de31636..bf3b0a8 100644
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -645,14 +645,13 @@ copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
-       link_name = xstrdup (file_hdr->c_tar_linkname);
-     }
- 
--  cpio_safer_name_suffix (link_name, true, !no_abs_paths_flag, false);
--  
-   res = UMASKED_SYMLINK (link_name, file_hdr->c_name,
- 			 file_hdr->c_mode);
-   if (res < 0 && create_dir_flag)
-     {
-       create_all_directories (file_hdr->c_name);
--      res = UMASKED_SYMLINK (link_name, file_hdr->c_name, file_hdr->c_mode);
-+      res = UMASKED_SYMLINK (link_name, file_hdr->c_name,
-+			     file_hdr->c_mode);
-     }
-   if (res < 0)
-     {
-diff --git a/tests/CVE-2015-1197.at b/tests/CVE-2015-1197.at
-deleted file mode 100644
-index 6079af7..0000000
---- a/tests/CVE-2015-1197.at
-+++ /dev/null
-@@ -1,43 +0,0 @@
--# Process this file with autom4te to create testsuite.  -*- Autotest -*-
--# Copyright (C) 2009-2019 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(CVE-2015-1197 (--no-absolute-filenames for symlinks))
--AT_CHECK(
--tempdir=$(pwd)/tmp
--mkdir $tempdir
--touch $tempdir/file
--ln -s $tempdir dir
--AT_DATA(filelist,
--dir
--dir/file
--)
--ln -s /tmp dir
--touch /tmp/file
--cpio -o < filelist > test.cpio
--rm dir /tmp/file
--cpio --no-absolute-filenames -iv < test.cpio
--,
--2,
--,
--1 block
--cpio: Removing leading `/' from hard link targets
--dir
--cpio: dir/file: Cannot open: No such file or directory
--dir/file
--1 block
--)
--AT_CLEANUP
--
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 65bf470..a71c057 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -56,7 +56,6 @@ TESTSUITE_AT = \
-  symlink-to-stdout.at\
-  version.at\
-  big-block-size.at\
-- CVE-2015-1197.at\
-  CVE-2019-14866.at
- 
- TESTSUITE = $(srcdir)/testsuite
-diff --git a/tests/testsuite.at b/tests/testsuite.at
-index aa56bb9..58ed1d2 100644
---- a/tests/testsuite.at
-+++ b/tests/testsuite.at
-@@ -44,5 +44,4 @@ m4_include(setstat04.at)
- m4_include(setstat05.at)
- m4_include(big-block-size.at)
- 
--m4_include(CVE-2015-1197.at)
- m4_include(CVE-2019-14866.at)
--- 
-2.27.0
-

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

@@ -0,0 +1,61 @@
+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 Added

@@ -0,0 +1,430 @@
+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   | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ src/dstring.c   |  26 +++++++++--
+ src/dstring.h   |   1 +
+ src/extern.h    |   4 +-
+ src/global.c    |   2 +
+ src/initramfs.h |  21 +++++++++
+ src/main.c      |  22 +++++++++
+ 8 files changed, 211 insertions(+), 8 deletions(-)
+ create mode 100644 src/initramfs.h
+
+diff --git a/doc/cpio.texi b/doc/cpio.texi
+index 31a15fa..03d9585 100644
+--- a/doc/cpio.texi
++++ b/doc/cpio.texi
+@@ -276,6 +276,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 421d36d..4cd60a3 100644
+--- a/src/copyout.c
++++ b/src/copyout.c
+@@ -22,6 +22,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"
+@@ -589,6 +590,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.  */
+@@ -604,6 +693,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;
+@@ -635,9 +726,37 @@ process_copy_out (void)
+       prepare_append (out_file_des);
+     }
+ 
++  /* 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.  */

_service:tar_scm:backport-0001-CVE-2021-38185-Rewrite-dynamic-string-support.patch Added

@@ -0,0 +1,462 @@
+From dd96882877721703e19272fe25034560b794061b Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sat, 7 Aug 2021 12:52:21 +0300
+Subject: PATCH 11/13 Rewrite dynamic string support.
+
+* src/dstring.c (ds_init): Take a single argument.
+(ds_free): New function.
+(ds_resize): Take a single argument.  Use x2nrealloc to expand
+the storage.
+(ds_reset,ds_append,ds_concat,ds_endswith): New function.
+(ds_fgetstr): Rewrite.  In particular, this fixes integer overflow.
+* src/dstring.h (dynamic_string): Keep both the allocated length
+(ds_size) and index of the next free byte in the string (ds_idx).
+(ds_init,ds_resize): Change signature.
+(ds_len): New macro.
+(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos.
+* src/copyin.c: Use new ds_ functions.
+* src/copyout.c: Likewise.
+* src/copypass.c: Likewise.
+* src/util.c: Likewise.
+---
+ src/copyin.c   | 40 +++++++++++++-------------
+ src/copyout.c  | 16 ++++-------
+ src/copypass.c | 34 +++++++++++------------
+ src/dstring.c  | 88 ++++++++++++++++++++++++++++++++++++++++++----------------
+ src/dstring.h  | 31 ++++++++++-----------
+ src/util.c     |  6 ++--
+ 6 files changed, 123 insertions(+), 92 deletions(-)
+
+diff --git a/src/copyin.c b/src/copyin.c
+index bf3b0a8..c7f4b49 100644
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out,
+   char *str_res;		/* Result for string function.  */
+   static dynamic_string new_name;	/* New file name for rename option.  */
+   static int initialized_new_name = false;
++
+   if (!initialized_new_name)
+-  {
+-    ds_init (&new_name, 128);
+-    initialized_new_name = true;
+-  }
++    {
++      ds_init (&new_name);
++      initialized_new_name = true;
++    }
+ 
+   if (rename_flag)
+     {
+@@ -778,39 +779,41 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name)
+    already in `save_patterns' (from the command line) are preserved.  */
+ 
+ static void
+-read_pattern_file ()
++read_pattern_file (void)
+ {
+-  int max_new_patterns;
+-  char **new_save_patterns;
+-  int new_num_patterns;
++  char **new_save_patterns = NULL;
++  size_t max_new_patterns;
++  size_t new_num_patterns;
+   int i;
+-  dynamic_string pattern_name;
++  dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER;
+   FILE *pattern_fp;
+ 
+   if (num_patterns < 0)
+     num_patterns = 0;
+-  max_new_patterns = 1 + num_patterns;
+-  new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *));
+   new_num_patterns = num_patterns;
+-  ds_init (&pattern_name, 128);
++  max_new_patterns = num_patterns;
++  new_save_patterns = xcalloc (max_new_patterns, sizeof (new_save_patterns0));
+ 
+   pattern_fp = fopen (pattern_file_name, "r");
+   if (pattern_fp == NULL)
++  {
+     open_error (pattern_file_name);
++    ds_free (&pattern_name);
++  }
+   else
+   {
+     while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
+       {
+-        if (new_num_patterns >= max_new_patterns)
+-        {
+-          max_new_patterns += 1;
+-          new_save_patterns = (char **)
+-          xrealloc ((char *) new_save_patterns,
+-            max_new_patterns * sizeof (char *));
+-        }
++        if (new_num_patterns == max_new_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);
++
+     if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
+       close_error (pattern_file_name);
+   }
+@@ -1198,7 +1201,7 @@ swab_array (char *ptr, int count)
+    in the file system.  */
+ 
+ void
+-process_copy_in ()
++process_copy_in (void)
+ {
+   char done = false;		/* True if trailer reached.  */
+   FILE *tty_in = NULL;		/* Interactive file for rename option.  */
+diff --git a/src/copyout.c b/src/copyout.c
+index 4b7336b..421d36d 100644
+--- a/src/copyout.c
++++ b/src/copyout.c
+@@ -594,9 +594,10 @@ assign_string (char **pvar, char *value)
+    The format of the header depends on the compatibility (-c) flag.  */
+ 
+ void
+-process_copy_out ()
++process_copy_out (void)
+ {
+-  dynamic_string input_name;	/* Name of file read from stdin.  */
++  dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
++                                /* Name of file read from stdin.  */
+   struct stat file_stat;	/* Stat record for file.  */
+   struct cpio_file_stat file_hdr = CPIO_FILE_STAT_INITIALIZER;
+                                 /* Output header information.  */
+@@ -605,7 +606,6 @@ process_copy_out ()
+   char *orig_file_name = NULL;
+ 
+   /* Initialize the copy out.  */
+-  ds_init (&input_name, 128);
+   file_hdr.c_magic = 070707;
+ 
+   /* Check whether the output file might be a tape.  */
+@@ -657,14 +657,9 @@ process_copy_out ()
+ 	    {
+ 	      if (file_hdr.c_mode & CP_IFDIR)
+ 		{
+-		  int len = strlen (input_name.ds_string);
+ 		  /* Make sure the name ends with a slash */
+-		  if (input_name.ds_stringlen-1 != '/')
+-		    {
+-		      ds_resize (&input_name, len + 2);
+-		      input_name.ds_stringlen = '/';
+-		      input_name.ds_stringlen+1 = 0;
+-		    }
++		  if (!ds_endswith (&input_name, '/'))
++		    ds_append (&input_name, '/');
+ 		}
+ 	    }
+ 	  
+@@ -875,6 +870,7 @@ process_copy_out ()
+ 			 (unsigned long) blocks), (unsigned long) blocks);
+     }
+   cpio_file_stat_free (&file_hdr);
++  ds_free (&input_name);
+ }
+ 
+ 
+diff --git a/src/copypass.c b/src/copypass.c
+index dc13b5b..62f31c6 100644
+--- a/src/copypass.c
++++ b/src/copypass.c
+@@ -48,10 +48,12 @@ set_copypass_perms (int fd, const char *name, struct stat *st)
+    If `link_flag', link instead of copying.  */
+ 
+ void
+-process_copy_pass ()
++process_copy_pass (void)
+ {
+-  dynamic_string input_name;	/* Name of file from stdin.  */
+-  dynamic_string output_name;	/* Name of new file.  */
++  dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
++                                /* Name of file from stdin.  */
++  dynamic_string output_name = DYNAMIC_STRING_INITIALIZER;
++                                /* Name of new file.  */
+   size_t dirname_len;		/* Length of `directory_name'.  */
+   int res;			/* Result of functions.  */
+   char *slash;			/* For moving past slashes in input name.  */
+@@ -65,25 +67,18 @@ process_copy_pass ()
+ 				   created files  */
+ 
+   /* Initialize the copy pass.  */
+-  ds_init (&input_name, 128);
+   
+   dirname_len = strlen (directory_name);
+   if (change_directory_option && !ISSLASH (directory_name0))
+     {
+       char *pwd = xgetcwd ();
+-
+-      dirname_len += strlen (pwd) + 1;
+-      ds_init (&output_name, dirname_len + 2);

_service:tar_scm:backport-0002-CVE-2021-38185-Fix-previous-commit.patch Added

@@ -0,0 +1,36 @@
+From dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Wed, 11 Aug 2021 18:10:38 +0300
+Subject: PATCH 12/13 Fix previous commit
+
+* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a
+loop.
+---
+ src/dstring.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dstring.c b/src/dstring.c
+index 692d3e7..b7e0bb5 100644
+--- a/src/dstring.c
++++ b/src/dstring.c
+@@ -64,7 +64,7 @@ void
+ ds_reset (dynamic_string *s, size_t len)
+ {
+   while (len > s->ds_size)
+-    ds_resize (s);
++    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
+   s->ds_idx = len;
+ }
+ 
+@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str)
+ {
+   size_t len = strlen (str);
+   while (len + 1 > s->ds_size)
+-    ds_resize (s);
++    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
+   memcpy (s->ds_string + s->ds_idx, str, len);
+   s->ds_idx += len;
+   s->ds_strings->ds_idx = 0;
+-- 
+1.8.3.1
+

_service:tar_scm:backport-0003-CVE-2021-38185-Fix-dynamic-string-reallocations.patch Added

@@ -0,0 +1,78 @@
+From 236684f6deb3178043fe72a8e2faca538fa2aae1 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Wed, 18 Aug 2021 09:41:39 +0300
+Subject: PATCH 13/13 Fix dynamic string reallocations
+
+* src/dstring.c (ds_resize): Take additional argument: number of
+bytes to leave available after ds_idx.  All uses changed.
+---
+ src/dstring.c | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/src/dstring.c b/src/dstring.c
+index b7e0bb5..fd4e030 100644
+--- a/src/dstring.c
++++ b/src/dstring.c
+@@ -49,9 +49,9 @@ ds_free (dynamic_string *string)
+ /* Expand dynamic string STRING, if necessary.  */
+ 
+ void
+-ds_resize (dynamic_string *string)
++ds_resize (dynamic_string *string, size_t len)
+ {
+-  if (string->ds_idx == string->ds_size)
++  while (len + string->ds_idx >= string->ds_size)
+     {
+       string->ds_string = x2nrealloc (string->ds_string, &string->ds_size,
+ 				      1);
+@@ -63,8 +63,7 @@ ds_resize (dynamic_string *string)
+ void
+ ds_reset (dynamic_string *s, size_t len)
+ {
+-  while (len > s->ds_size)
+-    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
++  ds_resize (s, len);
+   s->ds_idx = len;
+ }
+ 
+@@ -86,10 +85,10 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos)
+   /* Read the input string.  */
+   while ((next_ch = getc (f)) != eos && next_ch != EOF)
+     {
+-      ds_resize (s);
++      ds_resize (s, 0);
+       s->ds_strings->ds_idx++ = next_ch;
+     }
+-  ds_resize (s);
++  ds_resize (s, 0);
+   s->ds_strings->ds_idx = '\0';
+ 
+   if (s->ds_idx == 0 && next_ch == EOF)
+@@ -101,12 +100,12 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos)
+ void
+ ds_append (dynamic_string *s, int c)
+ {
+-  ds_resize (s);
++  ds_resize (s, 0);
+   s->ds_strings->ds_idx = c;
+   if (c)
+     {
+       s->ds_idx++;
+-      ds_resize (s);
++      ds_resize (s, 0);
+       s->ds_strings->ds_idx = 0;
+     }      
+ }
+@@ -115,8 +114,7 @@ void
+ ds_concat (dynamic_string *s, char const *str)
+ {
+   size_t len = strlen (str);
+-  while (len + 1 > s->ds_size)
+-    s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
++  ds_resize (s, len);
+   memcpy (s->ds_string + s->ds_idx, str, len);
+   s->ds_idx += len;
+   s->ds_strings->ds_idx = 0;
+-- 
+1.8.3.1
+

_service:tar_scm:backport-cpio-2.13-mutiple-definition.patch Added

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

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

@@ -0,0 +1,49 @@
+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 12bd27c..183b5b5 100644
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -870,21 +870,24 @@ read_pattern_file ()
+ 
+   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)
+-    {
+-      if (new_num_patterns >= max_new_patterns)
+-	{
+-	  max_new_patterns += 1;
+-	  new_save_patterns = (char **)
+-	    xrealloc ((char *) new_save_patterns,
+-		      max_new_patterns * sizeof (char *));
+-	}
+-      new_save_patternsnew_num_patterns = xstrdup (pattern_name.ds_string);
+-      ++new_num_patterns;
+-    }
+-  if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
+-    close_error (pattern_file_name);
++    open_error (pattern_file_name);
++  else
++  {
++    while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
++      {
++        if (new_num_patterns >= max_new_patterns)
++        {
++          max_new_patterns += 1;
++          new_save_patterns = (char **)
++          xrealloc ((char *) new_save_patterns,
++            max_new_patterns * sizeof (char *));
++        }
++        new_save_patternsnew_num_patterns = xstrdup (pattern_name.ds_string);
++        ++new_num_patterns;
++      }
++    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 Added

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

@@ -0,0 +1,28 @@
+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 b29f348..1142d6a 100644
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -1123,15 +1123,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 Added

@@ -0,0 +1,39 @@
+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"; $as_echo "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 Added

@@ -0,0 +1,69 @@
+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 Added

_service:tar_scm:revert-CVE-2015-1197.patch Added

@@ -0,0 +1,109 @@
+From 250cae97153b438f5644e5d96814a7f5cb8c80e5 Mon Sep 17 00:00:00 2001
+From: Liquor <lirui130@huawei.com>
+Date: Thu, 26 Nov 2020 19:13:13 +0800
+Subject: PATCH revert "CVE-2015-1197"
+
+reason:https://lists.gnu.org/archive/html/bug-cpio/2019-11/msg00016.html
+---
+ src/copyin.c           |  5 ++---
+ tests/CVE-2015-1197.at | 43 ------------------------------------------
+ tests/Makefile.am      |  1 -
+ tests/testsuite.at     |  1 -
+ 4 files changed, 2 insertions(+), 48 deletions(-)
+ delete mode 100644 tests/CVE-2015-1197.at
+
+diff --git a/src/copyin.c b/src/copyin.c
+index de31636..bf3b0a8 100644
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -645,14 +645,13 @@ copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
+       link_name = xstrdup (file_hdr->c_tar_linkname);
+     }
+ 
+-  cpio_safer_name_suffix (link_name, true, !no_abs_paths_flag, false);
+-  
+   res = UMASKED_SYMLINK (link_name, file_hdr->c_name,
+ 			 file_hdr->c_mode);
+   if (res < 0 && create_dir_flag)
+     {
+       create_all_directories (file_hdr->c_name);
+-      res = UMASKED_SYMLINK (link_name, file_hdr->c_name, file_hdr->c_mode);
++      res = UMASKED_SYMLINK (link_name, file_hdr->c_name,
++			     file_hdr->c_mode);
+     }
+   if (res < 0)
+     {
+diff --git a/tests/CVE-2015-1197.at b/tests/CVE-2015-1197.at
+deleted file mode 100644
+index 6079af7..0000000
+--- a/tests/CVE-2015-1197.at
++++ /dev/null
+@@ -1,43 +0,0 @@
+-# Process this file with autom4te to create testsuite.  -*- Autotest -*-
+-# Copyright (C) 2009-2019 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(CVE-2015-1197 (--no-absolute-filenames for symlinks))
+-AT_CHECK(
+-tempdir=$(pwd)/tmp
+-mkdir $tempdir
+-touch $tempdir/file
+-ln -s $tempdir dir
+-AT_DATA(filelist,
+-dir
+-dir/file
+-)
+-ln -s /tmp dir
+-touch /tmp/file
+-cpio -o < filelist > test.cpio
+-rm dir /tmp/file
+-cpio --no-absolute-filenames -iv < test.cpio
+-,
+-2,
+-,
+-1 block
+-cpio: Removing leading `/' from hard link targets
+-dir
+-cpio: dir/file: Cannot open: No such file or directory
+-dir/file
+-1 block
+-)
+-AT_CLEANUP
+-
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 65bf470..a71c057 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -56,7 +56,6 @@ TESTSUITE_AT = \
+  symlink-to-stdout.at\
+  version.at\
+  big-block-size.at\
+- CVE-2015-1197.at\
+  CVE-2019-14866.at
+ 
+ TESTSUITE = $(srcdir)/testsuite
+diff --git a/tests/testsuite.at b/tests/testsuite.at
+index aa56bb9..58ed1d2 100644
+--- a/tests/testsuite.at
++++ b/tests/testsuite.at
+@@ -44,5 +44,4 @@ m4_include(setstat04.at)
+ m4_include(setstat05.at)
+ m4_include(big-block-size.at)
+ 
+-m4_include(CVE-2015-1197.at)
+ m4_include(CVE-2019-14866.at)
+-- 
+2.27.0
+

_service Changed

_service:extract_file:cpio-2.13.tar.bz2 Deleted

_service:extract_file:cpio.yaml Deleted

_service:tar_scm:cpio-1629812485.af086f5.tar -> _service:tar_scm:cpio-2.13.tar.bz2 Changed

_service:tar_scm:cpio.yaml Added

Changes of Revision 2