From d1d0237f2df2fc83d8dc235ed139d45de342a138 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 29 May 2020 08:38:20 +0200 Subject: [PATCH] ** UnrealIRCd 5.0.5.1 ** --- Config | 2 +- configure | 20 ++++++++++---------- configure.ac | 4 ++-- doc/Config.header | 2 +- doc/RELEASE-NOTES.md | 25 +++++++------------------ extras/doxygen/Doxyfile | 2 +- include/windows/setup.h | 2 +- src/version.c.SH | 2 +- src/windows/unrealinst.iss | 2 +- 9 files changed, 25 insertions(+), 36 deletions(-) diff --git a/Config b/Config index ef1d9adf4..5b33f025c 100755 --- a/Config +++ b/Config @@ -326,7 +326,7 @@ echo "We will now ask you a number of questions. You can just press ENTER to acc echo "" # This needs to be updated each release so auto-upgrading works for settings, modules, etc!!: -UNREALRELEASES="unrealircd-5.0.4 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" +UNREALRELEASES="unrealircd-5.0.5 unrealircd-5.0.4 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 diff --git a/configure b/configure index db3dd47e7..425742e98 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.5. +# Generated by GNU Autoconf 2.69 for unrealircd 5.0.5.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='5.0.5' -PACKAGE_STRING='unrealircd 5.0.5' +PACKAGE_VERSION='5.0.5.1' +PACKAGE_STRING='unrealircd 5.0.5.1' PACKAGE_BUGREPORT='https://bugs.unrealircd.org/' PACKAGE_URL='https://unrealircd.org/' @@ -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.5 to adapt to many kinds of systems. +\`configure' configures unrealircd 5.0.5.1 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.5:";; + short | recursive ) echo "Configuration of unrealircd 5.0.5.1:";; 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.5 +unrealircd configure 5.0.5.1 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.5, which was +It was created by unrealircd $as_me 5.0.5.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -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="" +UNREAL_VERSION_SUFFIX=".1" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -8398,7 +8398,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.5, which was +This file was extended by unrealircd $as_me 5.0.5.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8461,7 +8461,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.5 +unrealircd config.status 5.0.5.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b99241bc8..59ee662a7 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.5], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [5.0.5.1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) AC_CONFIG_SRCDIR([src/ircd.c]) AC_CONFIG_HEADER([include/setup.h]) AC_CONFIG_AUX_DIR([autoconf]) @@ -40,7 +40,7 @@ AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor versi # 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=[""] +UNREAL_VERSION_SUFFIX=[".1"] 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) diff --git a/doc/Config.header b/doc/Config.header index 5d8038b96..69cd351e1 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 5.0.5 + for UnrealIRCd 5.0.5.1 This program will help you to compile your IRC server, and ask you questions regarding the compile-time settings of it during the process. diff --git a/doc/RELEASE-NOTES.md b/doc/RELEASE-NOTES.md index a5019e481..c9b2a4f25 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,7 +1,11 @@ -UnrealIRCd 5.0.5 Release Notes -=============================== +UnrealIRCd 5.0.5.1 Release Notes +================================= -This release mainly focuses on new features, while also fixing a few bugs. +Note: 5.0.5.1 reverts the previously introduced UTF8 Spamfilter support. +Unfortunately we had to do this, due to a bug in the PCRE2 regex library +that caused a freeze / infinite loop with certain regexes and text. + +This 5.0.5 release mainly focuses on new features, while also fixing a few bugs. Fixes: * [except ban { }](https://www.unrealircd.org/docs/Except_ban_block) @@ -14,21 +18,6 @@ Fixes: happen if you use 3rd party modules that add parameter channel modes. Enhancements: -* [Spamfilter](https://www.unrealircd.org/docs/Spamfilter) is now UTF8-aware. - This means, among other things: - * Case insensitive matches work better. For example, with extended - Latin, a spamfilter on ```ę``` now also matches ```Ę```. - * Other PCRE2 features such as [\p](https://www.pcre.org/current/doc/html/pcre2syntax.html#SEC5) - are now available. For example you can now set a spamfilter with the regex - ```\p{Arabic}``` to block all Arabic script, or ```\p{Cyrillic}``` to - block all Cyrillic script (such as Russian). - Please do use these new tools with care. Blocking an entire language - or script is quite a drastic measure. - * These new features require the PCRE2 10.34 regex library. If you - have a lower version on your system then UnrealIRCd will fall back - to using the UnrealIRCd-shipped-library version 10.34. The only - downside to that is that compiling during ```./Config``` may take - a little longer than usual. * [antimixedutf8](https://www.unrealircd.org/docs/Set_block#set::antimixedutf8) has been improved to detect CJK and other scripts and this will now catch more mixed UTF8 spam. Note that, if you previously manually diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index 85dba8256..ac2fecf05 100644 --- a/extras/doxygen/Doxyfile +++ b/extras/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "UnrealIRCd" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 5.0.5 +PROJECT_NUMBER = 5.0.5.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/include/windows/setup.h b/include/windows/setup.h index 92307aa8c..9e49db41b 100644 --- a/include/windows/setup.h +++ b/include/windows/setup.h @@ -67,6 +67,6 @@ /* Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX) */ -#define UNREAL_VERSION_SUFFIX "" +#define UNREAL_VERSION_SUFFIX ".1" #endif diff --git a/src/version.c.SH b/src/version.c.SH index aa643c85c..f392e90dc 100644 --- a/src/version.c.SH +++ b/src/version.c.SH @@ -4,7 +4,7 @@ echo "Extracting src/version.c..." #id=`grep '$Id: Changes,v' ../Changes` #id=`echo $id |sed 's/.* Changes\,v \(.*\) .* Exp .*/\1/'` -id="5.0.5" +id="5.0.5.1" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index 00882e9e6..e5a461070 100644 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 5 -AppVerName=UnrealIRCd 5.0.5 +AppVerName=UnrealIRCd 5.0.5.1 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org