Commit a19bffc9 authored by Milan P. Stanić's avatar Milan P. Stanić
Browse files

main/iputils: upgrade to 20190709

build with meson because upstream switched to it
change source to github.com where development is moved
remove obsolete patches
parent 014320aa
Pipeline #1322 passed with stages
in 1 minute and 4 seconds
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iputils
pkgver=20180629
pkgrel=1
pkgver=20190709
pkgrel=0
pkgdesc="IP Configuration Utilities (and Ping)"
url="https://github.com/iputils/iputils/"
arch="all"
license="BSD-3-Clause GPL-2.0-or-later"
makedepends="libcap-dev openssl-dev"
makedepends="libcap-dev openssl-dev meson"
replaces="bbsuid"
source="https://github.com/iputils/$pkgname/archive/s$pkgver.tar.gz
fix-init-of-cmsg.patch
fix-defines.patch
"
source="https://github.com/iputils/$pkgname/archive/s$pkgver.tar.gz"
options="!check suid"
builddir="$srcdir/$pkgname-s$pkgver"
build() {
cd "$builddir"
make all ninfod USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/usr/include
meson \
--buildtype=plain \
--prefix="/usr" \
--sbindir="bin" \
-DNO_SETCAP_OR_SUID=true \
-DBUILD_RARPD=true \
-DBUILD_TRACEROUTE6=true \
-DBUILD_MANS=false \
-DUSE_IDN=false \
-DUSE_GETTEXT=false \
"build"
ninja -C "build"
}
package() {
local name
cd "$builddir"
cd "$builddir"/build
for name in arping clockdiff ipg rarpd rdisc tftpd tracepath; do
for name in arping clockdiff rarpd rdisc tftpd tracepath; do
install -D -m755 $name "$pkgdir"/usr/sbin/$name
done
install -D -m755 ninfod/ninfod "$pkgdir"/usr/sbin/ninfod
......@@ -37,6 +46,4 @@ package() {
ln -s ping "$pkgdir"/bin/ping6
}
sha512sums="16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 s20180629.tar.gz
2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf fix-init-of-cmsg.patch
85c766b2cd738aeedb8dda8100af5814d9c0b4b62d6e98ca4329e3d34b19845e34bde772ca27e79360b7911cdb51bad11ca8f7717a367286c08243471fb32c47 fix-defines.patch"
sha512sums="5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5 s20190709.tar.gz"
--- 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
Fixes ping on s390x.
diff --git a/ping.c b/ping.c
index a0857a1..329553d 100644
--- a/ping.c
+++ b/ping.c
@@ -108,8 +108,11 @@ static int parsetos(char *str);
static struct {
struct cmsghdr cm;
struct in_pktinfo ipi;
-} cmsg = { {sizeof(struct cmsghdr) + sizeof(struct in_pktinfo), SOL_IP, IP_PKTINFO},
- {0, }};
+} cmsg = { .cm = {
+ .cmsg_len = sizeof(struct cmsghdr) + sizeof(struct in_pktinfo),
+ .cmsg_level = SOL_IP,
+ .cmsg_type = IP_PKTINFO},
+ .ipi = {0, }};
int cmsg_len;
struct sockaddr_in source;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment