From 7f882c6d68b6b7e2d6fdcac0b2c6ebab77473572 Mon Sep 17 00:00:00 2001 From: aanriot Date: Mon, 26 Jun 2006 20:39:16 +0000 Subject: [PATCH] maintenance update to 0.71, some changes have been merged upstream. ok jakob@ --- net/mtr/Makefile | 11 +++++------ net/mtr/distinfo | 8 ++++---- net/mtr/patches/patch-configure | 12 ++++++++++++ net/mtr/patches/patch-dns_c | 31 ------------------------------- net/mtr/patches/patch-net_c | 28 ---------------------------- 5 files changed, 21 insertions(+), 69 deletions(-) create mode 100644 net/mtr/patches/patch-configure delete mode 100644 net/mtr/patches/patch-dns_c delete mode 100644 net/mtr/patches/patch-net_c diff --git a/net/mtr/Makefile b/net/mtr/Makefile index efa3e44df7b..59ba9f61fc0 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.30 2006/02/02 18:49:17 jakob Exp $ +# $OpenBSD: Makefile,v 1.31 2006/06/26 20:39:16 aanriot Exp $ COMMENT= "Matt's traceroute - network diagnostic tool" -VERSION= 0.69 +VERSION= 0.71 DISTNAME= mtr-${VERSION} CATEGORIES= net @@ -16,12 +16,11 @@ PERMIT_DISTFILES_CDROM= yes PERMIT_DISTFILES_FTP= yes WANTLIB= c m termcap -MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \ - ftp://ftp.lysator.liu.se/mirror/unix/mtr/ +MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE=gnu -FLAVORS= no_x11 +FLAVORS= no_x11 FLAVOR?= .if ${FLAVOR:L} == "no_x11" diff --git a/net/mtr/distinfo b/net/mtr/distinfo index 6ff0978a907..59742f83c66 100644 --- a/net/mtr/distinfo +++ b/net/mtr/distinfo @@ -1,4 +1,4 @@ -MD5 (mtr-0.69.tar.gz) = 58904d6d8d70114195cdeb653d56914c -SHA1 (mtr-0.69.tar.gz) = 3fd0fa148b349d1966e0d79af0ffb84ecc7bed4b -RMD160 (mtr-0.69.tar.gz) = e95e0f27253d8d94587b429cbb65311035e93c2e -SIZE (mtr-0.69.tar.gz) = 183216 +MD5 (mtr-0.71.tar.gz) = 8c1c9f5db2c599eea3b12bfed8b80618 +RMD160 (mtr-0.71.tar.gz) = 9979721f39a83f4ad6d41d3e9f4c7848b7a99745 +SHA1 (mtr-0.71.tar.gz) = 5a2b72e0d69522e524e961c3195d5878c49510b4 +SIZE (mtr-0.71.tar.gz) = 205442 diff --git a/net/mtr/patches/patch-configure b/net/mtr/patches/patch-configure new file mode 100644 index 00000000000..d8f684d4ae8 --- /dev/null +++ b/net/mtr/patches/patch-configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure,v 1.1 2006/06/26 20:39:16 aanriot Exp $ +--- configure.orig Fri Jun 9 15:45:35 2006 ++++ configure Fri Jun 9 15:46:31 2006 +@@ -6965,7 +6965,7 @@ fi + + fi + +-LIBS="$LIBS -lresolv" ++#LIBS="$LIBS -lresolv" + + echo "$as_me:$LINENO: checking for herror" >&5 + echo $ECHO_N "checking for herror... $ECHO_C" >&6 diff --git a/net/mtr/patches/patch-dns_c b/net/mtr/patches/patch-dns_c deleted file mode 100644 index be647f48674..00000000000 --- a/net/mtr/patches/patch-dns_c +++ /dev/null @@ -1,31 +0,0 @@ -Index: dns.c -diff -u -p dns.c.orig dns.c ---- dns.c.orig Tue Jan 11 17:32:42 2005 -+++ dns.c Thu Feb 3 19:25:28 2005 -@@ -437,7 +437,7 @@ char *strlongip(ip_t * ip) - } - - --int longipstr(char *s, ip_t *dst) -+int longipstr(char *s, ip_t *dst, int af) - { - #ifdef ENABLE_IPV6 - return inet_pton( af, s, dst ); -@@ -488,7 +488,7 @@ void dns_open(void) - strerror(errno)); - exit(-1); - } -- longipstr( "127.0.0.1", &localhost ); -+ longipstr( "127.0.0.1", &localhost, AF_INET ); - aseed = time(NULL) ^ (time(NULL) << 3) ^ (dword)getpid(); - for (i = 0;i < BashSize;i++) { - idbash[i] = NULL; -@@ -1228,7 +1228,7 @@ void dns_ack(void) - if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr), - (void *) &(from4->sin_addr), (int) AF_INET ) == 0 || - addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr), -- (void *) &unspec_addr, (int) AF_INET ) != 0 ) /* 0.0.0.0 replies as 127.0.0.1 */ -+ (void *) &unspec_addr, (int) AF_INET ) == 0 ) /* 0.0.0.0 replies as 127.0.0.1 */ - break; - } else - for (i = 0;i < _res.nscount;i++) diff --git a/net/mtr/patches/patch-net_c b/net/mtr/patches/patch-net_c deleted file mode 100644 index 25ee703243f..00000000000 --- a/net/mtr/patches/patch-net_c +++ /dev/null @@ -1,28 +0,0 @@ ---- net.c.orig Thu Jan 13 08:13:53 2005 -+++ net.c Wed Nov 16 19:43:05 2005 -@@ -277,7 +277,7 @@ - exit( EXIT_FAILURE); - } - echotype = ICMP6_ECHO_REQUEST; -- salen = sizeof (struct sockaddr_storage); -+ salen = sizeof (struct sockaddr_in6); - break; - #endif - } -@@ -305,7 +305,6 @@ - rv = sendto(sendsock, packet, abs(packetsize), 0, - remotesockaddr, salen); - if (rv >= 0) { -- fprintf (stderr, "You've got a broken (FreeBSD?) system\n"); - BSDfix = 1; - } - } -@@ -346,7 +345,7 @@ - addrcpy( (void *) &(host[index].addrs[0]), addr, af ); - } else { - for( i=0; i