pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-12 17:14:46 +02:00
Code Activity

Bump version to 4.0.0-rc1

Browse Source
This commit is contained in:
Bram Matthys
2015-10-10 17:44:52 +02:00
parent ccdc948200
commit 507d88cf09
20 changed files with 114 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.CHANGES.NEW
+2 -2
View File
@@ -7,7 +7,7 @@
\___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_|
Configuration Program
for Unreal3.4-beta4
for Unreal4.0.0-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.
@@ -17,4 +17,4 @@ A short installation guide is available online at:
https://www.unrealircd.org/docs/Installing_from_source
Full documentation is available at:
https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation
https://www.unrealircd.org/docs/UnrealIRCd_4_documentation
Config
+3 -3
View File
@@ -443,7 +443,7 @@ echo ""
if [ -z "$NOCACHE" ] ; then
# This needs to be updated each release:
UNREALRELEASES="Unreal3.4-beta3 Unreal3.4-beta2 Unreal3.4-beta1 Unreal3.4-alpha4 Unreal3.4-alpha3 Unreal3.4-alpha2 Unreal3.4-alpha1"
UNREALRELEASES="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
@@ -496,8 +496,8 @@ fi
TEST="$BASEPATH"
echo ""
echo "In what directory do you want to install UnrealIRCd?"
echo "(Note: in Unreal3.4.x you should always install somewhere,"
echo "and if this directory does not exist it will be created)"
echo "(Note: UnrealIRCd 4 will need to be installed somewhere."
echo " If this directory does not exist it will be created.)"
echo $n "[$TEST] -> $c"
read cc
if [ -z "$cc" ] ; then
Makefile.in
+1 -1
View File
@@ -232,7 +232,7 @@ install: all
@echo '* To start/stop UnrealIRCd run: @SCRIPTDIR@/unrealircd"'
@echo ''
@echo '* Consult the documentation online at:'
@echo ' * https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation'
@echo ' * https://www.unrealircd.org/docs/UnrealIRCd_4_documentation'
@echo ' * https://www.unrealircd.org/docs/FAQ'
@echo ''
-@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
configure
Vendored
+14 -14
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for unrealircd 3.4-beta4.
# Generated by GNU Autoconf 2.69 for unrealircd 4.0.0-rc1.
#
# Report bugs to <http://bugs.unrealircd.org/>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='unrealircd'
PACKAGE_TARNAME='unrealircd'
PACKAGE_VERSION='3.4-beta4'
PACKAGE_STRING='unrealircd 3.4-beta4'
PACKAGE_VERSION='4.0.0-rc1'
PACKAGE_STRING='unrealircd 4.0.0-rc1'
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 3.4-beta4 to adapt to many kinds of systems.
\`configure' configures unrealircd 4.0.0-rc1 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 3.4-beta4:";;
short | recursive ) echo "Configuration of unrealircd 4.0.0-rc1:";;
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 3.4-beta4
unrealircd configure 4.0.0-rc1
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 3.4-beta4, which was
It was created by unrealircd $as_me 4.0.0-rc1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2517,23 +2517,23 @@ if test "x$enable_dynamic_linking" = "x"; then
exit 1
fi
# Generation version number (e.g.: 3 for Unreal3*)
UNREAL_VERSION_GENERATION="3"
# Generation version number (e.g.: 4 for Unreal4*)
UNREAL_VERSION_GENERATION="4"
cat >>confdefs.h <<_ACEOF
#define UNREAL_VERSION_GENERATION $UNREAL_VERSION_GENERATION
_ACEOF
# Major version number (e.g.: 2 for Unreal3.2*)
UNREAL_VERSION_MAJOR="4"
# Major version number (e.g.: 0 for Unreal4.0.0)
UNREAL_VERSION_MAJOR="0"
cat >>confdefs.h <<_ACEOF
#define UNREAL_VERSION_MAJOR $UNREAL_VERSION_MAJOR
_ACEOF
# Minor version number (e.g.: 1 for Unreal3.2.1)
# Minor version number (e.g.: 0 for Unreal4.0.0)
UNREAL_VERSION_MINOR="0"
cat >>confdefs.h <<_ACEOF
@@ -8252,7 +8252,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 3.4-beta4, which was
This file was extended by unrealircd $as_me 4.0.0-rc1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8315,7 +8315,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 3.4-beta4
unrealircd config.status 4.0.0-rc1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
configure.ac
+9 -9
View File
@@ -8,7 +8,7 @@ dnl src/win32/unrealinst.iss
dnl .CHANGES.NEW
dnl src/version.c.SH
AC_INIT([unrealircd], [3.4-beta4], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
AC_INIT([unrealircd], [4.0.0-rc1], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
AC_CONFIG_SRCDIR([src/ircd.c])
AC_CONFIG_HEADER([include/setup.h])
AC_CONFIG_AUX_DIR([autoconf])
@@ -20,17 +20,17 @@ if test "x$enable_dynamic_linking" = "x"; then
fi
dnl Calculate the versions. Perhaps the use of expr is a little too extravagant
# Generation version number (e.g.: 3 for Unreal3*)
UNREAL_VERSION_GENERATION=["3"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_GENERATION], [$UNREAL_VERSION_GENERATION], [Generation version number (e.g.: 3 for Unreal3*)])
# Generation version number (e.g.: 4 for Unreal4*)
UNREAL_VERSION_GENERATION=["4"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_GENERATION], [$UNREAL_VERSION_GENERATION], [Generation version number (e.g.: 4 for Unreal4*)])
# Major version number (e.g.: 2 for Unreal3.2*)
UNREAL_VERSION_MAJOR=["4"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: 2 for Unreal3.2*)])
# Major version number (e.g.: 0 for Unreal4.0.0)
UNREAL_VERSION_MAJOR=["0"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: 0 for Unreal4.0.0)])
# Minor version number (e.g.: 1 for Unreal3.2.1)
# Minor version number (e.g.: 0 for Unreal4.0.0)
UNREAL_VERSION_MINOR=["0"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: 1 for Unreal3.2.1)])
AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: 0 for Unreal4.0.0)])
# 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
doc/RELEASE-NOTES
+35 -33
View File
@@ -1,45 +1,47 @@
UnrealIRCd 3.4-beta4 Release Notes
UnrealIRCd 4.0.0-rc1 Release Notes
===================================
This is the fourth 'beta' version of UnrealIRCd 3.4. We plan to have a
'stable' UnrealIRCd 3.4 release by Q4 2015.
This is the first Release Candidate for UnrealIRCd 4.
We plan to have a 'stable' UnrealIRCd 4.0.0 release in Q4 2015.
IMPORTANT REMARKS:
* The ending of the 'alpha' stage means that most features we want are
in 3.4 now. During 'beta' stage we will work towards getting a stable
IRC server.
* Linking with 3.2.x servers is supported but not very well tested.
Note that if you have SSL enabled then this requires version 3.2.10.3
or later on the 3.2.x side.
* The UnrealIRCd version number of the development series has been bumped
from 3.4 to 4 to indicate the significant code and end-user changes.
* 'Release Candidate' means that our focus lies entirely on fixing bugs
and improving stability. No new features will be added during RC phase.
* Although running a mixed network is not 100% ideal, you CAN link in a
UnrealIRCd 4 server on a UnrealIRCd 3.2.x network. If you do, then
be sure to run 3.2.10.3 or later as otherwise linking will fail if you
have enabled SSL.
* We run daily tests on UnrealIRCd 4 without any issues and UnrealIRCd 4
is becoming more stable each release. However, because it's still a
release *candidate* it may crash occasionally or have issues.
Therefore:
* You should never run 3.4-beta4 as a production server
* We do not recommend linking 3.4-beta4 to a production 3.2.x network (yet)
Please do:
* Install 3.4-beta4 to play around, show to your friends, have fun with
Feel free to:
* Install 4.0.0-rc1 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
https://bugs.unrealircd.org/ so we can improve 3.4.x!
https://bugs.unrealircd.org/ so we can improve UnrealIRCd!
Finally:
* If you are moving from 3.2.x then be sure to read 'CONFIGURATION CHANGES'
which explains the new directory structure and how to make UnrealIRCd
convert your existing 3.2.x configuration file to the 3.4.x format.
convert your existing 3.2.x configuration file to the UnrealIRCd 4 format.
==[ DOCUMENTATION ]==
UnrealIRCd 3.4.x documentation is now located in a wiki online at:
THe UnrealIRCd 4 documentation is located in a wiki online at:
* https://www.unrealircd.org/docs/
The old unreal32docs.*html files have been removed.
==[ CONFIGURATION CHANGES ]==
UnrealIRCd 3.4 uses a new directory structure.
UnrealIRCd 4 uses a new directory structure.
*NIX: If you are not on Windows then this means you must now choose a
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 Unreal3.4-beta4 directory
After compiling, you should leave your Unreal4.0.0-rc1 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).
@@ -52,8 +54,8 @@ tmp/ temporary files
data/ persistent data such as ircd.tune
cache/ cached remote includes
It is possible to use your existing 3.2.x configuration file, but it needs
to be 'upgraded' to the new 3.4.x syntax. UnrealIRCd can do this for you.
It is possible to use your existing 3.2.x configuration file, but it needs to
be 'upgraded' to the new UnrealIRCd 4 syntax. UnrealIRCd can do this for you.
Simply place your unrealircd.conf (and any other .conf's you use) in the
conf/ directory and then:
* On *NIX run './unrealircd upgrade-conf' (from /home/xxxx/unrealircd)
@@ -71,8 +73,8 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
==[ GENERAL INFORMATION ]==
* Below you will see a summary of all changes. Changes may be tagged when
a change was made in a specific version, e.g. "(A3)" means 3.4-alpha3
and "(B1)" means 3.4-beta1.
a change was made in a specific version, e.g. "(A3)" means alpha3
and "(B1)" means beta1.
For a complete list of changes (600+) use 'git log' or have a look at:
https://github.com/unrealircd/unrealircd/commits/unreal34
@@ -140,8 +142,8 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
* When you link two servers the current timestamp is exchanged. If the
time differs more than 60 seconds then servers won't link and it will
show a message that you should fix your clock(s). This requires
version 3.4-alpha3 (or later) on both ends of the link (A3)
* Configuration file converter that will upgrade your 3.2.x conf to 3.4.x.
version alpha3 (or later) on both ends of the link (A3)
* Configuration file converter that will upgrade your 3.2.x conf to 4.x.
On *NIX run './unreal upgrade-conf'. On Windows simply try to boot and
after the config errors screen UnrealIRCd offers the conversion. (A3)
* The IRCd can now better handle unknown channel modes which expect a
@@ -184,11 +186,11 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
* -regex: this is the new fast PCRE2 regex engine
* -simple: supports just strings and ? and * wildcards (super fast)
* -posix: the old regex engine for compatibility with 3.2.x. (A3)
* If you have both 3.2.x and 3.4.x servers on your network then the
3.4.x server will only send spamfilters of type 'posix' to the 3.2.x
* If you have both 3.2.x and 4.x servers on your network then the
4.x server will only send spamfilters of type 'posix' to the 3.2.x
servers because 3.2.x servers don't support the other two types.
So in a mixed network you probably want to keep using 'posix' for
a while until all your UnrealIRCd servers are on 3.4.x. (A3)
a while until all your servers are running UnrealIRCd 4. (A3)
* set::oper-only-stats now defaults to "*"
* oper::from::userhost and vhost::from::userhost are now called
oper::mask and vhost::mask. The usermask@ part is now optional and
@@ -229,8 +231,8 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
(which is not recommended) we try to use STARTTLS in order to
'upgrade' the connection to use SSL/TLS anyway. This can be disabled
via link::outgoing::options::insecure. (B2)
* SSLv3 has now been disabled for security. This also means you can
only link 3.4.x with 3.2.10.3 and later because earlier versions
* SSLv3 has now been disabled for security. This also means you can only
link UnrealIRCd 4 with 3.2.10.3 and later because earlier versions
used SSLv3 instead of TLS due to an OpenSSL API mistake. (B4)
==[ MODULE CODERS / DEVELOPERS ]==
@@ -253,7 +255,7 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
* The server protocol docs have been removed. The protocol is now
documented at https://www.unrealircd.org/docs/Server_protocol
See also https://www.unrealircd.org/docs/Server_protocol:Changes
for a list of changes between the 3.2 and 3.4 server protocol.
for a list of changes between the 3.2 and 4.0 server protocol.
==[ MAJOR BUGS FIXED ]==
* Crash bug on-boot in alpha1 (A2)
@@ -261,7 +263,7 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
* link::outgoing::options::autoconnect did not work (A4)
* If the IRCd could not bind to any ports it started anyway (A4)
* alpha3 did not compile on x86 (32 bit) systems (A4)
* Multiple major crash bugs in earlier 3.4 alpha/beta versions caused
* Multiple major crash bugs in earlier alpha/beta versions caused
by OOB read, OOB write, read-after-free, etc. (B2)
* Spamfilter 'u' not working, likely since alpha1 (B2)
* Secure server linking with sslclientcertfp was broken since alpha3,
doc/conf/examples/example.conf
+4 -4
View File
@@ -1,4 +1,4 @@
/* Configuration file for UnrealIRCd 3.4.x
/* Configuration file for UnrealIRCd 4.0
*
* Simply copy this file to your conf/ directory, call it
* 'unrealircd.conf' and walk through it line by line (edit it!)
@@ -12,8 +12,8 @@
* this only takes a few minutes and will help you a lot:
* https://www.unrealircd.org/docs/Configuration#Configuration_file_syntax
*
* UnrealIRCd 3.4.x documentation (very extensive!):
* https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation
* UnrealIRCd 4 documentation (very extensive!):
* https://www.unrealircd.org/docs/UnrealIRCd_4_documentation
*
* Frequently Asked Questions:
* https://www.unrealircd.org/docs/FAQ
@@ -427,7 +427,7 @@ set {
/*
* Problems or need more help?
* 1) https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation
* 1) https://www.unrealircd.org/docs/UnrealIRCd_4_documentation
* 2) https://www.unrealircd.org/docs/FAQ <- answers 80% of your questions!
* 3) If you still have problems you can go irc.unrealircd.org #unreal-support,
* note that we require you to READ THE DOCUMENTATION and FAQ first!
doc/conf/examples/example.fr.conf
+4 -4
View File
@@ -1,4 +1,4 @@
/* Fichier de configuration pour UnrealIRCd 3.4.x
/* Fichier de configuration pour UnrealIRCd 4.0
*
* Copiez ce fichier dans le répertoire conf/, renommez le
* 'unrealircd.conf' et parcourez-le ligne par ligne (modifiez le !)
@@ -13,8 +13,8 @@
* beaucoup :
* https://www.unrealircd.org/docs/Configuration#Configuration_file_syntax
*
* Documentation pour UnrealIRCd 3.4.x (très complète !) :
* https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation/fr
* Documentation pour UnrealIRCd 4 (très complète !) :
* https://www.unrealircd.org/docs/UnrealIRCd_4_documentation/fr
*
* Foire Aux Questions :
* https://www.unrealircd.org/docs/FAQ
@@ -453,7 +453,7 @@ set {
/*
* Un problème ou besoin d'aide supplémentaire ?
* 1) https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation/fr
* 1) https://www.unrealircd.org/docs/UnrealIRCd_4_documentation/fr
* 2) https://www.unrealircd.org/docs/FAQ <- répond à 80% des questions !
* 3) Si vous avez toujours des problèmes, vous pouvez aller sur
* irc.unrealircd.org #unreal-support,
doc/conf/examples/example.tr.conf
+4 -4
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 3.4.x Yapılandırma Dosyası
/* UnrealIRCd 4.0 Yapılandırma Dosyası
*
* Biz buna basit bir 'unrealircd.conf' dosyası diyoruz.
* Bu dosyası satır satır editleyip conf/ dizinine kopyalayınız. (düzenleyin!)
@@ -12,8 +12,8 @@
* bu size bilgi edinmeniz açısından yardımcı olacaktır:
* https://www.unrealircd.org/docs/Configuration#Configuration_file_syntax
*
* UnrealIRCd 3.4.x belgeleme (çok geniş!):
* https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation
* UnrealIRCd 4.0 belgeleme (çok geniş!):
* https://www.unrealircd.org/docs/UnrealIRCd_4_documentation
*
* Sıkça Sorulan Sorular:
* https://www.unrealircd.org/docs/FAQ
@@ -423,7 +423,7 @@ set {
/*
* Sorununuza veya daha fazla yardımamı ihtiyacınız var?
* 1) https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation
* 1) https://www.unrealircd.org/docs/UnrealIRCd_4_documentation
* 2) https://www.unrealircd.org/docs/FAQ <- sorularınızın %80 ini kapsamakta!
* 3) Eğer probleminiz hala devam ediyorsa irc.unrealircd.org sunucusu #unreal-support kanalına girebilirsiniz
* DÖKÜMANTASYON ve FAQ kısmını okumanızı gerekli gördüğümüzü belirtiyoruz!
doc/translations.txt
+6 -3
View File
@@ -1,11 +1,14 @@
==[ Translations ]===========================================================
In UnrealIRCd 3.4.x we support the following translations:
* on-line documentation at https://www.unrealircd.org/docs/
In UnrealIRCd 4 we support the following translations:
* on-line documentation at https://www.unrealircd.org/docs/ (wiki!)
* help.conf
* example.conf
The following rules apply:
For translating the wiki documentation see this article:
https://www.unrealircd.org/docs/Translating_UnrealIRCd_wiki_pages
For the .conf files the following rules apply:
* You must translate the very latest (English) version of the document(s)
* The translation must be correct. Not just the spelling and grammar,
but also 'technically'. You should therefore have some real experience
include/setup.h.in
+3 -3
View File
@@ -369,13 +369,13 @@
/* Define if you have the <unistd.h> header file. */
#undef UNISTDH
/* Generation version number (e.g.: 3 for Unreal3*) */
/* Generation version number (e.g.: 4 for Unreal4*) */
#undef UNREAL_VERSION_GENERATION
/* Major version number (e.g.: 2 for Unreal3.2*) */
/* Major version number (e.g.: 0 for Unreal4.0.0) */
#undef UNREAL_VERSION_MAJOR
/* Minor version number (e.g.: 1 for Unreal3.2.1) */
/* Minor version number (e.g.: 0 for Unreal4.0.0) */
#undef UNREAL_VERSION_MINOR
/* Version suffix such as a beta marker or release candidate marker. (e.g.:
src/macosx/UnrealIRCd/AppModel.swift
+1 -1
View File
@@ -13,7 +13,7 @@ class AppModel : ChangeNotifierDelegate
{
var menuItem : NSStatusItem
static let logoName = "logo.png"
static let helpURL = "https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation"
static let helpURL = "https://www.unrealircd.org/docs/UnrealIRCd_4_documentation"
var daemonModel : DaemonModel
var configurationModel : ConfigurationModel
var windowController : NSWindowController?
src/modules/m_tkl.c
+1 -1
View File
@@ -2144,7 +2144,7 @@ int _m_tkl(aClient *cptr, aClient *sptr, int parc, char *parv[])
if (mixed_network())
{
sendto_realops("WARNING: Spamfilter '%s' added of type '%s' and 3.2.x servers are linked. "
"Spamfilter will not execute on non-3.4.x servers.",
"Spamfilter will not execute on non-UnrealIRCd-4 servers.",
parv[11] , parv[10]);
}
}
src/modules/webirc.c
+1 -1
View File
@@ -148,7 +148,7 @@ int webirc_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
if (!strcmp(ce->ce_varname, "cgiirc"))
{
config_error("%s:%i: the cgiirc block has been renamed to webirc and "
"the syntax has changed in UnrealIRCd 3.4.x",
"the syntax has changed in UnrealIRCd 4",
ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
need_34_upgrade = 1;
*errs = 1;
src/s_conf.c
+10 -10
View File
@@ -1540,7 +1540,7 @@ void upgrade_conf_to_34(void)
config_error("In next screen you will be prompted to automatically upgrade the configuration file(s).");
else
{
config_error("We offer a configuration file converter to convert 3.2.x conf's to 3.4.x, however this "
config_error("We offer a configuration file converter to convert 3.2.x conf's to 4.0, however this "
"is not available when running as a service. If you want to use it, make UnrealIRCd "
"run in GUI mode by running 'unreal uninstall'. Then start wircd.exe and when "
"it prompts you to convert the configuration click 'Yes'. Check if UnrealIRCd boots properly. "
@@ -1548,7 +1548,7 @@ void upgrade_conf_to_34(void)
"as a service again."); /* TODO: make this unnecessary :D */
}
#endif
config_error("To upgrade it to the new 3.4.x format, run: ./unrealircd upgrade-conf");
config_error("To upgrade it to the new 4.0 format, run: ./unrealircd upgrade-conf");
config_error("******************************************************************");
/* TODO: win32 may require a different error */
@@ -3763,7 +3763,7 @@ int _test_oper(ConfigFile *conf, ConfigEntry *ce)
/* oper::flags */
else if (!strcmp(cep->ce_varname, "flags"))
{
config_error("%s:%i: oper::flags no longer exists. UnrealIRCd 3.4.x uses a new style oper block now.",
config_error("%s:%i: oper::flags no longer exists. UnrealIRCd 4 uses a new style oper block.",
cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
errors++;
need_34_upgrade = 1;
@@ -3787,7 +3787,7 @@ int _test_oper(ConfigFile *conf, ConfigEntry *ce)
/* oper::flags {} */
if (!strcmp(cep->ce_varname, "flags"))
{
config_error("%s:%i: oper::flags no longer exists. UnrealIRCd 3.4.x uses a new style oper block now.",
config_error("%s:%i: oper::flags no longer exists. UnrealIRCd 4 uses a new style oper block.",
cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
errors++;
need_34_upgrade = 1;
@@ -5683,7 +5683,7 @@ int _test_vhost(ConfigFile *conf, ConfigEntry *ce)
"vhost::mask");
errors++;
}
// TODO: 3.2.x -> 3.4.x upgrading hints
// TODO: 3.2.x -> 4.x upgrading hints
return errors;
}
@@ -7483,7 +7483,7 @@ int _test_set(ConfigFile *conf, ConfigEntry *ce)
!strcmp(cepp->ce_varname, "timeout") ||
!strcmp(cepp->ce_varname, "retries"))
{
config_error("%s:%i: set::dns::%s no longer exist in UnrealIRCd 3.4.x. "
config_error("%s:%i: set::dns::%s no longer exist in UnrealIRCd 4. "
"Please remove it from your configuration file.",
cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname);
errors++;
@@ -7698,7 +7698,7 @@ int _test_set(ConfigFile *conf, ConfigEntry *ce)
}
}
else if (!strcmp(cep->ce_varname, "hosts")) {
config_error("%s:%i: set::hosts has been removed in UnrealIRCd 3.4.x. You can use oper::vhost now.",
config_error("%s:%i: set::hosts has been removed in UnrealIRCd 4. You can use oper::vhost now.",
cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
errors++;
need_34_upgrade = 1;
@@ -8061,8 +8061,8 @@ int _conf_loadmodule(ConfigFile *conf, ConfigEntry *ce)
if (strstr(ce->ce_vardata, "modules/cloak") && !strcmp(conf->cf_filename, "modules.conf"))
{
config_error("You seem to have an include for 'modules.conf'.");
config_error("If you have this because you are upgrading from 3.4-alpha3 to a");
config_error("later 3.4.x version then please change the include \"modules.conf\";");
config_error("If you have this because you are upgrading from 3.4-alpha3 to");
config_error("UnrealIRCd 4 then please change the include \"modules.conf\";");
config_error("into an include \"modules.default.conf\"; (probably in your");
config_error("conf/unrealircd.conf). Yeah, we changed the file name.");
// TODO ^: silly win32 wrapping prevents this from being displayed otherwise. PLZ FIX! !
@@ -8357,7 +8357,7 @@ int _test_alias(ConfigFile *conf, ConfigEntry *ce) {
{
config_error("%s:%i: alias::format contains an invalid regex: %s",
cep->ce_fileptr->cf_filename, cep->ce_varlinenum, err);
config_error("Upgrading from 3.2.x to 3.4.x? Note that regex changed from POSIX Regex "
config_error("Upgrading from 3.2.x to UnrealIRCd 4? Note that regex changed from POSIX Regex "
"to PCRE Regex!"); /* TODO: refer to some url ? */
} else {
unreal_delete_match(expr);
src/updconf.c
+8 -8
View File
@@ -1,5 +1,5 @@
/*
* Configuration file updater - upgrade from 3.2.x to 3.4.x
* Configuration file updater - upgrade from 3.2.x to 4.0
* (C) Copyright 2015 Bram Matthys and the UnrealIRCd team
*
* License: GPLv2
@@ -445,11 +445,11 @@ int upgrade_link_block(ConfigEntry *ce)
{
/* Prompt user ? */
config_warn("Link block '%s' has a different connect/receive password. "
"This is no longer supported in UnrealIRCd 3.4.x",
"This is no longer supported in UnrealIRCd 4.0",
ce->ce_vardata);
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf),
"\tpassword \"%s\"; /* WARNING: password changed due to 3.4.x upgrade */\n",
"\tpassword \"%s\"; /* WARNING: password changed due to 4.0 upgrade */\n",
password_connect);
} else
{
@@ -864,7 +864,7 @@ int upgrade_allow_block(ConfigEntry *ce)
else
{
/* very rare case -- let's bet on IP */
snprintf(comment, sizeof(comment), "/* CHANGED BY 3.2.x TO 3.4.x CONF UPGRADE!! Was: ip %s; hostname %s; */\n", ip, hostname);
snprintf(comment, sizeof(comment), "/* CHANGED BY 3.2.x TO 4.0 CONF UPGRADE!! Was: ip %s; hostname %s; */\n", ip, hostname);
hostname = NULL;
}
@@ -881,11 +881,11 @@ int upgrade_allow_block(ConfigEntry *ce)
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tclass %s;\n", class);
/* maxperip: optional in 3.2.x, mandatory in 3.4.x */
/* maxperip: optional in 3.2.x, mandatory in 4.0 */
if (maxperip)
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxperip %s;\n", maxperip);
else
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxperip 3; /* CHANGED BY 3.2.x TO 3.4.x CONF UPGRADE! */\n");
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxperip 3; /* CHANGED BY 3.2.x TO 4.0 CONF UPGRADE! */\n");
if (ipv6_clone_mask)
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tipv6-clone-mask %s;\n", ipv6_clone_mask);
@@ -1167,7 +1167,7 @@ int upgrade_oper_block(ConfigEntry *ce)
for (cep = ce->ce_entries; cep; cep = cep->ce_next)
{
if (!strcmp(cep->ce_varname, "operclass"))
return 0; /* already 3.4.x conf */
return 0; /* already 4.0 conf */
else if (!strcmp(cep->ce_varname, "flags"))
{
if (cep->ce_vardata) /* short options (flag letters) */
@@ -1662,7 +1662,7 @@ void update_conf(void)
char *mainconf = configfile;
int upgraded_files = 0;
config_status("Attempting to upgrade '%s' (and all it's included files) from UnrealIRCd 3.2.x to UnrealIRCd 3.4.x...", configfile);
config_status("Attempting to upgrade '%s' (and all it's included files) from UnrealIRCd 3.2.x to UnrealIRCd 4.0...", configfile);
strlcpy(me.name, "<server>", sizeof(me.name));
memset(&upgrade, 0, sizeof(upgrade));
src/version.c.SH
+1 -1
View File
@@ -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="3.4-beta4"
id="4.0.0-rc1"
echo "$id"
if test -r version.c
src/win32/gui.c
+1 -1
View File
@@ -1074,7 +1074,7 @@ void win_error()
{
need_34_upgrade = 0; /* anti-recursion. yes, is needed. */
if (MessageBox(NULL,
"Shall I try to upgrade your configuration files to UnrealIRCd 3.4.x format?",
"Shall I try to upgrade your configuration files to UnrealIRCd 4 format?",
"3.2.x configuration detected",
MB_YESNO|MB_ICONQUESTION) == IDNO)
{
src/win32/unrealinst.iss
+4 -4
View File
@@ -5,14 +5,14 @@
#define USE_CURL
[Setup]
AppName=UnrealIRCd 3.4
AppVerName=UnrealIRCd3.4-beta4
AppName=UnrealIRCd 4.0
AppVerName=UnrealIRCd4.0.0-rc1
AppPublisher=UnrealIRCd Team
AppPublisherURL=https://www.unrealircd.org
AppSupportURL=https://www.unrealircd.org
AppUpdatesURL=https://www.unrealircd.org
AppMutex=UnrealMutex,Global\UnrealMutex
DefaultDirName={pf}\Unreal3.4
DefaultDirName={pf}\Unreal4.0
DefaultGroupName=UnrealIRCd
AllowNoIcons=yes
LicenseFile=src\win32\gplplusssl.rtf
@@ -195,7 +195,7 @@ Name: "{group}\UnrealIRCd"; Filename: "{app}\wircd.exe"; WorkingDir: "{app}"
Name: "{group}\Uninstall UnrealIRCd"; Filename: "{uninstallexe}"; WorkingDir: "{app}"
Name: "{group}\Make Certificate"; Filename: "{app}\makecert.bat"; WorkingDir: "{app}"
Name: "{group}\Encrypt Certificate"; Filename: "{app}\encpem.bat"; WorkingDir: "{app}"
Name: "{group}\Documentation"; Filename: "https://www.unrealircd.org/docs/UnrealIRCd_3.4.x_documentation"; WorkingDir: "{app}"
Name: "{group}\Documentation"; Filename: "https://www.unrealircd.org/docs/UnrealIRCd_4_documentation"; WorkingDir: "{app}"
Name: "{userdesktop}\UnrealIRCd"; Filename: "{app}\wircd.exe"; WorkingDir: "{app}"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\UnrealIRCd"; Filename: "{app}\wircd.exe"; WorkingDir: "{app}"; Tasks: quicklaunchicon
unrealircd.in
+2 -2
View File
@@ -14,14 +14,14 @@ if [ "$1" = "start" ] ; then
if [ -r $PID_FILE ] ; then
mv -f $PID_FILE $PID_BACKUP
fi
# Check if ~/Unreal3.4.x/unrealircd.conf exists but the file
# Check if ~/Unrealxxx/unrealircd.conf exists but the file
# ~/unrealircd/conf/unrealircd.conf does not.
# If so, then assume a user-build and give the user a nice hint...
if [ ! -f @CONFDIR@/unrealircd.conf -a -f @BUILDDIR@/unrealircd.conf ]; then
echo ""
echo "There is no unrealircd.conf in @CONFDIR@"
echo "However I did find an unrealircd.conf in @BUILDDIR@"
echo "With UnrealIRCd 3.4.x you should no longer run the IRCd from @BUILDDIR@."
echo "With UnrealIRCd 4 you should no longer run the IRCd from @BUILDDIR@."
echo "You should 'cd @SCRIPTDIR@' and work from there."
echo "See https://www.unrealircd.org/docs/UnrealIRCd_files_and_directories"
exit 1