diff --git a/Config b/Config index bd5a6a70a..1f2c5ac93 100755 --- a/Config +++ b/Config @@ -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-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-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" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/configure b/configure index ebb7dd0fe..d5ba9a8f6 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-rc1. +# Generated by GNU Autoconf 2.69 for unrealircd 6.0.0-rc2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='6.0.0-rc1' -PACKAGE_STRING='unrealircd 6.0.0-rc1' +PACKAGE_VERSION='6.0.0-rc2' +PACKAGE_STRING='unrealircd 6.0.0-rc2' 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-rc1 to adapt to many kinds of systems. +\`configure' configures unrealircd 6.0.0-rc2 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-rc1:";; + short | recursive ) echo "Configuration of unrealircd 6.0.0-rc2:";; 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-rc1 +unrealircd configure 6.0.0-rc2 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-rc1, which was +It was created by unrealircd $as_me 6.0.0-rc2, 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="-rc1" +UNREAL_VERSION_SUFFIX="-rc2" 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-rc1, which was +This file was extended by unrealircd $as_me 6.0.0-rc2, 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-rc1 +unrealircd config.status 6.0.0-rc2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e35133c83..4d2e999cb 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-rc1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [6.0.0-rc2], [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=["-rc1"] +UNREAL_VERSION_SUFFIX=["-rc2"] 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 1fa65c71b..80d19c152 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 6.0.0-rc1 + for UnrealIRCd 6.0.0-rc2 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 40f436aca..f47d87c18 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,18 +1,17 @@ -UnrealIRCd 6.0.0-rc1 +UnrealIRCd 6.0.0-rc2 ======================= -This is the first Release Candidate for UnrealIRCd 6. +This is the second Release Candidate for UnrealIRCd 6. + +The plan is to have a stable 6.0.0 release the week before Christmas, so +please help us test this (possibly last) Release Candidate to ensure it's good! +Fire up an U6 test server, link in an U6 server to your existing U5 network, +upgrade a server from U5 to U6. Test real-world scenarios and play around. +If you find any issues (big or small), then please report them at +https://bugs.unrealircd.org/. The "Release Candidate" stage means that the code is (soon) expected to be of production quality. It should no longer crash or have major issues, but we need help from the public to verify that this is indeed the case. -So, feel free to fire up a U6 test server, link in an U6 server to your -existing U5 network, upgrade a not-so-important server from U5 to U6, -play around, and help us! - -If you find any issues, please report them at https://bugs.unrealircd.org/. -This way, you help us getting ready for a real stable UnrealIRCd 6 release. -Similarly, if you are missing any documentation on U6 features, upgrading, -or think some docs or instructions could be better, let us know as well. If you can afford it during testing, answer *Yes* to the `./Config` question about [AddressSanitizer](https://en.wikipedia.org/wiki/AddressSanitizer) @@ -20,8 +19,16 @@ as it allows better testing (catches more bugs). But, if you don't want this performance penalty, or if UnrealIRCd fails to start with a mysterious error, then you can answer *No* there, that is totally fine too. -If you were previously using a 6.0.0-beta then you can upgrade to -the release candidate using `./unrealircd upgrade` +If you were previously using a 6.0.0 beta or RC then you can upgrade to +the latest release (candidate) using `./unrealircd upgrade` + +Change between 6.0.0-rc1 and 6.0.0-rc2: +* Documentation changes (HELPOP EXTBANS, HELPOP SNOMASK, etc.) +* Fix a problem where a +a (chanadmin) could kick a +q (chanowner) +* Fix a possible KICK problem with some IRC clients (now behave like U5) +* Porting over some changes from 5.x to 6.x that were forgotten earlier + (curl-ca-bundle.crt, shipped c-ares, SVSLOGIN without SASL) +* Some other small fixes, eg +s/+p handling on netmerge Summary -------- diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index 84b285bd4..16fa9a42d 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-rc1 +PROJECT_NUMBER = 6.0.0-rc2 # 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/version.h b/include/version.h index 844b68633..00f5e621b 100644 --- a/include/version.h +++ b/include/version.h @@ -54,7 +54,7 @@ * Can be useful if the above 3 versionids are insufficient for you (eg: you want to support CVS). * This is updated automatically on the CVS server every Monday. so don't touch it. */ -#define UNREAL_VERSION_TIME 202125 +#define UNREAL_VERSION_TIME 202148 #define UNREAL_VERSION ((UNREAL_VERSION_GENERATION << 24) + (UNREAL_VERSION_MAJOR << 16) + (UNREAL_VERSION_MINOR << 8)) #define UnrealProtocol 6000 diff --git a/include/windows/setup.h b/include/windows/setup.h index 4d06b56a2..a93960196 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 "-rc1" +#define UNREAL_VERSION_SUFFIX "-rc2" #endif diff --git a/src/version.c.SH b/src/version.c.SH index 4940b3666..4fc747529 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-rc1$SUFFIX" +id="6.0.0-rc2$SUFFIX" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index 9923b3d8a..6d9f1a608 100644 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 6 -AppVerName=UnrealIRCd 6.0.0-rc1 +AppVerName=UnrealIRCd 6.0.0-rc2 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org