diff options
author | tron <tron@pkgsrc.org> | 2008-08-24 12:36:34 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2008-08-24 12:36:34 +0000 |
commit | 2e17894799332c444d17b1a8bdfb6781f7ed73b4 (patch) | |
tree | 06afff1e1a20c2c35f261da2975462516cd3462d /net/mtr/patches | |
parent | a99979e584c77259f294822b21494c9c435cba3c (diff) | |
download | pkgsrc-2e17894799332c444d17b1a8bdfb6781f7ed73b4.tar.gz |
Update "mtr" package to version 0.74. Changes since version 0.72:
- KES reported a build problem. Turns out I need to install gtk-1.2
on my development sytem, otherwise my release script causes the
build to break.
- changed some docs to advertise the new mailing list.
- added documentation for the Mac OS X compilation problem.
- added -Wno-pointer-sign to the compiler options.
- Nico Lichtmaier's cleanup-gtk patch. (now mtr uses a more modern
dialect of gtk).
- as possible after opening the sockets, it still had some
sprintf calls, which have now been converted into snprintf.
Diffstat (limited to 'net/mtr/patches')
-rw-r--r-- | net/mtr/patches/patch-aa | 21 | ||||
-rw-r--r-- | net/mtr/patches/patch-ab | 46 | ||||
-rw-r--r-- | net/mtr/patches/patch-ac | 45 |
3 files changed, 7 insertions, 105 deletions
diff --git a/net/mtr/patches/patch-aa b/net/mtr/patches/patch-aa deleted file mode 100644 index dae7f37f66f..00000000000 --- a/net/mtr/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2006/10/03 19:15:20 wiz Exp $ - ---- configure.orig 2006-09-29 19:41:56.000000000 +0000 -+++ configure -@@ -7204,6 +7204,7 @@ _ACEOF - LIBS="-lresolv $LIBS" - - else -+ LIBS="$ac_check_lib_save_LIBS" - - echo "$as_me:$LINENO: checking for __res_mkquery in -lresolv" >&5 - echo $ECHO_N "checking for __res_mkquery in -lresolv... $ECHO_C" >&6 -@@ -7287,8 +7288,6 @@ fi - - fi - --LIBS="$LIBS -lresolv" -- - echo "$as_me:$LINENO: checking for herror" >&5 - echo $ECHO_N "checking for herror... $ECHO_C" >&6 - if test "${ac_cv_func_herror+set}" = set; then diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab index e0c2319a496..c5e3cf20593 100644 --- a/net/mtr/patches/patch-ab +++ b/net/mtr/patches/patch-ab @@ -1,40 +1,8 @@ -$NetBSD: patch-ab,v 1.14 2006/10/03 19:15:20 wiz Exp $ +$NetBSD: patch-ab,v 1.15 2008/08/24 12:36:34 tron Exp $ ---- dns.c.orig 2006-03-26 06:54:11.000000000 +0000 -+++ dns.c -@@ -28,13 +28,20 @@ - #include <sys/time.h> - #include <sys/select.h> - #include <sys/stat.h> --#include <sys/errno.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+#ifdef __APPLE__ -+#include <arpa/nameser8_compat.h> -+#else - #include <arpa/nameser.h> -+#endif - #include <netdb.h> -+#ifdef __APPLE__ -+#include <resolv8_compat.h> -+#else - #include <resolv.h> -+#endif - #include <unistd.h> - #include <fcntl.h> - #include <ctype.h> -@@ -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[] = ""; +--- dns.c.orig 2008-08-19 18:07:33.000000000 +0100 ++++ dns.c 2008-08-24 13:22:55.000000000 +0100 +@@ -310,6 +310,17 @@ int use_dns = 1; @@ -52,7 +20,7 @@ $NetBSD: patch-ab,v 1.14 2006/10/03 19:15:20 wiz Exp $ /* Code */ #ifdef CorruptCheck -@@ -468,14 +483,14 @@ void dns_open(void) +@@ -484,14 +495,14 @@ { int option,i; @@ -72,7 +40,7 @@ $NetBSD: patch-ab,v 1.14 2006/10/03 19:15:20 wiz Exp $ 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) +@@ -874,17 +885,17 @@ { packetheader *hp; int r,i; @@ -94,7 +62,7 @@ $NetBSD: patch-ab,v 1.14 2006/10/03 19:15:20 wiz Exp $ sizeof(struct sockaddr)); } -@@ -1224,18 +1239,18 @@ void dns_ack(void) +@@ -1240,18 +1251,18 @@ /* Check to see if this server is actually one we sent to */ if ( addrcmp( (void *) &(from4->sin_addr), (void *) &localhost, (int) AF_INET ) == 0 ) { diff --git a/net/mtr/patches/patch-ac b/net/mtr/patches/patch-ac deleted file mode 100644 index ae984e62aef..00000000000 --- a/net/mtr/patches/patch-ac +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2008/05/22 12:10:49 tron Exp $ - ---- split.c.orig 2005-01-11 08:34:07.000000000 +0000 -+++ split.c 2008-05-22 13:07:48.000000000 +0100 -@@ -100,24 +100,28 @@ - addr = net_addr(at); - - if( addrcmp( (void *) addr, (void *) &unspec_addr, af ) != 0 ) { -+ int bytes; - name = dns_lookup(addr); - if(name != NULL) { - /* May be we should test name's length */ -- sprintf(newLine, "%s %d %d %d %d %d %d", name, -- net_loss(at), -- net_returned(at), net_xmit(at), -- net_best(at) /1000, net_avg(at)/1000, -- net_worst(at)/1000); -+ bytes = snprintf(newLine, sizeof(newLine), "%s %d %d %d %d %d %d", -+ name, -+ net_loss(at), -+ net_returned(at), net_xmit(at), -+ net_best(at) /1000, net_avg(at)/1000, -+ net_worst(at)/1000); - } else { -- sprintf(newLine, "%s %d %d %d %d %d %d", -- strlongip( addr ), -- net_loss(at), -- net_returned(at), net_xmit(at), -- net_best(at) /1000, net_avg(at)/1000, -- net_worst(at)/1000); -+ bytes = snprintf(newLine, sizeof(newLine), "%s %d %d %d %d %d %d", -+ strlongip( addr ), -+ net_loss(at), -+ net_returned(at), net_xmit(at), -+ net_best(at) /1000, net_avg(at)/1000, -+ net_worst(at)/1000); - } -+ if (bytes < 0 || bytes >= sizeof(newLine)) -+ strcpy(newLine, "???"); - } else { -- sprintf(newLine, "???"); -+ strcpy(newLine, "???"); - } - - if (strcmp(newLine, Lines[at]) == 0) { |