Re: [oe] [meta-gnome][PATCHv2] freerdp3: add recipe

2024-03-21 Thread Martin Jansa
The packageconfig for x11 doesn't seem to be enough to disable x11
when it's not in DISTRO_FEATURES.

CMake Error at 
TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/freerdp3/3.4.0/recipe-sysroot-native/usr/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230
(message):
  Could NOT find X11 (missing: X11_X11_INCLUDE_PATH X11_X11_LIB)

Call Stack (most recent call first):
  
TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/freerdp3/3.4.0/recipe-sysroot-native/usr/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:600
(_FPHSA_FAILURE_MESSAGE)
  
TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/freerdp3/3.4.0/recipe-sysroot-native/usr/share/cmake-3.28/Modules/FindX11.cmake:665
(find_package_handle_standard_args)
  server/shadow/X11/CMakeLists.txt:1 (find_package)

On Wed, Mar 20, 2024 at 7:10 PM Markus Volk  wrote:
>
> On Wed, Mar 20 2024 at 06:49:43 PM +01:00:00, Markus Volk  
> wrote:
>
> their dependencies are which are not yet in master branch of the core
>
>
> I tried to mention in the commit message, if an update requires a change to 
> oe-core.
>
> For now that would be
> gnome-settings-daemon, which requires gsettings-desktop-schemas 46.0
> gnome-calculator, which requires libsoup with vala support
> gnome-calendar, which requires libadwaita-1.5.0
>
> additionally to complete the gnome-46 port there would be
> nautilus, which will require glib-2.80
> gnome-console and gnome-terminal, which will require vte 0.76
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#109511): 
https://lists.openembedded.org/g/openembedded-devel/message/109511
Mute This Topic: https://lists.openembedded.org/mt/105020833/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [meta-python][PATCH] python3-dbus: re-add recipe with latest patches and add ptest

2024-03-21 Thread Alexander Kanavin
The patches are taken from Fedora, and so aren't backports. Should be
marked Inactive-Upstream rather.

I would only add it back if it has real consumers or use cases that
can't be fulfilled by maintained alternatives. Otherwise, anyone can
carry it privately,

Alex

On Thu, 21 Mar 2024 at 23:18, Derek Straka  wrote:
>
> The python3-dbus package was removed in (dac933e).  While the upstream
> project isn't active, other distributions (e.g. Fedora, Debian, etc)
> continue to offer the package and apply patches to resolve reported issues.
>
> While other packages offer similar functionality (e.g. dasbus), they are not
> drop in replacements and the general dbus functionality works out of the box.
> The python package has accomplished it's goal of providing useful 
> functionality,
> and the proposal is to continue to have it available in meta-python for use.
>
> Signed-off-by: Derek Straka 
> ---
>  .../ptest-packagelists-meta-python.inc|   1 +
>  .../packagegroups/packagegroup-meta-python.bb |   1 +
>  ...ttribute-conforming-to-introspect.dt.patch |   0
>  .../0002-Support-asynchronous-calls-58.patch  | 204 
>  ...mation-between-D-Bus-errors-and-exce.patch | 493 ++
>  .../python/python3-pydbus/run-ptest   |  15 +
>  .../python/python3-pydbus_0.6.0.bb|  26 +
>  7 files changed, 740 insertions(+)
>  create mode 100644 
> meta-python/recipes-devtools/python/python3-pydbus/0001-make-direction-attribute-conforming-to-introspect.dt.patch
>  create mode 100644 
> meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
>  create mode 100644 
> meta-python/recipes-devtools/python/python3-pydbus/0003-Support-transformation-between-D-Bus-errors-and-exce.patch
>  create mode 100644 
> meta-python/recipes-devtools/python/python3-pydbus/run-ptest
>  create mode 100644 
> meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
>
> diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc 
> b/meta-python/conf/include/ptest-packagelists-meta-python.inc
> index 447e0b938..ec26f768e 100644
> --- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
> +++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
> @@ -53,6 +53,7 @@ PTESTS_FAST_META_PYTHON = "\
>  python3-pytest-mock \
>  python3-pytoml \
>  python3-pyyaml-include \
> +python3-pydbus \
>  python3-rapidjson \
>  python3-requests-file \
>  python3-requests-toolbelt \
> diff --git 
> a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb 
> b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> index eb5a26463..e0446da28 100644
> --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
> @@ -311,6 +311,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
>  python3-pycodestyle \
>  python3-pyconnman \
>  python3-pycurl \
> +python3-pydbus \
>  python3-pydicti \
>  python3-pyephem \
>  python3-pyexpect \
> diff --git 
> a/meta-python/recipes-devtools/python/python3-pydbus/0001-make-direction-attribute-conforming-to-introspect.dt.patch
>  
> b/meta-python/recipes-devtools/python/python3-pydbus/0001-make-direction-attribute-conforming-to-introspect.dt.patch
> new file mode 100644
> index 0..e69de29bb
> diff --git 
> a/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
>  
> b/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
> new file mode 100644
> index 0..44600a8e6
> --- /dev/null
> +++ 
> b/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
> @@ -0,0 +1,204 @@
> +From 31d6dd7893a5e1bb9eb14bfcee861a5b62f64960 Mon Sep 17 00:00:00 2001
> +From: Vendula Poncova 
> +Date: Thu, 27 Jul 2017 18:41:29 +0200
> +Subject: [PATCH 2/3] Support asynchronous calls (#58)
> +
> +Added support for asynchronous calls of methods. A method is called
> +synchronously unless its callback parameter is specified. A callback
> +is a function f(*args, returned=None, error=None), where args is
> +callback_args specified in the method call, returned is a return
> +value of the method and error is an exception raised by the method.
> +
> +Example of an asynchronous call:
> +
> +def func(x, y, returned=None, error=None):
> +  pass
> +
> +proxy.Method(a, b, callback=func, callback_args=(x, y))
> +
> +Upstream-Status: Backport 
> [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/]
> +
> +Signed-off-by: Derek Straka 
> +---
> + doc/tutorial.rst   | 11 -
> + pydbus/proxy_method.py | 44 ++-
> + tests/publish_async.py | 63 
> ++
> + tests/run.sh   |  1 +
> + 4 files changed, 112 insertions(+), 7 deletions(-)
> + create mode 100644 tests/publish_async.py
> +
> +diff --git a

Re: [oe] [meta-oe][PATCH 1/2] redis: restore Upstream-Status -> LICENSE change for 7.4 and later !

2024-03-21 Thread Tim Orling
On Thu, Mar 21, 2024 at 5:55 PM Randy MacLeod via lists.openembedded.org
 wrote:

> Would the new license scheme described here:
>
> https://redis.com/blog/redis-adopts-dual-source-available-licensing/
>
> prevent us from accepting the 7.4 release? I suspect it should but I need
> more time to
> read the new terms.
>

Fedora has a rather long thread about this already:
https://lists.fedoraproject.org/archives/list/de...@lists.fedoraproject.org/thread/XVFFKU2NYB2Q3BQUYNANSDNE4VCJQ6KF/


>
> ../Randy
>
>
> On 2024-01-30 1:23 p.m., Martin Jansa via lists.openembedded.org wrote:
>
> On Tue, Jan 30, 2024 at 6:28 PM Khem Raj  wrote:
>
>> On 1/30/24 2:34 AM, Martin Jansa wrote:
>> > * accidentally dropped in:
>> >
>> https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
>> > ---
>> >   .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
>> >   1 file changed, 2 insertions(+)
>> >
>> > diff --git
>> a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > index b562e2522c..48a8bb5b4b 100644
>> > ---
>> a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > +++
>> b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>> >   Signed-off-by: Yi Fan Yu 
>> >
>> >   ---
>> > +Upstream-Status: Pending
>>
>> I think it might be better to move it above the scissor to avoid getting
>> lost in next devtool based upgrade.
>>
>
> As you wish, resent all 3 as v2 with it moved.
>
> FWIW: in
> https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc
> I've moved all Upstream-Statuses in LGE layers bellow, because too often
> developers applied them with Upstream-Status into the component source git
> repo where it doesn't belong and then it was already too late to remove it
> there (while with Upstream-Status lost in rebase/devtool there is still
> time to get warning from QA check and once this check is enabled by default
> in all the builds it will prevent people overlooking this by accident).
>
>
> --
> # Randy MacLeod
> # Wind River Linux
>
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#109509): 
https://lists.openembedded.org/g/openembedded-devel/message/109509
Mute This Topic: https://lists.openembedded.org/mt/105077570/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [meta-oe][PATCH 1/2] redis: restore Upstream-Status -> LICENSE change for 7.4 and later !

2024-03-21 Thread Khem Raj
On Thu, Mar 21, 2024 at 5:55 PM Randy MacLeod via
lists.openembedded.org
 wrote:
>
> Would the new license scheme described here:
>
> https://redis.com/blog/redis-adopts-dual-source-available-licensing/
>
> prevent us from accepting the 7.4 release? I suspect it should but I need 
> more time to
> read the new terms.
>

Good point. I saw the announcement today as well. I think we need to
certainly change to
use new license, if we can distribute it or not, perhaps it needs some
closer look.

> ../Randy
>
>
> On 2024-01-30 1:23 p.m., Martin Jansa via lists.openembedded.org wrote:
>
> On Tue, Jan 30, 2024 at 6:28 PM Khem Raj  wrote:
>>
>> On 1/30/24 2:34 AM, Martin Jansa wrote:
>> > * accidentally dropped in:
>> >
>> > https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
>> > ---
>> >   .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
>> >   1 file changed, 2 insertions(+)
>> >
>> > diff --git 
>> > a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> >  
>> > b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > index b562e2522c..48a8bb5b4b 100644
>> > --- 
>> > a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > +++ 
>> > b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>> >   Signed-off-by: Yi Fan Yu 
>> >
>> >   ---
>> > +Upstream-Status: Pending
>>
>> I think it might be better to move it above the scissor to avoid getting
>> lost in next devtool based upgrade.
>
>
> As you wish, resent all 3 as v2 with it moved.
>
> FWIW: in 
> https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc
>  I've moved all Upstream-Statuses in LGE layers bellow, because too often 
> developers applied them with Upstream-Status into the component source git 
> repo where it doesn't belong and then it was already too late to remove it 
> there (while with Upstream-Status lost in rebase/devtool there is still time 
> to get warning from QA check and once this check is enabled by default in all 
> the builds it will prevent people overlooking this by accident).
>
>
>
> --
> # Randy MacLeod
> # Wind River Linux
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#109508): 
https://lists.openembedded.org/g/openembedded-devel/message/109508
Mute This Topic: https://lists.openembedded.org/mt/105077570/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [meta-oe][PATCH 1/2] redis: restore Upstream-Status -> LICENSE change for 7.4 and later !

2024-03-21 Thread Randy MacLeod via lists.openembedded.org

Would the new license scheme described here:

https://redis.com/blog/redis-adopts-dual-source-available-licensing/

prevent us from accepting the 7.4 release? I suspect it should but I 
need more time to

read the new terms.

../Randy


On 2024-01-30 1:23 p.m., Martin Jansa via lists.openembedded.org wrote:

On Tue, Jan 30, 2024 at 6:28 PM Khem Raj  wrote:

On 1/30/24 2:34 AM, Martin Jansa wrote:
> * accidentally dropped in:
>

https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
> ---
>  .../lua-update-Makefile-to-use-environment-build-setting.patch
| 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git

a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch

b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> index b562e2522c..48a8bb5b4b 100644
> ---

a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> +++

b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>   Signed-off-by: Yi Fan Yu 
>
>   ---
> +Upstream-Status: Pending

I think it might be better to move it above the scissor to avoid
getting
lost in next devtool based upgrade.


As you wish, resent all 3 as v2 with it moved.

FWIW: in 
https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc 
I've moved all Upstream-Statuses in LGE layers bellow, because too 
often developers applied them with Upstream-Status into the component 
source git repo where it doesn't belong and then it was already too 
late to remove it there (while with Upstream-Status lost in 
rebase/devtool there is still time to get warning from QA check and 
once this check is enabled by default in all the builds it will 
prevent people overlooking this by accident).






--
# Randy MacLeod
# Wind River Linux

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#109507): 
https://lists.openembedded.org/g/openembedded-devel/message/109507
Mute This Topic: https://lists.openembedded.org/mt/105077570/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH] python3-dbus: re-add recipe with latest patches and add ptest

2024-03-21 Thread Derek Straka
The python3-dbus package was removed in (dac933e).  While the upstream
project isn't active, other distributions (e.g. Fedora, Debian, etc)
continue to offer the package and apply patches to resolve reported issues.

While other packages offer similar functionality (e.g. dasbus), they are not
drop in replacements and the general dbus functionality works out of the box.
The python package has accomplished it's goal of providing useful functionality,
and the proposal is to continue to have it available in meta-python for use.

Signed-off-by: Derek Straka 
---
 .../ptest-packagelists-meta-python.inc|   1 +
 .../packagegroups/packagegroup-meta-python.bb |   1 +
 ...ttribute-conforming-to-introspect.dt.patch |   0
 .../0002-Support-asynchronous-calls-58.patch  | 204 
 ...mation-between-D-Bus-errors-and-exce.patch | 493 ++
 .../python/python3-pydbus/run-ptest   |  15 +
 .../python/python3-pydbus_0.6.0.bb|  26 +
 7 files changed, 740 insertions(+)
 create mode 100644 
meta-python/recipes-devtools/python/python3-pydbus/0001-make-direction-attribute-conforming-to-introspect.dt.patch
 create mode 100644 
meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
 create mode 100644 
meta-python/recipes-devtools/python/python3-pydbus/0003-Support-transformation-between-D-Bus-errors-and-exce.patch
 create mode 100644 meta-python/recipes-devtools/python/python3-pydbus/run-ptest
 create mode 100644 meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb

diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc 
b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index 447e0b938..ec26f768e 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -53,6 +53,7 @@ PTESTS_FAST_META_PYTHON = "\
 python3-pytest-mock \
 python3-pytoml \
 python3-pyyaml-include \
+python3-pydbus \
 python3-rapidjson \
 python3-requests-file \
 python3-requests-toolbelt \
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb 
b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index eb5a26463..e0446da28 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -311,6 +311,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
 python3-pycodestyle \
 python3-pyconnman \
 python3-pycurl \
+python3-pydbus \
 python3-pydicti \
 python3-pyephem \
 python3-pyexpect \
diff --git 
a/meta-python/recipes-devtools/python/python3-pydbus/0001-make-direction-attribute-conforming-to-introspect.dt.patch
 
b/meta-python/recipes-devtools/python/python3-pydbus/0001-make-direction-attribute-conforming-to-introspect.dt.patch
new file mode 100644
index 0..e69de29bb
diff --git 
a/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
 
b/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
new file mode 100644
index 0..44600a8e6
--- /dev/null
+++ 
b/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-asynchronous-calls-58.patch
@@ -0,0 +1,204 @@
+From 31d6dd7893a5e1bb9eb14bfcee861a5b62f64960 Mon Sep 17 00:00:00 2001
+From: Vendula Poncova 
+Date: Thu, 27 Jul 2017 18:41:29 +0200
+Subject: [PATCH 2/3] Support asynchronous calls (#58)
+
+Added support for asynchronous calls of methods. A method is called
+synchronously unless its callback parameter is specified. A callback
+is a function f(*args, returned=None, error=None), where args is
+callback_args specified in the method call, returned is a return
+value of the method and error is an exception raised by the method.
+
+Example of an asynchronous call:
+
+def func(x, y, returned=None, error=None):
+  pass
+
+proxy.Method(a, b, callback=func, callback_args=(x, y))
+
+Upstream-Status: Backport 
[https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/]
+
+Signed-off-by: Derek Straka 
+---
+ doc/tutorial.rst   | 11 -
+ pydbus/proxy_method.py | 44 ++-
+ tests/publish_async.py | 63 ++
+ tests/run.sh   |  1 +
+ 4 files changed, 112 insertions(+), 7 deletions(-)
+ create mode 100644 tests/publish_async.py
+
+diff --git a/doc/tutorial.rst b/doc/tutorial.rst
+index 7474de3..b8479cf 100644
+--- a/doc/tutorial.rst
 b/doc/tutorial.rst
+@@ -84,7 +84,8 @@ All objects have methods, properties and signals.
+ Setting up an event loop
+ 
+ 
+-To handle signals emitted by exported objects, or to export your own objects, 
you need to setup an event loop.
++To handle signals emitted by exported objects, to asynchronously call methods
++or to export your own objects, you need to setup an event loop.
+ 
+ The only main loop supported

Re: [oe] [meta-oe][PATCH v4 7/7] lvgl: lv-conf.inc: generalize sed instructions

2024-03-21 Thread Peter Kjellerstedt
> -Original Message-
> From: Marek Vasut 
> Sent: den 18 mars 2024 23:00
> To: Christophe Chapuis 
> Cc: Peter Kjellerstedt ; openembedded-
> de...@lists.openembedded.org; Khem Raj ; Fabio Estevam
> 
> Subject: Re: [oe] [meta-oe][PATCH v4 7/7] lvgl: lv-conf.inc: generalize
> sed instructions
> 
> On 3/18/24 4:42 PM, Christophe Chapuis wrote:
> > I avoided \s because it's not well known, and I would also prefer using
> > [[:space:]] as it is POSIX compliant.

See chapter "5.6 regular expression extensions" in the sed info page for \s 
and a number of other similar sequences (for anyone used to Perl's regular 
expressions, \s is the normal way to match whitespace). And true, this is 
not POSIX, but neither is the -i option that is also used by the same 
command.

> >
> > I can propose a patch for this, taking Peter's remarks into account.

Thank you.

> 
> Yes please, already reviewed too.
> 
> btw please stop top-posting .

//Peter


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#109505): 
https://lists.openembedded.org/g/openembedded-devel/message/109505
Mute This Topic: https://lists.openembedded.org/mt/104964304/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe][meta-oe][kirkstone][PATCH 1/1] dnsmasq: Upgrade 2.87 -> 2.90

2024-03-21 Thread Soumya via lists.openembedded.org
From: Soumya Sambu 

Fixes CVE-2023-50387 and CVE-2023-50868

Remove backported CVE patch.
Remove patch for lua as hardcoding lua version was removed.

Changelog:
===
https://thekelleys.org.uk/dnsmasq/CHANGELOG

Signed-off-by: Soumya Sambu 
---
 .../recipes-support/dnsmasq/dnsmasq.inc   |  1 -
 .../recipes-support/dnsmasq/dnsmasq/lua.patch | 31 
 .../recipes-support/dnsmasq/dnsmasq_2.87.bb   |  7 ---
 .../recipes-support/dnsmasq/dnsmasq_2.90.bb   |  3 ++
 .../dnsmasq/files/CVE-2023-28450.patch| 48 ---
 5 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
 delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb
 create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
 delete mode 100644 
meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc 
b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 9e0f529ec..a8ff21a12 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -14,7 +14,6 @@ SRC_URI = 
"http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
file://dnsmasq-resolvconf.service \
file://dnsmasq-noresolvconf.service \
file://dnsmasq-resolved.conf \
-   file://CVE-2023-28450.patch \
 "
 
 inherit pkgconfig update-rc.d systemd
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch 
b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
deleted file mode 100644
index be2bb42fc..0
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From be1b3d2d0f1608cba5efee73d6aac5ad0709041b Mon Sep 17 00:00:00 2001
-From: Joe MacDonald 
-Date: Tue, 9 Sep 2014 10:24:58 -0400
-Subject: [PATCH] Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Christopher Larson 
-Signed-off-by: Paul Eggleton 
-

- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 73ea23e..ed3eeb9 100644
 a/Makefile
-+++ b/Makefile
-@@ -60,8 +60,8 @@ idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper 
HAVE_LIBIDN2 $(PKG_CONFI
- idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 
$(PKG_CONFIG) --libs libidn2`
- ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK 
$(PKG_CONFIG) --cflags libnetfilter_conntrack`
- ct_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK 
$(PKG_CONFIG) --libs libnetfilter_conntrack`
--lua_cflags =`echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT 
$(PKG_CONFIG) --cflags lua5.2` 
--lua_libs =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT 
$(PKG_CONFIG) --libs lua5.2` 
-+lua_cflags =`echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT 
$(PKG_CONFIG) --cflags lua`
-+lua_libs =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT 
$(PKG_CONFIG) --libs lua`
- nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC 
$(PKG_CONFIG) --cflags 'nettle hogweed' \
- HAVE_CRYPTOHASH 
$(PKG_CONFIG) --cflags nettle \
- HAVE_NETTLEHASH 
$(PKG_CONFIG) --cflags nettle`
-
--- 
-2.9.5
-
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb 
b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb
deleted file mode 100644
index 793b61d71..0
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require dnsmasq.inc
-
-SRC_URI[dnsmasq-2.87.sha256sum] = 
"ae39bffde9c37e4d64849b528afeb060be6bad6d1044a3bd94a49fce41357284"
-SRC_URI += "\
-file://lua.patch \
-"
-
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb 
b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
new file mode 100644
index 0..6e4c33110
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
@@ -0,0 +1,3 @@
+require dnsmasq.inc
+
+SRC_URI[dnsmasq-2.90.sha256sum] = 
"8fb542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b"
diff --git a/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch 
b/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch
deleted file mode 100644
index 129c9043e..0
--- a/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001
-From: Simon Kelley 
-Date: Tue, 7 Mar 2023 22:07:46 +
-Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232.
-
-http://www.dnsflagday.net/2020/ refers.
-
-Thanks to Xiang Li for the prompt.
-
-CVE: CVE-2023-28450
-Upstream-Status: Backport 
[https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f3

[oe] [meta-oe][PATCH] rocksdb: upgrade 7.9.2 -> 9.0.0

2024-03-21 Thread Yi Zhao
ChangeLog:
https://github.com/facebook/rocksdb/releases/tag/v9.0.0

* Refresh patches.
* Drop backport patch.

Signed-off-by: Yi Zhao 
---
 ...-missing-includes-cstdint-and-cstdio.patch | 70 ---
 ...1-cmake-Add-check-for-atomic-support.patch | 13 +++-
 ...-with-new-atomic-builtin-equivalents.patch | 11 ++-
 ...2-cmake-Use-exported-target-for-bz2.patch} | 13 ++--
 ...Do-not-add-msse4.2-mpclmul-on-clang.patch} |  8 +--
 ...04-Implement-support-for-musl-ppc64.patch} | 20 --
 ...mer-implementation-for-mips-platform.patch | 32 +
 ... => 0006-Implement-timer-for-arm-v6.patch} | 18 -
 meta-oe/recipes-dbs/rocksdb/files/mips.patch  | 20 --
 .../{rocksdb_7.9.2.bb => rocksdb_9.0.0.bb}| 19 +++--
 10 files changed, 103 insertions(+), 121 deletions(-)
 delete mode 100644 
meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
 rename 
meta-oe/recipes-dbs/rocksdb/files/{0001-cmake-Use-exported-target-for-bz2.patch 
=> 0002-cmake-Use-exported-target-for-bz2.patch} (74%)
 rename 
meta-oe/recipes-dbs/rocksdb/files/{0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch
 => 0003-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch} (87%)
 rename meta-oe/recipes-dbs/rocksdb/files/{ppc64.patch => 
0004-Implement-support-for-musl-ppc64.patch} (55%)
 create mode 100644 
meta-oe/recipes-dbs/rocksdb/files/0005-Implement-timer-implementation-for-mips-platform.patch
 rename meta-oe/recipes-dbs/rocksdb/files/{arm.patch => 
0006-Implement-timer-for-arm-v6.patch} (64%)
 delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/mips.patch
 rename meta-oe/recipes-dbs/rocksdb/{rocksdb_7.9.2.bb => rocksdb_9.0.0.bb} (82%)

diff --git 
a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
 
b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
deleted file mode 100644
index a177ce28b..0
--- 
a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Tue, 24 Jan 2023 21:40:43 -0800
-Subject: [PATCH] Add missing includes  and 
-
-This is needed with GCC 13 and newer [1]
-
-[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
-
-Upstream-Status: Backport 
[https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1]
-Signed-off-by: Khem Raj 

- .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h   | 1 +
- storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h   | 1 +
- .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h| 1 +
- storage/rocksdb/rocksdb/util/slice.cc| 1 +
- storage/rocksdb/rocksdb/util/string_util.h   | 1 +
- tpool/aio_linux.cc   | 1 +
- 6 files changed, 6 insertions(+)
-
 a/db/compaction/compaction_iteration_stats.h
-+++ b/db/compaction/compaction_iteration_stats.h
-@@ -7,6 +7,7 @@
- 
- #include 
- 
-+#include 
- #include "rocksdb/rocksdb_namespace.h"
- 
- namespace ROCKSDB_NAMESPACE {
 a/include/rocksdb/utilities/checkpoint.h
-+++ b/include/rocksdb/utilities/checkpoint.h
-@@ -8,6 +8,7 @@
- #pragma once
- #ifndef ROCKSDB_LITE
- 
-+#include 
- #include 
- #include 
- 
 a/table/block_based/data_block_hash_index.h
-+++ b/table/block_based/data_block_hash_index.h
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include 
- #include 
- #include 
- 
 a/util/slice.cc
-+++ b/util/slice.cc
-@@ -12,6 +12,7 @@
- #include 
- 
- #include 
-+#include 
- 
- #include "rocksdb/convenience.h"
- #include "rocksdb/slice_transform.h"
 a/util/string_util.h
-+++ b/util/string_util.h
-@@ -6,6 +6,7 @@
- 
- #pragma once
- 
-+#include 
- #include 
- #include 
- #include 
diff --git 
a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
 
b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
index 0fe9c1276..ba6a2d4fb 100644
--- 
a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
+++ 
b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch
@@ -1,4 +1,4 @@
-From cf168ae0b7bceab8432d096719b331f18428fe39 Mon Sep 17 00:00:00 2001
+From 034a9c4ce2ae61cfcffa977f1eb8e6f68947f480 Mon Sep 17 00:00:00 2001
 From: Khem Raj 
 Date: Wed, 18 Mar 2020 15:10:37 -0700
 Subject: [PATCH] cmake: Add check for atomic support
@@ -18,6 +18,7 @@ Fixes
 | 
/mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld:
 librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_add_8'
 
 Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/6555]
+
 Signed-off-by: Khem Raj 
 ---
  CMakeLists.txt  |  5 +++
@@ -25,9 +26,11 @@ Signed-off-by: Khem Raj 
  2 files changed, 74 insertions(+)
  create mode 100644 cmake/modules/CheckAtomic

[oe] [meta-networking][PATCH] openvpn: upgrade 2.6.9 -> 2.6.10

2024-03-21 Thread Yi Zhao
License-Update: Update copyright years to 2024

ChangeLog:
https://github.com/OpenVPN/openvpn/blob/v2.6.10/Changes.rst

Security fixes:

CVE-2024-27459: Windows: fix a possible stack overflow in the
interactive service component which might lead to a local privilege
escalation.

CVE-2024-24974: Windows: disallow access to the interactive service pipe
from remote computers.

CVE-2024-27903: Windows: disallow loading of plugins from untrusted
installation paths, which could be used to attack openvpn.exe via a
malicious plugin. Plugins can now only be loaded from the OpenVPN
install directory, the Windows system directory, and possibly from a
directory specified by HKLM\SOFTWARE\OpenVPN\plugin_dir.

CVE-2024-1305: Windows TAP driver: Fix potential integer overflow in
!TapSharedSendPacket.

Signed-off-by: Yi Zhao 
---
 .../openvpn/{openvpn_2.6.9.bb => openvpn_2.6.10.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/openvpn/{openvpn_2.6.9.bb => 
openvpn_2.6.10.bb} (95%)

diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.9.bb 
b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb
similarity index 95%
rename from meta-networking/recipes-support/openvpn/openvpn_2.6.9.bb
rename to meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb
index 3af6b30a7..f8de78ff7 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.6.9.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb
@@ -2,7 +2,7 @@ SUMMARY = "A full-featured SSL VPN solution via tun device."
 HOMEPAGE = "https://openvpn.net/";
 SECTION = "net"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4b34e946059f80dcfd811e8dd471b5ed"
+LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049"
 DEPENDS = "lzo lz4 openssl iproute2 libcap-ng 
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 inherit autotools systemd update-rc.d pkgconfig
@@ -14,7 +14,7 @@ SRC_URI = 
"http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
 
 UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads";
 
-SRC_URI[sha256sum] = 
"e08d147e15b4508dfcd1d6618a1f21f1495f9817a8dadc1eddf0532fa116d7e3"
+SRC_URI[sha256sum] = 
"1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b"
 
 CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix 
OpenVPN client, not openvpn"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#109502): 
https://lists.openembedded.org/g/openembedded-devel/message/109502
Mute This Topic: https://lists.openembedded.org/mt/105063563/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH] gperftools: 2.10 -> 2.15

2024-03-21 Thread Robert Yang via lists.openembedded.org
From: Robert Yang 

* Remove 0001-Support-Atomic-ops-on-clang.patch because of:
  commit 54605b8a5807fe893a4b9ff8def982a264cdc6c9
  Author: Aliaksey Kandratsenka 
  Date:   Wed Jun 21 10:39:18 2023 -0400

  amputate old atomic ops implementation

* Remove sgidef.patch because of:
  commit e78238d94d41764dc72edb37e3d6510255d3dcd4
  Author: Aliaksey Kandratsenka 
  Date:   Wed Jun 21 10:39:38 2023 -0400

  reworked heap leak checker for more portability

* Remove 0001-Define-off64_t-as-off_t-on-musl.patch because of:
  commit 8be84e4a5c28c33bfdb7da3ee0c92d9620cd552f
  Author: Aliaksey Kandratsenka 
  Date:   Fri Jul 21 14:18:12 2023 -0400

  drop old mmap hooks and introduce internal & simpler mmap_hook.h

* Rebased 0001-Support-Atomic-ops-on-clang.patch for 2.15

* Rebased ppc-musl.patch for 2.15

* Add 0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch to fix
  build error for 32bit machine.

Signed-off-by: Robert Yang 
---
 ...0001-Define-off64_t-as-off_t-on-musl.patch | 33 ---
 .../0001-Support-Atomic-ops-on-clang.patch| 31 --
 ...checkers-and-debug-allocator-on-musl.patch |  8 ++-
 ..._hook.cc-Fix-build-for-32bit-machine.patch | 59 +++
 .../gperftools/gperftools/ppc-musl.patch  | 38 +++-
 .../gperftools/gperftools/sgidef.patch| 23 
 ...{gperftools_2.10.bb => gperftools_2.15.bb} |  6 +-
 7 files changed, 74 insertions(+), 124 deletions(-)
 delete mode 100644 
meta-oe/recipes-support/gperftools/gperftools/0001-Define-off64_t-as-off_t-on-musl.patch
 delete mode 100644 
meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
 create mode 100644 
meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch
 delete mode 100644 meta-oe/recipes-support/gperftools/gperftools/sgidef.patch
 rename meta-oe/recipes-support/gperftools/{gperftools_2.10.bb => 
gperftools_2.15.bb} (91%)

diff --git 
a/meta-oe/recipes-support/gperftools/gperftools/0001-Define-off64_t-as-off_t-on-musl.patch
 
b/meta-oe/recipes-support/gperftools/gperftools/0001-Define-off64_t-as-off_t-on-musl.patch
deleted file mode 100644
index 2b782c2040..00
--- 
a/meta-oe/recipes-support/gperftools/gperftools/0001-Define-off64_t-as-off_t-on-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 41260e21e271eb1dc8b34f952ea3f90a0dc35e9e Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Sun, 25 Dec 2022 20:01:29 -0800
-Subject: [PATCH] Define off64_t as off_t on musl
-
-Musl's default bitlength for off_t is always 64bit therefore define
-off64_t as off_t on musl
-
-Upstream-Status: Submitted [https://github.com/gperftools/gperftools/pull/1379]
-Signed-off-by: Khem Raj 

- src/malloc_hook_mmap_linux.h | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h
-index c7d8b4b..a10687e 100644
 a/src/malloc_hook_mmap_linux.h
-+++ b/src/malloc_hook_mmap_linux.h
-@@ -45,6 +45,11 @@
- #include 
- #include 
- 
-+// musl's off_t is already 64-bit
-+#if defined(__linux__) && !defined(__GLIBC__)
-+typedef off_t off64_t;
-+#endif
-+
- // The x86-32 case and the x86-64 case differ:
- // 32b has a mmap2() syscall, 64b does not.
- // 64b and 32b have different calling conventions for mmap().
--- 
-2.39.0
-
diff --git 
a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
 
b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
deleted file mode 100644
index 2fd21c2783..00
--- 
a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From aa0a63209af6813d87255ec3ab339f2dbbf27d6d Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Mon, 6 Mar 2017 13:38:46 -0800
-Subject: [PATCH] Support Atomic ops on clang
-
-clang pretends to be gcc 4.2 which is a lie
-it actually supports a lot more features then
-gcc 4.2, here it depends on gcc 4.7 to enable
-the atomics and fails for clang
-
-Signed-off-by: Khem Raj 
-
-Upstream-Status: Pending
-

- src/base/atomicops.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/base/atomicops.h b/src/base/atomicops.h
-index dac95be..390733c 100644
 a/src/base/atomicops.h
-+++ b/src/base/atomicops.h
-@@ -124,7 +124,7 @@
- #include "base/atomicops-internals-linuxppc.h"
- #elif defined(__GNUC__) && defined(__mips__)
- #include "base/atomicops-internals-mips.h"
--#elif defined(__GNUC__) && GCC_VERSION >= 40700
-+#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__)
- #include "base/atomicops-internals-gcc.h"
- #elif defined(__clang__) && CLANG_VERSION >= 30400
- #include "base/atomicops-internals-gcc.h"
diff --git 
a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
 
b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
index e3e857f0c2..2ea54e