From 660a50161740bf3dd67e445b2bb24b1fb963c5e5 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 8 Sep 2023 17:46:18 +0200 Subject: [PATCH] ** UnrealIRCd 6.1.2-rc1 ** --- configure | 20 ++++++++++---------- configure.ac | 4 ++-- doc/Config.header | 2 +- doc/RELEASE-NOTES.md | 9 +++++---- doc/conf/modules.default.conf | 2 +- extras/doxygen/Doxyfile | 2 +- include/windows/setup.h | 2 +- src/version.c.SH | 2 +- src/windows/unrealinst.iss | 2 +- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/configure b/configure index c87148d3a..00df54c8d 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.71 for unrealircd 6.1.2-git. +# Generated by GNU Autoconf 2.71 for unrealircd 6.1.2-rc1. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='6.1.2-git' -PACKAGE_STRING='unrealircd 6.1.2-git' +PACKAGE_VERSION='6.1.2-rc1' +PACKAGE_STRING='unrealircd 6.1.2-rc1' PACKAGE_BUGREPORT='https://bugs.unrealircd.org/' PACKAGE_URL='https://unrealircd.org/' @@ -1372,7 +1372,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.1.2-git to adapt to many kinds of systems. +\`configure' configures unrealircd 6.1.2-rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 6.1.2-git:";; + short | recursive ) echo "Configuration of unrealircd 6.1.2-rc1:";; esac cat <<\_ACEOF @@ -1616,7 +1616,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 6.1.2-git +unrealircd configure 6.1.2-rc1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1915,7 +1915,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.1.2-git, which was +It was created by unrealircd $as_me 6.1.2-rc1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2706,7 +2706,7 @@ printf "%s\n" "#define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR" >>confdefs.h # 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="-rc1" printf "%s\n" "#define UNREAL_VERSION_SUFFIX \"$UNREAL_VERSION_SUFFIX\"" >>confdefs.h @@ -10064,7 +10064,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.1.2-git, which was +This file was extended by unrealircd $as_me 6.1.2-rc1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10129,7 +10129,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -unrealircd config.status 6.1.2-git +unrealircd config.status 6.1.2-rc1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d630fb6d5..326adc463 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.1.2-git], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [6.1.2-rc1], [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=["-rc1"] 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 86c4df31c..f91be499b 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 6.1.2-git + for UnrealIRCd 6.1.2-rc1 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 7d20ff7db..c4fdf6e0d 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,7 +1,8 @@ -UnrealIRCd 6.1.2-git -================= -This is the git version (development version) for future 6.1.2. This is work -in progress and may not be a stable version. +UnrealIRCd 6.1.2-rc1 +===================== +This is the release candidate for future 6.1.2. + +You can help us by testing this release and reporting any issues at https://bugs.unrealircd.org/. ### Enhancements: * We now give tips on (security) best practices depending on settings in your diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf index 4adba7976..5e0c7aa6d 100644 --- a/doc/conf/modules.default.conf +++ b/doc/conf/modules.default.conf @@ -1,4 +1,4 @@ -/* [6.1.2-git] +/* [6.1.2-rc1] * This file will load (nearly) all modules available on UnrealIRCd. * So all commands, channel modes, user modes, etc.. * diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile index f5a52ac9c..63d0d775b 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.1.2-git +PROJECT_NUMBER = 6.1.2-rc1 # 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/windows/setup.h b/include/windows/setup.h index e7a9e34d3..107a0a51b 100644 --- a/include/windows/setup.h +++ b/include/windows/setup.h @@ -67,6 +67,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 "-git" +#define UNREAL_VERSION_SUFFIX "-rc1" #endif diff --git a/src/version.c.SH b/src/version.c.SH index d19942bf0..62e926ac1 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.1.2-git$SUFFIX" +id="6.1.2-rc1$SUFFIX" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index b3da18a6b..82be50c03 100755 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 6 -AppVerName=UnrealIRCd 6.1.2-git +AppVerName=UnrealIRCd 6.1.2-rc1 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org