From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] diffutils: update to 3.3
Date: Sat, 28 May 2016 20:49:58 +0200
Message-ID: <1464461398-20283-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3624976529980661811=="
List-Id: <development.lists.ipfire.org>

--===============3624976529980661811==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 config/rootfiles/common/diffutils | 11 ++++-------
 lfs/diffutils                     | 15 +++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/config/rootfiles/common/diffutils b/config/rootfiles/common/diff=
utils
index b00abdb..bb02f1b 100644
--- 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 3e96c67..6cac7f3 100644
--- a/lfs/diffutils
+++ b/lfs/diffutils
@@ -24,10 +24,10 @@
=20
 include Config
=20
-VER        =3D 2.8.1
+VER        =3D 3.3
=20
 THISAPP    =3D diffutils-$(VER)
-DL_FILE    =3D $(THISAPP).tar.gz
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
=20
@@ -53,7 +53,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 71f9c5ae19b60608f6c7f162da86a428
+$(DL_FILE)_MD5 =3D 99180208ec2a82ce71f55b0d7389f1b3
=20
 install : $(TARGET)
=20
@@ -82,11 +82,10 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(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)
+#ifeq "$(ROOT)" ""
+#	cd $(DIR_APP) && touch man/diff.1
+#endif
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
--=20
1.9.1


--===============3624976529980661811==--