X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Futil-linux;h=7f69e67514bfbedcd5df82ee18a6d24c306e4ab3;hp=a39416601dc95d633a078e03e1446e8b6da3a34b;hb=d0bd5afe1b27020b41d0e7e043578e313a0ebf39;hpb=b7d60471a2c50eae9a8783d833c634d5e32f8393

diff --git a/lfs/util-linux b/lfs/util-linux
index a39416601d..7f69e67514 100644
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013   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        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.12r
+VER        = 2.24
 
 THISAPP    = util-linux-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9
+$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
 
 install : $(TARGET)
 
@@ -69,15 +69,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/util-linux-2.12r-umount-no-special.patch
-	cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-				hwclock/hwclock.c
-	-mkdir -p /var/lib/hwclock
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-cramfs-1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/util-linux-buildfix.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure
 	cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes HAVE_SLN=yes
 	cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
+	# Install fstrim cronjob
+	mkdir -p /etc/fcron.daily
+	install -m 0755 $(DIR_SRC)/config/fstrim/trim /etc/fcron.daily/trim
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)