From: Petr Vorel <petr.vorel@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Petr Vorel <petr.vorel@gmail.com>,
	Natanael Copa <ncopa@alpinelinux.org>
Subject: [PATCH 2/2] main/iputils: Don't build legacy tools
Date: Wed, 15 Dec 2021 19:54:55 +0100
Message-Id: <20211215185455.5073-2-petr.vorel@gmail.com>
In-Reply-To: <20211215185455.5073-1-petr.vorel@gmail.com>
References: <20211215185455.5073-1-petr.vorel@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

ninfod, rarpd, rdisc are legacy tools which are going to be removed from
upstream in next release [1], following previous removals [2].
Remove them now from Alpine.

[1] https://github.com/iputils/iputils/pull/388
[2] https://github.com/iputils/iputils/issues/363

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 main/iputils/APKBUILD | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD
index e0da44b8a5..a944d603b7 100644
--- a/main/iputils/APKBUILD
+++ b/main/iputils/APKBUILD
@@ -14,7 +14,9 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/iputils/iputils/archive/$pkg
 build() {
 	abuild-meson \
 		-DNO_SETCAP_OR_SUID=true \
-		-DBUILD_RARPD=true \
+		-DBUILD_NINFOD=false \
+		-DBUILD_RARPD=false \
+		-DBUILD_RDISC=false \
 		-DBUILD_MANS=false \
 		-DUSE_IDN=false \
 		-DUSE_GETTEXT=false \
@@ -26,14 +28,11 @@ package() {
 	local name
 	cd "$builddir"/build
 
-	for name in arping clockdiff rarpd rdisc tracepath; do
+	for name in arping clockdiff tracepath; do
 		install -D -m755 $name "$pkgdir"/usr/sbin/${name##*/}
 	done
-	install -D -m755 ninfod/ninfod "$pkgdir"/usr/sbin/ninfod
 
-	for name in ping/ping; do
-		install -D -m4755 $name "$pkgdir"/bin/${name##*/}
-	done
+	install -D -m4755 ping/ping "$pkgdir"/bin/ping
 
 	ln -s tracepath "$pkgdir"/usr/sbin/tracepath6
 	ln -s ping "$pkgdir"/bin/ping6
-- 
2.34.1