* [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
@ 2015-07-07 1:55 rongqing.li
2015-07-07 7:24 ` Koen Kooi
2015-07-08 15:37 ` akuster808
0 siblings, 2 replies; 10+ messages in thread
From: rongqing.li @ 2015-07-07 1:55 UTC (permalink / raw
To: openembedded-devel
From: Roy Li <rongqing.li@windriver.com>
Remove backport patch
Add CSocket submodule
Add the dependency on icu
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..f5bed08 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 icu"
-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] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-07 1:55 [PATCH][meta-networking][v2] znc: upgrade to 1.6.0 rongqing.li
@ 2015-07-07 7:24 ` Koen Kooi
2015-07-07 7:31 ` Rongqing Li
2015-07-08 15:37 ` akuster808
1 sibling, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2015-07-07 7:24 UTC (permalink / raw
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rongqing.li@windriver.com schreef op 07-07-15 om 03:55:
> From: Roy Li <rongqing.li@windriver.com>
>
> Remove backport patch Add CSocket submodule Add the dependency on icu
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com> ---
> diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
> b/meta-networking/recipes-irc/znc/znc_git.bb index 2e35e4d..f5bed08
> 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 icu"
>
> -PV = "1.0+git" +PV = "1.6.0+git"
If it's the 1.6 release, just call it '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;rev=f47e8465efa4e1cd948b9caae93ac401b4355df8
> \ +
> git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name
=Csocket
> \ " +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
>
Why are you using 2 different notations for SRCREV?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFVm36sMkyGM64RGpERAnkdAKCu2PeFLY0tM3mwKlS9AJ2TDj4LAQCeNsmL
GIoJ0jDJYLU2/z7hph+y+Ik=
=sHdl
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-07 7:24 ` Koen Kooi
@ 2015-07-07 7:31 ` Rongqing Li
2015-07-08 9:39 ` Koen Kooi
0 siblings, 1 reply; 10+ messages in thread
From: Rongqing Li @ 2015-07-07 7:31 UTC (permalink / raw
To: openembedded-devel
On 2015年07月07日 15:24, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> rongqing.li@windriver.com schreef op 07-07-15 om 03:55:
>> From: Roy Li <rongqing.li@windriver.com>
>>
>> Remove backport patch Add CSocket submodule Add the dependency on icu
>>
>> Signed-off-by: Roy Li <rongqing.li@windriver.com> ---
>
>> diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
>> b/meta-networking/recipes-irc/znc/znc_git.bb index 2e35e4d..f5bed08
>> 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 icu"
>>
>> -PV = "1.0+git" +PV = "1.6.0+git"
>
> If it's the 1.6 release, just call it '1.6.0'
>
grep oe-core
./meta/recipes-graphics/mesa/mesa_git.bb:PV = "10.5.4+git${SRCPV}"
./meta/recipes-graphics/fstests/fstests_git.bb:PV = "0.1+git${SRCPV}"
./meta/recipes-graphics/mx/mx-1.0_1.4.7.bb:PV = "1.4.7+git${SRCPV}"
./meta/recipes-graphics/drm/libdrm_git.bb:PV = "2.4.40+git${SRCPV}"
./meta/recipes-graphics/xorg-lib/libxcb_git.bb:PV = "1.1.90.1+gitr${SRCPV}"
./meta/recipes-graphics/xorg-lib/libxext_git.bb:PV = "1.0.99.1+gitr${SRCPV}"
./meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:PV = "0.0+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb:PV =
"1.3.2+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb:PV =
"1.3.0+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb:PV =
"0.15.2+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:PV =
"0.1.1+gitr${SRCPV}"
./meta/recipes-graphics/libepoxy/libepoxy_git.bb:PV = "1.2+git${SRCPV}"
./meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb:PV =
"0.1+git${SRCPV}"
./meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb:PV = "1.1+git${SRCPV}"
./meta/recipes-devtools/qemu/qemu_git.bb:PV = "1.3.0+git${SRCPV}"
./meta/recipes-devtools/swabber/swabber-native_git.bb:PV = "0.0+git${SRCPV}"
./meta/recipes-devtools/remake/remake_git.bb:PV = "3.82+dbg-0.9+git${SRCPV}"
./meta/recipes-devtools/mtd/mtd-utils_git.bb:PV = "1.5.1+git${SRCPV}"
./meta/recipes-devtools/opkg-utils/opkg-utils_git.bb:PV =
"0.1.8+git${SRCPV}"
./meta/recipes-devtools/bootchart2/bootchart2_git.bb:PV =
"0.14.6+git${SRCPV}"
./meta/recipes-devtools/mkelfimage/mkelfimage_git.bb:PV = "4.0+git${SRCPV}"
./meta/recipes-devtools/mmc/mmc-utils_git.bb:PV = "0.1"
./meta/recipes-devtools/pseudo/pseudo_git.bb:PV = "1.6.5+git${SRCPV}"
./meta/recipes-devtools/prelink/prelink_git.bb:PV = "1.0+git${SRCPV}"
./meta/recipes-devtools/pkgconfig/pkgconfig.inc:PV = "0.28+git${SRCPV}"
./meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb:PV =
"4.0.1+git${SRCPV}"
./meta/recipes-devtools/gnu-config/gnu-config_git.bb:PV = "1.0+git${SRCPV}"
./meta/recipes-devtools/tcf-agent/tcf-agent_git.bb:PV = "0.4.0+git${SRCPV}"
./meta/recipes-devtools/fdisk/gptfdisk_git.bb:PV = "0.8.10+git${SRCPV}"
./meta/recipes-multimedia/x264/x264_git.bb:PV = "r2491+git${SRCPV}"
./meta/recipes-multimedia/libav/libpostproc_git.bb:PV = "52.3.0+git${SRCPV}"
>>
>> -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"
>>
>
> Why are you using 2 different notations for SRCREV?
>
there are two different git repo
-Roy
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFVm36sMkyGM64RGpERAnkdAKCu2PeFLY0tM3mwKlS9AJ2TDj4LAQCeNsmL
> GIoJ0jDJYLU2/z7hph+y+Ik=
> =sHdl
> -----END PGP SIGNATURE-----
>
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-07 7:31 ` Rongqing Li
@ 2015-07-08 9:39 ` Koen Kooi
2015-07-09 1:27 ` Rongqing Li
2015-07-09 2:35 ` Rongqing Li
0 siblings, 2 replies; 10+ messages in thread
From: Koen Kooi @ 2015-07-08 9:39 UTC (permalink / raw
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Rongqing Li schreef op 07-07-15 om 09:31:
>
>
> On 2015年07月07日 15:24, Koen Kooi wrote: rongqing.li@windriver.com schreef
> op 07-07-15 om 03:55:
>>>> From: Roy Li <rongqing.li@windriver.com>
>>>>
>>>> Remove backport patch Add CSocket submodule Add the dependency on
>>>> icu
>>>>
>>>> Signed-off-by: Roy Li <rongqing.li@windriver.com> ---
>
>>>> diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
>>>> b/meta-networking/recipes-irc/znc/znc_git.bb index
>>>> 2e35e4d..f5bed08 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 icu"
>>>>
>>>> -PV = "1.0+git" +PV = "1.6.0+git"
>
> If it's the 1.6 release, just call it '1.6.0'
>
>
>> grep oe-core
>
>> ./meta/recipes-graphics/mesa/mesa_git.bb:PV = "10.5.4+git${SRCPV}"
>> ./meta/recipes-graphics/fstests/fstests_git.bb:PV = "0.1+git${SRCPV}"
>> ./meta/recipes-graphics/mx/mx-1.0_1.4.7.bb:PV = "1.4.7+git${SRCPV}"
>> ./meta/recipes-graphics/drm/libdrm_git.bb:PV = "2.4.40+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-lib/libxcb_git.bb:PV =
>> "1.1.90.1+gitr${SRCPV}"
>> ./meta/recipes-graphics/xorg-lib/libxext_git.bb:PV =
>> "1.0.99.1+gitr${SRCPV}"
>> ./meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:PV =
>> "0.0+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb:PV =
>> "1.3.2+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb:PV =
>> "1.3.0+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb:PV =
>> "0.15.2+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:PV =
>> "0.1.1+gitr${SRCPV}"
>> ./meta/recipes-graphics/libepoxy/libepoxy_git.bb:PV =
>> "1.2+git${SRCPV}"
>> ./meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb:PV =
>> "0.1+git${SRCPV}"
>> ./meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb:PV =
>> "1.1+git${SRCPV}" ./meta/recipes-devtools/qemu/qemu_git.bb:PV =
>> "1.3.0+git${SRCPV}"
>> ./meta/recipes-devtools/swabber/swabber-native_git.bb:PV =
>> "0.0+git${SRCPV}" ./meta/recipes-devtools/remake/remake_git.bb:PV =
>> "3.82+dbg-0.9+git${SRCPV}"
>> ./meta/recipes-devtools/mtd/mtd-utils_git.bb:PV = "1.5.1+git${SRCPV}"
>> ./meta/recipes-devtools/opkg-utils/opkg-utils_git.bb:PV =
>> "0.1.8+git${SRCPV}"
>> ./meta/recipes-devtools/bootchart2/bootchart2_git.bb:PV =
>> "0.14.6+git${SRCPV}"
>> ./meta/recipes-devtools/mkelfimage/mkelfimage_git.bb:PV =
>> "4.0+git${SRCPV}" ./meta/recipes-devtools/mmc/mmc-utils_git.bb:PV =
>> "0.1" ./meta/recipes-devtools/pseudo/pseudo_git.bb:PV =
>> "1.6.5+git${SRCPV}" ./meta/recipes-devtools/prelink/prelink_git.bb:PV =
>> "1.0+git${SRCPV}" ./meta/recipes-devtools/pkgconfig/pkgconfig.inc:PV =
>> "0.28+git${SRCPV}"
>> ./meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb:PV =
>> "4.0.1+git${SRCPV}"
>> ./meta/recipes-devtools/gnu-config/gnu-config_git.bb:PV =
>> "1.0+git${SRCPV}" ./meta/recipes-devtools/tcf-agent/tcf-agent_git.bb:PV
>> = "0.4.0+git${SRCPV}" ./meta/recipes-devtools/fdisk/gptfdisk_git.bb:PV
>> = "0.8.10+git${SRCPV}" ./meta/recipes-multimedia/x264/x264_git.bb:PV =
>> "r2491+git${SRCPV}"
>> ./meta/recipes-multimedia/libav/libpostproc_git.bb:PV =
>> "52.3.0+git${SRCPV}"
Your point being?
>
>
>
>>>>
>>>> -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=f47e8465efa4e1cd948b9caae93ac401b4355df
8
>>>>
>>>>
\ +
>>>> git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;n
ame
>
>>>>
=Csocket
>>>> \ " +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
>>>>
>
> Why are you using 2 different notations for SRCREV?
>
>
>
>> there are two different git repo
That's not a reason to use 2 different notations. Either put both in SRC_URI
or use two SRCREV_foo statements.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFVnO/FMkyGM64RGpERAr4DAJ96PYxPoMF3JR3Vc4QpMP2l9FhuAACfYPao
pdHU9MAwNQDfvcegqR7tRTY=
=GSXq
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-07 1:55 [PATCH][meta-networking][v2] znc: upgrade to 1.6.0 rongqing.li
2015-07-07 7:24 ` Koen Kooi
@ 2015-07-08 15:37 ` akuster808
1 sibling, 0 replies; 10+ messages in thread
From: akuster808 @ 2015-07-08 15:37 UTC (permalink / raw
To: openembedded-devel
if it is possible, can the security fix be noted?
1.4:
CVE-2014-9403
On 07/06/2015 06:55 PM, rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
>
> Remove backport patch
> Add CSocket submodule
> Add the dependency on icu
>
> 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..f5bed08 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 icu"
>
> -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"
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-08 9:39 ` Koen Kooi
@ 2015-07-09 1:27 ` Rongqing Li
2015-07-10 14:21 ` Koen Kooi
2015-07-11 23:34 ` Khem Raj
2015-07-09 2:35 ` Rongqing Li
1 sibling, 2 replies; 10+ messages in thread
From: Rongqing Li @ 2015-07-09 1:27 UTC (permalink / raw
To: openembedded-devel
On 2015年07月08日 17:39, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Rongqing Li schreef op 07-07-15 om 09:31:
>>
>>
>> On 2015年07月07日 15:24, Koen Kooi wrote: rongqing.li@windriver.com schreef
>> op 07-07-15 om 03:55:
>>>>> From: Roy Li <rongqing.li@windriver.com>
>>>>>
>>>>> Remove backport patch Add CSocket submodule Add the dependency on
>>>>> icu
>>>>>
>>>>> Signed-off-by: Roy Li <rongqing.li@windriver.com> ---
>>
>>>>> diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
>>>>> b/meta-networking/recipes-irc/znc/znc_git.bb index
>>>>> 2e35e4d..f5bed08 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 icu"
>>>>>
>>>>> -PV = "1.0+git" +PV = "1.6.0+git"
>>
>> If it's the 1.6 release, just call it '1.6.0'
>>
>>
>>> grep oe-core
>>
>>> ./meta/recipes-graphics/mesa/mesa_git.bb:PV = "10.5.4+git${SRCPV}"
>>> ./meta/recipes-graphics/fstests/fstests_git.bb:PV = "0.1+git${SRCPV}"
>>> ./meta/recipes-graphics/mx/mx-1.0_1.4.7.bb:PV = "1.4.7+git${SRCPV}"
>>> ./meta/recipes-graphics/drm/libdrm_git.bb:PV = "2.4.40+git${SRCPV}"
>>> ./meta/recipes-graphics/xorg-lib/libxcb_git.bb:PV =
>>> "1.1.90.1+gitr${SRCPV}"
>>> ./meta/recipes-graphics/xorg-lib/libxext_git.bb:PV =
>>> "1.0.99.1+gitr${SRCPV}"
>>> ./meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:PV =
>>> "0.0+git${SRCPV}"
>>> ./meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb:PV =
>>> "1.3.2+git${SRCPV}"
>>> ./meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb:PV =
>>> "1.3.0+git${SRCPV}"
>>> ./meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb:PV =
>>> "0.15.2+git${SRCPV}"
>>> ./meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:PV =
>>> "0.1.1+gitr${SRCPV}"
>>> ./meta/recipes-graphics/libepoxy/libepoxy_git.bb:PV =
>>> "1.2+git${SRCPV}"
>>> ./meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb:PV =
>>> "0.1+git${SRCPV}"
>>> ./meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb:PV =
>>> "1.1+git${SRCPV}" ./meta/recipes-devtools/qemu/qemu_git.bb:PV =
>>> "1.3.0+git${SRCPV}"
>>> ./meta/recipes-devtools/swabber/swabber-native_git.bb:PV =
>>> "0.0+git${SRCPV}" ./meta/recipes-devtools/remake/remake_git.bb:PV =
>>> "3.82+dbg-0.9+git${SRCPV}"
>>> ./meta/recipes-devtools/mtd/mtd-utils_git.bb:PV = "1.5.1+git${SRCPV}"
>>> ./meta/recipes-devtools/opkg-utils/opkg-utils_git.bb:PV =
>>> "0.1.8+git${SRCPV}"
>>> ./meta/recipes-devtools/bootchart2/bootchart2_git.bb:PV =
>>> "0.14.6+git${SRCPV}"
>>> ./meta/recipes-devtools/mkelfimage/mkelfimage_git.bb:PV =
>>> "4.0+git${SRCPV}" ./meta/recipes-devtools/mmc/mmc-utils_git.bb:PV =
>>> "0.1" ./meta/recipes-devtools/pseudo/pseudo_git.bb:PV =
>>> "1.6.5+git${SRCPV}" ./meta/recipes-devtools/prelink/prelink_git.bb:PV =
>>> "1.0+git${SRCPV}" ./meta/recipes-devtools/pkgconfig/pkgconfig.inc:PV =
>>> "0.28+git${SRCPV}"
>>> ./meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb:PV =
>>> "4.0.1+git${SRCPV}"
>>> ./meta/recipes-devtools/gnu-config/gnu-config_git.bb:PV =
>>> "1.0+git${SRCPV}" ./meta/recipes-devtools/tcf-agent/tcf-agent_git.bb:PV
>>> = "0.4.0+git${SRCPV}" ./meta/recipes-devtools/fdisk/gptfdisk_git.bb:PV
>>> = "0.8.10+git${SRCPV}" ./meta/recipes-multimedia/x264/x264_git.bb:PV =
>>> "r2491+git${SRCPV}"
>>> ./meta/recipes-multimedia/libav/libpostproc_git.bb:PV =
>>> "52.3.0+git${SRCPV}"
>
> Your point being?
lots of recipes under oe-core is using this style { PV=version+git}
-Roy
>
>
>>
>>
>>
>>>>>
>>>>> -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=f47e8465efa4e1cd948b9caae93ac401b4355df
> 8
>>>>>
>>>>>
> \ +
>>>>> git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;n
> ame
>>
>>>>>
> =Csocket
>>>>> \ " +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
>>>>>
>>
>> Why are you using 2 different notations for SRCREV?
>>
>>
>>
>>> there are two different git repo
>
> That's not a reason to use 2 different notations. Either put both in SRC_URI
> or use two SRCREV_foo statements.
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFVnO/FMkyGM64RGpERAr4DAJ96PYxPoMF3JR3Vc4QpMP2l9FhuAACfYPao
> pdHU9MAwNQDfvcegqR7tRTY=
> =GSXq
> -----END PGP SIGNATURE-----
>
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-08 9:39 ` Koen Kooi
2015-07-09 1:27 ` Rongqing Li
@ 2015-07-09 2:35 ` Rongqing Li
2015-07-11 23:38 ` Khem Raj
1 sibling, 1 reply; 10+ messages in thread
From: Rongqing Li @ 2015-07-09 2:35 UTC (permalink / raw
To: openembedded-devel
On 2015年07月08日 17:39, Koen Kooi wrote:
> That's not a reason to use 2 different notations. Either put both in SRC_URI
> or use two SRCREV_foo statements.
it is better if you can revised this patch, and submit.
-R
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-09 1:27 ` Rongqing Li
@ 2015-07-10 14:21 ` Koen Kooi
2015-07-11 23:34 ` Khem Raj
1 sibling, 0 replies; 10+ messages in thread
From: Koen Kooi @ 2015-07-10 14:21 UTC (permalink / raw
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Rongqing Li schreef op 09-07-15 om 03:27:
>
>
> On 2015年07月08日 17:39, Koen Kooi wrote: Rongqing Li schreef op 07-07-15 om
> 09:31:
>>>>
>>>>
>>>> On 2015年07月07日 15:24, Koen Kooi wrote: rongqing.li@windriver.com
>>>> schreef op 07-07-15 om 03:55:
>>>>>>> From: Roy Li <rongqing.li@windriver.com>
>>>>>>>
>>>>>>> Remove backport patch Add CSocket submodule Add the
>>>>>>> dependency on icu
>>>>>>>
>>>>>>> Signed-off-by: Roy Li <rongqing.li@windriver.com> ---
>>>>
>>>>>>> diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
>>>>>>> b/meta-networking/recipes-irc/znc/znc_git.bb index
>>>>>>> 2e35e4d..f5bed08 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 icu"
>>>>>>>
>>>>>>> -PV = "1.0+git" +PV = "1.6.0+git"
>>>>
>>>> If it's the 1.6 release, just call it '1.6.0'
>>>>
>>>>
>>>>> grep oe-core
>>>>
>>>>> ./meta/recipes-graphics/mesa/mesa_git.bb:PV =
>>>>> "10.5.4+git${SRCPV}"
>>>>> ./meta/recipes-graphics/fstests/fstests_git.bb:PV =
>>>>> "0.1+git${SRCPV}" ./meta/recipes-graphics/mx/mx-1.0_1.4.7.bb:PV =
>>>>> "1.4.7+git${SRCPV}" ./meta/recipes-graphics/drm/libdrm_git.bb:PV
>>>>> = "2.4.40+git${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-lib/libxcb_git.bb:PV =
>>>>> "1.1.90.1+gitr${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-lib/libxext_git.bb:PV =
>>>>> "1.0.99.1+gitr${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:PV =
>>>>> "0.0+git${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb:PV
>>>>> = "1.3.2+git${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb:PV =
>>>>> "1.3.0+git${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb:PV
>>>>> = "0.15.2+git${SRCPV}"
>>>>> ./meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:PV
>>>>> = "0.1.1+gitr${SRCPV}"
>>>>> ./meta/recipes-graphics/libepoxy/libepoxy_git.bb:PV =
>>>>> "1.2+git${SRCPV}"
>>>>> ./meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb:PV =
>>>>> "0.1+git${SRCPV}"
>>>>> ./meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb:PV =
>>>>> "1.1+git${SRCPV}" ./meta/recipes-devtools/qemu/qemu_git.bb:PV =
>>>>> "1.3.0+git${SRCPV}"
>>>>> ./meta/recipes-devtools/swabber/swabber-native_git.bb:PV =
>>>>> "0.0+git${SRCPV}" ./meta/recipes-devtools/remake/remake_git.bb:PV
>>>>> = "3.82+dbg-0.9+git${SRCPV}"
>>>>> ./meta/recipes-devtools/mtd/mtd-utils_git.bb:PV =
>>>>> "1.5.1+git${SRCPV}"
>>>>> ./meta/recipes-devtools/opkg-utils/opkg-utils_git.bb:PV =
>>>>> "0.1.8+git${SRCPV}"
>>>>> ./meta/recipes-devtools/bootchart2/bootchart2_git.bb:PV =
>>>>> "0.14.6+git${SRCPV}"
>>>>> ./meta/recipes-devtools/mkelfimage/mkelfimage_git.bb:PV =
>>>>> "4.0+git${SRCPV}" ./meta/recipes-devtools/mmc/mmc-utils_git.bb:PV
>>>>> = "0.1" ./meta/recipes-devtools/pseudo/pseudo_git.bb:PV =
>>>>> "1.6.5+git${SRCPV}"
>>>>> ./meta/recipes-devtools/prelink/prelink_git.bb:PV =
>>>>> "1.0+git${SRCPV}"
>>>>> ./meta/recipes-devtools/pkgconfig/pkgconfig.inc:PV =
>>>>> "0.28+git${SRCPV}"
>>>>> ./meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb:PV =
>>>>> "4.0.1+git${SRCPV}"
>>>>> ./meta/recipes-devtools/gnu-config/gnu-config_git.bb:PV =
>>>>> "1.0+git${SRCPV}"
>>>>> ./meta/recipes-devtools/tcf-agent/tcf-agent_git.bb:PV =
>>>>> "0.4.0+git${SRCPV}"
>>>>> ./meta/recipes-devtools/fdisk/gptfdisk_git.bb:PV =
>>>>> "0.8.10+git${SRCPV}"
>>>>> ./meta/recipes-multimedia/x264/x264_git.bb:PV =
>>>>> "r2491+git${SRCPV}"
>>>>> ./meta/recipes-multimedia/libav/libpostproc_git.bb:PV =
>>>>> "52.3.0+git${SRCPV}"
>
> Your point being?
>
>> lots of recipes under oe-core is using this style { PV=version+git}
Like lemmings of a cliff...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFVn9T9MkyGM64RGpERAqViAJ9+8Ad3sQQE1bvAvPfYbnxXvLZgIgCbBR1P
y8Z1GLTedpVErGs9YPLUkg4=
=0qW2
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-09 1:27 ` Rongqing Li
2015-07-10 14:21 ` Koen Kooi
@ 2015-07-11 23:34 ` Khem Raj
1 sibling, 0 replies; 10+ messages in thread
From: Khem Raj @ 2015-07-11 23:34 UTC (permalink / raw
To: openembeded-devel
On Wed, Jul 8, 2015 at 6:27 PM, Rongqing Li <rongqing.li@windriver.com> wrote:
> lots of recipes under oe-core is using this style { PV=version+git}
There is a pattern for using PV+git and that is when you are not at a
release point but somewhere between two releases
so it facilitates package updates when next release comes out. Its
better to not use it if you are on point release.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
2015-07-09 2:35 ` Rongqing Li
@ 2015-07-11 23:38 ` Khem Raj
0 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2015-07-11 23:38 UTC (permalink / raw
To: openembeded-devel
On Wed, Jul 8, 2015 at 7:35 PM, Rongqing Li <rongqing.li@windriver.com> wrote:
> it is better if you can revised this patch, and submit.
generally, when a patch is proposed then its reviewed if you are lucky
if you get folks commenting on it and giving honest feedback
and its better to address that as an owner of the patch and send a
revised version. Reluctance in addressing comments from reviewers
might end up in patch being discarded
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-07-11 23:38 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-07 1:55 [PATCH][meta-networking][v2] znc: upgrade to 1.6.0 rongqing.li
2015-07-07 7:24 ` Koen Kooi
2015-07-07 7:31 ` Rongqing Li
2015-07-08 9:39 ` Koen Kooi
2015-07-09 1:27 ` Rongqing Li
2015-07-10 14:21 ` Koen Kooi
2015-07-11 23:34 ` Khem Raj
2015-07-09 2:35 ` Rongqing Li
2015-07-11 23:38 ` Khem Raj
2015-07-08 15:37 ` akuster808
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.