Hi ports@,
Here is a diff to update mtr to 0.94.
Notable changes:
- Drop upstream patches which are now part of the release
- Disable new optional dependency on devel/jansson to produce JSON output
- Switch from Gtk+2 to Gtk+3
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/mtr/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile 23 Feb 2021 19:39:33 -0000 1.72
+++ Makefile 1 Sep 2021 13:56:52 -0000
@@ -4,9 +4,8 @@ COMMENT= network diagnostic tool, simila
GH_ACCOUNT= traviscross
GH_PROJECT= mtr
-GH_TAGNAME= v0.93
+GH_TAGNAME= v0.94
EPOCH= 0
-REVISION= 0
CATEGORIES= net
@@ -38,15 +37,16 @@ TEST_DEPENDS= ${MODPY_RUN_DEPENDS}
.if ${FLAVOR} == "gtk"
CONFIGURE_ARGS+= --with-gtk-prefix=${LOCALBASE}
-LIB_DEPENDS+= x11/gtk+2
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z
+LIB_DEPENDS+= x11/gtk+3
+WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
+WANTLIB += pangocairo-1.0 pthread
.else
CONFIGURE_ARGS+= --without-glib \
--without-gtk
.endif
+
+CONFIGURE_ARGS+= --without-jansson
pre-test:
ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/mtr/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 21 Aug 2019 15:23:42 -0000 1.19
+++ distinfo 1 Sep 2021 13:56:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (mtr-0.93.tar.gz) = OhqzMBBN3uMTWvPPpWe5YIABxd7svyAMCLVF7W16TI8=
-SIZE (mtr-0.93.tar.gz) = 142148
+SHA256 (mtr-0.94.tar.gz) = 6gNv3UXaSIwkFgP26lmga7z+bCYXfr00//VDNqRElLg=
+SIZE (mtr-0.94.tar.gz) = 143616
Index: patches/patch-packet_probe_c
===================================================================
RCS file: patches/patch-packet_probe_c
diff -N patches/patch-packet_probe_c
--- patches/patch-packet_probe_c 21 Aug 2019 15:23:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-packet_probe_c,v 1.1 2019/08/21 15:23:42 sthen Exp $
-
-From 9fe183d61f5382bd6dae1df1db6439a27e8edde2 Mon Sep 17 00:00:00 2001
-From: Chongyu Zhu <i...@lembacon.com>
-Date: Tue, 6 Aug 2019 23:01:57 +0800
-Subject: [PATCH] probe: fix find_source_addr
-
-Index: packet/probe.c
---- packet/probe.c.orig
-+++ 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;
- }
Index: patches/patch-packet_probe_unix_c
===================================================================
RCS file: /cvs/ports/net/mtr/patches/patch-packet_probe_unix_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-packet_probe_unix_c
--- patches/patch-packet_probe_unix_c 21 Aug 2019 15:23:42 -0000 1.1
+++ patches/patch-packet_probe_unix_c 1 Sep 2021 13:56:52 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-packet_probe_unix_c,v 1.
Index: packet/probe_unix.c
--- packet/probe_unix.c.orig
+++ packet/probe_unix.c
-@@ -129,7 +129,7 @@ void check_length_order(
+@@ -137,7 +137,7 @@ void check_length_order(
ssize_t bytes_sent;
int packet_size;
@@ -12,21 +12,12 @@ Index: packet/probe_unix.c
/* Linux will accept either byte order and check below fails to work
* in some cases due to sendto() returning EPERM. */
return;
-@@ -797,7 +797,7 @@ void receive_replies_from_recv_socket(
+@@ -805,7 +805,7 @@ void receive_replies_from_recv_socket(
+ }
}
- #endif
-#ifdef SO_PROTOCOL
+#if defined(SO_PROTOCOL) && defined(HAVE_LINUX_ERRQUEUE_H)
if (icmp_connrefused_received) {
/* using ICMP type ICMP_ECHOREPLY is not a bug, it is an
indication of successfully reaching dst host.
-@@ -818,7 +818,7 @@ void receive_replies_from_recv_socket(
- /* ICMP packets received from raw socket */
- handle_received_packet(net_state, &remote_addr, packet,
- packet_length, ×tamp);
--#ifdef SO_PROTOCOL
-+#if defined(SO_PROTOCOL) && defined(HAVE_LINUX_ERRQUEUE_H)
- }
- #endif
- }
Index: patches/patch-ui_dns_c
===================================================================
RCS file: patches/patch-ui_dns_c
diff -N patches/patch-ui_dns_c
--- patches/patch-ui_dns_c 21 Aug 2019 15:23:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-ui_dns_c,v 1.1 2019/08/21 15:23:42 sthen Exp $
-
-From fab26eacaf5484b8dcb4c14084d5d69e7266240f Mon Sep 17 00:00:00 2001
-From: Aaron Lipinski <kris.lipin...@gmail.com>
-Date: Sun, 28 Jul 2019 22:35:39 +1200
-Subject: [PATCH 1/2] show resolved hostname in raw dnsline
-
-From c938dc7725624ddf38710bc30710c6164735cb96 Mon Sep 17 00:00:00 2001
-From: Aaron Lipinski <kris.lipin...@gmail.com>
-Date: Mon, 29 Jul 2019 08:08:51 +1200
-Subject: [PATCH 2/2] rely on final return NULL
-
-Index: ui/dns.c
---- ui/dns.c.orig
-+++ ui/dns.c
-@@ -276,8 +276,6 @@ char *dns_lookup2(
- /* we've got a result. */
- if (r->name)
- return r->name;
-- else
-- return strlongip(ctl, ip);
- } else {
- r = xmalloc(sizeof(struct dns_results));
- memcpy(&r->ip, ip, sizeof(r->ip));
-@@ -289,7 +287,7 @@ char *dns_lookup2(
- if (rv < 0)
- error(0, errno, "couldn't write to resolver process");
- }
-- return strlongip(ctl, ip);
-+ return NULL;
- }
-
-
-@@ -302,7 +300,7 @@ char *dns_lookup(
- if (!ctl->dns || !ctl->use_dns)
- return NULL;
- t = dns_lookup2(ctl, ip);
-- return t;
-+ return t ? t : strlongip(ctl, ip);
- }
-
- /* XXX check if necessary/exported. */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/mtr/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 2 Jun 2017 16:50:16 -0000 1.10
+++ pkg/PLIST 1 Sep 2021 13:56:52 -0000
@@ -8,6 +8,4 @@
@mode 4555
@bin sbin/mtr-packet
@mode
-share/bash-completion/
-share/bash-completion/completions/
share/bash-completion/completions/mtr
