summaryrefslogtreecommitdiff
path: root/net/mtr
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-03-22 23:56:38 +0000
committerjoerg <joerg@pkgsrc.org>2006-03-22 23:56:38 +0000
commit6c73080bdfb4a415536c2fb6829537e3f089f935 (patch)
tree0cf58d129e3806fb4e9f3e5264a66cd8e0cc1756 /net/mtr
parent73c94df211b2414dc320d322f1f9217cff82a703 (diff)
downloadpkgsrc-6c73080bdfb4a415536c2fb6829537e3f089f935.tar.gz
Fix errno.
Diffstat (limited to 'net/mtr')
-rw-r--r--net/mtr/distinfo4
-rw-r--r--net/mtr/patches/patch-ab28
2 files changed, 23 insertions, 9 deletions
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 4edcff23f07..0144caab900 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2005/02/27 22:49:43 wiz Exp $
+$NetBSD: distinfo,v 1.17 2006/03/22 23:57:12 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) = 25e8711a7736d2772a17e6b6dda962d95e294c86
+SHA1 (patch-ab) = f132e394a4b6b00f56e38333d3f49bf5c11965b9
SHA1 (patch-ad) = 0565b900e45baf624866e3858ab43a2ab2c4bbfe
SHA1 (patch-ae) = 4e40b16e0416f024898eda8375b5560ae08cbfaa
diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab
index fa0b327ebfb..85fe3d65388 100644
--- a/net/mtr/patches/patch-ab
+++ b/net/mtr/patches/patch-ab
@@ -1,8 +1,12 @@
-$NetBSD: patch-ab,v 1.9 2005/02/27 22:49:43 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2006/03/22 23:57:12 joerg Exp $
---- dns.c.orig 2005-01-11 09:32:42.000000000 +0100
+--- dns.c.orig 2005-01-11 08:32:42.000000000 +0000
+++ dns.c
-@@ -32,9 +32,17 @@
+@@ -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>
@@ -20,7 +24,17 @@ $NetBSD: patch-ab,v 1.9 2005/02/27 22:49:43 wiz Exp $
#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
-@@ -294,6 +302,17 @@ char nullstring[] = "";
+@@ -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;
@@ -38,7 +52,7 @@ $NetBSD: patch-ab,v 1.9 2005/02/27 22:49:43 wiz Exp $
/* Code */
#ifdef CorruptCheck
-@@ -468,14 +487,14 @@ void dns_open(void)
+@@ -468,14 +483,14 @@ void dns_open(void)
{
int option,i;
@@ -58,7 +72,7 @@ $NetBSD: patch-ab,v 1.9 2005/02/27 22:49:43 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 +877,17 @@ void dorequest(char *s,int type,word id)
+@@ -858,17 +873,17 @@ void dorequest(char *s,int type,word id)
{
packetheader *hp;
int r,i;
@@ -80,7 +94,7 @@ $NetBSD: patch-ab,v 1.9 2005/02/27 22:49:43 wiz Exp $
sizeof(struct sockaddr));
}
-@@ -1224,18 +1243,18 @@ void dns_ack(void)
+@@ -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 ) {