diff options
| author | bouyer <bouyer@pkgsrc.org> | 2005-02-09 11:42:38 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2005-02-09 11:42:38 +0000 |
| commit | af5e79ba191169b127539b21872b578d16ba833d (patch) | |
| tree | 929a11cc3a16d95338e31ea5b4a5b5bcceef5d35 /net | |
| parent | 345791b837a51245b228f113945789153b176a07 (diff) | |
| download | pkgsrc-af5e79ba191169b127539b21872b578d16ba833d.tar.gz | |
Apply fix from Bryan J. Phillippe in pkg/29279: zero out struct sockaddr
before using it.
Bump PKGREVISION.
Diffstat (limited to 'net')
| -rw-r--r-- | net/wget/Makefile | 4 | ||||
| -rw-r--r-- | net/wget/distinfo | 4 | ||||
| -rw-r--r-- | net/wget/patches/patch-ac | 17 |
3 files changed, 13 insertions, 12 deletions
diff --git a/net/wget/Makefile b/net/wget/Makefile index 309983a9de5..5b2b4a5f28b 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -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 --git a/net/wget/distinfo b/net/wget/distinfo index 4e774489f66..df80e180565 100644 --- a/net/wget/distinfo +++ b/net/wget/distinfo @@ -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 --git a/net/wget/patches/patch-ac b/net/wget/patches/patch-ac index 1e6396918c2..a7917a8bc3a 100644 --- a/net/wget/patches/patch-ac +++ b/net/wget/patches/patch-ac @@ -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 @@ $NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $ return al; } -@@ -279,33 +284,29 @@ +@@ -279,33 +284,30 @@ */ void wget_sockaddr_set_address (wget_sockaddr *sa, @@ -42,6 +42,7 @@ $NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $ + 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 @@ $NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $ return; } #endif -@@ -422,12 +423,12 @@ +@@ -422,12 +424,12 @@ * socklen_t structure length for socket options */ socklen_t @@ -91,7 +92,7 @@ $NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $ return sizeof (struct sockaddr_in6); #endif abort(); -@@ -435,42 +436,6 @@ +@@ -435,42 +437,6 @@ return 0; } @@ -134,7 +135,7 @@ $NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $ /* 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 @@ $NetBSD: patch-ac,v 1.8 2005/01/30 22:59:50 bouyer Exp $ } /* 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; |