|
|
|
@ -1,49 +1,49 @@ |
|
|
|
Index: configure
|
|
|
|
Index: configure
|
|
|
|
--- configure.orig 2017-08-13 18:22:16.000000000 +0200
|
|
|
|
--- configure.orig 2021-09-13 16:46:32.000000000 +0200
|
|
|
|
+++ configure 2017-09-01 23:12:52.113607000 +0200
|
|
|
|
+++ configure 2021-09-22 20:06:32.477430000 +0200
|
|
|
|
@@ -5400,10 +5400,7 @@
|
|
|
|
@@ -5568,10 +5568,7 @@
|
|
|
|
if $ac_preproc_ok; then :
|
|
|
|
then :
|
|
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
else $as_nop
|
|
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
|
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
|
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
|
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
|
|
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
|
|
-See \`config.log' for more details" "$LINENO" 5; }
|
|
|
|
-See \`config.log' for more details" "$LINENO" 5; }
|
|
|
|
+ :
|
|
|
|
+ :
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
ac_ext=c
|
|
|
|
ac_ext=c
|
|
|
|
@@ -21853,7 +21850,7 @@
|
|
|
|
@@ -23911,7 +23908,7 @@
|
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
|
printf %s "(cached) " >&6
|
|
|
|
else
|
|
|
|
else $as_nop
|
|
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
|
|
-LIBS="-l"$LDAPLIBNAME" $LIBS"
|
|
|
|
-LIBS="-l"$LDAPLIBNAME" $LIBS"
|
|
|
|
+LIBS="-l$LDAPLIBNAME $LIBS"
|
|
|
|
+LIBS="-l$LDAPLIBNAME $LIBS"
|
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
|
/* end confdefs.h. */
|
|
|
|
/* end confdefs.h. */
|
|
|
|
|
|
|
|
|
|
|
|
@@ -21886,7 +21883,7 @@
|
|
|
|
@@ -23946,7 +23943,7 @@
|
|
|
|
#define `$as_echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
|
|
|
|
#define `printf "%s\n" "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
|
|
|
|
_ACEOF
|
|
|
|
_ACEOF
|
|
|
|
|
|
|
|
|
|
|
|
- LIBS="-l"$LDAPLIBNAME" $LIBS"
|
|
|
|
- LIBS="-l"$LDAPLIBNAME" $LIBS"
|
|
|
|
+ LIBS="-l$LDAPLIBNAME $LIBS"
|
|
|
|
+ LIBS="-l$LDAPLIBNAME $LIBS"
|
|
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
else $as_nop
|
|
|
|
|
|
|
|
|
|
|
|
@@ -40661,7 +40658,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case "$OPT_THRES" in
|
|
|
|
@@ -45099,7 +45096,7 @@
|
|
|
|
|
|
|
|
want_thres="no"
|
|
|
|
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
- want_thres="yes"
|
|
|
|
- want_thres="yes"
|
|
|
|
+ want_thres="$OPT_THRES"
|
|
|
|
+ want_thres="$OPT_THRES"
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
no)
|
|
|
|
esac
|
|
|
|
want_thres="no"
|
|
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $want_thres" >&5
|
|
|
|
Index: curl-config.in
|
|
|
|
Index: curl-config.in
|
|
|
|
--- curl-config.in.orig 2017-08-08 00:42:29.000000000 +0200
|
|
|
|
--- curl-config.in.orig 2021-08-23 00:23:06.000000000 +0200
|
|
|
|
+++ curl-config.in 2017-09-01 23:10:11.461019000 +0200
|
|
|
|
+++ curl-config.in 2021-09-22 20:04:36.091973000 +0200
|
|
|
|
@@ -137,7 +137,7 @@
|
|
|
|
@@ -150,7 +150,7 @@
|
|
|
|
if test "X@includedir@" = "X/usr/include"; then
|
|
|
|
if test "X@includedir@" = "X/usr/include"; then
|
|
|
|
echo "$CPPFLAG_CURL_STATICLIB"
|
|
|
|
echo "$CPPFLAG_CURL_STATICLIB"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@ -53,10 +53,10 @@ Index: curl-config.in |
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
Index: lib/vtls/openssl.c
|
|
|
|
Index: lib/vtls/openssl.c
|
|
|
|
--- lib/vtls/openssl.c.orig 2017-08-13 18:10:42.000000000 +0200
|
|
|
|
--- lib/vtls/openssl.c.orig 2021-09-11 23:46:15.000000000 +0200
|
|
|
|
+++ lib/vtls/openssl.c 2017-09-01 23:10:11.461438000 +0200
|
|
|
|
+++ lib/vtls/openssl.c 2021-09-22 20:04:36.092462000 +0200
|
|
|
|
@@ -87,6 +87,9 @@
|
|
|
|
@@ -111,6 +111,9 @@
|
|
|
|
#if defined(HAVE_OPENSSL_ENGINE_H)
|
|
|
|
#ifdef USE_OPENSSL_ENGINE
|
|
|
|
#include <openssl/ui.h>
|
|
|
|
#include <openssl/ui.h>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
+#if defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES)
|
|
|
|
+#if defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES)
|
|
|
|
|
