* [PATCH][meta-networking] znc: upgrade to 1.6.0
@ 2015-06-15 9:11 rongqing.li
2015-07-06 19:24 ` Joe MacDonald
0 siblings, 1 reply; 8+ messages in thread
From: rongqing.li @ 2015-06-15 9:11 UTC (permalink / raw)
To: openembedded-devel
From: Roy Li <rongqing.li@windriver.com>
Remove backport patch
Add CSocket submodule
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
...-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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH][meta-networking] znc: upgrade to 1.6.0
2015-06-15 9:11 [PATCH][meta-networking] znc: upgrade to 1.6.0 rongqing.li
@ 2015-07-06 19:24 ` Joe MacDonald
2015-07-07 0:47 ` Rongqing Li
0 siblings, 1 reply; 8+ messages in thread
From: Joe MacDonald @ 2015-07-06 19:24 UTC (permalink / raw)
To: openembedded-devel
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, <rongqing.li@windriver.com> wrote:
> From: Roy Li <rongqing.li@windriver.com>
>
> Remove backport patch
> Add CSocket submodule
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
> ...-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
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Joe MacDonald
:wq
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH][meta-networking] znc: upgrade to 1.6.0
2015-07-06 19:24 ` Joe MacDonald
@ 2015-07-07 0:47 ` Rongqing Li
0 siblings, 0 replies; 8+ messages in thread
From: Rongqing Li @ 2015-07-07 0:47 UTC (permalink / raw)
To: openembedded-devel
On 2015年07月07日 03:24, Joe MacDonald wrote:
> 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.
>
Ok, I will see it
-Roy
> On Mon, Jun 15, 2015 at 5:11 AM, <rongqing.li@windriver.com> wrote:
>> From: Roy Li <rongqing.li@windriver.com>
>>
>> Remove backport patch
>> Add CSocket submodule
>>
>> Signed-off-by: Roy Li <rongqing.li@windriver.com>
>> ---
>> ...-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
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH][meta-networking] znc: upgrade to 1.6.0
@ 2015-06-01 6:17 rongqing.li
2015-06-06 2:01 ` Joe MacDonald
0 siblings, 1 reply; 8+ messages in thread
From: rongqing.li @ 2015-06-01 6:17 UTC (permalink / raw)
To: openembedded-devel
From: Roy Li <rongqing.li@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
Signed-off-by: Roy Li <rongqing.li@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
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH][meta-networking] znc: upgrade to 1.6.0
2015-06-01 6:17 rongqing.li
@ 2015-06-06 2:01 ` Joe MacDonald
2015-06-08 0:31 ` Rongqing Li
0 siblings, 1 reply; 8+ messages in thread
From: Joe MacDonald @ 2015-06-06 2:01 UTC (permalink / raw)
To: rongqing.li; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 5851 bytes --]
Hey Roy,
[[oe] [PATCH][meta-networking] znc: upgrade to 1.6.0] On 15.06.01 (Mon 14:17) rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@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.
>
> Signed-off-by: Roy Li <rongqing.li@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
>
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH][meta-networking] znc: upgrade to 1.6.0
2015-06-06 2:01 ` Joe MacDonald
@ 2015-06-08 0:31 ` Rongqing Li
2015-06-08 0:42 ` Joe MacDonald
0 siblings, 1 reply; 8+ messages in thread
From: Rongqing Li @ 2015-06-08 0:31 UTC (permalink / raw)
To: Joe MacDonald; +Cc: openembedded-devel
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@windriver.com wrote:
>
>> From: Roy Li <rongqing.li@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@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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH][meta-networking] znc: upgrade to 1.6.0
2015-06-08 0:31 ` Rongqing Li
@ 2015-06-08 0:42 ` Joe MacDonald
2015-06-08 0:54 ` Rongqing Li
0 siblings, 1 reply; 8+ messages in thread
From: Joe MacDonald @ 2015-06-08 0:42 UTC (permalink / raw)
To: Rongqing Li; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 6652 bytes --]
[Re: [oe] [PATCH][meta-networking] znc: upgrade to 1.6.0] On 15.06.08 (Mon 08:31) Rongqing Li wrote:
>
>
> 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@windriver.com wrote:
> >
> >>From: Roy Li <rongqing.li@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
Okay. I haven't looked at the repo myself, but if there are
obvious tags for the releases, maybe you want to create a version of the
recipe that includes the git version directly and just selects an
appropriate release tag? I don't know, just a thought. Whatever works.
-J.
>
> -Roy
>
> >
> >>
> >>Signed-off-by: Roy Li <rongqing.li@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
> >>
>
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH][meta-networking] znc: upgrade to 1.6.0
2015-06-08 0:42 ` Joe MacDonald
@ 2015-06-08 0:54 ` Rongqing Li
0 siblings, 0 replies; 8+ messages in thread
From: Rongqing Li @ 2015-06-08 0:54 UTC (permalink / raw)
To: Joe MacDonald; +Cc: openembedded-devel
On 2015年06月08日 08:42, Joe MacDonald wrote:
> [Re: [oe] [PATCH][meta-networking] znc: upgrade to 1.6.0] On 15.06.08 (Mon 08:31) Rongqing Li wrote:
>
>>
>>
>> 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@windriver.com wrote:
>>>
>>>> From: Roy Li <rongqing.li@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
>
> Okay. I haven't looked at the repo myself, but if there are
> obvious tags for the releases, maybe you want to create a version of the
> recipe that includes the git version directly and just selects an
> appropriate release tag? I don't know, just a thought. Whatever works.
>
> -J.
I did not upgrade the git version since some codes moved into git submodule,
it does not work to directly upgrade the git version unless the host
has "git submodule", and modify the recipe file to get the submodule.
1. ChangeLog said:
znc$ grep "Move Csocket to git submodule" ./ -r
./ChangeLog.md:* Move Csocket to git submodule.
znc$
2. no Csocket code
znc$ ls third_party/Csocket/
znc$
3. run "git submodule" to fetch the codes
znc$ git submodule update --init --recursive
Submodule 'Csocket' (https://github.com/jimloco/Csocket.git) registered
for path 'third_party/Csocket'
Cloning into 'third_party/Csocket'...
remote: Counting objects: 1633, done.
remote: Total 1633 (delta 0), reused 0 (delta 0), pack-reused 1633
Receiving objects: 100% (1633/1633), 1.01 MiB | 182.00 KiB/s, done.
Resolving deltas: 100% (640/640), done.
Checking connectivity... done.
Submodule path 'third_party/Csocket': checked out
'07b4437396122650e5b8fb3d014e820a5decf4ee'
znc$
znc$ ls third_party/Csocket/
Csocket.cc Csocket.h CurlSock.cc CurlSock.h examples
znc$
-Roy
>
>>
>> -Roy
>>
>>>
>>>>
>>>> Signed-off-by: Roy Li <rongqing.li@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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-07-07 0:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-15 9:11 [PATCH][meta-networking] znc: upgrade to 1.6.0 rongqing.li
2015-07-06 19:24 ` Joe MacDonald
2015-07-07 0:47 ` Rongqing Li
-- strict thread matches above, loose matches on Subject: below --
2015-06-01 6:17 rongqing.li
2015-06-06 2:01 ` Joe MacDonald
2015-06-08 0:31 ` Rongqing Li
2015-06-08 0:42 ` Joe MacDonald
2015-06-08 0:54 ` Rongqing Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.