diff options
| -rw-r--r-- | net/tcpdump/distinfo | 3 | ||||
| -rw-r--r-- | net/tcpdump/patches/patch-af | 18 | ||||
| -rw-r--r-- | www/analog/patches/patch-ac | 26 |
3 files changed, 37 insertions, 10 deletions
diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo index 856831c9e05..457650b922e 100644 --- a/net/tcpdump/distinfo +++ b/net/tcpdump/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.15 2007/08/02 15:16:51 taca Exp $ +$NetBSD: distinfo,v 1.16 2007/10/19 03:48:47 taca Exp $ SHA1 (tcpdump-3.9.7.tar.gz) = 5d2a95f0de1cbae70ba01c64f9a2c0fac0183dba RMD160 (tcpdump-3.9.7.tar.gz) = 1c662f61c99121bfc8336eb059b60630cab03998 Size (tcpdump-3.9.7.tar.gz) = 873866 bytes +SHA1 (patch-af) = 5bf681fd99c2436875d7aafb8939fae231e906cf diff --git a/net/tcpdump/patches/patch-af b/net/tcpdump/patches/patch-af new file mode 100644 index 00000000000..e1fdbd96e93 --- /dev/null +++ b/net/tcpdump/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.3 2007/10/19 03:48:47 taca Exp $ + +--- print-rsvp.c.orig Thu Jun 14 10:03:21 2007 ++++ print-rsvp.c +@@ -1574,11 +1574,12 @@ rsvp_obj_print (const u_char *tptr, cons + + case RSVP_OBJ_LABEL_SET: + switch(rsvp_obj_ctype) { ++ u_int action, subchannel; ++ + case RSVP_CTYPE_1: + if (obj_tlen < 4) + return-1; + +- u_int action, subchannel; + action = (EXTRACT_16BITS(obj_tptr)>>8); + + printf("%s Action: %s (%u), Label type: %u", ident, diff --git a/www/analog/patches/patch-ac b/www/analog/patches/patch-ac index 42b121173cf..2b7d8ff259d 100644 --- a/www/analog/patches/patch-ac +++ b/www/analog/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.5 2007/05/29 09:03:13 tron Exp $ +$NetBSD: patch-ac,v 1.6 2007/10/19 03:51:51 taca Exp $ ---- alias.c.orig 2004-12-19 13:51:30.000000000 +0000 -+++ alias.c 2007-05-29 08:58:48.000000000 +0100 +--- alias.c.orig Sun Dec 19 22:51:30 2004 ++++ alias.c @@ -13,6 +13,10 @@ #include "anlghea3.h" @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/29 09:03:13 tron Exp $ /* Throughout this file, to avoid a buffer overflow, we must be careful when we do any operation which can increase the length of the name. Such operations are thankfully rare, except for user aliases in wildalias(). -@@ -213,7 +217,12 @@ +@@ -213,7 +217,12 @@ logical do_aliasS(char *name) { /* DNS lookup */ #ifndef NODNS @@ -26,14 +26,22 @@ $NetBSD: patch-ac,v 1.5 2007/05/29 09:03:13 tron Exp $ do_dns(name, NULL, dnslevel); len = (int)strlen(name) - 1; } -@@ -605,6 +614,37 @@ +@@ -586,6 +595,10 @@ logical dnsresolve(char *name, choice le + volatile logical done = FALSE; + #ifndef MAC + IN_ADDR_T addr; ++#ifdef IPV6 ++ struct addrinfo hints, *res; ++ char host[NI_MAXHOST]; ++#endif + #ifdef VMS + char *addrp; + #else +@@ -605,6 +618,34 @@ logical dnsresolve(char *name, choice le done = IpAddr2Name(name); /* Doesn't currently include code to use SIGALRM */ #else +#ifdef IPV6 -+ struct addrinfo hints, *res; -+ char host[NI_MAXHOST]; -+ + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_NUMERICHOST; + res = NULL; @@ -64,7 +72,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/29 09:03:13 tron Exp $ addr = inet_addr(name); if (addr != INET_ADDR_ERR) { addrp = (char *) &addr; -@@ -631,6 +671,7 @@ +@@ -631,6 +672,7 @@ logical dnsresolve(char *name, choice le } #endif } |