From 40bc3ef8cc049dc529e749c8fd6cc3e3a32f8e90 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Wed, 2 Jun 2021 15:27:14 +0200 Subject: [PATCH] Bump version to 5.2.0-git. This is still work in progress. Note that we are on the 'unreal52' branch now and have left 'unreal50' --- Config | 2 +- configure | 22 +++++++++++----------- configure.ac | 6 +++--- doc/Config.header | 2 +- doc/RELEASE-NOTES.md | 10 +--------- extras/doxygen/Doxyfile | 2 +- include/config.h | 2 +- include/windows/setup.h | 4 ++-- src/unrealdb.c | 4 ++-- src/version.c.SH | 2 +- src/windows/UnrealIRCd.exe.manifest | 2 +- src/windows/unrealinst.iss | 2 +- 12 files changed, 26 insertions(+), 34 deletions(-) diff --git a/Config b/Config index a08e1bfc4..b3809258c 100755 --- a/Config +++ b/Config @@ -347,7 +347,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.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 unrealircd-5.0.3 unrealircd-5.0.2 unrealircd-5.0.1 unrealircd-5.0.0" +UNREALRELEASES="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 unrealircd-5.0.3 unrealircd-5.0.2 unrealircd-5.0.1 unrealircd-5.0.0" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/configure b/configure index a9dd1b24b..28f04842f 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.10-git. +# Generated by GNU Autoconf 2.69 for unrealircd 5.2.0-git. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='5.0.10-git' -PACKAGE_STRING='unrealircd 5.0.10-git' +PACKAGE_VERSION='5.2.0-git' +PACKAGE_STRING='unrealircd 5.2.0-git' PACKAGE_BUGREPORT='https://bugs.unrealircd.org/' PACKAGE_URL='https://unrealircd.org/' @@ -1330,7 +1330,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.10-git to adapt to many kinds of systems. +\`configure' configures unrealircd 5.2.0-git to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 5.0.10-git:";; + short | recursive ) echo "Configuration of unrealircd 5.2.0-git:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 5.0.10-git +unrealircd configure 5.2.0-git generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1923,7 +1923,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.10-git, which was +It was created by unrealircd $as_me 5.2.0-git, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2323,7 +2323,7 @@ _ACEOF # Major version number (e.g.: Y in X.Y.Z) -UNREAL_VERSION_MAJOR="0" +UNREAL_VERSION_MAJOR="2" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_MAJOR $UNREAL_VERSION_MAJOR @@ -2331,7 +2331,7 @@ _ACEOF # Minor version number (e.g.: Z in X.Y.Z) -UNREAL_VERSION_MINOR="10" +UNREAL_VERSION_MINOR="0" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR @@ -8866,7 +8866,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.10-git, which was +This file was extended by unrealircd $as_me 5.2.0-git, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8929,7 +8929,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.10-git +unrealircd config.status 5.2.0-git configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5a96a6bef..61bd4ec79 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.10-git], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [5.2.0-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]) @@ -30,11 +30,11 @@ UNREAL_VERSION_GENERATION=["5"] AC_DEFINE_UNQUOTED([UNREAL_VERSION_GENERATION], [$UNREAL_VERSION_GENERATION], [Generation version number (e.g.: X for X.Y.Z)]) # Major version number (e.g.: Y in X.Y.Z) -UNREAL_VERSION_MAJOR=["0"] +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=["10"] +UNREAL_VERSION_MINOR=["0"] 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 diff --git a/doc/Config.header b/doc/Config.header index 0cf6f513f..28d882f2c 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 5.0.10-git + for UnrealIRCd 5.2.0-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 92ebc8994..cbe33c6ef 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,16 +1,8 @@ -UnrealIRCd 5.X.Y-git Release Notes +UnrealIRCd 5.2.0-git Release Notes =============================== This is the current development version (git) of UnrealIRCd. -This UnrealIRCd release focusses on channel history. A way to store channel -history encrypted on disk has been added (to preserve between server restarts) -and the IRCv3 CHATHISTORY command has been implemented to allow fetching -thousands of lines of channel history. - -It also contains a breaking change, meaning (almost) everyone will need -to change a few things in their configuration file. - Breaking change: * The set::anti-flood block has been redone so you can have different limits for ''unknown-users'' and ''known-users''. diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index 660e825a1..f0a68247b 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.10 +PROJECT_NUMBER = 5.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/config.h b/include/config.h index e891c4dc2..bf9f6565b 100644 --- a/include/config.h +++ b/include/config.h @@ -96,7 +96,7 @@ * an insane amount of log output which can be very useful for debugging. * You should *NEVER* enable this setting on production servers. */ -/* #undef DEBUGMODE */ +#define DEBUGMODE /* Similarly, DEBUG_IOENGINE can be used to debug the I/O engine. */ /* #undef DEBUG_IOENGINE */ diff --git a/include/windows/setup.h b/include/windows/setup.h index 04843666a..d1f2ffa40 100644 --- a/include/windows/setup.h +++ b/include/windows/setup.h @@ -60,10 +60,10 @@ #define UNREAL_VERSION_GENERATION 5 /* Major version number (e.g.: 2 for Unreal3.2*) */ -#define UNREAL_VERSION_MAJOR 0 +#define UNREAL_VERSION_MAJOR 2 /* Minor version number (e.g.: 1 for Unreal3.2.1) */ -#define UNREAL_VERSION_MINOR 10 +#define UNREAL_VERSION_MINOR 0 /* Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX) */ diff --git a/src/unrealdb.c b/src/unrealdb.c index e08918927..91de7dc32 100644 --- a/src/unrealdb.c +++ b/src/unrealdb.c @@ -40,11 +40,11 @@ * and I/O speeds of the underlying hardware. */ -/* In UnrealIRCd 5.0.10 we don't write the v1 header yet for unencrypted +/* In UnrealIRCd 5.2.0 we don't write the v1 header yet for unencrypted * database files, this so users using unencrypted can easily downgrade * to 5.0.9 and lower should there be any need to do so. * We DO support READING encypted, unencrypted v1, and unencrypted raw (v0) - * in 5.0.10, though. + * in 5.2.0, though. * Presumably in 2022 or so we will stop writing v0 by default and change * this #undef to a #define to write v1. */ diff --git a/src/version.c.SH b/src/version.c.SH index 08e7bd98a..84fa0f7fa 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.9.1" +id="5.2.0" echo "$id" if test -r version.c diff --git a/src/windows/UnrealIRCd.exe.manifest b/src/windows/UnrealIRCd.exe.manifest index f734e2b5f..f7bd8ef8b 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 488d3a993..5b5b5d94e 100644 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 5 -AppVerName=UnrealIRCd 5.0.10-git +AppVerName=UnrealIRCd 5.2.0-git AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org