Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jan 2020 04:07:53 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522094 - in head/net/mtr: . files
Message-ID:  <202001050407.00547riE049196@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Jan  5 04:07:53 2020
New Revision: 522094
URL: https://svnweb.freebsd.org/changeset/ports/522094

Log:
  Update to 0.93
  
  Changes:	https://github.com/traviscross/mtr/blob/master/NEWS

Added:
  head/net/mtr/files/patch-packet-probe_unix.c   (contents, props changed)
Deleted:
  head/net/mtr/files/patch-ui-mtr.c
Modified:
  head/net/mtr/Makefile
  head/net/mtr/distinfo

Modified: head/net/mtr/Makefile
==============================================================================
--- head/net/mtr/Makefile	Sun Jan  5 04:07:48 2020	(r522093)
+++ head/net/mtr/Makefile	Sun Jan  5 04:07:53 2020	(r522094)
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mtr
-PORTVERSION=	0.92
-PORTREVISION=	1
+PORTVERSION=	0.93
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net
-MASTER_SITES=	https://www.bitwizard.nl/mtr/files/ \
-		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Traceroute and ping in a single network diagnostic tool
@@ -14,26 +12,27 @@ COMMENT=	Traceroute and ping in a single network diagn
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		autoreconf ncurses pkgconfig
+
+GNU_CONFIGURE=	yes
+LDFLAGS+=	-lncurses
+
+GH_ACCOUNT=	traviscross
+USE_GITHUB=	yes
+
 CONFLICTS_INSTALL?=	mtr-nox11
 
 OPTIONS_DEFINE=	IPV6 X11
 OPTIONS_DEFAULT=X11
 X11_DESC=	Build X11-enabled mtr
 
-USES=		autoreconf ncurses pkgconfig
-
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-lncurses
-
 IPV6_CONFIGURE_ENABLE=	ipv6
 X11_CONFIGURE_WITH=	gtk
 X11_USE=		GNOME=gtk20
 X11_USES=		gnome
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|getopt.*$$(OBJEXT)||g; s|getopt.*[ch]||g; /getopt.*Po/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])|${PORTVERSION}|' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/ui/mtr.c
 
 post-install:
 	@${ECHO_MSG} ""

Modified: head/net/mtr/distinfo
==============================================================================
--- head/net/mtr/distinfo	Sun Jan  5 04:07:48 2020	(r522093)
+++ head/net/mtr/distinfo	Sun Jan  5 04:07:53 2020	(r522094)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496491441
-SHA256 (mtr-0.92.tar.gz) = f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382
-SIZE (mtr-0.92.tar.gz) = 296430
+TIMESTAMP = 1578125689
+SHA256 (traviscross-mtr-v0.93_GH0.tar.gz) = 3a1ab330104ddee3135af3cfa567b9608001c5deecbf200c08b545ed6d7a4c8f
+SIZE (traviscross-mtr-v0.93_GH0.tar.gz) = 142148

Added: head/net/mtr/files/patch-packet-probe_unix.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mtr/files/patch-packet-probe_unix.c	Sun Jan  5 04:07:53 2020	(r522094)
@@ -0,0 +1,25 @@
+--- packet/probe_unix.c.orig	2019-08-03 08:31:26 UTC
++++ packet/probe_unix.c
+@@ -798,6 +798,7 @@ void receive_replies_from_recv_socket(
+ #endif
+ 
+ #ifdef SO_PROTOCOL
++#ifdef 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.
+@@ -815,11 +816,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
+     }
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001050407.00547riE049196>