Accepting request 1075026 from Base:System

- update to 9.2:
  * cksum now accepts the --base64 (-b) option to print
    base64-encoded checksums.  It also accepts/checks such
    checksums.
  * cksum now accepts the --raw option to output a raw binary
    checksum.  No file name or other information is output in
    this mode.
  * cp, mv, and install now accept the --debug option to
    print details on how a file is being copied.
  * factor now accepts the --exponents (-h) option to print
    factors in the form p^e, rather than repeating the prime p, e
    times.
  * ls now supports the --time=modification option, to explicitly
    select the default mtime timestamp for display and sorting.
  * mv now supports the --no-copy option, which causes it to fail
    when asked to move a file to a different file system.
  * split now accepts options like '-n SIZE' that exceed machine
    integer range, when they can be implemented as if they were
    infinity.
  * split -n now accepts piped input even when not in round-robin
    mode, by first copying input to a temporary file to determine its
    size.
  * wc now accepts the --total={auto,never,always,only} option
    to give explicit control over when the total is output.
  * 'cp --reflink=always A B' no longer leaves behind a newly
    created empty file B merely because copy-on-write clones are not
    supported.
  * 'cp -n' and 'mv -n' now exit with nonzero status if they skip
    their action because the destination exists, and likewise for 'cp
    -i', 'ln -i', and 'mv -i' when the user declines.  (POSIX

OBS-URL: https://build.opensuse.org/request/show/1075026
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2023-04-01 17:30:07 +00:00 committed by Git OBS Bridge
commit e8f7db283f
12 changed files with 322 additions and 521 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423
size 5712104

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEbDfcEhIaUAa8HbgE32/ZcTBgN9kFAmJZ7qQACgkQ32/ZcTBg
N9mseQ/9HIe1s2ZCGOonUKI7HPp/x/qZXrq2R2/BL8+m9dMPfoIXa42DKu/LMpCK
amMuDIgfDbVp2Zky1cQ80d/lvYmkZXAIwUl0POrQiQkZ8fBsmZjQPKs4hTE4RmkX
7Y4n+KbOYPVkT+ROSq8O2fOL4++1kPoLFC6rkgylAR1t4836WzcNM33QCloyQlFU
CYQe57uSPfabDhswIQFraEPhIH0ZRQLAmcT2xuvlrbD8Uy9uakFrM8CFBVA9TpNu
KC7dShDErrTxfxlNfWLMD8vJu140if3hgGD45tNEM2VFSOhvQ07uoexwhLVSa+fw
cl114IAwAeBtz6ssE80vku8+pWmsAgfeqncn8DtEZ87Fa56N8u2QKuMZ/FjrxYwS
X9gHANJg5dzvVUB8ICvopGIs5iWXY5GhwaCuutSy/tsLp32Ytzv0FMtiKI1a6Msf
p8ojsFGnzQ2e4QRUBPKB2yxAZIlUvArFpsnebEPC47UBWbh4q/q6GA8omdLTF7N+
xQsaCyUCcRov3S8lD/4p/r0NfYnL2Tnjq39v6dH8gAQpDB/xDCnP3jG6mufKp7tu
mf0Q/Jws+4FKs7yVyq6DCOtFiJnx410fMhsHpDnzEegldWD1K9TIjDEW4E3yotwt
I8mGBRbgYc19TEUmTIr40MLc0vE3up7pY5/TY1kRdsYFlOPLbiA=
=Npyd
-----END PGP SIGNATURE-----

3
coreutils-9.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3
size 5773008

16
coreutils-9.2.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEbDfcEhIaUAa8HbgE32/ZcTBgN9kFAmQYdugACgkQ32/ZcTBg
N9k4HxAAr7vBX/LcT4lEItbgOWXehPnqD4ZeNz1KdzYdSJNV6CpmT5ivCM3Jen84
hB4EmEAi0ddjKR+eY3wUmFXILUmgABbUxsNz8ZLysHtktlzLy3Jxs1w0Qegwo4UY
WgXG7OSBxJCaKnQpYxYKL5brz+hU+7bB6HYtBmZw6P/AF/OotvoIs5omh/2hV9x2
gr8NhVz5VGd/A/btuOl1ZG2J4oZE/ysnHbzuwnWMo7FGEZ0tuQhqbVDwUjlHU6K9
JuwZ8vy+mix4RGVuKsMAzZSc6/tIVNbize1Dpckxzq+S55n9c5Z9UVcNYwPQAp/W
SqIIEO0sI+3Rii3jJsr819EnC/5ZbbPAgFk/3TDrRrwUEZSp4tOggmuM7ugrQQQ8
BSpnxZNWXBzitVFBAcQSasqHhLnPTxEJSTnPM/CBj3oKWjjkhGfxGlfS7FyF2sbL
dcpyoyC19oqob6Cl+SKz+LfIf+XzZFz1mBF8bn8uFTO5+8D/1VZNos1b/qC+y1Pn
/XHgficjHFj8R7Rstuknk+GF9SteAUgzitJaY0yLynRlo7TILxk1BLf1ErOQPS6G
iIHc38FO0OUmHTYakUPOS1A9AgwpwDxsGfwtxPcJSEaN3XCSPbMFNFKC61qnWCIP
N+tFayfE7yGGJGGenSB7qsMjCbB8icHtKf5OJwziTTaDUOZT0gU=
=V98/
-----END PGP SIGNATURE-----

View File

@ -6,18 +6,18 @@ Index: gnulib-tests/gnulib.mk
===================================================================
--- gnulib-tests/gnulib.mk.orig
+++ gnulib-tests/gnulib.mk
@@ -1073,10 +1073,10 @@ EXTRA_DIST += test-getloadavg.c signatur
@@ -1115,10 +1115,10 @@ EXTRA_DIST += test-getloadavg.c signatur
## begin gnulib module getlogin-tests
-TESTS += test-getlogin
-check_PROGRAMS += test-getlogin
-test_getlogin_LDADD = $(LDADD) $(LIB_GETLOGIN)
-test_getlogin_LDADD = $(LDADD) $(GETLOGIN_LIB)
-EXTRA_DIST += test-getlogin.c test-getlogin.h signature.h macros.h
+#TESTS += test-getlogin
+#check_PROGRAMS += test-getlogin
+#test_getlogin_LDADD = $(LDADD) $(LIB_GETLOGIN)
+#EXTRA_DIST += test-getlogin.c test-getlogin.h signature.h macros.h
+# TESTS += test-getlogin
+# check_PROGRAMS += test-getlogin
+# test_getlogin_LDADD = $(LDADD) $(GETLOGIN_LIB)
+# EXTRA_DIST += test-getlogin.c test-getlogin.h signature.h macros.h
## end gnulib module getlogin-tests

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig
+++ doc/coreutils.texi
@@ -71,7 +71,6 @@
@@ -73,7 +73,6 @@
* groups: (coreutils)groups invocation. Print group names a user is in.
* head: (coreutils)head invocation. Output the first part of files.
* hostid: (coreutils)hostid invocation. Print numeric host identifier.
@ -14,7 +14,7 @@ Index: doc/coreutils.texi
* id: (coreutils)id invocation. Print user identity.
* install: (coreutils)install invocation. Copy files and set attributes.
* join: (coreutils)join invocation. Join lines on a common field.
@@ -203,7 +202,7 @@ Free Documentation License''.
@@ -205,7 +204,7 @@ Free Documentation License''.
* File name manipulation:: dirname basename pathchk mktemp realpath
* Working context:: pwd stty printenv tty
* User information:: id logname whoami groups users who
@ -23,7 +23,7 @@ Index: doc/coreutils.texi
* SELinux context:: chcon runcon
* Modified command invocation:: chroot env nice nohup stdbuf timeout
* Process control:: kill
@@ -426,7 +425,6 @@ System context
@@ -428,7 +427,6 @@ System context
* date invocation:: Print or set system date and time
* nproc invocation:: Print the number of processors
* uname invocation:: Print system information
@ -31,7 +31,7 @@ Index: doc/coreutils.texi
* hostid invocation:: Print numeric host identifier
* uptime invocation:: Print system uptime and load
@@ -15947,7 +15945,6 @@ information.
@@ -16203,7 +16201,6 @@ information.
* arch invocation:: Print machine hardware name.
* nproc invocation:: Print the number of processors.
* uname invocation:: Print system information.
@ -39,7 +39,7 @@ Index: doc/coreutils.texi
* hostid invocation:: Print numeric host identifier.
* uptime invocation:: Print system uptime and load.
@end menu
@@ -16804,15 +16801,6 @@ Note this is non-portable (even across G
@@ -17094,15 +17091,6 @@ Note this is non-portable (even across G
Print the machine hardware name (sometimes called the hardware class
or hardware type).
@ -55,7 +55,7 @@ Index: doc/coreutils.texi
@item -p
@itemx --processor
@opindex -p
@@ -16866,34 +16854,6 @@ Print the kernel version.
@@ -17156,34 +17144,6 @@ Print the kernel version.
@exitstatus

View File

@ -6,7 +6,7 @@ Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig
+++ doc/coreutils.texi
@@ -74,7 +74,6 @@
@@ -76,7 +76,6 @@
* id: (coreutils)id invocation. Print user identity.
* install: (coreutils)install invocation. Copy files and set attributes.
* join: (coreutils)join invocation. Join lines on a common field.
@ -14,7 +14,7 @@ Index: doc/coreutils.texi
* link: (coreutils)link invocation. Make hard links between files.
* ln: (coreutils)ln invocation. Make links between files.
* logname: (coreutils)logname invocation. Print current login name.
@@ -205,7 +204,6 @@ Free Documentation License''.
@@ -207,7 +206,6 @@ Free Documentation License''.
* System context:: date arch nproc uname hostid uptime
* SELinux context:: chcon runcon
* Modified command invocation:: chroot env nice nohup stdbuf timeout
@ -22,7 +22,7 @@ Index: doc/coreutils.texi
* Delaying:: sleep
* Numeric operations:: factor numfmt seq
* File permissions:: Access modes
@@ -453,10 +451,6 @@ Modified command invocation
@@ -455,10 +453,6 @@ Modified command invocation
* stdbuf invocation:: Run a command with modified I/O buffering
* timeout invocation:: Run a command with a time limit
@ -33,7 +33,7 @@ Index: doc/coreutils.texi
Delaying
* sleep invocation:: Delay for a specified time
@@ -18310,90 +18304,6 @@ timeout -s INT 5s env --ignore-signal=IN
@@ -18604,90 +18598,6 @@ timeout -s INT 5s env --ignore-signal=IN
timeout -s INT -k 3s 5s env --ignore-signal=INT sleep 20
@end example

View File

@ -16,7 +16,7 @@ Index: tests/local.mk
===================================================================
--- tests/local.mk.orig
+++ tests/local.mk
@@ -736,14 +736,9 @@ all_tests = \
@@ -743,14 +743,9 @@ all_tests = \
# See tests/factor/create-test.sh.
tf = tests/factor
factor_tests = \

View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Tue Mar 21 20:58:07 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update to 9.2:
* cksum now accepts the --base64 (-b) option to print
base64-encoded checksums. It also accepts/checks such
checksums.
* cksum now accepts the --raw option to output a raw binary
checksum. No file name or other information is output in
this mode.
* cp, mv, and install now accept the --debug option to
print details on how a file is being copied.
* factor now accepts the --exponents (-h) option to print
factors in the form p^e, rather than repeating the prime p, e
times.
* ls now supports the --time=modification option, to explicitly
select the default mtime timestamp for display and sorting.
* mv now supports the --no-copy option, which causes it to fail
when asked to move a file to a different file system.
* split now accepts options like '-n SIZE' that exceed machine
integer range, when they can be implemented as if they were
infinity.
* split -n now accepts piped input even when not in round-robin
mode, by first copying input to a temporary file to determine its
size.
* wc now accepts the --total={auto,never,always,only} option
to give explicit control over when the total is output.
* 'cp --reflink=always A B' no longer leaves behind a newly
created empty file B merely because copy-on-write clones are not
supported.
* 'cp -n' and 'mv -n' now exit with nonzero status if they skip
their action because the destination exists, and likewise for 'cp
-i', 'ln -i', and 'mv -i' when the user declines. (POSIX
specifies this for 'cp -i' and 'mv -i'.)
* cp, mv, and install again read in multiples of the reported
block size, to support unusual devices that may have this
constraint.
* du --apparent now counts apparent sizes only of regular files
and symbolic links. POSIX does not specify the meaning of
apparent sizes (i.e., st_size) for other file types, and
counting those sizes could cause confusing and unwanted size
mismatches.
* 'ls -v' and 'sort -V' go back to sorting ".0" before ".A",
reverting to the behavior in coreutils-9.0 and earlier.
This behavior is now documented.
* ls --color now matches a file extension case sensitively
if there are different sequences defined for separate cases.
* printf unicode \uNNNN, \UNNNNNNNN syntax, now supports all
valid unicode code points. Previously is was restricted to
the C universal character subset, which restricted most points <=
0x9F.
* runcon now exits with status 125 for internal errors.
Previously upon internal errors it would exit with status 1,
which was less distinguishable
from errors from the invoked command.
* 'split -n N' now splits more evenly when the input size is
not a multiple of N, by creating N output files whose sizes
differ by at most 1 byte. Formerly, it did this only when
the input size was less than N.
* 'stat -c %s' now prints sizes as unsigned, consistent with
'ls'.
* a long list of bugfixes, see included NEWS file for details
- drop gnulib-simple-backup-fix.patch (upstream)
- drop coreutils-tests-workaround-make-fdleak.patch (obsolete)
-------------------------------------------------------------------
Mon Sep 26 20:29:11 UTC 2022 - Bernhard Voelker <mail@bernhard-voelker.de>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@
%global psuffix %{nil}
%endif
Name: coreutils%{?psuffix}
Version: 9.1
Version: 9.2
Release: 0
Summary: GNU Core Utilities
License: GPL-3.0-or-later
@ -62,8 +62,6 @@ Patch501: coreutils-test_without_valgrind.patch
# Downstream patch to skip a test failing on OBS.
# tests: skip tests/rm/ext3-perf.sh temporarily as it hangs on OBS.
Patch810: coreutils-skip-tests-rm-ext3-perf.patch
# Upstream patch - remove with version >9.1:
Patch850: gnulib-simple-backup-fix.patch
Patch900: coreutils-tests-workaround-make-fdleak.patch
BuildRequires: automake
BuildRequires: gmp-devel
@ -159,7 +157,6 @@ This package contains the documentation for the GNU Core Utilities.
%patch501
%patch810
%patch850
%patch900
# ================================================
@ -196,7 +193,7 @@ ln -v lib/parse-datetime.{c,y} .
chmod a+x tests/misc/sort-mb-tests.sh
# Avoid parallel make, because otherwise some timeout based tests like
# rm/ext3-perf may fail due to high CPU or IO load.
%make_build check-very-expensive VERBOSE=yes \
%make_build -j1 check-very-expensive VERBOSE=yes \
&& install -d -m 755 %{buildroot}%{_docdir}/%{name} \
&& xz -c tests/test-suite.log \
> %{buildroot}%{_docdir}/%{name}/test-suite.log.xz

View File

@ -1,93 +0,0 @@
Upstream patch on top of coreutils-9.1; remove with >9.1.
Fixes: https://bugs.gnu.org/55029
Two commits:
* https://git.sv.gnu.org/cgit/coreutils.git/commit/?id=e087525091b
commit e087525091b8f0a15eb2354f71032597d5271599
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed Apr 20 19:44:56 2022 -0700
mv: test Bug#55029
* tests/mv/backup-dir.sh: New test for Bug#55029,
reported by Steve Ward.
* https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=7347caeb9d90
commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed Apr 20 19:34:57 2022 -0700
backupfile: fix bug when renaming simple backups
* lib/backupfile.c (backupfile_internal): Fix bug when RENAME
and when doing simple backups. Problem reported by Steve Ward in:
https://bugs.gnu.org/55029
---
NEWS | 8 ++++++++
lib/backupfile.c | 7 +++----
tests/mv/backup-dir.sh | 6 ++++++
3 files changed, 17 insertions(+), 4 deletions(-)
Index: lib/backupfile.c
===================================================================
--- lib/backupfile.c.orig
+++ lib/backupfile.c
@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char co
return s;
DIR *dirp = NULL;
- int sdir = AT_FDCWD;
+ int sdir = dir_fd;
idx_t base_max = 0;
while (true)
{
@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char co
if (! rename)
break;
- int olddirfd = sdir < 0 ? dir_fd : sdir;
- idx_t offset = sdir < 0 ? 0 : base_offset;
+ idx_t offset = backup_type == simple_backups ? 0 : base_offset;
unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
- if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
+ if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
break;
int e = errno;
if (! (e == EEXIST && extended))
Index: tests/mv/backup-dir.sh
===================================================================
--- tests/mv/backup-dir.sh.orig
+++ tests/mv/backup-dir.sh
@@ -36,4 +36,10 @@ mkdir C D E || framework_failure_
mv -T --backup=numbered C E/ || fail=1
mv -T --backup=numbered D E/ || fail=1
+# Bug#55029
+mkdir F && echo 1 >1 && echo 2 >2 && cp 1 F/X && cp 2 X || framework_failure_
+mv --backup=simple X F/ || fail=1
+compare 1 F/X~ || fail=1
+compare 2 F/X || fail=1
+
Exit $fail
Index: NEWS
===================================================================
--- NEWS.orig
+++ NEWS
@@ -1,5 +1,13 @@
GNU coreutils NEWS -*- outline -*-
+* Downstream changes on top of release 9.1
+
+** Bug fixes
+
+ 'mv --backup=simple f d/' no longer mistakenly backs up d/f to f~.
+ [bug introduced in coreutils-9.1]
+
+
* Noteworthy changes in release 9.1 (2022-04-15) [stable]
** Bug fixes