From 29475acb95b68fe6bb9ac0c1632971773aca933ecdbde23411863eeb1f8a329e Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Fri, 14 Jan 2011 13:58:48 +0000
Subject: [PATCH] Accepting request 10077 from home:llunak:virtuoso

Copy from IBS home:uli_suse/coreutils based on submit request 10077 from user uli_suse

OBS-URL: https://build.opensuse.org/request/show/10077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=51
---
 _service:set_version:coreutils.spec     |  6 ++++--
 coreutils-8.9-singlethreaded-sort.patch | 15 +++++++++++++++
 coreutils.changes                       |  6 ++++++
 coreutils.spec                          |  6 ++++--
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 coreutils-8.9-singlethreaded-sort.patch

diff --git a/_service:set_version:coreutils.spec b/_service:set_version:coreutils.spec
index f41e1c5..8bd0d18 100644
--- a/_service:set_version:coreutils.spec
+++ b/_service:set_version:coreutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package coreutils (Version 8.9)
+# spec file for package coreutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,7 +24,7 @@ Url:            http://www.gnu.org/software/coreutils/
 License:        GFDLv1.2 ; GPLv2+ ; GPLv3+
 Group:          System/Base
 Version:        8.9
-Release:        1
+Release:        2
 Provides:       fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
 Obsoletes:      fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
 Obsoletes:      libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
@@ -55,6 +55,7 @@ Patch25:        coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
 Patch30:        coreutils-8.6-compile-su-with-fpie.diff
 Patch31:        coreutils-getaddrinfo.patch
 Patch32:        coreutils-ptr_int_casts.patch
+Patch33:        coreutils-8.9-singlethreaded-sort.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # this will create a cycle, broken up randomly - coreutils is just too core to have other
 # prerequires
@@ -94,6 +95,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
 %patch30 -p1
 %patch31
 %patch32
+%patch33
 cp %{S:4} po/de.po
 
 %build
diff --git a/coreutils-8.9-singlethreaded-sort.patch b/coreutils-8.9-singlethreaded-sort.patch
new file mode 100644
index 0000000..71e7f32
--- /dev/null
+++ b/coreutils-8.9-singlethreaded-sort.patch
@@ -0,0 +1,15 @@
+Index: src/sort.c
+===================================================================
+--- src/sort.c.orig
++++ src/sort.c
+@@ -5263,8 +5263,8 @@ main (int argc, char **argv)
+     {
+       if (!nthreads)
+         {
+-          unsigned long int np = num_processors (NPROC_CURRENT_OVERRIDABLE);
+-          nthreads = MIN (np, DEFAULT_MAX_THREADS);
++          //unsigned long int np = num_processors (NPROC_CURRENT_OVERRIDABLE);
++          nthreads = 1; //MIN (np, DEFAULT_MAX_THREADS);
+         }
+ 
+       /* Avoid integer overflow later.  */
diff --git a/coreutils.changes b/coreutils.changes
index 0fc425f..217a818 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 14 14:13:28 CET 2011 - uli@suse.de
+
+- sort threading still broken, it deadlocks occasionally; set
+  default number of threads to 1 as a workaround
+
 -------------------------------------------------------------------
 Wed Jan  5 14:25:16 CET 2011 - pth@suse.de
 
diff --git a/coreutils.spec b/coreutils.spec
index f41e1c5..8bd0d18 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package coreutils (Version 8.9)
+# spec file for package coreutils
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,7 +24,7 @@ Url:            http://www.gnu.org/software/coreutils/
 License:        GFDLv1.2 ; GPLv2+ ; GPLv3+
 Group:          System/Base
 Version:        8.9
-Release:        1
+Release:        2
 Provides:       fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
 Obsoletes:      fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
 Obsoletes:      libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
@@ -55,6 +55,7 @@ Patch25:        coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
 Patch30:        coreutils-8.6-compile-su-with-fpie.diff
 Patch31:        coreutils-getaddrinfo.patch
 Patch32:        coreutils-ptr_int_casts.patch
+Patch33:        coreutils-8.9-singlethreaded-sort.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # this will create a cycle, broken up randomly - coreutils is just too core to have other
 # prerequires
@@ -94,6 +95,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
 %patch30 -p1
 %patch31
 %patch32
+%patch33
 cp %{S:4} po/de.po
 
 %build