From f70a2017150afeeba3e2c49e77a8f1d131bea0f4 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Tue, 16 Oct 2012 15:25:04 +0200 Subject: [PATCH] - Update version to 3.2.10-rc1 --- .CHANGES.NEW | 2 +- Changes | 1 + Unreal.nfo | 16 +++++++++++----- configure | 18 +++++++++--------- configure.ac | 2 +- doc/technical/serverprotocol.html | 4 ++-- doc/technical/vl.txt | 1 + doc/unreal32docs.html | 4 ++-- include/version.h | 2 +- include/win32/setup.h | 4 ++-- src/modules/l_commands.c | 2 +- src/s_serv.c | 5 +++-- src/version.c.SH | 2 +- src/win32/unrealinst.iss | 2 +- 14 files changed, 37 insertions(+), 28 deletions(-) diff --git a/.CHANGES.NEW b/.CHANGES.NEW index 8f5e6281a..de4758bc1 100644 --- a/.CHANGES.NEW +++ b/.CHANGES.NEW @@ -7,7 +7,7 @@ \___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_| Configuration Program - for Unreal3.2.9 + for Unreal3.2.10-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/Changes b/Changes index df1abd7a7..9e0b4b6f8 100644 --- a/Changes +++ b/Changes @@ -2502,3 +2502,4 @@ link::password-receive, etc). - Windows: fix MOTD file always showing a date of 1/1/1970, reported by maxarturo (#4102). +- Update version to 3.2.10-rc1 diff --git a/Unreal.nfo b/Unreal.nfo index c700d6a36..42cfd7ce3 100644 --- a/Unreal.nfo +++ b/Unreal.nfo @@ -1,5 +1,5 @@ =============================================== -= UnrealIRCd v3.2.9 = += UnrealIRCd v3.2.10-rc1 = =============================================== This release was brought to you by: @@ -13,14 +13,20 @@ Contributors: ============= - * Bock - * goldenwolf - * katsklaw + * nenolod + * Adam + * warg * Stealth + * WolfSage + * katsklaw + * darkex + * fspijkerman + * fbi + * Apocalypse RC Testers: =========== - LqidSkin, goldenwolf, katsklaw, nph, selten, Simplicity + <> Previous coders: ================ diff --git a/configure b/configure index a159b1dfe..bc198632d 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 3.2.9. +# Generated by GNU Autoconf 2.69 for unrealircd 3.2.10-rc1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unrealircd' PACKAGE_TARNAME='unrealircd' -PACKAGE_VERSION='3.2.9' -PACKAGE_STRING='unrealircd 3.2.9' +PACKAGE_VERSION='3.2.10-rc1' +PACKAGE_STRING='unrealircd 3.2.10-rc1' PACKAGE_BUGREPORT='http://bugs.unrealircd.org/' PACKAGE_URL='http://unrealircd.org/' @@ -1282,7 +1282,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.2.9 to adapt to many kinds of systems. +\`configure' configures unrealircd 3.2.10-rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1343,7 +1343,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unrealircd 3.2.9:";; + short | recursive ) echo "Configuration of unrealircd 3.2.10-rc1:";; esac cat <<\_ACEOF @@ -1481,7 +1481,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unrealircd configure 3.2.9 +unrealircd configure 3.2.10-rc1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2087,7 +2087,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.2.9, which was +It was created by unrealircd $as_me 3.2.10-rc1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7626,7 +7626,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.2.9, which was +This file was extended by unrealircd $as_me 3.2.10-rc1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7689,7 +7689,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.2.9 +unrealircd config.status 3.2.10-rc1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index eb66ce650..c8ec7e496 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl Unreal.nfo dnl .CHANGES.NEW dnl src/version.c.SH -AC_INIT([unrealircd], [3.2.9], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/]) +AC_INIT([unrealircd], [3.2.10-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]) diff --git a/doc/technical/serverprotocol.html b/doc/technical/serverprotocol.html index 09a1579da..f1d9befd5 100644 --- a/doc/technical/serverprotocol.html +++ b/doc/technical/serverprotocol.html @@ -75,8 +75,7 @@

9.2 Table for NICKIP.

1 Introduction

-

This document describes the UnrealIRCd server-to-server protocol as of protocol 2307 (Unreal 3.2.4). - It is currently slightly out of date, as the current protocol is 2310, but that should not matter much.

+

This document describes the UnrealIRCd server-to-server protocol.

A word about clocks.

Unreal is very time-dependant. Users and channels, for example, are timestamped, and if server clocks are not synchronized properly, things can go very wrong very fast. See http://vulnscan.org/UnrealIrcd/faq/#67 for more information on this. Note that there is a slight difference between server time and what is actually reported by the UNIX date command or by the C time() function. Unreal can apply an offset to the real time to create the server time, allowing servers to be virtually synchronized when synchronizing the real clocks is not possible (such as on shell servers). I should make it quite clear that GMT time is used for everything. To be specific, timestamps in unreal are 32-bit integer values (actually, however many bits the time_t type is, which is 32 on 32-bit systems such as x86). This integer value is the number of seconds that have elapsed since Midnight January 1, 1970 GMT (can be referred to as Epoch time in the UNIX world). This means that timezones are no problem, nor is daylight savings time (or whatever your country of choice calls it).

@@ -118,6 +117,7 @@

The server.name is the same as that in the remote server's link:: block. When received from unreal servers, this will be the value of that server's me::name. The protocol version is the numeric protocol version (2306 for example), and the protocol flags are the server's compilation flags (described below). These two fields are checked against the deny version {} blocks in the remote server's configuration. A value of 0 for either field prevents deny version{} checking for that field. The server description can be anything. When received from unreal servers, it'll be the value of me::description.

The following version numbers have been used previously:

    +
  • 2311 - Unreal 3.2.10
  • 2310 - Unreal 3.2.9
  • 2309 - Unreal 3.2.6, 3.2.7, 3.2.8
  • 2308 - Unreal 3.2.5
    • diff --git a/doc/technical/vl.txt b/doc/technical/vl.txt index bf8b35b15..a64d6db3f 100644 --- a/doc/technical/vl.txt +++ b/doc/technical/vl.txt @@ -2,6 +2,7 @@ VL Information (c) 2002 codemastr (Dominick Meglio) [codemastr@unrealircd.com] Protocol Version ------------------------------------------------------------------------------------------------ +2311 3.2.10 2310 3.2.9 2309 3.2.6, 3.2.7, 3.2.8 2308 3.2.5 diff --git a/doc/unreal32docs.html b/doc/unreal32docs.html index a8c5fddf5..c442fcdd0 100644 --- a/doc/unreal32docs.html +++ b/doc/unreal32docs.html @@ -32,8 +32,8 @@ English |

    UnrealIRCd
    http://www.unrealircd.com
    - Version: 3.2.9
    - Last doc update: 2011-10-09
    + Version: 3.2.10
    + Last doc update: 2012-10-16
    Head coder/maintainer: Syzop
    Coders: binki
    diff --git a/include/version.h b/include/version.h index 987418d5d..da2142aef 100644 --- a/include/version.h +++ b/include/version.h @@ -56,7 +56,7 @@ */ #define UNREAL_VERSION_TIME 201144 -#define UnrealProtocol 2310 +#define UnrealProtocol 2311 #define PATCH1 macro_to_str(UNREAL_VERSION_GENERATION) #define PATCH2 "." macro_to_str(UNREAL_VERSION_MAJOR) #define PATCH3 "." macro_to_str(UNREAL_VERSION_MINOR) diff --git a/include/win32/setup.h b/include/win32/setup.h index 03436df03..eb67dd7c3 100644 --- a/include/win32/setup.h +++ b/include/win32/setup.h @@ -80,10 +80,10 @@ #define UNREAL_VERSION_MAJOR 2 /* Minor version number (e.g.: 1 for Unreal3.2.1) */ -#define UNREAL_VERSION_MINOR 9 +#define UNREAL_VERSION_MINOR 10 /* Version suffix such as a beta marker or release candidate marker. (e.g.: -rc2 for unrealircd-3.2.9-rc2) */ -#define UNREAL_VERSION_SUFFIX "" +#define UNREAL_VERSION_SUFFIX "-rc1" #endif diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c index 1cc5dd0a2..f45909904 100644 --- a/src/modules/l_commands.c +++ b/src/modules/l_commands.c @@ -61,7 +61,7 @@ ModuleHeader l_commands_Header #endif = { "commands", /* Name of module */ - "3.2.9", /* Version */ + "3.2.10", /* Version */ "Wrapper library for m_ commands", /* Short description of module */ "3.2-b8-1", NULL diff --git a/src/s_serv.c b/src/s_serv.c index 3712a9a36..f87235e40 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -266,10 +266,11 @@ char *unrealinfo[] = "* binki ", "", "Contributors:", - "* Stealth, tabrisnet, Bock, fbi", + "* nenolod, Adam, warg, Stealth, WolfSage, katsklaw, darkex," + " fspijkerman, fbi, Apocalypse", "", "RC Testers:", - "* LqidSkin, goldenwolf, katsklaw, nph, selten, Simplicity,", + "* <>,", " and everyone else who downloaded the release candidates.", "", "Past UnrealIRCd3.2* coders/contributors:", diff --git a/src/version.c.SH b/src/version.c.SH index f411dbebe..62d4cac3f 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="3.2.9" +id="3.2.10-rc1" echo "$id" if test -r version.c diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 5272a6c88..518b4eaf6 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -11,7 +11,7 @@ [Setup] AppName=UnrealIRCd -AppVerName=UnrealIRCd3.2.9 +AppVerName=UnrealIRCd3.2.10-rc1 AppPublisher=UnrealIRCd Team AppPublisherURL=http://www.unrealircd.com AppSupportURL=http://www.unrealircd.com