diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2015-07-13 15:08:25 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-07-30 11:34:07 -0400 |
| commit | 768811216f87c30b3f41db2cffb2c0a6deaca912 (patch) | |
| tree | 2ac15354f48d8d26a7b3d77c273fbd628386d07f /meta-networking/recipes-irc | |
| parent | 8064196b93ca1ce2ad5cea86b84737a77b401c7c (diff) | |
| download | meta-openembedded-contrib-768811216f87c30b3f41db2cffb2c0a6deaca912.tar.gz | |
znc: upgrade to 1.6.0
Upgrade to fix CVE-2014-9403
Remove backport patch
Add CSocket submodule, which split from znc
Add the dependency on icu
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-irc')
| -rw-r--r-- | meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 | ||||
| -rw-r--r-- | meta-networking/recipes-irc/znc/znc_git.bb | 13 |
2 files changed, 7 insertions, 64 deletions
diff --git a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch b/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch deleted file mode 100644 index 68e4414704..0000000000 --- a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch +++ /dev/null @@ -1,58 +0,0 @@ -Subject: [PATCH] Fix NULL pointer dereference in webadmin. - -Upstream-Status: Backport - -commit 2bd410ee5570cea127233f1133ea22f25174eb28 upstream - -Triggerable by any non-admin, if webadmin is loaded. - -The only affected version is 1.0 - -Thanks to ChauffeR (Simone Esposito) for reporting this. ---- - modules/webadmin.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp -index b793c02..816f217 100644 ---- a/modules/webadmin.cpp -+++ b/modules/webadmin.cpp -@@ -419,7 +419,7 @@ public: - CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); - - // Admin||Self Check -- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { -+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { - return false; - } - -@@ -448,7 +448,7 @@ public: - CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); - - // Admin||Self Check -- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { -+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { - return false; - } - -@@ -472,7 +472,7 @@ public: - CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); - - // Admin||Self Check -- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { -+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { - return false; - } - -@@ -486,7 +486,7 @@ public: - CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock); - - // Admin||Self Check -- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) { -+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) { - return false; - } - --- -1.8.5.2.233.g932f7e4 - diff --git a/meta-networking/recipes-irc/znc/znc_git.bb b/meta-networking/recipes-irc/znc/znc_git.bb index 2e35e4dd33..d81c17052e 100644 --- a/meta-networking/recipes-irc/znc/znc_git.bb +++ b/meta-networking/recipes-irc/znc/znc_git.bb @@ -1,16 +1,17 @@ SUMMARY = "ZNC, an advanced IRC bouncer" SECTION = "net" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "openssl" +DEPENDS = "openssl zlib icu" -PV = "1.0+git" +PV = "1.6.0" -SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2" -SRC_URI = "git://github.com/znc/znc.git \ - file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \ +SRC_URI = "git://github.com/znc/znc.git;name=znc \ + git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ " +SRCREV_znc = "f47e8465efa4e1cd948b9caae93ac401b4355df8" +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee" S = "${WORKDIR}/git" |