X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcoreutils;h=63d0a889823900ce3170771a354a9d53f5c53fb0;hb=b9f4c9f85f8072048cd835d5a0d913eeb926d2c5;hp=5c0284c7ed1305c2460e65f5230111515e20892e;hpb=857d9bf244354fcc0899ba19073135541bd82596;p=ipfire-2.x.git

diff --git a/lfs/coreutils b/lfs/coreutils
index 5c0284c7ed..63d0a88982 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,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)
 
@@ -37,16 +35,23 @@ 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 --host=$(MACHINE)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  CONFIGURE_OPTIONS = --prefix=/tools
 endif
 
+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,20 +89,12 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch
-	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
+	@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)" ""
-	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
@@ -105,16 +102,8 @@ ifeq "$(ROOT)" ""
 	mv -v /usr/bin/{head,sleep,nice} /bin
 	ln -sf test /bin/[
 	#ln -sf ../../bin/install /usr/bin
-	mv -f /bin/uname /bin/uname.bak
-	echo '#!/bin/bash'				>  /bin/uname
-	echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname
-	chmod 755 /bin/uname
-else
-	rm /tools/bin/hostname
-	mv -f /tools/bin/uname /tools/bin/uname.bak
-	echo '#!/bin/bash'					>  /tools/bin/uname
-	echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g''	>> /tools/bin/uname
-	chmod 755 /tools/bin/uname
+	dircolors -p > /etc/DIR_COLORS
 endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)