- update to 9.2:
* 'comm --output-delimiter="" --total' now delimits columns in the total line with the NUL character, consistent with NUL column delimiters in the rest of the output. Previously no delimiters were used for the total line in this case. * 'cp -p' no longer has a security hole when cloning into a dangling symbolic link on macOS 10.12 and later. - drop gnulib-simple-backup-fix.patch (upstream) - drop coreutils-tests-workaround-make-fdleak.patch (obsolete) OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=344
This commit is contained in:
parent
2b6b7ce591
commit
073dfd0e93
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423
|
||||
size 5712104
|
@ -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
3
coreutils-9.2.tar.xz
Normal 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
16
coreutils-9.2.tar.xz.sig
Normal 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-----
|
@ -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
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 = \
|
||||
|
@ -1,25 +0,0 @@
|
||||
---
|
||||
tests/init.sh | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
Index: tests/init.sh
|
||||
===================================================================
|
||||
--- tests/init.sh.orig
|
||||
+++ tests/init.sh
|
||||
@@ -685,6 +685,16 @@ compare ()
|
||||
}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
+# OpenSUSE/OSC workaround.
|
||||
+# GNU make 4.3.90 leaks a lot of file descriptors when using the jobserver.
|
||||
+# Close all of them pointing to files matching '/tmp/Gm*'.
|
||||
+p=$$
|
||||
+for n in $(find /proc/$p/fd -lname '/tmp/Gm*' -printf '%P\n'); do
|
||||
+ exec {n}>&-
|
||||
+done
|
||||
+# -----------------------------------------------------------------------------
|
||||
+
|
||||
+# -----------------------------------------------------------------------------
|
||||
|
||||
# If you want to override the testdir_prefix_ function,
|
||||
# or to add more utility functions, use this file.
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 21 20:58:07 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 9.2:
|
||||
* 'comm --output-delimiter="" --total' now delimits columns
|
||||
in the total line with the NUL character, consistent with
|
||||
NUL column delimiters in the rest of the output.
|
||||
Previously no delimiters were used for the total line in
|
||||
this case.
|
||||
* 'cp -p' no longer has a security hole when cloning into a
|
||||
dangling symbolic link on macOS 10.12 and later.
|
||||
- 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>
|
||||
|
||||
|
@ -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,9 +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
|
||||
BuildRequires: hostname
|
||||
@ -159,8 +156,6 @@ This package contains the documentation for the GNU Core Utilities.
|
||||
%patch501
|
||||
|
||||
%patch810
|
||||
%patch850
|
||||
%patch900
|
||||
|
||||
# ================================================
|
||||
%build
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user