From 2f2ee0ba030ad52980ce14bf36d50c2abd7150d4 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 8 Nov 2015 10:29:01 +0100 Subject: [PATCH] Bump version to 4.0.0-rc3 --- .CHANGES.NEW | 2 +- Config | 2 +- configure | 20 ++++++++++---------- configure.ac | 6 +++--- doc/RELEASE-NOTES | 9 +++++---- include/setup.h.in | 2 +- include/win32/setup.h | 4 ++-- src/version.c.SH | 2 +- src/win32/unrealinst.iss | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.CHANGES.NEW b/.CHANGES.NEW index 8749b8729..9e290abaa 100644 --- a/.CHANGES.NEW +++ b/.CHANGES.NEW @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 4.0.0-rc2 + for UnrealIRCd 4.0.0-rc3 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 d2bb2c166..6348cdda9 100755 --- a/Config +++ b/Config @@ -443,7 +443,7 @@ echo "" if [ -z "$NOCACHE" ] ; then # This needs to be updated each release so auto-upgrading works for settings, modules, etc!!: - UNREALRELEASES="unrealircd-4.0.0-rc1 Unreal3.4-beta4 Unreal3.4-beta3 Unreal3.4-beta2 Unreal3.4-beta1 Unreal3.4-alpha4 Unreal3.4-alpha3 Unreal3.4-alpha2 Unreal3.4-alpha1" + UNREALRELEASES="unrealircd-4.0.0-rc2 unrealircd-4.0.0-rc1 Unreal3.4-beta4 Unreal3.4-beta3 Unreal3.4-beta2 Unreal3.4-beta1 Unreal3.4-alpha4 Unreal3.4-alpha3 Unreal3.4-alpha2 Unreal3.4-alpha1" if [ -f "config.settings" ]; then . ./config.settings else diff --git a/configure b/configure index 2ded5aa0d..ae27fd78f 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.0.0-rc2. +# Generated by GNU Autoconf 2.69 for unrealircd 4.0.0-rc3. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='4.0.0-rc2' -PACKAGE_STRING='unrealircd 4.0.0-rc2' +PACKAGE_VERSION='4.0.0-rc3' +PACKAGE_STRING='unrealircd 4.0.0-rc3' PACKAGE_BUGREPORT='http://bugs.unrealircd.org/' PACKAGE_URL='http://unrealircd.org/' @@ -1311,7 +1311,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.0.0-rc2 to adapt to many kinds of systems. +\`configure' configures unrealircd 4.0.0-rc3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1376,7 +1376,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 4.0.0-rc2:";; + short | recursive ) echo "Configuration of unrealircd 4.0.0-rc3:";; esac cat <<\_ACEOF @@ -1524,7 +1524,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 4.0.0-rc2 +unrealircd configure 4.0.0-rc3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2130,7 +2130,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.0.0-rc2, which was +It was created by unrealircd $as_me 4.0.0-rc3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2542,7 +2542,7 @@ _ACEOF # The version suffix such as a beta marker or release candidate -# marker. (e.g.: -rc2 for unrealircd-3.2.9-rc2). This macro is a +# 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="`expr $PACKAGE_VERSION : '[0-9]*\.[0-9]*\.[0-9]*\(.*\)'`" @@ -8251,7 +8251,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.0.0-rc2, which was +This file was extended by unrealircd $as_me 4.0.0-rc3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8314,7 +8314,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.0.0-rc2 +unrealircd config.status 4.0.0-rc3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 74d9414ce..d48a00bbd 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.0.0-rc2], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) +AC_INIT([unrealircd], [4.0.0-rc3], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) AC_CONFIG_SRCDIR([src/ircd.c]) AC_CONFIG_HEADER([include/setup.h]) AC_CONFIG_AUX_DIR([autoconf]) @@ -33,10 +33,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 -# marker. (e.g.: -rc2 for unrealircd-3.2.9-rc2). This macro is a +# 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=["`expr $PACKAGE_VERSION : '[0-9]*\.[0-9]*\.[0-9]*\(.*\)'`"] -AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rc2 for unrealircd-3.2.9-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_PROG_CC if test "$ac_cv_prog_gcc" = "yes"; then diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES index f57264e9d..f054e0890 100644 --- a/doc/RELEASE-NOTES +++ b/doc/RELEASE-NOTES @@ -1,4 +1,4 @@ -UnrealIRCd 4.0.0-rc2 Release Notes +UnrealIRCd 4.0.0-rc3 Release Notes =================================== This is the second Release Candidate for UnrealIRCd 4. @@ -18,7 +18,7 @@ IMPORTANT REMARKS: release *candidate* it may crash occasionally or have issues. Feel free to: -* Install 4.0.0-rc2 to play around, show to your friends, have fun with +* Install 4.0.0-rc3 to play around, show to your friends, have fun with the latest features and improvements, test things. * Link in an UnrealIRCd 4 test server to your 3.2.x network * Report any problems, bugs, issues and other feedback on @@ -41,7 +41,7 @@ UnrealIRCd 4 uses a new directory structure. target directory to install UnrealIRCd to. ./Config will ask this and it's ~/unrealircd by default (eg: /home/nerd/unrealircd). You also need to run 'make install' after 'make' now. - After compiling, you should leave your unrealircd-4.0.0-rc2 directory + After compiling, you should leave your unrealircd-4.0.0-rc3 directory and change to ~/unrealircd as everything takes place there. For example to start UnrealIRCd you run './unrealircd start' (again, from the /home/xxxx/unrealircd directory). @@ -281,7 +281,8 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x * GLINE/KLINE/.. refused perfectly good bans. [B4] * Crash with invite-notify [RC2] * OS X and *BSD: serious problems with the I/O engine [RC2] -* Strange behavior and possible crash in /WHOIS [RC3] +* Odd behavior and possible crash in /WHOIS [RC3] +* Strange empty host bug [RC3] ==[ MINOR BUGS FIXED ]== * Errors in example configuration files [A2] diff --git a/include/setup.h.in b/include/setup.h.in index c8b75e7d0..9228fc132 100644 --- a/include/setup.h.in +++ b/include/setup.h.in @@ -379,7 +379,7 @@ #undef UNREAL_VERSION_MINOR /* Version suffix such as a beta marker or release candidate marker. (e.g.: - -rc2 for unrealircd-3.2.9-rc2) */ + -rcX for unrealircd-3.2.9-rcX) */ #undef UNREAL_VERSION_SUFFIX /* Define if you have libcurl installed to get remote includes and MOTD diff --git a/include/win32/setup.h b/include/win32/setup.h index 4ddbbca2f..24dbcca71 100644 --- a/include/win32/setup.h +++ b/include/win32/setup.h @@ -80,7 +80,7 @@ #define UNREAL_VERSION_MINOR 0 /* Version suffix such as a beta marker or release candidate marker. (e.g.: - -rc2 for unrealircd-3.2.9-rc2) */ -#define UNREAL_VERSION_SUFFIX "-rc2" + -rcX for unrealircd-3.2.9-rcX) */ +#define UNREAL_VERSION_SUFFIX "-rc3" #endif diff --git a/src/version.c.SH b/src/version.c.SH index 84cc54b46..d6ac4a308 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.0.0-rc2" +id="4.0.0-rc3" echo "$id" if test -r version.c diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 172898f02..95e5cff92 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 4 -AppVerName=UnrealIRCd 4.0.0-rc2 +AppVerName=UnrealIRCd 4.0.0-rc3 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org