diff --git a/.CHANGES.NEW b/.CHANGES.NEW
index 67ec18bc5..649434ff7 100644
--- a/.CHANGES.NEW
+++ b/.CHANGES.NEW
@@ -7,7 +7,7 @@
\___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_|
Configuration Program
- for Unreal3.2.10.3
+ for Unreal3.2.10.4
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/.RELEASE.NOTES b/.RELEASE.NOTES
index 32ae34d83..1a0d7995e 100644
--- a/.RELEASE.NOTES
+++ b/.RELEASE.NOTES
@@ -1,4 +1,4 @@
-Unreal3.2.10.3 Release Notes
+Unreal3.2.10.4 Release Notes
=============================
==[ GENERAL INFORMATION ]==
@@ -13,6 +13,22 @@ Unreal3.2.10.3 Release Notes
SUMMARY of the changes in this release. See the file 'Changes' for a
complete list of all changes.
+==[ .4 RELEASE ]==
+Two major issues were fixed:
+- Compile problems when using clang instead of gcc (such as on FreeBSD & OS X)
+- For services who allow you to log in by account name but still allow you to
+ use a different nick: when you're logged in you are now considered
+ registered as far as mode +M and +R are concerned.
+ Tech: whenever services set SVID and it's not * and does not start with a
+ number, then we consider this user to be 'logged in'.
+ Whenever a user is set +r (s)he is also considered 'logged in'.
+ This way it's compatible with both older and new services and doesn't
+ (or shouldn't) introduce security issues with older services using
+ servicetimestamp for nick tracking or other means.
+Additionally:
+- curl-ca-bundle.crt has been updated to use latest certificates
+- The Windows libraries (OpenSSL, curl, ..) have been updated.
+
==[ .3 RELEASE ]==
The following issues have been fixed in 3.2.10.3:
- Crash when SASL is enabled and ping-cookie is disabled
diff --git a/Unreal.nfo b/Unreal.nfo
index be98bc836..da764ac7f 100644
--- a/Unreal.nfo
+++ b/Unreal.nfo
@@ -1,5 +1,5 @@
===============================================
-= UnrealIRCd v3.2.10.3 =
+= UnrealIRCd v3.2.10.4 =
===============================================
This release was brought to you by:
@@ -13,6 +13,7 @@
Contributors:
=============
+ * Heero
* nenolod
* Adam
* warg
diff --git a/configure b/configure
index 5ea64a2e9..26d120dec 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.10.3.
+# Generated by GNU Autoconf 2.69 for unrealircd 3.2.10.4.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='unrealircd'
PACKAGE_TARNAME='unrealircd'
-PACKAGE_VERSION='3.2.10.3'
-PACKAGE_STRING='unrealircd 3.2.10.3'
+PACKAGE_VERSION='3.2.10.4'
+PACKAGE_STRING='unrealircd 3.2.10.4'
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.10.3 to adapt to many kinds of systems.
+\`configure' configures unrealircd 3.2.10.4 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.10.3:";;
+ short | recursive ) echo "Configuration of unrealircd 3.2.10.4:";;
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.10.3
+unrealircd configure 3.2.10.4
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.10.3, which was
+It was created by unrealircd $as_me 3.2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7631,7 +7631,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.10.3, which was
+This file was extended by unrealircd $as_me 3.2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7694,7 +7694,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.10.3
+unrealircd config.status 3.2.10.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 19a5f0091..9b476f48e 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.10.3], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
+AC_INIT([unrealircd], [3.2.10.4], [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/unreal32docs.de.html b/doc/unreal32docs.de.html
index 0ff86d0a4..07b6b81dc 100644
--- a/doc/unreal32docs.de.html
+++ b/doc/unreal32docs.de.html
@@ -27,7 +27,7 @@
Head Coders: Stskeeps / codemastr / Syzop / Luke/
aquanight / WolfSage
diff --git a/doc/unreal32docs.es.html b/doc/unreal32docs.es.html
index b2216bc17..b06f6fa6d 100644
--- a/doc/unreal32docs.es.html
+++ b/doc/unreal32docs.es.html
@@ -30,7 +30,7 @@ Spanish
Programador jefe/mantenimiento: Syzop
diff --git a/doc/unreal32docs.fr.html b/doc/unreal32docs.fr.html
index e9898afc1..70ad29d30 100644
--- a/doc/unreal32docs.fr.html
+++ b/doc/unreal32docs.fr.html
@@ -33,7 +33,7 @@
UnrealIRCd
http://www.unrealircd.com
-
Version: 3.2.10.3
+
Version: 3.2.10.4
Dernière mise à jour de la documentation: 2013-04-05
diff --git a/doc/unreal32docs.html b/doc/unreal32docs.html
index 9752ecbaf..7bc15b7b2 100644
--- a/doc/unreal32docs.html
+++ b/doc/unreal32docs.html
@@ -30,7 +30,7 @@ English |
Head coder/maintainer: Syzop
diff --git a/doc/unreal32docs.hu.html b/doc/unreal32docs.hu.html
index 438d5ac20..5bf070789 100644
--- a/doc/unreal32docs.hu.html
+++ b/doc/unreal32docs.hu.html
@@ -29,7 +29,7 @@ Hungarian |
Fõ fejlesztõ/karbantartó: Syzop
diff --git a/doc/unreal32docs.ru.html b/doc/unreal32docs.ru.html
index 7cb157eb3..457778a7f 100644
--- a/doc/unreal32docs.ru.html
+++ b/doc/unreal32docs.ru.html
@@ -28,7 +28,7 @@
Ãëàâíûå ïðîãðàììèñòû Syzop
diff --git a/doc/unreal32docs.tr.html b/doc/unreal32docs.tr.html
index 1ce8b96ee..26048db9b 100644
--- a/doc/unreal32docs.tr.html
+++ b/doc/unreal32docs.tr.html
@@ -48,7 +48,7 @@ href="unreal32docs.hu.html">Hungarian
Baþ Kodlayýcý/Devam Ettiren: Syzop
Kodlayýcýlar: binki
diff --git a/include/version.h b/include/version.h
index b5cd62cf9..049195127 100644
--- a/include/version.h
+++ b/include/version.h
@@ -54,7 +54,7 @@
* 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 201252
+#define UNREAL_VERSION_TIME 201430
#define UnrealProtocol 2311
#define PATCH1 macro_to_str(UNREAL_VERSION_GENERATION)
diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c
index 3705f2dad..37a437f1c 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.10.3", /* Version */
+ "3.2.10.4", /* Version */
"Wrapper library for m_ commands", /* Short description of module */
"3.2-b8-1",
NULL
diff --git a/src/version.c.SH b/src/version.c.SH
index 54842b2db..d10f952f6 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.10.3"
+id="3.2.10.4"
echo "$id"
if test -r version.c
diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss
index 8a0e92b03..161a0b89a 100644
--- a/src/win32/unrealinst.iss
+++ b/src/win32/unrealinst.iss
@@ -11,7 +11,7 @@
[Setup]
AppName=UnrealIRCd
-AppVerName=UnrealIRCd3.2.10.3
+AppVerName=UnrealIRCd3.2.10.4
AppPublisher=UnrealIRCd Team
AppPublisherURL=http://www.unrealircd.com
AppSupportURL=http://www.unrealircd.com