From 17dcf6ebb2c47cafe97f98f5a5d77ca58cfb1c08 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Feb 2016 00:36:39 +0000 Subject: [PATCH 1/6] Update Csocket submodule: Fix for LibreSSL --- third_party/Csocket | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/Csocket b/third_party/Csocket index 8e3b70aa..8b6636f0 160000 --- a/third_party/Csocket +++ b/third_party/Csocket @@ -1 +1 @@ -Subproject commit 8e3b70aab7f6801ee834ae919b0675bbba5c7932 +Subproject commit 8b6636f04272e10dd52acb9081564dfc13b56b4b From b49a92b1e6dfcdb2b9999f26222dd869426a38a8 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Feb 2016 21:18:12 +0000 Subject: [PATCH 2/6] ZNC 1.6.3-rc1 --- configure.ac | 2 +- include/znc/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 566b5239..d4c6fb52 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.6.x]) +AC_INIT([znc], [1.6.3-rc1]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/version.h b/include/znc/version.h index 14d7bf16..6f46d9b1 100644 --- a/include/znc/version.h +++ b/include/znc/version.h @@ -4,9 +4,9 @@ // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 1 #define VERSION_MINOR 6 -#define VERSION_PATCH -1 +#define VERSION_PATCH 3 // This one is for display purpose -#define VERSION_STR "1.6.x" +#define VERSION_STR "1.6.3" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0) From 71cdb81fe8d441eba8b1f61aa2c875a9b7ccfca8 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 18 Feb 2016 22:18:08 +0000 Subject: [PATCH 3/6] Don't save ZNC version to config as part of quit message. Introduce one more string for ExpandString. Fix #1244 --- src/User.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/User.cpp b/src/User.cpp index f7b42272..723e34b3 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -537,8 +537,9 @@ CString& CUser::ExpandString(const CString& sStr, CString& sRet) const { sRet.Replace("%version%", CZNC::GetVersion()); sRet.Replace("%time%", sTime); sRet.Replace("%uptime%", CZNC::Get().GetUptime()); + sRet.Replace("%znc%", CZNC::GetTag(false)); // The following lines do not exist. You must be on DrUgS! - sRet.Replace("%znc%", "All your IRC are belong to ZNC"); + sRet.Replace("%irc%", "All your IRC are belong to ZNC"); // Chosen by fair zocchihedron dice roll by SilverLeo sRet.Replace("%rand%", "42"); @@ -1240,7 +1241,7 @@ const CString& CUser::GetDefaultChanModes() const { return m_sDefaultChanModes; const CString& CUser::GetClientEncoding() const { return m_sClientEncoding; } bool CUser::HasSpaceForNewNetwork() const { return GetNetworks().size() < MaxNetworks(); } -CString CUser::GetQuitMsg() const { return (!m_sQuitMsg.Trim_n().empty()) ? m_sQuitMsg : CZNC::GetTag(false); } +CString CUser::GetQuitMsg() const { return (!m_sQuitMsg.Trim_n().empty()) ? m_sQuitMsg : "%znc%"; } const MCString& CUser::GetCTCPReplies() const { return m_mssCTCPReplies; } unsigned int CUser::GetBufferCount() const { return m_uBufferCount; } bool CUser::AutoClearChanBuffer() const { return m_bAutoClearChanBuffer; } From 6fe9dfc25e4ec49a9c900080f6caea39b2f1eb21 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 18 Feb 2016 22:21:35 +0000 Subject: [PATCH 4/6] ZNC 1.6.3-rc2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d4c6fb52..27a5dfbb 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.6.3-rc1]) +AC_INIT([znc], [1.6.3-rc2]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) From 90d03a48e5ffc8b98bd24ba8be88a6b0175e1968 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 23 Feb 2016 21:23:42 +0000 Subject: [PATCH 5/6] ZNC 1.6.3 --- ChangeLog.md | 28 ++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index b6b51c93..5337647b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,31 @@ +# ZNC 1.6.3 (2016-02-16) + +## Core +* New character encoding is now applied immediately, without reconnect. +* Fixed build with LibreSSL. +* Fixed error 404 when accessing the web UI with the configured URI prefix, + but without the `/` in the end. +* `znc-buildmod` now exits with non-zero exit code when the .cpp file is not found. +* Fixed `znc-buildmod` on Cygwin. +* ExpandString got expanded. It now expands `%znc%` to + `ZNC - http://znc.in`, honoring the global "Hide version" setting. +* Default quit message is switched from `ZNC - http://znc.in` to `%znc%`, + which is the same, but "automatically" changes the shown version when ZNC gets upgraded. + Before, the old version was recorded in the user's quit message, and stayed the same + regardless of the current version of ZNC. + +## Modules +* modperl: + * Fixed a memory leak. +* sasl: + * Added an option to show which mechanisms failed or succeeded. +* webadmin: + * Fixed an error message on invalid user settings to say what exactly was invalid. + * No more autocomplete password in user settings. It led to an error when ZNC + thought the user is going to change a password, but the passwords didn't match. + + + # ZNC 1.6.2 (2015-11-15) ## Fixes diff --git a/configure.ac b/configure.ac index 27a5dfbb..d7f485ef 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.6.3-rc2]) +AC_INIT([znc], [1.6.3]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) From e5ff36eb8ef137e1ebc8d3f72e2db33193c94672 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 23 Feb 2016 21:37:38 +0000 Subject: [PATCH 6/6] Revert version to 1.6.x after release of 1.6.3 --- configure.ac | 2 +- include/znc/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d7f485ef..566b5239 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.6.3]) +AC_INIT([znc], [1.6.x]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/version.h b/include/znc/version.h index 6f46d9b1..14d7bf16 100644 --- a/include/znc/version.h +++ b/include/znc/version.h @@ -4,9 +4,9 @@ // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 1 #define VERSION_MINOR 6 -#define VERSION_PATCH 3 +#define VERSION_PATCH -1 // This one is for display purpose -#define VERSION_STR "1.6.3" +#define VERSION_STR "1.6.x" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0)