Revert upgrade to 0.92 due to mtr not working.

See PR pkg/52323.

5 files changed, 61 insertions, 7 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 61b69da7da2..e60b92c585f 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2017/06/14 20:26:56 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2017/06/26 14:41:37 wiz Exp $
 
-DISTNAME=	mtr-0.92
+DISTNAME=	mtr-0.87
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/
 
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index fc4e4de99d2..5f075c70d70 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.47 2017/06/14 20:26:56 wiz Exp $
+$NetBSD: distinfo,v 1.48 2017/06/26 14:41:37 wiz Exp $
 
-SHA1 (mtr-0.92.tar.gz) = 3d568bf712bb1257390375c6953589004aa56c39
-RMD160 (mtr-0.92.tar.gz) = 7a697e13abfb12e50af43c6d493098dc0a7fe803
-SHA512 (mtr-0.92.tar.gz) = d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f
-Size (mtr-0.92.tar.gz) = 296430 bytes
+SHA1 (mtr-0.87.tar.gz) = afd192a765116f3d44e4bada9e11d4ccd79acefc
+RMD160 (mtr-0.87.tar.gz) = 9cc760ec31113462f9aeff94b3ba1af1cb4ed994
+SHA512 (mtr-0.87.tar.gz) = 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
+Size (mtr-0.87.tar.gz) = 184645 bytes
+SHA1 (patch-asn.c) = 37aec0ccc296122c93d60f7b5397fd5a61c94e86
+SHA1 (patch-net.c) = b8a88ef7c4bad7cfbb502e60e12fd84b90e601dd
+SHA1 (patch-net.h) = b5209872236f078e29e124988324ab0be870c45c
diff --git a/net/mtr/patches/patch-asn.c b/net/mtr/patches/patch-asn.c
new file mode 100644
index 00000000000..3208c2bbf81
--- /dev/null
+++ b/net/mtr/patches/patch-asn.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-asn.c,v 1.7 2017/06/26 14:41:37 wiz Exp $
+
+Fix build on Darwin.
+
+--- asn.c.orig	2017-02-17 02:50:57.000000000 +0000
++++ asn.c
+@@ -23,9 +23,6 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ 
+-#ifdef __APPLE__
+-#define BIND_8_COMPAT
+-#endif
+ #include <arpa/nameser.h>
+ #ifdef HAVE_ARPA_NAMESER_COMPAT_H
+ #include <arpa/nameser_compat.h>
diff --git a/net/mtr/patches/patch-net.c b/net/mtr/patches/patch-net.c
new file mode 100644
index 00000000000..681a4e6752b
--- /dev/null
+++ b/net/mtr/patches/patch-net.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-net.c,v 1.3 2017/06/26 14:41:37 wiz Exp $
+
+Fix build on SunOS.
+--- net.c.orig	2013-04-29 18:22:05.000000000 +0000
++++ net.c
+@@ -38,6 +38,9 @@
+ #include <math.h>
+ #include <errno.h>
+ #include <string.h>
++#ifdef __sun
++#include <sys/filio.h>
++#endif
+ 
+ #include "mtr.h"
+ #include "net.h"
diff --git a/net/mtr/patches/patch-net.h b/net/mtr/patches/patch-net.h
new file mode 100644
index 00000000000..61fe085cea2
--- /dev/null
+++ b/net/mtr/patches/patch-net.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-net.h,v 1.4 2017/06/26 14:41:37 wiz Exp $
+
+Assumes that SCTP is available everywhere.
+At least let it compile on older systems.
+https://github.com/traviscross/mtr/issues/141
+
+--- net.h.orig	2014-12-09 11:19:43.000000000 +0000
++++ net.h
+@@ -26,6 +26,10 @@
+ #include <netinet/icmp6.h>
+ #endif
+ 
++#ifndef IPPROTO_SCTP
++#define	IPPROTO_SCTP	132
++#endif
++
+ int net_preopen(void);
+ int net_selectsocket(void);
+ int net_open(struct hostent *host);