From 359f7b46759009ac9b923e7e6daafd7ebc3edfb0 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Wed, 15 Dec 2021 16:54:37 +0100 Subject: [PATCH] Get UnrealIRCd 6.0.0 ready, but don't release *yet*. --- Config | 4 ++-- SECURITY.md | 2 +- configure | 20 ++++++++++---------- configure.ac | 4 ++-- doc/Config.header | 2 +- doc/RELEASE-NOTES.md | 34 +++++++++++++++++++++++++++------- extras/doxygen/Doxyfile | 2 +- include/windows/setup.h | 2 +- src/version.c.SH | 2 +- src/windows/unrealinst.iss | 2 +- 10 files changed, 47 insertions(+), 27 deletions(-) diff --git a/Config b/Config index 1f2c5ac93..c325496a3 100755 --- a/Config +++ b/Config @@ -1,7 +1,7 @@ #!/bin/sh # # Config script for UnrealIRCd -# (C) 2001-2019 The UnrealIRCd Team +# (C) 2001-2021 The UnrealIRCd Team # # This configure script is free software; the UnrealIRCd Team gives # unlimited permission to copy, distribute and modify as long as the @@ -348,7 +348,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.0.0-rc1 unrealircd-6.0.0-beta4 unrealircd-6.0.0-beta3 unrealircd-6.0.0-beta2 unrealircd-6.0.0-beta1 unrealircd-5.2.2 unrealircd-5.2.1.1 unrealircd-5.2.1 unrealircd-5.2.1-rc1 unrealircd-5.2.0.2 unrealircd-5.2.0.1 unrealircd-5.2.0 unrealircd-5.2.0-rc1 unrealircd-5.0.9.1 unrealircd-5.0.9 unrealircd-5.0.9-rc1 unrealircd-5.0.8 unrealircd-5.0.8-rc1 unrealircd-5.0.7 unrealircd-5.0.7-rc1 unrealircd-5.0.6 unrealircd-5.0.5.1 unrealircd-5.0.5 unrealircd-5.0.4 unrealircd-5.0.3.1" +UNREALRELEASES="unrealircd-6.0.0-rc2 unrealircd-6.0.0-rc1 unrealircd-6.0.0-beta4 unrealircd-6.0.0-beta3 unrealircd-6.0.0-beta2 unrealircd-6.0.0-beta1 unrealircd-5.2.2 unrealircd-5.2.1.1 unrealircd-5.2.1 unrealircd-5.2.1-rc1 unrealircd-5.2.0.2 unrealircd-5.2.0.1 unrealircd-5.2.0 unrealircd-5.2.0-rc1 unrealircd-5.0.9.1 unrealircd-5.0.9 unrealircd-5.0.9-rc1 unrealircd-5.0.8 unrealircd-5.0.8-rc1 unrealircd-5.0.7 unrealircd-5.0.7-rc1 unrealircd-5.0.6 unrealircd-5.0.5.1 unrealircd-5.0.5 unrealircd-5.0.4" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/SECURITY.md b/SECURITY.md index 4ec037454..0b6e8db7f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,7 +1,7 @@ # Security Policy ## Supported Versions -* The latest *stable* release of UnrealIRCd 5 (until 2023-06-01) +* The latest *stable* release of UnrealIRCd 5 (until 2023-07-01) * The latest *stable* release of UnrealIRCd 6 See [UnrealIRCd releases](https://www.unrealircd.org/docs/UnrealIRCd_releases) for information on older versions and End Of Life dates. diff --git a/configure b/configure index d5ba9a8f6..04f90c41b 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 6.0.0-rc2. +# Generated by GNU Autoconf 2.69 for unrealircd 6.0.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='6.0.0-rc2' -PACKAGE_STRING='unrealircd 6.0.0-rc2' +PACKAGE_VERSION='6.0.0' +PACKAGE_STRING='unrealircd 6.0.0' PACKAGE_BUGREPORT='https://bugs.unrealircd.org/' PACKAGE_URL='https://unrealircd.org/' @@ -1345,7 +1345,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.0.0-rc2 to adapt to many kinds of systems. +\`configure' configures unrealircd 6.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1411,7 +1411,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 6.0.0-rc2:";; + short | recursive ) echo "Configuration of unrealircd 6.0.0:";; esac cat <<\_ACEOF @@ -1586,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 6.0.0-rc2 +unrealircd configure 6.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1955,7 +1955,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.0.0-rc2, which was +It was created by unrealircd $as_me 6.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2373,7 +2373,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="-rc2" +UNREAL_VERSION_SUFFIX="" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -9391,7 +9391,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.0.0-rc2, which was +This file was extended by unrealircd $as_me 6.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9454,7 +9454,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 6.0.0-rc2 +unrealircd config.status 6.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4d2e999cb..51d4c88c7 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.0.0-rc2], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [6.0.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=["-rc2"] +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 80d19c152..a7199af56 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 6.0.0-rc2 + for UnrealIRCd 6.0.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 4cbeb5cc1..daf8cc3d9 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,6 +1,12 @@ UnrealIRCd 6.0.0-git ================= -This WILL BE the first stable release of UnrealIRCd 6. +*NOT RELEASED YET* + +This is the first stable release of UnrealIRCd 6. + +Many thanks to k4be for his help during development, other contributors for +their feedback and patches, the people who tested the beta's and release +candidates, translators and everyone else who made this release happen! Summary -------- @@ -13,8 +19,22 @@ which snomask. All the +vhoaq channel modes are now modular as well, handy for admins who don't want or need halfops or +q/+a. For WHOIS it is now customizable in detail who gets to see what. -Upgrading ----------- +A summary of the features is available at +[What's new in UnrealIRCd 6](https://www.unrealircd.org/docs/What's_new_in_UnrealIRCd_6). +For complete information, continue reading the release notes below. +The sections below contain all the details. + +Upgrading from UnrealIRCd 5 +---------------------------- +The previous stable series, UnrealIRCd 5, will no longer get any new features. +We still do bug fixes until July 1, 2022. In the 12 months after that, only +security issues will be fixed. Finally, after July 1, 2023, +[all support will stop](https://www.unrealircd.org/docs/UnrealIRCd_5_EOL). + +If you want to hold off for a while because you are cautious or if you +depend on 3rd party modules (which may not have been upgraded yet by their +authors) then feel free to wait for a 6.0.1 or 6.0.2 release. + If you are upgrading from UnrealIRCd 5 to 6 then you can use your existing configuration and files. There's no need to start from scratch. However, you will need to make a few updates, see @@ -24,11 +44,11 @@ Enhancements ------------- * Completely new log system and snomasks overhaul * Both logging and snomask sending is done by a single logging function - * New support for [JSON logging](https://www.unrealircd.org/docs/JSON_logging) + * Support for [JSON logging](https://www.unrealircd.org/docs/JSON_logging) to disk, instead of the default text format. JSON logging adds lot of detail to log messages and consistently - expands things like 'client' with properties like hostname, - connected_since, reputation, modes, etc. + expands things like *client* with properties like *hostname*, + *connected_since*, *reputation*, *modes*, etc. * The JSON data is also sent to all IRCOps who request the `unrealircd.org/json-log` capability. The data is then sent in a message-tag called `unrealircd.org/json-log`. This makes it ideal @@ -173,7 +193,7 @@ Module coders (API changes) Server protocol ---------------- * When multiple related `SJOIN` messages are generated for the same channel - then we now only send the current channel modes (eg ```+sntk key```) in the + then we now only send the current channel modes (eg `+sntk key`) in the first SJOIN and not in the other ones as they are unneeded for the immediate followup SJOINs, they waste unnecessary bytes and CPU. Such messages may be generated when syncing a channel that has dozens diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index 16fa9a42d..7b2131289 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.0.0-rc2 +PROJECT_NUMBER = 6.0.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 a93960196..f145dfe11 100644 --- a/include/windows/setup.h +++ b/include/windows/setup.h @@ -65,6 +65,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 "-rc2" +#define UNREAL_VERSION_SUFFIX "" #endif diff --git a/src/version.c.SH b/src/version.c.SH index 4fc747529..61a401612 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.0.0-rc2$SUFFIX" +id="6.0.0$SUFFIX" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index 742e9b17d..89ce4360c 100755 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 6 -AppVerName=UnrealIRCd 6.0.0-rc2 +AppVerName=UnrealIRCd 6.0.0 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org