Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtr: Update to 0.92 and switch to tarball

Browse source 
Should be faster.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-07-16 10:20:44 -07:00 committed by Jonathan McCrohan
parent 84197cc5d0
commit 0264b90152
2 changed files with 8 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/mtr/Makefile
View file

@ -8,21 +8,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mtr
PKG_REV:=dd2b75080bc5406ba0b438953b36b72204ba114b
PKG_VERSION:=0.85+newdns-$(PKG_REV)
PKG_RELEASE:=2
PKG_VERSION:=0.92
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/traviscross/mtr.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=4911c96ee4b3c31692664a845dccddabdfef107646d4861b21fd4053bd2b76e8
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/traviscross/mtr/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=568a52911a8933496e60c88ac6fea12379469d7943feb9223f4337903e4bc164
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
@ -34,7 +33,6 @@ define Package/mtr
DEPENDS:=+libncurses
TITLE:=Full screen ncurses traceroute tool
URL:=http://www.bitwizard.nl/mtr/
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
endef
define Package/mtr/description

49
net/mtr/patches/100-disabled-ipv6-fix.patch
View file

@ -1,49 +0,0 @@
--- a/net.c
+++ b/net.c
@@ -307,9 +307,11 @@ void net_send_tcp(int index)
struct sockaddr_storage local;
struct sockaddr_storage remote;
struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
- struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
+#ifdef ENABLE_IPV6
+ struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
+#endif
socklen_t len;
ttl = index + 1;
@@ -566,8 +568,10 @@ void net_send_query(int index)
/* sendto() assumes packet length includes the IPv4 header but not the
IPv6 header. */
- spacketsize = abs(packetsize) -
- ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
+ spacketsize = abs(packetsize);
+#ifdef ENABLE_IPV6
+ spacketsize -= ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
+#endif
rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
/* Try the first packet again using host byte order. */
--- a/dns.c
+++ b/dns.c
@@ -49,7 +49,7 @@
#include <unistd.h>
#include <fcntl.h>
//#include <ctype.h>
-//#include <string.h>
+#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
--- a/net.h
+++ b/net.h
@@ -20,6 +20,7 @@
#include <netdb.h>
#include <arpa/inet.h>
#include <netinet/in.h>
+#include <sys/select.h>
#include <sys/socket.h>
#ifdef ENABLE_IPV6
#include <netinet/ip6.h>