diff --git a/Config b/Config
index 348e21d8b..73428effd 100755
--- a/Config
+++ b/Config
@@ -377,7 +377,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="6.2.1 6.2.1-rc2 6.2.1-rc1 6.2.0.2 6.2.0.1 6.2.0 6.2.0-beta3 6.2.0-beta2 6.2.0-beta1 6.1.10 6.1.10-rc1 6.1.9 6.1.8 6.1.8.1 6.1.8 6.1.8-rc1 6.1.7 6.1.7-rc1 6.1.6 6.1.6-rc1 6.1.5 6.1.4 6.1.3 6.1.3-rc1 6.1.2.3 6.1.2.2 6.1.2.1 6.1.2 6.1.2-rc2 6.1.2-rc1 6.1.1.1 6.1.1 6.1.0 6.1.0-rc2 6.1.0-rc1 6.0.7 6.0.6 6.0.5 6.0.5-rc2 6.0.5-rc1 6.0.4.2 6.0.4.1 6.0.4 6.0.4-rc2 6.0.4-rc1 6.0.3 6.0.2 6.0.1.1 6.0.1 6.0.0"
+UNREALRELEASES="6.2.2 6.2.1 6.2.1-rc2 6.2.1-rc1 6.2.0.2 6.2.0.1 6.2.0 6.2.0-beta3 6.2.0-beta2 6.2.0-beta1 6.1.10 6.1.10-rc1 6.1.9 6.1.8 6.1.8.1 6.1.8 6.1.8-rc1 6.1.7 6.1.7-rc1 6.1.6 6.1.6-rc1 6.1.5 6.1.4 6.1.3 6.1.3-rc1 6.1.2.3 6.1.2.2 6.1.2.1 6.1.2 6.1.2-rc2 6.1.2-rc1 6.1.1.1 6.1.1 6.1.0 6.1.0-rc2 6.1.0-rc1 6.0.7 6.0.6 6.0.5 6.0.5-rc2 6.0.5-rc1 6.0.4.2 6.0.4.1 6.0.4 6.0.4-rc2 6.0.4-rc1 6.0.3 6.0.2 6.0.1.1 6.0.1 6.0.0"
if [ -f "config.settings" ]; then
. ./config.settings
else
diff --git a/configure b/configure
index d955909e9..da483d3d7 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.72 for unrealircd 6.2.2.
+# Generated by GNU Autoconf 2.72 for unrealircd 6.2.3-git.
#
# Report bugs to .
#
@@ -604,8 +604,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='unrealircd'
PACKAGE_TARNAME='unrealircd'
-PACKAGE_VERSION='6.2.2'
-PACKAGE_STRING='unrealircd 6.2.2'
+PACKAGE_VERSION='6.2.3-git'
+PACKAGE_STRING='unrealircd 6.2.3-git'
PACKAGE_BUGREPORT='https://bugs.unrealircd.org/'
PACKAGE_URL='https://unrealircd.org/'
@@ -1363,7 +1363,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.2 to adapt to many kinds of systems.
+'configure' configures unrealircd 6.2.3-git to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1429,7 +1429,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of unrealircd 6.2.2:";;
+ short | recursive ) echo "Configuration of unrealircd 6.2.3-git:";;
esac
cat <<\_ACEOF
@@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-unrealircd configure 6.2.2
+unrealircd configure 6.2.3-git
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1914,7 +1914,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.2, which was
+It was created by unrealircd $as_me 6.2.3-git, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2715,7 +2715,7 @@ printf "%s\n" "#define UNREAL_VERSION_MAJOR $UNREAL_VERSION_MAJOR" >>confdefs.h
# Minor version number (e.g.: Z in X.Y.Z)
-UNREAL_VERSION_MINOR="2"
+UNREAL_VERSION_MINOR="3"
printf "%s\n" "#define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR" >>confdefs.h
@@ -2723,7 +2723,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=""
+UNREAL_VERSION_SUFFIX="-git"
printf "%s\n" "#define UNREAL_VERSION_SUFFIX \"$UNREAL_VERSION_SUFFIX\"" >>confdefs.h
@@ -10624,7 +10624,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.2, which was
+This file was extended by unrealircd $as_me 6.2.3-git, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10689,7 +10689,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.2
+unrealircd config.status 6.2.3-git
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 34904dcb9..83e1a8daf 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.2], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
+AC_INIT([unrealircd], [6.2.3-git], [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=["2"]
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=["2"]
+UNREAL_VERSION_MINOR=["3"]
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=[""]
+UNREAL_VERSION_SUFFIX=["-git"]
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 f0add5285..b8dad8da7 100644
--- a/doc/Config.header
+++ b/doc/Config.header
@@ -7,7 +7,7 @@
\___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_|
Configuration Program
- for UnrealIRCd 6.2.2
+ for UnrealIRCd 6.2.3-git
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 cfe498174..3fac0abb2 100644
--- a/doc/RELEASE-NOTES.md
+++ b/doc/RELEASE-NOTES.md
@@ -1,6 +1,43 @@
-UnrealIRCd 6.2.2
+UnrealIRCd 6.2.3-git
=================
+This is the git version (development version) for future UnrealIRCd 6.2.3.
+This is work in progress and may not always be a stable version.
+
+### Enhancements:
+* In [ban user { }](https://www.unrealircd.org/docs/Ban_user_block)
+ you can now use `soft yes;` to make it a
+ [Soft ban](https://www.unrealircd.org/docs/Soft_ban).
+
+### Changes:
+* Small updates to `HELPOP`.
+
+### Fixes:
+* Crash when using [Extended Server Bans](https://www.unrealircd.org/docs/Extended_server_bans)
+ with an invalid syntax in the configuration file.
+
+### Developers and protocol:
+* Changes in [JSON-RPC](https://www.unrealircd.org/docs/JSON-RPC):
+ * Mask/match items and security groups now get expanded in the same way.
+ All properties are expanded properly. Extended fields like `account`
+ and `country` are expanded directly under, just like any other items.
+ * [`security_group`](https://www.unrealircd.org/docs/JSON-RPC:Security_group):
+ Uses the new style output (see previous).
+ * [`server_ban`](https://www.unrealircd.org/docs/JSON-RPC:Server_ban) and
+ [`server_ban_exception`](https://www.unrealircd.org/docs/JSON-RPC:Server_ban_exception)
+ now show the expanded mask items in `match` rather than `"name":""`.
+ This does mean that `name` will be missing if it is a `match` item.
+ * [`spamfilter`](https://www.unrealircd.org/docs/JSON-RPC:Spamfilter):
+ here too, mask item is expanded if it is used in spamfilter.except.
+ * [`connthrottle`](https://www.unrealircd.org/docs/JSON-RPC:Connthrottle):
+ In `connthrottle.status` the `state` value `active` was changed to
+ `monitoring` (module is enabled but not actively intervening).
+ Also, the items under config.except are now an expanded mask item
+ (consistent with the rest).
+
+UnrealIRCd 6.2.2
+-----------------
+
This is a small maintenance release to fix some minor issues.
If you are still running 6.0.x or 6.1.x then we highly recommend to upgrade
diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf
index b348fa7dd..0ac84c726 100644
--- a/doc/conf/modules.default.conf
+++ b/doc/conf/modules.default.conf
@@ -1,4 +1,4 @@
-/* [6.2.2]
+/* [6.2.3-git]
* 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 a88e189cc..586aefc3f 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.2
+PROJECT_NUMBER = 6.2.3-git
# 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 0b13afa1a..92944cf12 100644
--- a/include/windows/setup.h
+++ b/include/windows/setup.h
@@ -69,10 +69,10 @@
#define UNREAL_VERSION_MAJOR 2
/* Minor version number (e.g.: 1 for Unreal3.2.1) */
-#define UNREAL_VERSION_MINOR 2
+#define UNREAL_VERSION_MINOR 3
/* 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 "-git"
#endif
diff --git a/src/version.c.SH b/src/version.c.SH
index a88fad176..e35eaf6f3 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.2$SUFFIX"
+id="6.2.3-git$SUFFIX"
echo "$id"
if test -r version.c
diff --git a/src/windows/UnrealIRCd.exe.manifest b/src/windows/UnrealIRCd.exe.manifest
index 634ba1437..3440afd6c 100644
--- a/src/windows/UnrealIRCd.exe.manifest
+++ b/src/windows/UnrealIRCd.exe.manifest
@@ -3,7 +3,7 @@
Internet Relay Chat Daemon
diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss
index 57c56fc78..92ba519b8 100755
--- a/src/windows/unrealinst.iss
+++ b/src/windows/unrealinst.iss
@@ -6,7 +6,7 @@
[Setup]
AppName=UnrealIRCd 6
-AppVerName=UnrealIRCd 6.2.2
+AppVerName=UnrealIRCd 6.2.3-git
AppPublisher=UnrealIRCd Team
AppPublisherURL=https://www.unrealircd.org
AppSupportURL=https://www.unrealircd.org