iputils: version bump s20180629 -> s20200821

Switch to meson. This fixes building with gcc 10.
The crypto dependency is replaced by a local md5 implementation.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 38 insertions, 70 deletions

diff --git a/rules/iputils.in b/rules/iputils.in
index d46bb9681..ede632adc 100644
--- a/rules/iputils.in
+++ b/rules/iputils.in
@@ -3,19 +3,21 @@
 menuconfig IPUTILS
 	tristate
 	prompt "iputils                       "
+	select HOST_MESON
 	select LIBC_RESOLV	if IPUTILS_PING
-	select LIBCAP		if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_TRACEROUTE6 || IPUTILS_CLOCKDIFF
-	select LIBGCRYPT	if IPUTILS_GCRYPT
-	select NETTLE		if IPUTILS_NETTLE
-	select OPENSSL		if IPUTILS_OPENSSL
+	select LIBCAP		if IPUTILS_LIBCAP
 	help
 	  The iputils package is set of small useful utilities for Linux
 	  networking.
 
 if IPUTILS
 
+config IPUTILS_LIBCAP
+	bool
+
 config IPUTILS_ARPING
 	bool
+	select IPUTILS_LIBCAP
 	depends on !BUSYBOX_ARPING || ALLYES
 	prompt "arping"
 	help
@@ -27,6 +29,7 @@ comment "BusyBox' arping is selected!"
 
 config IPUTILS_CLOCKDIFF
 	bool
+	select IPUTILS_LIBCAP
 	prompt "clockdiff"
 	help
 	  Measures clock difference between us and destination with 1 msec
@@ -34,6 +37,7 @@ config IPUTILS_CLOCKDIFF
 
 config IPUTILS_PING
 	bool
+	select IPUTILS_LIBCAP
 	depends on (!BUSYBOX_PING && !INETUTILS_PING) || ALLYES
 	prompt "ping"
 	help
@@ -48,39 +52,6 @@ comment "inetutils' ping is selected!"
 comment "BusyBox' ping is selected!"
         depends on BUSYBOX_PING
 
-if GLOBAL_IPV6
-
-choice
-	prompt "crypto library to be used for ping -N"
-	default IPUTILS_NOCRYPTO
-	depends on IPUTILS_PING
-	help
-	  Selecting a crypto library is necessary for ping to support
-	  sending IPv6 Node Information Queries (RFC 4620).
-
-	config IPUTILS_NOCRYPTO
-		bool
-		prompt "none"
-		help
-		  No crypto library is used. This means that ping -N
-		  won't work.
-
-	config IPUTILS_GCRYPT
-		bool
-		prompt "libgcrypt"
-
-	config IPUTILS_NETTLE
-		bool
-		prompt "nettle"
-
-	config IPUTILS_OPENSSL
-		bool
-		prompt "openssl"
-
-endchoice
-
-endif
-
 config IPUTILS_RARPD
 	bool
 	prompt "rarpd"
@@ -120,6 +91,7 @@ config IPUTILS_TRACEPATH
 
 config IPUTILS_TRACEROUTE6
 	bool
+	select IPUTILS_LIBCAP
 	depends on !BUSYBOX_TRACEROUTE6 || ALLYES
 	prompt "traceroute6"
 	depends on GLOBAL_IPV6
diff --git a/rules/iputils.make b/rules/iputils.make
index 910fcd5b3..33fa4826e 100644
--- a/rules/iputils.make
+++ b/rules/iputils.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_IPUTILS) += iputils
 #
 # Paths and names
 #
-IPUTILS_VERSION	:= s20180629
-IPUTILS_MD5	:= 866547f2ffb17b67049472c770703c83
+IPUTILS_VERSION	:= s20200821
+IPUTILS_MD5	:= 85a5ce27f92d8fa2770dd290acd4c1e3
 IPUTILS		:= iputils-$(IPUTILS_VERSION)
 IPUTILS_SUFFIX	:= tar.gz
 IPUTILS_URL	:= http://codeload.github.com/iputils/iputils/$(IPUTILS_SUFFIX)/$(IPUTILS_VERSION)
@@ -28,35 +28,31 @@ IPUTILS_LICENSE_FILES := file://ninfod/COPYING;md5=5e9a325527978995c41e6d9a83f6e
 # Prepare
 # ----------------------------------------------------------------------------
 
-IPUTILS_TOOLS-y					:=
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_ARPING)		+= arping
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_CLOCKDIFF)	+= clockdiff
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_PING)		+= ping
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_RARPD)		+= rarpd
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_RDISC)		+= rdisc
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TFTPD)		+= tftpd
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TRACEPATH)	+= tracepath
-IPUTILS_TOOLS-$(PTXCONF_IPUTILS_TRACEROUTE6)	+= traceroute6
-
-IPUTILS_CONF_TOOL	:= NO
-IPUTILS_MAKEVARS	:= \
-	$(CROSS_ENV) \
-	USE_IDN=no \
-	USE_GCRYPT=$(call ptx/yesno, PTXCONF_IPUTILS_GCRYPT) \
-	USE_NETTLE=$(call ptx/yesno, PTXCONF_IPUTILS_NETTLE) \
-	USE_CRYPTO=$(call ptx/ifdef, PTXCONF_IPUTILS_OPENSSL, shared, no) \
-	TARGETS="$(IPUTILS_TOOLS-y)"
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/iputils.install:
-	@$(call targetinfo)
-	@$(foreach tool,$(IPUTILS_TOOLS-y), \
-		install -D -m755 $(IPUTILS_DIR)/$(tool) \
-			$(IPUTILS_PKGDIR)/usr/bin/$(tool);)
-	@$(call touch)
+IPUTILS_CONF_TOOL	:= meson
+IPUTILS_CONF_OPT	:= \
+	$(CROSS_MESON_USR) \
+	-DBUILD_ARPING=$(call ptx/truefalse, PTXCONF_IPUTILS_ARPING) \
+	-DBUILD_CLOCKDIFF=$(call ptx/truefalse, PTXCONF_IPUTILS_CLOCKDIFF) \
+	-DBUILD_HTML_MANS=false \
+	-DBUILD_MANS=false \
+	-DBUILD_NINFOD=false \
+	-DBUILD_PING=$(call ptx/truefalse, PTXCONF_IPUTILS_PING) \
+	-DBUILD_RARPD=$(call ptx/truefalse, PTXCONF_IPUTILS_RARPD) \
+	-DBUILD_RDISC=$(call ptx/truefalse, PTXCONF_IPUTILS_RDISC) \
+	-DBUILD_TFTPD=$(call ptx/truefalse, PTXCONF_IPUTILS_TFTPD) \
+	-DBUILD_TRACEPATH=$(call ptx/truefalse, PTXCONF_IPUTILS_TRACEPATH) \
+	-DBUILD_TRACEROUTE6=$(call ptx/truefalse, PTXCONF_IPUTILS_TRACEROUTE6) \
+	-DENABLE_RDISC_SERVER=true \
+	-DNINFOD_MESSAGES=true \
+	-DNO_SETCAP_OR_SUID=true \
+	-DSETCAP_OR_SUID_ARPING=false \
+	-DSETCAP_OR_SUID_CLOCKDIFF=false \
+	-DSETCAP_OR_SUID_PING=false \
+	-DSETCAP_OR_SUID_TRACEROUTE6=false \
+	-DUSE_CAP=$(call ptx/truefalse, PTXCONF_IPUTILS_LIBCAP) \
+	-DUSE_GETTEXT=false \
+	-DUSE_IDN=false \
+	-Dsystemdunitdir=/usr/lib/systemd/system
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -71,8 +67,8 @@ $(STATEDIR)/iputils.targetinstall:
 	@$(call install_fixup, iputils,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
 	@$(call install_fixup, iputils,DESCRIPTION,missing)
 
-	@$(foreach tool,$(IPUTILS_TOOLS-y), \
-		$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/$(tool));)
+	@$(call install_tree, iputils, 0, 0, -, /usr/bin)
+	@$(call install_tree, iputils, 0, 0, -, /usr/sbin)
 
 	@$(call install_finish, iputils)