←︎ unrealircd :: eec3fa0

commit eec3fa048615fda07497ea59fb4c83df9282f2f0

Author: acidvegas <acid.vegas@acid.vegas>

Date:   Mon Apr 20 15:12:33 2020 -0400

    updated to 5.0.4

---

 Config                                             | 140 ++++++------

 autoconf/m4/unreal.m4                              |  20 ++

 configure                                          | 247 +++++++++++++--------

 configure.ac                                       |  26 ++-

 doc/Config.header                                  |   3 +-

 doc/RELEASE-NOTES.md                               |  45 +++-

 doc/conf/except.conf                               |   1 +

 doc/conf/ircd.motd                                 |  11 +-

 doc/conf/unrealircd.remote.conf                    | 185 ---------------

 extras/doxygen/Doxyfile                            |   2 +-

 .../cipherscan_profiles/openssl-102-ubuntu16.txt   |  27 +++

 extras/tls.cnf                                     |   2 +-

 include/dynconf.h                                  |   7 +-

 include/h.h                                        |   5 +

 include/modules.h                                  |   3 +-

 include/setup.h.in                                 |   3 +

 include/windows/setup.h                            |   4 +-

 src/api-event.c                                    |  90 +++++---

 src/api-usermode.c                                 |  20 +-

 src/conf.c                                         |  94 ++++++--

 src/dns.c                                          |   2 +-

 src/ircd.c                                         |   7 +-

 src/modules/channeldb.c                            |  12 +-

 src/modules/connect.c                              |   2 +-

 src/modules/ident_lookup.c                         |  16 +-

 src/modules/join.c                                 |   2 +-

 src/modules/nick.c                                 |   4 +-

 src/modules/oper.c                                 |   4 +-

 src/modules/sajoin.c                               |  21 +-

 src/modules/sapart.c                               |  16 ++

 src/modules/server.c                               |   1 +

 src/modules/svsmode.c                              |   7 +

 src/modules/tkl.c                                  |  18 +-

 src/modules/whois.c                                |   8 +-

 src/modules/whox.c                                 |  87 ++++++--

 src/random.c                                       |   6 +-

 src/serv.c                                         |  40 +++-

 src/socket.c                                       |   7 +-

 src/tls.c                                          |  35 ++-

 src/user.c                                         |  26 +++

 src/version.c.SH                                   |   2 +-

 src/windows/UnrealIRCd.exe.manifest                |   2 +-

 src/windows/unrealinst.iss                         |   2 +-

 unrealircd.in                                      |   7 +-

 44 files changed, 748 insertions(+), 521 deletions(-)

diff --git a/Config b/Config

index 28ccb7f..7ddfe86 100755

--- a/Config

+++ b/Config

@@ -255,25 +255,19 @@ fi

 #parse arguments

-NOCACHE=""

 IMPORTEDSETTINGS=""

 NOINTRO=""

 QUICK=""

-CLEAN=""

 ADVANCED=""

 while [ $# -ge 1 ] ; do

 	if [ $1 = "--help" ] ; then

 		echo "Config utility for UnrealIRCd"

 		echo "-----------------------------"

 		echo "Syntax: ./Config [options]"

-		echo "-nocache     Ignore settings saved in config.settings"

 		echo "-nointro     Skip intro (release notes, etc)"

 		echo "-quick       Skip questions, go straight to configure"

 		echo "-advanced    Include additional advanced questions"

-		echo "-clean       Clean ./configure cache"

 		exit 0

-	elif [ $1 = "-nocache" ] ; then

-		NOCACHE="1"

 	elif [ $1 = "-nointro" ] ; then

 		NOINTRO="1"

 	elif [ $1 = "-quick" -o $1 = "-q" ] ; then

@@ -285,8 +279,6 @@ while [ $# -ge 1 ] ; do

 		RUN_CONFIGURE

 		cd "$UNREALCWD"

 		exit 0

-	elif [ $1 = "-clean" -o $1 = "-C" ] ; then

-		CLEAN="1"

 	elif [ $1 = "-advanced" ] ; then

 		PREADVANCED="1"

 	fi

@@ -299,10 +291,6 @@ elif [ "$ADVANCED" = "1" ]; then

 	ADVANCED=""

 fi

-if [ -n "$CLEAN" ] ; then

-	rm -f config.cache

-fi

-

 if [ "`id -u`" = "0" ]; then

 	echo "ERROR: You cannot build or run UnrealIRCd as root"

 	echo ""

@@ -324,79 +312,77 @@ clear

 echo "We will now ask you a number of questions. You can just press ENTER to accept the defaults!"

 echo ""

-if [ -z "$NOCACHE" ] ; then

-	# This needs to be updated each release so auto-upgrading works for settings, modules, etc!!:

-	UNREALRELEASES="unrealircd-5.0.2 unrealircd-5.0.1 unrealircd-5.0.0 unrealircd-5.0.0-rc2 unrealircd-5.0.0-rc1"

-	if [ -f "config.settings" ]; then

-		. ./config.settings

-	else

-		# Try to load a previous config.settings

-		for x in $UNREALRELEASES

-		do

-			if [ -f ../$x/config.settings ]; then

-				IMPORTEDSETTINGS="../$x"

-				break

-			fi

-		done

-		echo "If you have previously installed UnrealIRCd on this shell then you can specify a"

-		echo "directory here so I can import the build settings and third party modules"

-		echo "to make your life a little easier."

-		if [ ! -z "$IMPORTEDSETTINGS" ]; then

-			echo "Found previous installation in: $IMPORTEDSETTINGS."

-			echo "You can enter a different path or type 'none' if you don't want to use it."

-			echo "Just press Enter to accept the default settings."

-		else

-			echo "If you install UnrealIRCd for the first time on this shell, then just hit Enter";

+# This needs to be updated each release so auto-upgrading works for settings, modules, etc!!:

+UNREALRELEASES="unrealircd-5.0.3.1 unrealircd-5.0.3 unrealircd-5.0.2 unrealircd-5.0.1 unrealircd-5.0.0 unrealircd-5.0.0-rc2 unrealircd-5.0.0-rc1"

+if [ -f "config.settings" ]; then

+	. ./config.settings

+else

+	# Try to load a previous config.settings

+	for x in $UNREALRELEASES

+	do

+		if [ -f ../$x/config.settings ]; then

+			IMPORTEDSETTINGS="../$x"

+			break

 		fi

+	done

+	echo "If you have previously installed UnrealIRCd on this shell then you can specify a"

+	echo "directory here so I can import the build settings and third party modules"

+	echo "to make your life a little easier."

+	if [ ! -z "$IMPORTEDSETTINGS" ]; then

+		echo "Found previous installation in: $IMPORTEDSETTINGS."

+		echo "You can enter a different path or type 'none' if you don't want to use it."

+		echo "Just press Enter to accept the default settings."

+	else

+		echo "If you install UnrealIRCd for the first time on this shell, then just hit Enter";

+	fi

-		TEST="$IMPORTEDSETTINGS"

-		echo $n "[$TEST] -> $c"

-		read cc

-		if [ -z "$cc" ]; then

-			IMPORTEDSETTINGS="$TEST"

-		else

-			IMPORTEDSETTINGS="$cc"

+	TEST="$IMPORTEDSETTINGS"

+	echo $n "[$TEST] -> $c"

+	read cc

+	if [ -z "$cc" ]; then

+		IMPORTEDSETTINGS="$TEST"

+	else

+		IMPORTEDSETTINGS="$cc"

+	fi

+	if [ "$IMPORTEDSETTINGS" = "none" ]; then

+		IMPORTEDSETTINGS=""

+	fi

+	if [ "$IMPORTEDSETTINGS" != "" ]; then

+		if [ -d $IMPORTEDSETTINGS/conf ]; then

+			echo "ERROR: Directory $IMPORTEDSETTINGS is an INSTALLATION directory (eg /home/irc/unrealircd)."

+			echo "This question was about a SOURCE directory (eg /home/irc/unrealircd-5.0.0)."

+			exit

 		fi

-		if [ "$IMPORTEDSETTINGS" = "none" ]; then

-			IMPORTEDSETTINGS=""

+		if [ ! -f $IMPORTEDSETTINGS/config.settings ]; then

+			echo "Directory $IMPORTEDSETTINGS does not exist or does not contain a config.settings file"

+			exit

 		fi

-		if [ "$IMPORTEDSETTINGS" != "" ]; then

-			if [ -d $IMPORTEDSETTINGS/conf ]; then

-				echo "ERROR: Directory $IMPORTEDSETTINGS is an INSTALLATION directory (eg /home/irc/unrealircd)."

-				echo "This question was about a SOURCE directory (eg /home/irc/unrealircd-5.0.0)."

-				exit

-			fi

-			if [ ! -f $IMPORTEDSETTINGS/config.settings ]; then

-				echo "Directory $IMPORTEDSETTINGS does not exist or does not contain a config.settings file"

-				exit

-			fi

-			COPYMODULES="1"

-			if grep -q TOPICNICKISNUH $IMPORTEDSETTINGS/config.settings; then

-				echo "Directory $IMPORTEDSETTINGS seems to be UnrealIRCd 4.x (or older)."

-				echo "I will copy the settings but not any 3rd party modules, as they are incompatible with 5.x."

-				COPYMODULES="0"

-			fi

-			# Actually load the settings

-			. $IMPORTEDSETTINGS/config.settings

-			if [ "$COPYMODULES" = "1" ]; then

-				# Copy over 3rd party modules (also deals with 0 file cases, hence the silly looking code)

-				for f in $IMPORTEDSETTINGS/src/modules/third/*.c

-				do

-					[ -e "$f" ] && cp $f src/modules/third/

-				done

-			fi

+		COPYMODULES="1"

+		if grep -q TOPICNICKISNUH $IMPORTEDSETTINGS/config.settings; then

+			echo "Directory $IMPORTEDSETTINGS seems to be UnrealIRCd 4.x (or older)."

+			echo "I will copy the settings but not any 3rd party modules, as they are incompatible with 5.x."

+			COPYMODULES="0"

 		fi

-	fi

-	# If we just imported settings and the curl dir is set to

-	# something like /home/xxx/unrealircd-5.x.y/extras/curl/

-	# (what we call 'local-curl') then remove this setting as

-	# it would refer to the old UnrealIRCd installation.

-	if [ ! -z "$IMPORTEDSETTINGS" ]; then

-		if echo "$CURLDIR"|grep -qi unrealircd; then

-			CURLDIR=""

+		# Actually load the settings

+		. $IMPORTEDSETTINGS/config.settings

+		if [ "$COPYMODULES" = "1" ]; then

+			# Copy over 3rd party modules (also deals with 0 file cases, hence the silly looking code)

+			for f in $IMPORTEDSETTINGS/src/modules/third/*.c

+			do

+				[ -e "$f" ] && cp $f src/modules/third/

+			done

 		fi

 	fi

 fi

+# If we just imported settings and the curl dir is set to

+# something like /home/xxx/unrealircd-5.x.y/extras/curl/

+# (what we call 'local-curl') then remove this setting as

+# it would refer to the old UnrealIRCd installation.

+if [ ! -z "$IMPORTEDSETTINGS" ]; then

+	if echo "$CURLDIR"|grep -qi unrealircd; then

+		CURLDIR=""

+	fi

+fi

 TEST="$BASEPATH"

 echo ""

diff --git a/autoconf/m4/unreal.m4 b/autoconf/m4/unreal.m4

index a77b095..ec2c85d 100644

--- a/autoconf/m4/unreal.m4

+++ b/autoconf/m4/unreal.m4

@@ -252,3 +252,23 @@ else

 	AC_MSG_RESULT([no])

 fi

 ])

+

+AC_DEFUN([CHECK_SSL_CTX_SET_SECURITY_LEVEL],

+[

+AC_MSG_CHECKING([for SSL_CTX_set_security_level in SSL library])

+AC_LANG_PUSH(C)

+SAVE_LIBS="$LIBS"

+LIBS="$LIBS $CRYPTOLIB"

+AC_TRY_LINK([#include <openssl/ssl.h>],

+	[SSL_CTX *ctx = NULL; SSL_CTX_set_security_level(ctx, 1);],

+	has_function=1,

+	has_function=0)

+LIBS="$SAVE_LIBS"

+AC_LANG_POP(C)

+if test $has_function = 1; then

+	AC_MSG_RESULT([yes])

+	AC_DEFINE([HAS_SSL_CTX_SET_SECURITY_LEVEL], [], [Define if ssl library has SSL_CTX_set_security_level])

+else

+	AC_MSG_RESULT([no])

+fi

+])

diff --git a/configure b/configure

index 125017a..4936473 100755

--- a/configure

+++ b/configure

@@ -1,6 +1,6 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.69 for unrealircd 5.0.3.1.

+# Generated by GNU Autoconf 2.69 for unrealircd 5.0.4.

 #

 # Report bugs to <https://bugs.unrealircd.org/>.

 #

@@ -580,8 +580,8 @@ MAKEFLAGS=

 # Identity of this package.

 PACKAGE_NAME='unrealircd'

 PACKAGE_TARNAME='unrealircd'

-PACKAGE_VERSION='5.0.3.1'

-PACKAGE_STRING='unrealircd 5.0.3.1'

+PACKAGE_VERSION='5.0.4'

+PACKAGE_STRING='unrealircd 5.0.4'

 PACKAGE_BUGREPORT='https://bugs.unrealircd.org/'

 PACKAGE_URL='https://unrealircd.org/'

@@ -670,6 +670,8 @@ HARDEN_BINLDFLAGS

 HARDEN_BINCFLAGS

 HARDEN_LDFLAGS

 HARDEN_CFLAGS

+GMAKE

+MAKER

 OBJEXT

 EXEEXT

 ac_ct_CC

@@ -679,8 +681,6 @@ CFLAGS

 CC

 PKGCONFIG

 GUNZIP

-GMAKE

-MAKER

 INSTALL

 OPENSSLPATH

 TOUCH

@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then

   # Omit some internal or obsolete options to make the list less imposing.

   # This message is too long to be a string in the A/UX 3.1 sh.

   cat <<_ACEOF

-\`configure' configures unrealircd 5.0.3.1 to adapt to many kinds of systems.

+\`configure' configures unrealircd 5.0.4 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1391,7 +1391,7 @@ fi

 if test -n "$ac_init_help"; then

   case $ac_init_help in

-     short | recursive ) echo "Configuration of unrealircd 5.0.3.1:";;

+     short | recursive ) echo "Configuration of unrealircd 5.0.4:";;

    esac

   cat <<\_ACEOF

@@ -1544,7 +1544,7 @@ fi

 test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

-unrealircd configure 5.0.3.1

+unrealircd configure 5.0.4

 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.

@@ -1913,7 +1913,7 @@ cat >config.log <<_ACEOF

 This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

-It was created by unrealircd $as_me 5.0.3.1, which was

+It was created by unrealircd $as_me 5.0.4, which was

 generated by GNU Autoconf 2.69.  Invocation command line was

   $ $0 $@

@@ -2321,7 +2321,7 @@ _ACEOF

 # Minor version number (e.g.: Z in X.Y.Z)

-UNREAL_VERSION_MINOR="3"

+UNREAL_VERSION_MINOR="4"

 cat >>confdefs.h <<_ACEOF

 #define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR

@@ -2331,7 +2331,7 @@ _ACEOF

 # The version suffix such as a beta marker or release candidate

 # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a

 # string instead of an integer because it contains arbitrary data.

-UNREAL_VERSION_SUFFIX=".1"

+UNREAL_VERSION_SUFFIX=""

 cat >>confdefs.h <<_ACEOF

 #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX"

@@ -2551,91 +2551,6 @@ $as_echo "no" >&6; }

 fi

-# Extract the first word of "gmake", so it can be a program name with args.

-set dummy gmake; ac_word=$2

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_prog_MAKER+:} false; then :

-  $as_echo_n "(cached) " >&6

-else

-  if test -n "$MAKER"; then

-  ac_cv_prog_MAKER="$MAKER" # Let the user override the test.

-else

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-for as_dir in $PATH

-do

-  IFS=$as_save_IFS

-  test -z "$as_dir" && as_dir=.

-    for ac_exec_ext in '' $ac_executable_extensions; do

-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

-    ac_cv_prog_MAKER="gmake"

-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

-    break 2

-  fi

-done

-  done

-IFS=$as_save_IFS

-

-  test -z "$ac_cv_prog_MAKER" && ac_cv_prog_MAKER="make"

-fi

-fi

-MAKER=$ac_cv_prog_MAKER

-if test -n "$MAKER"; then

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKER" >&5

-$as_echo "$MAKER" >&6; }

-else

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

-fi

-

-

-# Extract the first word of "gmake", so it can be a program name with args.

-set dummy gmake; ac_word=$2

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

-$as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_path_GMAKE+:} false; then :

-  $as_echo_n "(cached) " >&6

-else

-  case $GMAKE in

-  [\\/]* | ?:[\\/]*)

-  ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path.

-  ;;

-  *)

-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-for as_dir in $PATH

-do

-  IFS=$as_save_IFS

-  test -z "$as_dir" && as_dir=.

-    for ac_exec_ext in '' $ac_executable_extensions; do

-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

-    ac_cv_path_GMAKE="$as_dir/$ac_word$ac_exec_ext"

-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

-    break 2

-  fi

-done

-  done

-IFS=$as_save_IFS

-

-  ;;

-esac

-fi

-GMAKE=$ac_cv_path_GMAKE

-if test -n "$GMAKE"; then

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMAKE" >&5

-$as_echo "$GMAKE" >&6; }

-else

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

-fi

-

-

-

-if $MAKER --version | grep -q "GNU Make"; then :

-  GNUMAKE="0"

-else

-  as_fn_error $? "It seems your system does not have gmake installed. Please install gmake." "$LINENO" 5

-fi

-

 # Extract the first word of "gunzip", so it can be a program name with args.

 set dummy gunzip; ac_word=$2

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

@@ -3687,6 +3602,90 @@ if test "$ac_cv_prog_cc_c99" = "no"; then :

   as_fn_error $? "No C99 compiler was found. Please install gcc or clang and other build tools. Eg, on Debian/Ubuntu you probably want to run the following as root: apt-get install build-essential " "$LINENO" 5

 fi

+# Extract the first word of "gmake", so it can be a program name with args.

+set dummy gmake; ac_word=$2

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

+$as_echo_n "checking for $ac_word... " >&6; }

+if ${ac_cv_prog_MAKER+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  if test -n "$MAKER"; then

+  ac_cv_prog_MAKER="$MAKER" # Let the user override the test.

+else

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+    for ac_exec_ext in '' $ac_executable_extensions; do

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

+    ac_cv_prog_MAKER="gmake"

+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+  done

+IFS=$as_save_IFS

+

+  test -z "$ac_cv_prog_MAKER" && ac_cv_prog_MAKER="make"

+fi

+fi

+MAKER=$ac_cv_prog_MAKER

+if test -n "$MAKER"; then

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKER" >&5

+$as_echo "$MAKER" >&6; }

+else

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+fi

+

+

+# Extract the first word of "gmake", so it can be a program name with args.

+set dummy gmake; ac_word=$2

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

+$as_echo_n "checking for $ac_word... " >&6; }

+if ${ac_cv_path_GMAKE+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  case $GMAKE in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+    for ac_exec_ext in '' $ac_executable_extensions; do

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

+    ac_cv_path_GMAKE="$as_dir/$ac_word$ac_exec_ext"

+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+  done

+IFS=$as_save_IFS

+

+  ;;

+esac

+fi

+GMAKE=$ac_cv_path_GMAKE

+if test -n "$GMAKE"; then

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMAKE" >&5

+$as_echo "$GMAKE" >&6; }

+else

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+fi

+

+

+if $MAKER --version | grep -q "GNU Make"; then :

+  GNUMAKE="0"

+else

+  as_fn_error $? "It seems your system does not have make/gmake installed. If you are on Linux then install make, otherwise install gmake." "$LINENO" 5

+fi

+

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -ldescrypt" >&5

 $as_echo_n "checking for crypt in -ldescrypt... " >&6; }

@@ -6384,6 +6383,53 @@ else

 $as_echo "no" >&6; }

 fi

+

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_security_level in SSL library" >&5

+$as_echo_n "checking for SSL_CTX_set_security_level in SSL library... " >&6; }

+ac_ext=c

+ac_cpp='$CPP $CPPFLAGS'

+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

+

+SAVE_LIBS="$LIBS"

+LIBS="$LIBS $CRYPTOLIB"

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#include <openssl/ssl.h>

+int

+main ()

+{

+SSL_CTX *ctx = NULL; SSL_CTX_set_security_level(ctx, 1);

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_c_try_link "$LINENO"; then :

+  has_function=1

+else

+  has_function=0

+fi

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext conftest.$ac_ext

+LIBS="$SAVE_LIBS"

+ac_ext=c

+ac_cpp='$CPP $CPPFLAGS'

+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

+

+if test $has_function = 1; then

+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+$as_echo "yes" >&6; }

+

+$as_echo "#define HAS_SSL_CTX_SET_SECURITY_LEVEL /**/" >>confdefs.h

+

+else

+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+fi

+

 # Check whether --enable-dynamic-linking was given.

 if test "${enable_dynamic_linking+set}" = set; then :

   enableval=$enable_dynamic_linking; enable_dynamic_linking=$enableval

@@ -6948,6 +6994,11 @@ $as_echo "installing Argon2 library" >&6; }

 $ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 || exit 1

 # We need to manually copy the libs to PRIVATELIBDIR because

 # there is no way to tell make install in libargon2 to do so.

+# BUT FIRST, delete the old library so it becomes an unlink+create

+# operation rather than overwriting the existing file which would

+# lead to a crash of the currently running IRCd.

+rm -f "$PRIVATELIBDIR/"libargon2*

+# Now copy the new library files:

 cp -av $cur_dir/extras/argon2/lib/* $PRIVATELIBDIR/

 ARGON2_CFLAGS="-I$cur_dir/extras/argon2/include"

@@ -8249,7 +8300,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

 # report actual input values of CONFIG_FILES etc. instead of their

 # values after options handling.

 ac_log="

-This file was extended by unrealircd $as_me 5.0.3.1, which was

+This file was extended by unrealircd $as_me 5.0.4, which was

 generated by GNU Autoconf 2.69.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

@@ -8312,7 +8363,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

 ac_cs_version="\\

-unrealircd config.status 5.0.3.1

+unrealircd config.status 5.0.4

 configured by $0, generated by GNU Autoconf 2.69,

   with options \\"\$ac_cs_config\\"

diff --git a/configure.ac b/configure.ac

index 983b6dd..92720c8 100644

--- a/configure.ac

+++ b/configure.ac

@@ -7,7 +7,7 @@ dnl src/windows/unrealinst.iss

 dnl doc/Config.header

 dnl src/version.c.SH

-AC_INIT([unrealircd], [5.0.3.1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])

+AC_INIT([unrealircd], [5.0.4], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])

 AC_CONFIG_SRCDIR([src/ircd.c])

 AC_CONFIG_HEADER([include/setup.h])

 AC_CONFIG_AUX_DIR([autoconf])

@@ -34,13 +34,13 @@ UNREAL_VERSION_MAJOR=["0"]

 AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: Y for X.Y.Z)])

 # Minor version number (e.g.: Z in X.Y.Z)

-UNREAL_VERSION_MINOR=["3"]

+UNREAL_VERSION_MINOR=["4"]

 AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: Z for X.Y.Z)])

 # The version suffix such as a beta marker or release candidate

 # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a

 # string instead of an integer because it contains arbitrary data.

-UNREAL_VERSION_SUFFIX=[".1"]

+UNREAL_VERSION_SUFFIX=[""]

 AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX)])

 AC_PATH_PROG(RM,rm)

@@ -60,13 +60,6 @@ exit 1

 ])

 AC_PATH_PROG(INSTALL,install)

-AC_CHECK_PROG(MAKER, gmake, gmake, make)

-AC_PATH_PROG(GMAKE,gmake)

-

-AS_IF([$MAKER --version | grep -q "GNU Make"],

-        [GNUMAKE="0"],

-        [AC_MSG_ERROR([It seems your system does not have gmake installed. Please install gmake.])])

-

 AC_PATH_PROG(GUNZIP, gunzip)

 AC_PATH_PROG(PKGCONFIG, pkg-config)

@@ -75,6 +68,13 @@ AC_PROG_CC_C99

 AS_IF([test "$ac_cv_prog_cc_c99" = "no"],

 	[AC_MSG_ERROR([No C99 compiler was found. Please install gcc or clang and other build tools. Eg, on Debian/Ubuntu you probably want to run the following as root: apt-get install build-essential ])])

+dnl Check for make moved down, so the above compiler check takes precedence.

+AC_CHECK_PROG(MAKER, gmake, gmake, make)

+AC_PATH_PROG(GMAKE,gmake)

+AS_IF([$MAKER --version | grep -q "GNU Make"],

+        [GNUMAKE="0"],

+        [AC_MSG_ERROR([It seems your system does not have make/gmake installed. If you are on Linux then install make, otherwise install gmake.])])

+

 dnl Checks for libraries.

 AC_CHECK_LIB(descrypt, crypt,

 	[AC_DEFINE([HAVE_CRYPT], [], [Define if you have crypt])

@@ -497,6 +497,7 @@ AC_ARG_WITH(system-cares, [AS_HELP_STRING([--without-system-cares], [Use bundled

 CHECK_SSL

 CHECK_SSL_CTX_SET1_CURVES_LIST

 CHECK_SSL_CTX_SET_MIN_PROTO_VERSION

+CHECK_SSL_CTX_SET_SECURITY_LEVEL

 AC_ARG_ENABLE(dynamic-linking, [AS_HELP_STRING([--disable-dynamic-linking], [Make the IRCd statically link with shared objects rather than dynamically (noone knows if disabling dynamic linking actually does anything or not)])],

 	[enable_dynamic_linking=$enableval], [enable_dynamic_linking="yes"])

 AS_IF([test $enable_dynamic_linking = "yes"],

@@ -603,6 +604,11 @@ AC_MSG_RESULT(installing Argon2 library)

 $ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 || exit 1

 # We need to manually copy the libs to PRIVATELIBDIR because

 # there is no way to tell make install in libargon2 to do so.

+# BUT FIRST, delete the old library so it becomes an unlink+create

+# operation rather than overwriting the existing file which would

+# lead to a crash of the currently running IRCd.

+rm -f "$PRIVATELIBDIR/"libargon2*

+# Now copy the new library files:

 cp -av $cur_dir/extras/argon2/lib/* $PRIVATELIBDIR/

 ARGON2_CFLAGS="-I$cur_dir/extras/argon2/include"

 AC_SUBST(ARGON2_CFLAGS)

diff --git a/doc/Config.header b/doc/Config.header

index caeeb18..dcddc86 100644

--- a/doc/Config.header

+++ b/doc/Config.header

@@ -7,11 +7,10 @@

  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|

                                Configuration Program

-                                for UnrealIRCd 5.0.3.1

+                                for UnrealIRCd 5.0.4

 This program will help you to compile your IRC server, and ask you

 questions regarding the compile-time settings of it during the process. 

-regarding the setup of it, during the process.

 A short installation guide is available online at:

 https://www.unrealircd.org/docs/Installing_from_source

diff --git a/doc/RELEASE-NOTES.md b/doc/RELEASE-NOTES.md

index b7625dc..d030e13 100644

--- a/doc/RELEASE-NOTES.md

+++ b/doc/RELEASE-NOTES.md

@@ -1,5 +1,46 @@

-UnrealIRCd 5.0.3.1 Release Notes

-=================================

+UnrealIRCd 5.0.4 Release Notes

+===============================

+

+This new 5.0.4 version fixes quite a number of bugs. It contains only two small feature improvements.

+

+Fixes:

+* When placing a SHUN on an online user it was not always effective.

+* Channeldb was not properly restoring all channel modes, such as +P.

+* When upgrading UnrealIRCd it could sometimes crash the currently

+  running IRC server (rare), or trigger a crash report on

+  ```./unrealircd restart``` (quite common).

+* UnrealIRCd was giving up too easily on ident lookups.

+* Crash when unloading a module with moddata.

+* Crash if an authenticated server sends wrong information (rare).

+* Removing a TEMPSHUN did not work if the user was on another server.

+* SAJOIN to 0 (part all channels) resulted in a desync when used on remote users.

+* Forced nick change from services was not showing up if the user

+  was not in any channels.

+

+Enhancements:

+* New option [set::hide-idle-time::policy](https://www.unrealircd.org/docs/Set_block#set%3A%3Ahide-idle-time)

+  by which you can change usermode +I (hide idle time in WHOIS) from

+  oper-only to settable by users. More options will follow in a future

+  release.

+* In WHOIS you can now see if a user is currently (temp)shunned.

+  This only works for locally connected users for technical reasons,

+  so use ```/WHOIS Nick Nick``` to see it for remote users.

+

+Changes:

+* The oper notices and logging with regards to server linking have changed

+  a little. They are more consistent and log more now.

+* When an IRCOp tries to oper up from an insecure connection we will now

+  mention the https://www.unrealircd.org/docs/FAQ#oper-requires-tls page.

+  This message is customizable through

+  [set::plaintext-policy::oper-message](https://www.unrealircd.org/docs/Set_block#set::plaintext-policy).

+* The French HELPOP text was updated.

+

+Upgrading from UnrealIRCd 4?

+-----------------------------

+

+Are you upgrading from UnrealIRCd 4.x to UnrealIRCd 5?

+Then check out the *UnrealIRCd 5* release notes [further down](#unrealircd-5). At the

+very least, check out [Upgrading from 4.x](https://www.unrealircd.org/docs/Upgrading_from_4.x).

 UnrealIRCd 5.0.3.1

 -------------------

diff --git a/doc/conf/except.conf b/doc/conf/except.conf

index 14a9be5..562fbd5 100644

--- a/doc/conf/except.conf

+++ b/doc/conf/except.conf

@@ -33,3 +33,4 @@ except ban { mask *@2600:3c03::f03c:91ff:fe96:c1fa; } # bot.search.mibbit.com

 # Netsplit

 except ban { mask *@85.25.137.63; } # eagle.netsplit.de

+except ban { mask *@85.25.10.40;  } # anaconda.netsplit.de

diff --git a/doc/conf/ircd.motd b/doc/conf/ircd.motd

index 1113ad7..7fc0ae0 100644

--- a/doc/conf/ircd.motd

+++ b/doc/conf/ircd.motd

@@ -36,12 +36,9 @@

      0,0  0║ ╚0,0     0║ 0,0       0╗   0,0  0║   ╚0,0     0╔╝

      0╚═╝  ╚════╝ ╚══════╝   ╚═╝    ╚════╝

+4─────────┤ 0THE WILD WILD WEST OF IRC4├─────────

+14• 7Do not disrupt the orderly operation of the network

+14• 7No distribution of child pornography

-4──────────────────┤ 0RULES 4├───────────────────

-

-14• 7Do not disrupt or compromise our security. 

-14• 7No malicious abuse of network services.

-14• 7No distribution of child pornography.

-

-4──────────────────────────────────────────────

+8,4         E N T E R   T H E   V O I D          

diff --git a/doc/conf/unrealircd.remote.conf b/doc/conf/unrealircd.remote.conf

deleted file mode 100644

index e745785..0000000

--- a/doc/conf/unrealircd.remote.conf

+++ /dev/null

@@ -1,185 +0,0 @@

-admin { ""; }

-

-alias botserv { type services; }

-alias bs { target botserv; type services; }

-alias chanserv { type services; }

-alias cs { target chanserv; type services; }

-alias hostserv { type services; }

-alias hs { target hostserv; type services; }

-alias nickserv { type services; }

-alias ns { target nickserv; type services; }

-alias operserv { type services; }

-alias os { target operserv; type services; }

-

-class clients { pingfreq 120; maxclients 100; sendq 1M; options { nofakelag; } }

-class servers { pingfreq 120; maxclients  10; sendq 1M; connfreq 30;           }

-

-allow { ip *; class clients; maxperip 2; }

-

-listen { ip *; port 6667;      options { clientsonly;      } }

-listen { ip *; port 6697;      options { clientsonly; tls; } }

-listen { ip *; port REDACTED;  options { serversonly; tls; } }

-

-link irc.supernets.org {

-	incoming { mask REDACTED; }

-	outgoing {

-		bind-ip *;

-		hostname REDACTED;

-		port REDACTED;

-		options { tls; autoconnect; }

-	}

-	password "REDACTED" { spkifp; }

-	class servers;

-}

-

-log "errors.log" { flags { errors; } maxsize 10K; }

-

-tld { mask *@*; motd remote.motd; rules remote.motd; options { remote; } }

-

-ulines { services.supernets.org; }

-

-blacklist dronebl {

-	dns {

-		name dnsbl.dronebl.org;

-		type record;

-		reply { 3; 5; 6; 7; 8; 9; 10; 11; 12; 13; 14; 15; 16; }

-	}

-	action gzline;

-	ban-time 1d;

-	reason "8,4   E N T E R   T H E   V O I D   ";

-}

-

-blacklist efnetrbl {

-	dns {

-		name rbl.efnetrbl.org;

-		type record;

-		reply { 1; 4; 5; }

-	}

-	action gzline;

-	ban-time 1d;

-	reason "8,4   E N T E R   T H E   V O I D   ";

-}

-

-blacklist torbl {

-	dns {

-		name torexit.dan.me.uk;

-		type record;

-		reply { 100; }

-	}

-	action gzline;

-	ban-time 1d;

-	reason "8,4   E N T E R   T H E   V O I D   ";

-}

-

-webirc { mask 107.161.19.53;  password "REDACTED"; } # KiwiIRC

-webirc { mask 107.161.19.109; password "REDACTED"; }

-webirc { mask 107.161.31.4;   password "REDACTED"; }

-

-webirc { mask 207.192.75.252; password "REDACTED"; } # Mibbit

-webirc { mask 64.62.228.82;   password "REDACTED"; }

-webirc { mask 78.129.202.38;  password "REDACTED"; }

-webirc { mask 109.169.29.95 ; password "REDACTED"; }

-

-set {

-	kline-address "banned@supernets.org";

-	gline-address "banned@supernets.org";

-	modes-on-connect "+ipTx";

-	modes-on-oper "+HIq";

-	snomask-on-oper "+bcFfkGsSo";

-	modes-on-join "+ns";

-	level-on-join "op";

-	restrict-channelmodes "CnLpPs";

-	restrict-commands {

-		invite          { connect-delay 3600; exempt-identified yes; }

-		list            { connect-delay 120;  exempt-identified yes; }

-		private-message { connect-delay 300;  exempt-identified yes; }

-		private-notice  { connect-delay 3600; exempt-identified yes; }

-	}

-	auto-join "#superbowl";

-	oper-auto-join "#help";

-	static-quit "EMO-QUIT";

-	static-part "EMO-PART";

-	who-limit 100;

-	nick-length 20;

-	maxchannelsperuser 10;

-	channel-command-prefix "`!@$.";

-	options { hide-ulines; flat-map; identd-check; }

-	network-name "SuperNETs";

-	default-server "irc.supernets.org";

-	services-server "services.supernets.org";

-	sasl-server "services.supernets.org";

-	help-channel "#help";

-	cloak-method ip;

-	cloak-keys {

-		"REDACTED";

-		"REDACTED";

-		"REDACTED";

-	}

-	hiddenhost-prefix "SUPER";

-	plaintext-policy {

-		user warn;

-		oper deny;

-		server deny;

-		user-message "4WARNING: You are not using a secure connection with SSL/TLS";

-		oper-message "Network operators must connect using SSL/TLS";

-	}

-	outdated-tls-policy {

-		user warn;

-		oper deny;

-		server deny;

-		user-message "4WARNING: You are using an outdated SSL/TLS protocol or cipher";

-		oper-message "Network operators must connect using an up-to-date SSL/TLS protocol or cipher";

-	}

-	anti-flood {

-		away-flood 3:300;

-		connect-flood 3:300;

-		invite-flood 3:300;

-		join-flood 3:300;

-		knock-flood 3:300;

-		max-concurrent-conversations { users 5; new-user-every 60s; }

-		nick-flood 3:300;

-		unknown-flood-amount 2048;

-		unknown-flood-bantime 1h;

-	}

-	default-bantime 1d;

-	spamfilter {

-		ban-time 1d;

-		ban-reason "8,4   E N T E R   T H E   V O I D   ";

-		except "#anythinggoes";

-	}

-	max-targets-per-command { kick 1; part 1; privmsg 1; }

-	hide-ban-reason yes;

-	reject-message {

-		gline                "8,4   E N T E R   T H E   V O I D   ";

-		kline                "8,4   E N T E R   T H E   V O I D   ";

-		password-mismatch    "8,4   E N T E R   T H E   V O I D   ";

-		server-full          "8,4   E N T E R   T H E   V O I D   ";

-		too-many-connections "8,4   E N T E R   T H E   V O I D   ";

-		unauthorized         "8,4   E N T E R   T H E   V O I D   ";

-	}

-	antimixedutf8 {

-		score 10;

-		ban-action block;

-		ban-reason "8,4   E N T E R   T H E   V O I D   ";

-		ban-time 1h;

-	}

-	connthrottle {

-		known-users   { minimum-reputation-score 24; sasl-bypass yes;       }

-		new-users     { local-throttle 20:60;        global-throttle 30:60; }

-		disabled-when { reputation-gathering 1w;     start-delay 3m;        }

-	}

-	history {

-		channel {

-			playback-on-join        { lines 100; time 1d; }

-			max-storage-per-channel { lines 100; time 1d; }

-		}

-	}

-	manual-ban-target ip;

-}

-

-hideserver {

-	disable-map yes;