Date: Sun, 9 Sep 2012 17:49:55 +0900 (JST) From: Masaki TAGAWA <masaki@club.kyutech.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/171491: [PATCH] www/http_get: Makefile changed, update to 20100619 and take maintainership Message-ID: <201209090849.q898ntZZ037874@rosetta.club.kyutech.ac.jp> Resent-Message-ID: <201209090900.q8990I0C022769@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171491 >Category: ports >Synopsis: [PATCH] www/http_get: Makefile changed, update to 20100619 and take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 09 09:00:17 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Masaki TAGAWA >Release: FreeBSD 9.0-STABLE amd64 >Organization: Kyushu Institute of Technology >Environment: System: FreeBSD rosetta.club.kyutech.ac.jp 9.0-STABLE FreeBSD 9.0-STABLE #8: Mon Jul 2 11:36:08 JST 2012 root@rosetta.club.kyutech.ac.jp:/usr/obj/usr/src/sys/CLUBVMKERNEL amd64 >Description: * Makefile changed - Now it supports https (SSL) * Update to 20100619 (latest) * I can take maintainership >How-To-Repeat: >Fix: --- http_get.patch begins here --- diff -ruN /usr/ports/www/http_get.old/Makefile /usr/ports/www/http_get/http_get/Makefile --- /usr/ports/www/http_get.old/Makefile 2009-07-06 16:09:21.000000000 +0900 +++ /usr/ports/www/http_get/Makefile 2012-09-09 11:46:14.940485404 +0900 @@ -6,19 +6,23 @@ # PORTNAME= http_get -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.0.20100619 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/http_get/ -DISTNAME= ${PORTNAME}_18mar2002 +DISTNAME= ${PORTNAME}_19jun2010 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= masaki@club.kyutech.ac.jp COMMENT= Dump http-contents to stdout WRKSRC= ${WRKDIR}/http_get +MAKEFILE= ${FILESDIR}/Makefile.bsd MAN1= http_get.1 -MANCOMPRESSED= no +MANCOMPRESSED= yes PLIST_FILES= bin/http_get +.ifndef NO_OPENSSL +USE_OPENSSL= yes +.endif + .include <bsd.port.mk> diff -ruN /usr/ports/www/http_get.old/distinfo /usr/ports/www/http_get/distinfo --- /usr/ports/www/http_get.old/distinfo 2011-03-19 21:34:20.000000000 +0900 +++ /usr/ports/www/http_get/distinfo 2012-09-09 11:14:14.835485946 +0900 @@ -1,2 +1,2 @@ -SHA256 (http_get_18mar2002.tar.gz) = 0cc841593596c86842a0f18143ef81fb4876e0c2fbef92e9c2687b75f0bc9dd3 -SIZE (http_get_18mar2002.tar.gz) = 6481 +SHA256 (http_get_19jun2010.tar.gz) = 8c5c58c9c2710cbb6d225b9ddf9301a894d2069a2a4852d3a1a1df8d4a7f4c6a +SIZE (http_get_19jun2010.tar.gz) = 6646 diff -ruN /usr/ports/www/http_get.old/files/Makefile.bsd /usr/ports/www/http_get/files/Makefile.bsd --- /usr/ports/www/http_get.old/files/Makefile.bsd 1970-01-01 09:00:00.000000000 +0900 +++ /usr/ports/www/http_get/files/Makefile.bsd 2012-09-09 11:42:28.675486426 +0900 @@ -0,0 +1,12 @@ +PROG = http_get +SRCS = http_get.c + +.ifndef NO_OPENSSL +CFLAGS += -DUSE_SSL -I${OPENSSLBASE}/include ${OPENSSL_CFLAGS} +LDFLAGS += -L${OPENSSLBASE}/lib -lssl -lcrypto +.endif + +BINDIR = ${PREFIX}/bin +MANDIR = ${PREFIX}/man/man + +.include <bsd.prog.mk> diff -ruN /usr/ports/www/http_get.old/files/patch-http_get.c /usr/ports/www/http_get/files/patch-http_get.c --- /usr/ports/www/http_get.old/files/patch-http_get.c 2004-12-16 03:17:20.000000000 +0900 +++ /usr/ports/www/http_get/files/patch-http_get.c 2012-09-09 11:29:37.078486042 +0900 @@ -1,9 +1,9 @@ ---- http_get.c.orig Wed Dec 15 19:10:11 2004 -+++ http_get.c Wed Dec 15 19:10:30 2004 +--- http_get.c.org 2010-06-20 11:20:30.000000000 +0900 ++++ http_get.c 2012-09-09 11:24:00.000000000 +0900 @@ -2,7 +2,9 @@ ** ** Originally based on a simple version by Al Globus <globus@nas.nasa.gov>. - ** Debugged and prettified by Jef Poskanzer <jef@acme.com>. Also includes + ** Debugged and prettified by Jef Poskanzer <jef@mail.acme.com>. Also includes -** ifdefs to handle https via OpenSSL. +** ifdefs to handle https via OpenSSL. -h argument for debugging multihomed +** URLs added by Jim Salter. @@ -11,7 +11,7 @@ */ #include <unistd.h> -@@ -35,6 +37,7 @@ +@@ -36,6 +38,7 @@ static int verbose; static int timeout; static char* url; @@ -19,51 +19,48 @@ /* Protocol symbols. */ #define PROTO_HTTP 0 -@@ -72,6 +75,8 @@ - user_agent = "http_get"; - auth_token = (char*) 0; - cookie = (char*) 0; +@@ -79,6 +82,7 @@ + ncookies = 0; + header_name = (char*) 0; + header_value = (char*) 0; + force_host = (char*) "[NONE]"; -+ + verbose = 0; while ( argn < argc && argv[argn][0] == '-' && argv[argn][1] != '\0' ) { - if ( strcmp( argv[argn], "-v" ) == 0 ) -@@ -81,6 +86,11 @@ +@@ -87,6 +91,11 @@ ++argn; timeout = atoi( argv[argn] ); } -+ else if ( strcmp( argv[argn], "-h" ) == 0 && argn + 1 < argc ) -+ { -+ ++argn; -+ force_host = argv[argn]; -+ } ++ else if ( strcmp( argv[argn], "-H" ) == 0 && argn + 1 < argc ) ++ { ++ ++argn; ++ force_host = argv[argn]; ++ } else if ( strcmp( argv[argn], "-r" ) == 0 && argn + 1 < argc ) { ++argn; -@@ -127,7 +137,7 @@ +@@ -147,7 +156,7 @@ static void usage() { -- (void) fprintf( stderr, "usage: %s [-t timeout] [-r referer] [-u user-agent] [-a username:password] url\n", argv0 ); -+ (void) fprintf( stderr, "usage: %s [-t timeout] [-h force host address] [-r referer] [-u user-agent] [-a username:password] url\n", argv0 ); +- (void) fprintf( stderr, "usage: %s [-c cookie] [-t timeout] [-r referer] [-u user-agent] [-a username:password] [-h header value] [-v] url\n", argv0 ); ++ (void) fprintf( stderr, "usage: %s [-c cookie] [-t timeout] [-H force host address] [-r referer] [-u user-agent] [-a username:password] [-h header value] [-v] url\n", argv0 ); exit( 1 ); } -@@ -218,7 +228,16 @@ - int bytes, b, header_state, status; +@@ -240,7 +249,14 @@ + int i, bytes, b, header_state, status; (void) alarm( timeout ); - sockfd = open_client_socket( host, port ); -+ -+if ( force_host == "[NONE]" ) -+ { ++ if ( strcmp( force_host, "[NONE]" ) == 0 ) ++ { + sockfd = open_client_socket( host, port ); -+ } -+else -+ { ++ } ++ else ++ { + sockfd = open_client_socket( force_host, port ); -+ } -+ ++ } #ifdef USE_SSL if ( protocol == PROTO_HTTPS ) --- http_get.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209090849.q898ntZZ037874>