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

UnrealIRCd version updates

Browse Source
This commit is contained in:
Bram Matthys
2018-09-28 09:26:40 +02:00
parent 02c5c8567a
commit 6acfa3404b
24 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.CHANGES.NEW
+1 -1
View File
@@ -7,7 +7,7 @@
\___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_|
Configuration Program
for UnrealIRCd 4.0.19-rc2
for UnrealIRCd 4.2.0
This program will help you to compile your IRC server, and ask you
questions regarding the compile-time settings of it during the process.
Config
+1 -1
View File
@@ -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.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.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
Makefile.in
+1 -1
View File
@@ -244,7 +244,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_4_documentation'
@echo ' * https://www.unrealircd.org/docs/'
@echo ' * https://www.unrealircd.org/docs/FAQ'
@echo '* You may also wish to install a cron job to ensure UnrealIRCd is always running:'
@echo ' * https://www.unrealircd.org/docs/Cron_job'
README.md
+2 -2
View File
@@ -1,5 +1,5 @@
[![Build Status - *NIX](https://travis-ci.org/unrealircd/unrealircd.svg?branch=unreal40)](https://travis-ci.org/unrealircd/unrealircd)
[![Build Status - Windows](https://ci.appveyor.com/api/projects/status/9kgectl2mfyia0s5/branch/unreal40?svg=true)](https://ci.appveyor.com/project/syzop/unrealircd/branch/unreal40)
[![Build Status - *NIX](https://travis-ci.org/unrealircd/unrealircd.svg?branch=unreal42)](https://travis-ci.org/unrealircd/unrealircd)
[![Build Status - Windows](https://ci.appveyor.com/api/projects/status/9kgectl2mfyia0s5/branch/unreal42?svg=true)](https://ci.appveyor.com/project/syzop/unrealircd/branch/unreal42)
[![Twitter Follow](https://img.shields.io/twitter/follow/Unreal_IRCd.svg?style=social&label=Follow)](https://twitter.com/Unreal_IRCd)
## About UnrealIRCd
appveyor.yml
+1 -1
View File
@@ -1,4 +1,4 @@
version: 4.0.x-devbuild-{build}
version: 4.2.x-devbuild-{build}
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
configure
Vendored
+12 -12
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 4.0.19-rc2.
# Generated by GNU Autoconf 2.69 for unrealircd 4.2.0.
#
# Report bugs to <http://bugs.unrealircd.org/>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='unrealircd'
PACKAGE_TARNAME='unrealircd'
PACKAGE_VERSION='4.0.19-rc2'
PACKAGE_STRING='unrealircd 4.0.19-rc2'
PACKAGE_VERSION='4.2.0'
PACKAGE_STRING='unrealircd 4.2.0'
PACKAGE_BUGREPORT='http://bugs.unrealircd.org/'
PACKAGE_URL='http://unrealircd.org/'
@@ -1331,7 +1331,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.19-rc2 to adapt to many kinds of systems.
\`configure' configures unrealircd 4.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of unrealircd 4.0.19-rc2:";;
short | recursive ) echo "Configuration of unrealircd 4.2.0:";;
esac
cat <<\_ACEOF
@@ -1551,7 +1551,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
unrealircd configure 4.0.19-rc2
unrealircd configure 4.2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2157,7 +2157,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.19-rc2, which was
It was created by unrealircd $as_me 4.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2558,7 +2558,7 @@ _ACEOF
# Major version number (e.g.: Y in X.Y.Z)
UNREAL_VERSION_MAJOR="0"
UNREAL_VERSION_MAJOR="2"
cat >>confdefs.h <<_ACEOF
#define UNREAL_VERSION_MAJOR $UNREAL_VERSION_MAJOR
@@ -2566,7 +2566,7 @@ _ACEOF
# Minor version number (e.g.: Z in X.Y.Z)
UNREAL_VERSION_MINOR="19"
UNREAL_VERSION_MINOR="0"
cat >>confdefs.h <<_ACEOF
#define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR
@@ -2576,7 +2576,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="-rc2"
UNREAL_VERSION_SUFFIX=""
cat >>confdefs.h <<_ACEOF
#define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX"
@@ -9325,7 +9325,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.19-rc2, which was
This file was extended by unrealircd $as_me 4.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9388,7 +9388,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.19-rc2
unrealircd config.status 4.2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
configure.ac
+4 -4
View File
@@ -8,7 +8,7 @@ dnl src/win32/unrealinst.iss
dnl .CHANGES.NEW
dnl src/version.c.SH
AC_INIT([unrealircd], [4.0.19-rc2], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
AC_INIT([unrealircd], [4.2.0], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
AC_CONFIG_SRCDIR([src/ircd.c])
AC_CONFIG_HEADER([include/setup.h])
AC_CONFIG_AUX_DIR([autoconf])
@@ -32,17 +32,17 @@ UNREAL_VERSION_GENERATION=["4"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_GENERATION], [$UNREAL_VERSION_GENERATION], [Generation version number (e.g.: X for X.Y.Z)])
# Major version number (e.g.: Y in X.Y.Z)
UNREAL_VERSION_MAJOR=["0"]
UNREAL_VERSION_MAJOR=["2"]
AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: Y for X.Y.Z)])
# Minor version number (e.g.: Z in X.Y.Z)
UNREAL_VERSION_MINOR=["19"]
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.: -rcX for unrealircd-3.2.9-rcX). This macro is a
# string instead of an integer because it contains arbitrary data.
UNREAL_VERSION_SUFFIX=["-rc2"]
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
doc/conf/examples/example.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* Configuration file for UnrealIRCd 4.0
/* Configuration file for UnrealIRCd 4
*
* Simply copy this file to your conf/ directory, call it
* 'unrealircd.conf' and walk through it line by line (edit it!)
doc/conf/examples/example.fr.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* Fichier de configuration pour UnrealIRCd 4.0
/* Fichier de configuration pour UnrealIRCd 4
*
* Copiez ce fichier dans le répertoire conf/, renommez le
* 'unrealircd.conf' et parcourez-le ligne par ligne (modifiez le !)
doc/conf/examples/example.tr.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 için yapılandırma dosyası
/* UnrealIRCd 4 için yapılandırma dosyası
* Türkçe Çeviri: Diablo - (Serkan Sepetçi)
* İletişim: irc.trirc.com:6667 - diablo@unrealircd.org
*
doc/conf/help/help.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 Help Configuration
/* UnrealIRCd 4 Help Configuration
* Based on the original help text written by hAtbLaDe
* Revised by CC (07/2002) and many others
*/
doc/conf/help/help.de.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 Help Configuration
/* UnrealIRCd 4 Help Configuration
* Based on the original help text written by hAtbLaDe
* Revised by CC (07/2002) and many others
*
doc/conf/help/help.fr.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 Help Configuration
/* UnrealIRCd 4 Help Configuration
* Basé sur l'aide originale écrite par hAtbLaDe
* Révisé par CC (07/2002)
* Ancien traducteur français : babass
doc/conf/help/help.it.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 Help Configuration
/* UnrealIRCd 4 Help Configuration
* Based on the original help text written by hAtbLaDe
* Revised by CC (07/2002) and many others
*
doc/conf/help/help.ru.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 Help Configuration
/* UnrealIRCd 4 Help Configuration
* Based on the original help text written by hAtbLaDe
* Revised by CC (07/2002)
*
doc/conf/help/help.tr.conf
+1 -1
View File
@@ -1,4 +1,4 @@
/* UnrealIRCd 4.0 Yardım Ayarları
/* UnrealIRCd 4 Yardım Ayarları
*
* Orjinal yardım metnini yazan by hAtbLaDe
* Gözden geçiren by CC (07/2002) ve diğerleri
extras/build-tests/nix/select-config
+1 -1
View File
@@ -19,7 +19,7 @@ function build_ssl {
}
if [ ! -d extras ]; then
echo "This tool is supposed to be run from the source root, so ~/unrealircd-4.0.x or similar"
echo "This tool is supposed to be run from the source root, so ~/unrealircd-4.2.x or similar"
exit 1
fi
extras/curlinstall
+1 -1
View File
@@ -18,7 +18,7 @@ if [ ! -f src/parse.c ]; then
cd ..
else
echo "Please run this program from your UnrealIRCd directory"
echo "(usually $HOME/unrealircd-4.0.X or something like that)"
echo "(usually $HOME/unrealircd-4.2.X or something like that)"
exit 1
fi
fi
include/version.h
+2 -2
View File
@@ -54,9 +54,9 @@
* Can be useful if the above 3 versionids are insufficient for you (eg: you want to support CVS).
* This is updated automatically on the CVS server every Monday. so don't touch it.
*/
#define UNREAL_VERSION_TIME 201552
#define UNREAL_VERSION_TIME 201818
#define UnrealProtocol 4019
#define UnrealProtocol 4200
#define PATCH1 macro_to_str(UNREAL_VERSION_GENERATION)
#define PATCH2 "." macro_to_str(UNREAL_VERSION_MAJOR)
#define PATCH3 "." macro_to_str(UNREAL_VERSION_MINOR)
include/win32/setup.h
+3 -3
View File
@@ -81,13 +81,13 @@
#define UNREAL_VERSION_GENERATION 4
/* Major version number (e.g.: 2 for Unreal3.2*) */
#define UNREAL_VERSION_MAJOR 0
#define UNREAL_VERSION_MAJOR 2
/* Minor version number (e.g.: 1 for Unreal3.2.1) */
#define UNREAL_VERSION_MINOR 19
#define UNREAL_VERSION_MINOR 0
/* Version suffix such as a beta marker or release candidate marker. (e.g.:
-rcX for unrealircd-3.2.9-rcX) */
#define UNREAL_VERSION_SUFFIX "-rc2"
#define UNREAL_VERSION_SUFFIX ""
#endif
src/updconf.c
+8 -8
View File
@@ -1,5 +1,5 @@
/*
* Configuration file updater - upgrade from 3.2.x to 4.0
* Configuration file updater - upgrade from 3.2.x to 4.x
* (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 4.0",
"This is no longer supported in UnrealIRCd 4.x",
ce->ce_vardata);
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf),
"\tpassword \"%s\"; /* WARNING: password changed due to 4.0 upgrade */\n",
"\tpassword \"%s\"; /* WARNING: password changed due to 4.x upgrade */\n",
options_autoconnect ? password_connect : password_receive);
} 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 4.0 CONF UPGRADE!! Was: ip %s; hostname %s; */\n", ip, hostname);
snprintf(comment, sizeof(comment), "/* CHANGED BY 3.2.x TO 4.x 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 4.0 */
/* maxperip: optional in 3.2.x, mandatory in 4.x */
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 4.0 CONF UPGRADE! */\n");
snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxperip 3; /* CHANGED BY 3.2.x TO 4.x 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 4.0 conf */
return 0; /* already 4.x 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 4.0...", configfile);
config_status("Attempting to upgrade '%s' (and all it's included files) from UnrealIRCd 3.2.x to UnrealIRCd 4.x...", 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="4.0.19-rc2"
id="4.2.0"
echo "$id"
if test -r version.c
src/win32/UnrealIRCd.exe.manifest
+1 -1
View File
@@ -3,7 +3,7 @@
<assemblyIdentity
processorArchitecture="X86"
name="UnrealIRCd.UnrealIRCd.4"
version="4.0.0.0"
version="4.2.0.0"
type="win32"
/>
<description>Internet Relay Chat Daemon</description>
src/win32/unrealinst.iss
+1 -1
View File
@@ -6,7 +6,7 @@
[Setup]
AppName=UnrealIRCd 4
AppVerName=UnrealIRCd 4.0.19-rc2
AppVerName=UnrealIRCd 4.2.0
AppPublisher=UnrealIRCd Team
AppPublisherURL=https://www.unrealircd.org
AppSupportURL=https://www.unrealircd.org