details: https://anonhg.NetBSD.org/pkgsrc/rev/00312b74525f
branches: trunk
changeset: 488770:00312b74525f
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Wed Feb 09 11:42:38 2005 +0000
description:
Apply fix from Bryan J. Phillippe in pkg/29279: zero out struct sockaddr
before using it.
Bump PKGREVISION.
diffstat:
net/wget/Makefile | 4 ++--
net/wget/distinfo | 4 ++--
net/wget/patches/patch-ac | 17 +++++++++--------
3 files changed, 13 insertions(+), 12 deletions(-)
diffs (96 lines):
diff -r 28bebb1a1c2a -r 00312b74525f net/wget/Makefile
--- a/net/wget/Makefile Wed Feb 09 11:39:19 2005 +0000
+++ b/net/wget/Makefile Wed Feb 09 11:42:38 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2005/01/25 20:07:25 bouyer Exp $
+# $NetBSD: Makefile,v 1.79 2005/02/09 11:42:38 bouyer Exp $
DISTNAME= wget-1.9.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=wget/}
diff -r 28bebb1a1c2a -r 00312b74525f net/wget/distinfo
--- a/net/wget/distinfo Wed Feb 09 11:39:19 2005 +0000
+++ b/net/wget/distinfo Wed Feb 09 11:42:38 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2005/01/30 22:59:50 bouyer Exp $
+$NetBSD: distinfo,v 1.24 2005/02/09 11:42:38 bouyer Exp $
SHA1 (wget-1.9.1.tar.gz) = 0597a4f47b056e3e60cf7d08c9409d67358e7099
Size (wget-1.9.1.tar.gz) = 1322378 bytes
SHA1 (patch-aa) = 6ddfbceb3d66c8bce99695cf5be50b7b91aee7b2
SHA1 (patch-ab) = b00db7f71a3add563121066a3bfd378019d206bf
-SHA1 (patch-ac) = 0bd16e8d364609f9b2d73d91350a8e162a85f9e5
+SHA1 (patch-ac) = 5ad24408048d2b2264b101369959dcac25bb1d9f
SHA1 (patch-ad) = 7605ad58dfc5e6982a06437d953ec8ceb55c86e7
SHA1 (patch-ag) = d13900b60f52cac6c71f701026e6de8b32f00354
SHA1 (patch-ah) = e31060497c77f87f0ed4cab44e63597654ca0525
diff -r 28bebb1a1c2a -r 00312b74525f net/wget/patches/patch-ac
--- a/net/wget/patches/patch-ac Wed Feb 09 11:39:19 2005 +0000
+++ b/net/wget/patches/patch-ac Wed Feb 09 11:42:38 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $
+$NetBSD: patch-ac,v 1.9 2005/02/09 11:42:38 bouyer Exp $
---- src/host.c.orig Sun Oct 26 02:38:25 2003
-+++ src/host.c Sun Jan 23 21:23:28 2005
+--- src/host.c.orig 2003-10-26 02:38:25.000000000 +0100
++++ src/host.c 2005-02-08 17:36:26.000000000 +0100
@@ -189,13 +189,15 @@
if (ai->ai_family == AF_INET6)
{
@@ -34,7 +34,7 @@
return al;
}
-@@ -279,33 +284,29 @@
+@@ -279,33 +284,30 @@
*/
void
wget_sockaddr_set_address (wget_sockaddr *sa,
@@ -42,6 +42,7 @@
+ unsigned short port, ip_address *addr, int family)
{
- if (ip_family == AF_INET)
++ memset (sa, 0, sizeof(*sa));
+ if (family == AF_INET)
{
- sa->sin.sin_family = ip_family;
@@ -75,7 +76,7 @@
return;
}
#endif
-@@ -422,12 +423,12 @@
+@@ -422,12 +424,12 @@
* socklen_t structure length for socket options
*/
socklen_t
@@ -91,7 +92,7 @@
return sizeof (struct sockaddr_in6);
#endif
abort();
-@@ -435,42 +436,6 @@
+@@ -435,42 +437,6 @@
return 0;
}
@@ -134,7 +135,7 @@
/* Versions of gethostbyname and getaddrinfo that support timeout. */
-@@ -559,17 +524,16 @@
+@@ -559,17 +525,16 @@
pretty_print_address (ip_address *addr)
{
#ifdef ENABLE_IPV6
@@ -159,7 +160,7 @@
}
/* Add host name HOST with the address ADDR_TEXT to the cache.
-@@ -601,23 +565,27 @@
+@@ -601,23 +566,27 @@
lookup_host (const char *host, int silent)
{
struct address_list *al = NULL;