From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] iputils: update to 20210202
Date: Sun, 23 May 2021 17:40:46 +0200
Message-ID: <49e795b9-3458-8a8a-cb4a-a49b579e6abe@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3346304193012322816=="
List-Id: <development.lists.ipfire.org>

--===============3346304193012322816==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

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(a)ipfire.org>
---
 config/rootfiles/common/iputils | 12 ++++++++++++
 lfs/iputils                     | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/iputils b/config/rootfiles/common/iputils
index 3484cbb24..37e0cb603 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 ae692df7a..01ed1fccd 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
-- 
2.26.2

--===============3346304193012322816==--