diff --git a/Config b/Config index 25dc0fe47..332441b65 100755 --- a/Config +++ b/Config @@ -376,7 +376,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-6.1.10 unrealircd-6.1.10-rc1 unrealircd-6.1.9 unrealircd-6.1.8 unrealircd-6.1.8.1 unrealircd-6.1.8 unrealircd-6.1.8-rc1 unrealircd-6.1.7 unrealircd-6.1.7-rc1 unrealircd-6.1.6 unrealircd-6.1.6-rc1 unrealircd-6.1.5 unrealircd-6.1.4 unrealircd-6.1.3 unrealircd-6.1.3-rc1 unrealircd-6.1.2.3 unrealircd-6.1.2.2 unrealircd-6.1.2.1 unrealircd-6.1.2 unrealircd-6.1.2-rc2 unrealircd-6.1.2-rc1 unrealircd-6.1.1.1 unrealircd-6.1.1 unrealircd-6.1.0 unrealircd-6.1.0-rc2 unrealircd-6.1.0-rc1 unrealircd-6.0.7 unrealircd-6.0.6 unrealircd-6.0.5 unrealircd-6.0.5-rc2 unrealircd-6.0.5-rc1 unrealircd-6.0.4.2 unrealircd-6.0.4.1 unrealircd-6.0.4 unrealircd-6.0.4-rc2 unrealircd-6.0.4-rc1 unrealircd-6.0.3 unrealircd-6.0.2 unrealircd-6.0.1.1 unrealircd-6.0.1 unrealircd-6.0.0" +UNREALRELEASES="unrealircd-6.2.0-beta3 unrealircd-6.2.0-beta2 unrealircd-6.2.0-beta1 unrealircd-6.1.10 unrealircd-6.1.10-rc1 unrealircd-6.1.9 unrealircd-6.1.8 unrealircd-6.1.8.1 unrealircd-6.1.8 unrealircd-6.1.8-rc1 unrealircd-6.1.7 unrealircd-6.1.7-rc1 unrealircd-6.1.6 unrealircd-6.1.6-rc1 unrealircd-6.1.5 unrealircd-6.1.4 unrealircd-6.1.3 unrealircd-6.1.3-rc1 unrealircd-6.1.2.3 unrealircd-6.1.2.2 unrealircd-6.1.2.1 unrealircd-6.1.2 unrealircd-6.1.2-rc2 unrealircd-6.1.2-rc1 unrealircd-6.1.1.1 unrealircd-6.1.1 unrealircd-6.1.0 unrealircd-6.1.0-rc2 unrealircd-6.1.0-rc1 unrealircd-6.0.7 unrealircd-6.0.6 unrealircd-6.0.5 unrealircd-6.0.5-rc2 unrealircd-6.0.5-rc1 unrealircd-6.0.4.2 unrealircd-6.0.4.1 unrealircd-6.0.4 unrealircd-6.0.4-rc2 unrealircd-6.0.4-rc1 unrealircd-6.0.3 unrealircd-6.0.2 unrealircd-6.0.1.1 unrealircd-6.0.1 unrealircd-6.0.0" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/configure b/configure index 30e382831..40716dd6f 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.71 for unrealircd 6.2.0-beta3. +# Generated by GNU Autoconf 2.71 for unrealircd 6.2.0. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='6.2.0-beta3' -PACKAGE_STRING='unrealircd 6.2.0-beta3' +PACKAGE_VERSION='6.2.0' +PACKAGE_STRING='unrealircd 6.2.0' PACKAGE_BUGREPORT='https://bugs.unrealircd.org/' PACKAGE_URL='https://unrealircd.org/' @@ -1372,7 +1372,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 6.2.0-beta3 to adapt to many kinds of systems. +\`configure' configures unrealircd 6.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 6.2.0-beta3:";; + short | recursive ) echo "Configuration of unrealircd 6.2.0:";; esac cat <<\_ACEOF @@ -1616,7 +1616,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 6.2.0-beta3 +unrealircd configure 6.2.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1915,7 +1915,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 6.2.0-beta3, which was +It was created by unrealircd $as_me 6.2.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2706,7 +2706,7 @@ printf "%s\n" "#define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR" >>confdefs.h # 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="-beta3" +UNREAL_VERSION_SUFFIX="" printf "%s\n" "#define UNREAL_VERSION_SUFFIX \"$UNREAL_VERSION_SUFFIX\"" >>confdefs.h @@ -10238,7 +10238,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 6.2.0-beta3, which was +This file was extended by unrealircd $as_me 6.2.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10303,7 +10303,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -unrealircd config.status 6.2.0-beta3 +unrealircd config.status 6.2.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c3e7e0488..1386e5989 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], [6.2.0-beta3], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [6.2.0], [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=["-beta3"] +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) diff --git a/doc/Config.header b/doc/Config.header index fe6a16660..2af18abc3 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 6.2.0-beta3 + for UnrealIRCd 6.2.0 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 fc37adc59..40f6d9133 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,15 +1,18 @@ -UnrealIRCd 6.2.0-beta3 -======================= +UnrealIRCd 6.2.0 +================= -This is the third beta for future UnrealIRCd 6.2.0. This is work in progress -and not a stable version. There will likely be more betas or release candidates. -Please report any issues at https://bugs.unrealircd.org/. +This release has channel flood protection turned on by default, UTF8 Text +Analysis and Spamfilter enhancements, new best practices regarding plaintext +port 6667 and TLS certificates, PQC enhancements, etc. -Changes between beta2 and beta3 are: a config load message if you have any -plaintext ports open to users, more prominent certificate verification warning, -a check if your server certificate is not only issued by a CA but actually -valid for me::name, class::connfreq being used also for the 1st server reconnect, -and spamfilter:input-conversion now properly accepting `deconfused`. +It is highly recommended to read the release notes. Or, at least read the +first item under "Enhancements". + +The beta's for 6.2.0 didn't receive as much testing as I would have liked. +If you want to hold off for a while because you are cautious or if you +depend on 3rd party modules then feel free to wait for version 6.2.1. +(At the time of this 6.2.0 release quite some 3rd party modules have +not been updated to work with 6.2.x) ### Enhancements: * [Channel flood protection by default](https://www.unrealircd.org/docs/Channel_anti-flood_settings): @@ -97,7 +100,6 @@ and spamfilter:input-conversion now properly accepting `deconfused`. ### Changes: * Windows: we now use OpenSSL instead of LibreSSL. This also means PQC is available on Windows now (see Post-quantum cryptography above). - * When a netsplit happens and [set::server-linking::autoconnect-strategy](https://www.unrealircd.org/docs/Set_block#set::server-linking) is `sequential` (which is the default) or `sequential-fallback` diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf index ec2aadb35..50c2810b9 100644 --- a/doc/conf/modules.default.conf +++ b/doc/conf/modules.default.conf @@ -1,4 +1,4 @@ -/* [6.2.0-beta3] +/* [6.2.0] * This file will load (nearly) all modules available on UnrealIRCd. * So all commands, channel modes, user modes, etc.. * diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index f2117241b..0e7d9adad 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 = 6.2.0-beta3 +PROJECT_NUMBER = 6.2.0 # 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 a5dc1a1de..4803cc53e 100644 --- a/include/windows/setup.h +++ b/include/windows/setup.h @@ -73,6 +73,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 "-beta3" +#define UNREAL_VERSION_SUFFIX "" #endif diff --git a/src/version.c.SH b/src/version.c.SH index 503fbb02d..76a4c47a5 100644 --- a/src/version.c.SH +++ b/src/version.c.SH @@ -7,7 +7,7 @@ echo "Extracting src/version.c..." if [ -d ../.git ]; then SUFFIX="-$(git rev-parse --short HEAD)" fi -id="6.2.0-beta3$SUFFIX" +id="6.2.0$SUFFIX" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index 4c371300a..89a6b36d4 100755 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 6 -AppVerName=UnrealIRCd 6.2.0-beta3 +AppVerName=UnrealIRCd 6.2.0 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org