Index: head/ftp/curl/Makefile =================================================================== --- head/ftp/curl/Makefile (revision 239597) +++ head/ftp/curl/Makefile (revision 239598) @@ -1,221 +1,225 @@ # New ports collection makefile for: curl # Date created: 12 December 1998 # Whom: Neil Blakey-Milner # # $FreeBSD$ # PORTNAME= curl -PORTVERSION= 7.19.5 -PORTREVISION= 1 +PORTVERSION= 7.19.6 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.sunet.se/pub/www/utilities/curl/ \ ftp://ftp.fu-berlin.de/pub/unix/network/curl/ \ ftp://crydee.sai.msu.ru/zeus/unix/WWW/tools/mirror/ MASTER_SITE_SUBDIR= curl MAINTAINER= roam@FreeBSD.org COMMENT= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss PATCH_STRIP= -p1 MAN1= curl.1 curl-config.1 MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 \ curl_easy_escape.3 curl_easy_getinfo.3 \ curl_easy_init.3 curl_easy_pause.3 \ curl_easy_perform.3 curl_easy_reset.3 curl_easy_recv.3 \ curl_easy_send.3 \ curl_easy_setopt.3 curl_easy_strerror.3 curl_easy_unescape.3 \ curl_escape.3 \ curl_unescape.3 curl_formadd.3 curl_formget.3 curl_formfree.3 curl_free.3 \ curl_getdate.3 curl_getenv.3 curl_global_init.3 \ curl_global_init_mem.3 curl_global_cleanup.3 curl_mprintf.3 \ curl_multi_add_handle.3 curl_multi_assign.3 curl_multi_cleanup.3 \ curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \ curl_multi_perform.3 curl_multi_remove_handle.3 \ curl_multi_setopt.3 curl_multi_socket.3 \ curl_multi_socket_action.3 \ curl_multi_strerror.3 curl_multi_timeout.3 \ curl_share_cleanup.3 curl_share_init.3 \ curl_share_setopt.3 curl_share_strerror.3 curl_slist_append.3 \ curl_slist_free_all.3 curl_strequal.3 curl_version.3 \ curl_version_info.3 libcurl.3 libcurl-easy.3 libcurl-errors.3 \ libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3 USE_LDCONFIG= yes SHLIB_VER= 5 MAKE_ENV= SHLIB_VER="${SHLIB_VER}" PLIST_SUB= SHLIB_VER="${SHLIB_VER}" USE_PERL5_BUILD= yes USE_BZIP2= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \ CURL_DEBUG "Enable curl diagnostic output" off \ GNUTLS "Use GNU TLS if OPENSSL is OFF" off \ IPV6 "IPv6 support" on \ KERBEROS4 "Kerberos 4 authentication" off \ LDAP "LDAP support" off \ LDAPS "LDAPS support (requires LDAP and SSL)" off \ LIBIDN "Internationalized Domain Names via libidn" off \ LIBSSH2 "SCP/SFTP support via libssh2" off \ NTLM "NTLM authentication" off \ OPENSSL "OpenSSL support" on \ - PROXY "Proxy support" on + PROXY "Proxy support" on \ + TRACKMEMORY "Enable curl memory diagnostic output" off .include .if defined(WITH_GNUTLS) && defined(WITH_OPENSSL) IGNORE= may only use GNU TLS if OpenSSL support is disabled .endif .if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL) IGNORE= only supports LIBSSH2 with OpenSSL .endif .if defined(WITH_NTLM) && !defined(WITH_OPENSSL) IGNORE= only supports NTLM with OpenSSL .endif .if defined(WITH_CARES) && defined(WITH_IPV6) IGNORE= does not support both c-ares and IPv6 - disable one of them .endif .if defined(WITH_LDAPS) .if !defined(WITH_LDAP) IGNORE= only supports LDAPS with LDAP .else .if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS) IGNORE= only supports LDAPS with SSL (OpenSSL or GNUTLS) .endif .endif .endif .if !defined(WITHOUT_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} \ --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt .else CONFIGURE_ARGS+= --without-ssl .endif .if defined(WITH_CARES) LIB_DEPENDS+= cares.2:${PORTSDIR}/dns/c-ares CONFIGURE_ARGS+= --enable-ares=${LOCALBASE} .else CONFIGURE_ARGS+= --disable-ares .endif .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE} .else CONFIGURE_ARGS+=--without-gnutls .endif .if defined(WITH_OPENSSL) || defined(WITH_GNUTLS) PLIST_SUB+= SSL="" .else PLIST_SUB+= SSL="@comment " .endif .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4) CONFIGURE_ARGS += --with-krb4=/usr .else CONFIGURE_ARGS += --without-krb4 .endif .if defined(WITH_LDAP) CONFIGURE_ARGS+= --enable-ldap USE_OPENLDAP= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ADDFLAGS= true .if defined(WITH_LDAPS) CONFIGURE_ARGS+= --enable-ldaps .else CONFIGURE_ARGS+= --disable-ldaps .endif .else CONFIGURE_ARGS+= --disable-ldap --disable-ldaps .endif .if defined(WITH_LIBIDN) LIB_DEPENDS+= idn.16:${PORTSDIR}/dns/libidn CONFIGURE_ARGS+= --with-libidn=${LOCALBASE} .else CONFIGURE_ARGS+= --without-libidn .endif .if defined(WITH_LIBSSH2) LIB_DEPENDS+= ssh2.1:${PORTSDIR}/security/libssh2 CONFIGURE_ARGS+= --with-libssh2=${LOCALBASE} .else CONFIGURE_ARGS+= --without-libssh2 .endif .if defined(WITH_CURL_DEBUG) CONFIGURE_ARGS+= --enable-debug +.endif + +.if defined(WITH_TRACKMEMORY) +CONFIGURE_ARGS+= --enable-curldebug .endif .if defined(WITH_NTLM) CONFIGURE_ARGS+= --enable-ntlm .else CONFIGURE_ARGS+= --disable-ntlm .endif .if !defined(WITHOUT_PROXY) CONFIGURE_ARGS+= --enable-proxy .else CONFIGURE_ARGS+= --disable-proxy .endif .if defined(ADDFLAGS) CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif DOCS= BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES \ HISTORY INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS \ LICENSE-MIXING MANUAL README.netware README.win32 RESOURCES \ SSLCERTS THANKS TODO TheArtOfHttpScripting VERSIONS \ curl-config.html curl-config.pdf curl.html curl.pdf \ index.html post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S@^@${WRKSRC}/docs/@} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/libcurl (cd ${WRKSRC}/docs/libcurl && exec ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/) .endif .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/docs/examples/README ${WRKSRC}/docs/examples/Makefile.example ${WRKSRC}/docs/examples/makefile* ${WRKSRC}/docs/examples/*.c ${WRKSRC}/docs/examples/*.cc ${EXAMPLESDIR}/ .endif # Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use # the user's locale when dates are sent to the server. test: build .if defined(WITHOUT_PROXY) @${ECHO_MSG} "******************************************" @${ECHO_MSG} "* You have disabled curl proxy support. *" @${ECHO_MSG} "* Some tests SHALL FAIL! *" @${ECHO_MSG} "* This is being addressed. *" @${ECHO_MSG} "******************************************" .endif @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test .include Property changes on: head/ftp/curl/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.100 \ No newline at end of property +1.101 \ No newline at end of property Index: head/ftp/curl/distinfo =================================================================== --- head/ftp/curl/distinfo (revision 239597) +++ head/ftp/curl/distinfo (revision 239598) @@ -1,3 +1,3 @@ -MD5 (curl-7.19.5.tar.bz2) = 426d161661dce70c8ea9ad8f553363a3 -SHA256 (curl-7.19.5.tar.bz2) = 05ad84a9c8d340917370f357ad9fdce5ea595deb11f4cb70f946fa48c7b02cd0 -SIZE (curl-7.19.5.tar.bz2) = 2298238 +MD5 (curl-7.19.6.tar.bz2) = 8402c1f654c51ad7287aad57c3aa79be +SHA256 (curl-7.19.6.tar.bz2) = ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021 +SIZE (curl-7.19.6.tar.bz2) = 2347791 Property changes on: head/ftp/curl/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.53 \ No newline at end of property +1.54 \ No newline at end of property Index: head/ftp/curl/files/patch-lib::nss.c =================================================================== --- head/ftp/curl/files/patch-lib::nss.c (revision 239597) +++ head/ftp/curl/files/patch-lib::nss.c (nonexistent) @@ -1,13 +0,0 @@ -Fix a typo in a comment. - ---- a/lib/nss.c -+++ b/lib/nss.c -@@ -157,7 +157,7 @@ - #endif - }; - --/* following ciphers are new in NSS 3.4 and not enabled by default, therefor -+/* following ciphers are new in NSS 3.4 and not enabled by default, therefore - they are enabled explicitly */ - static const int enable_ciphers_by_default[] = { - TLS_DHE_DSS_WITH_AES_128_CBC_SHA, Property changes on: head/ftp/curl/files/patch-lib::nss.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/curl/files/patch-include::curl::curl.h =================================================================== --- head/ftp/curl/files/patch-include::curl::curl.h (revision 239597) +++ head/ftp/curl/files/patch-include::curl::curl.h (nonexistent) @@ -1,22 +0,0 @@ -Fix two minor grammatical errors in comments. - ---- a/include/curl/curl.h -+++ b/include/curl/curl.h -@@ -186,7 +186,7 @@ - size_t nitems, - void *outstream); - --/* this is the return codes for the seek callbacks */ -+/* those are the return codes for the seek callbacks */ - #define CURL_SEEKFUNC_OK 0 - #define CURL_SEEKFUNC_FAIL 1 /* fail the entire transfer */ - #define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking can't be done, so -@@ -1516,7 +1516,7 @@ - * DESCRIPTION - * - * curl_global_init() should be invoked exactly once for each application that -- * uses libcurl and before any call of other libcurl function. -+ * uses libcurl and before any call of other libcurl functions. - * - * This function is not thread-safe! - */ Property changes on: head/ftp/curl/files/patch-include::curl::curl.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html =================================================================== --- head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html (revision 239597) +++ head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html (nonexistent) @@ -1,13 +0,0 @@ -Fix a typo. - ---- a/docs/libcurl/libcurl-tutorial.html -+++ b/docs/libcurl/libcurl-tutorial.html -@@ -329,7 +329,7 @@ -

libcurl has no means to interpret or evaluate Javascript and thus it doesn't support this. If you get yourself in a position where you face this nasty invention, the following advice have been mentioned and used in the past: -

- Depending on the Javascript complexity, write up a script that translates it to another language and execute that. -

- Read the Javascript code and rewrite the same logic in another language. --

- Implement a Javascript interpreted, people have successfully used the Mozilla Javascript engine in the past. -+

- Implement a Javascript interpreter, people have successfully used the Mozilla Javascript engine in the past. -

- Ask your admins to stop this, for a static proxy setup or similar. -

Persistence Is The Way to Happiness

-

Property changes on: head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.html ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 =================================================================== --- head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 (revision 239597) +++ head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 (nonexistent) @@ -1,13 +0,0 @@ -Fix a typo. - ---- a/docs/libcurl/libcurl-tutorial.3 -+++ b/docs/libcurl/libcurl-tutorial.3 -@@ -754,7 +754,7 @@ - - - Read the Javascript code and rewrite the same logic in another language. - --- Implement a Javascript interpreted, people have successfully used the -+- Implement a Javascript interpreter, people have successfully used the - Mozilla Javascript engine in the past. - - - Ask your admins to stop this, for a static proxy setup or similar. Property changes on: head/ftp/curl/files/patch-docs::libcurl::libcurl-tutorial.3 ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ftp/curl/files/patch-Makefile.in =================================================================== --- head/ftp/curl/files/patch-Makefile.in (revision 239597) +++ head/ftp/curl/files/patch-Makefile.in (revision 239598) @@ -1,30 +1,30 @@ Build and install the documentation as usual, no special handling. --- a/Makefile.in +++ b/Makefile.in -@@ -273,9 +273,9 @@ - libcurl.pc.in vc6curl.dsw +@@ -297,9 +297,9 @@ + libcurl.pc.in vc6curl.dsw MacOSX-Framework Android.mk $(CMAKE_DIST) bin_SCRIPTS = curl-config -SUBDIRS = lib src -DIST_SUBDIRS = $(SUBDIRS) tests include packages docs -pkgconfigdir = $(libdir)/pkgconfig +SUBDIRS = lib src docs +DIST_SUBDIRS = $(SUBDIRS) tests include packages +pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = libcurl.pc all: all-recursive -@@ -835,12 +835,10 @@ +@@ -859,12 +859,10 @@ # We extend the standard install with a custom hook: install-data-hook: cd include && $(MAKE) install - cd docs && $(MAKE) install # We extend the standard uninstall with a custom hook: uninstall-hook: cd include && $(MAKE) uninstall - cd docs && $(MAKE) uninstall ca-bundle: lib/mk-ca-bundle.pl @echo "generate a fresh ca-bundle.crt" Property changes on: head/ftp/curl/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/ftp/curl/files/patch-lib::url.c =================================================================== --- head/ftp/curl/files/patch-lib::url.c (revision 239597) +++ head/ftp/curl/files/patch-lib::url.c (revision 239598) @@ -1,15 +1,15 @@ Different handling of signals and threads. --- a/lib/url.c +++ b/lib/url.c -@@ -719,6 +719,10 @@ - data->set.httpauth = CURLAUTH_BASIC; /* defaults to basic */ - data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */ +@@ -792,6 +792,10 @@ + data->progress.flags |= PGRS_HIDE; + data->state.current_speed = -1; /* init to negative == impossible */ +#if defined(__FreeBSD_version) + data->set.no_signal = TRUE; /* different handling of signals and threads */ +#endif /* __FreeBSD_version */ + /* This no longer creates a connection cache here. It is instead made on the first call to curl_easy_perform() or when the handle is added to a multi stack. */ Property changes on: head/ftp/curl/files/patch-lib::url.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/ftp/curl/files/patch-src::main.c =================================================================== --- head/ftp/curl/files/patch-src::main.c (revision 239597) +++ head/ftp/curl/files/patch-src::main.c (revision 239598) @@ -1,55 +1,57 @@ Use fstat() instead of stat() to avoid a race condition. --- a/src/main.c +++ b/src/main.c -@@ -4355,31 +4355,32 @@ - (-1 == create_dir_hierarchy(outfile, config->errors))) - return CURLE_WRITE_ERROR; +@@ -4384,33 +4384,34 @@ + break; + } - if(config->resume_from_current) { - /* We're told to continue from where we are now. Get the - size of the file as it is now and open it for append instead */ - - struct_stat fileinfo; - - /* VMS -- Danger, the filesize is only valid for stream files */ - if(0 == stat(outfile, &fileinfo)) - /* set offset to current file size: */ - config->resume_from = fileinfo.st_size; - else - /* let offset be 0 */ - config->resume_from = 0; - } - outs.filename = outfile; - if(config->resume_from) { - outs.init = config->resume_from; + if(config->resume_from || config->resume_from_current) { /* open file for output: */ - outs.stream=(FILE *) fopen(outfile, config->resume_from?"ab":"wb"); + /* (always open for appending, it has no effect on new files) */ + outs.stream=(FILE *) fopen(outfile, "ab"); if (!outs.stream) { helpf(config->errors, "Can't open '%s'!\n", outfile); - return CURLE_WRITE_ERROR; + free(url); + res = CURLE_WRITE_ERROR; + break; } + + if(config->resume_from_current) { + /* We're told to continue from where we are now. Get the + size of the file as it is now */ + + struct_stat fileinfo; + + if(0 == fstat(fileno(outs.stream), &fileinfo)) + /* set offset to current file size: */ + config->resume_from = fileinfo.st_size; + else + /* let offset be 0 */ + config->resume_from = 0; + } + + outs.init = config->resume_from; } else { outs.stream = NULL; /* open when needed */ Property changes on: head/ftp/curl/files/patch-src::main.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property