diff options
author | cube <cube@pkgsrc.org> | 2004-08-04 12:21:02 +0000 |
---|---|---|
committer | cube <cube@pkgsrc.org> | 2004-08-04 12:21:02 +0000 |
commit | decdb56b9d33f038ce0bd165303783c40f105954 (patch) | |
tree | a901549423d858d535fe11b2321b7e5b9d76e513 | |
parent | 2a9310b22178d43f653cfd7ac5be93978f91736a (diff) | |
download | pkgsrc-decdb56b9d33f038ce0bd165303783c40f105954.tar.gz |
Make http_load actually use the -proxy parameter. Fixes PR 26541 by
Mike Grupenhoff.
-rw-r--r-- | www/http_load/Makefile | 4 | ||||
-rw-r--r-- | www/http_load/distinfo | 3 | ||||
-rw-r--r-- | www/http_load/patches/patch-ab | 56 |
3 files changed, 60 insertions, 3 deletions
diff --git a/www/http_load/Makefile b/www/http_load/Makefile index aad8d02c9fa..a776737dff8 100644 --- a/www/http_load/Makefile +++ b/www/http_load/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/04/27 05:44:23 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/08/04 12:21:02 cube Exp $ DISTNAME= http_load-04jan2002 PKGNAME= http_load-20020104 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/http_load/ diff --git a/www/http_load/distinfo b/www/http_load/distinfo index 1cfc6369569..1b9f126cdfb 100644 --- a/www/http_load/distinfo +++ b/www/http_load/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/10/25 09:33:36 wiz Exp $ +$NetBSD: distinfo,v 1.4 2004/08/04 12:21:02 cube Exp $ SHA1 (http_load-04jan2002.tar.gz) = 7b21fd2cfeb4bf6705ef6bd3f194a6a2f01ff976 Size (http_load-04jan2002.tar.gz) = 16710 bytes SHA1 (patch-aa) = a5303abf65e48825607d47d6d519c24b28a42718 +SHA1 (patch-ab) = b10f08ce3f09d8518415f4735aad2ca8bd53de3b diff --git a/www/http_load/patches/patch-ab b/www/http_load/patches/patch-ab new file mode 100644 index 00000000000..2749d7af0d5 --- /dev/null +++ b/www/http_load/patches/patch-ab @@ -0,0 +1,56 @@ +$NetBSD: patch-ab,v 1.1 2004/08/04 12:21:02 cube Exp $ + +--- http_load.c.orig 2002-01-04 22:20:46.000000000 +0100 ++++ http_load.c +@@ -655,11 +655,11 @@ lookup_address( int url_num ) + (void) memset( &hints, 0, sizeof(hints) ); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; +- (void) snprintf( portstr, sizeof(portstr), "%d", (int) urls[url_num].port ); +- if ( (gaierr = getaddrinfo( urls[url_num].hostname, portstr, &hints, &ai )) != 0 ) ++ (void) snprintf( portstr, sizeof(portstr), "%d", (int) port ); ++ if ( (gaierr = getaddrinfo( hostname, portstr, &hints, &ai )) != 0 ) + { + (void) fprintf( +- stderr, "%s: getaddrinfo %s - %s\n", argv0, urls[url_num].hostname, ++ stderr, "%s: getaddrinfo %s - %s\n", argv0, hostname, + gai_strerror( gaierr ) ); + exit( 1 ); + } +@@ -689,7 +689,7 @@ lookup_address( int url_num ) + { + (void) fprintf( + stderr, "%s - sockaddr too small (%lu < %lu)\n", +- urls[url_num].hostname, ++ hostname, + (unsigned long) sizeof(urls[url_num].sa), + (unsigned long) aiv4->ai_addrlen ); + exit( 1 ); +@@ -708,7 +708,7 @@ lookup_address( int url_num ) + { + (void) fprintf( + stderr, "%s - sockaddr too small (%lu < %lu)\n", +- urls[url_num].hostname, ++ hostname, + (unsigned long) sizeof(urls[url_num].sa), + (unsigned long) aiv6->ai_addrlen ); + exit( 1 ); +@@ -724,15 +724,15 @@ lookup_address( int url_num ) + + (void) fprintf( + stderr, "%s: no valid address found for host %s\n", argv0, +- urls[url_num].hostname ); ++ hostname ); + exit( 1 ); + + #else /* USE_IPV6 */ + +- he = gethostbyname( urls[url_num].hostname ); ++ he = gethostbyname( hostname ); + if ( he == (struct hostent*) 0 ) + { +- (void) fprintf( stderr, "%s: unknown host - %s\n", argv0, urls[url_num].hostname ); ++ (void) fprintf( stderr, "%s: unknown host - %s\n", argv0, hostname ); + exit( 1 ); + } + urls[url_num].sock_family = urls[url_num].sa.sin_family = he->h_addrtype; |