diff --git a/configure b/configure index 503c8bb6f..fea0cf5be 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.2.2-git. +# Generated by GNU Autoconf 2.69 for unrealircd 5.2.2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='5.2.2-git' -PACKAGE_STRING='unrealircd 5.2.2-git' +PACKAGE_VERSION='5.2.2' +PACKAGE_STRING='unrealircd 5.2.2' 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.2.2-git to adapt to many kinds of systems. +\`configure' configures unrealircd 5.2.2 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.2.2-git:";; + short | recursive ) echo "Configuration of unrealircd 5.2.2:";; 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.2.2-git +unrealircd configure 5.2.2 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.2.2-git, which was +It was created by unrealircd $as_me 5.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2341,7 +2341,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="-git" +UNREAL_VERSION_SUFFIX="" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -8870,7 +8870,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.2.2-git, which was +This file was extended by unrealircd $as_me 5.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8933,7 +8933,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.2.2-git +unrealircd config.status 5.2.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 20878a0bf..2140d5d11 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.2.2-git], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [5.2.2], [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=["-git"] +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 964c89172..1b0cf7694 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 5.2.2-git + for UnrealIRCd 5.2.2 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 834078e7e..751036d91 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,4 +1,4 @@ -UnrealIRCd 5.2.2-NOTRELEASEDYET Release Notes +UnrealIRCd 5.2.2 Release Notes =============================== Previous release 5.2.1.1 turned out to be good and stable. This 5.2.2 release @@ -7,7 +7,7 @@ only contains some minor changes. If you are still using UnrealIRCd 5.0.x then we recommend you to upgrade to 5.2.2 in the next few weeks/months. Just as a reminder: 5.2.x is the direct successor to 5.0.9, there is -[no support for 5.0.x](https://www.unrealircd.org/docs/FAQ#About_the_new_5.2.x_series). +[no support for 5.0.x](https://www.unrealircd.org/docs/FAQ#about-52x). Fixes: * Fix issues with Let's Encrypt certificates for @@ -142,7 +142,7 @@ on disk and allows clients to fetch hundreds/thousands of lines. Upgrading and the 5.0.x series ------------------------------- UnrealIRCd 5.2.0 is the direct successor to 5.0.9/5.0.9.1. -There will be [no further 5.0.x releases](https://www.unrealircd.org/docs/FAQ#About_the_new_5.2.x_series), +There will be [no further 5.0.x releases](https://www.unrealircd.org/docs/FAQ#about-52x), in particular there will be no 5.0.10. Only four bugs that affect a limited number of people/networks were fixed. diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index 62e4ae45b..937dbf798 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.2.2-git +PROJECT_NUMBER = 5.2.2 # 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 9d17000f0..9f890746e 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 202139 #define UNREAL_VERSION ((UNREAL_VERSION_GENERATION << 24) + (UNREAL_VERSION_MAJOR << 16) + (UNREAL_VERSION_MINOR << 8)) #define UnrealProtocol 5002 diff --git a/include/windows/setup.h b/include/windows/setup.h index e41c97c10..a608381aa 100644 --- a/include/windows/setup.h +++ b/include/windows/setup.h @@ -63,7 +63,7 @@ #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) */ diff --git a/src/version.c.SH b/src/version.c.SH index 51d15f23e..6d0a1728c 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="5.2.2-git$SUFFIX" +id="5.2.2$SUFFIX" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index ca10f3278..8ff530fdf 100644 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 5 -AppVerName=UnrealIRCd 5.2.2-git +AppVerName=UnrealIRCd 5.2.2 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org