SHA256
1
0
forked from pool/coreutils

Accepting request 212838 from home:bernhard-voelker:branches:Base:System

Update to 8.22

OBS-URL: https://build.opensuse.org/request/show/212838
OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=219
This commit is contained in:
Bernhard Voelker 2014-01-04 22:54:58 +00:00 committed by Git OBS Bridge
parent a076bc027f
commit 091187f8d9
17 changed files with 677 additions and 1481 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b28dba154ded8117dc043125a7e0fae2e7b613a7d287c46e9faa6866a81d377
size 102904

View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212
size 5335124

View File

@ -16,8 +16,8 @@ independent executable (PIE). This is enforced via RPMLINT.
Index: src/local.mk
===================================================================
--- src/local.mk.orig
+++ src/local.mk
--- src/local.mk.orig 2014-01-03 18:18:24.193893522 +0100
+++ src/local.mk 2014-01-03 19:47:24.269617498 +0100
@@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
@ -27,7 +27,7 @@ Index: src/local.mk
# The list of all programs (separated in different variables to express
# the how and when they should be installed) is defined in this makefile
@@ -266,6 +266,9 @@ src_factor_LDADD += $(LIB_GMP)
@@ -271,6 +271,9 @@ src_factor_LDADD += $(LIB_GMP)
# for getloadavg
src_uptime_LDADD += $(GETLOADAVG_LIBS)

View File

@ -1,37 +0,0 @@
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Mon, 20 May 2013 00:03:20 +0200
Subject: [PATCH] tests/nap.h: increase delay multiplier to avoid problems in
VMs like OBS
The gnulib change http://git.sv.gnu.org/cgit/gnulib.git/commit/?id=5191133e
(available upstreams with >= 8.22, applied to openSUSE's coreutils
package with "coreutils-gnulib-tests-fix-nap-race.patch", decreased the
probability of lost races to about a third, however such problems could
still be observed in virtual machines like OBS.
Increasing the factor from 1.125 to 3 seems to close the race window.
* tests/nap.h (nap): Change the multiplier for the delay from 1.125
to 3.
---
gnulib-tests/nap.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: gnulib-tests/nap.h
===================================================================
--- gnulib-tests/nap.h.orig
+++ gnulib-tests/nap.h
@@ -126,9 +126,11 @@ nap (void)
/* Multiply by 1.125 (rounding up), to avoid problems if the
file system's clock is a bit slower than nanosleep's.
+ OBS: use 3 as multiplier to avoid this race a bit better
+ which is even more likely in VMs.
Ceiling it at INT_MAX, though. */
- int delta = (d >> 3) + ((d & 7) != 0);
- d = delta < INT_MAX - d ? d + delta : INT_MAX;
+ int d2 = 3 * d;
+ d = d2 < INT_MAX ? d2 : INT_MAX;
delay.tv_sec = d / 1000000000;
delay.tv_nsec = d % 1000000000;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,12 @@
diff --git a/gnulib-tests/test-isnanl.h b/gnulib-tests/test-isnanl.h
index 06e6a7c..2df10f8 100644
--- a/gnulib-tests/test-isnanl.h
+++ b/gnulib-tests/test-isnanl.h
---
gnulib-tests/test-isnanl.h | 9 +++++++++
gnulib-tests/test-signbit.c | 10 ++++++++++
2 files changed, 19 insertions(+)
Index: gnulib-tests/test-isnanl.h
===================================================================
--- gnulib-tests/test-isnanl.h.orig 2014-01-03 18:18:24.131884585 +0100
+++ gnulib-tests/test-isnanl.h 2014-01-03 19:47:25.428781733 +0100
@@ -51,6 +51,15 @@ main ()
/* A bit pattern that is different from a Quiet NaN. With a bit of luck,
it's a Signalling NaN. */
@ -18,10 +23,10 @@ index 06e6a7c..2df10f8 100644
memory_long_double m;
m.value = NaNl ();
# if LDBL_EXPBIT0_BIT > 0
diff --git a/gnulib-tests/test-signbit.c b/gnulib-tests/test-signbit.c
index e8ea097..7e24292 100644
--- a/gnulib-tests/test-signbit.c
+++ b/gnulib-tests/test-signbit.c
Index: gnulib-tests/test-signbit.c
===================================================================
--- gnulib-tests/test-signbit.c.orig 2014-01-03 18:18:24.131884585 +0100
+++ gnulib-tests/test-signbit.c 2014-01-03 19:47:25.446784284 +0100
@@ -151,6 +151,16 @@ test_signbitl ()
#define NWORDS \
((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))

File diff suppressed because it is too large Load Diff

View File

@ -11,10 +11,14 @@ Test cases:
Andreas Gruenbacher <agruen@suse.de>
---
src/chgrp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: src/chgrp.c
===================================================================
--- src/chgrp.c.orig
+++ src/chgrp.c
--- src/chgrp.c.orig 2014-01-03 18:18:24.257902746 +0100
+++ src/chgrp.c 2014-01-03 19:47:23.019440368 +0100
@@ -88,7 +88,7 @@ parse_group (const char *name)
{
unsigned long int tmp;

View File

@ -1,7 +1,11 @@
---
doc/coreutils.texi | 38 +-------------------------------------
1 file changed, 1 insertion(+), 37 deletions(-)
Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig
+++ doc/coreutils.texi
--- doc/coreutils.texi.orig 2014-01-03 18:18:24.527941663 +0100
+++ doc/coreutils.texi 2014-01-03 19:47:18.522803264 +0100
@@ -66,7 +66,6 @@
* groups: (coreutils)groups invocation. Print group names a user is in.
* head: (coreutils)head invocation. Output the first part of files.
@ -19,7 +23,7 @@ Index: doc/coreutils.texi
* SELinux context:: chcon runcon
* Modified command invocation:: chroot env nice nohup stdbuf timeout
* Process control:: kill
@@ -419,7 +418,6 @@ System context
@@ -417,7 +416,6 @@ System context
* date invocation:: Print or set system date and time
* nproc invocation:: Print the number of processors
* uname invocation:: Print system information
@ -27,7 +31,7 @@ Index: doc/coreutils.texi
* hostid invocation:: Print numeric host identifier
* uptime invocation:: Print system uptime and load
@@ -14626,7 +14624,6 @@ information.
@@ -14852,7 +14850,6 @@ information.
* arch invocation:: Print machine hardware name.
* nproc invocation:: Print the number of processors.
* uname invocation:: Print system information.
@ -35,7 +39,7 @@ Index: doc/coreutils.texi
* hostid invocation:: Print numeric host identifier.
* uptime invocation:: Print system uptime and load.
@end menu
@@ -15448,15 +15445,6 @@ easily available, as is the case with Li
@@ -15674,15 +15671,6 @@ easily available, as is the case with Li
Print the machine hardware name (sometimes called the hardware class
or hardware type).
@ -51,7 +55,7 @@ Index: doc/coreutils.texi
@item -p
@itemx --processor
@opindex -p
@@ -15510,30 +15498,6 @@ Print the kernel version.
@@ -15736,30 +15724,6 @@ Print the kernel version.
@exitstatus

View File

@ -1,7 +1,11 @@
---
doc/coreutils.texi | 90 -----------------------------------------------------
1 file changed, 90 deletions(-)
Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig
+++ doc/coreutils.texi
--- doc/coreutils.texi.orig 2014-01-03 19:47:18.522803264 +0100
+++ doc/coreutils.texi 2014-01-03 19:47:20.702112039 +0100
@@ -69,7 +69,6 @@
* id: (coreutils)id invocation. Print user identity.
* install: (coreutils)install invocation. Copy and change attributes.
@ -18,7 +22,7 @@ Index: doc/coreutils.texi
* Delaying:: sleep
* Numeric operations:: factor seq
* File permissions:: Access modes
@@ -446,10 +444,6 @@ Modified command invocation
@@ -444,10 +442,6 @@ Modified command invocation
* stdbuf invocation:: Run a command with modified I/O buffering
* timeout invocation:: Run a command with a time limit
@ -29,7 +33,7 @@ Index: doc/coreutils.texi
Delaying
* sleep invocation:: Delay for a specified time
@@ -16380,90 +16374,6 @@ the exit status of @var{command} otherwi
@@ -16606,90 +16600,6 @@ the exit status of @var{command} otherwi
@end display

View File

@ -1,7 +1,11 @@
---
src/uname.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
Index: src/uname.c
===================================================================
--- src/uname.c.orig
+++ src/uname.c
--- src/uname.c.orig 2014-01-03 18:18:24.316911250 +0100
+++ src/uname.c 2014-01-03 19:47:21.922284919 +0100
@@ -337,6 +337,36 @@ main (int argc, char **argv)
# endif
}

View File

@ -1,3 +1,170 @@
-------------------------------------------------------------------
Mon Dec 30 10:17:50 UTC 2013 - mail@bernhard-voelker.de
- Refresh patches to match the new version.
* coreutils-build-timeout-as-pie.patch: Update line number.
* coreutils-gnulib-tests-ppc64le.patch: Likewise.
* coreutils-invalid-ids.patch: Likewise.
* coreutils-remove_hostname_documentation.patch: Likewise.
* coreutils-remove_kill_documentation.patch: Likewise.
* coreutils-sysinfo.patch: Likewise.
* coreutils-i18n.patch: Likewise. Additionally:
Accommodate to upstream changes in cut.c and uniq.c.
Fix some compiler warnings.
Fix 145-mb test in tests/misc/uniq.pl.
- Remove now-upstream and therefore obsolete patches.
* coreutils-8.21.de.po.xz: Remove, upstream is latest.
* coreutils-gnulib-tests-fix-nap-race-obs.patch:
Remove, now upstream.
* coreutils-gnulib-tests-fix-nap-race.patch: Likewise.
* longlong-aarch64.patch: Likewise.
- Update to 8.22 (2013-12-13) [stable]
** Bug fixes
df now processes the mount list correctly in the presence of unstatable
mount points. Previously it may have failed to output some mount points.
[bug introduced in coreutils-8.21]
df now processes symbolic links and relative paths to special files containing
a mounted file system correctly. Previously df displayed the statistics about
the file system the file is stored on rather than the one inside.
[This bug was present in "the beginning".]
df now processes disk device nodes correctly in the presence of bind mounts.
Now df shows the base mounted file system rather than the last one mounted.
[This bug was present in "the beginning".]
install now removes the target file if the strip program failed for any
reason. Before, that file was left behind, sometimes even with wrong
permissions.
[This bug was present in "the beginning".]
ln --relative now updates existing symlinks correctly. Previously it based
the relative link on the dereferenced path of an existing link.
[This bug was introduced when --relative was added in coreutils-8.16.]
ls --recursive will no longer exit with "serious" exit code (2), if there
is an error reading a directory not specified on the command line.
[Bug introduced in coreutils-5.3.0]
mkdir, mkfifo, and mknod now work better when creating a file in a directory
with a default ACL whose umask disagrees with the process's umask, on a
system such as GNU/Linux where directory ACL umasks override process umasks.
[bug introduced in coreutils-6.0]
mv will now replace empty directories in the destination with directories
from the source, when copying across file systems.
[This bug was present in "the beginning".]
od -wN with N larger than 64K on a system with 32-bit size_t would
print approximately 2*N bytes of extraneous padding.
[Bug introduced in coreutils-7.0]
rm -I now prompts for confirmation before removing a write protected file.
[Bug introduced in coreutils-6.8]
shred once again uses direct I/O on systems requiring aligned buffers.
Also direct I/O failures for odd sized writes at end of file are now handled.
[The "last write" bug was introduced in coreutils-5.3.0 but masked
by the alignment bug introduced in coreutils-6.0]
tail --retry -f now waits for the files specified to appear. Before, tail
would immediately exit when such a file is initially inaccessible.
[This bug was introduced when inotify support was added in coreutils-7.5]
tail -F has improved handling of symlinks. Previously tail didn't respond
to the symlink target (re)appearing after being (re)created.
[This bug was introduced when inotify support was added in coreutils-7.5]
** New features
cp, install, mkdir, mknod, mkfifo and mv now support "restorecon"
functionality through the -Z option, to set the SELinux context
appropriate for the new item location in the file system.
csplit accepts a new option: --suppressed-matched, to elide the lines
used to identify the split points.
df --output now accepts a 'file' field, to propagate a specified
command line argument through to the output.
du accepts a new option: --inodes to show the number of inodes instead
of the blocks used.
id accepts a new option: --zero (-z) to delimit the output entries by
a NUL instead of a white space character.
id and ls with -Z report the SMACK security context where available.
mkdir, mkfifo and mknod with -Z set the SMACK context where available.
id can now lookup by user ID, in addition to the existing name lookup.
join accepts a new option: --zero-terminated (-z). As with the sort,uniq
option of the same name, this makes join consume and produce NUL-terminated
lines rather than newline-terminated lines.
uniq accepts a new option: --group to print all items, while separating
unique groups with empty lines.
shred accepts new parameters to the --remove option to give greater
control over that operation, which can greatly reduce sync overhead.
shuf accepts a new option: --repeat (-r), which can repeat items in
the output.
** Changes in behavior
cp --link now dereferences a symbolic link as source before creating the
hard link in the destination unless the -P,--no-deref option is specified.
Previously, it would create a hard link of the symbolic link, even when
the dereferencing options -L or -H were specified.
cp, install, mkdir, mknod and mkfifo no longer accept an argument to the
short -Z option. The --context equivalent still takes an optional argument.
dd status=none now suppresses all non fatal diagnostic messages,
not just the transfer counts.
df no longer accepts the long-obsolescent --megabytes option.
stdbuf now requires at least one buffering mode option to be specified,
as per the documented interface.
** Improvements
base64 encoding throughput for bulk data is increased by about 60%.
md5sum can use libcrypto hash routines where allowed to potentially
get better performance through using more system specific logic.
sha1sum for example has improved throughput by 40% on an i3-2310M.
This also affects sha1sum, sha224sum, sha256sum, sha384sum and sha512sum.
stat and tail work better with EFIVARFS, EXOFS, F2FS, HOSTFS, SMACKFS, SNFS
and UBIFS. stat -f --format=%T now reports the file system type, and tail -f
now uses inotify for files on all those except SNFS, rather than the default
(for unknown file system types) of issuing a warning and reverting to polling.
shuf outputs subsets of large inputs much more efficiently.
Reservoir sampling is used to limit memory usage based on the number of
outputs, rather than the number of inputs.
shred increases the default write block size from 12KiB to 64KiB
to align with other utilities and reduce the system call overhead.
split --line-bytes=SIZE, now only allocates memory as needed rather
than allocating SIZE bytes at program start.
stty now supports configuring "stick" (mark/space) parity where available.
** Build-related
factor now builds on aarch64 based systems [bug introduced in coreutils-8.20]
-------------------------------------------------------------------
Thu Dec 19 23:37:39 UTC 2013 - uweigand@de.ibm.com

View File

@ -1,7 +1,7 @@
#
# spec file for package coreutils-testsuite
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@ Summary: GNU Core Utilities
License: GPL-3.0+
Group: System/Base
Url: http://www.gnu.org/software/coreutils/
Version: 8.21
Version: 8.22
Release: 0
#################################################################
@ -87,25 +87,16 @@ Source: coreutils-%{version}.tar.xz
%endif
Source1: baselibs.conf
Source2: coreutils-%{version}.de.po.xz
Patch1: coreutils-remove_hostname_documentation.patch
Patch3: coreutils-remove_kill_documentation.patch
Patch4: coreutils-i18n.patch
Patch8: coreutils-sysinfo.patch
Patch16: coreutils-invalid-ids.patch
Patch17: longlong-aarch64.patch
# OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option.
Patch100: coreutils-build-timeout-as-pie.patch
# Fix gnulib-test failures related to gnulib-tests/nap.h.
Patch200: coreutils-gnulib-tests-fix-nap-race.patch
# Fix gnulib-test failures: increase nap() delay multiplier even
# a bit more to avoid failures on OBS.
Patch201: coreutils-gnulib-tests-fix-nap-race-obs.patch
# Fix imported gnulib long double math tests for little-endian PowerPC
Patch202: coreutils-gnulib-tests-ppc64le.patch
@ -133,15 +124,10 @@ the GNU fileutils, sh-utils, and textutils packages.
%patch3
%patch8
%patch16
%patch17 -p1
#
%patch100
%patch200
%patch201
%patch202 -p1
xz -dc %{S:2} >po/de.po
%patch202
#???## We need to statically link to gmp, otherwise we have a build loop
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in

View File

@ -1,3 +1,170 @@
-------------------------------------------------------------------
Mon Dec 30 10:17:50 UTC 2013 - mail@bernhard-voelker.de
- Refresh patches to match the new version.
* coreutils-build-timeout-as-pie.patch: Update line number.
* coreutils-gnulib-tests-ppc64le.patch: Likewise.
* coreutils-invalid-ids.patch: Likewise.
* coreutils-remove_hostname_documentation.patch: Likewise.
* coreutils-remove_kill_documentation.patch: Likewise.
* coreutils-sysinfo.patch: Likewise.
* coreutils-i18n.patch: Likewise. Additionally:
Accommodate to upstream changes in cut.c and uniq.c.
Fix some compiler warnings.
Fix 145-mb test in tests/misc/uniq.pl.
- Remove now-upstream and therefore obsolete patches.
* coreutils-8.21.de.po.xz: Remove, upstream is latest.
* coreutils-gnulib-tests-fix-nap-race-obs.patch:
Remove, now upstream.
* coreutils-gnulib-tests-fix-nap-race.patch: Likewise.
* longlong-aarch64.patch: Likewise.
- Update to 8.22 (2013-12-13) [stable]
** Bug fixes
df now processes the mount list correctly in the presence of unstatable
mount points. Previously it may have failed to output some mount points.
[bug introduced in coreutils-8.21]
df now processes symbolic links and relative paths to special files containing
a mounted file system correctly. Previously df displayed the statistics about
the file system the file is stored on rather than the one inside.
[This bug was present in "the beginning".]
df now processes disk device nodes correctly in the presence of bind mounts.
Now df shows the base mounted file system rather than the last one mounted.
[This bug was present in "the beginning".]
install now removes the target file if the strip program failed for any
reason. Before, that file was left behind, sometimes even with wrong
permissions.
[This bug was present in "the beginning".]
ln --relative now updates existing symlinks correctly. Previously it based
the relative link on the dereferenced path of an existing link.
[This bug was introduced when --relative was added in coreutils-8.16.]
ls --recursive will no longer exit with "serious" exit code (2), if there
is an error reading a directory not specified on the command line.
[Bug introduced in coreutils-5.3.0]
mkdir, mkfifo, and mknod now work better when creating a file in a directory
with a default ACL whose umask disagrees with the process's umask, on a
system such as GNU/Linux where directory ACL umasks override process umasks.
[bug introduced in coreutils-6.0]
mv will now replace empty directories in the destination with directories
from the source, when copying across file systems.
[This bug was present in "the beginning".]
od -wN with N larger than 64K on a system with 32-bit size_t would
print approximately 2*N bytes of extraneous padding.
[Bug introduced in coreutils-7.0]
rm -I now prompts for confirmation before removing a write protected file.
[Bug introduced in coreutils-6.8]
shred once again uses direct I/O on systems requiring aligned buffers.
Also direct I/O failures for odd sized writes at end of file are now handled.
[The "last write" bug was introduced in coreutils-5.3.0 but masked
by the alignment bug introduced in coreutils-6.0]
tail --retry -f now waits for the files specified to appear. Before, tail
would immediately exit when such a file is initially inaccessible.
[This bug was introduced when inotify support was added in coreutils-7.5]
tail -F has improved handling of symlinks. Previously tail didn't respond
to the symlink target (re)appearing after being (re)created.
[This bug was introduced when inotify support was added in coreutils-7.5]
** New features
cp, install, mkdir, mknod, mkfifo and mv now support "restorecon"
functionality through the -Z option, to set the SELinux context
appropriate for the new item location in the file system.
csplit accepts a new option: --suppressed-matched, to elide the lines
used to identify the split points.
df --output now accepts a 'file' field, to propagate a specified
command line argument through to the output.
du accepts a new option: --inodes to show the number of inodes instead
of the blocks used.
id accepts a new option: --zero (-z) to delimit the output entries by
a NUL instead of a white space character.
id and ls with -Z report the SMACK security context where available.
mkdir, mkfifo and mknod with -Z set the SMACK context where available.
id can now lookup by user ID, in addition to the existing name lookup.
join accepts a new option: --zero-terminated (-z). As with the sort,uniq
option of the same name, this makes join consume and produce NUL-terminated
lines rather than newline-terminated lines.
uniq accepts a new option: --group to print all items, while separating
unique groups with empty lines.
shred accepts new parameters to the --remove option to give greater
control over that operation, which can greatly reduce sync overhead.
shuf accepts a new option: --repeat (-r), which can repeat items in
the output.
** Changes in behavior
cp --link now dereferences a symbolic link as source before creating the
hard link in the destination unless the -P,--no-deref option is specified.
Previously, it would create a hard link of the symbolic link, even when
the dereferencing options -L or -H were specified.
cp, install, mkdir, mknod and mkfifo no longer accept an argument to the
short -Z option. The --context equivalent still takes an optional argument.
dd status=none now suppresses all non fatal diagnostic messages,
not just the transfer counts.
df no longer accepts the long-obsolescent --megabytes option.
stdbuf now requires at least one buffering mode option to be specified,
as per the documented interface.
** Improvements
base64 encoding throughput for bulk data is increased by about 60%.
md5sum can use libcrypto hash routines where allowed to potentially
get better performance through using more system specific logic.
sha1sum for example has improved throughput by 40% on an i3-2310M.
This also affects sha1sum, sha224sum, sha256sum, sha384sum and sha512sum.
stat and tail work better with EFIVARFS, EXOFS, F2FS, HOSTFS, SMACKFS, SNFS
and UBIFS. stat -f --format=%T now reports the file system type, and tail -f
now uses inotify for files on all those except SNFS, rather than the default
(for unknown file system types) of issuing a warning and reverting to polling.
shuf outputs subsets of large inputs much more efficiently.
Reservoir sampling is used to limit memory usage based on the number of
outputs, rather than the number of inputs.
shred increases the default write block size from 12KiB to 64KiB
to align with other utilities and reduce the system call overhead.
split --line-bytes=SIZE, now only allocates memory as needed rather
than allocating SIZE bytes at program start.
stty now supports configuring "stick" (mark/space) parity where available.
** Build-related
factor now builds on aarch64 based systems [bug introduced in coreutils-8.20]
-------------------------------------------------------------------
Thu Dec 19 23:37:39 UTC 2013 - uweigand@de.ibm.com

View File

@ -1,7 +1,7 @@
#
# spec file for package coreutils
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@ Summary: GNU Core Utilities
License: GPL-3.0+
Group: System/Base
Url: http://www.gnu.org/software/coreutils/
Version: 8.21
Version: 8.22
Release: 0
#################################################################
@ -87,25 +87,16 @@ Source: coreutils-%{version}.tar.xz
%endif
Source1: baselibs.conf
Source2: coreutils-%{version}.de.po.xz
Patch1: coreutils-remove_hostname_documentation.patch
Patch3: coreutils-remove_kill_documentation.patch
Patch4: coreutils-i18n.patch
Patch8: coreutils-sysinfo.patch
Patch16: coreutils-invalid-ids.patch
Patch17: longlong-aarch64.patch
# OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option.
Patch100: coreutils-build-timeout-as-pie.patch
# Fix gnulib-test failures related to gnulib-tests/nap.h.
Patch200: coreutils-gnulib-tests-fix-nap-race.patch
# Fix gnulib-test failures: increase nap() delay multiplier even
# a bit more to avoid failures on OBS.
Patch201: coreutils-gnulib-tests-fix-nap-race-obs.patch
# Fix imported gnulib long double math tests for little-endian PowerPC
Patch202: coreutils-gnulib-tests-ppc64le.patch
@ -133,15 +124,10 @@ the GNU fileutils, sh-utils, and textutils packages.
%patch3
%patch8
%patch16
%patch17 -p1
#
%patch100
%patch200
%patch201
%patch202 -p1
xz -dc %{S:2} >po/de.po
%patch202
#???## We need to statically link to gmp, otherwise we have a build loop
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in

View File

@ -1,48 +0,0 @@
From 9fe7c5b6eb373d859390dd5a7844a666d8b7818b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Granlund?= <tg@gmplib.org>
Date: Mon, 4 Mar 2013 17:57:33 +0000
Subject: [PATCH] build: fix factor build failure on aarch64
* src/longlong.h (__aarch64__): Make add_ssaaaa and sub_ddmmss work.
* NEWS: Mention the build fix.
Reported at https://bugzilla.redhat.com/917735
---
NEWS | 4 ++++
src/longlong.h | 21 +++++++--------------
2 files changed, 11 insertions(+), 14 deletions(-)
Index: coreutils-8.21/src/longlong.h
===================================================================
--- coreutils-8.21.orig/src/longlong.h
+++ coreutils-8.21/src/longlong.h
@@ -529,23 +529,16 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
#endif /* __arm__ */
#if defined (__aarch64__) && W_TYPE_SIZE == 64
+/* FIXME: Extend the immediate range for the low word by using both
+ ADDS and SUBS, since they set carry in the same way. */
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \
+ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \
: "=r" (sh), "=&r" (sl) \
- : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
+ : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC)
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- do { \
- if (__builtin_constant_p (bl)) \
- { \
- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
- : "=r" (sh), "=&r" (sl) \
- : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \
- } \
- else /* only bh might be a constant */ \
- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
- : "=r" (sh), "=&r" (sl) \
- : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\
- } while (0)
+ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \
+ : "=r,r" (sh), "=&r,&r" (sl) \
+ : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC)
#define umul_ppmm(ph, pl, m0, m1) \
do { \
UDItype __m0 = (m0), __m1 = (m1); \