aboutsummaryrefslogtreecommitdiffstats
path: root/main/iputils
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2018-07-11 23:32:15 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2018-07-13 12:41:59 +0000
commit7bee3031171d3c3e2edf13d65af70e0e5f18d4ec (patch)
tree7a02ae19d138ebdf279c87657624643882475187 /main/iputils
parentaacf426a751c7c3f08ca95f3f49672a012070265 (diff)
downloadaports-7bee3031171d3c3e2edf13d65af70e0e5f18d4ec.tar.bz2
aports-7bee3031171d3c3e2edf13d65af70e0e5f18d4ec.tar.xz
main/iputils: upgrade to 20180629
Diffstat (limited to 'main/iputils')
-rw-r--r--main/iputils/APKBUILD12
-rw-r--r--main/iputils/fix-defines.patch13
-rw-r--r--main/iputils/time.patch10
3 files changed, 19 insertions, 16 deletions
diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD
index 7c4bbf9ad2..fc463ad96a 100644
--- a/main/iputils/APKBUILD
+++ b/main/iputils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iputils
-pkgver=20161105
-pkgrel=1
+pkgver=20180629
+pkgrel=0
pkgdesc="IP Configuration Utilities (and Ping)"
url="https://github.com/iputils/iputils/"
arch="all"
@@ -9,8 +9,8 @@ license="BSD-3-Clause GPL-2.0-or-later"
makedepends="libcap-dev libressl-dev"
replaces="bbsuid"
source="https://github.com/iputils/$pkgname/archive/s$pkgver.tar.gz
- time.patch
fix-init-of-cmsg.patch
+ fix-defines.patch
"
options="!check suid"
builddir="$srcdir/$pkgname-s$pkgver"
@@ -37,6 +37,6 @@ package() {
ln -s ping "$pkgdir"/bin/ping6
}
-sha512sums="1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797 s20161105.tar.gz
-530532d16574921d0789af6a82706915e8103e712195c4f2eb6379192cc7126ba6bc9f33e8454118628d59f8932ffd2bb5aaba3b61fa93df83088e3b0d93d227 time.patch
-2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf fix-init-of-cmsg.patch"
+sha512sums="16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 s20180629.tar.gz
+2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf fix-init-of-cmsg.patch
+85c766b2cd738aeedb8dda8100af5814d9c0b4b62d6e98ca4329e3d34b19845e34bde772ca27e79360b7911cdb51bad11ca8f7717a367286c08243471fb32c47 fix-defines.patch"
diff --git a/main/iputils/fix-defines.patch b/main/iputils/fix-defines.patch
new file mode 100644
index 0000000000..13a2060327
--- /dev/null
+++ b/main/iputils/fix-defines.patch
@@ -0,0 +1,13 @@
+--- 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
diff --git a/main/iputils/time.patch b/main/iputils/time.patch
deleted file mode 100644
index 1d6033f7af..0000000000
--- a/main/iputils/time.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./tracepath.c.orig
-+++ ./tracepath.c
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <time.h>
- #include <sys/socket.h>
- #include <linux/types.h>
- #include <linux/errqueue.h>