From: Peter Müller <peter.mueller@ipfire.org>
Date: Sun, 23 May 2021 15:40:46 +0000 (+0200)
Subject: iputils: update to 20210202
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=cf4b5b40a13b5edc8a91f2d5ce34c18bda437e85

iputils: update to 20210202

The changelog between version "s20160803" is too large to include it
here, please refer to https://github.com/iputils/iputils/releases for a
human-readable version.

Due to build system changes, single binaries cannot be compiled by
running "make [program]" anymore, updated rootfiles to reflect that
change.

20210202's version of /usr/bin/ping is bug-compatible to s20160803's
one, hence does not cause trouble in ~/src/ppp/ip-up. Tested, works.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/iputils b/config/rootfiles/common/iputils
index 3484cbb244..37e0cb6037 100644
--- a/config/rootfiles/common/iputils
+++ b/config/rootfiles/common/iputils
@@ -1,3 +1,15 @@
 bin/ping
+#etc/rc.d/init.d/ninfod.sh
+#usr/bin/arping
+#usr/bin/clockdiff
 usr/bin/ping
 usr/bin/tracepath
+#usr/sbin/ninfod
+#usr/sbin/rdisc
+#usr/share/locale/de/LC_MESSAGES/iputils.mo
+#usr/share/locale/fr/LC_MESSAGES/iputils.mo
+#usr/share/locale/ja/LC_MESSAGES/iputils.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/iputils.mo
+#usr/share/locale/tr/LC_MESSAGES/iputils.mo
+#usr/share/locale/uk/LC_MESSAGES/iputils.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/iputils.mo
diff --git a/lfs/iputils b/lfs/iputils
index ae692df7ad..01ed1fccd5 100644
--- a/lfs/iputils
+++ b/lfs/iputils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = s20160308
+VER        = 20210202
 
 THISAPP    = iputils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a3ff521e21a383f562c2f06472c5bca0
+$(DL_FILE)_MD5 = ba8f64ba70ac4717a1ae6746d452b3da
 
 install : $(TARGET)
 
@@ -70,9 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make ping tracepath
-	cd $(DIR_APP) && install -m 0755 ping /usr/bin
-	cd $(DIR_APP) && install -m 0755 tracepath /usr/bin
+	cd $(DIR_APP) && meson builddir -Dprefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 
 	# Allow execution of /usr/bin/ping by other users than "root"
 	setcap cap_net_raw+ep /usr/bin/ping