commit: 9198b2553a860df49728249505cedfb9780f968c Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Jan 8 12:23:30 2017 +0000 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 02:31:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9198b255
net-irc/znc: remove unused patches ...2-webadmin-correctly-handle-channel-names.patch | 73 ---------------------- net-irc/znc/files/znc-1.6.1-libressl.patch | 19 ------ 2 files changed, 92 deletions(-) diff --git a/net-irc/znc/files/znc-1.2-webadmin-correctly-handle-channel-names.patch b/net-irc/znc/files/znc-1.2-webadmin-correctly-handle-channel-names.patch deleted file mode 100644 index 93705f7..00000000 --- a/net-irc/znc/files/znc-1.2-webadmin-correctly-handle-channel-names.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=507794 - -From 5e6e3be32acfeadeaf1fb3bb17bada08aec6432f Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psyc...@znc.in> -Date: Sun, 13 Apr 2014 20:36:55 +0200 -Subject: [PATCH] webadmin/add channel: Correctly handle channel names - -The CChan constructor makes sure that the channel name begins with a valid -channel prefix. Thus, this could change the name of the resulting channel. - -When you edited an irc network which already had a channel "#foo", were -connected to IRC (so ZNC knows which prefixes are valid) and added a channel -"foo", this would lead to a problem: - -Webadmin checks and sees that there is no channel "foo" yet. Webadmin creates a -new CChan instance for "foo". The CChan constructor notices that "f" is not a -valid channel prefix and instead calls itself "#foo". Then, -CIRCNetwork::AddChan() would see that this channel already exists, delete the -given channel and return false. - -However, webadmin didn't check this result and would continue changing settings -on an already destroyed CChan instance. - -Fix this by checking if the channel exists after CChan had its chance to mess -with the channel name. Also handle failures from CIRCNetwork::AddChan(). - -Fixes #528. - -Signed-off-by: Uli Schlachter <psyc...@znc.in> ---- - modules/webadmin.cpp | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp -index 40a28d3..90ddfd2 100644 ---- a/modules/webadmin.cpp -+++ b/modules/webadmin.cpp -@@ -668,13 +668,19 @@ class CWebAdminMod : public CModule { - return true; - } - -- if (pNetwork->FindChan(sChanName.Token(0))) { -- WebSock.PrintErrorPage("Channel [" + sChanName.Token(0) + "] already exists"); -+ // This could change the channel name and e.g. add a "#" prefix -+ pChan = new CChan(sChanName, pNetwork, true); -+ -+ if (pNetwork->FindChan(pChan->GetName())) { -+ WebSock.PrintErrorPage("Channel [" + pChan->GetName() + "] already exists"); -+ delete pChan; - return true; - } - -- pChan = new CChan(sChanName, pNetwork, true); -- pNetwork->AddChan(pChan); -+ if (!pNetwork->AddChan(pChan)) { -+ WebSock.PrintErrorPage("Could not add channel [" + pChan->GetName() + "]"); -+ return true; -+ } - } - - pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt(), spSession->IsAdmin()); -@@ -700,7 +706,7 @@ class CWebAdminMod : public CModule { - - CTemplate TmplMod; - TmplMod["User"] = pUser->GetUserName(); -- TmplMod["ChanName"] = sChanName; -+ TmplMod["ChanName"] = pChan->GetName(); - TmplMod["WebadminAction"] = "change"; - FOR_EACH_MODULE(it, pNetwork) { - (*it)->OnEmbeddedWebRequest(WebSock, "webadmin/channel", TmplMod); --- -1.9.1 - diff --git a/net-irc/znc/files/znc-1.6.1-libressl.patch b/net-irc/znc/files/znc-1.6.1-libressl.patch deleted file mode 100644 index 8bbe9cf..00000000 --- a/net-irc/znc/files/znc-1.6.1-libressl.patch +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_Csocket_cpp,v 1.1 2014/07/12 14:42:37 pascal Exp $ ---- src/Csocket.cpp.orig Sat Jul 12 16:03:48 2014 -+++ src/Csocket.cpp Sat Jul 12 16:04:36 2014 -@@ -555,6 +555,7 @@ bool InitSSL( ECompType eCompressionType ) - } - #endif /* _WIN32 */ - -+#ifndef OPENSSL_NO_COMP - COMP_METHOD *cm = NULL; - - if( CT_ZLIB & eCompressionType ) -@@ -570,6 +571,7 @@ bool InitSSL( ECompType eCompressionType ) - if( cm ) - SSL_COMP_add_compression_method( CT_RLE, cm ); - } -+#endif - - // setting this up once in the begining - g_iCsockSSLIdx = SSL_get_ex_new_index( 0, ( void * )"CsockGlobalIndex", NULL, NULL, NULL );
