Commit fa6ca163 authored by Karel Slaný's avatar Karel Slaný
Browse files

Merge branch 'curl-fixes' into develop

Datovka has problems connecting to data boxes when using a user certificate
with libcurl 7.60 and 7.61.
parents 8dac2dd9 2b7db2a6
......@@ -372,6 +372,7 @@ build_libcurl () {
if [ "x${TYPE}" = "xshared" ]; then
CONFOPTS="${CONFOPTS} --disable-static"
fi
#CONFOPTS="${CONFOPTS} --enable-crypto-auth" # ?
CONFOPTS="${CONFOPTS} --enable-http"
CONFOPTS="${CONFOPTS} --enable-ipv6"
CONFOPTS="${CONFOPTS} --enable-proxy"
......@@ -390,7 +391,11 @@ build_libcurl () {
CONFOPTS="${CONFOPTS} --disable-telnet"
CONFOPTS="${CONFOPTS} --disable-tftp"
CONFOPTS="${CONFOPTS} --without-axtls"
CONFOPTS="${CONFOPTS} --without-cyassl"
CONFOPTS="${CONFOPTS} --without-ssl" # without OpenSSL
CONFOPTS="${CONFOPTS} --without-wolfssl" # since curl-7.60.0
CONFOPTS="${CONFOPTS} --without-zsh-functions-dir"
#CONFOPTS="${CONFOPTS} --with-ca-fallback" # ?
CONFOPTS="${CONFOPTS} --with-winssl"
./configure ${CONFOPTS} --host="${X86_MINGV_HOST}" \
......
......@@ -33,7 +33,7 @@ _GETTEXT_SHA256=""
_GETTEXT_SIG_SUFF=".sig"
_GETTEXT_KEY_FP="462225C3B46F34879FC8496CD605848ED7E69871" # "Daiki Ueno <ueno@unixuser.org>"
_LIBCURL_ARCHIVE="curl-7.61.1.tar.xz"
_LIBCURL_ARCHIVE="curl-7.59.0.tar.xz"
_LIBCURL_URL_PREFIX="https://curl.haxx.se/download/"
_LIBCURL_SHA256=""
_LIBCURL_SIG_SUFF=".asc"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment