diff options
| author | Pavel Vinogradov | 2021-12-03 18:35:40 -0500 |
|---|---|---|
| committer | Pavel Vinogradov | 2021-12-03 18:35:40 -0500 |
| commit | c00fc921c0ae286de2cd239f8fe45868cae32e5d (patch) | |
| tree | d2cfd1fa7d717f2f06b83f7d7b709d8c34307b50 | |
| parent | 7c7c5481a0fefaab4f8b9f27070b5d33a09ed874 (diff) | |
ftp/curl: more patching for ngtcp2's openssl
| -rw-r--r-- | ftp/curl/HISTORY | 4 | ||||
| -rw-r--r-- | ftp/curl/ngtcp2-openssl.patch | 59 |
2 files changed, 63 insertions, 0 deletions
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY index aa1ea332a4..97cc6f5f78 100644 --- a/ftp/curl/HISTORY +++ b/ftp/curl/HISTORY @@ -1,3 +1,7 @@ +2021-12-03 Pavel Vinogradov <public@sourcemage.org> + * ngtcp2-openssl.patch: more patching to make it work with limited + ngtcp2's openssl + 2021-12-02 Pavel Vinogradov <public@sourcemage.org> * PRE_BUILD, ngtcp2-openssl.patch: added patch to use ngtcp2's openssl when needed diff --git a/ftp/curl/ngtcp2-openssl.patch b/ftp/curl/ngtcp2-openssl.patch index d19876c83e..bef443f092 100644 --- a/ftp/curl/ngtcp2-openssl.patch +++ b/ftp/curl/ngtcp2-openssl.patch @@ -51,3 +51,62 @@ diff --git a/configure b/configure else $as_nop +@@ -25309,14 +25309,13 @@ fi + + if test X"$HAVECRYPTO" = X"yes"; then + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5 +-printf %s "checking for SSL_connect in -lssl... " >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lngtcp2_crypto_openssl" >&5 ++printf %s "checking for SSL_connect in -lngtcp2_crypto_openssl... " >&6; } + if test ${ac_cv_lib_ssl_SSL_connect+y} + then : + printf %s "(cached) " >&6 + else $as_nop + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lssl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25348,7 +25347,6 @@ if test "x$ac_cv_lib_ssl_SSL_connect" = xyes + then : + printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h + +- LIBS="-lssl $LIBS" + + fi + +@@ -25358,14 +25356,13 @@ fi + printf %s "checking for ssl with RSAglue/rsaref libs in use... " >&6; }; + OLIBS=$LIBS + LIBS="-lRSAglue -lrsaref $LIBS" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5 +-printf %s "checking for SSL_connect in -lssl... " >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lngtcp2_crypto_openssl" >&5 ++printf %s "checking for SSL_connect in -lngtcp2_crypto_openssl... " >&6; } + if test ${ac_cv_lib_ssl_SSL_connect+y} + then : + printf %s "(cached) " >&6 + else $as_nop + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lssl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25397,7 +25394,6 @@ if test "x$ac_cv_lib_ssl_SSL_connect" = xyes + then : + printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h + +- LIBS="-lssl $LIBS" + + fi + +@@ -25435,7 +25431,7 @@ done + ac_fn_c_check_header_compile "$LINENO" "x509.h" "ac_cv_header_x509_h" "$ac_includes_default" + if test "x$ac_cv_header_x509_h" = xyes + then : +- printf "%s\n" "#define HAVE_X509_H 1" >>confdefs.h ++ printe "%s\n" "#define HAVE_X509_H 0" >>confdefs.h + + fi + ac_fn_c_check_header_compile "$LINENO" "rsa.h" "ac_cv_header_rsa_h" "$ac_includes_default" |