From d7a686895061b5172cd8bd13696534d36a1bdacb Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 9 Nov 2025 09:01:34 +0100 Subject: [PATCH] Bump version to 6.2.2-git --- Config | 2 +- configure | 22 ++++++++--------- configure.ac | 6 ++--- doc/Config.header | 2 +- doc/RELEASE-NOTES.md | 33 ++++++++++++++++++++++---- doc/conf/modules.default.conf | 2 +- extras/doxygen/Doxyfile | 2 +- include/windows/setup.h | 4 ++-- src/modules/md.c | 7 ++++++ src/version.c.SH | 2 +- src/windows/UnrealIRCd.exe.manifest | 2 +- src/windows/unrealinst.iss | 2 +- src/windows/unrealircdctl.exe.manifest | 2 +- 13 files changed, 60 insertions(+), 28 deletions(-) diff --git a/Config b/Config index 7bbcacef4..5025a572e 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="unrealircd-6.2.1-rc2 unrealircd-6.2.1-rc1 unrealircd-6.2.0.2 unrealircd-6.2.0.1 unrealircd-6.2.0 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" +UNREALRELEASES="unrealircd-6.2.1 unrealircd-6.2.1-rc2 unrealircd-6.2.1-rc1 unrealircd-6.2.0.2 unrealircd-6.2.0.1 unrealircd-6.2.0 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 4ab13d315..adcaed100 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.1. +# Generated by GNU Autoconf 2.72 for unrealircd 6.2.2-git. # # Report bugs to . # @@ -604,8 +604,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='6.2.1' -PACKAGE_STRING='unrealircd 6.2.1' +PACKAGE_VERSION='6.2.2-git' +PACKAGE_STRING='unrealircd 6.2.2-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.1 to adapt to many kinds of systems. +'configure' configures unrealircd 6.2.2-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.1:";; + short | recursive ) echo "Configuration of unrealircd 6.2.2-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.1 +unrealircd configure 6.2.2-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.1, which was +It was created by unrealircd $as_me 6.2.2-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="1" +UNREAL_VERSION_MINOR="2" 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.1, which was +This file was extended by unrealircd $as_me 6.2.2-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.1 +unrealircd config.status 6.2.2-git configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 193c426dd..16da0a585 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.1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [6.2.2-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=["1"] +UNREAL_VERSION_MINOR=["2"] 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 0ad2ada27..db6bf8358 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 6.2.1 + for UnrealIRCd 6.2.2-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 20b9ba878..0ea0867e2 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,6 +1,24 @@ -UnrealIRCd 6.2.1 +UnrealIRCd 6.2.2-git ================= +This is the git version (development version) for future UnrealIRCd 6.2.2. +This is work in progress and may not always be a stable version. + +### Enhancements: +* TODO + +### Changes: +* TODO + +### Fixes: +* TODO + +### Developers and protocol: +* TODO + +UnrealIRCd 6.2.1 +----------------- + This version focusses on performance improvements but also quite some new features are added and issues were fixed. @@ -88,6 +106,16 @@ features are added and issues were fixed. UnrealIRCd 6.2.0.2 ------------------- +This version fixes scoring in the optional antimixedutf8 module. + +UnrealIRCd 6.2.0.1 +------------------- + +This version fixes some unnecessary "best practices" warnings. + +UnrealIRCd 6.2.0 +----------------- + UnrealIRCd 6.2.0 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. @@ -101,9 +129,6 @@ 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) -6.2.0.1: This version fixes some unnecessary "best practices" warnings. -6.2.0.2: This version fixes scoring in the optional antimixedutf8 module. - ### Enhancements: * [Channel flood protection by default](https://www.unrealircd.org/docs/Channel_anti-flood_settings): This is an important change that IRCOps and chanops should know about: diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf index a04707483..7d94c5f23 100644 --- a/doc/conf/modules.default.conf +++ b/doc/conf/modules.default.conf @@ -1,4 +1,4 @@ -/* [6.2.1] +/* [6.2.2-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 5b764b901..2a2c81e33 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.1 +PROJECT_NUMBER = 6.2.2-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 f25932691..28b45440d 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 1 +#define UNREAL_VERSION_MINOR 2 /* 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/modules/md.c b/src/modules/md.c index 21e6ffc3c..f01a608df 100644 --- a/src/modules/md.c +++ b/src/modules/md.c @@ -108,6 +108,13 @@ int md_access_check(Client *client, ModDataInfo *md, Client *target) * https://www.unrealircd.org/docs/Server_protocol:MD_command * Module API documentation (if writing an UnrealIRCd module): * https://www.unrealircd.org/docs/Dev:Module_Storage + * + * Note that this MD command has the CMD_BIGLINES flag set, + * which means the IRC S2S protocol line can be up to 16k of data. + * In particular, the value (parv[4]) can be near 16k. + * This is supported since UnrealIRCd 6.1.1. No effort is made to + * deal with non-BIGLINES servers. As of 2025 (6.2.1) we don't ship + * with modules that have serializers that return so many bytes, anyway. */ CMD_FUNC(cmd_md) { diff --git a/src/version.c.SH b/src/version.c.SH index 9b30a609d..6c456bea9 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.1$SUFFIX" +id="6.2.2-git$SUFFIX" echo "$id" if test -r version.c diff --git a/src/windows/UnrealIRCd.exe.manifest b/src/windows/UnrealIRCd.exe.manifest index ebbdcf727..634ba1437 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 e132cfb19..86ae26201 100755 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 6 -AppVerName=UnrealIRCd 6.2.1 +AppVerName=UnrealIRCd 6.2.2-git AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org diff --git a/src/windows/unrealircdctl.exe.manifest b/src/windows/unrealircdctl.exe.manifest index e0db20814..007fc8ace 100644 --- a/src/windows/unrealircdctl.exe.manifest +++ b/src/windows/unrealircdctl.exe.manifest @@ -3,7 +3,7 @@ UnrealIRCd - Control utility