From c23f4ac0cb876b0b8a5a089d3e0923e974cdf14e Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 3 Apr 2006 18:38:58 +0000 Subject: Update mtr to 0.71: 0.71: The build-time check for the resolver library was improved. Binding to a specific interface was fixed. Incorrect display of multiple routes was fixed. Several minor bugs were fixed. v0.70 Antinio submitted a cumulative patch containing some nice improvements. He also submitted an automake patch that causes mtr to no longer compile on my system. I refuse to have mtr "in the dark" that I can't test-compile the dist. Add option for gtk support, and remove mtr-gtk package. --- net/Makefile | 3 +- net/mtr-gtk/DESCR | 5 -- net/mtr-gtk/MESSAGE | 9 ---- net/mtr-gtk/Makefile | 35 ------------- net/mtr-gtk/PLIST | 5 -- net/mtr-gtk/distinfo | 7 --- net/mtr-gtk/patches/patch-aa | 14 ----- net/mtr-gtk/patches/patch-ab | 121 ------------------------------------------- net/mtr/Makefile | 8 +-- net/mtr/distinfo | 13 ++--- net/mtr/options.mk | 13 +++++ net/mtr/patches/patch-aa | 14 ----- net/mtr/patches/patch-ab | 6 +-- net/mtr/patches/patch-ad | 21 -------- net/mtr/patches/patch-ae | 44 ---------------- 15 files changed, 26 insertions(+), 292 deletions(-) delete mode 100644 net/mtr-gtk/DESCR delete mode 100644 net/mtr-gtk/MESSAGE delete mode 100644 net/mtr-gtk/Makefile delete mode 100644 net/mtr-gtk/PLIST delete mode 100644 net/mtr-gtk/distinfo delete mode 100644 net/mtr-gtk/patches/patch-aa delete mode 100644 net/mtr-gtk/patches/patch-ab create mode 100644 net/mtr/options.mk delete mode 100644 net/mtr/patches/patch-aa delete mode 100644 net/mtr/patches/patch-ad delete mode 100644 net/mtr/patches/patch-ae (limited to 'net') diff --git a/net/Makefile b/net/Makefile index 6f5ec1375f6..f68fe013363 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.611 2006/03/31 21:55:22 adrianp Exp $ +# $NetBSD: Makefile,v 1.612 2006/04/03 18:38:58 wiz Exp $ # COMMENT= Networking tools @@ -197,7 +197,6 @@ SUBDIR+= mrstat SUBDIR+= mrt SUBDIR+= mrtg SUBDIR+= mtr -SUBDIR+= mtr-gtk SUBDIR+= mydns-mysql SUBDIR+= mydns-pgsql SUBDIR+= nagios-base diff --git a/net/mtr-gtk/DESCR b/net/mtr-gtk/DESCR deleted file mode 100644 index ce71350b7b7..00000000000 --- a/net/mtr-gtk/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -mtr combines the functionality of the "traceroute" and "ping" programs -into a single network diagnostic tool. - -Authors: Matt Kimball is the primary author of mtr. - Roger Wolff is currently maintaining mtr. diff --git a/net/mtr-gtk/MESSAGE b/net/mtr-gtk/MESSAGE deleted file mode 100644 index e5a41b21499..00000000000 --- a/net/mtr-gtk/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2003/05/06 17:42:12 jmmv Exp $ - - ${PREFIX}/sbin/mtr-gtk is setuid "root". - - Please read about potential security issues in - ${PREFIX}/share/doc/mtr-gtk/SECURITY - -=========================================================================== diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile deleted file mode 100644 index 7e3c860875b..00000000000 --- a/net/mtr-gtk/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: Makefile,v 1.27 2006/02/05 23:10:27 joerg Exp $ -# - -DISTNAME= mtr-0.69 -PKGNAME= ${DISTNAME:S/-/-gtk-/} -PKGREVISION= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ - -MAINTAINER= sommerfeld@NetBSD.org -HOMEPAGE= http://www.bitwizard.nl/mtr/ -COMMENT= Traceroute and ping in a single graphical network diagnostic tool - -PKG_INSTALLATION_TYPES= overwrite pkgviews - -GNU_CONFIGURE= yes -USE_TOOLS+= gmake - -INSTALLATION_DIRS= man/man8 sbin - -# mtr uses libtermcap by default, but needs wattr_{on,off} from (n)curses, -# so we rewrite -ltermcap to -lncurses (which will be auto-mangled into -# -lcurses on the appropriate platforms). -BUILDLINK_TRANSFORM+= l:termcap:ncurses - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr-gtk - ${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin/mtr-gtk - ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8 - ${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk - -.include "../../devel/ncurses/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/net/mtr-gtk/PLIST b/net/mtr-gtk/PLIST deleted file mode 100644 index fcff7c94c8b..00000000000 --- a/net/mtr-gtk/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:20 zuntum Exp $ -man/man8/mtr-gtk.8 -sbin/mtr-gtk -share/doc/mtr-gtk/SECURITY -@dirrm share/doc/mtr-gtk diff --git a/net/mtr-gtk/distinfo b/net/mtr-gtk/distinfo deleted file mode 100644 index 73369cb8147..00000000000 --- a/net/mtr-gtk/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.12 2006/03/22 23:56:38 joerg Exp $ - -SHA1 (mtr-0.69.tar.gz) = 3fd0fa148b349d1966e0d79af0ffb84ecc7bed4b -RMD160 (mtr-0.69.tar.gz) = e95e0f27253d8d94587b429cbb65311035e93c2e -Size (mtr-0.69.tar.gz) = 183216 bytes -SHA1 (patch-aa) = 5eb4ab7bfa02095c2b7a110426dd4aa5738f0a2c -SHA1 (patch-ab) = f132e394a4b6b00f56e38333d3f49bf5c11965b9 diff --git a/net/mtr-gtk/patches/patch-aa b/net/mtr-gtk/patches/patch-aa deleted file mode 100644 index e55f5d89646..00000000000 --- a/net/mtr-gtk/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2005/02/27 22:49:43 wiz Exp $ - ---- net.c.orig 2005-01-13 09:13:53.000000000 +0100 -+++ net.c -@@ -305,7 +305,9 @@ void net_send_query(int index) - rv = sendto(sendsock, packet, abs(packetsize), 0, - remotesockaddr, salen); - if (rv >= 0) { -+#if 0 - fprintf (stderr, "You've got a broken (FreeBSD?) system\n"); -+#endif - BSDfix = 1; - } - } diff --git a/net/mtr-gtk/patches/patch-ab b/net/mtr-gtk/patches/patch-ab deleted file mode 100644 index 8270639f0c2..00000000000 --- a/net/mtr-gtk/patches/patch-ab +++ /dev/null @@ -1,121 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2006/03/22 23:56:38 joerg Exp $ - ---- dns.c.orig 2005-01-11 08:32:42.000000000 +0000 -+++ dns.c -@@ -28,13 +28,20 @@ - #include - #include - #include --#include - #include - #include - #include -+#ifdef __APPLE__ -+#include -+#else - #include -+#endif - #include -+#ifdef __APPLE__ -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -54,9 +61,6 @@ extern char *sys_errlist[]; - #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error") - #endif - --/* Hmm, it seems Irix requires this */ --extern int errno; -- - extern int af; - - /* Defines */ -@@ -294,6 +298,17 @@ char nullstring[] = ""; - - int use_dns = 1; - -+#ifdef res_ninit -+#define RES_INIT() res_ninit(&myres); -+#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ -+ res_nmkquery(&myres, a, b, c, d, e, f, g, h, i) -+struct __res_state myres; -+#else -+#define RES_INIT() res_init(); -+#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \ -+ res_mkquery(a, b, c, d, e, f, g, h, i) -+#define myres _res -+#endif - - /* Code */ - #ifdef CorruptCheck -@@ -468,14 +483,14 @@ void dns_open(void) - { - int option,i; - -- res_init(); -- if (!_res.nscount) { -+ RES_INIT(); -+ if (!myres.nscount) { - fprintf(stderr,"No nameservers defined.\n"); - exit(-1); - } -- _res.options|= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH; -- for (i = 0;i < _res.nscount;i++) -- _res.nsaddr_list[i].sin_family = AF_INET; -+ myres.options|= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH; -+ for (i = 0;i < myres.nscount;i++) -+ myres.nsaddr_list[i].sin_family = AF_INET; - resfd = socket(AF_INET, SOCK_DGRAM, 0); - if (resfd == -1) { - fprintf(stderr,"Unable to allocate socket for nameserver communication: %s\n", -@@ -858,17 +873,17 @@ void dorequest(char *s,int type,word id) - { - packetheader *hp; - int r,i; -- int buf[(MaxPacketsize/sizeof (int))+1]; -+ unsigned char buf[MaxPacketsize]; - -- r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize); -+ r = RES_MKQUERY(QUERY,s,C_IN,type,NULL,0,NULL,(unsigned char*)buf,MaxPacketsize); - if (r == -1) { - restell("Resolver error: Query too large."); - return; - } - hp = (packetheader *)buf; - hp->id = id; /* htons() deliberately left out (redundant) */ -- for (i = 0;i < _res.nscount;i++) -- (void)sendto(resfd,buf,r,0,(struct sockaddr *)&_res.nsaddr_list[i], -+ for (i = 0;i < myres.nscount;i++) -+ (void)sendto(resfd,buf,r,0,(struct sockaddr *)&myres.nsaddr_list[i], - sizeof(struct sockaddr)); - } - -@@ -1224,18 +1239,18 @@ void dns_ack(void) - /* Check to see if this server is actually one we sent to */ - if ( addrcmp( (void *) &(from4->sin_addr), (void *) &localhost, - (int) AF_INET ) == 0 ) { -- for (i = 0;i < _res.nscount;i++) -- if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr), -+ for (i = 0;i < myres.nscount;i++) -+ if ( addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr), - (void *) &(from4->sin_addr), (int) AF_INET ) == 0 || -- addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr), -+ addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr), - (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++) -- if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr), -+ for (i = 0;i < myres.nscount;i++) -+ if ( addrcmp( (void *) &(myres.nsaddr_list[i].sin_addr), - (void *) &(from4->sin_addr), AF_INET ) == 0 ) - break; -- if (i == _res.nscount) { -+ if (i == myres.nscount) { - sprintf(tempstring,"Resolver error: Received reply from unknown source: %s", - inet_ntoa(from4->sin_addr )); - restell(tempstring); diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 52c53950dce..7dcfe80bb85 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2006/02/05 23:10:27 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2006/04/03 18:38:58 wiz Exp $ # -DISTNAME= mtr-0.69 -PKGREVISION= 1 +DISTNAME= mtr-0.71 CATEGORIES= net MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ @@ -14,9 +13,10 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_TOOLS+= gmake -CONFIGURE_ARGS+= --without-gtk INSTALLATION_DIRS= man/man8 sbin +.include "options.mk" + # mtr uses libtermcap by default, but needs wattr_{on,off} from (n)curses, # so we rewrite -ltermcap to -lncurses (which will be auto-mangled into # -lcurses on the appropriate platforms). diff --git a/net/mtr/distinfo b/net/mtr/distinfo index 0144caab900..e0c9f4efc7e 100644 --- a/net/mtr/distinfo +++ b/net/mtr/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.17 2006/03/22 23:57:12 joerg Exp $ +$NetBSD: distinfo,v 1.18 2006/04/03 18:38:58 wiz Exp $ -SHA1 (mtr-0.69.tar.gz) = 3fd0fa148b349d1966e0d79af0ffb84ecc7bed4b -RMD160 (mtr-0.69.tar.gz) = e95e0f27253d8d94587b429cbb65311035e93c2e -Size (mtr-0.69.tar.gz) = 183216 bytes -SHA1 (patch-aa) = 5eb4ab7bfa02095c2b7a110426dd4aa5738f0a2c -SHA1 (patch-ab) = f132e394a4b6b00f56e38333d3f49bf5c11965b9 -SHA1 (patch-ad) = 0565b900e45baf624866e3858ab43a2ab2c4bbfe -SHA1 (patch-ae) = 4e40b16e0416f024898eda8375b5560ae08cbfaa +SHA1 (mtr-0.71.tar.gz) = 5a2b72e0d69522e524e961c3195d5878c49510b4 +RMD160 (mtr-0.71.tar.gz) = 9979721f39a83f4ad6d41d3e9f4c7848b7a99745 +Size (mtr-0.71.tar.gz) = 205442 bytes +SHA1 (patch-ab) = 6305e59e7e2532e0446b33be5584fe1afc0a063b diff --git a/net/mtr/options.mk b/net/mtr/options.mk new file mode 100644 index 00000000000..fff2ab936aa --- /dev/null +++ b/net/mtr/options.mk @@ -0,0 +1,13 @@ +# $NetBSD: options.mk,v 1.1 2006/04/03 18:38:58 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mtr +PKG_SUPPORTED_OPTIONS= gtk + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgtk) +.include "../../x11/gtk/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-gtk +.endif diff --git a/net/mtr/patches/patch-aa b/net/mtr/patches/patch-aa deleted file mode 100644 index e55f5d89646..00000000000 --- a/net/mtr/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2005/02/27 22:49:43 wiz Exp $ - ---- net.c.orig 2005-01-13 09:13:53.000000000 +0100 -+++ net.c -@@ -305,7 +305,9 @@ void net_send_query(int index) - rv = sendto(sendsock, packet, abs(packetsize), 0, - remotesockaddr, salen); - if (rv >= 0) { -+#if 0 - fprintf (stderr, "You've got a broken (FreeBSD?) system\n"); -+#endif - BSDfix = 1; - } - } diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab index 85fe3d65388..19864dc4978 100644 --- a/net/mtr/patches/patch-ab +++ b/net/mtr/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.10 2006/03/22 23:57:12 joerg Exp $ +$NetBSD: patch-ab,v 1.11 2006/04/03 18:38:58 wiz Exp $ ---- dns.c.orig 2005-01-11 08:32:42.000000000 +0000 +--- dns.c.orig 2006-03-23 05:45:58.000000000 +0000 +++ dns.c @@ -28,13 +28,20 @@ #include @@ -105,7 +105,7 @@ $NetBSD: patch-ab,v 1.10 2006/03/22 23:57:12 joerg Exp $ (void *) &(from4->sin_addr), (int) AF_INET ) == 0 || - addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr), + addrcmp( (void *) &(myres.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-ad b/net/mtr/patches/patch-ad deleted file mode 100644 index af310245ea8..00000000000 --- a/net/mtr/patches/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2005/02/27 22:49:43 wiz Exp $ - ---- mtr.c.orig 2005-01-11 09:33:41.000000000 +0100 -+++ mtr.c -@@ -126,7 +126,6 @@ void parse_arg (int argc, char **argv) - { "report", 0, 0, 'r' }, - { "xml", 0, 0, 'x' }, - { "curses", 0, 0, 't' }, -- { "gtk", 0, 0, 'g' }, - { "raw", 0, 0, 'l' }, - { "split", 0, 0, 'p' }, /* BL */ - /* maybe above should change to -d 'x' */ -@@ -369,7 +368,7 @@ int main(int argc, char **argv) - - if (PrintHelp) { - printf("usage: %s [-hvrctglsni46] [--help] [--version] [--report]\n" -- "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n" -+ "\t\t[--report-cycles=COUNT] [--curses]\n" - "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */ - "\t\t[--psize=bytes/-p=bytes]\n" /* ok */ - "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]); diff --git a/net/mtr/patches/patch-ae b/net/mtr/patches/patch-ae deleted file mode 100644 index 85af218f06c..00000000000 --- a/net/mtr/patches/patch-ae +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2005/02/27 22:49:43 wiz Exp $ - ---- mtr.8.orig 2005-01-11 09:10:13.000000000 +0100 -+++ mtr.8 -@@ -8,7 +8,7 @@ mtr \- a network diagnostic tool - .SH SYNOPSIS - .B mtr - [\c --.B \-hvrctglsni46\c -+.B \-hvrctlsni46\c - ] - [\c - .B \-\-help\c -@@ -35,9 +35,6 @@ mtr \- a network diagnostic tool - .B \-\-no-dns\c - ] - [\c --.B \-\-gtk\c --] --[\c - .B \-\-address\ IP.ADD.RE.SS\c - ] - [\c -@@ -153,20 +150,6 @@ to display numeric IP numbers and not tr - host names. - - .TP --.B \-g --.TP --.B \-\-gtk --.br --Use this option to force --.B mtr --to use the GTK+ based X11 window interface (if available). --GTK+ must have been available on the system when --.B mtr --was built for this to work. See the GTK+ web page at --.B http://www.gimp.org/gtk/ --for more information about GTK+. -- --.TP - .B \-s - .TP - .B \-\-split -- cgit v1.2.3