Date: Friday, April 21, 2023 @ 21:55:00
Author: seblu
Revision: 475104
archrelease: copy trunk to testing-x86_64
Added:
coreutils/repos/testing-x86_64/
coreutils/repos/testing-x86_64/PKGBUILD
(from rev 475103, coreutils/trunk/PKGBUILD)
coreutils/repos/testing-x86_64/copy-fix-reflink-auto-fallback.patch
(from rev 475103, coreutils/trunk/copy-fix-reflink-auto-fallback.patch)
coreutils/repos/testing-x86_64/coreutils-backup-62607.patch
(from rev 475103, coreutils/trunk/coreutils-backup-62607.patch)
coreutils/repos/testing-x86_64/gnulib-backupfile-62607.patch
(from rev 475103, coreutils/trunk/gnulib-backupfile-62607.patch)
coreutils/repos/testing-x86_64/keys/
--------------------------------------+
PKGBUILD | 52 ++++++++++++
copy-fix-reflink-auto-fallback.patch | 136 +++++++++++++++++++++++++++++++++
coreutils-backup-62607.patch | 39 +++++++++
gnulib-backupfile-62607.patch | 43 ++++++++++
4 files changed, 270 insertions(+)
Copied: coreutils/repos/testing-x86_64/PKGBUILD (from rev 475103,
coreutils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2023-04-21 21:55:00 UTC (rev 475104)
@@ -0,0 +1,52 @@
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: judd <[email protected]>
+
+pkgname=coreutils
+pkgver=9.3
+pkgrel=1
+pkgdesc='The basic file, shell and text manipulation utilities of the GNU
operating system'
+arch=('x86_64')
+license=('GPL3')
+url='https://www.gnu.org/software/coreutils/'
+depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl')
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady
+sha256sums=('adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa'
+ 'SKIP')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --with-openssl \
+ --enable-no-install-program=groups,hostname,kill,uptime
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: coreutils/repos/testing-x86_64/copy-fix-reflink-auto-fallback.patch
(from rev 475103, coreutils/trunk/copy-fix-reflink-auto-fallback.patch)
===================================================================
--- testing-x86_64/copy-fix-reflink-auto-fallback.patch
(rev 0)
+++ testing-x86_64/copy-fix-reflink-auto-fallback.patch 2023-04-21 21:55:00 UTC
(rev 475104)
@@ -0,0 +1,136 @@
+From 093a8b4bfaba60005f14493ce7ef11ed665a0176 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]>
+Date: Thu, 23 Mar 2023 13:19:04 +0000
+Subject: copy: fix --reflink=auto to fallback in more cases
+
+On restricted systems like android or some containers,
+FICLONE could return EPERM, EACCES, or ENOTTY,
+which would have induced the command to fail to copy
+rather than falling back to a more standard copy.
+
+* src/copy.c (is_terminal_failure): A new function refactored
+from handle_clone_fail().
+(is_CLONENOTSUP): Merge in the handling of EACCES, ENOTTY, EPERM
+as they also pertain to determination of whether cloning is supported
+if we ever use this function in that context.
+(handle_clone_fail): Use is_terminal_failure() in all cases,
+so that we assume a terminal failure in less errno cases.
+* NEWS: Mention the bug fix.
+Addresses https://bugs.gnu.org/62404
+---
+ NEWS | 8 ++++++++
+ src/copy.c | 62 +++++++++++++++++++++++++++++++++++---------------------------
+ 2 files changed, 43 insertions(+), 27 deletions(-)
+
+diff --git a/src/copy.c b/src/copy.c
+index 3919787..f8ba058 100644
+--- a/src/copy.c
++++ b/src/copy.c
+@@ -278,15 +278,27 @@ create_hole (int fd, char const *name, bool punch_holes,
off_t size)
+ }
+
+
+-/* Whether the errno from FICLONE, or copy_file_range
+- indicates operation is not supported for this file or file system. */
++/* Whether the errno indicates the operation is a transient failure.
++ I.e., a failure that would indicate the operation _is_ supported,
++ but has failed in a terminal way. */
++
++static bool
++is_terminal_error (int err)
++{
++ return err == EIO || err == ENOMEM || err == ENOSPC || err == EDQUOT;
++}
++
++
++/* Whether the errno from FICLONE, or copy_file_range indicates
++ the operation is not supported/allowed for this file or process. */
+
+ static bool
+ is_CLONENOTSUP (int err)
+ {
+- return err == ENOSYS || is_ENOTSUP (err)
++ return err == ENOSYS || err == ENOTTY || is_ENOTSUP (err)
+ || err == EINVAL || err == EBADF
+- || err == EXDEV || err == ETXTBSY;
++ || err == EXDEV || err == ETXTBSY
++ || err == EPERM || err == EACCES;
+ }
+
+
+@@ -339,20 +351,18 @@ sparse_copy (int src_fd, int dest_fd, char **abuf,
size_t buf_size,
+ {
+ copy_debug.offload = COPY_DEBUG_UNSUPPORTED;
+
+- if (is_CLONENOTSUP (errno))
+- break;
+-
+- /* copy_file_range might not be enabled in seccomp filters,
+- so retry with a standard copy. EPERM can also occur
+- for immutable files, but that would only be in the edge case
+- where the file is made immutable after creating/truncating,
++ /* Consider operation unsupported only if no data copied.
++ For example, EPERM could occur if copy_file_range not enabled
++ in seccomp filters, so retry with a standard copy. EPERM can
++ also occur for immutable files, but that would only be in the
++ edge case where the file is made immutable after creating,
+ in which case the (more accurate) error is still shown. */
+- if (errno == EPERM && *total_n_read == 0)
++ if (*total_n_read == 0 && is_CLONENOTSUP (errno))
+ break;
+
+ /* ENOENT was seen sometimes across CIFS shares, resulting in
+ no data being copied, but subsequent standard copies succeed.
*/
+- if (errno == ENOENT && *total_n_read == 0)
++ if (*total_n_read == 0 && errno == ENOENT)
+ break;
+
+ if (errno == EINTR)
+@@ -1172,17 +1182,15 @@ handle_clone_fail (int dst_dirfd, char const*
dst_relname,
+ char const* src_name, char const* dst_name,
+ int dest_desc, bool new_dst, enum Reflink_type
reflink_mode)
+ {
+- /* If the clone operation is creating the destination,
+- then don't try and cater for all non transient file system errors,
+- and instead only cater for specific transient errors. */
+- bool transient_failure;
+- if (dest_desc < 0) /* currently for fclonefileat(). */
+- transient_failure = errno == EIO || errno == ENOMEM
+- || errno == ENOSPC || errno == EDQUOT;
+- else /* currently for FICLONE. */
+- transient_failure = ! is_CLONENOTSUP (errno);
+-
+- if (reflink_mode == REFLINK_ALWAYS || transient_failure)
++ /* When the clone operation fails, report failure only with errno values
++ known to mean trouble when the clone is supported and called properly.
++ Do not report failure merely because !is_CLONENOTSUP (errno),
++ as systems may yield oddball errno values here with FICLONE.
++ Also is_CLONENOTSUP() is not appropriate for the range of errnos
++ possible from fclonefileat(), so it's more consistent to avoid. */
++ bool report_failure = is_terminal_error (errno);
++
++ if (reflink_mode == REFLINK_ALWAYS || report_failure)
+ error (0, errno, _("failed to clone %s from %s"),
+ quoteaf_n (0, dst_name), quoteaf_n (1, src_name));
+
+@@ -1190,14 +1198,14 @@ handle_clone_fail (int dst_dirfd, char const*
dst_relname,
+ but cloned no data. */
+ if (new_dst /* currently not for fclonefileat(). */
+ && reflink_mode == REFLINK_ALWAYS
+- && ((! transient_failure) || lseek (dest_desc, 0, SEEK_END) == 0)
++ && ((! report_failure) || lseek (dest_desc, 0, SEEK_END) == 0)
+ && unlinkat (dst_dirfd, dst_relname, 0) != 0 && errno != ENOENT)
+ error (0, errno, _("cannot remove %s"), quoteaf (dst_name));
+
+- if (! transient_failure)
++ if (! report_failure)
+ copy_debug.reflink = COPY_DEBUG_UNSUPPORTED;
+
+- if (reflink_mode == REFLINK_ALWAYS || transient_failure)
++ if (reflink_mode == REFLINK_ALWAYS || report_failure)
+ return false;
+
+ return true;
+--
+cgit v1.1
+
Copied: coreutils/repos/testing-x86_64/coreutils-backup-62607.patch (from rev
475103, coreutils/trunk/coreutils-backup-62607.patch)
===================================================================
--- testing-x86_64/coreutils-backup-62607.patch (rev 0)
+++ testing-x86_64/coreutils-backup-62607.patch 2023-04-21 21:55:00 UTC (rev
475104)
@@ -0,0 +1,39 @@
+From 1a80fab339d52db7e284b4f2f41068d5d8dd7e4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]>
+Date: Mon, 3 Apr 2023 18:12:33 +0100
+Subject: [PATCH] tests: cp: test --backup with subdirectories
+
+* tests/cp/backup-dir.sh: Add a test to ensure
+we rename appropriately when backing up through subdirs.
+* NEWS: Mention the bug fix.
+Addresses https://bugs.gnu.org/62607
+---
+ NEWS | 5 +++++
+ tests/cp/backup-dir.sh | 8 +++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/tests/cp/backup-dir.sh b/tests/cp/backup-dir.sh
+index 6573d58e0..5c17498cf 100755
+--- a/tests/cp/backup-dir.sh
++++ b/tests/cp/backup-dir.sh
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# Ensure that cp -b doesn't back up directories.
++# Ensure that cp -b handles directories appropriately
+
+ # Copyright (C) 2006-2023 Free Software Foundation, Inc.
+
+@@ -29,4 +29,10 @@ cp -ab x y || fail=1
+ test -d y/x || fail=1
+ test -d y/x~ && fail=1
+
++# Bug 62607.
++# This would fail to backup using rename, and thus fail to replace the file
++mkdir -p {src,dst}/foo || framework_failure_
++touch {src,dst}/foo/bar || framework_failure_
++cp --recursive --backup src/* dst || fail=1
++
+ Exit $fail
+--
+2.26.2
+
Copied: coreutils/repos/testing-x86_64/gnulib-backupfile-62607.patch (from rev
475103, coreutils/trunk/gnulib-backupfile-62607.patch)
===================================================================
--- testing-x86_64/gnulib-backupfile-62607.patch
(rev 0)
+++ testing-x86_64/gnulib-backupfile-62607.patch 2023-04-21 21:55:00 UTC
(rev 475104)
@@ -0,0 +1,43 @@
+From 418aa564ebff70c1d118a5d3307a6d0b147ff7a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]>
+Date: Mon, 3 Apr 2023 18:06:22 +0100
+Subject: [PATCH] backupfile: fix bug when renaming from subdirectory
+
+* lib/backupfile.c (backup_internal): Ensure we use the
+appropriate offset if operating on a subdirectory,
+i.e., on an updated sdir.
+Fixes https://bugs.gnu.org/62607
+---
+ ChangeLog | 8 ++++++++
+ lib/backupfile.c | 7 ++++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/lib/backupfile.c b/lib/backupfile.c
+index 9cca271343..5bcf924414 100644
+--- a/lib/backupfile.c
++++ b/lib/backupfile.c
+@@ -331,7 +331,7 @@ backupfile_internal (int dir_fd, char const *file,
+ return s;
+
+ DIR *dirp = NULL;
+- int sdir = dir_fd;
++ int sdir = -1;
+ idx_t base_max = 0;
+ while (true)
+ {
+@@ -370,9 +370,10 @@ backupfile_internal (int dir_fd, char const *file,
+ if (! rename)
+ break;
+
+- idx_t offset = backup_type == simple_backups ? 0 : base_offset;
++ dir_fd = sdir < 0 ? dir_fd : sdir;
++ idx_t offset = sdir < 0 ? 0 : base_offset;
+ unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
+- if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
++ if (renameatu (dir_fd, file + offset, dir_fd, s + offset, flags) == 0)
+ break;
+ int e = errno;
+ if (! (e == EEXIST && extended))
+--
+2.26.2
+
