From 99defea611a56aed435ee3df6eeb5deadaa2a060 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Wed, 30 Dec 2020 14:14:33 +0100 Subject: [PATCH] ** UnrealIRCd 5.0.8-rc1 ** --- configure | 20 ++++++++++---------- configure.ac | 4 ++-- doc/Config.header | 2 +- doc/RELEASE-NOTES.md | 9 +++++++-- include/windows/setup.h | 2 +- src/version.c.SH | 2 +- src/windows/unrealinst.iss | 3 ++- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/configure b/configure index da57e8795..754da4c53 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.0.8-git. +# Generated by GNU Autoconf 2.69 for unrealircd 5.0.8-rc1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='5.0.8-git' -PACKAGE_STRING='unrealircd 5.0.8-git' +PACKAGE_VERSION='5.0.8-rc1' +PACKAGE_STRING='unrealircd 5.0.8-rc1' PACKAGE_BUGREPORT='https://bugs.unrealircd.org/' PACKAGE_URL='https://unrealircd.org/' @@ -1325,7 +1325,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.0.8-git to adapt to many kinds of systems. +\`configure' configures unrealircd 5.0.8-rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 5.0.8-git:";; + short | recursive ) echo "Configuration of unrealircd 5.0.8-rc1:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 5.0.8-git +unrealircd configure 5.0.8-rc1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1913,7 +1913,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.0.8-git, which was +It was created by unrealircd $as_me 5.0.8-rc1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2331,7 +2331,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="-rc1" cat >>confdefs.h <<_ACEOF #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX" @@ -8492,7 +8492,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.0.8-git, which was +This file was extended by unrealircd $as_me 5.0.8-rc1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8555,7 +8555,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.0.8-git +unrealircd config.status 5.0.8-rc1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3f0295a9f..51b664bc0 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.0.8-git], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/]) +AC_INIT([unrealircd], [5.0.8-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 709663ac4..231ef8051 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for UnrealIRCd 5.0.8-git + for UnrealIRCd 5.0.8-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 00274069d..39cd26198 100644 --- a/doc/RELEASE-NOTES.md +++ b/doc/RELEASE-NOTES.md @@ -1,7 +1,9 @@ -UnrealIRCd 5.0.8-git Release Notes +UnrealIRCd 5.0.8-rc1 Release Notes =================================== -UnrealIRCd 5.0.8 is work in progress and so are these release notes. +This is the release candidate for UnrealIRCd 5.0.8. Please report any issues +you encounter on https://bugs.unrealircd.org/ so they can be fixed before +the real 5.0.8 stable release. Enhancements: * Support for [security groups](https://www.unrealircd.org/docs/Security-group_block), @@ -37,6 +39,9 @@ Changes: * Mention the ban reason in Q-line server notices * Add self-test to module manager and improve the error message in case the IRCd source directory does not exist. +* Print out a more helpful error if you run the unrealircd binary + rather than the unrealircd script with an argument like 'mkpasswd' etc. +* On *NIX create a symlink 'source' to the UnrealIRCd source Module coders / Developers: * The [Doxygen module API docs](https://www.unrealircd.org/api/5/index.html) diff --git a/include/windows/setup.h b/include/windows/setup.h index 04bbc562f..e6652bd50 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 78abfb634..baf88f605 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="5.0.8-git" +id="5.0.8-rc1" echo "$id" if test -r version.c diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss index 87fc30624..3a1bb52ef 100644 --- a/src/windows/unrealinst.iss +++ b/src/windows/unrealinst.iss @@ -6,7 +6,7 @@ [Setup] AppName=UnrealIRCd 5 -AppVerName=UnrealIRCd 5.0.8-git +AppVerName=UnrealIRCd 5.0.8-rc1 AppPublisher=UnrealIRCd Team AppPublisherURL=https://www.unrealircd.org AppSupportURL=https://www.unrealircd.org @@ -68,6 +68,7 @@ Source: "src\modules\chanmodes\*.dll"; DestDir: "{app}\modules\chanmodes"; Flags Source: "src\modules\usermodes\*.dll"; DestDir: "{app}\modules\usermodes"; Flags: ignoreversion Source: "src\modules\snomasks\*.dll"; DestDir: "{app}\modules\snomasks"; Flags: ignoreversion Source: "src\modules\extbans\*.dll"; DestDir: "{app}\modules\extbans"; Flags: ignoreversion +Source: "src\modules\third\*.dll"; DestDir: "{app}\modules\third"; Flags: ignoreversion skipifsourcedoesntexist Source: "c:\dev\unrealircd-5-libs\pcre2\bin\pcre*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion Source: "c:\dev\unrealircd-5-libs\argon2\vs2015\build\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion