ports/169812: [UPDATE] ftp/curl to 7.26.0
Denis Generalov
gd at rambler-co.ru
Thu Jul 12 23:30:02 UTC 2012
>Number: 169812
>Category: ports
>Synopsis: [UPDATE] ftp/curl to 7.26.0
>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: Thu Jul 12 23:30:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Denis Generalov
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
Rambler
>Environment:
FreeBSD tyl.rambler.ramblermedia.com 9.0-STABLE FreeBSD 9.0-STABLE #1: Tue Feb 14 22:57:58 MSK 2012 root at tyl2.park.rambler.ru:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
- Update to 7.26.0
- Convert options to optionsNG
- Depricates ports/148094 and ports/166870 with options converting
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/ftp/curl/Makefile ./Makefile
--- /usr/ports/ftp/curl/Makefile 2012-03-04 00:06:07.000000000 +0400
+++ ./Makefile 2012-07-13 03:20:38.000000000 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= curl
-PORTVERSION= 7.24.0
+PORTVERSION= 7.26.0
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
@@ -17,21 +17,29 @@
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= \
+ CARES \
+ CURL_DEBUG \
+ GNUTLS \
+ GSSAPI \
+ IPV6 \
+ KERBEROS4 \
+ LDAP \
+ LDAPS \
+ IDN \
+ SSH \
+ NTLM \
+ OPENSSL \
+ CA_BUNDLE \
+ PROXY \
+ RTMP \
+ TRACKMEMORY
+
+OPTIONS_DEFAULT= IPV6 OPENSSL CA_BUNDLE PROXY
+
+CURL_DEBUG_DESC= Enable curl diagnostic output
+CA_BUNDLE_DESC= Install CA bundle for OpenSSL
+TRACKMEMORY_DESC= Enable curl memory diagnostic output
CONFIGURE_ARGS= --disable-threaded-resolver --disable-werror \
--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
@@ -49,7 +57,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 \
@@ -75,82 +83,82 @@
.include <bsd.port.options.mk>
-.if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MOPENSSL}
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
+.if empty(PORT_OPTIONS:MOPENSSL)
+.if ${PORT_OPTIONS:MSSH}
+IGNORE= only supports SSH with OpenSSL
.endif
-
-.if defined(WITH_NTLM) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MNTLM}
IGNORE= only supports NTLM with OpenSSL
.endif
+.if ${PORT_OPTIONS:MCA_BUNDLE}
+IGNORE= only supports CA bundle with OpenSSL
+.endif
+.endif
-.if defined(WITH_LDAPS)
-.if !defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAPS}
+.if empty(PORT_OPTIONS:MLDAP)
IGNORE= only supports LDAPS with LDAP
-.else
-.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
-IGNORE= only supports LDAPS with SSL (OpenSSL or GNUTLS)
.endif
+.if empty(PORT_OPTIONS:MOPENSSL) && empty(PORT_OPTIONS:MGNUTLS)
+IGNORE= only supports LDAPS with SSL (OpenSSL or GNUTLS)
.endif
.endif
-.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=yes
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
-.if !defined(WITHOUT_CA_BUNDLE)
-RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+.if ${PORT_OPTIONS:MCA_BUNDLE}
+RUN_DEPENDS+= ca_root_nss>=3.*:${PORTSDIR}/security/ca_root_nss
CONFIGURE_ARGS+= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
.else
CONFIGURE_ARGS+= --without-ca-bundle
.endif
.else
CONFIGURE_ARGS+= --without-ssl
-.if defined(WITH_CA_BUNDLE)
-IGNORE= only supports CA bundle with OpenSSL
-.endif
.endif
-.if defined(WITH_CARES)
-LIB_DEPENDS+= cares.2:${PORTSDIR}/dns/c-ares
+.if ${PORT_OPTIONS:MCARES}
+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}
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE}
.else
-CONFIGURE_ARGS+=--without-gnutls
+CONFIGURE_ARGS+= --without-gnutls
.endif
-.if defined(WITH_OPENSSL) || defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
PLIST_SUB+= SSL=""
.else
PLIST_SUB+= SSL="@comment "
.endif
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
-.if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
+.if exists(/usr/lib/libkrb.a) && ${PORT_OPTIONS:MKERBEROS4}
CONFIGURE_ARGS += --with-krb4=/usr
.else
CONFIGURE_ARGS += --without-krb4
.endif
-.if defined(WITH_LDAP)
-CONFIGURE_ARGS+= --enable-ldap
+.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= yes
+CONFIGURE_ARGS+= --enable-ldap
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.if defined(WITH_LDAPS)
+.if ${PORT_OPTIONS:MLDAPS}
CONFIGURE_ARGS+= --enable-ldaps
.else
CONFIGURE_ARGS+= --disable-ldaps
@@ -159,44 +167,50 @@
CONFIGURE_ARGS+= --disable-ldap --disable-ldaps
.endif
-.if defined(WITH_LIBIDN)
+.if ${PORT_OPTIONS:MIDN}
LIB_DEPENDS+= idn.17:${PORTSDIR}/dns/libidn
CONFIGURE_ARGS+= --with-libidn=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-libidn
.endif
-.if defined(WITH_LIBSSH2)
+.if ${PORT_OPTIONS:MSSH}
LIB_DEPENDS+= ssh2.1:${PORTSDIR}/security/libssh2
CONFIGURE_ARGS+= --with-libssh2=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-libssh2
.endif
-.if defined(WITH_CURL_DEBUG)
+.if ${PORT_OPTIONS:MCURL_DEBUG}
CONFIGURE_ARGS+= --enable-debug
.endif
-.if defined(WITH_RTMP)
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+= --with-gssapi
+.else
+CONFIGURE_ARGS+= --without-gssapi
+.endif
+
+.if ${PORT_OPTIONS:MRTMP}
LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump
CONFIGURE_ARGS+= --with-librtmp=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-librtmp
.endif
-.if defined(WITH_TRACKMEMORY)
+.if ${PORT_OPTIONS:MTRACKMEMORY}
CONFIGURE_ARGS+= --enable-curldebug
.else
CONFIGURE_ARGS+= --disable-curldebug
.endif
-.if defined(WITH_NTLM)
+.if ${PORT_OPTIONS:MNTLM}
CONFIGURE_ARGS+= --enable-ntlm
.else
CONFIGURE_ARGS+= --disable-ntlm
.endif
-.if !defined(WITHOUT_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
CONFIGURE_ARGS+= --enable-proxy
.else
CONFIGURE_ARGS+= --disable-proxy
@@ -220,7 +234,7 @@
# 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)
+.if empty(PORT_OPTIONS:MPROXY)
@${ECHO_MSG} "******************************************"
@${ECHO_MSG} "* You have disabled curl proxy support. *"
@${ECHO_MSG} "* Some tests SHALL FAIL! *"
diff -ruN --exclude=CVS /usr/ports/ftp/curl/distinfo ./distinfo
--- /usr/ports/ftp/curl/distinfo 2012-03-04 00:06:07.000000000 +0400
+++ ./distinfo 2012-07-12 18:38:30.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (curl-7.24.0.tar.lzma) = cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
-SIZE (curl-7.24.0.tar.lzma) = 1973811
+SHA256 (curl-7.26.0.tar.lzma) = 2e3fd7869b80f208a10dc59edd3cbe9b77d9951fe24210cea4657904279d9695
+SIZE (curl-7.26.0.tar.lzma) = 1996532
diff -ruN --exclude=CVS /usr/ports/ftp/curl/files/patch-configure ./files/patch-configure
--- /usr/ports/ftp/curl/files/patch-configure 2012-03-04 00:06:07.000000000 +0400
+++ ./files/patch-configure 2012-07-12 19:11:14.000000000 +0400
@@ -8,20 +8,20 @@
--- configure.orig 2012-02-26 17:52:21.904908587 +0800
+++ configure 2012-02-26 17:52:21.929909948 +0800
-@@ -15049,10 +15049,10 @@
+@@ -15023,10 +15023,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_all="-O -O0 -O1 -O2 -Os -O3 -O4"
+ flags_opt_yes="-Os"
- 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 @@
+@@ -15976,6 +15976,9 @@
tmp_CFLAGS="$CFLAGS"
tmp_CPPFLAGS="$CPPFLAGS"
@@ -31,7 +31,7 @@
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
-@@ -15922,6 +15925,7 @@
+@@ -16006,6 +16009,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
@@ -39,7 +39,7 @@
#
if test "$want_debug" = "yes"; then
-@@ -16139,6 +16143,9 @@
+@@ -16223,6 +16227,9 @@
#
if test "$honor_optimize_option" = "yes"; then
@@ -49,7 +49,7 @@
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
-@@ -16169,6 +16176,7 @@
+@@ -16253,6 +16260,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
@@ -57,7 +57,7 @@
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 @@
+@@ -20424,7 +20431,8 @@
PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL
@@ -67,7 +67,7 @@
{ $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 @@
+@@ -23490,29 +23499,30 @@
;;
off)
LIB_RTMP="-lrtmp"
diff -ruN --exclude=CVS /usr/ports/ftp/curl/files/patch-lib::url.c ./files/patch-lib::url.c
--- /usr/ports/ftp/curl/files/patch-lib::url.c 2012-03-04 00:06:07.000000000 +0400
+++ ./files/patch-lib::url.c 2012-07-12 19:11:48.000000000 +0400
@@ -5,7 +5,7 @@
--- 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 @@
+@@ -812,6 +812,10 @@
data->progress.flags |= PGRS_HIDE;
data->state.current_speed = -1; /* init to negative == impossible */
diff -ruN --exclude=CVS /usr/ports/ftp/curl/files/patch-src-tool_operate.c ./files/patch-src-tool_operate.c
--- /usr/ports/ftp/curl/files/patch-src-tool_operate.c 2012-03-03 12:05:19.000000000 +0400
+++ ./files/patch-src-tool_operate.c 2012-07-12 19:13:31.000000000 +0400
@@ -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 @@
+@@ -599,22 +599,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 @@
+@@ -622,6 +608,19 @@
}
outs.fopened = TRUE;
outs.stream = file;
===> Done
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list