From 4048483da0a97e9b3e4a5ed654800a756c055da6 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 2 Nov 2015 00:35:23 +0000 Subject: [PATCH 1/5] Update Csocket: fix build without sslv3 (#1146) --- third_party/Csocket | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/Csocket b/third_party/Csocket index 0d6d4ee0..8e3b70aa 160000 --- a/third_party/Csocket +++ b/third_party/Csocket @@ -1 +1 @@ -Subproject commit 0d6d4ee0974ae32af43ff3f6747788aa0b44afe1 +Subproject commit 8e3b70aab7f6801ee834ae919b0675bbba5c7932 From 92ce58d25fb635011c92a1651f8a894d8247c907 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 2 Nov 2015 20:44:33 +0000 Subject: [PATCH 2/5] ZNC 1.6.2-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 2c252581..53a45274 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 main.h! -AC_INIT([znc], [1.6.x]) +AC_INIT([znc], [1.6.2-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..d2c4b0b9 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 2 // This one is for display purpose -#define VERSION_STR "1.6.x" +#define VERSION_STR "1.6.2" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0) From 429e0451e4d1dd4579db923e52967787758925fb Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 6 Nov 2015 13:16:59 +0200 Subject: [PATCH 3/5] .travis.yml: encrypt IRC notification settings Thanks @petemoore at #795 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e84a87df..35718797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,9 @@ after_success: notifications: irc: channels: - - "irc.freenode.net#znc-dev" + # travis encrypt "irc.freenode.net#znc-dev" -r znc/znc + # prevents forks from spamming #znc-dev by just enabling Travis + - secure: "ACdKvJT+gvuzDTfQkhnHI8aQNtXHI1tJOgFPss9XpF8025KYxrvhuff15VRhYuDCuNSuqhZYG9Oz+ZCQzu85ravkXVa3X+ze8SRoIIwAN2tpkr7KTfbJc4gD2S/RZUi432ICiQznHWnhV209XSLXY4qBhnR0OkCg5/pY8zievYw=" on_success: always on_failure: always sudo: required From 55b5c24255c2a029a1d9af5c2e742d76fe82208c Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 15 Nov 2015 17:36:31 +0000 Subject: [PATCH 4/5] Increase the version number to 1.6.2 --- ChangeLog.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 42644ad4..b6b51c93 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,47 @@ +# ZNC 1.6.2 (2015-11-15) + +## Fixes + +* Fixed a use-after-delete in webadmin. It was already partially fixed in ZNC 1.4; since 1.4 it has been still possible to trigger, but much harder. +* Fixed a startup failure when awaynick and simple_away were both loaded, and simple_away had arguments. +* Fixed a build failure when using an ancient OpenSSL version. +* Fixed a build failure when using OpenSSL which was built without SSLv3 support. +* Bindhost was sometimes used as ident. +* `CAP :END` wasn't parsed correctly, causing timeout during login for some clients. +* Fixed channel keys if client joined several channels in single command. +* Fixed memory leak when reading an invalid config. + +## Modules + +* autovoice: + * Check for autovoices when we are opped. +* controlpanel: + * Fixed `DelCTCPReply` case-insensitivity. +* dcc: + * Add missing return statement. It was harmless. +* modpython: + * Fixed a memory leak. +* modules_online: + * Wrong ident was used before. +* stickychan: + * Fixed to unstick inaccessible channels to avoid infinite join loops. + +## Internal + +* Fixed the nick passed to `CModule::OnChanMsg()` so it has channel permissions set. +* Fixed noisy `-Winconsistent-missing-override` compilation warnings. +* Initialized some fields in constructors of modules before `OnLoad()`. + +## Cosmetic + +* Various modules had commands with empty descriptions. +* perform: + * Say "number" instead of "nr". +* route_replies: + * Make the timeout error message more clear. + + + # ZNC 1.6.1 (2015-08-04) ## Fixes diff --git a/configure.ac b/configure.ac index 53a45274..dae417fb 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,8 @@ 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 main.h! -AC_INIT([znc], [1.6.2-rc1]) +dnl Keep the version number in sync with version.h! +AC_INIT([znc], [1.6.2]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) From e2d313d3ba0e9dd908c3bf015128decf38a61ee9 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 15 Nov 2015 17:59:43 +0000 Subject: [PATCH 5/5] Revert version changes after releasing 1.6.2 to 1.6.x --- configure.ac | 2 +- include/znc/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index dae417fb..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.2]) +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 d2c4b0b9..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 2 +#define VERSION_PATCH -1 // This one is for display purpose -#define VERSION_STR "1.6.2" +#define VERSION_STR "1.6.x" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0)