From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 27 Jun 2020 23:24:54 +0000 (-0500)
Subject: curl: Bump minimum version to 7.45.0 as we need CURLOPT_DEFAULT_PROTOCOL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=739e8bb0ae9ffdacd5339024b00becd9ff40fa8c;p=thirdparty%2Ffreeradius-server.git

curl: Bump minimum version to 7.45.0 as we need CURLOPT_DEFAULT_PROTOCOL
---

diff --git a/src/lib/curl/base.c b/src/lib/curl/base.c
index de96e049fdc..be81fd91e50 100644
--- a/src/lib/curl/base.c
+++ b/src/lib/curl/base.c
@@ -26,9 +26,19 @@
 #include <freeradius-devel/tls/base.h>
 #endif
 
+#define CURL_NO_OLDIES 1
+
 #include <curl/curl.h>
 #include <talloc.h>
 
+/*
+ *	We have to use this as curl uses lots of enums
+ */
+#ifndef CURL_AT_LEAST_VERSION
+#  define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | z)
+#  define CURL_AT_LEAST_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
+#endif
+
 static uint32_t instance_count = 0;
 static fr_dict_t const *dict_freeradius; /*internal dictionary for server*/
 
diff --git a/src/lib/curl/base.h b/src/lib/curl/base.h
index 7fd2fb3637f..06816355710 100644
--- a/src/lib/curl/base.h
+++ b/src/lib/curl/base.h
@@ -29,6 +29,8 @@ RCSIDH(curl_h, "$Id$")
 extern "C" {
 #endif
 
+#define CURL_NO_OLDIES 1
+
 #include <curl/curl.h>
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/util/event.h>
diff --git a/src/lib/curl/configure b/src/lib/curl/configure
index 484d91905c2..c8a27f23d0d 100755
--- a/src/lib/curl/configure
+++ b/src/lib/curl/configure
@@ -3045,11 +3045,11 @@ fi
 $as_echo "$libcurl_cv_lib_curl_version" >&6; }
 
 	_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-	_libcurl_wanted=`echo 7.19.1 | $_libcurl_version_parse`
+	_libcurl_wanted=`echo 7.45.0 | $_libcurl_version_parse`
 
 	if test $_libcurl_wanted -gt 0 ; then
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.19.1" >&5
-$as_echo_n "checking for libcurl >= version 7.19.1... " >&6; }
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.45.0" >&5
+$as_echo_n "checking for libcurl >= version 7.45.0... " >&6; }
 if ${libcurl_cv_lib_version_ok+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3296,10 +3296,6 @@ mod_cflags="$LIBCURL_CPPFLAGS"
 
 
 
-
-unset ac_cv_env_LIBS_set
-unset ac_cv_env_LIBS_value
-
 ac_config_files="$ac_config_files all.mk"
 
 cat >confcache <<\_ACEOF
@@ -4576,4 +4572,3 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-
diff --git a/src/lib/curl/configure.ac b/src/lib/curl/configure.ac
index c238d397325..feaba2b630a 100644
--- a/src/lib/curl/configure.ac
+++ b/src/lib/curl/configure.ac
@@ -18,7 +18,7 @@ if test x$with_[]modname != xno; then
 	dnl # Check for curl
 	dnl ############################################################
 
-	LIBCURL_CHECK_CONFIG([], [7.19.1])
+	LIBCURL_CHECK_CONFIG([], [7.45.0])
 
 	if test "x$libcurl_cv_lib_version_ok" != "xyes"; then
 		fail="$fail libcurl >= 7.19.2"
diff --git a/src/lib/curl/io.c b/src/lib/curl/io.c
index 40f0104a31a..fd19c085a5e 100644
--- a/src/lib/curl/io.c
+++ b/src/lib/curl/io.c
@@ -27,6 +27,8 @@
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/syserror.h>
 
+#define CURL_NO_OLDIES 1
+
 #include <curl/curl.h>
 #include <talloc.h>
 
diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index e3850318859..a39f712f369 100644
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -32,14 +32,6 @@ RCSIDH(rest_h, "$Id$")
 
 #define CURL_NO_OLDIES 1
 
-/*
- *	We have to use this as curl uses lots of enums
- */
-#ifndef CURL_AT_LEAST_VERSION
-#  define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | z)
-#  define CURL_AT_LEAST_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
-#endif
-
 #include <curl/curl.h>
 
 /*