From 3bc4cab4a842e39c154ec4702cc82dd021a4019f Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Tue, 29 Sep 2020 18:15:38 +0000
Subject: [PATCH] Update to 0.94

Changes:	https://github.com/traviscross/mtr/blob/master/NEWS
---
 net/mtr/Makefile                        |  3 +--
 net/mtr/distinfo                        |  6 +++---
 net/mtr/files/patch-packet-probe.c      | 20 --------------------
 net/mtr/files/patch-packet-probe_unix.c | 25 -------------------------
 4 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 net/mtr/files/patch-packet-probe.c
 delete mode 100644 net/mtr/files/patch-packet-probe_unix.c

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 3c21cc4b78e6..adc9edff7158 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mtr
-PORTVERSION=	0.93
+PORTVERSION=	0.94
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index a4fc4bdbecd5..558750b9aac8 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578125689
-SHA256 (traviscross-mtr-v0.93_GH0.tar.gz) = 3a1ab330104ddee3135af3cfa567b9608001c5deecbf200c08b545ed6d7a4c8f
-SIZE (traviscross-mtr-v0.93_GH0.tar.gz) = 142148
+TIMESTAMP = 1601319670
+SHA256 (traviscross-mtr-v0.94_GH0.tar.gz) = ea036fdd45da488c241603f6ea59a06bbcfe6c26177ebd34fff54336a44494b8
+SIZE (traviscross-mtr-v0.94_GH0.tar.gz) = 143616
diff --git a/net/mtr/files/patch-packet-probe.c b/net/mtr/files/patch-packet-probe.c
deleted file mode 100644
index cd3b77597e49..000000000000
--- a/net/mtr/files/patch-packet-probe.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- packet/probe.c.orig	2019-08-03 08:31:26 UTC
-+++ packet/probe.c
-@@ -323,7 +323,7 @@ int find_source_addr(
-        anything to the port.
-      */
-     *sockaddr_port_offset(&dest_with_port) = htons(1);
--    len = sockaddr_addr_size(&dest_with_port);
-+    len = sockaddr_size(&dest_with_port);
- 
-     sock = socket(destaddr->ss_family, SOCK_DGRAM, IPPROTO_UDP);
-     if (sock == -1) {
-@@ -364,7 +364,7 @@ int find_source_addr(
-        Zero the port, as we may later use this address to finding, and
-        we don't want to use the port from the socket we just created.
-      */
--    *sockaddr_port_offset(&srcaddr) = 0;
-+    *sockaddr_port_offset(srcaddr) = 0;
- 
-     return 0;
- }
diff --git a/net/mtr/files/patch-packet-probe_unix.c b/net/mtr/files/patch-packet-probe_unix.c
deleted file mode 100644
index 576c65856322..000000000000
--- a/net/mtr/files/patch-packet-probe_unix.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- packet/probe_unix.c.orig	2019-08-03 08:31:26 UTC
-+++ packet/probe_unix.c
-@@ -795,7 +795,6 @@ void receive_replies_from_recv_socket(
-                 memcpy(&remote_addr, SO_EE_OFFENDER(ee), sizeof(remote_addr));
-             }
-         }
--#endif
- 
- #ifdef SO_PROTOCOL
-         if (icmp_connrefused_received) {
-@@ -815,11 +814,14 @@ void receive_replies_from_recv_socket(
-                     packet, packet_length, &timestamp);
-         } else {
- #endif
-+#endif
-             /* ICMP packets received from raw socket */
-             handle_received_packet(net_state, &remote_addr, packet,
-                                    packet_length, &timestamp);
- #ifdef SO_PROTOCOL
-+#ifdef HAVE_LINUX_ERRQUEUE_H
-         }
-+#endif
- #endif
-     }
- }