From dca140ed2b096d3b482508827de114c125ea3210 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sun, 17 Oct 2010 19:53:52 +0000
Subject: [PATCH] -up to 8.6; really run tests; po pl patch merged upstream

Changed files:
    coreutils-advcopy.patch -> 1.7
    coreutils-fmt-wchars.patch -> 1.7
    coreutils-getgid.patch -> 1.16
    coreutils-info.patch -> 1.9
    coreutils.spec -> 1.166
---
 coreutils-advcopy.patch    |  2 +-
 coreutils-fmt-wchars.patch |  2 +-
 coreutils-getgid.patch     | 11 +++++++++++
 coreutils-info.patch       | 18 +++++++++---------
 coreutils.spec             | 10 +++++-----
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/coreutils-advcopy.patch b/coreutils-advcopy.patch
index 2eca7d5..0eee167 100644
--- a/coreutils-advcopy.patch
+++ b/coreutils-advcopy.patch
@@ -126,7 +126,7 @@ diff -ru coreutils-8.4.orig/src/copy.c coreutils-8.4/src/copy.c
 +      int last_size = g_iTotalWritten;
 +      /* END progress mod */
 +
-       for (;;)
+       while (true)
          {
 +          if (progress) {
 +          /* BEGIN progress mod */
diff --git a/coreutils-fmt-wchars.patch b/coreutils-fmt-wchars.patch
index 3b636b0..48d0227 100644
--- a/coreutils-fmt-wchars.patch
+++ b/coreutils-fmt-wchars.patch
@@ -491,7 +491,7 @@ diff -ur coreutils-7.6.org/src/fmt.c coreutils-7.6/src/fmt.c
 +static wint_t
 +get_space (FILE *f, wint_t c)
  {
-   for (;;)
+   while (true)
      {
 -      if (c == ' ')
 +      if (c == L' ')
diff --git a/coreutils-getgid.patch b/coreutils-getgid.patch
index 4f326e9..eef4d60 100644
--- a/coreutils-getgid.patch
+++ b/coreutils-getgid.patch
@@ -216,3 +216,14 @@ diff -Nur coreutils-4.5.3.orig/src/getgid.c coreutils-4.5.3/src/getgid.c
  #: src/getlimits.c:29 src/timeout.c:74 src/truncate.c:42
  msgid "Padraig Brady"
 
+--- coreutils-8.6/README~	2010-10-17 21:37:11.589739007 +0200
++++ coreutils-8.6/README	2010-10-17 21:42:27.222782339 +0200
+@@ -9,7 +9,7 @@
+ 
+   [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp
+   csplit cut date dd df dir dircolors dirname du echo env expand expr
+-  factor false fmt fold groups head hostid hostname id install join kill
++  factor false fmt fold getgid groups head hostid hostname id install join kill
+   link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
+   nproc od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
+   runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
diff --git a/coreutils-info.patch b/coreutils-info.patch
index be9a6f7..488d80d 100644
--- a/coreutils-info.patch
+++ b/coreutils-info.patch
@@ -724,15 +724,6 @@
  @section @command{md5sum}: Print or check MD5 digests
  
  @pindex md5sum
-@@ -3419,7 +3401,7 @@
- considered infeasible at the moment, it is known how to produce
- different files with identical MD5 (a ``collision''), something which
- can be a security issue in certain contexts.  For more secure hashes,
--consider using SHA-1 or SHA-2.  @xref{sha1sum invocation}, and
-+consider using SHA-1 or SHA-2.  @xref{sha1sum}, and
- @ref{sha2 utilities}.
- 
- If a @var{file} is specified as @samp{-} or if no files are given
 @@ -3527,7 +3509,7 @@
  @exitstatus
  
@@ -793,6 +784,15 @@
  except that keys with the same value sort together.
  
  If multiple random sort fields are specified, the same random hash
+@@ -4060,7 +4060,7 @@
+ Limit the number of sorts run in parallel to @var{n}. By default,
+ @var{n} is set to the number of available processors, and values
+ greater than that are reduced to that limit. Also see
+-@ref{nproc invocation}.
++@ref{nproc}.
+ 
+ @item -u
+ @itemx --unique
 @@ -4077,7 +4059,7 @@
  this equivalence does not extend to arbitrary @command{sort} options.
  For example, @code{sort -n -u} inspects only the value of the initial
diff --git a/coreutils.spec b/coreutils.spec
index 3c02ac9..c61c489 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -5,12 +5,12 @@
 Summary:	GNU Core-utils - basic command line utilities
 Summary(pl.UTF-8):	GNU Core-utils - podstawowe narzędzia działające z linii poleceń
 Name:		coreutils
-Version:	8.5
-Release:	3
+Version:	8.6
+Release:	1
 License:	GPL v3+
 Group:		Applications/System
 Source0:	http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5:	55170ed640e300f5b81640c6f4641513
+# Source0-md5:	17d693d282ac57c62b241a045e7b511c
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	f7c986ebc74ccb8d08ed70141063f14c
 Source2:	DIR_COLORS
@@ -110,7 +110,7 @@ Programy zawarte w tym pakiecie to:
 
 %prep
 %setup -q -a1
-%patch13 -p1
+#%patch13 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -149,7 +149,7 @@ rm -f po/stamp-po
 
 %{__make}
 
-%{?with_tests:%{__make} tests}
+%{?with_tests:%{__make} tests check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-- 
2.43.0