From 5594bf3fd4805ff168d1adf275febeb170239c06 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Mon, 3 Jan 2022 15:45:12 +0100
Subject: iputils: 20210722 -> 20211215

---
 iputils/.footprint |  9 ---------
 iputils/.signature |  9 ++++-----
 iputils/Pkgfile    | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'iputils')

diff --git a/iputils/.footprint b/iputils/.footprint
index 4e49c1fab..dfc97e978 100644
--- a/iputils/.footprint
+++ b/iputils/.footprint
@@ -4,7 +4,6 @@ drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/arping
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwsr-xr-x	root/root	usr/bin/traceroute6
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/clockdiff
 -rwxr-xr-x	root/root	usr/sbin/ninfod
@@ -14,11 +13,3 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/arping.8.gz
--rw-r--r--	root/root	usr/share/man/man8/clockdiff.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ninfod.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ping.8.gz
--rw-r--r--	root/root	usr/share/man/man8/rarpd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/rdisc.8.gz
--rw-r--r--	root/root	usr/share/man/man8/tracepath.8.gz
--rw-r--r--	root/root	usr/share/man/man8/traceroute6.8.gz
diff --git a/iputils/.signature b/iputils/.signature
index b770d411c..f072ee62b 100644
--- a/iputils/.signature
+++ b/iputils/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SJ44S+NeAmYn0NhdE1hlzFHKhLE28+zB4OyCXzk+WVhN6mgWUMahtB71Cz93gKrQg4jyGIV/Z/+dgcf4dtJIQU=
-SHA256 (Pkgfile) = 26e9651e4d0ac8a2152a5b8bdaae9448e5eb58748b90979b5c5b85fd802052ed
-SHA256 (.footprint) = 43939b63c3bfc9cf8414b95ebaf536426c9dad9e972a6a8baf6f74c00947c372
-SHA256 (iputils-20210722.tar.gz) = 6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
-SHA256 (iputils-man-20210722.tar.xz) = a58f140078723c74ac5b014694e40433b665ee1bd57c693e27e3ba665bc9650c
+RWSE3ohX2g5d/R91N9FoG3bVC5InoV/FKkmWsGyQRjP/GFRkbfzEu23bH/dbUiRmBnmZfJi9wExoS6QMRAC6HP/f8+QypyZU1A4=
+SHA256 (Pkgfile) = 476b629a98fac91a6adec99a2247ea5635779fb55aa2dd58289025a94e8a0f59
+SHA256 (.footprint) = de8587e29daaf6976b9d2a66b5818259af5e47b8605d6da4d5bd8a5ad2b0237e
+SHA256 (iputils-20211215.tar.gz) = b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf
diff --git a/iputils/Pkgfile b/iputils/Pkgfile
index cfd7637b4..4a29d068f 100644
--- a/iputils/Pkgfile
+++ b/iputils/Pkgfile
@@ -4,10 +4,10 @@
 # Depends on: libcap openssl meson ninja
 
 name=iputils
-version=20210722
+version=20211215
 release=1
-source=(https://github.com/iputils/iputils/archive/$version/$name-$version.tar.gz
-	$name-man-$version.tar.xz)
+source=(https://github.com/iputils/iputils/archive/$version/$name-$version.tar.gz)
+	#$name-man-$version.tar.xz)
 
 build() {
 	cd $name-$version
@@ -15,9 +15,11 @@ build() {
 	meson setup build . \
 		--prefix=/usr \
 		--buildtype=plain \
-		-D BUILD_MANS=false \
-		-D BUILD_TRACEROUTE6=true \
-		-D BUILD_RARPD=true
+		--wrap-mode nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D BUILD_RARPD=true \
+		-D BUILD_MANS=false
 
 	meson compile -C build -j ${JOBS:-1}
 
@@ -26,8 +28,7 @@ build() {
 	install build/arping $PKG/sbin/
 	install build/{tracepath,clockdiff,rdisc,rarpd} $PKG/usr/sbin/
 	install build/ninfod/ninfod $PKG/usr/sbin/
-	install build/traceroute6 $PKG/usr/bin/
-	install -m 0644 $SRC/*.8 $PKG/usr/share/man/man8
+	#install -m 0644 $SRC/*.8 $PKG/usr/share/man/man8
 
-	chmod u+s $PKG/bin/ping $PKG/usr/bin/traceroute6
+	chmod u+s $PKG/bin/ping
 }
-- 
cgit v1.2.3