From 0f7883d12fd46c2173fe80e28ab1a3bb484de0ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Oct 2006 19:53:23 +0000
Subject: [PATCH] * Revive the old coreutils, since coreutils 6 is broken
 beyond repair   with dietlibc (it does some incredibly nasty hackery with the
 system   header files...).

svn path=/nixpkgs/trunk/; revision=6878
---
 pkgs/tools/misc/coreutils-5/default.nix  | 10 +++++++
 pkgs/tools/misc/coreutils-5/uclibc.patch | 35 ++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/misc/coreutils-5/default.nix
 create mode 100644 pkgs/tools/misc/coreutils-5/uclibc.patch

diff --git a/pkgs/tools/misc/coreutils-5/default.nix b/pkgs/tools/misc/coreutils-5/default.nix
new file mode 100644
index 00000000000..e09a44842d5
--- /dev/null
+++ b/pkgs/tools/misc/coreutils-5/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "coreutils-5.97";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz;
+    md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
+  };
+  patches = [./dietlibc.patch];
+}
diff --git a/pkgs/tools/misc/coreutils-5/uclibc.patch b/pkgs/tools/misc/coreutils-5/uclibc.patch
new file mode 100644
index 00000000000..232737c2f35
--- /dev/null
+++ b/pkgs/tools/misc/coreutils-5/uclibc.patch
@@ -0,0 +1,35 @@
+diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c
+*** coreutils-5.97-orig/lib/strftime.c	2006-10-18 17:10:16.000000000 +0200
+--- coreutils-5.97/lib/strftime.c	2006-10-18 17:19:10.000000000 +0200
+***************
+*** 180,185 ****
+--- 180,191 ----
+  # define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
+  #endif
+  
++ #if FPRINTFTIME
++ #define advance(p, _n) ;
++ #else
++ #define advance(p, _n) p += _n;
++ #endif 
++ 
+  #define add(n, f)							      \
+    do									      \
+      {									      \
+***************
+*** 198,204 ****
+  		memset_space (p, _delta);				      \
+  	    }								      \
+  	  f;								      \
+! 	  p += FPRINTFTIME ? 0 : _n;					      \
+  	}								      \
+        i += _incr;							      \
+      } while (0)
+--- 204,210 ----
+  		memset_space (p, _delta);				      \
+  	    }								      \
+  	  f;								      \
+! 	  advance(p, _n);						      \
+  	}								      \
+        i += _incr;							      \
+      } while (0)