Compare commits
9 Commits
Author | SHA1 | Date |
---|---|---|
Kamil Dudka | abc28b9594 | |
Kamil Dudka | 68b00c3a00 | |
Kamil Dudka | eec6a1a559 | |
Kamil Dudka | 2c189a7754 | |
Kamil Dudka | f6751c73e7 | |
Kamil Dudka | e7d98e7de9 | |
Kamil Dudka | 2d2f5fa729 | |
Tom Stellard | 0b456bfc4c | |
Kamil Dudka | f5136f39ad |
|
@ -0,0 +1,81 @@
|
|||
From 9618fb718b75920f37e5be2049ad1d0bb5c4a28c Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 26 Jan 2021 09:23:54 -0800
|
||||
Subject: [PATCH] expr: fix bug with unmatched \(...\)
|
||||
|
||||
Problem reported by Qiuhao Li.
|
||||
* doc/coreutils.texi (String expressions):
|
||||
Document the correct behavior, which POSIX requires.
|
||||
* src/expr.c (docolon): Treat unmatched \(...\) as empty.
|
||||
* tests/misc/expr.pl: New test.
|
||||
|
||||
Upstream-commit: 735083ba24878075235007b4417982ad5700436d
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
doc/coreutils.texi | 14 ++++++++------
|
||||
src/expr.c | 9 +++++++--
|
||||
tests/misc/expr.pl | 3 +++
|
||||
3 files changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
||||
index 2382a16..5b2bb2c 100644
|
||||
--- a/doc/coreutils.texi
|
||||
+++ b/doc/coreutils.texi
|
||||
@@ -13529,12 +13529,14 @@ second is considered to be a (basic, a la GNU @code{grep}) regular
|
||||
expression, with a @code{^} implicitly prepended. The first argument is
|
||||
then matched against this regular expression.
|
||||
|
||||
-If the match succeeds and @var{regex} uses @samp{\(} and @samp{\)}, the
|
||||
-@code{:} expression returns the part of @var{string} that matched the
|
||||
-subexpression; otherwise, it returns the number of characters matched.
|
||||
-
|
||||
-If the match fails, the @code{:} operator returns the null string if
|
||||
-@samp{\(} and @samp{\)} are used in @var{regex}, otherwise 0.
|
||||
+If @var{regex} does not use @samp{\(} and @samp{\)}, the @code{:}
|
||||
+expression returns the number of characters matched, or 0 if the match
|
||||
+fails.
|
||||
+
|
||||
+If @var{regex} uses @samp{\(} and @samp{\)}, the @code{:} expression
|
||||
+returns the part of @var{string} that matched the subexpression, or
|
||||
+the null string if the match failed or the subexpression did not
|
||||
+contribute to the match.
|
||||
|
||||
@kindex \( @r{regexp operator}
|
||||
Only the first @samp{\( @dots{} \)} pair is relevant to the return
|
||||
diff --git a/src/expr.c b/src/expr.c
|
||||
index e134872..0616a42 100644
|
||||
--- a/src/expr.c
|
||||
+++ b/src/expr.c
|
||||
@@ -721,8 +721,13 @@ docolon (VALUE *sv, VALUE *pv)
|
||||
/* Were \(...\) used? */
|
||||
if (re_buffer.re_nsub > 0)
|
||||
{
|
||||
- sv->u.s[re_regs.end[1]] = '\0';
|
||||
- v = str_value (sv->u.s + re_regs.start[1]);
|
||||
+ if (re_regs.end[1] < 0)
|
||||
+ v = str_value ("");
|
||||
+ else
|
||||
+ {
|
||||
+ sv->u.s[re_regs.end[1]] = '\0';
|
||||
+ v = str_value (sv->u.s + re_regs.start[1]);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/tests/misc/expr.pl b/tests/misc/expr.pl
|
||||
index e45f8e7..e57f79d 100755
|
||||
--- a/tests/misc/expr.pl
|
||||
+++ b/tests/misc/expr.pl
|
||||
@@ -84,6 +84,9 @@ my @Tests =
|
||||
# In 5.94 and earlier, anchors incorrectly matched newlines.
|
||||
['anchor', "'a\nb' : 'a\$'", {OUT => '0'}, {EXIT => 1}],
|
||||
|
||||
+ # In 8.32, \( ... \) that did not match caused memory errors.
|
||||
+ ['emptysub', '"a" : "\\(b\\)*"', {OUT => ''}, {EXIT => 1}],
|
||||
+
|
||||
# These tests are taken from grep/tests/bre.tests.
|
||||
['bre1', '"abc" : "a\\(b\\)c"', {OUT => 'b'}],
|
||||
['bre2', '"a(" : "a("', {OUT => '2'}],
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
From f61085aaa37f169365c56e44f5129d0491913b6a Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 27 Aug 2020 17:52:58 -0700
|
||||
Subject: [PATCH] perror, strerror_r: remove unportable tests
|
||||
|
||||
Problem reported by Florian Weimer in:
|
||||
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
|
||||
* tests/test-perror2.c (main):
|
||||
* tests/test-strerror_r.c (main): Omit unportable tests.
|
||||
|
||||
Upstream-commit: 175e0bc72808d564074c4adcc72aeadb74adfcc6
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
gnulib-tests/test-perror2.c | 3 ---
|
||||
gnulib-tests/test-strerror_r.c | 3 ---
|
||||
2 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c
|
||||
index 1d14eda..c6214dd 100644
|
||||
--- a/gnulib-tests/test-perror2.c
|
||||
+++ b/gnulib-tests/test-perror2.c
|
||||
@@ -79,9 +79,6 @@ main (void)
|
||||
errno = -5;
|
||||
perror ("");
|
||||
ASSERT (!ferror (stderr));
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c
|
||||
index b11d6fd..c1dbcf8 100644
|
||||
--- a/gnulib-tests/test-strerror_r.c
|
||||
+++ b/gnulib-tests/test-strerror_r.c
|
||||
@@ -165,9 +165,6 @@ main (void)
|
||||
|
||||
strerror_r (EACCES, buf, sizeof buf);
|
||||
strerror_r (-5, buf, sizeof buf);
|
||||
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
|
||||
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
|
||||
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
|
||||
ASSERT (STREQ (msg4, str4));
|
||||
|
||||
free (str1);
|
||||
--
|
||||
2.25.4
|
||||
|
|
@ -0,0 +1,164 @@
|
|||
From b9f9ed14bda93ecb407129b69e6476813c250046 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 15 Apr 2020 20:50:32 -0700
|
||||
Subject: [PATCH] fts: remove NOSTAT_LEAF_OPTIMIZATION
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It caused ‘find’ and ‘du’ to dump core, and it was useful
|
||||
only for obsolescent Linux filesystems anyway. Problem reported in:
|
||||
https://lists.gnu.org/r/bug-gnulib/2020-04/msg00068.html
|
||||
Quite possibly there is still a serious underlying fts bug with
|
||||
tight-loop-check and mutating file systems, but if so this patch
|
||||
should cause the bug to be triggered less often.
|
||||
* lib/fts.c (enum leaf_optimization): Remove
|
||||
NOSTAT_LEAF_OPTIMIZATION, as it’s problematic.
|
||||
(S_MAGIC_REISERFS, S_MAGIC_XFS): Remove; no longer needed.
|
||||
(leaf_optimization): Remove special cases for ReiserFS and XFS.
|
||||
(fts_read): Remove NOSTAT_LEAF_OPTIMIZATION code.
|
||||
* lib/fts_.h (struct _ftsent.fts_n_dirs_remaining):
|
||||
Remove. All uses removed.
|
||||
|
||||
Upstream-commit: 47bf2cf3184027c1eb9c1dfeea5c5b8b2d69710d
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
lib/fts.c | 56 ++++++++-------------------------------------------
|
||||
lib/fts_.h | 5 -----
|
||||
2 files changed, 8 insertions(+), 53 deletions(-)
|
||||
|
||||
diff --git a/lib/fts.c b/lib/fts.c
|
||||
index 1093ce5..dfe3fef 100644
|
||||
--- a/lib/fts.c
|
||||
+++ b/lib/fts.c
|
||||
@@ -445,7 +445,6 @@ fts_open (char * const *argv,
|
||||
if ((parent = fts_alloc(sp, "", 0)) == NULL)
|
||||
goto mem2;
|
||||
parent->fts_level = FTS_ROOTPARENTLEVEL;
|
||||
- parent->fts_n_dirs_remaining = -1;
|
||||
}
|
||||
|
||||
/* The classic fts implementation would call fts_stat with
|
||||
@@ -634,9 +633,8 @@ fts_close (FTS *sp)
|
||||
}
|
||||
|
||||
/* Minimum link count of a traditional Unix directory. When leaf
|
||||
- optimization is OK and MIN_DIR_NLINK <= st_nlink, then st_nlink is
|
||||
- an upper bound on the number of subdirectories (counting "." and
|
||||
- ".."). */
|
||||
+ optimization is OK and a directory's st_nlink == MIN_DIR_NLINK,
|
||||
+ then the directory has no subdirectories. */
|
||||
enum { MIN_DIR_NLINK = 2 };
|
||||
|
||||
/* Whether leaf optimization is OK for a directory. */
|
||||
@@ -645,12 +643,8 @@ enum leaf_optimization
|
||||
/* st_nlink is not reliable for this directory's subdirectories. */
|
||||
NO_LEAF_OPTIMIZATION,
|
||||
|
||||
- /* Leaf optimization is OK, but is not useful for avoiding stat calls. */
|
||||
- OK_LEAF_OPTIMIZATION,
|
||||
-
|
||||
- /* Leaf optimization is not only OK: it is useful for avoiding
|
||||
- stat calls, because dirent.d_type does not work. */
|
||||
- NOSTAT_LEAF_OPTIMIZATION
|
||||
+ /* st_nlink == 2 means the directory lacks subdirectories. */
|
||||
+ OK_LEAF_OPTIMIZATION
|
||||
};
|
||||
|
||||
#if (defined __linux__ || defined __ANDROID__) \
|
||||
@@ -663,9 +657,7 @@ enum leaf_optimization
|
||||
# define S_MAGIC_CIFS 0xFF534D42
|
||||
# define S_MAGIC_NFS 0x6969
|
||||
# define S_MAGIC_PROC 0x9FA0
|
||||
-# define S_MAGIC_REISERFS 0x52654973
|
||||
# define S_MAGIC_TMPFS 0x1021994
|
||||
-# define S_MAGIC_XFS 0x58465342
|
||||
|
||||
# ifdef HAVE___FSWORD_T
|
||||
typedef __fsword_t fsword;
|
||||
@@ -786,23 +778,15 @@ dirent_inode_sort_may_be_useful (FTSENT const *p, int dir_fd)
|
||||
}
|
||||
|
||||
/* Given an FTS entry P for a directory with descriptor DIR_FD,
|
||||
- return true if it is both useful and valid to apply leaf optimization.
|
||||
- The optimization is useful only for file systems that lack usable
|
||||
- dirent.d_type info. The optimization is valid if an st_nlink value
|
||||
- of at least MIN_DIR_NLINK is an upper bound on the number of
|
||||
- subdirectories of D, counting "." and ".." as subdirectories.
|
||||
+ return whether it is valid to apply leaf optimization.
|
||||
+ The optimization is valid if a directory's st_nlink value equal
|
||||
+ to MIN_DIR_NLINK means the directory has no subdirectories.
|
||||
DIR_FD is negative if unavailable. */
|
||||
static enum leaf_optimization
|
||||
leaf_optimization (FTSENT const *p, int dir_fd)
|
||||
{
|
||||
switch (filesystem_type (p, dir_fd))
|
||||
{
|
||||
- /* List here the file system types that may lack usable dirent.d_type
|
||||
- info, yet for which the optimization does apply. */
|
||||
- case S_MAGIC_REISERFS:
|
||||
- case S_MAGIC_XFS: /* XFS lacked it until 2013-08-22 commit. */
|
||||
- return NOSTAT_LEAF_OPTIMIZATION;
|
||||
-
|
||||
case 0:
|
||||
/* Leaf optimization is unsafe if the file system type is unknown. */
|
||||
FALLTHROUGH;
|
||||
@@ -1027,26 +1011,7 @@ check_for_dir:
|
||||
if (p->fts_info == FTS_NSOK)
|
||||
{
|
||||
if (p->fts_statp->st_size == FTS_STAT_REQUIRED)
|
||||
- {
|
||||
- FTSENT *parent = p->fts_parent;
|
||||
- if (parent->fts_n_dirs_remaining == 0
|
||||
- && ISSET(FTS_NOSTAT)
|
||||
- && ISSET(FTS_PHYSICAL)
|
||||
- && (leaf_optimization (parent, sp->fts_cwd_fd)
|
||||
- == NOSTAT_LEAF_OPTIMIZATION))
|
||||
- {
|
||||
- /* nothing more needed */
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- p->fts_info = fts_stat(sp, p, false);
|
||||
- if (S_ISDIR(p->fts_statp->st_mode)
|
||||
- && p->fts_level != FTS_ROOTLEVEL
|
||||
- && 0 < parent->fts_n_dirs_remaining
|
||||
- && parent->fts_n_dirs_remaining != (nlink_t) -1)
|
||||
- parent->fts_n_dirs_remaining--;
|
||||
- }
|
||||
- }
|
||||
+ p->fts_info = fts_stat(sp, p, false);
|
||||
else
|
||||
fts_assert (p->fts_statp->st_size == FTS_NO_STAT_REQUIRED);
|
||||
}
|
||||
@@ -1830,11 +1795,6 @@ err: memset(sbp, 0, sizeof(struct stat));
|
||||
}
|
||||
|
||||
if (S_ISDIR(sbp->st_mode)) {
|
||||
- p->fts_n_dirs_remaining
|
||||
- = ((sbp->st_nlink < MIN_DIR_NLINK
|
||||
- || p->fts_level <= FTS_ROOTLEVEL)
|
||||
- ? -1
|
||||
- : sbp->st_nlink - (ISSET (FTS_SEEDOT) ? 0 : MIN_DIR_NLINK));
|
||||
if (ISDOT(p->fts_name)) {
|
||||
/* Command-line "." and ".." are real directories. */
|
||||
return (p->fts_level == FTS_ROOTLEVEL ? FTS_D : FTS_DOT);
|
||||
diff --git a/lib/fts_.h b/lib/fts_.h
|
||||
index d40a116..2e76cc4 100644
|
||||
--- a/lib/fts_.h
|
||||
+++ b/lib/fts_.h
|
||||
@@ -227,11 +227,6 @@ typedef struct _ftsent {
|
||||
|
||||
size_t fts_namelen; /* strlen(fts_name) */
|
||||
|
||||
- /* If not (nlink_t) -1, an upper bound on the number of
|
||||
- remaining subdirectories of interest. If this becomes
|
||||
- zero, some work can be avoided. */
|
||||
- nlink_t fts_n_dirs_remaining;
|
||||
-
|
||||
# define FTS_D 1 /* preorder directory */
|
||||
# define FTS_DC 2 /* directory that causes cycles */
|
||||
# define FTS_DEFAULT 3 /* none of the above */
|
||||
--
|
||||
2.21.1
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
From 53c6b01e8e3fd338d7f53e5ff817ef86f9efa852 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Wed, 11 Nov 2020 17:22:33 +0000
|
||||
Subject: [PATCH] ls: fix crash printing SELinux context for unstatable files
|
||||
|
||||
This crash was identified by Cyber Independent Testing Lab:
|
||||
https://cyber-itl.org/2020/10/28/citl-7000-defects.html
|
||||
and was introduced with commit v6.9.90-11-g4245876e2
|
||||
|
||||
* src/ls.c (gobble_file): Ensure scontext is initialized
|
||||
in the case where files are not statable.
|
||||
* tests/ls/selinux-segfault.sh: Renamed from proc-selinux-segfault.sh,
|
||||
and added test case for broken symlinks.
|
||||
* tests/local.mk: Adjust for the renamed test.
|
||||
|
||||
Upstream-commit: 6fc695cb4a26f09dfeef8b1c24895a707055334e
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
src/ls.c | 3 +++
|
||||
tests/local.mk | 2 +-
|
||||
.../{proc-selinux-segfault.sh => selinux-segfault.sh} | 10 ++++++++--
|
||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||
rename tests/ls/{proc-selinux-segfault.sh => selinux-segfault.sh} (77%)
|
||||
|
||||
diff --git a/src/ls.c b/src/ls.c
|
||||
index 4acf5f4..8eb483d 100644
|
||||
--- a/src/ls.c
|
||||
+++ b/src/ls.c
|
||||
@@ -3412,6 +3412,9 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
|
||||
provokes an exit status of 1. */
|
||||
file_failure (command_line_arg,
|
||||
_("cannot access %s"), full_name);
|
||||
+
|
||||
+ f->scontext = UNKNOWN_SECURITY_CONTEXT;
|
||||
+
|
||||
if (command_line_arg)
|
||||
return 0;
|
||||
|
||||
diff --git a/tests/local.mk b/tests/local.mk
|
||||
index 2aeff2b..2441fdc 100644
|
||||
--- a/tests/local.mk
|
||||
+++ b/tests/local.mk
|
||||
@@ -616,7 +616,7 @@ all_tests = \
|
||||
tests/ls/multihardlink.sh \
|
||||
tests/ls/no-arg.sh \
|
||||
tests/ls/no-cap.sh \
|
||||
- tests/ls/proc-selinux-segfault.sh \
|
||||
+ tests/ls/selinux-segfault.sh \
|
||||
tests/ls/quote-align.sh \
|
||||
tests/ls/readdir-mountpoint-inode.sh \
|
||||
tests/ls/recursive.sh \
|
||||
diff --git a/tests/ls/proc-selinux-segfault.sh b/tests/ls/selinux-segfault.sh
|
||||
similarity index 77%
|
||||
rename from tests/ls/proc-selinux-segfault.sh
|
||||
rename to tests/ls/selinux-segfault.sh
|
||||
index 831a00e..e2b7ef6 100755
|
||||
--- a/tests/ls/proc-selinux-segfault.sh
|
||||
+++ b/tests/ls/selinux-segfault.sh
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
-# ls -l /proc/sys would segfault when built against libselinux1 2.0.15-2+b1
|
||||
+# Ensure we don't segfault in selinux handling
|
||||
|
||||
# Copyright (C) 2008-2020 Free Software Foundation, Inc.
|
||||
|
||||
@@ -19,9 +19,15 @@
|
||||
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
|
||||
print_ver_ ls
|
||||
|
||||
+# ls -l /proc/sys would segfault when built against libselinux1 2.0.15-2+b1
|
||||
f=/proc/sys
|
||||
test -r $f || f=.
|
||||
-
|
||||
ls -l $f > out || fail=1
|
||||
|
||||
+# ls <= 8.32 would segfault when printing
|
||||
+# the security context of broken symlink targets
|
||||
+mkdir sedir || framework_failure_
|
||||
+ln -sf missing sedir/broken || framework_failure_
|
||||
+returns_ 1 ls -L -R -Z -m sedir > out || fail=1
|
||||
+
|
||||
Exit $fail
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
From 09400b7f7f48d8eedc0df55de8073a43bc0aac96 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Tue, 27 Oct 2020 20:15:43 +0000
|
||||
Subject: [PATCH 1/2] stat,tail: sync file system constants from the linux
|
||||
kernel
|
||||
|
||||
* src/stat.c: Add magic constants for "devmem", and
|
||||
"zonefs" file systems.
|
||||
* NEWS: Mention the improvement.
|
||||
|
||||
Upstream-commit: ff80b6b0a0507e24f39cc1aad09d147f5187430b
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
src/stat.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/stat.c b/src/stat.c
|
||||
index 5012622..8cd69da 100644
|
||||
--- a/src/stat.c
|
||||
+++ b/src/stat.c
|
||||
@@ -347,6 +347,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
|
||||
return "debugfs";
|
||||
case S_MAGIC_DEVFS: /* 0x1373 local */
|
||||
return "devfs";
|
||||
+ case S_MAGIC_DEVMEM: /* 0x454D444D local */
|
||||
+ return "devmem";
|
||||
case S_MAGIC_DEVPTS: /* 0x1CD1 local */
|
||||
return "devpts";
|
||||
case S_MAGIC_DMA_BUF: /* 0x444D4142 local */
|
||||
@@ -549,6 +551,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
|
||||
return "z3fold";
|
||||
case S_MAGIC_ZFS: /* 0x2FC12FC1 local */
|
||||
return "zfs";
|
||||
+ case S_MAGIC_ZONEFS: /* 0x5A4F4653 local */
|
||||
+ return "zonefs";
|
||||
case S_MAGIC_ZSMALLOC: /* 0x58295829 local */
|
||||
return "zsmallocfs";
|
||||
|
||||
--
|
||||
2.25.4
|
||||
|
||||
|
||||
From d5948fd41013dfe4d2d10083111821667977c6d1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Tue, 27 Oct 2020 21:04:14 +0000
|
||||
Subject: [PATCH 2/2] mountlist: recognize more file system types as remote
|
||||
|
||||
Sync "remote" file systems from stat.c in coreutils.
|
||||
Note we only consider file systems that do not use host:resource
|
||||
mount source. I.e. those that don't generally use a colon when
|
||||
mounting, as that case is already considered. Searching for
|
||||
"<fstype> /etc/fstab" was informative for identifying these.
|
||||
The full list of "remote" file systems in coreutils is currently:
|
||||
acfs afs ceph cifs coda fhgfs fuseblk fusectl
|
||||
gfs gfs2 gpfs ibrix k-afs lustre novell nfs nfsd
|
||||
ocfs2 panfs prl_fs smb smb2 snfs vboxsf vmhgfs vxfs
|
||||
Note also we do not include virtual machine file systems,
|
||||
as even though they're remote to the current kernel,
|
||||
they are generally not distributed to separate hosts.
|
||||
|
||||
* lib/mountlist.c (ME_REMOTE): Sync previously unconsidered
|
||||
"remote" file systems from stat.c in coreutils.
|
||||
|
||||
Upstream-commit: dd1fc46be12d671c1a9d9dc5a6fa8c766e99aa2f
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
lib/mountlist.c | 12 ++++++++++--
|
||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/mountlist.c b/lib/mountlist.c
|
||||
index 7abe024..e0227b7 100644
|
||||
--- a/lib/mountlist.c
|
||||
+++ b/lib/mountlist.c
|
||||
@@ -221,8 +221,9 @@ me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
|
||||
#ifndef ME_REMOTE
|
||||
/* A file system is "remote" if its Fs_name contains a ':'
|
||||
or if (it is of type (smbfs or cifs) and its Fs_name starts with '//')
|
||||
- or if it is of type (afs or auristorfs)
|
||||
- or Fs_name is equal to "-hosts" (used by autofs to mount remote fs). */
|
||||
+ or if it is of any other of the listed types
|
||||
+ or Fs_name is equal to "-hosts" (used by autofs to mount remote fs).
|
||||
+ "VM" file systems like prl_fs or vboxsf are not considered remote here. */
|
||||
# define ME_REMOTE(Fs_name, Fs_type) \
|
||||
(strchr (Fs_name, ':') != NULL \
|
||||
|| ((Fs_name)[0] == '/' \
|
||||
@@ -230,8 +231,15 @@ me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
|
||||
&& (strcmp (Fs_type, "smbfs") == 0 \
|
||||
|| strcmp (Fs_type, "smb3") == 0 \
|
||||
|| strcmp (Fs_type, "cifs") == 0)) \
|
||||
+ || strcmp (Fs_type, "acfs") == 0 \
|
||||
|| strcmp (Fs_type, "afs") == 0 \
|
||||
+ || strcmp (Fs_type, "coda") == 0 \
|
||||
|| strcmp (Fs_type, "auristorfs") == 0 \
|
||||
+ || strcmp (Fs_type, "fhgfs") == 0 \
|
||||
+ || strcmp (Fs_type, "gpfs") == 0 \
|
||||
+ || strcmp (Fs_type, "ibrix") == 0 \
|
||||
+ || strcmp (Fs_type, "ocfs2") == 0 \
|
||||
+ || strcmp (Fs_type, "vxfs") == 0 \
|
||||
|| strcmp ("-hosts", Fs_name) == 0)
|
||||
#endif
|
||||
|
||||
--
|
||||
2.25.4
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
From 11b37b65d08c2a8b6d967fd866ebbdbe7e864949 Mon Sep 17 00:00:00 2001
|
||||
From: Nishant Nayan <nishant.nayan@oracle.com>
|
||||
Date: Thu, 26 Nov 2020 14:35:17 +0000
|
||||
Subject: [PATCH] rm: do not skip files upon failure to remove an empty dir
|
||||
|
||||
When removing a directory fails for some reason, and that directory
|
||||
is empty, the rm_fts code gets the return value of the excise call
|
||||
confused with the return value of its earlier call to prompt,
|
||||
causing fts_skip_tree to be called again and the next file
|
||||
that rm would otherwise have deleted to survive.
|
||||
|
||||
* src/remove.c (rm_fts): Ensure we only skip a single fts entry,
|
||||
when processing empty dirs. I.e. only skip the entry
|
||||
having successfully removed it.
|
||||
* tests/rm/empty-immutable-skip.sh: New root-only test.
|
||||
* tests/local.mk: Add it.
|
||||
* NEWS: Mention the bug fix.
|
||||
Fixes https://bugs.gnu.org/44883
|
||||
|
||||
Upstream-commit: 6bf108358a6104ec1c694c9530b3cd56b95f4b57
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
src/remove.c | 3 ++-
|
||||
tests/local.mk | 1 +
|
||||
tests/rm/empty-immutable-skip.sh | 46 ++++++++++++++++++++++++++++++++
|
||||
3 files changed, 49 insertions(+), 1 deletion(-)
|
||||
create mode 100755 tests/rm/empty-immutable-skip.sh
|
||||
|
||||
diff --git a/src/remove.c b/src/remove.c
|
||||
index 2d40c55..adf9489 100644
|
||||
--- a/src/remove.c
|
||||
+++ b/src/remove.c
|
||||
@@ -506,7 +506,8 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x)
|
||||
/* When we know (from prompt when in interactive mode)
|
||||
that this is an empty directory, don't prompt twice. */
|
||||
s = excise (fts, ent, x, true);
|
||||
- fts_skip_tree (fts, ent);
|
||||
+ if (s == RM_OK)
|
||||
+ fts_skip_tree (fts, ent);
|
||||
}
|
||||
|
||||
if (s != RM_OK)
|
||||
diff --git a/tests/local.mk b/tests/local.mk
|
||||
index 5f7f775..2aeff2b 100644
|
||||
--- a/tests/local.mk
|
||||
+++ b/tests/local.mk
|
||||
@@ -136,6 +136,7 @@ all_root_tests = \
|
||||
tests/rm/no-give-up.sh \
|
||||
tests/rm/one-file-system.sh \
|
||||
tests/rm/read-only.sh \
|
||||
+ tests/rm/empty-immutable-skip.sh \
|
||||
tests/tail-2/append-only.sh \
|
||||
tests/tail-2/end-of-device.sh \
|
||||
tests/touch/now-owned-by-other.sh
|
||||
diff --git a/tests/rm/empty-immutable-skip.sh b/tests/rm/empty-immutable-skip.sh
|
||||
new file mode 100755
|
||||
index 0000000..c91d8d4
|
||||
--- /dev/null
|
||||
+++ b/tests/rm/empty-immutable-skip.sh
|
||||
@@ -0,0 +1,46 @@
|
||||
+#!/bin/sh
|
||||
+# Ensure that rm does not skip extra files after hitting an empty immutable dir.
|
||||
+# Requires root access to do chattr +i, as well as an ext[23] or xfs file system
|
||||
+
|
||||
+# Copyright (C) 2020 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
|
||||
+# (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 <https://www.gnu.org/licenses/>.
|
||||
+
|
||||
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
|
||||
+print_ver_ rm
|
||||
+require_root_
|
||||
+
|
||||
+# These simple one-file operations are expected to work even in the
|
||||
+# presence of this bug, and we need them to set up the rest of the test.
|
||||
+chattr_i_works=1
|
||||
+touch f
|
||||
+chattr +i f 2>/dev/null || chattr_i_works=0
|
||||
+rm f 2>/dev/null
|
||||
+test -f f || chattr_i_works=0
|
||||
+chattr -i f 2>/dev/null || chattr_i_works=0
|
||||
+rm f 2>/dev/null || chattr_i_works=0
|
||||
+test -f f && chattr_i_works=0
|
||||
+
|
||||
+if test $chattr_i_works = 0; then
|
||||
+ skip_ "chattr +i doesn't work on this file system"
|
||||
+fi
|
||||
+
|
||||
+mkdir empty || framework_failure_
|
||||
+touch x y || framework_failure_
|
||||
+chattr +i empty || framework_failure_
|
||||
+rm -rf empty x y
|
||||
+{ test -f x || test -f y; } && fail=1
|
||||
+chattr -i empty
|
||||
+
|
||||
+Exit $fail
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
From bb0e7fabcaed9a7e71e30f05e638e9f243cdb13e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Mon, 25 Jan 2021 14:12:48 +0000
|
||||
Subject: [PATCH] split: fix --number=K/N to output correct part of file
|
||||
|
||||
This functionality regressed with the adjustments
|
||||
in commit v8.25-4-g62e7af032
|
||||
|
||||
* src/split.c (bytes_chunk_extract): Account for already read data
|
||||
when seeking into the file.
|
||||
* tests/split/b-chunk.sh: Use the hidden ---io-blksize option,
|
||||
to test this functionality.
|
||||
Fixes https://bugs.gnu.org/46048
|
||||
|
||||
Upstream-commit: bb21daa125aeb4e32546309d370918ca47e612db
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
src/split.c | 2 +-
|
||||
tests/split/b-chunk.sh | 45 ++++++++++++++++++++++++------------------
|
||||
2 files changed, 27 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/src/split.c b/src/split.c
|
||||
index 09e610b..19248f6 100644
|
||||
--- a/src/split.c
|
||||
+++ b/src/split.c
|
||||
@@ -1001,7 +1001,7 @@ bytes_chunk_extract (uintmax_t k, uintmax_t n, char *buf, size_t bufsize,
|
||||
}
|
||||
else
|
||||
{
|
||||
- if (lseek (STDIN_FILENO, start, SEEK_CUR) < 0)
|
||||
+ if (lseek (STDIN_FILENO, start - initial_read, SEEK_CUR) < 0)
|
||||
die (EXIT_FAILURE, errno, "%s", quotef (infile));
|
||||
initial_read = SIZE_MAX;
|
||||
}
|
||||
diff --git a/tests/split/b-chunk.sh b/tests/split/b-chunk.sh
|
||||
index 864ce55..39a6799 100755
|
||||
--- a/tests/split/b-chunk.sh
|
||||
+++ b/tests/split/b-chunk.sh
|
||||
@@ -35,32 +35,39 @@ split -e -n 10 /dev/null || fail=1
|
||||
returns_ 1 stat x?? 2>/dev/null || fail=1
|
||||
|
||||
printf '1\n2\n3\n4\n5\n' > input || framework_failure_
|
||||
+printf '1\n2' > exp-1 || framework_failure_
|
||||
+printf '\n3\n' > exp-2 || framework_failure_
|
||||
+printf '4\n5\n' > exp-3 || framework_failure_
|
||||
|
||||
for file in input /proc/version /sys/kernel/profiling; do
|
||||
test -f $file || continue
|
||||
|
||||
- split -n 3 $file > out || fail=1
|
||||
- split -n 1/3 $file > b1 || fail=1
|
||||
- split -n 2/3 $file > b2 || fail=1
|
||||
- split -n 3/3 $file > b3 || fail=1
|
||||
+ for blksize in 1 2 4096; do
|
||||
+ if ! test "$file" = 'input'; then
|
||||
+ # For /proc like files we must be able to read all
|
||||
+ # into the internal buffer to be able to determine size.
|
||||
+ test "$blksize" = 4096 || continue
|
||||
+ fi
|
||||
|
||||
- case $file in
|
||||
- input)
|
||||
- printf '1\n2' > exp-1
|
||||
- printf '\n3\n' > exp-2
|
||||
- printf '4\n5\n' > exp-3
|
||||
+ split -n 3 ---io-blksize=$blksize $file > out || fail=1
|
||||
+ split -n 1/3 ---io-blksize=$blksize $file > b1 || fail=1
|
||||
+ split -n 2/3 ---io-blksize=$blksize $file > b2 || fail=1
|
||||
+ split -n 3/3 ---io-blksize=$blksize $file > b3 || fail=1
|
||||
|
||||
- compare exp-1 xaa || fail=1
|
||||
- compare exp-2 xab || fail=1
|
||||
- compare exp-3 xac || fail=1
|
||||
- ;;
|
||||
- esac
|
||||
+ case $file in
|
||||
+ input)
|
||||
+ compare exp-1 xaa || fail=1
|
||||
+ compare exp-2 xab || fail=1
|
||||
+ compare exp-3 xac || fail=1
|
||||
+ ;;
|
||||
+ esac
|
||||
|
||||
- compare xaa b1 || fail=1
|
||||
- compare xab b2 || fail=1
|
||||
- compare xac b3 || fail=1
|
||||
- cat xaa xab xac | compare - $file || fail=1
|
||||
- test -f xad && fail=1
|
||||
+ compare xaa b1 || fail=1
|
||||
+ compare xab b2 || fail=1
|
||||
+ compare xac b3 || fail=1
|
||||
+ cat xaa xab xac | compare - $file || fail=1
|
||||
+ test -f xad && fail=1
|
||||
+ done
|
||||
done
|
||||
|
||||
Exit $fail
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -23,6 +23,7 @@ Co-authored-by: Pádraig Brady <pbrady@redhat.com>
|
|||
lib/mbfile.h | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
m4/mbfile.m4 | 14 +++
|
||||
src/expand.c | 43 +++++----
|
||||
src/local.mk | 4 +-
|
||||
src/unexpand.c | 54 +++++++----
|
||||
tests/expand/mb.sh | 98 ++++++++++++++++++++
|
||||
tests/local.mk | 2 +
|
||||
|
@ -458,6 +459,21 @@ index 9fa2e10..380e020 100644
|
|||
}
|
||||
}
|
||||
|
||||
diff --git a/src/local.mk b/src/local.mk
|
||||
index 72db9c704..ef3bfa469 100644
|
||||
--- a/src/local.mk
|
||||
+++ b/src/local.mk
|
||||
@@ -415,8 +415,8 @@ src_basenc_CPPFLAGS = -DBASE_TYPE=42 $(AM_CPPFLAGS)
|
||||
|
||||
src_ginstall_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS)
|
||||
|
||||
-src_expand_SOURCES = src/expand.c src/expand-common.c
|
||||
-src_unexpand_SOURCES = src/unexpand.c src/expand-common.c
|
||||
+src_expand_SOURCES = src/expand.c src/expand-common.c lib/mbfile.c
|
||||
+src_unexpand_SOURCES = src/unexpand.c src/expand-common.c lib/mbfile.c
|
||||
|
||||
# Ensure we don't link against libcoreutils.a as that lib is
|
||||
# not compiled with -fPIC which causes issues on 64 bit at least
|
||||
diff --git a/src/unexpand.c b/src/unexpand.c
|
||||
index 7801274..569a7ee 100644
|
||||
--- a/src/unexpand.c
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 8.32
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}.2
|
||||
License: GPLv3+
|
||||
Url: https://www.gnu.org/software/coreutils/
|
||||
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
||||
|
@ -16,6 +16,27 @@ Source106: coreutils-colorls.csh
|
|||
# ls: restore 8.31 behavior on removed directories
|
||||
Patch1: coreutils-8.32-ls-removed-dir.patch
|
||||
|
||||
# du: simplify leaf optimization for XFS (#1823247)
|
||||
Patch2: coreutils-8.32-leaf-opt-xfs.patch
|
||||
|
||||
# eliminate unportable gnulib tests
|
||||
Patch4: coreutils-8.32-gnulib-perror-test.patch
|
||||
|
||||
# df,stat,tail: recognize more file system types
|
||||
Patch5: coreutils-8.32-new-fs-types.patch
|
||||
|
||||
# rm: do not skip files upon failure to remove an empty dir (#1905481)
|
||||
Patch6: coreutils-8.32-rm-stray-skip.patch
|
||||
|
||||
# expr: fix invalid read with unmatched \(...\) (#1919775)
|
||||
Patch7: coreutils-8.32-expr-unmatched-par.patch
|
||||
|
||||
# split: fix --number=K/N to output correct part of file (#1921246)
|
||||
Patch8: coreutils-8.32-split-number.patch
|
||||
|
||||
# ls: fix crash printing SELinux context for unstatable files (#1921249)
|
||||
Patch9: coreutils-8.32-ls-scontext-crash.patch
|
||||
|
||||
# disable the test-lock gnulib test prone to deadlock
|
||||
Patch100: coreutils-8.26-test-lock.patch
|
||||
|
||||
|
@ -133,6 +154,9 @@ including documentation and translations.
|
|||
%prep
|
||||
%autosetup -N
|
||||
|
||||
# will be regenerated in the build directories
|
||||
rm -f src/fs.h
|
||||
|
||||
# will be further modified by coreutils-8.32-DIR_COLORS.patch
|
||||
sed src/dircolors.hin \
|
||||
-e 's| 00;36$| 01;36|' \
|
||||
|
@ -165,6 +189,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic"
|
|||
# make mknod work again in chroot without /proc being mounted (#1811038)
|
||||
export ac_cv_func_lchmod="no"
|
||||
|
||||
# avoid using statx() syscall on Fedora 32 (#1760300)
|
||||
export ac_cv_func_statx="no"
|
||||
|
||||
%{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
|
||||
for type in separate single; do
|
||||
mkdir $type && \
|
||||
|
@ -259,6 +286,22 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|||
%license COPYING
|
||||
|
||||
%changelog
|
||||
* Tue Feb 02 2021 Kamil Dudka <kdudka@redhat.com> - 8.32-4.fc32.2
|
||||
- ls: fix crash printing SELinux context for unstatable files (#1921249)
|
||||
- split: fix --number=K/N to output correct part of file (#1921246)
|
||||
- expr: fix invalid read with unmatched \(...\) (#1919775)
|
||||
- rm: do not skip files upon failure to remove an empty dir (#1905481)
|
||||
- df,stat,tail: recognize more file system types
|
||||
|
||||
* Thu Apr 23 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-4.fc32.1
|
||||
- du: simplify leaf optimization for XFS (#1823247)
|
||||
|
||||
* Fri Apr 17 2020 Tom Stellard <tstellar@redhat.com> - 8.32-4
|
||||
- Fix missing inline function definition
|
||||
|
||||
* Thu Mar 19 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-3.fc32.1
|
||||
- avoid using statx() syscall on Fedora 32 (#1760300)
|
||||
|
||||
* Wed Mar 11 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-3
|
||||
- uniq: remove collation handling as required by newer POSIX
|
||||
|
||||
|
|
Loading…
Reference in New Issue