coreutils: Update to 8.23.

2026-04-09 18:45:54 +02:00 · 2014-07-27 12:49:56 +02:00
parent 4bd06a3dd2
commit 285f03c2e8
7 changed files with 232 additions and 4687 deletions
--- a/config/rootfiles/common/coreutils
+++ b/config/rootfiles/common/coreutils
@@ -1,4 +1,4 @@
-#bin/[
+bin/[
 bin/chgrp
 bin/chmod
 bin/chown
@@ -22,69 +22,244 @@ bin/true
 bin/uname
 etc/DIR_COLORS
 usr/bin/[
+usr/bin/arch
+usr/bin/base64
 usr/bin/basename
-#usr/bin/cksum
-#usr/bin/comm
-#usr/bin/csplit
+usr/bin/chcon
+usr/bin/cksum
+usr/bin/comm
+usr/bin/csplit
 usr/bin/cut
-#usr/bin/dir
+usr/bin/dir
 usr/bin/dircolors
 usr/bin/dirname
 usr/bin/du
 usr/bin/env
-#usr/bin/expand
+usr/bin/expand
 usr/bin/expr
-#usr/bin/factor
-#usr/bin/fmt
+usr/bin/factor
+usr/bin/fmt
 usr/bin/fold
 usr/bin/groups
 usr/bin/hostid
 usr/bin/id
 usr/bin/install
 usr/bin/join
-#usr/bin/link
-#usr/bin/logname
+usr/bin/link
+usr/bin/logname
 usr/bin/md5sum
 usr/bin/mkfifo
-#usr/bin/nl
+usr/bin/mktemp
+usr/bin/nl
 usr/bin/nohup
-#usr/bin/od
+usr/bin/nproc
+usr/bin/numfmt
+usr/bin/od
 usr/bin/paste
-#usr/bin/pathchk
-#usr/bin/pinky
-#usr/bin/pr
-#usr/bin/printenv
+usr/bin/pathchk
+usr/bin/pinky
+usr/bin/pr
+usr/bin/printenv
 usr/bin/printf
-#usr/bin/ptx
+usr/bin/ptx
 usr/bin/readlink
+usr/bin/realpath
+usr/bin/runcon
 usr/bin/seq
 usr/bin/sha1sum
+usr/bin/sha224sum
+usr/bin/sha256sum
+usr/bin/sha384sum
+usr/bin/sha512sum
 usr/bin/shred
+usr/bin/shuf
 usr/bin/sort
 usr/bin/split
 usr/bin/stat
-#usr/bin/sum
-#usr/bin/tac
+#usr/bin/stdbuf
+usr/bin/sum
+usr/bin/tac
 usr/bin/tail
 usr/bin/tee
 usr/bin/test
+usr/bin/timeout
 usr/bin/touch
 usr/bin/tr
-#usr/bin/tsort
+usr/bin/truncate
+usr/bin/tsort
 usr/bin/tty
 usr/bin/unexpand
 usr/bin/uniq
 usr/bin/unlink
-#usr/bin/users
-#usr/bin/vdir
+usr/bin/uptime
+usr/bin/users
+usr/bin/vdir
 usr/bin/wc
 usr/bin/who
 usr/bin/whoami
 usr/bin/yes
+#usr/libexec
+#usr/libexec/coreutils
+#usr/libexec/coreutils/libstdbuf.so
 usr/sbin/chroot
 #usr/share/info/coreutils.info
+#usr/share/locale/af
+#usr/share/locale/af/LC_MESSAGES
+#usr/share/locale/af/LC_MESSAGES/coreutils.mo
+#usr/share/locale/af/LC_TIME
+#usr/share/locale/af/LC_TIME/coreutils.mo
+#usr/share/locale/be/LC_MESSAGES/coreutils.mo
+#usr/share/locale/be/LC_TIME
+#usr/share/locale/be/LC_TIME/coreutils.mo
+#usr/share/locale/bg/LC_MESSAGES/coreutils.mo
+#usr/share/locale/bg/LC_TIME
+#usr/share/locale/bg/LC_TIME/coreutils.mo
+#usr/share/locale/ca/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ca/LC_TIME
+#usr/share/locale/ca/LC_TIME/coreutils.mo
+#usr/share/locale/cs/LC_MESSAGES/coreutils.mo
+#usr/share/locale/cs/LC_TIME
+#usr/share/locale/cs/LC_TIME/coreutils.mo
+#usr/share/locale/da/LC_MESSAGES/coreutils.mo
+#usr/share/locale/da/LC_TIME
+#usr/share/locale/da/LC_TIME/coreutils.mo
+#usr/share/locale/de/LC_MESSAGES/coreutils.mo
+#usr/share/locale/de/LC_TIME
+#usr/share/locale/de/LC_TIME/coreutils.mo
+#usr/share/locale/el/LC_MESSAGES/coreutils.mo
+#usr/share/locale/el/LC_TIME
+#usr/share/locale/el/LC_TIME/coreutils.mo
+#usr/share/locale/eo
+#usr/share/locale/eo/LC_MESSAGES
+#usr/share/locale/eo/LC_MESSAGES/coreutils.mo
+#usr/share/locale/eo/LC_TIME
+#usr/share/locale/eo/LC_TIME/coreutils.mo
+#usr/share/locale/es/LC_MESSAGES/coreutils.mo
+#usr/share/locale/es/LC_TIME
+#usr/share/locale/es/LC_TIME/coreutils.mo
+#usr/share/locale/et
+#usr/share/locale/et/LC_MESSAGES
+#usr/share/locale/et/LC_MESSAGES/coreutils.mo
+#usr/share/locale/et/LC_TIME
+#usr/share/locale/et/LC_TIME/coreutils.mo
+#usr/share/locale/eu
+#usr/share/locale/eu/LC_MESSAGES
+#usr/share/locale/eu/LC_MESSAGES/coreutils.mo
+#usr/share/locale/eu/LC_TIME
+#usr/share/locale/eu/LC_TIME/coreutils.mo
+#usr/share/locale/fi/LC_MESSAGES/coreutils.mo
+#usr/share/locale/fi/LC_TIME
+#usr/share/locale/fi/LC_TIME/coreutils.mo
+#usr/share/locale/fr/LC_MESSAGES/coreutils.mo
+#usr/share/locale/fr/LC_TIME
+#usr/share/locale/fr/LC_TIME/coreutils.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ga/LC_TIME
+#usr/share/locale/ga/LC_TIME/coreutils.mo
+#usr/share/locale/gl/LC_MESSAGES/coreutils.mo
+#usr/share/locale/gl/LC_TIME
+#usr/share/locale/gl/LC_TIME/coreutils.mo
+#usr/share/locale/hr/LC_MESSAGES/coreutils.mo
+#usr/share/locale/hr/LC_TIME
+#usr/share/locale/hr/LC_TIME/coreutils.mo
+#usr/share/locale/hu/LC_MESSAGES/coreutils.mo
+#usr/share/locale/hu/LC_TIME
+#usr/share/locale/hu/LC_TIME/coreutils.mo
+#usr/share/locale/ia
+#usr/share/locale/ia/LC_MESSAGES
+#usr/share/locale/ia/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ia/LC_TIME
+#usr/share/locale/ia/LC_TIME/coreutils.mo
+#usr/share/locale/id/LC_MESSAGES/coreutils.mo
+#usr/share/locale/id/LC_TIME
+#usr/share/locale/id/LC_TIME/coreutils.mo
+#usr/share/locale/it/LC_MESSAGES/coreutils.mo
+#usr/share/locale/it/LC_TIME
+#usr/share/locale/it/LC_TIME/coreutils.mo
+#usr/share/locale/ja/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ja/LC_TIME
+#usr/share/locale/ja/LC_TIME/coreutils.mo
+#usr/share/locale/kk
+#usr/share/locale/kk/LC_MESSAGES
+#usr/share/locale/kk/LC_MESSAGES/coreutils.mo
+#usr/share/locale/kk/LC_TIME
+#usr/share/locale/kk/LC_TIME/coreutils.mo
+#usr/share/locale/ko/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ko/LC_TIME
+#usr/share/locale/ko/LC_TIME/coreutils.mo
+#usr/share/locale/lg
+#usr/share/locale/lg/LC_MESSAGES
+#usr/share/locale/lg/LC_MESSAGES/coreutils.mo
+#usr/share/locale/lg/LC_TIME
+#usr/share/locale/lg/LC_TIME/coreutils.mo
+#usr/share/locale/lt/LC_MESSAGES/coreutils.mo
+#usr/share/locale/lt/LC_TIME
+#usr/share/locale/lt/LC_TIME/coreutils.mo
+#usr/share/locale/ms
+#usr/share/locale/ms/LC_MESSAGES
+#usr/share/locale/ms/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ms/LC_TIME
+#usr/share/locale/ms/LC_TIME/coreutils.mo
+#usr/share/locale/nb/LC_MESSAGES/coreutils.mo
+#usr/share/locale/nb/LC_TIME
+#usr/share/locale/nb/LC_TIME/coreutils.mo
+#usr/share/locale/nl/LC_MESSAGES/coreutils.mo
+#usr/share/locale/nl/LC_TIME
+#usr/share/locale/nl/LC_TIME/coreutils.mo
+#usr/share/locale/pl/LC_MESSAGES/coreutils.mo
+#usr/share/locale/pl/LC_TIME
+#usr/share/locale/pl/LC_TIME/coreutils.mo
+#usr/share/locale/pt
+#usr/share/locale/pt/LC_MESSAGES
+#usr/share/locale/pt/LC_MESSAGES/coreutils.mo
+#usr/share/locale/pt/LC_TIME
+#usr/share/locale/pt/LC_TIME/coreutils.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+#usr/share/locale/pt_BR/LC_TIME
+#usr/share/locale/pt_BR/LC_TIME/coreutils.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ro/LC_TIME
+#usr/share/locale/ro/LC_TIME/coreutils.mo
+#usr/share/locale/ru/LC_MESSAGES/coreutils.mo
+#usr/share/locale/ru/LC_TIME
+#usr/share/locale/ru/LC_TIME/coreutils.mo
+#usr/share/locale/sk/LC_MESSAGES/coreutils.mo
+#usr/share/locale/sk/LC_TIME
+#usr/share/locale/sk/LC_TIME/coreutils.mo
+#usr/share/locale/sl
+#usr/share/locale/sl/LC_MESSAGES
+#usr/share/locale/sl/LC_MESSAGES/coreutils.mo
+#usr/share/locale/sl/LC_TIME
+#usr/share/locale/sl/LC_TIME/coreutils.mo
+#usr/share/locale/sv/LC_MESSAGES/coreutils.mo
+#usr/share/locale/sv/LC_TIME
+#usr/share/locale/sv/LC_TIME/coreutils.mo
+#usr/share/locale/tr/LC_MESSAGES/coreutils.mo
+#usr/share/locale/tr/LC_TIME
+#usr/share/locale/tr/LC_TIME/coreutils.mo
+#usr/share/locale/uk
+#usr/share/locale/uk/LC_MESSAGES
+#usr/share/locale/uk/LC_MESSAGES/coreutils.mo
+#usr/share/locale/uk/LC_TIME
+#usr/share/locale/uk/LC_TIME/coreutils.mo
+#usr/share/locale/vi/LC_MESSAGES/coreutils.mo
+#usr/share/locale/vi/LC_TIME
+#usr/share/locale/vi/LC_TIME/coreutils.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+#usr/share/locale/zh_CN/LC_TIME
+#usr/share/locale/zh_CN/LC_TIME/coreutils.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+#usr/share/locale/zh_TW/LC_TIME
+#usr/share/locale/zh_TW/LC_TIME/coreutils.mo
+#usr/share/man/man1/arch.1
+#usr/share/man/man1/base64.1
 #usr/share/man/man1/basename.1
 #usr/share/man/man1/cat.1
+#usr/share/man/man1/chcon.1
 #usr/share/man/man1/chroot.1
 #usr/share/man/man1/cksum.1
 #usr/share/man/man1/comm.1
@@ -103,15 +278,17 @@ usr/sbin/chroot
 #usr/share/man/man1/groups.1
 #usr/share/man/man1/head.1
 #usr/share/man/man1/hostid.1
-#usr/share/man/man1/hostname.1
 #usr/share/man/man1/id.1
 #usr/share/man/man1/join.1
 #usr/share/man/man1/link.1
 #usr/share/man/man1/logname.1
 #usr/share/man/man1/md5sum.1
+#usr/share/man/man1/mktemp.1
 #usr/share/man/man1/nice.1
 #usr/share/man/man1/nl.1
 #usr/share/man/man1/nohup.1
+#usr/share/man/man1/nproc.1
+#usr/share/man/man1/numfmt.1
 #usr/share/man/man1/od.1
 #usr/share/man/man1/paste.1
 #usr/share/man/man1/pathchk.1
@@ -122,13 +299,21 @@ usr/sbin/chroot
 #usr/share/man/man1/ptx.1
 #usr/share/man/man1/pwd.1
 #usr/share/man/man1/readlink.1
+#usr/share/man/man1/realpath.1
+#usr/share/man/man1/runcon.1
 #usr/share/man/man1/seq.1
 #usr/share/man/man1/sha1sum.1
+#usr/share/man/man1/sha224sum.1
+#usr/share/man/man1/sha256sum.1
+#usr/share/man/man1/sha384sum.1
+#usr/share/man/man1/sha512sum.1
 #usr/share/man/man1/shred.1
+#usr/share/man/man1/shuf.1
 #usr/share/man/man1/sleep.1
 #usr/share/man/man1/sort.1
 #usr/share/man/man1/split.1
 #usr/share/man/man1/stat.1
+#usr/share/man/man1/stdbuf.1
 #usr/share/man/man1/stty.1
 #usr/share/man/man1/sum.1
 #usr/share/man/man1/sync.1
@@ -136,14 +321,17 @@ usr/sbin/chroot
 #usr/share/man/man1/tail.1
 #usr/share/man/man1/tee.1
 #usr/share/man/man1/test.1
+#usr/share/man/man1/timeout.1
 #usr/share/man/man1/tr.1
 #usr/share/man/man1/true.1
+#usr/share/man/man1/truncate.1
 #usr/share/man/man1/tsort.1
 #usr/share/man/man1/tty.1
 #usr/share/man/man1/uname.1
 #usr/share/man/man1/unexpand.1
 #usr/share/man/man1/uniq.1
 #usr/share/man/man1/unlink.1
+#usr/share/man/man1/uptime.1
 #usr/share/man/man1/users.1
 #usr/share/man/man1/wc.1
 #usr/share/man/man1/who.1
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -24,10 +24,10 @@

 include Config

-VER        = 5.96
+VER        = 8.23

 THISAPP    = coreutils-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

@@ -35,17 +35,22 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
  TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
+  CONFIGURE_OPTIONS = --prefix=/usr
 else
  TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  CONFIGURE_OPTIONS = --prefix=/tools
 endif

-EXTRA_CONFIG += ac_cv_func_working_mktime=yes
+CONFIGURE_OPTIONS += \
+	--disable-selinux \
+	--enable-largefile \
+	--disable-rpath \
+	--enable-install-program=arch \
+	--enable-no-install-program=hostname,kill \
+	--with-tty-group \
+	gl_cv_func_mknod_works=yes
+
+CFLAGS += -fno-strict-aliasing

 ###############################################################################
 # Top-level Rules
@@ -55,7 +60,7 @@ objects =$(DL_FILE)

 $(DL_FILE)                      = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5                  = bf55d069d82128fd754a090ce8b5acff
+$(DL_FILE)_MD5                  = abed135279f87ad6762ce57ff6d89c41

 install : $(TARGET)

@@ -84,24 +89,12 @@ $(subst %,%_MD5,$(objects)) :

 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-rename-tee.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-futimes.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+
 ifeq "$(ROOT)" ""
-ifeq "$(MACHINE)" "i586"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch
-endif
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-suppress_uptime_kill_su-1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-i18n-1.patch
-	cd $(DIR_APP) && chmod +x tests/sort/sort-mb-tests
-	cd $(DIR_APP) && sed -i 's/_LEN 6/_LEN 20/' src/who.c
-endif
-	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
-	#use hostname from inet-tools
-ifeq "$(ROOT)" ""
-	rm /usr/bin/hostname
 	mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
 	mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
 	mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
@@ -110,8 +103,7 @@ ifeq "$(ROOT)" ""
 	ln -sf test /bin/[
 	#ln -sf ../../bin/install /usr/bin
 	dircolors -p > /etc/DIR_COLORS
-else
-	rm /tools/bin/hostname
 endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/src/patches/coreutils-5.96-futimes.patch
+++ b/src/patches/coreutils-5.96-futimes.patch
@@ -1,56 +0,0 @@
--- coreutils-6.0.orig/lib/utimens.c	2006-06-11 09:14:31.000000000 +0200
-+++ coreutils-6.0/lib/utimens.c	2007-07-17 00:41:08.000000000 +0200
-@@ -75,7 +75,7 @@
-    Return 0 on success, -1 (setting errno) on failure.  */
- 
- int
-futimens (int fd ATTRIBUTE_UNUSED,
-+cu_futimens (int fd ATTRIBUTE_UNUSED,
- 	  char const *file, struct timespec const timespec[2])
- {
-   /* There's currently no interface to set file timestamps with
-@@ -168,5 +168,5 @@
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
-  return futimens (-1, file, timespec);
-+  return cu_futimens (-1, file, timespec);
- }
--- coreutils-6.0.orig/lib/utimens.h	2004-11-23 21:41:51.000000000 +0100
-+++ coreutils-6.0/lib/utimens.h	2007-07-17 00:41:31.000000000 +0200
-@@ -1,3 +1,3 @@
- #include "timespec.h"
-int futimens (int, char const *, struct timespec const [2]);
-+int cu_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
--- coreutils-6.0.orig/src/copy.c	2007-07-16 23:18:42.000000000 +0200
-+++ coreutils-6.0/src/copy.c	2007-07-17 00:43:10.000000000 +0200
-@@ -648,7 +648,7 @@
-       timespec[0] = get_stat_atime (src_sb);
-       timespec[1] = get_stat_mtime (src_sb);
- 
-      if (futimens (dest_desc, dst_name, timespec) != 0)
-+      if (cu_futimens (dest_desc, dst_name, timespec) != 0)
- 	{
- 	  error (0, errno, _("preserving times for %s"), quote (dst_name));
- 	  if (x->require_preserve)
--- coreutils-6.0.orig/src/touch.c	2005-11-02 11:01:07.000000000 +0100
-+++ coreutils-6.0/src/touch.c	2007-07-17 00:43:51.000000000 +0200
-@@ -167,7 +167,7 @@
- 
-   if (amtime_now)
-     {
-      /* Pass NULL to futimens so it will not fail if we have
-+      /* Pass NULL to cu_futimens so it will not fail if we have
- 	 write access to the file, but don't own it.  */
-       t = NULL;
-     }
-@@ -182,7 +182,7 @@
-       t = timespec;
-     }
- 
-  ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
-+  ok = (cu_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
- 
-   if (fd == STDIN_FILENO)
-     {
--- a/src/patches/coreutils-5.96-i18n-1.patch
+++ b/src/patches/coreutils-5.96-i18n-1.patch
--- a/src/patches/coreutils-5.96-rename-tee.patch
+++ b/src/patches/coreutils-5.96-rename-tee.patch
@@ -1,51 +0,0 @@
-From b50508742035812f8ae8671eedc6623fac53f51d Mon Sep 17 00:00:00 2001
-From: Jim Meyering <jim@meyering.net>
-Date: Thu, 22 Jun 2006 12:50:32 +0000
-Subject: [PATCH] * src/tee.c (tee_files): Rename from tee, to avoid conflict with
- the function in glibc's <fcntl.h>.  Reported by Andreas Schwab.
-
---
- src/tee.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/tee.c b/src/tee.c
-index f99642d..f612181 100644
--- a/src/tee.c
-+++ b/src/tee.c
-@@ -1,5 +1,5 @@
- /* tee - read from standard input and write to standard output and files.
-   Copyright (C) 85,1990-2005 Free Software Foundation, Inc.
-+   Copyright (C) 85,1990-2006 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -31,7 +31,7 @@
- 
- #define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
- 
-static bool tee (int nfiles, const char **files);
-+static bool tee_files (int nfiles, const char **files);
- 
- /* If true, append to output files rather than truncating them. */
- static bool append;
-@@ -121,7 +121,7 @@ main (int argc, char **argv)
-   /* Do *not* warn if tee is given no file arguments.
-      POSIX requires that it work when given no arguments.  */
- 
-  ok = tee (argc - optind, (const char **) &argv[optind]);
-+  ok = tee_files (argc - optind, (const char **) &argv[optind]);
-   if (close (STDIN_FILENO) != 0)
-     error (EXIT_FAILURE, errno, _("standard input"));
- 
-@@ -133,7 +133,7 @@ main (int argc, char **argv)
-    Return true if successful.  */
- 
- static bool
-tee (int nfiles, const char **files)
-+tee_files (int nfiles, const char **files)
- {
-   FILE **descriptors;
-   char buffer[BUFSIZ];
-- 
-1.7.2.5
-
--- a/src/patches/coreutils-5.96-suppress_uptime_kill_su-1.patch
+++ b/src/patches/coreutils-5.96-suppress_uptime_kill_su-1.patch
@@ -1,272 +0,0 @@
-Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
-Date: 2006-03-15
-Initial Package Version: 5.94
-Origin: original suppress_hotname_uptame_kill_su patch (Robert Connolly)
-Upstream Status: N/A
-Description: This patch supresses the building of uptime, and kill.  The su
-command is built so the testsuite can run, use './src/su', but it will not
-be installed. Also see:
-           http://www.linuxfromscratch.org/patches/downloads/coreutils/
-           coreutils-5.0-dupes-2.patch
-
-diff -Naur coreutils-5.94.orig/AUTHORS coreutils-5.94/AUTHORS
--- coreutils-5.94.orig/AUTHORS	2004-11-03 23:10:50.000000000 +0000
-+++ coreutils-5.94/AUTHORS	2006-03-15 22:20:49.000000000 +0000
-@@ -34,7 +34,6 @@
- hostname: Jim Meyering
- id: Arnold Robbins, David MacKenzie
- join: Mike Haertel
-kill: Paul Eggert
- link: Michael Stone
- ln: Mike Parker, David MacKenzie
- logname: FIXME: unknown
-@@ -83,7 +82,6 @@
- unexpand: David MacKenzie
- uniq: Richard Stallman, David MacKenzie
- unlink: Michael Stone
-uptime: Joseph Arceneaux, David MacKenzie, Kaveh Ghazi
- users: Joseph Arceneaux, David MacKenzie
- vdir: Richard Stallman, David MacKenzie
- wc: Paul Rubin, David MacKenzie
-diff -Naur coreutils-5.94.orig/Makefile.in coreutils-5.94/Makefile.in
--- coreutils-5.94.orig/Makefile.in	2006-02-13 12:52:03.000000000 +0000
-+++ coreutils-5.94/Makefile.in	2006-03-15 22:20:49.000000000 +0000
-@@ -148,7 +148,7 @@
- 	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
- 	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
- 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
-	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
-+	$(top_srcdir)/m4/unlocked-io.m4 \
- 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
- 	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
- 	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
-diff -Naur coreutils-5.94.orig/README coreutils-5.94/README
--- coreutils-5.94.orig/README	2005-09-28 18:34:26.000000000 +0000
-+++ coreutils-5.94/README	2006-03-15 22:20:49.000000000 +0000
-@@ -9,11 +9,11 @@
- 
-   [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
-   df dir dircolors dirname du echo env expand expr factor false fmt fold
-  ginstall groups head hostid hostname id join kill link ln logname ls
-+  ginstall groups head hostid hostname id join link ln logname ls
-   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
-   printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
-   split stat stty su sum sync tac tail tee test touch tr true tsort tty
-  uname unexpand uniq unlink uptime users vdir wc who whoami yes
-+  uname unexpand uniq unlink users vdir wc who whoami yes
- 
- See the file NEWS for a list of major changes in the current release.
- 
-diff -Naur coreutils-5.94.orig/configure coreutils-5.94/configure
--- coreutils-5.94.orig/configure	2006-02-13 12:52:04.000000000 +0000
-+++ coreutils-5.94/configure	2006-03-15 22:20:49.000000000 +0000
-@@ -50418,8 +50418,7 @@
- { echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
- echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
-   if test $gnulib_cv_have_boot_time = yes; then
-  OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
-  MAN="$MAN uptime.1"
-+echo "uptime is suppressed"
- fi
- 
- 
-diff -Naur coreutils-5.94.orig/man/Makefile.in coreutils-5.94/man/Makefile.in
--- coreutils-5.94.orig/man/Makefile.in	2006-02-13 12:51:58.000000000 +0000
-+++ coreutils-5.94/man/Makefile.in	2006-03-15 22:20:50.000000000 +0000
-@@ -142,7 +142,7 @@
- 	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
- 	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
- 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
-	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
-+	$(top_srcdir)/m4/unlocked-io.m4 \
- 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
- 	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
- 	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
-@@ -303,13 +303,13 @@
-   basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
-   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
-   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
-  head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
-+  head.1 hostid.1 hostname.1 id.1 install.1 join.1 \
-   link.1 ln.1 logname.1 \
-   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
-   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
-   rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
-  su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
-  tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
-+  sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
-+  tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \
-   who.1 whoami.1 yes.1
- 
- man_aux = $(dist_man_MANS:.1=.x)
-@@ -575,7 +575,6 @@
- id.1:		$(common_dep)	$(srcdir)/id.x		../src/id.c
- install.1:	$(common_dep)	$(srcdir)/install.x	../src/install.c
- join.1:		$(common_dep)	$(srcdir)/join.x	../src/join.c
-kill.1:		$(common_dep)	$(srcdir)/kill.x	../src/kill.c
- link.1:		$(common_dep)	$(srcdir)/link.x	../src/link.c
- ln.1:		$(common_dep)	$(srcdir)/ln.x		../src/ln.c
- logname.1:	$(common_dep)	$(srcdir)/logname.x	../src/logname.c
-@@ -608,7 +607,6 @@
- split.1:	$(common_dep)	$(srcdir)/split.x	../src/split.c
- stat.1:		$(common_dep)	$(srcdir)/stat.x	../src/stat.c
- stty.1:		$(common_dep)	$(srcdir)/stty.x	../src/stty.c
-su.1:		$(common_dep)	$(srcdir)/su.x		../src/su.c
- sum.1:		$(common_dep)	$(srcdir)/sum.x		../src/sum.c
- sync.1:		$(common_dep)	$(srcdir)/sync.x	../src/sync.c
- tac.1:		$(common_dep)	$(srcdir)/tac.x		../src/tac.c
-@@ -624,7 +622,6 @@
- unexpand.1:	$(common_dep)	$(srcdir)/unexpand.x	../src/unexpand.c
- uniq.1:		$(common_dep)	$(srcdir)/uniq.x	../src/uniq.c
- unlink.1:	$(common_dep)	$(srcdir)/unlink.x	../src/unlink.c
-uptime.1:	$(common_dep)	$(srcdir)/uptime.x	../src/uptime.c
- users.1:	$(common_dep)	$(srcdir)/users.x	../src/users.c
- vdir.1:		$(common_dep)	$(srcdir)/vdir.x	../src/ls.c
- wc.1:		$(common_dep)	$(srcdir)/wc.x		../src/wc.c
-@@ -656,7 +653,7 @@
- check-x-vs-1:
- 	PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;		\
- 	t=ls-files.$$$$;						\
-	(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
-+	(cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
- 	echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//'	\
- 	  | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };		\
- 	rm $$t
-diff -Naur coreutils-5.94.orig/src/Makefile.in coreutils-5.94/src/Makefile.in
--- coreutils-5.94.orig/src/Makefile.in	2006-02-13 13:08:11.000000000 +0000
-+++ coreutils-5.94/src/Makefile.in	2006-03-15 22:20:50.000000000 +0000
-@@ -39,7 +39,7 @@
- host_triplet = @host@
- EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
- 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
-	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
-+	uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
- bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
- 	cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
- 	ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
-@@ -56,7 +56,7 @@
- 	uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) \
- 	dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) \
- 	factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) id$(EXEEXT) \
-	kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \
-+	logname$(EXEEXT) pathchk$(EXEEXT) \
- 	printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \
- 	sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \
- 	tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) $(am__EXEEXT_1) \
-@@ -169,7 +169,7 @@
- 	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
- 	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
- 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
-	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
-+	$(top_srcdir)/m4/unlocked-io.m4 \
- 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
- 	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
- 	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
-@@ -350,11 +350,6 @@
- join_LDADD = $(LDADD)
- join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
- 	../lib/libcoreutils.a
-kill_SOURCES = kill.c
-kill_OBJECTS = kill.$(OBJEXT)
-kill_LDADD = $(LDADD)
-kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
-	../lib/libcoreutils.a
- link_SOURCES = link.c
- link_OBJECTS = link.$(OBJEXT)
- link_LDADD = $(LDADD)
-@@ -577,9 +572,6 @@
- unlink_LDADD = $(LDADD)
- unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
- 	../lib/libcoreutils.a
-uptime_SOURCES = uptime.c
-uptime_OBJECTS = uptime.$(OBJEXT)
-uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
- users_SOURCES = users.c
- users_OBJECTS = users.$(OBJEXT)
- users_LDADD = $(LDADD)
-@@ -622,28 +614,28 @@
- 	csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
- 	dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
- 	fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
-	id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
-+	id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
- 	$(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
- 	nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
- 	printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
- 	rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \
- 	sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \
- 	tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \
-	unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
-+	unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \
- 	wc.c who.c whoami.c yes.c
- DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
- 	$(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
- 	csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
- 	dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
- 	fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
-	id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
-+	id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
- 	$(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
- 	nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
- 	printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
- 	rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \
- 	sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \
- 	tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \
-	unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
-+	unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \
- 	wc.c who.c whoami.c yes.c
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
-@@ -840,7 +832,6 @@
- nanosec_libs = $(LDADD) $(POW_LIB) $(LIB_NANOSLEEP)
- sleep_LDADD = $(nanosec_libs)
- tail_LDADD = $(nanosec_libs)
-uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
- su_LDADD = $(LDADD) $(LIB_CRYPT)
- SUFFIXES = .sh
- installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
-@@ -1076,9 +1067,6 @@
- join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES) 
- 	@rm -f join$(EXEEXT)
- 	$(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
-kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES) 
-	@rm -f kill$(EXEEXT)
-	$(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
- link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) 
- 	@rm -f link$(EXEEXT)
- 	$(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
-@@ -1226,9 +1214,6 @@
- unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) 
- 	@rm -f unlink$(EXEEXT)
- 	$(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
-uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES) 
-	@rm -f uptime$(EXEEXT)
-	$(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
- users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) 
- 	@rm -f users$(EXEEXT)
- 	$(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
-@@ -1322,7 +1307,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
-@@ -1378,7 +1362,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
-@@ -1606,7 +1589,7 @@
- 	  && can_create_suid_root_executable=yes; \
- 	rm -f $$TMPFILE; \
- 	if test $$can_create_suid_root_executable = yes; then \
-	  $(INSTALL_SU); \
-+	  echo "Installation of su is suppressed"; \
- 	else \
- 	  echo "WARNING: insufficient access; not installing su"; \
- 	  echo "NOTE: to install su, run 'make install-root' as root"; \
--- a/src/patches/coreutils-5.96-uname-1.patch
+++ b/src/patches/coreutils-5.96-uname-1.patch
@@ -1,204 +0,0 @@
-Submitted By: Robert Connolly <robert@linuxfromscratch.org> (ashes)
-Date: 2005-11-13
-Initial Package Version: 5.93
-Upstream Status: pending
-Origin: Scot McPherson and Zack Winkles
-Description: Fix the output of uname once and for all. This is the position independent
-version.
-
-	$ uname -m      # This always worked.
-	i686
-	$ uname -i      # Used to report 'unknown'.
-	i386
-	$ uname -p      # Likewise.
-	athlon-4
-
-Now 'uname -p' can be used by GCC's mtune/mcpu and march options. For example:
-
-	CFLAGS="-march=$(uname -m) -mtune=$(uname -p)"
-
-diff -Naur coreutils-5.93.orig/src/uname.c coreutils-5.93/src/uname.c
--- coreutils-5.93.orig/src/uname.c	2005-09-15 19:57:04.000000000 +0000
-+++ coreutils-5.93/src/uname.c	2005-11-13 19:18:35.000000000 +0000
-@@ -29,6 +29,26 @@
- # include <sys/systeminfo.h>
- #endif
- 
-+#ifdef linux
-+/* Thanks to the ffmpeg team for this PIC version of cpuid() */
-+#ifdef ARCH_X86_64
-+#  define REG_b "rbx"
-+#  define REG_S "rsi"
-+#else
-+#  define REG_b "ebx"
-+#  define REG_S "esi"
-+#endif
-+#define cpuid(index,eax,ebx,ecx,edx)\
-+	__asm __volatile\
-+	  ("mov %%"REG_b", %%"REG_S"\n\t"\
-+	  "cpuid\n\t"\
-+	  "xchg %%"REG_b", %%"REG_S\
-+	  : "=a" (eax), "=S" (ebx),\
-+	  "=c" (ecx), "=d" (edx)\
-+	  : "0" (index));
-+int has_sse( void );
-+#endif
-+
- #if HAVE_SYS_SYSCTL_H
- # if HAVE_SYS_PARAM_H
- #  include <sys/param.h> /* needed for OpenBSD 3.0 */
-@@ -256,6 +276,99 @@
- 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
- 	  element = processor;
-       }
-+#else
-+      {
-+	struct utsname u;
-+	uname (&u);
-+	element = u.machine;
-+#ifdef linux
-+/******************************************************************************
-+ *
-+ * Hello, major hack.  I shouldn't have to do this.  struct utsname should
-+ * have another element with this info in it.  There's probably a struct
-+ * somewhere that has this info, I just don't know where it is.
-+ *
-+ *****************************************************************************/
-+
-+	if( !strcmp( element, "i586" ) || !strcmp( element, "i686" ) ) {
-+	  int eax, ebx, ecx, edx, unused;
-+	  int model, family, sse;
-+     
-+	  cpuid(0,unused,ebx,ecx,edx);
-+	  cpuid(1,eax,unused,unused,unused);
-+	  model = (eax >> 4) & 0xf;
-+	  family = (eax >> 8) & 0xf;
-+
-+	  switch(ebx) {
-+	  case 0x756e6547: // Intel
-+	    switch( family ) {
-+	    case 5: // Pentium
-+	      if( model <= 3 )
-+		element="pentium";
-+	      if( model > 3 )
-+		element="pentium-mmx";
-+	      break;
-+	    case 6: // PentiumPro - Pentium III
-+	      if( model == 1 ) // Pentium Pro
-+		element="pentiumpro";
-+	      if( ( model == 3 ) || ( model == 5 ) ||
-+		  ( model == 6 ) ) // Pentium II
-+		element="pentium2";
-+	      if( ( model == 7 ) || ( model == 8 ) ||
-+		  ( model == 10 ) || ( model == 11 ) ) // These are all Pentium III
-+		element="pentium3";
-+	      break;
-+	    case 15: // Pentium4
-+	      if( model == 3 ) // Prescott
-+                element="prescott";
-+	      else
-+	      element="pentium4";
-+	      break;
-+	    default:
-+	      break;
-+	    } // end switch( family )
-+	    break;
-+	  case 0x68747541: // AMD
-+	    switch(family) {
-+	    case 5:
-+	      if( ( model == 0 ) || ( model == 1 ) || 
-+		  ( model == 2 ) || ( model == 3 ) ) // K5
-+		element="i586";
-+	      if( ( model == 6 ) || ( model == 7 ) ) // K6
-+		element="k6";
-+	      if( model == 8 ) // K6-2
-+		element="k6-2";
-+	      if( model == 9 ) // K6-3
-+		element="k6-3";
-+	      break;
-+	    case 6:
-+	      if( model <= 4 )
-+		element="athlon";
-+	      if( model > 4 ) {
-+		sse = has_sse();
-+		if( sse == 0 )
-+		  element="athlon";
-+		if( sse == 1 )
-+		  element="athlon-4";
-+	      }
-+	      break;
-+	    case 15:
-+	      element="athlon-4";
-+	      break;
-+	    default:
-+	      break;
-+	    } // end switch( family )
-+	    break;
-+	  case 0x69727943: // Cyrix
-+	    element="i386"; // who knows what cyrix supports, lets be safe
-+	    break;
-+	  default:
-+	    break;
-+	  } // end switch(ebx)
-+	}
-+
-+#endif
-+      }
- #endif
- #ifdef UNAME_PROCESSOR
-       if (element == unknown)
-@@ -293,7 +406,7 @@
- 
-   if (toprint & PRINT_HARDWARE_PLATFORM)
-     {
-      char const *element = unknown;
-+      char *element = unknown;
- #if HAVE_SYSINFO && defined SI_PLATFORM
-       {
- 	static char hardware_platform[257];
-@@ -301,6 +414,15 @@
- 			  hardware_platform, sizeof hardware_platform))
- 	  element = hardware_platform;
-       }
-+#else
-+      {
-+	struct utsname u;
-+	uname (&u);
-+	element = u.machine;
-+	if (strlen (element) == 4 && element[0] == 'i' && element[2] == '8'
-+	    && element[3] == '6')
-+	  element[1] = '3';
-+      }
- #endif
- #ifdef UNAME_HARDWARE_PLATFORM
-       if (element == unknown)
-@@ -323,3 +445,29 @@
- 
-   exit (EXIT_SUCCESS);
- }
-+
-+#ifdef linux
-+
-+/******************************************************************************
-+ *
-+ * int has_sse( void )
-+ * Checks Athlon CPU's to see if they support SSE.
-+ *
-+ *****************************************************************************/
-+
-+int has_sse( void )
-+{
-+  unsigned long edx, unused;
-+  int sse;
-+  cpuid(1,unused,unused,unused,edx);
-+  // I think, I need this tested on a Duron with SSE
-+  // and one without it.
-+  sse = edx & 0x2000000;
-+  if( sse == 0 ) {
-+    return 0;
-+  } else {
-+    return 1;
-+  }
-+
-+}
-+#endif