Date: Thu, 4 Oct 2012 23:46:23 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172325: [exp-run] ftp/curl: update to 7.27.0 Message-ID: <3XXdk721WXz7B4@sunpoet.net> Resent-Message-ID: <201210041550.q94FoA3H080319@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172325 >Category: ports >Synopsis: [exp-run] ftp/curl: update to 7.27.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 04 15:50:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0: Sat Sep 8 01:52:48 CST >Description: Request for exp-run. The attached patch is also available at [1]. [1] http://people.freebsd.org/~sunpoet/curl.patch - Update to 7.27.0 - Convert to new options framework - Adjust option: LIBIDN -> IDN - Add option: GSSAPI (off by default to keep package unchanged in this update) - Sort option handler - Cosmetic change Changes: http://curl.haxx.se/changes.html Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- curl-7.27.0.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 305261) +++ Makefile (working copy) @@ -1,13 +1,8 @@ -# New ports collection makefile for: curl -# Date created: 12 December 1998 -# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za> -# +# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za> # $FreeBSD$ -# PORTNAME= curl -PORTVERSION= 7.24.0 -PORTREVISION= 1 +PORTVERSION= 7.27.0 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -18,21 +13,14 @@ LICENSE= MIT -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 \ - CA_BUNDLE "Install CA bundle for OpenSSL" on \ - PROXY "Proxy support" on \ - RTMP "RTMP streams support" off \ - TRACKMEMORY "Enable curl memory diagnostic output" off +OPTIONS_DEFINE= CA_BUNDLE CARES CURL_DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 KERBEROS4 LDAP LDAPS LIBSSH2 NTLM PROXY RTMP TRACKMEMORY +OPTIONS_DEFAULT=CA_BUNDLE IPV6 OPENSSL PROXY SSL +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL +CA_BUNDLE_DESC= Install CA bundle for OpenSSL +CURL_DEBUG_DESC= cURL diagnostic output +LIBSSH2_DESC= SCP/SFTP support via libssh2 +TRACKMEMORY_DESC= cURL memory diagnostic output CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \ --enable-imap --enable-pop3 --enable-rtsp --enable-smtp @@ -52,7 +40,7 @@ MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \ TODO TheArtOfHttpScripting VERSIONS curl-config.html \ curl-config.pdf curl.html curl.pdf index.html -MAN1= curl.1 curl-config.1 +MAN1= curl.1 curl-config.1 mk-ca-bundle.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_recv.3 curl_easy_reset.3 \ @@ -65,160 +53,160 @@ 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_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_unescape.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 -PLIST_SUB= SHLIB_VER="${SHLIB_VER}" +PLIST_SUB+= SHLIB_VER="${SHLIB_VER}" SHLIB_VER= 6 .endif .include <bsd.port.options.mk> -.if defined(WITH_GNUTLS) && defined(WITH_OPENSSL) -IGNORE= may only use GNU TLS if OpenSSL support is disabled +.if ${PORT_OPTIONS:MCA_BUNDLE} && empty(PORT_OPTIONS:MOPENSSL) +IGNORE= only supports CA bundle with OpenSSL .endif -.if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL) -IGNORE= only supports LIBSSH2 with OpenSSL +.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MLDAP) +IGNORE= only supports LDAPS with LDAP .endif -.if defined(WITH_NTLM) && !defined(WITH_OPENSSL) -IGNORE= only supports NTLM with OpenSSL +.if ${PORT_OPTIONS:MLDAPS} && empty(PORT_OPTIONS:MSSL) +IGNORE= only supports LDAPS with SSL (OpenSSL or GnuTLS) .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) +.if ${PORT_OPTIONS:MLIBSSH2} && empty(PORT_OPTIONS:MOPENSSL) +IGNORE= only supports LIBSSH2 with OpenSSL .endif + +.if ${PORT_OPTIONS:MNTLM} && empty(PORT_OPTIONS:MOPENSSL) +IGNORE= only supports NTLM with OpenSSL .endif -.endif -.if !defined(WITHOUT_OPENSSL) -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.if !defined(WITHOUT_CA_BUNDLE) +.if ${PORT_OPTIONS:MCA_BUNDLE} RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -CONFIGURE_ARGS+= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt +CONFIGURE_ARGS+=--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt .else -CONFIGURE_ARGS+= --without-ca-bundle +CONFIGURE_ARGS+=--without-ca-bundle .endif + +.if ${PORT_OPTIONS:MCARES} +LIB_DEPENDS+= cares:${PORTSDIR}/dns/c-ares +CONFIGURE_ARGS+=--enable-ares=${LOCALBASE} .else -CONFIGURE_ARGS+= --without-ssl -.if defined(WITH_CA_BUNDLE) -IGNORE= only supports CA bundle with OpenSSL +CONFIGURE_ARGS+=--disable-ares .endif -.endif -.if defined(WITH_CARES) -LIB_DEPENDS+= cares.2:${PORTSDIR}/dns/c-ares -CONFIGURE_ARGS+= --enable-ares=${LOCALBASE} +.if ${PORT_OPTIONS:MCURL_DEBUG} +CONFIGURE_ARGS+=--enable-debug .else -CONFIGURE_ARGS+= --disable-ares +CONFIGURE_ARGS+=--disable-debug .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} 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="" +.if ${PORT_OPTIONS:MGSSAPI} +CONFIGURE_ARGS+=--with-gssapi .else -PLIST_SUB+= SSL="@comment " +CONFIGURE_ARGS+=--without-gssapi .endif -.if defined(WITH_IPV6) -CONFIGURE_ARGS+= --enable-ipv6 +.if ${PORT_OPTIONS:MIDN} +LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn +CONFIGURE_ARGS+=--with-libidn=${LOCALBASE} .else -CONFIGURE_ARGS+= --disable-ipv6 +CONFIGURE_ARGS+=--without-libidn .endif -.if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4) -CONFIGURE_ARGS += --with-krb4=/usr +.if ${PORT_OPTIONS:MIPV6} +CONFIGURE_ARGS+=--enable-ipv6 .else -CONFIGURE_ARGS += --without-krb4 +CONFIGURE_ARGS+=--disable-ipv6 .endif -.if defined(WITH_LDAP) -CONFIGURE_ARGS+= --enable-ldap -USE_OPENLDAP= yes +.if ${PORT_OPTIONS:MKERBEROS4} && exists(/usr/lib/libkrb.a) +CONFIGURE_ARGS+=--with-krb4=/usr +.else +CONFIGURE_ARGS+=--without-krb4 +.endif + +.if ${PORT_OPTIONS:MLDAP} CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--enable-ldap LDFLAGS+= -L${LOCALBASE}/lib -.if defined(WITH_LDAPS) -CONFIGURE_ARGS+= --enable-ldaps +USE_OPENLDAP= yes .else -CONFIGURE_ARGS+= --disable-ldaps +CONFIGURE_ARGS+=--disable-ldap .endif + +.if ${PORT_OPTIONS:MLDAPS} +CONFIGURE_ARGS+=--enable-ldaps .else -CONFIGURE_ARGS+= --disable-ldap --disable-ldaps +CONFIGURE_ARGS+=--disable-ldaps .endif -.if defined(WITH_LIBIDN) -LIB_DEPENDS+= idn.17:${PORTSDIR}/dns/libidn -CONFIGURE_ARGS+= --with-libidn=${LOCALBASE} +.if ${PORT_OPTIONS:MLIBSSH2} +LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2 +CONFIGURE_ARGS+=--with-libssh2=${LOCALBASE} .else -CONFIGURE_ARGS+= --without-libidn +CONFIGURE_ARGS+=--without-libssh2 .endif -.if defined(WITH_LIBSSH2) -LIB_DEPENDS+= ssh2.1:${PORTSDIR}/security/libssh2 -CONFIGURE_ARGS+= --with-libssh2=${LOCALBASE} +.if ${PORT_OPTIONS:MNTLM} +CONFIGURE_ARGS+=--enable-ntlm .else -CONFIGURE_ARGS+= --without-libssh2 +CONFIGURE_ARGS+=--disable-ntlm .endif -.if defined(WITH_CURL_DEBUG) -CONFIGURE_ARGS+= --enable-debug -.endif - -.if defined(WITH_RTMP) -LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump -CONFIGURE_ARGS+= --with-librtmp=${LOCALBASE} +.if ${PORT_OPTIONS:MOPENSSL} +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} .else -CONFIGURE_ARGS+= --without-librtmp +CONFIGURE_ARGS+=--without-ssl .endif -.if defined(WITH_TRACKMEMORY) -CONFIGURE_ARGS+= --enable-curldebug +.if ${PORT_OPTIONS:MPROXY} +CONFIGURE_ARGS+=--enable-proxy .else -CONFIGURE_ARGS+= --disable-curldebug +CONFIGURE_ARGS+=--disable-proxy .endif -.if defined(WITH_NTLM) -CONFIGURE_ARGS+= --enable-ntlm +.if ${PORT_OPTIONS:MRTMP} +LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump +CONFIGURE_ARGS+=--with-librtmp=${LOCALBASE} .else -CONFIGURE_ARGS+= --disable-ntlm +CONFIGURE_ARGS+=--without-librtmp .endif -.if !defined(WITHOUT_PROXY) -CONFIGURE_ARGS+= --enable-proxy +.if ${PORT_OPTIONS:MTRACKMEMORY} +CONFIGURE_ARGS+=--enable-curldebug .else -CONFIGURE_ARGS+= --disable-proxy +CONFIGURE_ARGS+=--disable-curldebug .endif post-patch: + @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/require "valgrind.pm";/d' ${WRKSRC}/tests/runtests.pl post-install: .if !defined(BUILDING_HIPHOP) - ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal -.if !defined(NOPORTDOCS) + ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal/ +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/ cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/ .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR}/ cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${EXAMPLESDIR}/ .endif @@ -226,14 +214,14 @@ # 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) +regression-test test: build +.if empty(PORT_OPTIONS:MPROXY) @${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 + cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 305261) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268 -SIZE (curl-7.24.0.tar.lzma) = 1973811 +SHA256 (curl-7.27.0.tar.lzma) = b986186140e0ef0102e11094873f1e71bca1159d12fe869a8aa2ce649f02b238 +SIZE (curl-7.27.0.tar.lzma) = 2037300 Index: files/patch-configure =================================================================== --- files/patch-configure (revision 305261) +++ files/patch-configure (working copy) @@ -6,22 +6,9 @@ Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-19 ---- configure.orig 2012-02-26 17:52:21.904908587 +0800 -+++ configure 2012-02-26 17:52:21.929909948 +0800 -@@ -15049,10 +15049,10 @@ - flags_dbg_all="$flags_dbg_all -gdwarf-2" - flags_dbg_all="$flags_dbg_all -gvms" - flags_dbg_yes="-g" -- flags_dbg_off="-g0" -+ flags_dbg_off="" - flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" - flags_opt_yes="-O2" -- flags_opt_off="-O0" -+ flags_opt_off="" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -@@ -15892,6 +15892,9 @@ +--- configure.orig 2012-07-28 02:25:28.000000000 +0800 ++++ configure 2012-09-22 20:54:44.428056025 +0800 +@@ -15985,6 +15985,9 @@ tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" @@ -31,7 +18,7 @@ ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -15922,6 +15925,7 @@ +@@ -16015,6 +16018,7 @@ done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -39,7 +26,7 @@ # if test "$want_debug" = "yes"; then -@@ -16139,6 +16143,9 @@ +@@ -16232,6 +16236,9 @@ # if test "$honor_optimize_option" = "yes"; then @@ -49,7 +36,7 @@ ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -16169,6 +16176,7 @@ +@@ -16262,6 +16269,7 @@ done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -57,17 +44,17 @@ if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -20137,7 +20145,8 @@ +@@ -20508,7 +20516,8 @@ PKGTEST="no" PREFIX_OPENSSL=$OPT_SSL - OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig" -+ # Use the FreeBSD location of the pkg-config libdir ++ # Use the FreeBSD location of the pkgconf libdir + OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig" { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5 $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;} if test -f "$OPENSSL_PCDIR/openssl.pc"; then -@@ -23231,29 +23240,30 @@ +@@ -23925,29 +23934,30 @@ ;; off) LIB_RTMP="-lrtmp" Index: files/patch-lib-url.c =================================================================== --- files/patch-lib-url.c (working copy) +++ files/patch-lib-url.c (working copy) @@ -3,9 +3,9 @@ Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-18 ---- lib/url.c.orig 2012-01-23 23:31:30.000000000 +0800 -+++ lib/url.c 2012-02-26 17:52:21.937920303 +0800 -@@ -797,6 +797,10 @@ +--- lib/url.c.orig 2012-07-13 20:21:05.000000000 +0800 ++++ lib/url.c 2012-09-22 20:54:44.435391726 +0800 +@@ -812,6 +812,10 @@ data->progress.flags |= PGRS_HIDE; data->state.current_speed = -1; /* init to negative == impossible */ Index: files/patch-lib::url.c =================================================================== --- files/patch-lib::url.c (revision 305261) +++ files/patch-lib::url.c (working copy) @@ -1,18 +0,0 @@ -Description: Different handling of signals and threads. -Forwarded: not-needed -Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2010-12-18 - ---- lib/url.c.orig 2012-01-23 23:31:30.000000000 +0800 -+++ lib/url.c 2012-02-26 17:52:21.937920303 +0800 -@@ -797,6 +797,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 */ -+ - data->wildcard.state = CURLWC_INIT; - data->wildcard.filelist = NULL; - data->set.fnmatch = ZERO_NULL; Index: files/patch-src-tool_operate.c =================================================================== --- files/patch-src-tool_operate.c (revision 305261) +++ files/patch-src-tool_operate.c (working copy) @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2012-01-23 23:31:30.000000000 +0800 -+++ src/tool_operate.c 2012-02-26 17:40:00.117907281 +0800 -@@ -580,22 +580,10 @@ +--- src/tool_operate.c.orig 2012-07-24 01:59:20.000000000 +0800 ++++ src/tool_operate.c 2012-09-22 20:54:44.439408357 +0800 +@@ -653,22 +653,10 @@ DEBUGASSERT(!outs.filename); } @@ -26,7 +26,7 @@ if(!file) { helpf(config->errors, "Can't open '%s'!\n", outfile); res = CURLE_WRITE_ERROR; -@@ -603,6 +591,19 @@ +@@ -676,6 +664,19 @@ } outs.fopened = TRUE; outs.stream = file; --- curl-7.27.0.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?3XXdk721WXz7B4>