iputils: update to 20190515.

srcpkgs/iputils/patches/fix-musl-defines.patch

@@ -1,13 +0,0 @@
---- a/ping.h
-+++ b/ping.h
-@@ -44,6 +44,10 @@
- #define getnameinfo_flags 0
- #endif
- 
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+
- #ifndef WITHOUT_IFADDRS
- #include <ifaddrs.h>
- #endif

srcpkgs/iputils/patches/setcap.patch

@@ -0,0 +1,67 @@
+From 473be6467f995865244e7e68b2fa587a4ee79551 Mon Sep 17 00:00:00 2001
+From: Michael Weiss <dev.primeos@gmail.com>
+Date: Thu, 16 May 2019 09:44:27 +0000
+Subject: [PATCH] build-sys: Make setcap really optional
+
+The setcap dependency is marked as optional but meson.build depends on
+setcap.path():
+
+meson.build:246:7: ERROR:  add_install_script args must be strings
+---
+ meson.build | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git meson.build meson.build
+index 8af9e18..95c778a 100644
+--- meson.build
++++ meson.build
+@@ -221,10 +221,13 @@ config_h = configure_file(
+ setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
+ if get_option('NO_SETCAP_OR_SUID')
+ 	perm_type = 'none'
++	setcap_path = '/dev/null'
+ elif cap_dep.found() and setcap.found()
+ 	perm_type = 'caps'
++	setcap_path = setcap.path()
+ else
+ 	perm_type = 'setuid'
++	setcap_path = '/dev/null'
+ endif
+ 
+ ############################################################
+@@ -243,7 +246,7 @@ if build_ping == true
+ 		join_paths(get_option('prefix'), get_option('bindir')),
+ 		'ping',
+ 		perm_type,
+-		setcap.path()
++		setcap_path
+ 	)
+ endif
+ 
+@@ -263,7 +266,7 @@ if build_traceroute6 == true
+ 		join_paths(get_option('prefix'), get_option('bindir')),
+ 		'traceroute6',
+ 		perm_type,
+-		setcap.path()
++		setcap_path
+ 	)
+ endif
+ 
+@@ -276,7 +279,7 @@ if build_clockdiff == true
+ 		join_paths(get_option('prefix'), get_option('bindir')),
+ 		'clockdiff',
+ 		perm_type,
+-		setcap.path()
++		setcap_path
+ 	)
+ endif
+ 
+@@ -306,7 +309,7 @@ if build_arping == true
+ 		join_paths(get_option('prefix'), get_option('bindir')),
+ 		'arping',
+ 		perm_type,
+-		setcap.path()
++		setcap_path
+ 	)
+ endif
+ 

srcpkgs/iputils/template

@@ -1,17 +1,20 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20180629
+version=20190515
-revision=3
+revision=1
-patch_args="-Np1"
 wrksrc="${pkgname}-s${version}"
+build_style=meson
+configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
+ -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel libressl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/s${version}.tar.gz"
+distfiles="https://github.com/iputils/iputils/archive/s${version}.tar.gz"
-checksum=da14105291dd491f28ea91ade854ed10aee8ba019641c80eed233de3908be7c5
+checksum=9b5125eb5ef9f4e947ad8fdddcf77f538f53b8f47b53eb5bc5347cb16d01c8fd
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
@@ -19,21 +22,8 @@ alternatives="
  ping6:ping6:/usr/bin/${pkgname}-ping
  ping6:ping6.8:/usr/share/man/man8/${pkgname}-ping.8"
 
-do_build() {
+post_install() {
-	make CC="$CC" LD="$LD" CCOPTOPT="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		USE_NETTLE=no USE_GNUTLS=no USE_GCRYPT=no USE_IDN=no \
-		${makejobs} \
-		arping clockdiff ping rdisc tracepath
-}
-
-do_install() {
-	vbin ping ${pkgname}-ping
-	for f in clockdiff arping rdisc tracepath; do
-		vbin ${f}
-	done
-	for f in clockdiff arping ping rdisc tracepath; do
-		vman doc/${f}.8
-	done
 	mv ${DESTDIR}/usr/share/man/man8/{ping,${pkgname}-ping}.8
-	vlicense LICENSE.BSD3
+	mv ${DESTDIR}/usr/bin/{ping,${pkgname}-ping}
+	vlicense Documentation/LICENSE.BSD3
 }