Merge pull request #1059 from Rmys/master

coreutils rebuild

system/base/coreutils/files/coreutils-8.26-test-lock.patch

@@ -0,0 +1,29 @@
+From 0d04ee8ddedb2bf33d64f148f246a3b7ec4fef21 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 23 Jan 2017 12:35:41 +0100
+Subject: [PATCH] test-lock: disable the rwlock test
+
+It hangs indefinitely if the system rwlock implementation does not
+prevent writer starvation (and glibc does not implement it).
+
+Bug: http://www.mail-archive.com/bug-gnulib@gnu.org/msg33017.html
+---
+ gnulib-tests/test-lock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c
+index aa6de27..5af0a6c 100644
+--- a/gnulib-tests/test-lock.c
++++ b/gnulib-tests/test-lock.c
+@@ -42,7 +42,7 @@
+    Uncomment some of these, to verify that all tests crash if no locking
+    is enabled.  */
+ #define DO_TEST_LOCK 1
+-#define DO_TEST_RWLOCK 1
++#define DO_TEST_RWLOCK 0
+ #define DO_TEST_RECURSIVE_LOCK 1
+ #define DO_TEST_ONCE 1
+ 
+-- 
+2.7.4
+

system/base/coreutils/files/coreutils-8.31-improve-test-cp-proc-short-read.patch

@@ -0,0 +1,54 @@
+From fb4cb651666adb43e8b332de95616e250b4d16f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Tue, 4 Feb 2020 00:37:23 +0000
+Subject: [PATCH] tests: avoid false failure due to varying /proc/kallsyms
+
+* tests/cp/proc-short-read.sh: Switch to using /proc/cpuinfo,
+rather than /proc/kallsyms which was seen to vary in some cases.
+Fixes https://bugs.gnu.org/39357
+
+Upstream-commit: ab108667ba6112efdd42f9618a1920dc9b8f6e51
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ tests/cp/proc-short-read.sh | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh
+index 6c58881de..dcc8b30d5 100755
+--- a/tests/cp/proc-short-read.sh
++++ b/tests/cp/proc-short-read.sh
+@@ -19,22 +19,18 @@
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ cp
+ 
+-kall=/proc/kallsyms
++proc_large=/proc/cpuinfo  # usually > 4KiB
+ 
+-test -r $kall || skip_ "your system lacks $kall"
++test -r $proc_large || skip_ "your system lacks $proc_large"
+ 
+-# Before coreutils-7.3, cp would copy less than 4KiB of this 1MB+ file.
+-cp $kall 1    || fail=1
+-cat $kall > 2 || fail=1
+-compare 1 2   || fail=1
++# Before coreutils-7.3, cp would copy less than 4KiB of this file.
++cp $proc_large 1    || fail=1
++cat $proc_large > 2 || fail=1
+ 
+-# Also check md5sum, just for good measure.
+-md5sum $kall > 3 || fail=1
+-md5sum 2     > 4 || fail=1
++# adjust varying parts
++sed '/MHz/d; /bogomips/d;' 1 > proc.cp || framework_failure_
++sed '/MHz/d; /bogomips/d;' 2 > proc.cat || framework_failure_
+ 
+-# Remove each file name before comparing checksums.
+-sed 's/ .*//' 3 > sum.proc || fail=1
+-sed 's/ .*//' 4 > sum.2    || fail=1
+-compare sum.proc sum.2 || fail=1
++compare proc.cp proc.cat || fail=1
+ 
+ Exit $fail
+-- 
+2.21.1
+

system/base/coreutils/files/coreutils-8.31-root-tests.patch

@@ -0,0 +1,71 @@
+From 57324f74fb8855d4888b1e6b6dbaaec781bb6db9 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Fri, 7 Feb 2020 17:05:06 +0100
+Subject: [PATCH] tests: ensure tests/cp/preserve-gid.sh works with single
+ binary
+
+* tests/cp/preserve-gid.sh: If configured with --enable-single-binary
+copy the coreutils single binary, instead of the cp one-line launcher.
+
+Discussed at https://bugzilla.redhat.com/1800597
+Fixes https://bugs.gnu.org/39485
+
+Upstream-commit: b96b1a47286632fd1cb738cf5a9893cf72a70d30
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ tests/cp/preserve-gid.sh | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/tests/cp/preserve-gid.sh b/tests/cp/preserve-gid.sh
+index e48584c1e..bba09df09 100755
+--- a/tests/cp/preserve-gid.sh
++++ b/tests/cp/preserve-gid.sh
+@@ -110,7 +110,14 @@ cleanup_() { rm -rf "$tmp_path"; }
+ # is not readable by our nameless IDs.
+ test -d /tmp && TMPDIR=/tmp
+ tmp_path=$(mktemp -d) || fail_ "failed to create temporary directory"
+-cp "$abs_path_dir_/cp" "$tmp_path"
++if test -x "$abs_path_dir_/coreutils" &&
++   { test -l "$abs_path_dir_/cp" ||
++     test $(wc -l < "$abs_path_dir_/cp") = 1; } then
++  # if configured with --enable-single-binary we need to use the single binary
++  cp "$abs_path_dir_/coreutils" "$tmp_path/cp" || framework_failure_
++else
++  cp "$abs_path_dir_/cp" "$tmp_path"
++fi
+ chmod -R a+rx "$tmp_path"
+ 
+ t1() {
+-- 
+2.21.1
+
+From 94a47b51e64c21fef4ad8faca1599099c459b2ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Mon, 10 Feb 2020 15:05:43 +0000
+Subject: [PATCH] tests: fix test for symlink
+
+* tests/cp/preserve-gid.sh: s/-l/-L/.
+Reported by Kamil Dudka
+
+Upstream-commit: 3150f4a82ef6542c4a8f0bf413815e78766f044f
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ tests/cp/preserve-gid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/cp/preserve-gid.sh b/tests/cp/preserve-gid.sh
+index bba09df09..547bf66bc 100755
+--- a/tests/cp/preserve-gid.sh
++++ b/tests/cp/preserve-gid.sh
+@@ -111,7 +111,7 @@ cleanup_() { rm -rf "$tmp_path"; }
+ test -d /tmp && TMPDIR=/tmp
+ tmp_path=$(mktemp -d) || fail_ "failed to create temporary directory"
+ if test -x "$abs_path_dir_/coreutils" &&
+-   { test -l "$abs_path_dir_/cp" ||
++   { test -L "$abs_path_dir_/cp" ||
+      test $(wc -l < "$abs_path_dir_/cp") = 1; } then
+   # if configured with --enable-single-binary we need to use the single binary
+   cp "$abs_path_dir_/coreutils" "$tmp_path/cp" || framework_failure_
+-- 
+2.21.1
+

system/base/coreutils/pspec.xml

@@ -30,6 +30,9 @@
             <Patch level="0">remove_am_silent_rules.patch</Patch>
 <!--             <Patch level="0">add-more-dircolors.patch</Patch> -->
 <!--             <Patch level="1">0001-cp-don-t-reserve-a-device-number.patch</Patch> -->
+            <Patch level="1">coreutils-8.26-test-lock.patch</Patch>
+            <Patch level="1">coreutils-8.31-improve-test-cp-proc-short-read.patch</Patch>
+            <Patch level="1">coreutils-8.31-root-tests.patch</Patch>
         </Patches>
     </Source>
 
@@ -55,6 +58,13 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2020-02-22</Date>
+            <Version>8.31</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
 		<Update release="8">
             <Date>2019-12-23</Date>
             <Version>8.31</Version>