Index: branches/2017Q2/ftp/curl/Makefile =================================================================== --- branches/2017Q2/ftp/curl/Makefile (revision 443700) +++ branches/2017Q2/ftp/curl/Makefile (revision 443701) @@ -1,163 +1,163 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.54.0 +PORTVERSION= 7.54.1 CATEGORIES= ftp net www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP OPTIONS_RADIO= RESOLV SSL OPTIONS_SINGLE= GSSAPI OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP CA_BUNDLE_DESC= Install CA bundle for OpenSSL CA_BUNDLE_IMPLIES= OPENSSL COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking LDAPS_IMPLIES= LDAP LIBSSH2_DESC= SCP/SFTP support via libssh2 LIBSSH2_IMPLIES= OPENSSL RESOLV_DESC= DNS resolving options SMB_DESC= SMB/CIFS support THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support CONFIGURE_ARGS= --disable-werror \ --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ --without-axtls CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= test USE_LDCONFIG= yes USE_PERL5= build USES= cpe gmake libtool localbase pathfix perl5 shebangfix tar:lzma PORTDOCS= * PORTEXAMPLES= * CPE_VENDOR= haxx DOCS= BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ FEATURES HISTORY.md HTTP-COOKIES.md HTTP2.md INSTALL \ INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md MAIL-ETIQUETTE \ MANUAL RELEASE-PROCEDURE RESOURCES ROADMAP.md SECURITY.md \ SSL-PROBLEMS.md SSLCERTS.md THANKS TODO TheArtOfHttpScripting \ VERSIONS SHEBANG_FILES= */*.pl CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle CA_BUNDLE_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CARES_CONFIGURE_ENABLE= ares CARES_LIB_DEPENDS= libcares.so:dns/c-ares COOKIES_CONFIGURE_ENABLE= cookies CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_BASE_LIBS= ${GSSAPILIBS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS} GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_MIT_LIBS= ${GSSAPILIBS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi HTTP2_CONFIGURE_WITH= nghttp2 HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 HTTP2_USES= pkgconfig IDN_CONFIGURE_WITH= libidn2 IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= OPENLDAP=yes LDAPS_CONFIGURE_ENABLE= ldaps LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 METALINK_CONFIGURE_WITH=libmetalink METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink METALINK_LIBS= -lcrypto NSS_CONFIGURE_WITH= nss NSS_LIB_DEPENDS= libnss3.so:security/nss NSS_USES= pkgconfig OPENSSL_CONFIGURE_OFF= --without-ssl OPENSSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_USES= ssl POLARSSL_CONFIGURE_WITH=polarssl POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 PROXY_CONFIGURE_ENABLE= proxy PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl RTMP_CONFIGURE_WITH= librtmp RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_USES= pkgconfig SMB_CONFIGURE_ENABLE= smb THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded-resolver TLS_SRP_CONFIGURE_ENABLE= tls-srp WOLFSSL_CONFIGURE_WITH= cyassl WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl .include .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL .endif .if ${PORT_OPTIONS:MTLS_SRP} && ${SSL_DEFAULT:Mlibressl*} IGNORE= unsupported TLS-SRP in LibreSSL .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include |include |' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h post-install: ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ pre-test-PROXY-off: @${ECHO_MSG} "******************************************" @${ECHO_MSG} "* You have disabled curl proxy support. *" @${ECHO_MSG} "* Some tests SHALL FAIL! *" @${ECHO_MSG} "* This is being addressed. *" @${ECHO_MSG} "******************************************" .include Index: branches/2017Q2/ftp/curl/distinfo =================================================================== --- branches/2017Q2/ftp/curl/distinfo (revision 443700) +++ branches/2017Q2/ftp/curl/distinfo (revision 443701) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492694896 -SHA256 (curl-7.54.0.tar.lzma) = cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a -SIZE (curl-7.54.0.tar.lzma) = 2084912 +TIMESTAMP = 1497527215 +SHA256 (curl-7.54.1.tar.lzma) = 2b7af34d4900887e0b4e0a9f545b9511ff774d07151ae4976485060d3e1bdb6e +SIZE (curl-7.54.1.tar.lzma) = 2101798 Index: branches/2017Q2/ftp/curl/files/patch-configure =================================================================== --- branches/2017Q2/ftp/curl/files/patch-configure (revision 443700) +++ branches/2017Q2/ftp/curl/files/patch-configure (revision 443701) @@ -1,140 +1,140 @@ Description: Tweak the build for a FreeBSD environment. Respect user-supplied CFLAGS Use the FreeBSD location of pkg-config's library directory. Check for librtmp in sensible locations in all cases. Forwarded: not-needed Author: Peter Pentchev Last-Update: 2010-12-19 ---- configure.orig 2013-10-12 20:24:48 UTC +--- configure.orig 2017-06-14 06:10:57 UTC +++ configure -@@ -3611,9 +3611,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -4149,9 +4149,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; - -l* | --library=*) - xc_bad_var_ldflags=yes - ;; +# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk) +# -l* | --library=*) +# xc_bad_var_ldflags=yes +# ;; esac done if test $xc_bad_var_ldflags = yes; then -@@ -3683,9 +3684,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -4221,9 +4222,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in - -D*) - xc_bad_var_cflags=yes - ;; +# Temporarily disable -D* flag check (PR/177401, PR/180944) +# -D*) +# xc_bad_var_cflags=yes +# ;; -U*) xc_bad_var_cflags=yes ;; -@@ -16960,6 +16962,8 @@ $as_echo "$as_me: WARNING: compiler opti +@@ -17982,6 +17984,8 @@ $as_echo "$as_me: WARNING: compiler opti tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" +# Do not remove the user-supplied debug flags in CFLAGS (PR/150854) +if false; then ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -16990,6 +16994,7 @@ $as_echo "$as_me: WARNING: compiler opti +@@ -18012,6 +18016,7 @@ $as_echo "$as_me: WARNING: compiler opti done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS +fi # if test "$want_debug" = "yes"; then -@@ -17207,6 +17212,8 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -18229,6 +18234,8 @@ $as_echo "$honor_optimize_option" >&6; } # if test "$honor_optimize_option" = "yes"; then +# Do not remove the user-supplied optimization flags in CFLAGS (PR/150854) +if false; then ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -17237,6 +17244,7 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -18259,6 +18266,7 @@ $as_echo "$honor_optimize_option" >&6; } done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS +fi if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -25050,29 +25059,30 @@ $as_echo "found" >&6; } +@@ -26661,30 +26669,30 @@ $as_echo "found" >&6; } ;; off) LIB_RTMP="-lrtmp" + LD_RTMP="" + CPP_RTMP="" + DIR_RTMP="" ;; *) - PREFIX_RTMP=$OPT_LIBRTMP -+ LIB_RTMP="-lrtmp" + LIB_RTMP="-lrtmp" + LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff" + CPP_RTMP="-I${PREFIX_RTMP}/include" + DIR_RTMP="${PREFIX_RTMP}/lib$libsuff" + PREFIX_RTMP=$OPT_LIBRTMP ;; esac - if test -n "$PREFIX_RTMP"; then - LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff - CPP_RTMP=-I${PREFIX_RTMP}/include - DIR_RTMP=${PREFIX_RTMP}/lib$libsuff - fi - LDFLAGS="$LDFLAGS $LD_RTMP" CPPFLAGS="$CPPFLAGS $CPP_RTMP" LIBS="$LIB_RTMP $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5 -$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5 +$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; } if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lrtmp $LIBS" +LIBS="$LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -39613,9 +39623,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -41279,9 +41287,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; - -l* | --library=*) - xc_bad_var_ldflags=yes - ;; +# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk) +# -l* | --library=*) +# xc_bad_var_ldflags=yes +# ;; esac done if test $xc_bad_var_ldflags = yes; then -@@ -39685,9 +39696,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -41351,9 +41360,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in - -D*) - xc_bad_var_cflags=yes - ;; +# Temporarily disable -D* flag check (PR/177401, PR/180944) +# -D*) +# xc_bad_var_cflags=yes +# ;; -U*) xc_bad_var_cflags=yes ;; Index: branches/2017Q2/ftp/curl/files/patch-src-tool_operate.c =================================================================== --- branches/2017Q2/ftp/curl/files/patch-src-tool_operate.c (revision 443700) +++ branches/2017Q2/ftp/curl/files/patch-src-tool_operate.c (revision 443701) @@ -1,54 +1,54 @@ ---- src/tool_operate.c.orig 2013-07-31 20:53:34 UTC +--- src/tool_operate.c.orig 2017-06-09 09:57:41 UTC +++ src/tool_operate.c -@@ -589,20 +589,7 @@ static CURLcode operate_do(struct Global +@@ -654,20 +654,7 @@ static CURLcode operate_do(struct Global DEBUGASSERT(!outs.filename); } - 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; - } - - if(config->resume_from) { + if(config->resume_from || config->resume_from_current) { #ifdef __VMS /* open file for output, forcing VMS output format into stream mode which is needed for stat() call above to always work. */ -@@ -610,7 +597,8 @@ static CURLcode operate_do(struct Global +@@ -675,7 +662,8 @@ static CURLcode operate_do(struct Global "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0"); #else /* open file for output: */ - FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); + /* (always open for appending, it has no effect on new files) */ + FILE *file = fopen(outfile, "ab"); #endif if(!file) { helpf(global->errors, "Can't open '%s'!\n", outfile); -@@ -619,6 +607,19 @@ static CURLcode operate_do(struct Global +@@ -684,6 +672,19 @@ static CURLcode operate_do(struct Global } outs.fopened = TRUE; outs.stream = file; + + 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 { Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 443700) +++ branches/2017Q2 (revision 443701) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r443658