Merge branch 'master' into next

* master:
  Update docs
  OpenSSL3: Fix build with base SSL
  OpenSSL3: Fix build with base SSL

build/autotools/includes/acinclude.m4

@@ -607,7 +607,7 @@ fi
 dnl Now check cf_openssl_found to see if we found anything.
 if test ! -z "$cf_openssl_basedir"; then
   if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then
-    SSL_INCLUDES="-I${cf_openssl_basedir}/include -DOPENSSL_API_COMPAT=0x10100000L"
+    SSL_INCLUDES="-I${cf_openssl_basedir}/include"
     SSL_LIBS="-L${cf_openssl_basedir}/lib"
   else
     dnl OpenSSL wasn't found in the directory specified.
@@ -619,6 +619,7 @@ else
     cf_openssl_basedir="/usr"
   fi
 fi
+SSL_INCLUDES="${SSL_INCLUDES} -DOPENSSL_API_COMPAT=0x10100000L"
 
 dnl Has it been found by now?
 if test ! -z "$cf_openssl_basedir"; then

configure

@@ -6849,7 +6849,7 @@ else
 fi
 if test ! -z "$cf_openssl_basedir"; then
   if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then
-    SSL_INCLUDES="-I${cf_openssl_basedir}/include -DOPENSSL_API_COMPAT=0x10100000L"
+    SSL_INCLUDES="-I${cf_openssl_basedir}/include"
     SSL_LIBS="-L${cf_openssl_basedir}/lib"
   else
         cf_openssl_basedir=""
@@ -6859,6 +6859,7 @@ else
     cf_openssl_basedir="/usr"
   fi
 fi
+SSL_INCLUDES="${SSL_INCLUDES} -DOPENSSL_API_COMPAT=0x10100000L"
 
 if test ! -z "$cf_openssl_basedir"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5

doc/UPDATES.md

@@ -19,6 +19,9 @@
   * Sort cmd_groups and cmd_bots better.
   * cmd_groups: Indicate which bots are down with a _*_.
 
+# maint
+  * Fix OpenSSL 3 build.
+
 # 1.4.10
   * Clear FiSH keys when a client quits.
   * Fix crash when clearing last botset entry for a bot.