Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f674e5fc9c |
||
|
|
eb04a0fe33 |
||
|
|
0615d97b81 |
||
|
|
0095d94d91 |
||
|
|
20976b8be8 |
||
|
|
c493f607ab | ||
|
|
c3c18147bd |
||
|
|
e454479c5c |
||
|
|
a0b27bcd5f |
||
|
|
386bf34c2e |
||
|
|
fdfe50c891 |
11 changed files with 390 additions and 1252 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From c7b13f5e1a7ad012c510a8bdd5a8943ab4b55833 Mon Sep 17 00:00:00 2001
|
||||
From bca11e30e8a6281a8cbddc9fb196dd86ab09c955 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Fri, 17 Jun 2016 16:58:18 +0200
|
||||
Subject: [PATCH] downstream changes to default DIR_COLORS
|
||||
|
|
@ -9,7 +9,7 @@ Subject: [PATCH] downstream changes to default DIR_COLORS
|
|||
2 files changed, 23 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/DIR_COLORS b/DIR_COLORS
|
||||
index b465771..ad42b09 100644
|
||||
index 540f6cd..b4785b6 100644
|
||||
--- a/DIR_COLORS
|
||||
+++ b/DIR_COLORS
|
||||
@@ -1,3 +1,7 @@
|
||||
|
|
@ -30,7 +30,7 @@ index b465771..ad42b09 100644
|
|||
# ===================================================================
|
||||
# Terminal filters
|
||||
# ===================================================================
|
||||
@@ -69,7 +76,7 @@ DOOR 01;35 # door
|
||||
@@ -70,7 +77,7 @@ DOOR 01;35 # door
|
||||
BLK 40;33;01 # block device driver
|
||||
CHR 40;33;01 # character device driver
|
||||
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
|
||||
|
|
@ -40,7 +40,7 @@ index b465771..ad42b09 100644
|
|||
SETGID 30;43 # regular file that is setgid (g+s)
|
||||
CAPABILITY 00 # regular file with capability (very expensive to lookup)
|
||||
diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor
|
||||
index eab6258..1627b63 100644
|
||||
index e3b0ec3..39a0a4c 100644
|
||||
--- a/DIR_COLORS.lightbgcolor
|
||||
+++ b/DIR_COLORS.lightbgcolor
|
||||
@@ -1,3 +1,9 @@
|
||||
|
|
@ -63,7 +63,7 @@ index eab6258..1627b63 100644
|
|||
# ===================================================================
|
||||
# Terminal filters
|
||||
# ===================================================================
|
||||
@@ -59,17 +68,17 @@ TERM xterm*
|
||||
@@ -60,17 +69,17 @@ TERM xterm*
|
||||
#NORMAL 00 # no color code at all
|
||||
#FILE 00 # regular file: use no color at all
|
||||
RESET 0 # reset to "normal" color
|
||||
|
|
@ -86,7 +86,7 @@ index eab6258..1627b63 100644
|
|||
SETUID 37;41 # regular file that is setuid (u+s)
|
||||
SETGID 30;43 # regular file that is setgid (g+s)
|
||||
CAPABILITY 00 # regular file with capability (very expensive to lookup)
|
||||
@@ -78,7 +87,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
||||
@@ -79,7 +88,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
||||
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
|
||||
|
||||
# This is for regular files with execute permission:
|
||||
|
|
@ -96,5 +96,5 @@ index eab6258..1627b63 100644
|
|||
# ===================================================================
|
||||
# File extension attributes
|
||||
--
|
||||
2.34.1
|
||||
2.49.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
From 915004f403cb25fadb207ddfdbe6a2f43bd44fac Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Fri, 17 Jan 2025 17:29:34 +0000
|
||||
Subject: [PATCH] ls: fix crash with --context
|
||||
|
||||
* src/ls.c (main): Flag that we need to stat()
|
||||
if we're going to get security context (call file_has_aclinfo_cache).
|
||||
(file_has_aclinfo_cache): Be defensive and only lookup the device
|
||||
for the file if the stat has been performed.
|
||||
(has_capability_cache): Likewise.
|
||||
* tests/ls/selinux-segfault.sh: Add a test case.
|
||||
Reported by Bruno Haible.
|
||||
---
|
||||
src/ls.c | 10 +++++-----
|
||||
tests/ls/selinux-segfault.sh | 3 +++
|
||||
2 files changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/ls.c b/src/ls.c
|
||||
index 3215360216..f67167f160 100644
|
||||
--- a/src/ls.c
|
||||
+++ b/src/ls.c
|
||||
@@ -1768,7 +1768,7 @@ main (int argc, char **argv)
|
||||
|
||||
format_needs_stat = ((sort_type == sort_time) | (sort_type == sort_size)
|
||||
| (format == long_format)
|
||||
- | print_block_size | print_hyperlink);
|
||||
+ | print_block_size | print_hyperlink | print_scontext);
|
||||
format_needs_type = ((! format_needs_stat)
|
||||
& (recursive | print_with_color | print_scontext
|
||||
| directories_first
|
||||
@@ -3309,7 +3309,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f,
|
||||
static int unsupported_scontext_err;
|
||||
static dev_t unsupported_device;
|
||||
|
||||
- if (f->stat.st_dev == unsupported_device)
|
||||
+ if (f->stat_ok && f->stat.st_dev == unsupported_device)
|
||||
{
|
||||
ai->buf = ai->u.__gl_acl_ch;
|
||||
ai->size = 0;
|
||||
@@ -3322,7 +3322,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f,
|
||||
errno = 0;
|
||||
int n = file_has_aclinfo (file, ai, flags);
|
||||
int err = errno;
|
||||
- if (n <= 0 && !acl_errno_valid (err))
|
||||
+ if (f->stat_ok && n <= 0 && !acl_errno_valid (err))
|
||||
{
|
||||
unsupported_return = n;
|
||||
unsupported_scontext = ai->scontext;
|
||||
@@ -3342,14 +3342,14 @@ has_capability_cache (char const *file, struct fileinfo *f)
|
||||
found that has_capability fails indicating lack of support. */
|
||||
static dev_t unsupported_device;
|
||||
|
||||
- if (f->stat.st_dev == unsupported_device)
|
||||
+ if (f->stat_ok && f->stat.st_dev == unsupported_device)
|
||||
{
|
||||
errno = ENOTSUP;
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool b = has_capability (file);
|
||||
- if ( !b && !acl_errno_valid (errno))
|
||||
+ if (f->stat_ok && !b && !acl_errno_valid (errno))
|
||||
unsupported_device = f->stat.st_dev;
|
||||
return b;
|
||||
}
|
||||
diff --git a/tests/ls/selinux-segfault.sh b/tests/ls/selinux-segfault.sh
|
||||
index 11623acb3f..1cac2b5fc0 100755
|
||||
--- a/tests/ls/selinux-segfault.sh
|
||||
+++ b/tests/ls/selinux-segfault.sh
|
||||
@@ -30,4 +30,7 @@ mkdir sedir || framework_failure_
|
||||
ln -sf missing sedir/broken || framework_failure_
|
||||
returns_ 1 ls -L -R -Z -m sedir > out || fail=1
|
||||
|
||||
+# ls 9.6 would segfault with the following
|
||||
+ls -Z . > out || fail=1
|
||||
+
|
||||
Exit $fail
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 24450e5eecf012bc1ea8cab8d677a45fa42c1778 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
|
||||
Date: Mon, 24 Feb 2025 10:36:35 +0100
|
||||
Subject: who: fix -m with guessed tty names
|
||||
|
||||
* who.c (scan_entries): Account for guessed tty names (e.g.
|
||||
'sshd pts/1') from the readutmp module when using the systemd backend.
|
||||
Addresses https://bugzilla.redhat.com/2343998
|
||||
---
|
||||
src/who.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/who.c b/src/who.c
|
||||
index b56a1ac..17c1e34 100644
|
||||
--- a/src/who.c
|
||||
+++ b/src/who.c
|
||||
@@ -583,7 +583,7 @@ scan_entries (idx_t n, struct gl_utmp const *utmp_buf)
|
||||
while (n--)
|
||||
{
|
||||
if (!my_line_only
|
||||
- || STREQ (ttyname_b, utmp_buf->ut_line))
|
||||
+ || str_endswith (utmp_buf->ut_line, ttyname_b))
|
||||
{
|
||||
if (need_users && IS_USER_PROCESS (utmp_buf))
|
||||
print_user (utmp_buf, boottime);
|
||||
28
coreutils-9.9-fix-cut-test-aarch64.patch
Normal file
28
coreutils-9.9-fix-cut-test-aarch64.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
From 95044cb5eaea83d02f768feb5ab79fcf5e6ad782 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Mon, 22 Dec 2025 17:12:48 +0000
|
||||
Subject: [PATCH] tests: avoid false failure due to ulimit on aarch64
|
||||
|
||||
* tests/cut/cut-huge-range.sh: Add an extra 1MiB headroom,
|
||||
which was seen with aarch64.
|
||||
Reported at https://bugzilla.redhat.com/2424302
|
||||
|
||||
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||
Upstream-commit: 95044cb5eaea83d02f768feb5ab79fcf5e6ad782
|
||||
---
|
||||
tests/cut/cut-huge-range.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/cut/cut-huge-range.sh b/tests/cut/cut-huge-range.sh
|
||||
index 4bd1b129d8..98d7e8f0b9 100755
|
||||
--- a/tests/cut/cut-huge-range.sh
|
||||
+++ b/tests/cut/cut-huge-range.sh
|
||||
@@ -22,6 +22,7 @@ getlimits_
|
||||
|
||||
vm=$(get_min_ulimit_v_ returns_ 0 cut -b1 /dev/null) \
|
||||
|| skip_ 'shell lacks ulimit, or ASAN enabled'
|
||||
+vm=$(($vm+1000)) # https://bugzilla.redhat.com/2424302
|
||||
|
||||
# Ensure we can cut up to our sentinel value.
|
||||
# Don't use expr to subtract one,
|
||||
|
||||
169
coreutils-9.9-gnulib-c23.patch
Normal file
169
coreutils-9.9-gnulib-c23.patch
Normal file
|
|
@ -0,0 +1,169 @@
|
|||
From 891761bca1aa78336e5b18c121075b6e4696c5d4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 23 Nov 2025 00:50:40 -0800
|
||||
Subject: [PATCH] Port to C23 qualifier-generic fns like strchr
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This ports Gnulib to strict C23 platforms that reject code
|
||||
like ‘char *q = strchr (P, 'x');’ when P is a pointer to const,
|
||||
because in C23 strchr is a qualifier-generic function so
|
||||
strchr (P, 'x') returns char const *.
|
||||
This patch does not attempt to do the following two things,
|
||||
which might be useful in the future:
|
||||
1. When compiling on non-C23 platforms, check user code for
|
||||
portability to platforms that define qualifier-generic functions.
|
||||
2. Port Gnulib to platforms that have qualifier-generic functions
|
||||
not listed in the C23 standard, e.g., strchrnul. I don’t know
|
||||
of any such platforms.
|
||||
* lib/mbschr.c (mbschr):
|
||||
* lib/memchr2.c (memchr2):
|
||||
Port to C23, where functions like strchr are qualifier-generic.
|
||||
* lib/c++defs.h (_GL_FUNCDECL_SYS_NAME): New macro.
|
||||
* lib/c++defs.h (_GL_FUNCDECL_SYS):
|
||||
* lib/stdlib.in.h (bsearch):
|
||||
Use it, to prevent C23 names like strchr from acting like macros.
|
||||
* lib/string.in.h (memchr, strchr, strpbrk, strrchr):
|
||||
Do not #undef when GNULIB_POSIXCHECK is defined, as this could
|
||||
cause conforming C23 code to fail to conform. It’s not clear why
|
||||
_GL_WARN_ON_USE_CXX; perhaps it was needed but isn’t any more?
|
||||
But for now, limit the removal of #undef to these four functions
|
||||
where #undeffing is clearly undesirable in C23.
|
||||
* lib/wchar.in.h (wmemchr): Parenthesize function name in decl,
|
||||
to prevent it from acting like a macro.
|
||||
|
||||
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||
Upstream-commit: df17f4f37ed3ca373d23ad42eae51122bdb96626
|
||||
---
|
||||
lib/c++defs.h | 12 +++++++++++-
|
||||
lib/mbschr.c | 2 +-
|
||||
lib/memchr2.c | 2 +-
|
||||
lib/stdlib.in.h | 6 +++---
|
||||
lib/string.in.h | 4 ----
|
||||
lib/wchar.in.h | 2 +-
|
||||
6 files changed, 17 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/lib/c++defs.h b/lib/c++defs.h
|
||||
index b77979a..7384457 100644
|
||||
--- a/lib/c++defs.h
|
||||
+++ b/lib/c++defs.h
|
||||
@@ -127,6 +127,16 @@
|
||||
#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
|
||||
_GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
|
||||
|
||||
+/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
|
||||
+ parenthsized func otherwise. Parenthesization is needed in C23 if
|
||||
+ the function is like strchr and so is a qualifier-generic macro
|
||||
+ that expands to something more complicated. */
|
||||
+#ifdef __cplusplus
|
||||
+# define _GL_FUNCDECL_SYS_NAME(func) func
|
||||
+#else
|
||||
+# define _GL_FUNCDECL_SYS_NAME(func) (func)
|
||||
+#endif
|
||||
+
|
||||
/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
|
||||
declares the system function, named func, with the given prototype,
|
||||
consisting of return type, parameters, and attributes.
|
||||
@@ -139,7 +149,7 @@
|
||||
_GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
|
||||
*/
|
||||
#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
|
||||
- _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
|
||||
+ _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
|
||||
|
||||
/* _GL_CXXALIAS_RPL (func, rettype, parameters);
|
||||
declares a C++ alias called GNULIB_NAMESPACE::func
|
||||
diff --git a/lib/mbschr.c b/lib/mbschr.c
|
||||
index c9e14b5..6582134 100644
|
||||
--- a/lib/mbschr.c
|
||||
+++ b/lib/mbschr.c
|
||||
@@ -65,5 +65,5 @@ mbschr (const char *string, int c)
|
||||
return NULL;
|
||||
}
|
||||
else
|
||||
- return strchr (string, c);
|
||||
+ return (char *) strchr (string, c);
|
||||
}
|
||||
diff --git a/lib/memchr2.c b/lib/memchr2.c
|
||||
index 7493823..d7724ae 100644
|
||||
--- a/lib/memchr2.c
|
||||
+++ b/lib/memchr2.c
|
||||
@@ -55,7 +55,7 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
|
||||
c2 = (unsigned char) c2_in;
|
||||
|
||||
if (c1 == c2)
|
||||
- return memchr (s, c1, n);
|
||||
+ return (void *) memchr (s, c1, n);
|
||||
|
||||
/* Handle the first few bytes by reading one byte at a time.
|
||||
Do this until VOID_PTR is aligned on a longword boundary. */
|
||||
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
|
||||
index bef0aaa..fd0e1e0 100644
|
||||
--- a/lib/stdlib.in.h
|
||||
+++ b/lib/stdlib.in.h
|
||||
@@ -224,9 +224,9 @@ _GL_INLINE_HEADER_BEGIN
|
||||
|
||||
/* Declarations for ISO C N3322. */
|
||||
#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
|
||||
-_GL_EXTERN_C void *bsearch (const void *__key,
|
||||
- const void *__base, size_t __nmemb, size_t __size,
|
||||
- int (*__compare) (const void *, const void *))
|
||||
+_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
|
||||
+ (const void *__key, const void *__base, size_t __nmemb, size_t __size,
|
||||
+ int (*__compare) (const void *, const void *))
|
||||
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
|
||||
_GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
|
||||
int (*__compare) (const void *, const void *))
|
||||
diff --git a/lib/string.in.h b/lib/string.in.h
|
||||
index fdcdd21..8b56acf 100644
|
||||
--- a/lib/string.in.h
|
||||
+++ b/lib/string.in.h
|
||||
@@ -409,7 +409,6 @@ _GL_CXXALIASWARN1 (memchr, void const *,
|
||||
_GL_CXXALIASWARN (memchr);
|
||||
# endif
|
||||
#elif defined GNULIB_POSIXCHECK
|
||||
-# undef memchr
|
||||
/* Assume memchr is always declared. */
|
||||
_GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
|
||||
"use gnulib module memchr for portability" );
|
||||
@@ -674,7 +673,6 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
|
||||
#if defined GNULIB_POSIXCHECK
|
||||
/* strchr() does not work with multibyte strings if the locale encoding is
|
||||
GB18030 and the character to be searched is a digit. */
|
||||
-# undef strchr
|
||||
/* Assume strchr is always declared. */
|
||||
_GL_WARN_ON_USE_CXX (strchr,
|
||||
const char *, char *, (const char *, int),
|
||||
@@ -981,7 +979,6 @@ _GL_CXXALIASWARN (strpbrk);
|
||||
Even in this simple case, it does not work with multibyte strings if the
|
||||
locale encoding is GB18030 and one of the characters to be searched is a
|
||||
digit. */
|
||||
-# undef strpbrk
|
||||
_GL_WARN_ON_USE_CXX (strpbrk,
|
||||
const char *, char *, (const char *, const char *),
|
||||
"strpbrk cannot work correctly on character strings "
|
||||
@@ -1011,7 +1008,6 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
|
||||
#if defined GNULIB_POSIXCHECK
|
||||
/* strrchr() does not work with multibyte strings if the locale encoding is
|
||||
GB18030 and the character to be searched is a digit. */
|
||||
-# undef strrchr
|
||||
/* Assume strrchr is always declared. */
|
||||
_GL_WARN_ON_USE_CXX (strrchr,
|
||||
const char *, char *, (const char *, int),
|
||||
diff --git a/lib/wchar.in.h b/lib/wchar.in.h
|
||||
index ab602a2..6be4515 100644
|
||||
--- a/lib/wchar.in.h
|
||||
+++ b/lib/wchar.in.h
|
||||
@@ -301,7 +301,7 @@ _GL_EXTERN_C int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
|
||||
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
|
||||
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
|
||||
# ifndef __cplusplus
|
||||
-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
|
||||
+_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
|
||||
_GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
|
||||
# endif
|
||||
_GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From d179da4730f414069dd2c0ac995a32398718916c Mon Sep 17 00:00:00 2001
|
||||
From 91be1a584108a6a3d96f64382bbf206c4213b3db Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Mon, 29 Mar 2010 17:20:34 +0000
|
||||
Subject: [PATCH] coreutils-df-direct.patch
|
||||
|
|
@ -11,10 +11,10 @@ Subject: [PATCH] coreutils-df-direct.patch
|
|||
create mode 100755 tests/df/direct.sh
|
||||
|
||||
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
||||
index ec58f6c..17cda80 100644
|
||||
index b420606..0ccb368 100644
|
||||
--- a/doc/coreutils.texi
|
||||
+++ b/doc/coreutils.texi
|
||||
@@ -12467,6 +12467,13 @@ some systems (notably Solaris), doing this yields more up to date results,
|
||||
@@ -12597,6 +12597,13 @@ some systems (notably Solaris), doing this yields more up to date results,
|
||||
but in general this option makes @command{df} much slower, especially when
|
||||
there are many or very busy file systems.
|
||||
|
||||
|
|
@ -29,10 +29,10 @@ index ec58f6c..17cda80 100644
|
|||
@opindex --total
|
||||
@cindex grand total of file system size, usage and available space
|
||||
diff --git a/src/df.c b/src/df.c
|
||||
index 5c7efd8..52ece19 100644
|
||||
index 75e638c..ef9f0a7 100644
|
||||
--- a/src/df.c
|
||||
+++ b/src/df.c
|
||||
@@ -122,6 +122,9 @@ static bool print_type;
|
||||
@@ -121,6 +121,9 @@ static bool print_type;
|
||||
/* If true, print a grand total at the end. */
|
||||
static bool print_grand_total;
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ index 5c7efd8..52ece19 100644
|
|||
/* Grand total data. */
|
||||
static struct fs_usage grand_fsu;
|
||||
|
||||
@@ -249,13 +252,15 @@ enum
|
||||
@@ -248,13 +251,15 @@ enum
|
||||
NO_SYNC_OPTION = CHAR_MAX + 1,
|
||||
SYNC_OPTION,
|
||||
TOTAL_OPTION,
|
||||
|
|
@ -71,7 +71,7 @@ index 5c7efd8..52ece19 100644
|
|||
|
||||
if (columns[col]->field == SIZE_FIELD
|
||||
&& (header_mode == DEFAULT_MODE
|
||||
@@ -1452,6 +1460,17 @@ get_point (char const *point, const struct stat *statp)
|
||||
@@ -1446,6 +1454,17 @@ get_point (char const *point, const struct stat *statp)
|
||||
static void
|
||||
get_entry (char const *name, struct stat const *statp)
|
||||
{
|
||||
|
|
@ -89,7 +89,7 @@ index 5c7efd8..52ece19 100644
|
|||
if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
|
||||
&& get_device (name))
|
||||
return;
|
||||
@@ -1522,6 +1541,7 @@ or all file systems by default.\n\
|
||||
@@ -1516,6 +1535,7 @@ or all file systems by default.\n\
|
||||
-B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n\
|
||||
'-BM' prints sizes in units of 1,048,576 bytes;\n\
|
||||
see SIZE format below\n\
|
||||
|
|
@ -97,7 +97,7 @@ index 5c7efd8..52ece19 100644
|
|||
-h, --human-readable print sizes in powers of 1024 (e.g., 1023M)\n\
|
||||
-H, --si print sizes in powers of 1000 (e.g., 1.1G)\n\
|
||||
"), stdout);
|
||||
@@ -1616,6 +1636,9 @@ main (int argc, char **argv)
|
||||
@@ -1610,6 +1630,9 @@ main (int argc, char **argv)
|
||||
xstrtol_fatal (e, oi, c, long_options, optarg);
|
||||
}
|
||||
break;
|
||||
|
|
@ -107,7 +107,7 @@ index 5c7efd8..52ece19 100644
|
|||
case 'i':
|
||||
if (header_mode == OUTPUT_MODE)
|
||||
{
|
||||
@@ -1712,6 +1735,13 @@ main (int argc, char **argv)
|
||||
@@ -1706,6 +1729,13 @@ main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -183,5 +183,5 @@ index 0000000..8e4cfb8
|
|||
+
|
||||
+Exit $fail
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
|
|
|
|||
1153
coreutils-i18n.patch
1153
coreutils-i18n.patch
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
From f1a6e8d840a28eb2ab7a488e0d06450b7192c76d Mon Sep 17 00:00:00 2001
|
||||
From 8927d505ecb5334f09c48ef98ef1f464f581d0f7 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 2 Apr 2024 14:11:26 +0100
|
||||
Subject: [PATCH] coreutils-python3.patch
|
||||
|
|
@ -10,10 +10,10 @@ Subject: [PATCH] coreutils-python3.patch
|
|||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/init.cfg b/init.cfg
|
||||
index 612d287..9a6fa2d 100644
|
||||
index ac05f7b..26d9516 100644
|
||||
--- a/init.cfg
|
||||
+++ b/init.cfg
|
||||
@@ -597,10 +597,10 @@ seek_data_capable_()
|
||||
@@ -601,10 +601,10 @@ seek_data_capable_()
|
||||
# Skip the current test if "." lacks d_type support.
|
||||
require_dirent_d_type_()
|
||||
{
|
||||
|
|
@ -37,7 +37,7 @@ index 1a2f76f..42d3924 100644
|
|||
# Intended to exit 0 only on Linux/GNU systems.
|
||||
import os
|
||||
diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh
|
||||
index 1d0a359..bd03542 100755
|
||||
index adf482b..cf9214a 100755
|
||||
--- a/tests/du/move-dir-while-traversing.sh
|
||||
+++ b/tests/du/move-dir-while-traversing.sh
|
||||
@@ -21,8 +21,8 @@ print_ver_ du
|
||||
|
|
@ -61,5 +61,5 @@ index 1d0a359..bd03542 100755
|
|||
import os,sys
|
||||
|
||||
--
|
||||
2.48.1
|
||||
2.51.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
From fc96cab095d704e8bf9934812dd8d6f87fbf4be4 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 30 Aug 2023 17:19:58 +0200
|
||||
Subject: [PATCH] coreutils-selinux.patch
|
||||
|
||||
---
|
||||
src/cp.c | 19 ++++++++++++++++++-
|
||||
src/install.c | 12 +++++++++++-
|
||||
2 files changed, 29 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/cp.c b/src/cp.c
|
||||
index a0ec067..1169c6a 100644
|
||||
--- a/src/cp.c
|
||||
+++ b/src/cp.c
|
||||
@@ -996,7 +996,7 @@ main (int argc, char **argv)
|
||||
selinux_enabled = (0 < is_selinux_enabled ());
|
||||
cp_option_init (&x);
|
||||
|
||||
- while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
|
||||
+ while ((c = getopt_long (argc, argv, "abcdfHilLnprst:uvxPRS:TZ",
|
||||
long_opts, nullptr))
|
||||
!= -1)
|
||||
{
|
||||
@@ -1048,6 +1048,23 @@ main (int argc, char **argv)
|
||||
copy_contents = true;
|
||||
break;
|
||||
|
||||
+ case 'c':
|
||||
+ fprintf (stderr, "%s: warning: option '-c' is deprecated,"
|
||||
+ " please use '--preserve=context' instead\n", argv[0]);
|
||||
+ if (x.set_security_context)
|
||||
+ {
|
||||
+ fprintf (stderr,
|
||||
+ "%s: cannot force target context and preserve it\n",
|
||||
+ argv[0]);
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ else if (selinux_enabled)
|
||||
+ {
|
||||
+ x.preserve_security_context = true;
|
||||
+ x.require_preserve_context = true;
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
case 'd':
|
||||
x.preserve_links = true;
|
||||
x.dereference = DEREF_NEVER;
|
||||
diff --git a/src/install.c b/src/install.c
|
||||
index b3b26ab..2d2f072 100644
|
||||
--- a/src/install.c
|
||||
+++ b/src/install.c
|
||||
@@ -807,7 +807,7 @@ main (int argc, char **argv)
|
||||
dir_arg = false;
|
||||
umask (0);
|
||||
|
||||
- while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pt:TvS:Z", long_options,
|
||||
+ while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pPt:TvS:Z", long_options,
|
||||
nullptr))
|
||||
!= -1)
|
||||
{
|
||||
@@ -872,6 +872,9 @@ main (int argc, char **argv)
|
||||
no_target_directory = true;
|
||||
break;
|
||||
|
||||
+ case 'P':
|
||||
+ fprintf (stderr, "%s: warning: option '-P' is deprecated,"
|
||||
+ " please use '--preserve-context' instead\n", argv[0]);
|
||||
case PRESERVE_CONTEXT_OPTION:
|
||||
if (! selinux_enabled)
|
||||
{
|
||||
@@ -879,6 +882,13 @@ main (int argc, char **argv)
|
||||
"this kernel is not SELinux-enabled"));
|
||||
break;
|
||||
}
|
||||
+ if (x.set_security_context)
|
||||
+ {
|
||||
+ fprintf (stderr,
|
||||
+ "%s: cannot force target context and preserve it\n",
|
||||
+ argv[0]);
|
||||
+ exit (1);
|
||||
+ }
|
||||
x.preserve_security_context = true;
|
||||
use_default_selinux_context = false;
|
||||
break;
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 9.6
|
||||
Version: 9.9
|
||||
Release: 2%{?dist}
|
||||
# some used parts of gnulib are under various variants of LGPL
|
||||
License: GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later
|
||||
|
|
@ -32,20 +32,17 @@ Patch103: coreutils-python3.patch
|
|||
# df --direct
|
||||
Patch104: coreutils-df-direct.patch
|
||||
|
||||
# ls: fix crash with --context
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=915004f403cb25fadb207ddfdbe6a2f43bd44fac
|
||||
Patch105: coreutils-9.6-ls-selinux-crash.patch
|
||||
# gnulib C23 support
|
||||
# https://github.com/coreutils/gnulib/commit/df17f4f37ed3ca373d23ad42eae51122bdb96626
|
||||
Patch105: coreutils-9.9-gnulib-c23.patch
|
||||
|
||||
# who: fix -m with guessed tty names (rhbz#2343998)
|
||||
# https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=24450e5eecf012bc1ea8cab8d677a45fa42c1778
|
||||
Patch106: coreutils-9.6-who-m-systemd.patch
|
||||
# fix cut test failure on aarch64 rawhide (rhbz#2424302)
|
||||
# https://github.com/coreutils/coreutils/commit/95044cb5eaea83d02f768feb5ab79fcf5e6ad782
|
||||
Patch106: coreutils-9.9-fix-cut-test-aarch64.patch
|
||||
|
||||
# (sb) lin18nux/lsb compliance - multibyte functionality patch
|
||||
Patch800: coreutils-i18n.patch
|
||||
|
||||
# downstream SELinux options deprecated since 2009
|
||||
Patch950: coreutils-selinux.patch
|
||||
|
||||
Conflicts: filesystem < 3
|
||||
|
||||
# To avoid clobbering installs
|
||||
|
|
@ -128,6 +125,9 @@ packaged as a single multicall binary.
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=1107973#c7
|
||||
Obsoletes: %{name} < 8.24-100
|
||||
|
||||
# Gnulib translations are maintained seprately since coreutils 9.6 (#2393892)
|
||||
Requires: gnulib-l10n
|
||||
|
||||
# info doc refers to "Specifying the Time Zone" from glibc-doc (#959597)
|
||||
Suggests: glibc-doc
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ find tests -name '*.sh' -perm 0644 -print -exec chmod 0755 '{}' '+'
|
|||
|
||||
# FIXME: Force a newer gettext version to workaround `autoreconf -i` errors
|
||||
# with coreutils 9.6 and bundled gettext 0.19.2 from gettext-common-devel.
|
||||
sed -i 's/0.19.2/0.22.5/' bootstrap.conf configure.ac
|
||||
sed -i "s/0.19.2/$(rpm -q --queryformat '%%{VERSION}\n' gettext-devel)/" bootstrap.conf configure.ac
|
||||
|
||||
autoreconf -fiv
|
||||
|
||||
|
|
@ -286,6 +286,37 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|||
%license COPYING
|
||||
|
||||
%changelog
|
||||
* Tue Jan 13 2026 Lukáš Zaoral <lzaoral@redhat.com> - 9.9-2
|
||||
- fix cut test failure on aarch64 rawhide (rhbz#2424302)
|
||||
|
||||
* Wed Nov 26 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.9-1
|
||||
- rebase to latest upstream release (rhbz#2413803)
|
||||
|
||||
* Mon Sep 29 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.8-3
|
||||
- require gnulib-l10n for translations of gnulib messages (rhbz#2393892)
|
||||
|
||||
* Thu Sep 25 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.8-2
|
||||
- tail: fix tailing larger number of lines in regular files (rhbz#2398008)
|
||||
|
||||
* Wed Sep 24 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.8-1
|
||||
- rebase to latest upstream release (rhbz#2397467)
|
||||
- remove downstream patch for selinux options deprecated since 2009
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jun 30 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-4
|
||||
- stty: add support for arbitrary baud rates (rhbz#2375439)
|
||||
|
||||
* Wed May 28 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-3
|
||||
- sort: fix buffer under-read (CVE-2025-5278)
|
||||
|
||||
* Mon May 19 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-2
|
||||
- cp/mv: do not fail when copying of trivial NFSv4 ACLs fails (rhbz#2363149)
|
||||
|
||||
* Wed Apr 09 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.7-1
|
||||
- rebase to latest upstream release (rhbz#2358624)
|
||||
|
||||
* Tue Feb 25 2025 Lukáš Zaoral <lzaoral@redhat.com> - 9.6-2
|
||||
- fix 'who -m' with guessed tty names (rhbz#2343998)
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (coreutils-9.6.tar.xz) = 398391d7f9d77e6117b750abb8711eebdd9cd2549e7846cab26884fb2dd522b6bcfb8bf7fef35a12683e213ada7f89b817bf615628628d42aee3fa3102647b28
|
||||
SHA512 (coreutils-9.6.tar.xz.sig) = a8e578b5e1d053b49e3e2c5dc94431d17c6a14662f459b2174cea23865ccca32e5ae5c13fedb0a8345d25269a9b98cb7f463a897c9663f9f9bcaf61e5c781378
|
||||
SHA512 (coreutils-9.9.tar.xz.sig) = 0a3dfdfa6b4234e2e1d42142269f959bdf3cf8f6605a50270a27eff84dd22588f182121f7dd3eeb04be45f5109d02690215065b3d3b43882874d0e165a1435d0
|
||||
SHA512 (coreutils-9.9.tar.xz) = e7b0e59f7732d2c098ea4934014f470248bd5c4764210e9200a698010a8e3b95bbb26e543f0cd73ed5a4b8e1f8cda932c73f39954d68175e4deaa47526610c65
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue