[oe] [PATCH][meta-networking] znc: upgrade to 1.6.0

[Rongqing Li]

On 2015年06月06日 10:01, Joe MacDonald wrote:
> Hey Roy,
>
> [[oe] [PATCH][meta-networking] znc: upgrade to 1.6.0] On 15.06.01 (Mon 14:17) rongqing.li at windriver.com wrote:
>
>> From: Roy Li <rongqing.li at windriver.com>
>>
>> 1. upgrade to 1.6.0 to fix CVE-2014-9403
>> 2. Remove the backup patch
>> 3. not git version, otherwise it requires "git submodule" command,
>> since Csocket is moved into git submodule
>> 4. update the checksum of LICENSE, since the date in it was changed
>
> Couple of things about this one.  The patch fails to apply:
>
> ------------------------------------------------------------------------
> % git am /tmp/a.mbox
> Applying: znc: upgrade to 1.6.0
> error: patch failed: meta-networking/recipes-irc/znc/znc_git.bb:1
> error: meta-networking/recipes-irc/znc/znc_git.bb: patch does not apply
> Patch failed at 0001 znc: upgrade to 1.6.0
> The copy of the patch that failed is found in:
>     /home/jjm/external/yocto-networking/meta-openembedded/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> ------------------------------------------------------------------------
>
> but also, unless there's a good reason to drop the git recipe, I'd
> rather keep that and add in the released one beside it.  Normally I
> don't like to keep multiple versions of a recipe around, but if one of
> those is a "build directly from the source repo", that I think is
> reasonable to keep around.
>
> -J.

Sorry, I will fix it

-Roy

>
>>
>> Signed-off-by: Roy Li <rongqing.li at windriver.com>
>> ---
>>   ...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 ----------------------
>>   .../recipes-irc/znc/{znc_git.bb => znc_1.6.0.bb}   | 14 ++----
>>   2 files changed, 5 insertions(+), 67 deletions(-)
>>   delete mode 100644 meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
>>   rename meta-networking/recipes-irc/znc/{znc_git.bb => znc_1.6.0.bb} (47%)
>>
>> 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_1.6.0.bb
>> similarity index 47%
>> rename from meta-networking/recipes-irc/znc/znc_git.bb
>> rename to meta-networking/recipes-irc/znc/znc_1.6.0.bb
>> index 77db25b..ca3c606 100644
>> --- a/meta-networking/recipes-irc/znc/znc_git.bb
>> +++ b/meta-networking/recipes-irc/znc/znc_1.6.0.bb
>> @@ -1,17 +1,13 @@
>>   SUMMARY = "ZNC, an advanced IRC bouncer"
>>   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"
>> -
>> -SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2"
>> -SRC_URI = "git://github.com/znc/znc.git \
>> -           file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
>> +SRC_URI = "http://znc.in/releases/${BP}.tar.gz \
>>             "
>> -
>> -S = "${WORKDIR}/git"
>> +SRC_URI[md5sum]="674d8c1277752dcc627b96e33a63376e"
>> +SRC_URI[sha256sum]="df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7"
>>
>>   inherit autotools-brokensep pkgconfig
>>

-- 
Best Reagrds,
Roy | RongQing Li