diff --git a/.CHANGES.NEW b/.CHANGES.NEW index b19ec8d60..7f67263dc 100644 --- a/.CHANGES.NEW +++ b/.CHANGES.NEW @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 4.2.1-rc1 + for UnrealIRCd 4.2.1 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/Config b/Config index 9ea1adec9..d8d1740be 100755 --- a/Config +++ b/Config @@ -452,7 +452,7 @@ echo "" if [ -z "$NOCACHE" ] ; then # This needs to be updated each release so auto-upgrading works for settings, modules, etc!!: - UNREALRELEASES="unrealircd-4.2.0 unrealircd-4.0.19-rc2 unrealircd-4.0.19-rc1 unrealircd-4.0.18 unrealircd-4.0.18-rc2 unrealircd-4.0.18-rc1 unrealircd-4.0.17 unrealircd-4.0.17-rc1 unrealircd-4.0.16.1 unrealircd-4.0.16 unrealircd-4.0.15 unrealircd-4.0.14 unrealircd-4.0.14-rc1 unrealircd-4.0.13 unrealircd-4.0.13-rc1 unrealircd-4.0.12.1 unrealircd-4.0.12 unrealircd-4.0.11 unrealircd-4.0.10 unrealircd-4.0.9 unrealircd-4.0.8.4 unrealircd-4.0.8.3 unrealircd-4.0.8.2 unrealircd-4.0.8.1" + UNREALRELEASES="unrealircd-4.2.1-rc1 unrealircd-4.2.0 unrealircd-4.0.19-rc2 unrealircd-4.0.19-rc1 unrealircd-4.0.18 unrealircd-4.0.18-rc2 unrealircd-4.0.18-rc1 unrealircd-4.0.17 unrealircd-4.0.17-rc1 unrealircd-4.0.16.1 unrealircd-4.0.16 unrealircd-4.0.15 unrealircd-4.0.14 unrealircd-4.0.14-rc1 unrealircd-4.0.13 unrealircd-4.0.13-rc1 unrealircd-4.0.12.1 unrealircd-4.0.12 unrealircd-4.0.11 unrealircd-4.0.10 unrealircd-4.0.9 unrealircd-4.0.8.4 unrealircd-4.0.8.3 unrealircd-4.0.8.2 unrealircd-4.0.8.1" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/configure b/configure index dcdc70722..49172333f 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 4.2.1-rc1. +# Generated by GNU Autoconf 2.69 for unrealircd 4.2.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='4.2.1-rc1' -PACKAGE_STRING='unrealircd 4.2.1-rc1' +PACKAGE_VERSION='4.2.1' +PACKAGE_STRING='unrealircd 4.2.1' PACKAGE_BUGREPORT='http://bugs.unrealircd.org/' PACKAGE_URL='http://unrealircd.org/' @@ -1336,7 +1336,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 4.2.1-rc1 to adapt to many kinds of systems. +\`configure' configures unrealircd 4.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1402,7 +1402,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 4.2.1-rc1:";; + short | recursive ) echo "Configuration of unrealircd 4.2.1:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 4.2.1-rc1 +unrealircd configure 4.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2167,7 +2167,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 4.2.1-rc1, which was +It was created by unrealircd $as_me 4.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2586,7 +2586,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="" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -9456,7 +9456,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 4.2.1-rc1, which was +This file was extended by unrealircd $as_me 4.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9519,7 +9519,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 4.2.1-rc1 +unrealircd config.status 4.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index eac734965..b664b8df3 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl src/win32/unrealinst.iss dnl .CHANGES.NEW dnl src/version.c.SH -AC_INIT([unrealircd], [4.2.1-rc1], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) +AC_INIT([unrealircd], [4.2.1], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) AC_CONFIG_SRCDIR([src/ircd.c]) AC_CONFIG_HEADER([include/setup.h]) AC_CONFIG_AUX_DIR([autoconf]) @@ -42,7 +42,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=[""] 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_PROG_CC diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES index 850b7bf5a..67fbf1750 100644 --- a/doc/RELEASE-NOTES +++ b/doc/RELEASE-NOTES @@ -1,8 +1,5 @@ -UnrealIRCd 4.2.1-rc1 Release Notes -=================================== - -This is the release candidate for UnrealIRCd 4.2.1. You can help us with -testing this release so we can release a 4.2.1 stable later this year. +UnrealIRCd 4.2.1 Release Notes +=============================== This version enhances support for authentication for clients that do not support SASL. Also new is a module to combat mixed UTF8 character spam, diff --git a/include/win32/setup.h b/include/win32/setup.h index 23d315b16..97fe63d3d 100644 --- a/include/win32/setup.h +++ b/include/win32/setup.h @@ -88,6 +88,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 "" #endif diff --git a/src/version.c.SH b/src/version.c.SH index 6907b1022..3a3e7205a 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="4.2.1-rc1" +id="4.2.1" echo "$id" if test -r version.c diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index c7a85cdbb..b0a4f2c04 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 4 -AppVerName=UnrealIRCd 4.2.1-rc1 +AppVerName=UnrealIRCd 4.2.1 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org