diffutils: update to 3.5

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/diffutils b/config/rootfiles/common/diffutils
index b00abdb9e33fde40711d58714e9611a567d52cf5..bb02f1b8be652b491c5655e7265fd4a165086327 100644 (file)
--- a/config/rootfiles/common/diffutils
+++ b/config/rootfiles/common/diffutils
@@ -2,10 +2,7 @@ usr/bin/cmp
 usr/bin/diff
 #usr/bin/diff3
 #usr/bin/sdiff
-#usr/info
-#usr/info/diff.info
-#usr/info/dir
-#usr/man/man1/cmp.1
-#usr/man/man1/diff.1
-#usr/man/man1/diff3.1
-#usr/man/man1/sdiff.1
+#usr/share/info/diffutils.info
+#usr/share/man/man1/cmp.1
+#usr/share/man/man1/diff3.1
+#usr/share/man/man1/sdiff.1

diff --git a/lfs/diffutils b/lfs/diffutils
index 3e96c67655b01e65e34541cfb2ba7502e0c218e7..c8dc42f9090dc970e8f911f35eb7b38636dae936 100644 (file)
--- a/lfs/diffutils
+++ b/lfs/diffutils
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.8.1
+VER        = 3.5
 
 THISAPP    = diffutils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -53,7 +53,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 71f9c5ae19b60608f6c7f162da86a428
+$(DL_FILE)_MD5 = 569354697ff1cfc9a9de3781361015fa
 
 install : $(TARGET)
 
@@ -82,11 +82,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-i18n-1.patch
-       cd $(DIR_APP) && touch man/diff.1
-endif
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install