Hi Roy, This seems to have also brought in a build-dep warning:
znc-1.6.0+git: znc rdepends on libicuuc, but it isn't a build dependency? [build-deps] See Martin's logs. Can you check on that please? -J. On Mon, Jun 15, 2015 at 5:11 AM, <[email protected]> wrote: > From: Roy Li <[email protected]> > > Remove backport patch > Add CSocket submodule > > Signed-off-by: Roy Li <[email protected]> > --- > ...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 > ---------------------- > meta-networking/recipes-irc/znc/znc_git.bb | 12 ++--- > 2 files changed, 6 insertions(+), 64 deletions(-) > delete mode 100644 > meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch > > 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 68e4414..0000000 > --- > 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 2e35e4d..834c3de 100644 > --- a/meta-networking/recipes-irc/znc/znc_git.bb > +++ b/meta-networking/recipes-irc/znc/znc_git.bb > @@ -1,16 +1,16 @@ > 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" > > -PV = "1.0+git" > +PV = "1.6.0+git" > > -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;rev=f47e8465efa4e1cd948b9caae93ac401b4355df8 \ > + > git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket > \ > " > +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee" > > S = "${WORKDIR}/git" > > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Joe MacDonald :wq -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
