From 1f0d9c4420b1f5c78fde3b85c944c101697d180f Mon Sep 17 00:00:00 2001 From: NicJA Date: Sun, 10 Jun 2018 21:09:51 +0000 Subject: [PATCH] fix curls detection of ssl on AROS. Adjust the used link libraries (linking ssl twice seems to add unresolved symbols?) git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@55284 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- development/libs/curl/curl-7.60.0-aros.diff | 302 +++++++++++++++++++++++++--- development/libs/curl/mmakefile.src | 6 +- 2 files changed, 273 insertions(+), 35 deletions(-) diff --git a/development/libs/curl/curl-7.60.0-aros.diff b/development/libs/curl/curl-7.60.0-aros.diff index b4d681352..e6e3f6fb1 100644 --- a/development/libs/curl/curl-7.60.0-aros.diff +++ b/development/libs/curl/curl-7.60.0-aros.diff @@ -1,6 +1,6 @@ diff -ruN curl-7.60.0/acinclude.m4 curl-7.60.0.aros/acinclude.m4 --- curl-7.60.0/acinclude.m4 2018-05-07 10:18:02.000000000 +0100 -+++ curl-7.60.0.aros/acinclude.m4 2018-06-10 00:33:49.133700862 +0100 ++++ curl-7.60.0.aros/acinclude.m4 2018-06-10 21:07:08.478367466 +0100 @@ -1342,6 +1342,12 @@ #ifdef HAVE_SYS_SOCKET_H #include @@ -43,7 +43,7 @@ diff -ruN curl-7.60.0/acinclude.m4 curl-7.60.0.aros/acinclude.m4 X-unknown) diff -ruN curl-7.60.0/configure curl-7.60.0.aros/configure --- curl-7.60.0/configure 2018-05-14 13:20:30.000000000 +0100 -+++ curl-7.60.0.aros/configure 2018-06-10 00:34:16.597699463 +0100 ++++ curl-7.60.0.aros/configure 2018-06-10 21:16:06.439408512 +0100 @@ -1097,7 +1097,6 @@ docdir oldincludedir @@ -196,7 +196,137 @@ diff -ruN curl-7.60.0/configure curl-7.60.0.aros/configure # case X-"$tst_connect_need_LIBS" in X-unknown) -@@ -22893,8 +22925,38 @@ +@@ -22674,10 +22706,23 @@ + LIBS="-lcrypto $LIBS" + + else +- +- LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL" +- CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex in -lcrypto" >&5 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++void *SocketBase; ++int main (void) ++{ ++HMAC_Update(0,0,0); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ HAVECRYPTO="yes" ++else ++ LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL" ++ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex in -lcrypto" >&5 + $as_echo_n "checking for HMAC_Init_ex in -lcrypto... " >&6; } + if ${ac_cv_lib_crypto_HMAC_Init_ex+:} false; then : + $as_echo_n "(cached) " >&6 +@@ -22712,23 +22757,23 @@ + $as_echo "$ac_cv_lib_crypto_HMAC_Init_ex" >&6; } + if test "x$ac_cv_lib_crypto_HMAC_Init_ex" = xyes; then : + +- HAVECRYPTO="yes" +- LIBS="-lcrypto $LIBS" ++ HAVECRYPTO="yes" ++ LIBS="-lcrypto $LIBS" + else + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl" >&5 + $as_echo_n "checking OpenSSL linking with -ldl... " >&6; } +- LIBS="$LIBS -ldl" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ LIBS="$LIBS -ldl" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- #include ++ #include + + int main (void) + { + +- ERR_clear_error(); ++ ERR_clear_error(); + + ; + return 0; +@@ -22736,27 +22781,27 @@ + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- HAVECRYPTO="yes" ++ HAVECRYPTO="yes" + + else + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl and -lpthread" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl and -lpthread" >&5 + $as_echo_n "checking OpenSSL linking with -ldl and -lpthread... " >&6; } +- LIBS="$LIBS -lpthread" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ LIBS="$LIBS -lpthread" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- #include ++ #include + + int main (void) + { + +- ERR_clear_error(); ++ ERR_clear_error(); + + ; + return 0; +@@ -22764,17 +22809,17 @@ + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- HAVECRYPTO="yes" ++ HAVECRYPTO="yes" + + else + +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- LDFLAGS="$CLEANLDFLAGS" +- CPPFLAGS="$CLEANCPPFLAGS" +- LIBS="$CLEANLIBS" ++ LDFLAGS="$CLEANLDFLAGS" ++ CPPFLAGS="$CLEANCPPFLAGS" ++ LIBS="$CLEANLIBS" + + + fi +@@ -22791,6 +22836,10 @@ + + + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi + + + if test X"$HAVECRYPTO" = X"yes"; then +@@ -22893,8 +22942,38 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi @@ -236,7 +366,7 @@ diff -ruN curl-7.60.0/configure curl-7.60.0.aros/configure for ac_header in openssl/x509.h openssl/rsa.h openssl/crypto.h \ openssl/pem.h openssl/ssl.h openssl/err.h -@@ -30031,6 +30093,12 @@ +@@ -30031,6 +30110,12 @@ #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -249,7 +379,7 @@ diff -ruN curl-7.60.0/configure curl-7.60.0.aros/configure #endif int main (void) -@@ -30222,6 +30290,12 @@ +@@ -30222,6 +30307,12 @@ #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -264,7 +394,7 @@ diff -ruN curl-7.60.0/configure curl-7.60.0.aros/configure int main (void) diff -ruN curl-7.60.0/configure.ac curl-7.60.0.aros/configure.ac --- curl-7.60.0/configure.ac 2018-05-14 12:01:43.000000000 +0100 -+++ curl-7.60.0.aros/configure.ac 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/configure.ac 2018-06-10 21:14:46.240402393 +0100 @@ -630,6 +630,19 @@ AC_MSG_RESULT(yes) ) @@ -285,7 +415,115 @@ diff -ruN curl-7.60.0/configure.ac curl-7.60.0.aros/configure.ac dnl ********************************************************************** dnl Check for built-in manual -@@ -1715,8 +1728,23 @@ +@@ -1645,56 +1658,60 @@ + AC_CHECK_LIB(crypto, HMAC_Update,[ + HAVECRYPTO="yes" + LIBS="-lcrypto $LIBS" +- ],[ +- LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL" +- CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" +- AC_CHECK_LIB(crypto, HMAC_Init_ex,[ +- HAVECRYPTO="yes" +- LIBS="-lcrypto $LIBS"], [ +- +- dnl still no, but what about with -ldl? +- AC_MSG_CHECKING([OpenSSL linking with -ldl]) +- LIBS="$LIBS -ldl" +- AC_TRY_LINK( +- [ +- #include +- ], +- [ +- ERR_clear_error(); +- ], +- [ +- AC_MSG_RESULT(yes) +- HAVECRYPTO="yes" +- ], +- [ +- AC_MSG_RESULT(no) +- dnl ok, so what about bouth -ldl and -lpthread? +- +- AC_MSG_CHECKING([OpenSSL linking with -ldl and -lpthread]) +- LIBS="$LIBS -lpthread" +- AC_TRY_LINK( +- [ +- #include +- ], +- [ +- ERR_clear_error(); +- ], +- [ +- AC_MSG_RESULT(yes) +- HAVECRYPTO="yes" +- ], +- [ +- AC_MSG_RESULT(no) +- LDFLAGS="$CLEANLDFLAGS" +- CPPFLAGS="$CLEANCPPFLAGS" +- LIBS="$CLEANLIBS" ++ ],[AC_TRY_LINK([#include ++void *SocketBase;], ++ [HMAC_Update(0,0,0);], ++ [HAVECRYPTO="yes"], ++ [LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL" ++ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" ++ AC_CHECK_LIB(crypto, HMAC_Init_ex,[ ++ HAVECRYPTO="yes" ++ LIBS="-lcrypto $LIBS"], [ ++ ++ dnl still no, but what about with -ldl? ++ AC_MSG_CHECKING([OpenSSL linking with -ldl]) ++ LIBS="$LIBS -ldl" ++ AC_TRY_LINK( ++ [ ++ #include ++ ], ++ [ ++ ERR_clear_error(); ++ ], ++ [ ++ AC_MSG_RESULT(yes) ++ HAVECRYPTO="yes" ++ ], ++ [ ++ AC_MSG_RESULT(no) ++ dnl ok, so what about bouth -ldl and -lpthread? ++ ++ AC_MSG_CHECKING([OpenSSL linking with -ldl and -lpthread]) ++ LIBS="$LIBS -lpthread" ++ AC_TRY_LINK( ++ [ ++ #include ++ ], ++ [ ++ ERR_clear_error(); ++ ], ++ [ ++ AC_MSG_RESULT(yes) ++ HAVECRYPTO="yes" ++ ], ++ [ ++ AC_MSG_RESULT(no) ++ LDFLAGS="$CLEANLDFLAGS" ++ CPPFLAGS="$CLEANCPPFLAGS" ++ LIBS="$CLEANLIBS" + +- ]) ++ ]) + +- ]) ++ ]) + +- ]) +- ]) ++ ]) ++ ]) ++ ]) + + if test X"$HAVECRYPTO" = X"yes"; then + dnl This is only reasonable to do if crypto actually is there: check for +@@ -1715,8 +1732,23 @@ else AC_MSG_RESULT(yes) fi @@ -312,7 +550,7 @@ diff -ruN curl-7.60.0/configure.ac curl-7.60.0.aros/configure.ac AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \ diff -ruN curl-7.60.0/lib/aros.c curl-7.60.0.aros/lib/aros.c --- curl-7.60.0/lib/aros.c 1970-01-01 01:00:00.000000000 +0100 -+++ curl-7.60.0.aros/lib/aros.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/aros.c 2018-06-10 21:07:08.478367466 +0100 @@ -0,0 +1,69 @@ +/*************************************************************************** + * _ _ ____ _ @@ -385,7 +623,7 @@ diff -ruN curl-7.60.0/lib/aros.c curl-7.60.0.aros/lib/aros.c +#endif /* __AROS__ */ diff -ruN curl-7.60.0/lib/connect.c curl-7.60.0.aros/lib/connect.c --- curl-7.60.0/lib/connect.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/connect.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/connect.c 2018-06-10 21:07:08.478367466 +0100 @@ -58,6 +58,10 @@ #include #endif @@ -399,7 +637,7 @@ diff -ruN curl-7.60.0/lib/connect.c curl-7.60.0.aros/lib/connect.c #include "if2ip.h" diff -ruN curl-7.60.0/lib/curl_gethostname.c curl-7.60.0.aros/lib/curl_gethostname.c --- curl-7.60.0/lib/curl_gethostname.c 2017-12-02 23:33:20.000000000 +0000 -+++ curl-7.60.0.aros/lib/curl_gethostname.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/curl_gethostname.c 2018-06-10 21:07:08.478367466 +0100 @@ -48,6 +48,10 @@ * For libcurl static library release builds no overriding takes place. */ @@ -413,7 +651,7 @@ diff -ruN curl-7.60.0/lib/curl_gethostname.c curl-7.60.0.aros/lib/curl_gethostna #ifndef HAVE_GETHOSTNAME diff -ruN curl-7.60.0/lib/curl_setup.h curl-7.60.0.aros/lib/curl_setup.h --- curl-7.60.0/lib/curl_setup.h 2018-05-07 10:18:02.000000000 +0100 -+++ curl-7.60.0.aros/lib/curl_setup.h 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/curl_setup.h 2018-06-10 21:07:08.478367466 +0100 @@ -496,6 +496,13 @@ # endif /* MSDOS */ @@ -430,7 +668,7 @@ diff -ruN curl-7.60.0/lib/curl_setup.h curl-7.60.0.aros/lib/curl_setup.h extern char *strtok_r(char *s, const char *delim, char **last); diff -ruN curl-7.60.0/lib/file.c curl-7.60.0.aros/lib/file.c --- curl-7.60.0/lib/file.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/file.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/file.c 2018-06-10 21:07:08.478367466 +0100 @@ -137,7 +137,7 @@ char *real_path; struct FILEPROTO *file = data->req.protop; @@ -457,7 +695,7 @@ diff -ruN curl-7.60.0/lib/file.c curl-7.60.0.aros/lib/file.c /* binary zeroes indicate foul play */ diff -ruN curl-7.60.0/lib/ftp.c curl-7.60.0.aros/lib/ftp.c --- curl-7.60.0/lib/ftp.c 2018-05-14 12:30:44.000000000 +0100 -+++ curl-7.60.0.aros/lib/ftp.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/ftp.c 2018-06-10 21:07:08.478367466 +0100 @@ -46,6 +46,10 @@ #define in_addr_t unsigned long #endif @@ -471,7 +709,7 @@ diff -ruN curl-7.60.0/lib/ftp.c curl-7.60.0.aros/lib/ftp.c #include "sendf.h" diff -ruN curl-7.60.0/lib/getinfo.c curl-7.60.0.aros/lib/getinfo.c --- curl-7.60.0/lib/getinfo.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/getinfo.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/getinfo.c 2018-06-10 21:07:08.478367466 +0100 @@ -31,6 +31,10 @@ #include "connect.h" /* Curl_getconnectinfo() */ #include "progress.h" @@ -485,7 +723,7 @@ diff -ruN curl-7.60.0/lib/getinfo.c curl-7.60.0.aros/lib/getinfo.c #include "memdebug.h" diff -ruN curl-7.60.0/lib/hostip4.c curl-7.60.0.aros/lib/hostip4.c --- curl-7.60.0/lib/hostip4.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/hostip4.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/hostip4.c 2018-06-10 21:07:08.478367466 +0100 @@ -45,6 +45,10 @@ #include #endif @@ -499,7 +737,7 @@ diff -ruN curl-7.60.0/lib/hostip4.c curl-7.60.0.aros/lib/hostip4.c #include "hostip.h" diff -ruN curl-7.60.0/lib/http.c curl-7.60.0.aros/lib/http.c --- curl-7.60.0/lib/http.c 2018-05-14 12:30:44.000000000 +0100 -+++ curl-7.60.0.aros/lib/http.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/http.c 2018-06-10 21:07:08.478367466 +0100 @@ -45,6 +45,10 @@ #include #endif @@ -513,7 +751,7 @@ diff -ruN curl-7.60.0/lib/http.c curl-7.60.0.aros/lib/http.c #include "transfer.h" diff -ruN curl-7.60.0/lib/if2ip.c curl-7.60.0.aros/lib/if2ip.c --- curl-7.60.0/lib/if2ip.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/if2ip.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/if2ip.c 2018-06-10 21:07:08.478367466 +0100 @@ -50,6 +50,10 @@ # include #endif @@ -527,7 +765,7 @@ diff -ruN curl-7.60.0/lib/if2ip.c curl-7.60.0.aros/lib/if2ip.c #include "if2ip.h" diff -ruN curl-7.60.0/lib/inet_ntop.c curl-7.60.0.aros/lib/inet_ntop.c --- curl-7.60.0/lib/inet_ntop.c 2018-05-14 10:01:32.000000000 +0100 -+++ curl-7.60.0.aros/lib/inet_ntop.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/inet_ntop.c 2018-06-10 21:07:08.478367466 +0100 @@ -32,6 +32,10 @@ #include #endif @@ -541,7 +779,7 @@ diff -ruN curl-7.60.0/lib/inet_ntop.c curl-7.60.0.aros/lib/inet_ntop.c diff -ruN curl-7.60.0/lib/Makefile.in curl-7.60.0.aros/lib/Makefile.in --- curl-7.60.0/lib/Makefile.in 2018-05-14 13:20:31.000000000 +0100 -+++ curl-7.60.0.aros/lib/Makefile.in 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/Makefile.in 2018-06-10 21:07:08.478367466 +0100 @@ -227,7 +227,7 @@ libcurl_la-system_win32.lo libcurl_la-mime.lo \ libcurl_la-sha256.lo libcurl_la-setopt.lo \ @@ -592,7 +830,7 @@ diff -ruN curl-7.60.0/lib/Makefile.in curl-7.60.0.aros/lib/Makefile.in @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vtls/$(DEPDIR)/libcurl_la-openssl.Tpo vtls/$(DEPDIR)/libcurl_la-openssl.Plo diff -ruN curl-7.60.0/lib/Makefile.inc curl-7.60.0.aros/lib/Makefile.inc --- curl-7.60.0/lib/Makefile.inc 2018-05-07 10:18:02.000000000 +0100 -+++ curl-7.60.0.aros/lib/Makefile.inc 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/Makefile.inc 2018-06-10 21:07:08.478367466 +0100 @@ -54,7 +54,7 @@ http_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c rand.c \ curl_multibyte.c hostcheck.c conncache.c pipeline.c dotdot.c \ @@ -604,7 +842,7 @@ diff -ruN curl-7.60.0/lib/Makefile.inc curl-7.60.0.aros/lib/Makefile.inc formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \ diff -ruN curl-7.60.0/lib/memdebug.c curl-7.60.0.aros/lib/memdebug.c --- curl-7.60.0/lib/memdebug.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/memdebug.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/memdebug.c 2018-06-10 21:07:08.478367466 +0100 @@ -26,6 +26,10 @@ #include @@ -618,7 +856,7 @@ diff -ruN curl-7.60.0/lib/memdebug.c curl-7.60.0.aros/lib/memdebug.c #define MEMDEBUG_NODEFINES /* don't redefine the standard functions */ diff -ruN curl-7.60.0/lib/multi.c curl-7.60.0.aros/lib/multi.c --- curl-7.60.0/lib/multi.c 2018-05-07 10:18:03.000000000 +0100 -+++ curl-7.60.0.aros/lib/multi.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/multi.c 2018-06-10 21:07:08.478367466 +0100 @@ -22,6 +22,10 @@ #include "curl_setup.h" @@ -632,7 +870,7 @@ diff -ruN curl-7.60.0/lib/multi.c curl-7.60.0.aros/lib/multi.c #include "urldata.h" diff -ruN curl-7.60.0/lib/nonblock.c curl-7.60.0.aros/lib/nonblock.c --- curl-7.60.0/lib/nonblock.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/nonblock.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/nonblock.c 2018-06-10 21:07:08.478367466 +0100 @@ -37,6 +37,10 @@ #include #endif @@ -646,7 +884,7 @@ diff -ruN curl-7.60.0/lib/nonblock.c curl-7.60.0.aros/lib/nonblock.c /* diff -ruN curl-7.60.0/lib/select.c curl-7.60.0.aros/lib/select.c --- curl-7.60.0/lib/select.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/select.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/select.c 2018-06-10 21:07:08.478367466 +0100 @@ -35,6 +35,10 @@ #include #endif @@ -665,7 +903,7 @@ diff -ruN curl-7.60.0/lib/select.c curl-7.60.0.aros/lib/select.c + diff -ruN curl-7.60.0/lib/sendf.c curl-7.60.0.aros/lib/sendf.c --- curl-7.60.0/lib/sendf.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/lib/sendf.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/sendf.c 2018-06-10 21:07:08.478367466 +0100 @@ -30,6 +30,10 @@ #include #endif @@ -679,7 +917,7 @@ diff -ruN curl-7.60.0/lib/sendf.c curl-7.60.0.aros/lib/sendf.c #include "urldata.h" diff -ruN curl-7.60.0/lib/telnet.c curl-7.60.0.aros/lib/telnet.c --- curl-7.60.0/lib/telnet.c 2018-05-14 10:01:32.000000000 +0100 -+++ curl-7.60.0.aros/lib/telnet.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/telnet.c 2018-06-10 21:07:08.478367466 +0100 @@ -44,6 +44,10 @@ #include #endif @@ -693,7 +931,7 @@ diff -ruN curl-7.60.0/lib/telnet.c curl-7.60.0.aros/lib/telnet.c #include "transfer.h" diff -ruN curl-7.60.0/lib/tftp.c curl-7.60.0.aros/lib/tftp.c --- curl-7.60.0/lib/tftp.c 2018-05-07 10:18:03.000000000 +0100 -+++ curl-7.60.0.aros/lib/tftp.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/tftp.c 2018-06-10 21:07:08.478367466 +0100 @@ -44,6 +44,10 @@ #include #endif @@ -707,7 +945,7 @@ diff -ruN curl-7.60.0/lib/tftp.c curl-7.60.0.aros/lib/tftp.c #include "transfer.h" diff -ruN curl-7.60.0/lib/transfer.c curl-7.60.0.aros/lib/transfer.c --- curl-7.60.0/lib/transfer.c 2018-05-14 12:01:43.000000000 +0100 -+++ curl-7.60.0.aros/lib/transfer.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/transfer.c 2018-06-10 21:07:08.478367466 +0100 @@ -54,6 +54,10 @@ #error "We can't compile without socket() support!" #endif @@ -721,7 +959,7 @@ diff -ruN curl-7.60.0/lib/transfer.c curl-7.60.0.aros/lib/transfer.c #include "netrc.h" diff -ruN curl-7.60.0/lib/url.c curl-7.60.0.aros/lib/url.c --- curl-7.60.0/lib/url.c 2018-05-14 12:30:44.000000000 +0100 -+++ curl-7.60.0.aros/lib/url.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/url.c 2018-06-10 21:07:08.478367466 +0100 @@ -51,6 +51,10 @@ #include #endif @@ -735,7 +973,7 @@ diff -ruN curl-7.60.0/lib/url.c curl-7.60.0.aros/lib/url.c #endif diff -ruN curl-7.60.0/lib/vtls/vtls.c curl-7.60.0.aros/lib/vtls/vtls.c --- curl-7.60.0/lib/vtls/vtls.c 2018-05-14 12:01:43.000000000 +0100 -+++ curl-7.60.0.aros/lib/vtls/vtls.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/lib/vtls/vtls.c 2018-06-10 21:07:08.478367466 +0100 @@ -50,6 +50,11 @@ #include "urldata.h" @@ -750,7 +988,7 @@ diff -ruN curl-7.60.0/lib/vtls/vtls.c curl-7.60.0.aros/lib/vtls/vtls.c #include "sendf.h" diff -ruN curl-7.60.0/src/tool_main.c curl-7.60.0.aros/src/tool_main.c --- curl-7.60.0/src/tool_main.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/src/tool_main.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/src/tool_main.c 2018-06-10 21:07:08.478367466 +0100 @@ -32,6 +32,10 @@ #include #endif @@ -764,7 +1002,7 @@ diff -ruN curl-7.60.0/src/tool_main.c curl-7.60.0.aros/src/tool_main.c #include "curlx.h" diff -ruN curl-7.60.0/src/tool_sleep.c curl-7.60.0.aros/src/tool_sleep.c --- curl-7.60.0/src/tool_sleep.c 2018-05-07 09:20:04.000000000 +0100 -+++ curl-7.60.0.aros/src/tool_sleep.c 2018-06-09 16:45:31.196129474 +0100 ++++ curl-7.60.0.aros/src/tool_sleep.c 2018-06-10 21:07:08.478367466 +0100 @@ -35,6 +35,10 @@ # include #endif diff --git a/development/libs/curl/mmakefile.src b/development/libs/curl/mmakefile.src index 17646199a..7a915ae78 100644 --- a/development/libs/curl/mmakefile.src +++ b/development/libs/curl/mmakefile.src @@ -12,7 +12,7 @@ REPOSITORIES := http://curl.haxx.se/download \ CURL_VERSION=7.60.0 USER_CPPFLAGS=-D__BSD_VISIBLE=1 -CURL_OPTIONS=--disable-shared --without-random --disable-threaded-resolver --disable-ntlm-wb --libdir=$(AROS_LIB) +CURL_OPTIONS=--disable-shared --without-random --disable-threaded-resolver --disable-ntlm-wb --with-ssl=$(AROS_DEVELOPER) --libdir=$(AROS_LIB) %fetch_and_build_gnu_development package=curl version=$(CURL_VERSION) \ patch=yes package_repo="$(REPOSITORIES)" \ @@ -51,13 +51,13 @@ development-curl-fixenv : done; \ for file in $(GENDIR)/$(CURDIR)/curl/src/Makefile; \ do \ - $(SED) -i -e 's@-lssl -lcrypto -lz -lssl@-lssl -lcrypto -lz@' $$file; \ + $(SED) -i -e 's@-lssl -lssl -lcrypto -lz@-lssl -lcrypto -lz@' $$file; \ done #MM development-curl-fixconfig : @for file in $(AROS_DEVELOPER)/bin/curl-config; \ do \ - $(SED) -i -e 's@-lssl -lcrypto -lz -lssl@-lssl -lcrypto -lz@' $$file; \ + $(SED) -i -e 's@-lssl -lssl -lcrypto -lz@-lssl -lcrypto -lz@' $$file; \ done; \ $(ECHO) "SYS:Developer" > $(AROS_ENVARC)/SYS/Packages/Curl -- 2.11.4.GIT