From 9635658258d2a23a081c93372c188f8e5e3a234d Mon Sep 17 00:00:00 2001
From: Jos Ahrens <github@lynvie.com>
Date: Sat, 21 Jan 2017 16:32:38 +0100
Subject: [PATCH 1/2] [sasl] Do not try to convert entire "verbose" command to
 bool. (#1365)

Fixes #1291 for the stable branch.

Ref. https://github.com/znc/znc/commit/9864b2716a0274e046867aba83962b979d078bdd
for the original fix by psychon with dgw, this is merely a non-cherry-pick backport
as I realized too late it was already fixed elsewhere in the same manner.
---
 modules/sasl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index eeb13291..582774be 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -77,7 +77,7 @@ public:
 			"[yes|no]", "Don't connect unless SASL authentication succeeds");
 		AddCommand("Verbose", "yes|no", "Set verbosity level, useful to debug",
 			[&](const CString& sLine) {
-				m_bVerbose = sLine.ToBool();
+				m_bVerbose = sLine.Token(1, true).ToBool();
 				PutModule("Verbose: " + CString(m_bVerbose));
 			});
 

From 067995734064ff266fbcb4cd19c8313b1eab5ca4 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sun, 19 Feb 2017 10:29:49 +0000
Subject: [PATCH 2/2] Fix regression of 1.6.4 which caused crash in
 modperl/modpython.

See #1283
---
 modules/modperl/startup.pl | 1 +
 modules/modpython/znc.py   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/modperl/startup.pl b/modules/modperl/startup.pl
index f47a465d..f5ece23f 100644
--- a/modules/modperl/startup.pl
+++ b/modules/modperl/startup.pl
@@ -340,6 +340,7 @@ sub OnKick {}
 sub OnJoining {}
 sub OnJoin {}
 sub OnPart {}
+sub OnInvite {}
 sub OnChanBufferStarting {}
 sub OnChanBufferEnding {}
 sub OnChanBufferPlayLine {}
diff --git a/modules/modpython/znc.py b/modules/modpython/znc.py
index 81650f10..10851926 100644
--- a/modules/modpython/znc.py
+++ b/modules/modpython/znc.py
@@ -291,6 +291,9 @@ class Module:
     def OnPart(self, Nick, Channel, sMessage=None):
         pass
 
+    def OnInvite(self, Nick, sChan):
+        pass
+
     def OnChanBufferStarting(self, Chan, Client):
         pass