pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net Add patch based on christos' etherape patch-ab to ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/406543dd74a6
branches: trunk
changeset: 488460:406543dd74a6
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Feb 01 17:02:00 2005 +0000
description:
Add patch based on christos' etherape patch-ab to make name lookups work
on -current. Bump PKGREVISION.
diffstat:
net/mtr-gtk/Makefile | 3 +-
net/mtr-gtk/distinfo | 4 +-
net/mtr-gtk/patches/patch-ab | 98 +++++++++++++++++++++++++++++++++++++++++--
net/mtr/Makefile | 3 +-
net/mtr/distinfo | 4 +-
net/mtr/patches/patch-ab | 83 ++++++++++++++++++++++++++++++++++---
6 files changed, 177 insertions(+), 18 deletions(-)
diffs (273 lines):
diff -r 42ccc8b48c51 -r 406543dd74a6 net/mtr-gtk/Makefile
--- a/net/mtr-gtk/Makefile Tue Feb 01 16:53:58 2005 +0000
+++ b/net/mtr-gtk/Makefile Tue Feb 01 17:02:00 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/12/25 21:24:45 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/02/01 17:02:00 wiz Exp $
#
DISTNAME= mtr-0.67
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/-/-gtk-/}
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/
diff -r 42ccc8b48c51 -r 406543dd74a6 net/mtr-gtk/distinfo
--- a/net/mtr-gtk/distinfo Tue Feb 01 16:53:58 2005 +0000
+++ b/net/mtr-gtk/distinfo Tue Feb 01 17:02:00 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/12/25 21:24:45 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/02/01 17:02:00 wiz Exp $
SHA1 (mtr-0.67.tar.gz) = 23fe652ebe25fe86fcb421e78eb76917248b9c94
Size (mtr-0.67.tar.gz) = 131393 bytes
SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef
-SHA1 (patch-ab) = 8e329ba3e46e47db29a17acd746ccd461a25f1a9
+SHA1 (patch-ab) = cfddf96d24c734990a15beec796b6bbbf7cb3b9d
diff -r 42ccc8b48c51 -r 406543dd74a6 net/mtr-gtk/patches/patch-ab
--- a/net/mtr-gtk/patches/patch-ab Tue Feb 01 16:53:58 2005 +0000
+++ b/net/mtr-gtk/patches/patch-ab Tue Feb 01 17:02:00 2005 +0000
@@ -1,8 +1,64 @@
-$NetBSD: patch-ab,v 1.5 2004/10/27 16:18:31 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2005/02/01 17:02:00 wiz Exp $
---- dns.c.orig 2004-10-27 11:47:06.000000000 -0400
-+++ dns.c 2004-10-27 11:47:52.000000000 -0400
-@@ -814,9 +814,9 @@
+--- dns.c.orig 2004-08-26 09:56:53.000000000 +0200
++++ dns.c
+@@ -32,9 +32,17 @@
+ #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>
+@@ -282,6 +290,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
+@@ -448,14 +467,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",
+@@ -814,17 +833,17 @@ void dorequest(char *s,int type,word id)
{
packetheader *hp;
int r,i;
@@ -10,7 +66,39 @@
+ 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,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));
+ }
+
+@@ -1161,15 +1180,15 @@ void dns_ack(void)
+ if (r > 0) {
+ /* Check to see if this server is actually one we sent to */
+ if (from.sin_addr.s_addr == localhost) {
+- for (i = 0;i < _res.nscount;i++)
+- if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
+- (!_res.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */
++ for (i = 0;i < myres.nscount;i++)
++ if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
++ (!myres.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */
+ break;
+ } else
+- for (i = 0;i < _res.nscount;i++)
+- if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
++ for (i = 0;i < myres.nscount;i++)
++ if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
+ break;
+- if (i == _res.nscount) {
++ if (i == myres.nscount) {
+ sprintf(tempstring,"Resolver error: Received reply from unknown source: %s",
+ inet_ntoa(from.sin_addr));
+ restell(tempstring);
diff -r 42ccc8b48c51 -r 406543dd74a6 net/mtr/Makefile
--- a/net/mtr/Makefile Tue Feb 01 16:53:58 2005 +0000
+++ b/net/mtr/Makefile Tue Feb 01 17:02:00 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2004/12/25 21:24:45 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/02/01 17:02:00 wiz Exp $
#
DISTNAME= mtr-0.67
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/
diff -r 42ccc8b48c51 -r 406543dd74a6 net/mtr/distinfo
--- a/net/mtr/distinfo Tue Feb 01 16:53:58 2005 +0000
+++ b/net/mtr/distinfo Tue Feb 01 17:02:00 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/02/01 16:53:58 wiz Exp $
+$NetBSD: distinfo,v 1.14 2005/02/01 17:02:00 wiz Exp $
SHA1 (mtr-0.67.tar.gz) = 23fe652ebe25fe86fcb421e78eb76917248b9c94
Size (mtr-0.67.tar.gz) = 131393 bytes
SHA1 (patch-aa) = eb1998efc2a5b455461333382c34ed9c77cf76ef
-SHA1 (patch-ab) = d949475cf8beeb4972a35f4139689fde9781e88f
+SHA1 (patch-ab) = cfddf96d24c734990a15beec796b6bbbf7cb3b9d
SHA1 (patch-ad) = 91788870a4375fc622f512b5823202e7084f4c2e
SHA1 (patch-ae) = ccc70fa482a8b8d4ab3124558e6586254a8c36bf
diff -r 42ccc8b48c51 -r 406543dd74a6 net/mtr/patches/patch-ab
--- a/net/mtr/patches/patch-ab Tue Feb 01 16:53:58 2005 +0000
+++ b/net/mtr/patches/patch-ab Tue Feb 01 17:02:00 2005 +0000
@@ -1,12 +1,11 @@
-$NetBSD: patch-ab,v 1.7 2005/02/01 16:53:58 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2005/02/01 17:02:00 wiz Exp $
---- dns.c.orig Thu Aug 26 00:56:53 2004
-+++ dns.c Sun Jan 9 16:06:08 2005
-@@ -32,9 +32,18 @@
+--- dns.c.orig 2004-08-26 09:56:53.000000000 +0200
++++ dns.c
+@@ -32,9 +32,17 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-+
+#ifdef __APPLE__
+#include <arpa/nameser8_compat.h>
+#else
@@ -21,7 +20,45 @@
#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
-@@ -814,9 +823,9 @@
+@@ -282,6 +290,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
+@@ -448,14 +467,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",
+@@ -814,17 +833,17 @@ void dorequest(char *s,int type,word id)
{
packetheader *hp;
int r,i;
@@ -29,7 +66,39 @@
+ 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,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));
+ }
+
+@@ -1161,15 +1180,15 @@ void dns_ack(void)
+ if (r > 0) {
+ /* Check to see if this server is actually one we sent to */
+ if (from.sin_addr.s_addr == localhost) {
+- for (i = 0;i < _res.nscount;i++)
+- if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
+- (!_res.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */
++ for (i = 0;i < myres.nscount;i++)
++ if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) ||
++ (!myres.nsaddr_list[i].sin_addr.s_addr)) /* 0.0.0.0 replies as 127.0.0.1 */
+ break;
+ } else
+- for (i = 0;i < _res.nscount;i++)
+- if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
++ for (i = 0;i < myres.nscount;i++)
++ if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
+ break;
+- if (i == _res.nscount) {
++ if (i == myres.nscount) {
+ sprintf(tempstring,"Resolver error: Received reply from unknown source: %s",
+ inet_ntoa(from.sin_addr));
+ restell(tempstring);
Home |
Main Index |
Thread Index |
Old Index