summaryrefslogtreecommitdiff
path: root/net/mtr
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-06-08 10:17:43 +0000
committerwiz <wiz@pkgsrc.org>2010-06-08 10:17:43 +0000
commitc85c5838c5b5deb1beae2fbf8bb0091e846d1d6f (patch)
tree83020787d8f9c00e3c76637ebc47092160339b8b /net/mtr
parent073b6041402bd0b3b26dceaccec0bf5986e025d2 (diff)
downloadpkgsrc-c85c5838c5b5deb1beae2fbf8bb0091e846d1d6f.tar.gz
Update to 0.78: Inclusion of two pkgsrc patches.
Diffstat (limited to 'net/mtr')
-rw-r--r--net/mtr/Makefile4
-rw-r--r--net/mtr/distinfo10
-rw-r--r--net/mtr/patches/patch-ab89
-rw-r--r--net/mtr/patches/patch-ac15
4 files changed, 6 insertions, 112 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 9e5ed12b9ab..cef5584f39f 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2010/06/05 14:49:51 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/08 10:17:43 wiz Exp $
-DISTNAME= mtr-0.77
+DISTNAME= mtr-0.78
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 9d6e8d43426..572420e9bda 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.29 2010/06/05 14:50:12 wiz Exp $
+$NetBSD: distinfo,v 1.30 2010/06/08 10:17:43 wiz Exp $
-SHA1 (mtr-0.77.tar.gz) = 67461d021860fe5f3553ea9f00823f887a0ec389
-RMD160 (mtr-0.77.tar.gz) = 6e84bdf166861145a01a202ece0ec17c82111272
-Size (mtr-0.77.tar.gz) = 272517 bytes
+SHA1 (mtr-0.78.tar.gz) = d4e95e9f65b992f3a78bf2275bd94216eaa1efef
+RMD160 (mtr-0.78.tar.gz) = d2388ae8dd2a89809a8a1030dcc5b8554fe01cf0
+Size (mtr-0.78.tar.gz) = 272361 bytes
SHA1 (patch-aa) = fcee60ebcdc1b532439aa893f5d710f95f563e1c
-SHA1 (patch-ab) = 67699e8d4a8eb6d63a918e298960e7e8e105de40
-SHA1 (patch-ac) = 50fcafe1a0de3f285036882c79fdf61e03fbc045
diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab
deleted file mode 100644
index 052c9467a3a..00000000000
--- a/net/mtr/patches/patch-ab
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ab,v 1.17 2010/06/05 14:49:51 wiz Exp $
-
---- dns.c.orig 2009-11-27 07:49:15.000000000 +0000
-+++ dns.c
-@@ -309,6 +309,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
-@@ -484,14 +495,14 @@ void dns_open(void)
- int option,i;
-
- if (!dns) return;
-- 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",
-@@ -874,17 +885,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));
- }
-
-@@ -1240,18 +1251,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) {
- snprintf(tempstring, sizeof(tempstring), "Resolver error: Received reply from unknown source: %s",
- inet_ntoa(from4->sin_addr ));
- restell(tempstring);
diff --git a/net/mtr/patches/patch-ac b/net/mtr/patches/patch-ac
deleted file mode 100644
index 4ac8f79e307..00000000000
--- a/net/mtr/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/01/09 19:44:05 tron Exp $
-
-Remove bogus cast which breaks the build with Sun Studio C.
-
---- net.c.orig 2008-09-19 10:37:57.000000000 +0100
-+++ net.c 2010-01-09 19:34:47.000000000 +0000
-@@ -1205,7 +1205,7 @@
- switch ( saddr->sa_family ) {
- case AF_INET:
- sa4 = (struct sockaddr_in *) saddr;
-- strncpy( strptr, inet_ntoa( (struct in_addr) sa4->sin_addr ), len - 1 );
-+ strncpy( strptr, inet_ntoa( sa4->sin_addr ), len - 1 );
- strptr[ len - 1 ] = '\0';
- return;
- #ifdef ENABLE_IPV6