* [PATCH 02/25] lttng-tools: replace ad hoc ptest fixup with upstream fixes
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 03/25] rt-tests: update 2.1 -> 2.2 Alexander Kanavin
` (22 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...race-condition-in-test_event_tracker.patch | 221 ++++++++++++++++++
...more-before-analysing-traces-or-star.patch | 88 -------
...condition-in-test_ns_contexts_change.patch | 46 ++++
.../lttng/lttng-tools_2.13.0.bb | 3 +-
4 files changed, 269 insertions(+), 89 deletions(-)
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
new file mode 100644
index 00000000000..10020e1ecfc
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-Tests-race-condition-in-test_event_tracker.patch
@@ -0,0 +1,221 @@
+From d3392e4850532c02e53e3c3ff1cc27df7e51c941 Mon Sep 17 00:00:00 2001
+From: Francis Deslauriers <francis.deslauriers@efficios.com>
+Date: Tue, 7 Sep 2021 17:10:31 -0400
+Subject: [PATCH 1/2] Fix: Tests: race condition in test_event_tracker
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Background
+==========
+The `test_event_tracker` file contains test cases when the event
+generating app in executed in two distinct steps. Those two steps are
+preparation and execution.
+ 1. the preparation is the launching the app in the background, and
+ 2. the execution is actually generating the event that should or
+ should not be traced depending on the test case.
+
+This is useful to test the tracker feature since we want to ensure that
+already running apps are notified properly when changing their tracking
+status.
+
+Issue
+=====
+The `test_event_vpid_track_untrack` test case suffers from a race
+condition that is easy to reproduce on Yocto.
+
+The issue is that sometimes events are end up the trace when none is
+expected.
+
+This is due to the absence of synchronization point at the launch of the
+app which leads to the app being scheduled in-between the track-untrack
+calls leading to events being recorded to the trace.
+
+It's easy to reproduce this issue on my machine by adding a `sleep 5`
+between the track and untrack calls and setting the `NR_USEC_WAIT`
+variable to 1.
+
+Fix
+===
+Using the testapp `--sync-before-last-event-touch` flag to make the app
+create a file when all but the last event are executed. We then have the
+app wait until we create a file (`--sync-before-last-event`) to generate
+that last event. This way, we are sure no event will be generated when
+running the track and untrack commands.
+
+Notes
+=====
+- This issue affects other test cases in this file.
+- This commit fixes a typo in the test header.
+- This commit adds `diag` calls to help tracking to what test the output
+ relates to when reading the log.
+
+Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
+Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+Change-Id: Ia2b68128dc9a805526f9748f31ec2c2d95566f31
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ .../tools/tracker/test_event_tracker | 56 ++++++++++++++-----
+ 1 file changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker
+index feb3787..cc0f698 100755
+--- a/tests/regression/tools/tracker/test_event_tracker
++++ b/tests/regression/tools/tracker/test_event_tracker
+@@ -5,7 +5,7 @@
+ #
+ # SPDX-License-Identifier: GPL-2.0-only
+
+-TEST_DESC="LTTng - Event traker test"
++TEST_DESC="LTTng - Event tracker test"
+
+ CURDIR=$(dirname "$0")/
+ TESTDIR="$CURDIR/../../.."
+@@ -15,7 +15,7 @@ TESTAPP_KERNEL_NAME="gen-kernel-test-events"
+ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
+ TESTAPP_KERNEL_BIN="$TESTAPP_PATH/$TESTAPP_KERNEL_NAME/$TESTAPP_KERNEL_NAME"
+ SESSION_NAME="tracker"
+-NR_ITER=100
++NR_ITER=1
+ NUM_GLOBAL_TESTS=2
+ NUM_UST_TESTS=283
+ NUM_KERNEL_TESTS=462
+@@ -30,27 +30,41 @@ SCRIPT_GROUPNAME="$(id -gn)"
+
+ CHILD_PID=-1
+ WAIT_PATH=
+-AFTER_FIRST_PATH=
+-BEFORE_LAST_PATH=
++TOUCH_BEFORE_LAST_PATH=
++SYNC_BEFORE_LAST_PATH=
+
+ source $TESTDIR/utils/utils.sh
+
++# Launch the testapp and execute it up until right before the last event. It is
++# useful to do it in two seperate steps in order to test tracking and
++# untracking on an active app.
+ function prepare_ust_app
+ {
+- AFTER_FIRST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX)
+- BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
++ TOUCH_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_touch_before_last.XXXXXX)
++ SYNC_BEFORE_LAST_PATH=$(mktemp --tmpdir -u tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX)
++
++ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
++ --sync-before-last-event-touch "$TOUCH_BEFORE_LAST_PATH" \
++ --sync-before-last-event "$SYNC_BEFORE_LAST_PATH" &
+
+- $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT -a "$AFTER_FIRST_PATH" -b "$BEFORE_LAST_PATH" &
+ CHILD_PID=$!
++
++ # Wait for the app to execute all the way to right before the last
++ # event.
++ while [ ! -f "${TOUCH_BEFORE_LAST_PATH}" ]; do
++ sleep 0.5
++ done
+ }
+
++# Generate the last event.
+ function trace_ust_app
+ {
+- touch "$BEFORE_LAST_PATH"
+- wait
++ # Ask the test app to generate the last event.
++ touch "$SYNC_BEFORE_LAST_PATH"
++ wait "$CHILD_PID"
+ ok $? "Traced application stopped."
+- rm "$BEFORE_LAST_PATH"
+- rm "$AFTER_FIRST_PATH"
++ rm "$SYNC_BEFORE_LAST_PATH"
++ rm "$TOUCH_BEFORE_LAST_PATH"
+ }
+
+ function prepare_kernel_app
+@@ -64,7 +78,7 @@ function prepare_kernel_app
+ function trace_kernel_app
+ {
+ touch "$WAIT_PATH"
+- wait
++ wait "$CHILD_PID"
+ ok $? "Traced application stopped."
+ rm "$WAIT_PATH"
+ }
+@@ -78,6 +92,8 @@ function test_event_tracker()
+ local tracker="$4"
+ local channel=''
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -117,6 +133,8 @@ function test_event_vpid_tracker()
+ local wildcard="$3"
+ local channel=''
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -160,6 +178,8 @@ function test_event_pid_tracker()
+ local wildcard="$3"
+ local channel=''
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -203,6 +223,8 @@ function test_event_tracker_fail()
+ local wildcard="$2"
+ local tracker="$3"
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -222,6 +244,8 @@ function test_event_track_untrack()
+ local tracker="$4"
+ local channel=''
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -262,6 +286,8 @@ function test_event_vpid_track_untrack()
+ local wildcard="$3"
+ local channel=''
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -302,6 +328,8 @@ function test_event_pid_track_untrack()
+ local wildcard="$3"
+ local channel=''
+
++ diag "${FUNCNAME[0]} $*"
++
+ trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path"
+@@ -336,9 +364,9 @@ function test_event_pid_track_untrack()
+
+ function test_event_ust_vpid_untrack_snapshot()
+ {
+- local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
++ diag "${FUNCNAME[0]} $*"
+
+- diag "Test_event_ust_vpid_untrack_snapshot"
++ local trace_path=$(mktemp --tmpdir -d tmp.${FUNCNAME[0]}_trace_path.XXXXXX)
+
+ create_lttng_session_ok $SESSION_NAME "$trace_path" "--snapshot"
+
+--
+2.20.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch
deleted file mode 100644
index c4cac9cc587..00000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 8d9daede0882d239b0a47b0f7a6db68ba4934a7d Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Sat, 4 Sep 2021 13:57:39 +0200
-Subject: [PATCH] tests: wait some more before analysing traces or starting
- tracing
-
-Otherwise, there are sporadic race failures where lttng tracing
-is stopped before all expected events are collected or is started too soon, e.g.:
-
-PASS: tools/tracker/test_event_tracker 205 - Traced application stopped.
-PASS: tools/tracker/test_event_tracker 206 - Stop lttng tracing for session
-PASS: tools/tracker/test_event_tracker 207 - Destroy session tracker
-FAIL: tools/tracker/test_event_tracker 208 - Validate empty trace
-
-PASS: ust/namespaces/test_ns_contexts_change 42 - Stop lttng tracing for session mnt_ns
-PASS: ust/namespaces/test_ns_contexts_change 43 - Destroy session mnt_ns
-PASS: ust/namespaces/test_ns_contexts_change 44 - Wait after kill session daemon
-PASS: ust/namespaces/test_ns_contexts_change 45 - Validate trace for event mnt_ns = 4026531840, 1000 events
-PASS: ust/namespaces/test_ns_contexts_change 46 - Read a total of 1000 events, expected 1000
-PASS: ust/namespaces/test_ns_contexts_change 47 - Validate trace for event mnt_ns = 4026532303, 233 events
-FAIL: ust/namespaces/test_ns_contexts_change 48 - Read a total of 233 events, expected 1000
-
-This is a hack; issue should be fixed upstream with explicit syncs.
-It has been reported here: https://bugs.lttng.org/issues/1217
-
-Upstream-Status: Inappropriate [needs a real fix]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- tests/regression/tools/tracker/test_event_tracker | 8 ++++++++
- tests/regression/ust/namespaces/test_ns_contexts_change | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker
-index feb3787..a0f2257 100755
---- a/tests/regression/tools/tracker/test_event_tracker
-+++ b/tests/regression/tools/tracker/test_event_tracker
-@@ -130,6 +130,8 @@ function test_event_vpid_tracker()
-
- prepare_"$domain"_app
-
-+sleep 5
-+
- start_lttng_tracing_ok
-
- if [ "$expect_event" -eq 1 ]; then
-@@ -173,6 +175,8 @@ function test_event_pid_tracker()
-
- prepare_"$domain"_app
-
-+sleep 5
-+
- start_lttng_tracing_ok
-
- if [ "$expect_event" -eq 1 ]; then
-@@ -275,6 +279,8 @@ function test_event_vpid_track_untrack()
-
- prepare_"$domain"_app
-
-+sleep 5
-+
- start_lttng_tracing_ok
-
- lttng_track_"$domain"_ok "--vpid ${CHILD_PID}"
-@@ -315,6 +321,8 @@ function test_event_pid_track_untrack()
-
- prepare_"$domain"_app
-
-+sleep 5
-+
- start_lttng_tracing_ok
-
- lttng_track_"$domain"_ok "--pid ${CHILD_PID}"
-diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
-index c0af15e..b111bfe 100755
---- a/tests/regression/ust/namespaces/test_ns_contexts_change
-+++ b/tests/regression/ust/namespaces/test_ns_contexts_change
-@@ -79,6 +79,8 @@ function test_ns()
-
- touch "$file_sync_before_last"
-
-+sleep 5
-+
- # stop and destroy
- stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
---
-2.20.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch b/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
new file mode 100644
index 00000000000..a8d983105af
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch
@@ -0,0 +1,46 @@
+From d284752e616dfc4c9288be3bb21c04ea78cdd967 Mon Sep 17 00:00:00 2001
+From: Francis Deslauriers <francis.deslauriers@efficios.com>
+Date: Wed, 8 Sep 2021 10:16:23 -0400
+Subject: [PATCH 2/2] Fix: Tests: race condition in test_ns_contexts_change
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Issue
+=====
+The test script doesn't wait for the test application to complete before
+stopping the tracing session. The race is that depending on the
+scheduling the application is not always done generating events when the
+session is stopped.
+
+Fix
+===
+Make the test script wait for the termination of the test app before
+stopping the session.
+
+Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
+Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+Change-Id: I29d9b41d2a2ed60a6c42020509c2067442ae332c
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ tests/regression/ust/namespaces/test_ns_contexts_change | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change
+index c0af15e..8a4b62c 100755
+--- a/tests/regression/ust/namespaces/test_ns_contexts_change
++++ b/tests/regression/ust/namespaces/test_ns_contexts_change
+@@ -79,6 +79,9 @@ function test_ns()
+
+ touch "$file_sync_before_last"
+
++ # Wait for the test app to generate all expected events and exit.
++ wait $app_pid
++
+ # stop and destroy
+ stop_lttng_tracing_ok "$session_name"
+ destroy_lttng_session_ok "$session_name"
+--
+2.20.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
index 47cab42fcf5..1491aff6182 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
@@ -37,7 +37,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://lttng-sessiond.service \
file://determinism.patch \
file://0001-src-common-correct-header-location.patch \
- file://0001-tests-wait-some-more-before-analysing-traces-or-star.patch \
+ file://0001-Fix-Tests-race-condition-in-test_event_tracker.patch \
+ file://0002-Fix-Tests-race-condition-in-test_ns_contexts_change.patch \
"
SRC_URI[sha256sum] = "8dc894f9a7a840e943c1c344345c75f001a9529daa9157f1a0e6175c081c29e6"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 03/25] rt-tests: update 2.1 -> 2.2
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
2021-10-11 9:40 ` [PATCH 02/25] lttng-tools: replace ad hoc ptest fixup with upstream fixes Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 04/25] libgit2: update 1.1.1 -> 1.2.0 Alexander Kanavin
` (21 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 6 +++---
meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
index 56556dfe63e..1e8ff4619b5 100644
--- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
+++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
@@ -1,4 +1,4 @@
-From 7b0ab10370cad38e26c5ffaaa55a1fd77fff0f18 Mon Sep 17 00:00:00 2001
+From 05ccf5045adf4248f29623ad0db2d2a55ae5cd06 Mon Sep 17 00:00:00 2001
From: Randy Witt <randy.e.witt@intel.com>
Date: Fri, 16 Oct 2020 16:54:30 -0700
Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [other]
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 63cd77c..495d6bb 100644
+index ec5d693..ab8a8de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
- VERSION = 2.1
+ VERSION = 2.2
-CC = $(CROSS_COMPILE)gcc
-AR = $(CROSS_COMPILE)ar
+CC ?= $(CROSS_COMPILE)gcc
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 5ce4d298b96..71227307c3f 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,5 +1,5 @@
-SRCREV = "667e1aae896f8448615b062d27c818b32cb960ff"
-PV = "2.1"
+SRCREV = "75c16956e32817dfb0d5cb7379e731061e16593f"
+PV = "2.2"
PE = "1"
SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 04/25] libgit2: update 1.1.1 -> 1.2.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
2021-10-11 9:40 ` [PATCH 02/25] lttng-tools: replace ad hoc ptest fixup with upstream fixes Alexander Kanavin
2021-10-11 9:40 ` [PATCH 03/25] rt-tests: update 2.1 -> 2.2 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 05/25] libssh2: update 1.9.0 -> 1.10.0 Alexander Kanavin
` (20 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
License-Update: includes portions of openssl headers
https://github.com/libgit2/libgit2/commit/0903cac1d08817e87c556f5a3e6ec881be86c7f2
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../libgit2/{libgit2_1.1.1.bb => libgit2_1.2.0.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-support/libgit2/{libgit2_1.1.1.bb => libgit2_1.2.0.bb} (59%)
diff --git a/meta/recipes-support/libgit2/libgit2_1.1.1.bb b/meta/recipes-support/libgit2/libgit2_1.2.0.bb
similarity index 59%
rename from meta/recipes-support/libgit2/libgit2_1.1.1.bb
rename to meta/recipes-support/libgit2/libgit2_1.2.0.bb
index ae30a7a1001..6df42e473fd 100644
--- a/meta/recipes-support/libgit2/libgit2_1.1.1.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.2.0.bb
@@ -1,12 +1,12 @@
SUMMARY = "the Git linkable library"
HOMEPAGE = "http://libgit2.github.com/"
-LICENSE = "GPL-2.0-with-GCC-exception & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
+LICENSE = "GPL-2.0-with-GCC-exception & MIT & openssl"
+LIC_FILES_CHKSUM = "file://COPYING;md5=73fa96e40ce64f79bab087c7e1deeacd"
DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
-SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1"
-SRCREV = "8a0dc6783c340e61a44c179c48f832165ad2053c"
+SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main"
+SRCREV = "4fd32be01c79a5c003bb47674ac1d76d948518b7"
S = "${WORKDIR}/git"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 05/25] libssh2: update 1.9.0 -> 1.10.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (2 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 04/25] libgit2: update 1.1.1 -> 1.2.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 16:06 ` Khem Raj
2021-10-11 9:40 ` [PATCH 06/25] python3: update 3.9.6 -> 3.10.0 Alexander Kanavin
` (19 subsequent siblings)
23 siblings, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Khem Raj, Stefan Ghinea, Li Zhou
0001-configure-Conditionally-undefine-backend-m4-macro.patch no
longer needed; code removed upstream.
License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...nviroment-to-decide-if-a-test-is-bui.patch | 6 +-
...ditionally-undefine-backend-m4-macro.patch | 30 ----
...EC-macro-outside-of-if-check-549-550.patch | 112 ---------------
.../libssh2/files/CVE-2019-17498.patch | 131 ------------------
.../{libssh2_1.9.0.bb => libssh2_1.10.0.bb} | 10 +-
5 files changed, 5 insertions(+), 284 deletions(-)
delete mode 100644 meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
delete mode 100644 meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
delete mode 100644 meta/recipes-support/libssh2/files/CVE-2019-17498.patch
rename meta/recipes-support/libssh2/{libssh2_1.9.0.bb => libssh2_1.10.0.bb} (78%)
diff --git a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch
index 5ff9bf84622..b1204e49eb8 100644
--- a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch
+++ b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch
@@ -1,4 +1,4 @@
-From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001
+From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 28 Dec 2020 02:08:03 +0000
Subject: [PATCH] Don't let host enviroment to decide if a test is build
@@ -9,6 +9,7 @@ don't use SSHD on host to decide weither to build a test
Upstream-Status: Inappropriate[oe specific]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
---
tests/Makefile.am | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
@@ -41,6 +42,3 @@ index dc0922f..6cbc35d 100644
-endif
\ No newline at end of file
+endif
---
-2.20.1
-
diff --git a/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch b/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
deleted file mode 100644
index 1128c7ea0c2..00000000000
--- a/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From efe7101786193eaddb749c0583af6b54aec6f289 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 2 Feb 2021 18:45:16 -0800
-Subject: [PATCH] configure: Conditionally undefine backend m4 macro
-
-Unlike the M4 builtin, this macro fails if macro is not defined
-therefore recover the behavior of the builtin.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe5054a..758f8c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,7 +127,7 @@ fi
- m4_set_foreach([crypto_backends], [backend],
- [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")]
- )
--m4_undefine([backend])
-+m4_ifdef([backend], [m4_undefine([backend])])
-
-
- # libz
---
-2.30.0
-
diff --git a/meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch b/meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
deleted file mode 100644
index b331c1bf81b..00000000000
--- a/meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 1f76151c92e1b52e9c24ebf06adc77fbd6c062bc Mon Sep 17 00:00:00 2001
-From: Will Cosgrove <will@panic.com>
-Date: Tue, 26 Jan 2021 11:41:21 -0800
-Subject: [PATCH] kex.c: move EC macro outside of if check #549 (#550)
-
-File: kex.c
-
-Notes:
-Moved the macro LIBSSH2_KEX_METHOD_EC_SHA_HASH_CREATE_VERIFY outside of the LIBSSH2_ECDSA since it's also now used by the ED25519 code.
-
-Sha 256, 384 and 512 need to be defined for all backends now even if they aren't used directly. I believe this is already the case, but just a heads up.
-
-Credit:
-Stefan-Ghinea
-
-Upstream-Status: Backport
-
-Reference to upstream patch:
-https://github.com/libssh2/libssh2/commit/1f76151c92e1b52e9c24ebf06adc77fbd6c062bc
-
-Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
----
- src/kex.c | 66 +++++++++++++++++++++++++++----------------------------
- 1 file changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/src/kex.c b/src/kex.c
-index cb16639..19ab6ec 100644
---- a/src/kex.c
-+++ b/src/kex.c
-@@ -1885,39 +1885,6 @@ kex_method_diffie_hellman_group_exchange_sha256_key_exchange
- }
-
-
--#if LIBSSH2_ECDSA
--
--/* kex_session_ecdh_curve_type
-- * returns the EC curve type by name used in key exchange
-- */
--
--static int
--kex_session_ecdh_curve_type(const char *name, libssh2_curve_type *out_type)
--{
-- int ret = 0;
-- libssh2_curve_type type;
--
-- if(name == NULL)
-- return -1;
--
-- if(strcmp(name, "ecdh-sha2-nistp256") == 0)
-- type = LIBSSH2_EC_CURVE_NISTP256;
-- else if(strcmp(name, "ecdh-sha2-nistp384") == 0)
-- type = LIBSSH2_EC_CURVE_NISTP384;
-- else if(strcmp(name, "ecdh-sha2-nistp521") == 0)
-- type = LIBSSH2_EC_CURVE_NISTP521;
-- else {
-- ret = -1;
-- }
--
-- if(ret == 0 && out_type) {
-- *out_type = type;
-- }
--
-- return ret;
--}
--
--
- /* LIBSSH2_KEX_METHOD_EC_SHA_HASH_CREATE_VERIFY
- *
- * Macro that create and verifies EC SHA hash with a given digest bytes
-@@ -2027,6 +1994,39 @@ kex_session_ecdh_curve_type(const char *name, libssh2_curve_type *out_type)
- } \
-
-
-+#if LIBSSH2_ECDSA
-+
-+/* kex_session_ecdh_curve_type
-+ * returns the EC curve type by name used in key exchange
-+ */
-+
-+static int
-+kex_session_ecdh_curve_type(const char *name, libssh2_curve_type *out_type)
-+{
-+ int ret = 0;
-+ libssh2_curve_type type;
-+
-+ if(name == NULL)
-+ return -1;
-+
-+ if(strcmp(name, "ecdh-sha2-nistp256") == 0)
-+ type = LIBSSH2_EC_CURVE_NISTP256;
-+ else if(strcmp(name, "ecdh-sha2-nistp384") == 0)
-+ type = LIBSSH2_EC_CURVE_NISTP384;
-+ else if(strcmp(name, "ecdh-sha2-nistp521") == 0)
-+ type = LIBSSH2_EC_CURVE_NISTP521;
-+ else {
-+ ret = -1;
-+ }
-+
-+ if(ret == 0 && out_type) {
-+ *out_type = type;
-+ }
-+
-+ return ret;
-+}
-+
-+
- /* ecdh_sha2_nistp
- * Elliptic Curve Diffie Hellman Key Exchange
- */
---
-2.17.1
-
diff --git a/meta/recipes-support/libssh2/files/CVE-2019-17498.patch b/meta/recipes-support/libssh2/files/CVE-2019-17498.patch
deleted file mode 100644
index 001080072b6..00000000000
--- a/meta/recipes-support/libssh2/files/CVE-2019-17498.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001
-From: Will Cosgrove <will@panic.com>
-Date: Fri, 30 Aug 2019 09:57:38 -0700
-Subject: [PATCH] packet.c: improve message parsing (#402)
-
-* packet.c: improve parsing of packets
-
-file: packet.c
-
-notes:
-Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST.
-
-Upstream-Status: Backport
-CVE: CVE-2019-17498
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- src/packet.c | 68 ++++++++++++++++++++++------------------------------
- 1 file changed, 29 insertions(+), 39 deletions(-)
-
-diff --git a/src/packet.c b/src/packet.c
-index 38ab629..2e01bfc 100644
---- a/src/packet.c
-+++ b/src/packet.c
-@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
- size_t datalen, int macstate)
- {
- int rc = 0;
-- char *message = NULL;
-- char *language = NULL;
-+ unsigned char *message = NULL;
-+ unsigned char *language = NULL;
- size_t message_len = 0;
- size_t language_len = 0;
- LIBSSH2_CHANNEL *channelp = NULL;
-@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
-
- case SSH_MSG_DISCONNECT:
- if(datalen >= 5) {
-- size_t reason = _libssh2_ntohu32(data + 1);
-+ uint32_t reason = 0;
-+ struct string_buf buf;
-+ buf.data = (unsigned char *)data;
-+ buf.dataptr = buf.data;
-+ buf.len = datalen;
-+ buf.dataptr++; /* advance past type */
-
-- if(datalen >= 9) {
-- message_len = _libssh2_ntohu32(data + 5);
-+ _libssh2_get_u32(&buf, &reason);
-+ _libssh2_get_string(&buf, &message, &message_len);
-+ _libssh2_get_string(&buf, &language, &language_len);
-
-- if(message_len < datalen-13) {
-- /* 9 = packet_type(1) + reason(4) + message_len(4) */
-- message = (char *) data + 9;
--
-- language_len =
-- _libssh2_ntohu32(data + 9 + message_len);
-- language = (char *) data + 9 + message_len + 4;
--
-- if(language_len > (datalen-13-message_len)) {
-- /* bad input, clear info */
-- language = message = NULL;
-- language_len = message_len = 0;
-- }
-- }
-- else
-- /* bad size, clear it */
-- message_len = 0;
-- }
- if(session->ssh_msg_disconnect) {
-- LIBSSH2_DISCONNECT(session, reason, message,
-- message_len, language, language_len);
-+ LIBSSH2_DISCONNECT(session, reason, (const char *)message,
-+ message_len, (const char *)language,
-+ language_len);
- }
-+
- _libssh2_debug(session, LIBSSH2_TRACE_TRANS,
- "Disconnect(%d): %s(%s)", reason,
- message, language);
-@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
- int always_display = data[1];
-
- if(datalen >= 6) {
-- message_len = _libssh2_ntohu32(data + 2);
--
-- if(message_len <= (datalen - 10)) {
-- /* 6 = packet_type(1) + display(1) + message_len(4) */
-- message = (char *) data + 6;
-- language_len = _libssh2_ntohu32(data + 6 +
-- message_len);
--
-- if(language_len <= (datalen - 10 - message_len))
-- language = (char *) data + 10 + message_len;
-- }
-+ struct string_buf buf;
-+ buf.data = (unsigned char *)data;
-+ buf.dataptr = buf.data;
-+ buf.len = datalen;
-+ buf.dataptr += 2; /* advance past type & always display */
-+
-+ _libssh2_get_string(&buf, &message, &message_len);
-+ _libssh2_get_string(&buf, &language, &language_len);
- }
-
- if(session->ssh_msg_debug) {
-- LIBSSH2_DEBUG(session, always_display, message,
-- message_len, language, language_len);
-+ LIBSSH2_DEBUG(session, always_display,
-+ (const char *)message,
-+ message_len, (const char *)language,
-+ language_len);
- }
- }
-+
- /*
- * _libssh2_debug will actually truncate this for us so
- * that it's not an inordinate about of data
-@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
- uint32_t len = 0;
- unsigned char want_reply = 0;
- len = _libssh2_ntohu32(data + 1);
-- if(datalen >= (6 + len)) {
-+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) {
- want_reply = data[5 + len];
- _libssh2_debug(session,
- LIBSSH2_TRACE_CONN,
---
-2.17.1
-
diff --git a/meta/recipes-support/libssh2/libssh2_1.9.0.bb b/meta/recipes-support/libssh2/libssh2_1.10.0.bb
similarity index 78%
rename from meta/recipes-support/libssh2/libssh2_1.9.0.bb
rename to meta/recipes-support/libssh2/libssh2_1.10.0.bb
index a0cbb6af6b7..072d6819c0c 100644
--- a/meta/recipes-support/libssh2/libssh2_1.9.0.bb
+++ b/meta/recipes-support/libssh2/libssh2_1.10.0.bb
@@ -5,19 +5,15 @@ SECTION = "libs"
DEPENDS = "zlib"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7"
SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \
- file://CVE-2019-17498.patch \
- file://0001-configure-Conditionally-undefine-backend-m4-macro.patch \
file://run-ptest \
- file://0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch \
-"
+ "
SRC_URI:append:ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch"
-SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927"
-SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
+SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51"
inherit autotools pkgconfig ptest
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH 05/25] libssh2: update 1.9.0 -> 1.10.0
2021-10-11 9:40 ` [PATCH 05/25] libssh2: update 1.9.0 -> 1.10.0 Alexander Kanavin
@ 2021-10-11 16:06 ` Khem Raj
0 siblings, 0 replies; 38+ messages in thread
From: Khem Raj @ 2021-10-11 16:06 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Stefan Ghinea, Li Zhou
On Mon, Oct 11, 2021 at 2:41 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> 0001-configure-Conditionally-undefine-backend-m4-macro.patch no
> longer needed; code removed upstream.
>
Looks good.
> License-Update: copyright years
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> ...nviroment-to-decide-if-a-test-is-bui.patch | 6 +-
> ...ditionally-undefine-backend-m4-macro.patch | 30 ----
> ...EC-macro-outside-of-if-check-549-550.patch | 112 ---------------
> .../libssh2/files/CVE-2019-17498.patch | 131 ------------------
> .../{libssh2_1.9.0.bb => libssh2_1.10.0.bb} | 10 +-
> 5 files changed, 5 insertions(+), 284 deletions(-)
> delete mode 100644 meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
> delete mode 100644 meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
> delete mode 100644 meta/recipes-support/libssh2/files/CVE-2019-17498.patch
> rename meta/recipes-support/libssh2/{libssh2_1.9.0.bb => libssh2_1.10.0.bb} (78%)
>
> diff --git a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch
> index 5ff9bf84622..b1204e49eb8 100644
> --- a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch
> +++ b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch
> @@ -1,4 +1,4 @@
> -From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001
> +From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001
> From: Your Name <you@example.com>
> Date: Mon, 28 Dec 2020 02:08:03 +0000
> Subject: [PATCH] Don't let host enviroment to decide if a test is build
> @@ -9,6 +9,7 @@ don't use SSHD on host to decide weither to build a test
> Upstream-Status: Inappropriate[oe specific]
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> +
> ---
> tests/Makefile.am | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
> @@ -41,6 +42,3 @@ index dc0922f..6cbc35d 100644
> -endif
> \ No newline at end of file
> +endif
> ---
> -2.20.1
> -
> diff --git a/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch b/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
> deleted file mode 100644
> index 1128c7ea0c2..00000000000
> --- a/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From efe7101786193eaddb749c0583af6b54aec6f289 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Tue, 2 Feb 2021 18:45:16 -0800
> -Subject: [PATCH] configure: Conditionally undefine backend m4 macro
> -
> -Unlike the M4 builtin, this macro fails if macro is not defined
> -therefore recover the behavior of the builtin.
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - configure.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index fe5054a..758f8c2 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -127,7 +127,7 @@ fi
> - m4_set_foreach([crypto_backends], [backend],
> - [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")]
> - )
> --m4_undefine([backend])
> -+m4_ifdef([backend], [m4_undefine([backend])])
> -
> -
> - # libz
> ---
> -2.30.0
> -
> diff --git a/meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch b/meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
> deleted file mode 100644
> index b331c1bf81b..00000000000
> --- a/meta/recipes-support/libssh2/files/0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch
> +++ /dev/null
> @@ -1,112 +0,0 @@
> -From 1f76151c92e1b52e9c24ebf06adc77fbd6c062bc Mon Sep 17 00:00:00 2001
> -From: Will Cosgrove <will@panic.com>
> -Date: Tue, 26 Jan 2021 11:41:21 -0800
> -Subject: [PATCH] kex.c: move EC macro outside of if check #549 (#550)
> -
> -File: kex.c
> -
> -Notes:
> -Moved the macro LIBSSH2_KEX_METHOD_EC_SHA_HASH_CREATE_VERIFY outside of the LIBSSH2_ECDSA since it's also now used by the ED25519 code.
> -
> -Sha 256, 384 and 512 need to be defined for all backends now even if they aren't used directly. I believe this is already the case, but just a heads up.
> -
> -Credit:
> -Stefan-Ghinea
> -
> -Upstream-Status: Backport
> -
> -Reference to upstream patch:
> -https://github.com/libssh2/libssh2/commit/1f76151c92e1b52e9c24ebf06adc77fbd6c062bc
> -
> -Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
> ----
> - src/kex.c | 66 +++++++++++++++++++++++++++----------------------------
> - 1 file changed, 33 insertions(+), 33 deletions(-)
> -
> -diff --git a/src/kex.c b/src/kex.c
> -index cb16639..19ab6ec 100644
> ---- a/src/kex.c
> -+++ b/src/kex.c
> -@@ -1885,39 +1885,6 @@ kex_method_diffie_hellman_group_exchange_sha256_key_exchange
> - }
> -
> -
> --#if LIBSSH2_ECDSA
> --
> --/* kex_session_ecdh_curve_type
> -- * returns the EC curve type by name used in key exchange
> -- */
> --
> --static int
> --kex_session_ecdh_curve_type(const char *name, libssh2_curve_type *out_type)
> --{
> -- int ret = 0;
> -- libssh2_curve_type type;
> --
> -- if(name == NULL)
> -- return -1;
> --
> -- if(strcmp(name, "ecdh-sha2-nistp256") == 0)
> -- type = LIBSSH2_EC_CURVE_NISTP256;
> -- else if(strcmp(name, "ecdh-sha2-nistp384") == 0)
> -- type = LIBSSH2_EC_CURVE_NISTP384;
> -- else if(strcmp(name, "ecdh-sha2-nistp521") == 0)
> -- type = LIBSSH2_EC_CURVE_NISTP521;
> -- else {
> -- ret = -1;
> -- }
> --
> -- if(ret == 0 && out_type) {
> -- *out_type = type;
> -- }
> --
> -- return ret;
> --}
> --
> --
> - /* LIBSSH2_KEX_METHOD_EC_SHA_HASH_CREATE_VERIFY
> - *
> - * Macro that create and verifies EC SHA hash with a given digest bytes
> -@@ -2027,6 +1994,39 @@ kex_session_ecdh_curve_type(const char *name, libssh2_curve_type *out_type)
> - } \
> -
> -
> -+#if LIBSSH2_ECDSA
> -+
> -+/* kex_session_ecdh_curve_type
> -+ * returns the EC curve type by name used in key exchange
> -+ */
> -+
> -+static int
> -+kex_session_ecdh_curve_type(const char *name, libssh2_curve_type *out_type)
> -+{
> -+ int ret = 0;
> -+ libssh2_curve_type type;
> -+
> -+ if(name == NULL)
> -+ return -1;
> -+
> -+ if(strcmp(name, "ecdh-sha2-nistp256") == 0)
> -+ type = LIBSSH2_EC_CURVE_NISTP256;
> -+ else if(strcmp(name, "ecdh-sha2-nistp384") == 0)
> -+ type = LIBSSH2_EC_CURVE_NISTP384;
> -+ else if(strcmp(name, "ecdh-sha2-nistp521") == 0)
> -+ type = LIBSSH2_EC_CURVE_NISTP521;
> -+ else {
> -+ ret = -1;
> -+ }
> -+
> -+ if(ret == 0 && out_type) {
> -+ *out_type = type;
> -+ }
> -+
> -+ return ret;
> -+}
> -+
> -+
> - /* ecdh_sha2_nistp
> - * Elliptic Curve Diffie Hellman Key Exchange
> - */
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-support/libssh2/files/CVE-2019-17498.patch b/meta/recipes-support/libssh2/files/CVE-2019-17498.patch
> deleted file mode 100644
> index 001080072b6..00000000000
> --- a/meta/recipes-support/libssh2/files/CVE-2019-17498.patch
> +++ /dev/null
> @@ -1,131 +0,0 @@
> -From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001
> -From: Will Cosgrove <will@panic.com>
> -Date: Fri, 30 Aug 2019 09:57:38 -0700
> -Subject: [PATCH] packet.c: improve message parsing (#402)
> -
> -* packet.c: improve parsing of packets
> -
> -file: packet.c
> -
> -notes:
> -Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST.
> -
> -Upstream-Status: Backport
> -CVE: CVE-2019-17498
> -Signed-off-by: Li Zhou <li.zhou@windriver.com>
> ----
> - src/packet.c | 68 ++++++++++++++++++++++------------------------------
> - 1 file changed, 29 insertions(+), 39 deletions(-)
> -
> -diff --git a/src/packet.c b/src/packet.c
> -index 38ab629..2e01bfc 100644
> ---- a/src/packet.c
> -+++ b/src/packet.c
> -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> - size_t datalen, int macstate)
> - {
> - int rc = 0;
> -- char *message = NULL;
> -- char *language = NULL;
> -+ unsigned char *message = NULL;
> -+ unsigned char *language = NULL;
> - size_t message_len = 0;
> - size_t language_len = 0;
> - LIBSSH2_CHANNEL *channelp = NULL;
> -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> -
> - case SSH_MSG_DISCONNECT:
> - if(datalen >= 5) {
> -- size_t reason = _libssh2_ntohu32(data + 1);
> -+ uint32_t reason = 0;
> -+ struct string_buf buf;
> -+ buf.data = (unsigned char *)data;
> -+ buf.dataptr = buf.data;
> -+ buf.len = datalen;
> -+ buf.dataptr++; /* advance past type */
> -
> -- if(datalen >= 9) {
> -- message_len = _libssh2_ntohu32(data + 5);
> -+ _libssh2_get_u32(&buf, &reason);
> -+ _libssh2_get_string(&buf, &message, &message_len);
> -+ _libssh2_get_string(&buf, &language, &language_len);
> -
> -- if(message_len < datalen-13) {
> -- /* 9 = packet_type(1) + reason(4) + message_len(4) */
> -- message = (char *) data + 9;
> --
> -- language_len =
> -- _libssh2_ntohu32(data + 9 + message_len);
> -- language = (char *) data + 9 + message_len + 4;
> --
> -- if(language_len > (datalen-13-message_len)) {
> -- /* bad input, clear info */
> -- language = message = NULL;
> -- language_len = message_len = 0;
> -- }
> -- }
> -- else
> -- /* bad size, clear it */
> -- message_len = 0;
> -- }
> - if(session->ssh_msg_disconnect) {
> -- LIBSSH2_DISCONNECT(session, reason, message,
> -- message_len, language, language_len);
> -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message,
> -+ message_len, (const char *)language,
> -+ language_len);
> - }
> -+
> - _libssh2_debug(session, LIBSSH2_TRACE_TRANS,
> - "Disconnect(%d): %s(%s)", reason,
> - message, language);
> -@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> - int always_display = data[1];
> -
> - if(datalen >= 6) {
> -- message_len = _libssh2_ntohu32(data + 2);
> --
> -- if(message_len <= (datalen - 10)) {
> -- /* 6 = packet_type(1) + display(1) + message_len(4) */
> -- message = (char *) data + 6;
> -- language_len = _libssh2_ntohu32(data + 6 +
> -- message_len);
> --
> -- if(language_len <= (datalen - 10 - message_len))
> -- language = (char *) data + 10 + message_len;
> -- }
> -+ struct string_buf buf;
> -+ buf.data = (unsigned char *)data;
> -+ buf.dataptr = buf.data;
> -+ buf.len = datalen;
> -+ buf.dataptr += 2; /* advance past type & always display */
> -+
> -+ _libssh2_get_string(&buf, &message, &message_len);
> -+ _libssh2_get_string(&buf, &language, &language_len);
> - }
> -
> - if(session->ssh_msg_debug) {
> -- LIBSSH2_DEBUG(session, always_display, message,
> -- message_len, language, language_len);
> -+ LIBSSH2_DEBUG(session, always_display,
> -+ (const char *)message,
> -+ message_len, (const char *)language,
> -+ language_len);
> - }
> - }
> -+
> - /*
> - * _libssh2_debug will actually truncate this for us so
> - * that it's not an inordinate about of data
> -@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
> - uint32_t len = 0;
> - unsigned char want_reply = 0;
> - len = _libssh2_ntohu32(data + 1);
> -- if(datalen >= (6 + len)) {
> -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) {
> - want_reply = data[5 + len];
> - _libssh2_debug(session,
> - LIBSSH2_TRACE_CONN,
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-support/libssh2/libssh2_1.9.0.bb b/meta/recipes-support/libssh2/libssh2_1.10.0.bb
> similarity index 78%
> rename from meta/recipes-support/libssh2/libssh2_1.9.0.bb
> rename to meta/recipes-support/libssh2/libssh2_1.10.0.bb
> index a0cbb6af6b7..072d6819c0c 100644
> --- a/meta/recipes-support/libssh2/libssh2_1.9.0.bb
> +++ b/meta/recipes-support/libssh2/libssh2_1.10.0.bb
> @@ -5,19 +5,15 @@ SECTION = "libs"
> DEPENDS = "zlib"
>
> LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7"
>
> SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \
> - file://CVE-2019-17498.patch \
> - file://0001-configure-Conditionally-undefine-backend-m4-macro.patch \
> file://run-ptest \
> - file://0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch \
> -"
> + "
>
> SRC_URI:append:ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch"
>
> -SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927"
> -SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
> +SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51"
>
> inherit autotools pkgconfig ptest
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 06/25] python3: update 3.9.6 -> 3.10.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (3 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 05/25] libssh2: update 1.9.0 -> 1.10.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0 Alexander Kanavin
` (18 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Alexander Kanavin
native and target 0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
replaced by native-only 0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
which is more reboust against upstream changes, and keeps target code unmodified.
This however necessitated adding 0001-sysconfig.py-use-platlibdir-also-for-purelib.patch
to avoid hardcoding 'lib' on target builds as libdir.
Drop chunk from 0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch as
upstream now uses sysconfig directly inside distutils.
Add 0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch and
0001-multiprocessing-disable-a-failing-test.patch to address ptest failures.
License-Update: copyright years, case corrections.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/classes/python3-dir.bbclass | 2 +-
| 6 +--
...e-stdin-I-O-errors-same-way-as-maste.patch | 49 +++++++++++++++++++
...-use-libdir-values-from-configuratio.patch | 35 -------------
...-use-prefix-value-from-build-configu.patch | 34 +++++++++++++
...fig-append-STAGING_LIBDIR-python-sys.patch | 24 ++-------
...ssing-libraries-to-Extension-for-mul.patch | 15 +++---
...g.py-use-platlibdir-also-for-purelib.patch | 30 ++++++++++++
...tutils-prefix-is-inside-staging-area.patch | 14 +++---
.../python/python3/makerace.patch | 25 +++++++---
.../{python3_3.9.6.bb => python3_3.10.0.bb} | 10 ++--
11 files changed, 160 insertions(+), 84 deletions(-)
create mode 100644 meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
delete mode 100644 meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch
rename meta/recipes-devtools/python/{python3_3.9.6.bb => python3_3.10.0.bb} (97%)
diff --git a/meta/classes/python3-dir.bbclass b/meta/classes/python3-dir.bbclass
index f51f971fc55..ff03e584d4c 100644
--- a/meta/classes/python3-dir.bbclass
+++ b/meta/classes/python3-dir.bbclass
@@ -1,4 +1,4 @@
-PYTHON_BASEVERSION = "3.9"
+PYTHON_BASEVERSION = "3.10"
PYTHON_ABI = ""
PYTHON_DIR = "python${PYTHON_BASEVERSION}"
PYTHON_PN = "python3"
--git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
index a94fa0a5a97..46179ba1d18 100644
--- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
@@ -1,4 +1,4 @@
-From 9da913bf5f39c6fe737219af7419170574d6fbfb Mon Sep 17 00:00:00 2001
+From cebb772d718a8f798ed5ae311a6e3e61534bea95 Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Wed, 4 Mar 2020 00:06:42 +0000
Subject: [PATCH] Don't search system for headers/libraries
@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
-index a0bf9ea..da099bf 100644
+index 95e3e11..32a4d42 100644
--- a/setup.py
+++ b/setup.py
-@@ -674,8 +674,8 @@ class PyBuildExt(build_ext):
+@@ -840,8 +840,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(self.compiler.include_dirs,
sysconfig.get_config_var("INCLUDEDIR"))
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
new file mode 100644
index 00000000000..d6aa9501a70
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
@@ -0,0 +1,49 @@
+From d8521ee967937184eadc59fff1a30740ad181a98 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 16 Sep 2021 16:35:37 +0200
+Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O
+ errors
+
+reading stdin can throw the same I/O errors as reading from master fd does,
+e.g. when running under Yocto's test harness:
+======================================================================
+ERROR: test_spawn_doesnt_hang (test.test_pty.PtyTest)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "/usr/lib/python3.10/test/test_pty.py", line 316, in test_spawn_doesnt_hang
+ pty.spawn([sys.executable, '-c', 'print("hi there")'])
+ File "/usr/lib/python3.10/pty.py", line 181, in spawn
+ _copy(master_fd, master_read, stdin_read)
+ File "/usr/lib/python3.10/pty.py", line 157, in _copy
+ data = stdin_read(STDIN_FILENO)
+ File "/usr/lib/python3.10/pty.py", line 132, in _read
+ return os.read(fd, 1024)
+OSError: [Errno 5] Input/output error
+
+So let's treat both channels the same.
+
+Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Lib/pty.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Lib/pty.py b/Lib/pty.py
+index 8d8ce40df5..35439c6b96 100644
+--- a/Lib/pty.py
++++ b/Lib/pty.py
+@@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
+ os.write(STDOUT_FILENO, data)
+
+ if STDIN_FILENO in rfds:
+- data = stdin_read(STDIN_FILENO)
++ try:
++ data = stdin_read(STDIN_FILENO)
++ except OSError:
++ data = b""
+ if not data:
+ fds.remove(STDIN_FILENO)
+ else:
+--
+2.20.1
+
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
deleted file mode 100644
index 1490cdbb18a..00000000000
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deeedd1b8799294ab276ab7dbbfdb59c1dacc9a2 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 22 Oct 2020 13:10:34 +0200
-Subject: [PATCH] Lib/sysconfig.py: use libdir values from configuration file
-
-This allows correctly substituting them for target installs using
-native python.
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- Lib/sysconfig.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index bf04ac5..ed0462b 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -20,10 +20,10 @@ __all__ = [
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}',
-- 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}',
-- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
-+ 'stdlib': '{LIBDEST}',
-+ 'platstdlib': '{LIBDEST}',
-+ 'purelib': '{LIBDEST}/site-packages',
-+ 'platlib': '{LIBDEST}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
---
-2.24.0
-
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
new file mode 100644
index 00000000000..b72c709130b
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -0,0 +1,34 @@
+From aceaa16e25a8ab6a00f906c340843999635c8e23 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 10 Sep 2021 12:28:31 +0200
+Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
+ file
+
+This allows correctly substituting them for target installs using
+native python.
+
+Upstream-Status: Inappropriate [oe-core cross builds]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Lib/sysconfig.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index 95b48f6..84f6427 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -613,6 +613,11 @@ def get_config_vars(*args):
+ _init_non_posix(_CONFIG_VARS)
+ if os.name == 'posix':
+ _init_posix(_CONFIG_VARS)
++ _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix']
++ _CONFIG_VARS['base'] = _CONFIG_VARS['prefix']
++ _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix']
++ _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix']
++ _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR']
+ # For backward compatibility, see issue19555
+ SO = _CONFIG_VARS.get('EXT_SUFFIX')
+ if SO is not None:
+--
+2.20.1
+
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index b982691b365..b323ed4dd0a 100644
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
-From e65bfe22c858872b08366aff49119d4145a77f40 Mon Sep 17 00:00:00 2001
+From 3a98c2eab187289dc8c55e36738c2c0f4216d906 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 31 Jan 2019 16:46:30 +0100
Subject: [PATCH] distutils/sysconfig: append
@@ -10,28 +10,14 @@ Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Lib/distutils/sysconfig.py | 2 ++
- Lib/sysconfig.py | 2 ++
- 2 files changed, 4 insertions(+)
+ Lib/sysconfig.py | 2 ++
+ 1 file changed, 2 insertions(+)
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index b51629e..2df348c 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -438,6 +438,8 @@ def _init_posix():
- platform=sys.platform,
- multiarch=getattr(sys.implementation, '_multiarch', ''),
- ))
-+ if 'STAGING_LIBDIR' in os.environ:
-+ sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata')
- _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
- build_time_vars = _temp.build_time_vars
- global _config_vars
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index b2d790b..405273c 100644
+index a78c0b1..f5c5efe 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
-@@ -419,6 +419,8 @@ def _init_posix(vars):
+@@ -474,6 +474,8 @@ def _init_posix(vars):
"""Initialize the module as appropriate for POSIX systems."""
# _sysconfigdata is generated at build time, see _generate_posix_vars()
name = _get_sysconfigdata_name()
diff --git a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch b/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
index ea0af02e720..374433c68e5 100644
--- a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
+++ b/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
@@ -1,4 +1,4 @@
-From 7019ba184b828ed7253750cf409fc5760ef90a54 Mon Sep 17 00:00:00 2001
+From bad7e6a625436402a01d03021fb9ccd58bc9930f Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 9 Jan 2020 17:44:05 +0100
Subject: [PATCH] setup.py: pass missing libraries to Extension for
@@ -50,20 +50,21 @@ Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index ec3f2a4..b0f1541 100644
+index d92face..f42bcbb 100644
--- a/setup.py
+++ b/setup.py
-@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext):
- libraries=libs,
- include_dirs=["Modules/_multiprocessing"]))
-
+@@ -1836,7 +1836,7 @@ class PyBuildExt(build_ext):
+ if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
+ sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
+ multiprocessing_srcs.append('_multiprocessing/semaphore.c')
- self.add(Extension('_multiprocessing', multiprocessing_srcs,
+ self.add(Extension('_multiprocessing', multiprocessing_srcs, libraries=['pthread'],
include_dirs=["Modules/_multiprocessing"]))
- def detect_uuid(self):
+ if (not MS_WINDOWS and
diff --git a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch
new file mode 100644
index 00000000000..2b5a7d308cb
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch
@@ -0,0 +1,30 @@
+From 93346d1a2f5d4f7085391bc7c1230d85ebe00606 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Sun, 12 Sep 2021 21:44:36 +0200
+Subject: [PATCH] sysconfig.py: use platlibdir also for purelib
+
+This is needed in multilib configurations where hardcoding 'lib'
+is not correct.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Lib/sysconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index b70d392..c418acd 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -27,7 +27,7 @@ _INSTALL_SCHEMES = {
+ 'posix_prefix': {
+ 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}',
+ 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}',
+- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
++ 'purelib': '{base}/{platlibdir}/python{py_version_short}/site-packages',
+ 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
+ 'include':
+ '{installed_base}/include/python{py_version_short}{abiflags}',
+--
+2.20.1
+
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index 5a39cf89331..cc64e3ecf7b 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,7 +1,7 @@
-From c52fa7948ef109db1132fdc1aee0b68f8d767b4e Mon Sep 17 00:00:00 2001
+From f6411021856bafedd784748ec33494151e783b51 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 14 May 2013 15:00:26 -0700
-Subject: [PATCH 1/2] python3: Add target and native recipes
+Subject: [PATCH] python3: Add target and native recipes
Upstream-Status: Inappropriate [embedded specific]
@@ -17,10 +17,10 @@ Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 4774e12..ccf7d58 100644
+index 3414a76..361d3a1 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -95,7 +95,9 @@ def get_python_inc(plat_specific=0, prefix=None):
+@@ -277,7 +277,9 @@ def get_python_inc(plat_specific=0, prefix=None):
If 'prefix' is supplied, use it instead of sys.base_prefix or
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
"""
@@ -31,7 +31,7 @@ index 4774e12..ccf7d58 100644
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
if os.name == "posix":
if python_build:
-@@ -138,7 +140,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+@@ -320,7 +322,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
If 'prefix' is supplied, use it instead of sys.base_prefix or
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
"""
@@ -46,7 +46,7 @@ index 4774e12..ccf7d58 100644
if standard_lib:
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
else:
-@@ -152,7 +160,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+@@ -334,7 +342,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
else:
# Pure Python
libdir = "lib"
@@ -56,5 +56,5 @@ index 4774e12..ccf7d58 100644
if standard_lib:
return libpython
--
-2.24.0
+2.20.1
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch
index 96744cb5570..b150c1cb38e 100644
--- a/meta/recipes-devtools/python/python3/makerace.patch
+++ b/meta/recipes-devtools/python/python3/makerace.patch
@@ -1,3 +1,8 @@
+From 8b8583fb4f2bb3421e31ef06d17c04deec431c7e Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 13 Jul 2021 23:19:29 +0100
+Subject: [PATCH] python3: Fix make race
+
libainstall installs python-config.py but the .pyc cache files are generated
by the libinstall target. This means some builds may not generate the pyc files
for python-config.py depending on the order things happen in. This means builds
@@ -8,14 +13,18 @@ Add a dependency to avoid the race.
Upstream-Status: Pending
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Index: Python-3.9.6/Makefile.pre.in
-===================================================================
---- Python-3.9.6.orig/Makefile.pre.in
-+++ Python-3.9.6/Makefile.pre.in
-@@ -1486,7 +1486,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter
- venv venv/scripts venv/scripts/common venv/scripts/posix \
- curses pydoc_data \
- zoneinfo
+---
+ Makefile.pre.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 69d47a2..c471b60 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1528,7 +1528,7 @@ TESTSUBDIRS= ctypes/test \
+ unittest/test unittest/test/testmock
+
+ TEST_MODULES=@TEST_MODULES@
-libinstall: build_all $(srcdir)/Modules/xxmodule.c
+libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall
@for i in $(SCRIPTDIR) $(LIBDEST); \
diff --git a/meta/recipes-devtools/python/python3_3.9.6.bb b/meta/recipes-devtools/python/python3_3.10.0.bb
similarity index 97%
rename from meta/recipes-devtools/python/python3_3.9.6.bb
rename to meta/recipes-devtools/python/python3_3.10.0.bb
index 8a638b142b5..2e850710b68 100644
--- a/meta/recipes-devtools/python/python3_3.9.6.bb
+++ b/meta/recipes-devtools/python/python3_3.10.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly
LICENSE = "PSFv2"
SECTION = "devel/python"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c22d2438294c784731bf9dd224a467b7"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3dd7bed622743ef9b77169b3736f7990"
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://run-ptest \
@@ -28,18 +28,20 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
- file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \
file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \
file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch \
file://makerace.patch \
+ file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \
+ file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \
"
SRC_URI:append:class-native = " \
+ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
file://12-distutils-prefix-is-inside-staging-area.patch \
file://0001-Don-t-search-system-for-headers-libraries.patch \
"
-SRC_URI[sha256sum] = "397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a"
+SRC_URI[sha256sum] = "5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002"
# exclude pre-releases for both python 2.x and 3.x
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -55,7 +57,7 @@ CVE_CHECK_WHITELIST += "CVE-2019-18348"
# This is windows only issue.
CVE_CHECK_WHITELIST += "CVE-2020-15523"
-PYTHON_MAJMIN = "3.9"
+PYTHON_MAJMIN = "3.10"
S = "${WORKDIR}/Python-${PV}"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (4 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 06/25] python3: update 3.9.6 -> 3.10.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 18:07 ` [OE-core] " Peter Kjellerstedt
2021-10-11 9:40 ` [PATCH 08/25] cryptodev-tests: do not use -Werror with openssl 3 Alexander Kanavin
` (17 subsequent siblings)
23 siblings, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Hongxu Jia, Richard Purdie
Drop 0001-skip-test_symbol_presence.patch - testing revealed
no need for it, and I couldn't quite understand what it does.
Drop reproducible.patch - upstream has removed the non-reproducible
bit.
Process lines in run-ptest with sed one by one rather than with
perl after the test completes, avoiding ptest-runner timeout errors.
License-Update: openssl relicense to apache 2.0. Goodbye awkward
gpl exceptions in consumers.
DEPRECATED_CRYPTO_FLAGS is now empty by default but available
by anyone who wants to set it. Trying to come up with a working
set was not a good idea as shown in the deleted comment.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...1-Configure-do-not-tweak-mips-cflags.patch | 36 +++++++++
...sysroot-and-debug-prefix-map-from-co.patch | 21 ++---
.../0001-skip-test_symbol_presence.patch | 46 -----------
.../openssl/openssl/reproducible.patch | 32 --------
.../openssl/openssl/run-ptest | 2 +-
.../{openssl_1.1.1l.bb => openssl_3.0.0.bb} | 81 ++++++++++---------
6 files changed, 90 insertions(+), 128 deletions(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch
rename meta/recipes-connectivity/openssl/{openssl_1.1.1l.bb => openssl_3.0.0.bb} (76%)
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
new file mode 100644
index 00000000000..5effa6c6f61
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
@@ -0,0 +1,36 @@
+From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Tue, 14 Sep 2021 12:18:25 +0200
+Subject: [PATCH] Configure: do not tweak mips cflags
+
+This conflicts with mips machine definitons from yocto,
+e.g.
+| Error: -mips3 conflicts with the other architecture options, which imply -mips64r2
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Configure | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/Configure b/Configure
+index 821e680..0387a74 100755
+--- a/Configure
++++ b/Configure
+@@ -1422,16 +1422,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m)
+ push @{$config{shared_ldflag}}, "-mno-cygwin";
+ }
+
+-if ($target =~ /linux.*-mips/ && !$disabled{asm}
+- && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
+- # minimally required architecture flags for assembly modules
+- my $value;
+- $value = '-mips2' if ($target =~ /mips32/);
+- $value = '-mips3' if ($target =~ /mips64/);
+- unshift @{$config{cflags}}, $value;
+- unshift @{$config{cxxflags}}, $value if $config{CXX};
+-}
+-
+ # If threads aren't disabled, check how possible they are
+ unless ($disabled{threads}) {
+ if ($auto_threads) {
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
index 003cfbc8d89..60890c666d1 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
+++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
@@ -1,4 +1,4 @@
-From 3e1d00481093e10775eaf69d619c45b32a4aa7dc Mon Sep 17 00:00:00 2001
+From 5985253f2c9025d7c127443a3a9938946f80c2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
Date: Tue, 6 Nov 2018 14:50:47 +0100
Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler
@@ -21,7 +21,6 @@ https://patchwork.openembedded.org/patch/147229/
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Martin Hundebøll <martin@geanix.com>
-
Update to fix buildpaths qa issue for '-fmacro-prefix-map'.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
@@ -31,13 +30,15 @@ Update to fix buildpaths qa issue for '-ffile-prefix-map'.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- Configurations/unix-Makefile.tmpl | 10 +++++++++-
+ Configurations/unix-Makefile.tmpl | 12 +++++++++++-
crypto/build.info | 2 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
+index f88a70f..528cdef 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
-@@ -420,13 +420,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lfl
+@@ -471,13 +471,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (),
'$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
@@ -62,14 +63,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
PERLASM_SCHEME= {- $target{perlasm_scheme} -}
# For x86 assembler: Set PROCESSOR to 386 if you want to support
+diff --git a/crypto/build.info b/crypto/build.info
+index efca6cc..eda433e 100644
--- a/crypto/build.info
+++ b/crypto/build.info
-@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink
- ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
+@@ -109,7 +109,7 @@ DEFINE[../libcrypto]=$UPLINKDEF
+ DEPEND[info.o]=buildinf.h
DEPEND[cversion.o]=buildinf.h
-GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)"
- DEPEND[buildinf.h]=../configdata.pm
- GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
+ GENERATE[uplink-x86.s]=../ms/uplink-x86.pl
+ GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch b/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch
deleted file mode 100644
index d8d9651b647..00000000000
--- a/meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a9401b2289656c5a36dd1b0ecebf0d23e291ce70 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 2 Oct 2018 23:58:24 +0800
-Subject: [PATCH] skip test_symbol_presence
-
-We cannot skip `01-test_symbol_presence.t' by configuring option `no-shared'
-as INSTALL told us the shared libraries will not be built.
-
-[INSTALL snip]
- Notes on shared libraries
- -------------------------
-
- For most systems the OpenSSL Configure script knows what is needed to
- build shared libraries for libcrypto and libssl. On these systems
- the shared libraries will be created by default. This can be suppressed and
- only static libraries created by using the "no-shared" option. On systems
- where OpenSSL does not know how to build shared libraries the "no-shared"
- option will be forced and only static libraries will be created.
-[INSTALL snip]
-
-Hence directly modification the case to skip it.
-
-Upstream-Status: Inappropriate [OE Specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- test/recipes/01-test_symbol_presence.t | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
-index 7f2a2d7..0b93745 100644
---- a/test/recipes/01-test_symbol_presence.t
-+++ b/test/recipes/01-test_symbol_presence.t
-@@ -14,8 +14,7 @@ use OpenSSL::Test::Utils;
-
- setup("test_symbol_presence");
-
--plan skip_all => "Only useful when building shared libraries"
-- if disabled("shared");
-+plan skip_all => "The case needs debug symbols then we just disable it";
-
- my @libnames = ("crypto", "ssl");
- my $testcount = scalar @libnames;
---
-2.7.4
-
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
deleted file mode 100644
index a24260c95d0..00000000000
--- a/meta/recipes-connectivity/openssl/openssl/reproducible.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-The value for perl_archname can vary depending on the host, e.g.
-x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which
-makes the ptest package non-reproducible. Its unused other than
-these references so drop it.
-
-RP 2020/2/6
-
-Upstream-Status: Pending
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: openssl-1.1.1d/Configure
-===================================================================
---- openssl-1.1.1d.orig/Configure
-+++ openssl-1.1.1d/Configure
-@@ -286,7 +286,7 @@ if (defined env($local_config_envname))
- # Save away perl command information
- $config{perl_cmd} = $^X;
- $config{perl_version} = $Config{version};
--$config{perl_archname} = $Config{archname};
-+#$config{perl_archname} = $Config{archname};
-
- $config{prefix}="";
- $config{openssldir}="";
-@@ -2517,7 +2517,7 @@ _____
- @{$config{perlargv}}), "\n";
- print "\nPerl information:\n\n";
- print ' ',$config{perl_cmd},"\n";
-- print ' ',$config{perl_version},' for ',$config{perl_archname},"\n";
-+ print ' ',$config{perl_version},"\n";
- }
- if ($dump || $options) {
- my $longest = 0;
diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest
index 3fb22471f8c..8dff79101fa 100644
--- a/meta/recipes-connectivity/openssl/openssl/run-ptest
+++ b/meta/recipes-connectivity/openssl/openssl/run-ptest
@@ -9,4 +9,4 @@ export TOP=.
# OPENSSL_ENGINES is relative from the test binaries
export OPENSSL_ENGINES=../engines
-perl ./test/run_tests.pl $* | perl -0pe 's#(.*) \.*.ok#PASS: \1#g; s#(.*) \.*.skipped: (.*)#SKIP: \1 (\2)#g; s#(.*) \.*.\nDubious#FAIL: \1#;'
+perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g'
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb b/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
similarity index 76%
rename from meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
rename to meta/recipes-connectivity/openssl/openssl_3.0.0.bb
index b241ba78bcc..d8c50a80118 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
@@ -4,19 +4,14 @@ HOMEPAGE = "http://www.openssl.org/"
BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
SECTION = "libs/network"
-# "openssl" here actually means both OpenSSL and SSLeay licenses apply
-# (see meta/files/common-licenses/OpenSSL to which "openssl" is SPDXLICENSEMAPped)
-LICENSE = "openssl"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8"
-
-DEPENDS = "hostperl-runtime-native"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04"
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://run-ptest \
- file://0001-skip-test_symbol_presence.patch \
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://afalg.patch \
- file://reproducible.patch \
+ file://0001-Configure-do-not-tweak-mips-cflags.patch \
"
SRC_URI:append:class-nativesdk = " \
@@ -28,9 +23,9 @@ SRC_URI:append:riscv32 = " \
file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \
"
-SRC_URI[sha256sum] = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"
+SRC_URI[sha256sum] = "59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536"
-inherit lib_package multilib_header multilib_script ptest
+inherit lib_package multilib_header multilib_script ptest perlnative
MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
PACKAGECONFIG ?= ""
@@ -59,19 +54,9 @@ EXTRA_OECONF:class-nativesdk = "--with-rand-seed=os,devrandom"
CFLAGS:append:class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin"
CFLAGS:append:class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin"
-# Disable deprecated crypto algorithms
-# Retained for compatibilty
-# des (curl)
-# dh (python-ssl)
-# dsa (rpm)
-# md4 (cyrus-sasl freeradius hostapd)
-# bf (wvstreams postgresql x11vnc crda znc cfengine)
-# rc4 (freerdp librtorrent ettercap xrdp transmission pam-ssh-agent-auth php)
-# rc2 (mailx)
-# psk (qt5)
-# srp (libest)
-# whirlpool (qca)
-DEPRECATED_CRYPTO_FLAGS = "no-ssl no-idea no-rc5 no-md2 no-camellia no-mdc2 no-scrypt no-seed no-siphash no-sm2 no-sm3 no-sm4"
+# This allows disabling deprecated or undesirable crypto algorithms.
+# The default is to trust upstream choices.
+DEPRECATED_CRYPTO_FLAGS ?= ""
do_configure () {
os=${HOST_OS}
@@ -146,7 +131,7 @@ do_configure () {
# WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the
# environment variables set by bitbake. Adjust the environment variables instead.
HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
- perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target
+ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target
perl ${B}/configdata.pm --dump
}
@@ -154,43 +139,49 @@ do_install () {
oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
oe_multilib_header openssl/opensslconf.h
+ oe_multilib_header openssl/configuration.h
# Create SSL structure for packages such as ca-certificates which
# contain hard-coded paths to /etc/ssl. Debian does the same.
install -d ${D}${sysconfdir}/ssl
- mv ${D}${libdir}/ssl-1.1/certs \
- ${D}${libdir}/ssl-1.1/private \
- ${D}${libdir}/ssl-1.1/openssl.cnf \
+ mv ${D}${libdir}/ssl-3/certs \
+ ${D}${libdir}/ssl-3/private \
+ ${D}${libdir}/ssl-3/openssl.cnf \
${D}${sysconfdir}/ssl/
# Although absolute symlinks would be OK for the target, they become
# invalid if native or nativesdk are relocated from sstate.
- ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs
- ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private
- ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf
+ ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-3/certs
+ ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-3/private
+ ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-3/openssl.cnf
}
do_install:append:class-native () {
create_wrapper ${D}${bindir}/openssl \
- OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \
- SSL_CERT_DIR=${libdir}/ssl-1.1/certs \
- SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \
- OPENSSL_ENGINES=${libdir}/engines-1.1
+ OPENSSL_CONF=${libdir}/ssl-3/openssl.cnf \
+ SSL_CERT_DIR=${libdir}/ssl-3/certs \
+ SSL_CERT_FILE=${libdir}/ssl-3/cert.pem \
+ OPENSSL_ENGINES=${libdir}/engines-3
}
do_install:append:class-nativesdk () {
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
- sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+ sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
}
PTEST_BUILD_HOST_FILES += "configdata.pm"
PTEST_BUILD_HOST_PATTERN = "perl_version ="
do_install_ptest () {
+ install -d ${D}${PTEST_PATH}/test
+ install -m755 ${B}/test/p_test.so ${D}${PTEST_PATH}/test
+ install -m755 ${B}/test/provider_internal_test.cnf ${D}${PTEST_PATH}/test
+
# Prune the build tree
rm -f ${B}/fuzz/*.* ${B}/test/*.*
cp ${S}/Configure ${B}/configdata.pm ${D}${PTEST_PATH}
+ sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/configdata.pm
cp -r ${S}/external ${B}/test ${S}/test ${B}/fuzz ${S}/util ${B}/util ${D}${PTEST_PATH}
# For test_shlibload
@@ -204,10 +195,20 @@ do_install_ptest () {
install -d ${D}${PTEST_PATH}/engines
install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
+ install -m755 ${B}/engines/loader_attic.so ${D}${PTEST_PATH}/engines
+
+ install -d ${D}${PTEST_PATH}/providers
+ install -m755 ${B}/providers/legacy.so ${D}${PTEST_PATH}/providers
+
+ install -d ${D}${PTEST_PATH}/Configurations
+ cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/
# seems to be needed with perl 5.32.1
install -d ${D}${PTEST_PATH}/util/perl/recipes
cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/
+
+ sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/util/wrap.pl
+
}
# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
@@ -220,13 +221,13 @@ PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc"
FILES:libcrypto = "${libdir}/libcrypto${SOLIBS}"
FILES:libssl = "${libdir}/libssl${SOLIBS}"
FILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf \
- ${libdir}/ssl-1.1/openssl.cnf* \
+ ${libdir}/ssl-3/openssl.cnf* \
"
-FILES:${PN}-engines = "${libdir}/engines-1.1"
+FILES:${PN}-engines = "${libdir}/engines-3"
# ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP)
-FILES:${PN}-engines:append:mingw32:class-nativesdk = " ${prefix}${libdir}/engines-1_1"
-FILES:${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash"
-FILES:${PN} =+ "${libdir}/ssl-1.1/*"
+FILES:${PN}-engines:append:mingw32:class-nativesdk = " ${prefix}${libdir}/engines-3"
+FILES:${PN}-misc = "${libdir}/ssl-3/misc ${bindir}/c_rehash"
+FILES:${PN} =+ "${libdir}/ssl-3/* ${libdir}/ossl-modules/"
FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* RE: [OE-core] [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0
2021-10-11 9:40 ` [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0 Alexander Kanavin
@ 2021-10-11 18:07 ` Peter Kjellerstedt
2021-10-12 11:02 ` Alexander Kanavin
0 siblings, 1 reply; 38+ messages in thread
From: Peter Kjellerstedt @ 2021-10-11 18:07 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
Cc: Alexander Kanavin, Hongxu Jia, Richard Purdie
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: den 11 oktober 2021 11:41
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>; Hongxu Jia
> <hongxu.jia@windriver.com>; Richard Purdie
> <richard.purdie@linuxfoundation.org>
> Subject: [OE-core] [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0
>
> Drop 0001-skip-test_symbol_presence.patch - testing revealed
> no need for it, and I couldn't quite understand what it does.
>
> Drop reproducible.patch - upstream has removed the non-reproducible
> bit.
>
> Process lines in run-ptest with sed one by one rather than with
> perl after the test completes, avoiding ptest-runner timeout errors.
>
> License-Update: openssl relicense to apache 2.0. Goodbye awkward
> gpl exceptions in consumers.
>
> DEPRECATED_CRYPTO_FLAGS is now empty by default but available
> by anyone who wants to set it. Trying to come up with a working
> set was not a good idea as shown in the deleted comment.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> ...1-Configure-do-not-tweak-mips-cflags.patch | 36 +++++++++
> ...sysroot-and-debug-prefix-map-from-co.patch | 21 ++---
> .../0001-skip-test_symbol_presence.patch | 46 -----------
> .../openssl/openssl/reproducible.patch | 32 --------
> .../openssl/openssl/run-ptest | 2 +-
> .../{openssl_1.1.1l.bb => openssl_3.0.0.bb} | 81 ++++++++++---------
> 6 files changed, 90 insertions(+), 128 deletions(-)
> create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch
> delete mode 100644 meta/recipes-connectivity/openssl/openssl/0001-skip-test_symbol_presence.patch
> delete mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch
> rename meta/recipes-connectivity/openssl/{openssl_1.1.1l.bb => openssl_3.0.0.bb} (76%)
>
[cut]
> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb b/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
> similarity index 76%
> rename from meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
> rename to meta/recipes-connectivity/openssl/openssl_3.0.0.bb
> index b241ba78bcc..d8c50a80118 100644
> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
> @@ -4,19 +4,14 @@ HOMEPAGE = "http://www.openssl.org/"
> BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
> SECTION = "libs/network"
>
> -# "openssl" here actually means both OpenSSL and SSLeay licenses apply
> -# (see meta/files/common-licenses/OpenSSL to which "openssl" is SPDXLICENSEMAPped)
> -LICENSE = "openssl"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8"
> -
> -DEPENDS = "hostperl-runtime-native"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04"
>
> SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
> file://run-ptest \
> - file://0001-skip-test_symbol_presence.patch \
> file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
> file://afalg.patch \
> - file://reproducible.patch \
> + file://0001-Configure-do-not-tweak-mips-cflags.patch \
> "
>
> SRC_URI:append:class-nativesdk = " \
> @@ -28,9 +23,9 @@ SRC_URI:append:riscv32 = " \
> file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \
> "
>
> -SRC_URI[sha256sum] = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"
> +SRC_URI[sha256sum] = "59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e9eee31f61bc70536"
>
> -inherit lib_package multilib_header multilib_script ptest
> +inherit lib_package multilib_header multilib_script ptest perlnative
> MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
>
> PACKAGECONFIG ?= ""
> @@ -59,19 +54,9 @@ EXTRA_OECONF:class-nativesdk = "--with-rand-seed=os,devrandom"
> CFLAGS:append:class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin"
> CFLAGS:append:class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin"
>
> -# Disable deprecated crypto algorithms
> -# Retained for compatibilty
> -# des (curl)
> -# dh (python-ssl)
> -# dsa (rpm)
> -# md4 (cyrus-sasl freeradius hostapd)
> -# bf (wvstreams postgresql x11vnc crda znc cfengine)
> -# rc4 (freerdp librtorrent ettercap xrdp transmission pam-ssh-agent-auth php)
> -# rc2 (mailx)
> -# psk (qt5)
> -# srp (libest)
> -# whirlpool (qca)
> -DEPRECATED_CRYPTO_FLAGS = "no-ssl no-idea no-rc5 no-md2 no-camellia no-mdc2 no-scrypt no-seed no-siphash no-sm2 no-sm3 no-sm4"
> +# This allows disabling deprecated or undesirable crypto algorithms.
> +# The default is to trust upstream choices.
> +DEPRECATED_CRYPTO_FLAGS ?= ""
>
> do_configure () {
> os=${HOST_OS}
> @@ -146,7 +131,7 @@ do_configure () {
> # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the
> # environment variables set by bitbake. Adjust the environment variables instead.
> HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
> - perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target
> + perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target
> perl ${B}/configdata.pm --dump
> }
>
> @@ -154,43 +139,49 @@ do_install () {
> oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
>
> oe_multilib_header openssl/opensslconf.h
> + oe_multilib_header openssl/configuration.h
>
> # Create SSL structure for packages such as ca-certificates which
> # contain hard-coded paths to /etc/ssl. Debian does the same.
> install -d ${D}${sysconfdir}/ssl
> - mv ${D}${libdir}/ssl-1.1/certs \
> - ${D}${libdir}/ssl-1.1/private \
> - ${D}${libdir}/ssl-1.1/openssl.cnf \
> + mv ${D}${libdir}/ssl-3/certs \
> + ${D}${libdir}/ssl-3/private \
> + ${D}${libdir}/ssl-3/openssl.cnf \
Given that "${libdir}/ssl-3" is all over the recipe, wouldn't it make
sense to turn it into a variable? Then it will at least only be one
place to update the next time they change the version.
> ${D}${sysconfdir}/ssl/
>
> # Although absolute symlinks would be OK for the target, they become
> # invalid if native or nativesdk are relocated from sstate.
> - ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-1.1/certs
> - ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-1.1/private
> - ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf
> + ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-3/certs
> + ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-3/private
> + ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-3/openssl.cnf
> }
>
> do_install:append:class-native () {
> create_wrapper ${D}${bindir}/openssl \
> - OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \
> - SSL_CERT_DIR=${libdir}/ssl-1.1/certs \
> - SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \
> - OPENSSL_ENGINES=${libdir}/engines-1.1
> + OPENSSL_CONF=${libdir}/ssl-3/openssl.cnf \
> + SSL_CERT_DIR=${libdir}/ssl-3/certs \
> + SSL_CERT_FILE=${libdir}/ssl-3/cert.pem \
> + OPENSSL_ENGINES=${libdir}/engines-3
> }
>
> do_install:append:class-nativesdk () {
> mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
> install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
> - sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
> + sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
> }
>
> PTEST_BUILD_HOST_FILES += "configdata.pm"
> PTEST_BUILD_HOST_PATTERN = "perl_version ="
> do_install_ptest () {
> + install -d ${D}${PTEST_PATH}/test
> + install -m755 ${B}/test/p_test.so ${D}${PTEST_PATH}/test
> + install -m755 ${B}/test/provider_internal_test.cnf ${D}${PTEST_PATH}/test
> +
> # Prune the build tree
> rm -f ${B}/fuzz/*.* ${B}/test/*.*
>
> cp ${S}/Configure ${B}/configdata.pm ${D}${PTEST_PATH}
> + sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/configdata.pm
> cp -r ${S}/external ${B}/test ${S}/test ${B}/fuzz ${S}/util ${B}/util ${D}${PTEST_PATH}
>
> # For test_shlibload
> @@ -204,10 +195,20 @@ do_install_ptest () {
>
> install -d ${D}${PTEST_PATH}/engines
> install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
> + install -m755 ${B}/engines/loader_attic.so ${D}${PTEST_PATH}/engines
> +
> + install -d ${D}${PTEST_PATH}/providers
> + install -m755 ${B}/providers/legacy.so ${D}${PTEST_PATH}/providers
> +
> + install -d ${D}${PTEST_PATH}/Configurations
> + cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/
>
> # seems to be needed with perl 5.32.1
> install -d ${D}${PTEST_PATH}/util/perl/recipes
> cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/
> +
> + sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/util/wrap.pl
There is a mix of tab and space indentation above (both in the original
code and in the added lines).
> +
Unnecessary empty line.
> }
>
> # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
> @@ -220,13 +221,13 @@ PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc"
> FILES:libcrypto = "${libdir}/libcrypto${SOLIBS}"
> FILES:libssl = "${libdir}/libssl${SOLIBS}"
> FILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf \
> - ${libdir}/ssl-1.1/openssl.cnf* \
> + ${libdir}/ssl-3/openssl.cnf* \
> "
> -FILES:${PN}-engines = "${libdir}/engines-1.1"
> +FILES:${PN}-engines = "${libdir}/engines-3"
> # ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP)
> -FILES:${PN}-engines:append:mingw32:class-nativesdk = "${prefix}${libdir}/engines-1_1"
> -FILES:${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash"
> -FILES:${PN} =+ "${libdir}/ssl-1.1/*"
> +FILES:${PN}-engines:append:mingw32:class-nativesdk = "${prefix}${libdir}/engines-3"
> +FILES:${PN}-misc = "${libdir}/ssl-3/misc ${bindir}/c_rehash"
> +FILES:${PN} =+ "${libdir}/ssl-3/* ${libdir}/ossl-modules/"
Might as well change the "=+" to "+=".
> FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
>
> CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
> --
> 2.20.1
//Peter
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0
2021-10-11 18:07 ` [OE-core] " Peter Kjellerstedt
@ 2021-10-12 11:02 ` Alexander Kanavin
0 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-12 11:02 UTC (permalink / raw)
To: Peter Kjellerstedt
Cc: openembedded-core, Alexander Kanavin, Hongxu Jia, Richard Purdie
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
On Mon, 11 Oct 2021 at 20:07, Peter Kjellerstedt <
peter.kjellerstedt@axis.com> wrote:
> > - mv ${D}${libdir}/ssl-1.1/certs \
> > - ${D}${libdir}/ssl-1.1/private \
> > - ${D}${libdir}/ssl-1.1/openssl.cnf \
> > + mv ${D}${libdir}/ssl-3/certs \
> > + ${D}${libdir}/ssl-3/private \
> > + ${D}${libdir}/ssl-3/openssl.cnf \
>
> Given that "${libdir}/ssl-3" is all over the recipe, wouldn't it make
> sense to turn it into a variable? Then it will at least only be one
> place to update the next time they change the version.
>
This changes very rarely and adjusting it was a very minor part of doing
the update, essentially a five second copy-replace. Fixing up everything
that broke due to previously long-deprecated APIs becoming hard errors, and
making the ptests pass again was the bulk of it, and I think we're not
quite done yet as I only checked and fixed oe-core and meta-oe. I'd
appreciate if you test other layers.
> There is a mix of tab and space indentation above (both in the original
> code and in the added lines).
>
> > +
>
> Unnecessary empty line.
>
Can you send a followup patch for these please?
Alex
[-- Attachment #2: Type: text/html, Size: 1813 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 08/25] cryptodev-tests: do not use -Werror with openssl 3
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (5 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 09/25] serf: add a openssl 3 compatibility fix Alexander Kanavin
` (16 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../cryptodev/cryptodev-tests_1.12.bb | 1 +
...001-tests-Makefile-do-not-use-Werror.patch | 24 +++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb
index c1adbb6245b..c5414787966 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb
@@ -6,6 +6,7 @@ DEPENDS += "openssl"
SRC_URI += " \
file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \
+file://0001-tests-Makefile-do-not-use-Werror.patch \
"
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch b/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch
new file mode 100644
index 00000000000..347a4aef0fd
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch
@@ -0,0 +1,24 @@
+From e2c2895d52761ddc6384a31364236dd13f677c34 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 10 Sep 2021 10:44:42 +0200
+Subject: [PATCH] tests/Makefile: do not use -Werror
+
+Otherwise, openssl 3 deprecation warnings become errors.
+Reported at https://github.com/cryptodev-linux/cryptodev-linux/issues/67
+
+Upstream-Status: Inappropriate [upstream needs to update the code]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ tests/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 2fb7a9a..e94f80e 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall -Werror
++CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall
+
+ comp_progs := cipher_comp hash_comp hmac_comp
+
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 09/25] serf: add a openssl 3 compatibility fix
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (6 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 08/25] cryptodev-tests: do not use -Werror with openssl 3 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 10/25] ruby: disable openssl extension Alexander Kanavin
` (15 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...sl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 28 +++++++++++++++++++
meta/recipes-support/serf/serf_1.3.9.bb | 1 +
2 files changed, 29 insertions(+)
create mode 100644 meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
new file mode 100644
index 00000000000..e6172ef5aaa
--- /dev/null
+++ b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
@@ -0,0 +1,28 @@
+From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 10 Sep 2021 11:05:10 +0200
+Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC
+
+Upstream removed it in
+https://github.com/openssl/openssl/pull/16004
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ buckets/ssl_buckets.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
+index b01e535..9801f87 100644
+--- a/buckets/ssl_buckets.c
++++ b/buckets/ssl_buckets.c
+@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey)
+ return 0;
+ }
+ else {
+- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err),
+- ERR_GET_FUNC(err),
++ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err),
+ ERR_GET_REASON(err));
+ PKCS12_free(p12);
+ bio_meth_free(biom);
diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.9.bb
index 21515866a90..669f42b8e7c 100644
--- a/meta/recipes-support/serf/serf_1.3.9.bb
+++ b/meta/recipes-support/serf/serf_1.3.9.bb
@@ -12,6 +12,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0003-gen_def.patch \
file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \
file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \
+ file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \
"
SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 10/25] ruby: disable openssl extension
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (7 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 09/25] serf: add a openssl 3 compatibility fix Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 11/25] glib-2.0: update 2.68.4 -> 2.70.0 Alexander Kanavin
` (14 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
It is incompatible with openssl 3 in currently released versions, and given
very marginal use of ruby in oe, I do not think not having it matters.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-devtools/ruby/ruby.inc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc
index c953a270424..2b5caf35f56 100644
--- a/meta/recipes-devtools/ruby/ruby.inc
+++ b/meta/recipes-devtools/ruby/ruby.inc
@@ -37,3 +37,8 @@ do_configure:prepend() {
sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk
rm -rf ${S}/ruby/
}
+
+# Disable openssl extension until it becomes compatible with openssl 3
+do_configure:prepend() {
+ rm -rf ${S}/ext/openssl/extconf.rb
+}
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 11/25] glib-2.0: update 2.68.4 -> 2.70.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (8 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 10/25] ruby: disable openssl extension Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 12/25] glib-networking: update 2.68.2 " Alexander Kanavin
` (13 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Ross Burton
Internal copy of pcre is no longer provided.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...ble-more-tests-while-cross-compiling.patch | 26 ++++++------
.../glib-2.0/glib-2.0/relocate-modules.patch | 8 ++--
.../glib-2.0/glib-2.0/time-test.patch | 40 -------------------
...{glib-2.0_2.68.4.bb => glib-2.0_2.70.0.bb} | 3 +-
meta/recipes-core/glib-2.0/glib.inc | 5 +--
5 files changed, 20 insertions(+), 62 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/time-test.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.68.4.bb => glib-2.0_2.70.0.bb} (95%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
index 41ecfa1df86..9bbb33ffc16 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
@@ -1,4 +1,4 @@
-From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001
+From 73b1c416674d285b021e218da1a3ddb884e606da Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 9 Nov 2015 11:07:27 +0200
Subject: [PATCH] Enable more tests while cross-compiling
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 788cf97..dab65d2 100644
+index 5dbfb8e..3fd7998 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -203,7 +203,7 @@ if host_machine.system() != 'windows'
+@@ -221,7 +221,7 @@ if host_machine.system() != 'windows'
# Test programs that need to bring up a session bus (requires dbus-daemon)
have_dbus_daemon = find_program('dbus-daemon', required : false).found()
@@ -27,7 +27,7 @@ index 788cf97..dab65d2 100644
annotate_args = [
'--annotate', 'org.project.Bar', 'Key1', 'Value1',
'--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
-@@ -548,12 +548,12 @@ if installed_tests_enabled
+@@ -570,12 +570,12 @@ if installed_tests_enabled
endforeach
endif
@@ -42,7 +42,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate-source',
-@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_gresource = custom_target('test.gresource',
input : 'test.gresource.xml',
output : 'test.gresource',
@@ -51,7 +51,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -610,7 +610,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources2_c = custom_target('test_resources2.c',
input : 'test3.gresource.xml',
output : 'test_resources2.c',
@@ -60,7 +60,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate',
-@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -621,7 +621,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources2_h = custom_target('test_resources2.h',
input : 'test3.gresource.xml',
output : 'test_resources2.h',
@@ -69,7 +69,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate',
-@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
input : 'test2.gresource.xml',
depends : big_test_resource,
output : 'test_resources.c',
@@ -78,7 +78,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -644,7 +644,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
digit_test_resources_c = custom_target('digit_test_resources.c',
input : '111_digit_test.gresource.xml',
output : 'digit_test_resources.c',
@@ -87,7 +87,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -655,7 +655,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
digit_test_resources_h = custom_target('digit_test_resources.h',
input : '111_digit_test.gresource.xml',
output : 'digit_test_resources.h',
@@ -96,11 +96,11 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate',
-@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -688,11 +688,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
ld = find_program('ld', required : false)
-- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+- if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+ if not meson.is_cross_build()
test_gresource_binary = custom_target('test5.gresource',
input : 'test5.gresource.xml',
@@ -110,7 +110,7 @@ index 788cf97..dab65d2 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -704,7 +704,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary_c = custom_target('test_resources_binary.c',
input : 'test5.gresource.xml',
output : 'test_resources_binary.c',
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 846c8d62b68..9bfb6e85ccf 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From dac2bdeea38388e069412aa27eff8f1eff0440e5 Mon Sep 17 00:00:00 2001
+From ab071f315deed3740f867161ee58436b985d6fc1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
-index a2909a8..1f4ab82 100644
+index d34037a..7442df6 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -51,6 +51,8 @@
+@@ -54,6 +54,8 @@
#ifdef G_OS_WIN32
#include "gregistrysettingsbackend.h"
#include "giowin32-priv.h"
@@ -31,7 +31,7 @@ index a2909a8..1f4ab82 100644
#endif
#include <glib/gstdio.h>
-@@ -1213,7 +1215,15 @@ get_gio_module_dir (void)
+@@ -1224,7 +1226,15 @@ get_gio_module_dir (void)
NULL);
g_free (install_dir);
#else
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch b/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch
deleted file mode 100644
index 4d7ef97bb56..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2177]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 289f8be1b397a453cfcf35641455f3ae5fb4faeb Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Tue, 6 Jul 2021 19:26:03 +0100
-Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events
- don't happen
-
-The modification time test creates a file, gets the modification time in
-seconds, then gets the modification time in microseconds and assumes
-that the difference between the two has to be above 0.
-
-As rare as this may be, it can happen:
-
-$ stat g-file-info-test-50A450 -c %y
-2021-07-06 18:24:56.000000767 +0100
-
-Change the test to simply assert that the difference not negative to
-handle this case.
----
- gio/tests/g-file-info.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c
-index c11c50462..fd0c64b55 100644
---- a/gio/tests/g-file-info.c
-+++ b/gio/tests/g-file-info.c
-@@ -178,7 +178,7 @@ test_g_file_info_modification_time (void)
- g_assert_nonnull (dt_usecs);
-
- ts = g_date_time_difference (dt_usecs, dt);
-- g_assert_cmpint (ts, >, 0);
-+ g_assert_cmpint (ts, >=, 0);
- g_assert_cmpint (ts, <, G_USEC_PER_SEC);
-
- /* Try round-tripping the modification time. */
---
-2.25.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb
similarity index 95%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb
index cd789de3c01..8217aaa8d06 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb
@@ -17,11 +17,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \
- file://time-test.patch \
"
SRC_URI:append:class-native = " file://relocate-modules.patch"
-SRC_URI[sha256sum] = "62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b"
+SRC_URI[sha256sum] = "200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index a34776b0837..0eef2e330c3 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \
file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
- file://glib/pcre/pcre.h;beginline=8;endline=36;md5=3e2977dae4ad05217f58c446237298fc \
file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
BUGTRACKER = "http://bugzilla.gnome.org"
SECTION = "libs"
@@ -22,6 +21,7 @@ DEPENDS = "glib-2.0-native \
virtual/libintl \
virtual/libiconv \
libffi \
+ libpcre \
zlib"
PACKAGES += "${PN}-codegen ${PN}-utils"
@@ -36,10 +36,9 @@ GTKDOC_MESON_OPTION = "gtk_doc"
S = "${WORKDIR}/glib-${PV}"
-PACKAGECONFIG ??= "system-pcre libmount \
+PACKAGECONFIG ??= "libmount \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
# To use the system pcre it must be configured with --enable-unicode-properties
-PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre"
PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux"
PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
# libelf is auto-detected without a configuration option
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 12/25] glib-networking: update 2.68.2 -> 2.70.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (9 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 11/25] glib-2.0: update 2.68.4 -> 2.70.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 13/25] bison: update 3.7.6 -> 3.8.1 Alexander Kanavin
` (12 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../{glib-networking_2.68.2.bb => glib-networking_2.70.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.68.2.bb => glib-networking_2.70.0.bb} (93%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.68.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.70.0.bb
similarity index 93%
rename from meta/recipes-core/glib-networking/glib-networking_2.68.2.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.70.0.bb
index acea26e0804..fc700e03b71 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.68.2.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.70.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"
DEPENDS = "glib-2.0"
-SRC_URI[archive.sha256sum] = "535ebc054ef697db56a4fffed91bc0e11c8ee1c9acb48aad28c8e1d5c3d5994f"
+SRC_URI[archive.sha256sum] = "66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35"
PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 13/25] bison: update 3.7.6 -> 3.8.1
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (10 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 12/25] glib-networking: update 2.68.2 " Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 14/25] libdnf: update 0.63.1 -> 0.64.0 Alexander Kanavin
` (11 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Joshua Watt
Drop patch merged upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...001-Use-mapped-file-name-for-symbols.patch | 62 -------------------
.../bison/{bison_3.7.6.bb => bison_3.8.1.bb} | 3 +-
2 files changed, 1 insertion(+), 64 deletions(-)
delete mode 100644 meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch
rename meta/recipes-devtools/bison/{bison_3.7.6.bb => bison_3.8.1.bb} (93%)
diff --git a/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch b/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch
deleted file mode 100644
index 568ee4df193..00000000000
--- a/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2a3db4e3b8d33bad5577c2fcfe124ee7a202ef4f Mon Sep 17 00:00:00 2001
-From: Joshua Watt <JPEWhacker@gmail.com>
-Date: Mon, 15 Feb 2021 20:39:57 -0600
-Subject: [PATCH] Use mapped file name for symbols
-
-Applies the file name mapping before exporting it as a symbol. This
-allows the symbols to correctly respect the --file-prefix-map command
-line option.
-
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bison-patches/2021-02/msg00014.html]
----
- src/muscle-tab.c | 4 +++-
- src/output.c | 8 ++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/muscle-tab.c b/src/muscle-tab.c
-index b610d0b8..3e7657ca 100644
---- a/src/muscle-tab.c
-+++ b/src/muscle-tab.c
-@@ -204,8 +204,10 @@ static void
- muscle_syncline_grow (char const *key, location loc)
- {
- obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line);
-+ char *f = map_file_name (loc.start.file);
- obstack_quote (&muscle_obstack,
-- quotearg_style (c_quoting_style, loc.start.file));
-+ quotearg_style (c_quoting_style, f));
-+ free (f);
- obstack_sgrow (&muscle_obstack, ")dnl\n[");
- char const *extension = obstack_finish0 (&muscle_obstack);
- muscle_grow (key, extension, "", "");
-diff --git a/src/output.c b/src/output.c
-index 391d8e65..34dbc671 100644
---- a/src/output.c
-+++ b/src/output.c
-@@ -531,7 +531,9 @@ user_actions_output (FILE *out)
- {
- fprintf (out, "b4_syncline(%d, ",
- rules[r].action_loc.start.line);
-- string_output (out, rules[r].action_loc.start.file);
-+ char *f = map_file_name (rules[r].action_loc.start.file);
-+ string_output (out, f);
-+ free(f);
- fprintf (out, ")dnl\n");
- }
- fprintf (out, "[%*s%s]],\n[[",
-@@ -629,8 +631,10 @@ prepare_symbol_definitions (void)
-
- if (p->code)
- {
-+ char *f = map_file_name (p->location.start.file);
- SET_KEY2 (pname, "file");
-- MUSCLE_INSERT_C_STRING (key, p->location.start.file);
-+ MUSCLE_INSERT_C_STRING (key, f);
-+ free (f);
-
- SET_KEY2 (pname, "line");
- MUSCLE_INSERT_INT (key, p->location.start.line);
---
-2.30.0
-
diff --git a/meta/recipes-devtools/bison/bison_3.7.6.bb b/meta/recipes-devtools/bison/bison_3.8.1.bb
similarity index 93%
rename from meta/recipes-devtools/bison/bison_3.7.6.bb
rename to meta/recipes-devtools/bison/bison_3.8.1.bb
index c85ae049766..a6159b007ab 100644
--- a/meta/recipes-devtools/bison/bison_3.7.6.bb
+++ b/meta/recipes-devtools/bison/bison_3.8.1.bb
@@ -11,9 +11,8 @@ DEPENDS = "bison-native flex-native"
SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
file://add-with-bisonlocaledir.patch \
- file://0001-Use-mapped-file-name-for-symbols.patch \
"
-SRC_URI[sha256sum] = "67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf"
+SRC_URI[sha256sum] = "31fc602488aad6bdecf0ccc556e0fc72fc57cdc595cf92398f020e0cf4980f15"
inherit autotools gettext texinfo
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 14/25] libdnf: update 0.63.1 -> 0.64.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (11 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 13/25] bison: update 3.7.6 -> 3.8.1 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 15/25] libexif: update 0.6.22 -> 0.6.23 Alexander Kanavin
` (10 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Alexander Kanavin
Drop patch merged upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...avoid-the-use-of-non-portable-__WORD.patch | 34 -------------------
.../{libdnf_0.63.1.bb => libdnf_0.64.0.bb} | 3 +-
2 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.63.1.bb => libdnf_0.64.0.bb} (93%)
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch
deleted file mode 100644
index b740521fdaa..00000000000
--- a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 9 Mar 2021 19:30:42 +0000
-Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- libdnf/config.h | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/libdnf/config.h b/libdnf/config.h
-index 01b330b4..dbd53f5e 100644
---- a/libdnf/config.h
-+++ b/libdnf/config.h
-@@ -20,14 +20,11 @@
-
- #ifdef __APPLE__
- #include <stdint.h>
--#else
--#include <bits/wordsize.h>
- #endif
-+#include <limits.h>
-
--#if __WORDSIZE == 32
--#include "config-32.h"
--#elif __WORDSIZE == 64
-+#if (ULONG_MAX == 0xffffffffffffffff)
- #include "config-64.h"
- #else
--#error "Unknown word size"
-+#include "config-32.h"
- #endif
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.64.0.bb
similarity index 93%
rename from meta/recipes-devtools/libdnf/libdnf_0.63.1.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.64.0.bb
index a9f393e7225..38d3307b118 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.64.0.bb
@@ -11,12 +11,11 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
file://0001-Add-WITH_TESTS-option.patch \
file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
file://enable_test_data_dir_set.patch \
- file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \
file://0001-drop-FindPythonInstDir.cmake.patch \
file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \
"
-SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9"
+SRCREV = "e5ecbc1e5062631f44cb94a3b73d9310db0ff386"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 15/25] libexif: update 0.6.22 -> 0.6.23
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (12 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 14/25] libdnf: update 0.63.1 -> 0.64.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 16/25] sudo: update 1.9.7p2 -> 1.9.8p1 Alexander Kanavin
` (9 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Changqing Li
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../libexif/files/CVE-2020-0198.patch | 66 -------------------
.../libexif/files/CVE-2020-0452.patch | 39 -----------
.../{libexif_0.6.22.bb => libexif_0.6.23.bb} | 6 +-
3 files changed, 2 insertions(+), 109 deletions(-)
delete mode 100644 meta/recipes-support/libexif/files/CVE-2020-0198.patch
delete mode 100644 meta/recipes-support/libexif/files/CVE-2020-0452.patch
rename meta/recipes-support/libexif/{libexif_0.6.22.bb => libexif_0.6.23.bb} (75%)
diff --git a/meta/recipes-support/libexif/files/CVE-2020-0198.patch b/meta/recipes-support/libexif/files/CVE-2020-0198.patch
deleted file mode 100644
index 2a48844cb2b..00000000000
--- a/meta/recipes-support/libexif/files/CVE-2020-0198.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From ca71eda33fe8421f98fbe20eb4392473357c1c43 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 30 Dec 2020 10:22:47 +0800
-Subject: [PATCH] fixed another unsigned integer overflow
-
-first fixed by google in android fork,
-https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0
-
-(use a more generic overflow check method, also check second overflow instance.)
-
-https://security-tracker.debian.org/tracker/CVE-2020-0198
-
-Upstream-Status: Backport[https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c]
-CVE: CVE-2020-0198
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- libexif/exif-data.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libexif/exif-data.c b/libexif/exif-data.c
-index 8b280d3..34d58fc 100644
---- a/libexif/exif-data.c
-+++ b/libexif/exif-data.c
-@@ -47,6 +47,8 @@
- #undef JPEG_MARKER_APP1
- #define JPEG_MARKER_APP1 0xe1
-
-+#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize ))
-+
- static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
-
- struct _ExifDataPrivate
-@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d,
- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o);
- return;
- }
-- if (s > ds - o) {
-+ if (CHECKOVERFLOW(o,ds,s)) {
- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o);
- return;
- }
-@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
- }
-
- /* Read the number of entries */
-- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) {
-+ if (CHECKOVERFLOW(offset, ds, 2)) {
- exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
-- "Tag data past end of buffer (%u > %u)", offset+2, ds);
-+ "Tag data past end of buffer (%u+2 > %u)", offset, ds);
- return;
- }
- n = exif_get_short (d + offset, data->priv->order);
-@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
- offset += 2;
-
- /* Check if we have enough data. */
-- if (offset + 12 * n > ds) {
-+ if (CHECKOVERFLOW(offset, ds, 12*n)) {
- n = (ds - offset) / 12;
- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
- "Short data; only loading %hu entries...", n);
---
-2.17.1
-
diff --git a/meta/recipes-support/libexif/files/CVE-2020-0452.patch b/meta/recipes-support/libexif/files/CVE-2020-0452.patch
deleted file mode 100644
index a117b8b3691..00000000000
--- a/meta/recipes-support/libexif/files/CVE-2020-0452.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 302acd49eba0a125b0f20692df6abc6f7f7ca53e Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 30 Dec 2020 10:18:51 +0800
-Subject: [PATCH] fixed a incorrect overflow check that could be optimized
- away.
-
-inspired by:
-https://android.googlesource.com/platform/external/libexif/+/8e7345f3bc0bad06ac369d6cbc1124c8ceaf7d4b
-
-https://source.android.com/security/bulletin/2020-11-01
-
-CVE-2020-0452
-
-Upsteam-Status: Backport[https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06]
-CVE: CVE-2020-0452
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- libexif/exif-entry.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
-index 5de215f..3a6ce84 100644
---- a/libexif/exif-entry.c
-+++ b/libexif/exif-entry.c
-@@ -1371,8 +1371,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
- {
- unsigned char *utf16;
-
-- /* Sanity check the size to prevent overflow */
-- if (e->size+sizeof(uint16_t)+1 < e->size) break;
-+ /* Sanity check the size to prevent overflow. Note EXIF files are 64kb at most. */
-+ if (e->size >= 65536 - sizeof(uint16_t)*2) break;
-
- /* The tag may not be U+0000-terminated , so make a local
- U+0000-terminated copy before converting it */
---
-2.17.1
-
diff --git a/meta/recipes-support/libexif/libexif_0.6.22.bb b/meta/recipes-support/libexif/libexif_0.6.23.bb
similarity index 75%
rename from meta/recipes-support/libexif/libexif_0.6.22.bb
rename to meta/recipes-support/libexif/libexif_0.6.23.bb
index 9ca96d548c2..b33522dfc42 100644
--- a/meta/recipes-support/libexif/libexif_0.6.22.bb
+++ b/meta/recipes-support/libexif/libexif_0.6.23.bb
@@ -10,12 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
def version_underscore(v):
return "_".join(v.split("."))
-SRC_URI = "https://github.com/libexif/libexif/releases/download/libexif-${@version_underscore("${PV}")}-release/libexif-${PV}.tar.xz \
- file://CVE-2020-0198.patch \
- file://CVE-2020-0452.patch \
+SRC_URI = "https://github.com/libexif/libexif/releases/download/v${PV}/libexif-${PV}.tar.xz \
"
-SRC_URI[sha256sum] = "5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56"
+SRC_URI[sha256sum] = "a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431"
UPSTREAM_CHECK_URI = "https://github.com/libexif/libexif/releases/"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 16/25] sudo: update 1.9.7p2 -> 1.9.8p1
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (13 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 15/25] libexif: update 0.6.22 -> 0.6.23 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 17/25] wget: update 1.21.1 -> 1.21.2 Alexander Kanavin
` (8 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop specialhandling for mksig items; issue fixed upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
| 25 +++++++++++++++++++
meta/recipes-extended/sudo/sudo.inc | 16 ++++++------
.../sudo/{sudo_1.9.7p2.bb => sudo_1.9.8p1.bb} | 3 ++-
3 files changed, 34 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch
rename meta/recipes-extended/sudo/{sudo_1.9.7p2.bb => sudo_1.9.8p1.bb} (92%)
--git a/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch b/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch
new file mode 100644
index 00000000000..e7875c96f7c
--- /dev/null
+++ b/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch
@@ -0,0 +1,25 @@
+From f993c5c88faacc43971899aae2168ffb3e34dc80 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 24 Sep 2021 13:36:24 +0200
+Subject: [PATCH] lib/util/mksigname.c: correctly include header for out of
+ tree builds
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ lib/util/mksigname.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c
+index de8b1ad..0a69e7e 100644
+--- a/lib/util/mksigname.c
++++ b/lib/util/mksigname.c
+@@ -36,7 +36,7 @@ main(int argc, char *argv[])
+ {
+ unsigned int i;
+
+-#include "mksigname.h"
++#include "lib/util/mksigname.h"
+
+ printf("const char *const sudo_sys_signame[] = {\n");
+ for (i = 0; i < nitems(sudo_sys_signame); i++) {
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 6a18609adcb..82040de8aa1 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
BUGTRACKER = "http://www.sudo.ws/bugs/"
SECTION = "admin"
LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=fdff64d4fd19126330aa81b94d167173 \
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=b969d389e79703121cbffc9f3ea18a8b \
file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \
@@ -30,15 +30,13 @@ EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor"
EXTRA_OECONF:append:libc-musl = " --disable-hardening "
-# mksigname/mksiglist are used on build host to generate source files
do_compile:prepend () {
- # Remove build host references from sudo_usage.h
- sed -i \
- -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
- -e 's,--build=${BUILD_SYS},,g' \
- -e 's,--host=${HOST_SYS},,g' \
- ${B}/src/sudo_usage.h
- oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist
+ # Remove build host references from sudo_usage.h
+ sed -i \
+ -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
+ -e 's,--build=${BUILD_SYS},,g' \
+ -e 's,--host=${HOST_SYS},,g' \
+ ${B}/src/sudo_usage.h
}
# Explicitly create ${localstatedir}/lib before do_install to ensure
diff --git a/meta/recipes-extended/sudo/sudo_1.9.7p2.bb b/meta/recipes-extended/sudo/sudo_1.9.8p1.bb
similarity index 92%
rename from meta/recipes-extended/sudo/sudo_1.9.7p2.bb
rename to meta/recipes-extended/sudo/sudo_1.9.8p1.bb
index 9b5b2f3c694..4545d8766e9 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.7p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.8p1.bb
@@ -3,11 +3,12 @@ require sudo.inc
SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \
+ file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \
"
PAM_SRC_URI = "file://sudo.pam"
-SRC_URI[sha256sum] = "28b5ee725dbf89a7852f42f309ca877d2810a9531b4eecfe59f3a84b6b4afca8"
+SRC_URI[sha256sum] = "0939ee24df7095a92e0ca4aa3bd53b2a10965a7b921d51a26ab70cdd24388d69"
DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 17/25] wget: update 1.21.1 -> 1.21.2
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (14 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 16/25] sudo: update 1.9.7p2 -> 1.9.8p1 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 18/25] coreutils: update 8.32 -> 9.0 Alexander Kanavin
` (7 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-extended/wget/wget.inc | 2 ++
meta/recipes-extended/wget/{wget_1.21.1.bb => wget_1.21.2.bb} | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
rename meta/recipes-extended/wget/{wget_1.21.1.bb => wget_1.21.2.bb} (60%)
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index cd7290be579..2491199f18c 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
inherit autotools gettext texinfo update-alternatives pkgconfig
+DEPENDS += "autoconf-archive"
+
EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
--disable-rpath"
diff --git a/meta/recipes-extended/wget/wget_1.21.1.bb b/meta/recipes-extended/wget/wget_1.21.2.bb
similarity index 60%
rename from meta/recipes-extended/wget/wget_1.21.1.bb
rename to meta/recipes-extended/wget/wget_1.21.2.bb
index 21385bbfb27..90f3eb104dc 100644
--- a/meta/recipes-extended/wget/wget_1.21.1.bb
+++ b/meta/recipes-extended/wget/wget_1.21.2.bb
@@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
file://0002-improve-reproducibility.patch \
"
-SRC_URI[sha256sum] = "59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e"
+SRC_URI[sha256sum] = "e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497"
require wget.inc
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 18/25] coreutils: update 8.32 -> 9.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (15 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 17/25] wget: update 1.21.1 -> 1.21.2 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 19/25] itstool: update 2.0.6 -> 2.0.7 Alexander Kanavin
` (6 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core
Cc: Alexander Kanavin, Anders Wallin, Alexander Kanavin,
Adam Borowski, Paul Gortmaker
License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch | 167 ------------------
...8.31-behavior-on-removed-directories.patch | 99 -----------
.../coreutils/disable-ls-output-quoting.patch | 49 -----
...6ebd536e82b15542a00c888109471936bfda.patch | 93 ++++++++++
.../coreutils/fix-selinux-flask.patch | 7 +-
.../{coreutils_8.32.bb => coreutils_9.0.bb} | 10 +-
6 files changed, 100 insertions(+), 325 deletions(-)
delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch
delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch
delete mode 100644 meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch
create mode 100644 meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
rename meta/recipes-core/coreutils/{coreutils_8.32.bb => coreutils_9.0.bb} (94%)
diff --git a/meta/recipes-core/coreutils/coreutils/0001-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch b/meta/recipes-core/coreutils/coreutils/0001-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch
deleted file mode 100644
index 06b6307dab0..00000000000
--- a/meta/recipes-core/coreutils/coreutils/0001-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 3a48610860a9a75692d2cbedde69ac15269d540a Mon Sep 17 00:00:00 2001
-Message-Id: <3a48610860a9a75692d2cbedde69ac15269d540a.1624302273.git.wallinux@gmail.com>
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Wed, 15 Apr 2020 20:50:32 -0700
-Subject: [PATCH] fts: remove NOSTAT_LEAF_OPTIMIZATION
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It caused ‘find’ and ‘du’ to dump core, and it was useful
-only for obsolescent Linux filesystems anyway. Problem reported in:
-https://lists.gnu.org/r/bug-gnulib/2020-04/msg00068.html
-Quite possibly there is still a serious underlying fts bug with
-tight-loop-check and mutating file systems, but if so this patch
-should cause the bug to be triggered less often.
-* lib/fts.c (enum leaf_optimization): Remove
-NOSTAT_LEAF_OPTIMIZATION, as it’s problematic.
-(S_MAGIC_REISERFS, S_MAGIC_XFS): Remove; no longer needed.
-(leaf_optimization): Remove special cases for ReiserFS and XFS.
-(fts_read): Remove NOSTAT_LEAF_OPTIMIZATION code.
-* lib/fts_.h (struct _ftsent.fts_n_dirs_remaining):
-Remove. All uses removed.
-
-Upstream-Status: Backport [upstream gnulib commit:
-47bf2cf3184027c1eb9c1dfeea5c5b8b2d69710d]
-
-Signed-off-by: Anders Wallin <wallinux@gmail.com>
----
- lib/fts.c | 56 ++++++++----------------------------------------------
- lib/fts_.h | 5 -----
- 2 files changed, 8 insertions(+), 53 deletions(-)
-
-diff --git a/lib/fts.c b/lib/fts.c
-index d3a0472..ade8c33 100644
---- a/lib/fts.c
-+++ b/lib/fts.c
-@@ -445,7 +445,6 @@ fts_open (char * const *argv,
- if ((parent = fts_alloc(sp, "", 0)) == NULL)
- goto mem2;
- parent->fts_level = FTS_ROOTPARENTLEVEL;
-- parent->fts_n_dirs_remaining = -1;
- }
-
- /* The classic fts implementation would call fts_stat with
-@@ -634,9 +633,8 @@ fts_close (FTS *sp)
- }
-
- /* Minimum link count of a traditional Unix directory. When leaf
-- optimization is OK and MIN_DIR_NLINK <= st_nlink, then st_nlink is
-- an upper bound on the number of subdirectories (counting "." and
-- ".."). */
-+ optimization is OK and a directory's st_nlink == MIN_DIR_NLINK,
-+ then the directory has no subdirectories. */
- enum { MIN_DIR_NLINK = 2 };
-
- /* Whether leaf optimization is OK for a directory. */
-@@ -645,12 +643,8 @@ enum leaf_optimization
- /* st_nlink is not reliable for this directory's subdirectories. */
- NO_LEAF_OPTIMIZATION,
-
-- /* Leaf optimization is OK, but is not useful for avoiding stat calls. */
-- OK_LEAF_OPTIMIZATION,
--
-- /* Leaf optimization is not only OK: it is useful for avoiding
-- stat calls, because dirent.d_type does not work. */
-- NOSTAT_LEAF_OPTIMIZATION
-+ /* st_nlink == 2 means the directory lacks subdirectories. */
-+ OK_LEAF_OPTIMIZATION
- };
-
- #if (defined __linux__ || defined __ANDROID__) \
-@@ -663,9 +657,7 @@ enum leaf_optimization
- # define S_MAGIC_CIFS 0xFF534D42
- # define S_MAGIC_NFS 0x6969
- # define S_MAGIC_PROC 0x9FA0
--# define S_MAGIC_REISERFS 0x52654973
- # define S_MAGIC_TMPFS 0x1021994
--# define S_MAGIC_XFS 0x58465342
-
- # ifdef HAVE___FSWORD_T
- typedef __fsword_t fsword;
-@@ -782,23 +774,15 @@ dirent_inode_sort_may_be_useful (FTSENT const *p, int dir_fd)
- }
-
- /* Given an FTS entry P for a directory with descriptor DIR_FD,
-- return true if it is both useful and valid to apply leaf optimization.
-- The optimization is useful only for file systems that lack usable
-- dirent.d_type info. The optimization is valid if an st_nlink value
-- of at least MIN_DIR_NLINK is an upper bound on the number of
-- subdirectories of D, counting "." and ".." as subdirectories.
-+ return whether it is valid to apply leaf optimization.
-+ The optimization is valid if a directory's st_nlink value equal
-+ to MIN_DIR_NLINK means the directory has no subdirectories.
- DIR_FD is negative if unavailable. */
- static enum leaf_optimization
- leaf_optimization (FTSENT const *p, int dir_fd)
- {
- switch (filesystem_type (p, dir_fd))
- {
-- /* List here the file system types that may lack usable dirent.d_type
-- info, yet for which the optimization does apply. */
-- case S_MAGIC_REISERFS:
-- case S_MAGIC_XFS: /* XFS lacked it until 2013-08-22 commit. */
-- return NOSTAT_LEAF_OPTIMIZATION;
--
- case 0:
- /* Leaf optimization is unsafe if the file system type is unknown. */
- FALLTHROUGH;
-@@ -1023,26 +1007,7 @@ check_for_dir:
- if (p->fts_info == FTS_NSOK)
- {
- if (p->fts_statp->st_size == FTS_STAT_REQUIRED)
-- {
-- FTSENT *parent = p->fts_parent;
-- if (parent->fts_n_dirs_remaining == 0
-- && ISSET(FTS_NOSTAT)
-- && ISSET(FTS_PHYSICAL)
-- && (leaf_optimization (parent, sp->fts_cwd_fd)
-- == NOSTAT_LEAF_OPTIMIZATION))
-- {
-- /* nothing more needed */
-- }
-- else
-- {
-- p->fts_info = fts_stat(sp, p, false);
-- if (S_ISDIR(p->fts_statp->st_mode)
-- && p->fts_level != FTS_ROOTLEVEL
-- && 0 < parent->fts_n_dirs_remaining
-- && parent->fts_n_dirs_remaining != (nlink_t) -1)
-- parent->fts_n_dirs_remaining--;
-- }
-- }
-+ p->fts_info = fts_stat(sp, p, false);
- else
- fts_assert (p->fts_statp->st_size == FTS_NO_STAT_REQUIRED);
- }
-@@ -1826,11 +1791,6 @@ err: memset(sbp, 0, sizeof(struct stat));
- }
-
- if (S_ISDIR(sbp->st_mode)) {
-- p->fts_n_dirs_remaining
-- = ((sbp->st_nlink < MIN_DIR_NLINK
-- || p->fts_level <= FTS_ROOTLEVEL)
-- ? -1
-- : sbp->st_nlink - (ISSET (FTS_SEEDOT) ? 0 : MIN_DIR_NLINK));
- if (ISDOT(p->fts_name)) {
- /* Command-line "." and ".." are real directories. */
- return (p->fts_level == FTS_ROOTLEVEL ? FTS_D : FTS_DOT);
-diff --git a/lib/fts_.h b/lib/fts_.h
-index 6c7d0ce..15c248c 100644
---- a/lib/fts_.h
-+++ b/lib/fts_.h
-@@ -219,11 +219,6 @@ typedef struct _ftsent {
-
- size_t fts_namelen; /* strlen(fts_name) */
-
-- /* If not (nlink_t) -1, an upper bound on the number of
-- remaining subdirectories of interest. If this becomes
-- zero, some work can be avoided. */
-- nlink_t fts_n_dirs_remaining;
--
- # define FTS_D 1 /* preorder directory */
- # define FTS_DC 2 /* directory that causes cycles */
- # define FTS_DEFAULT 3 /* none of the above */
---
-2.32.0
-
diff --git a/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index fa900e3a761..00000000000
--- a/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 7c273e5c6041f8c70f73f5b280fbb8f27d9b5a36 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu, 5 Mar 2020 17:25:29 -0800
-Subject: [PATCH] ls: restore 8.31 behavior on removed directories
-
-* NEWS: Mention this.
-* src/ls.c: Do not include <sys/sycall.h>
-(print_dir): Don't worry about whether the directory is removed.
-* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
-behavior.
-
-Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/10fcb97bd728f09d4a027eddf8ad2900f0819b0a]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- src/ls.c | 22 ----------------------
- tests/ls/removed-directory.sh | 10 ++--------
- 2 files changed, 2 insertions(+), 30 deletions(-)
-
-diff --git a/src/ls.c b/src/ls.c
-index 637fe7a..0111f49 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -49,10 +49,6 @@
- # include <sys/ptem.h>
- #endif
-
--#ifdef __linux__
--# include <sys/syscall.h>
--#endif
--
- #include <stdio.h>
- #include <assert.h>
- #include <setjmp.h>
-@@ -2895,7 +2891,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- struct dirent *next;
- uintmax_t total_blocks = 0;
- static bool first = true;
-- bool found_any_entries = false;
-
- errno = 0;
- dirp = opendir (name);
-@@ -2971,7 +2966,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- next = readdir (dirp);
- if (next)
- {
-- found_any_entries = true;
- if (! file_ignored (next->d_name))
- {
- enum filetype type = unknown;
-@@ -3017,22 +3011,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- if (errno != EOVERFLOW)
- break;
- }
--#ifdef __linux__
-- else if (! found_any_entries)
-- {
-- /* If readdir finds no directory entries at all, not even "." or
-- "..", then double check that the directory exists. */
-- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
-- && errno != EINVAL)
-- {
-- /* We exclude EINVAL as that pertains to buffer handling,
-- and we've passed NULL as the buffer for simplicity.
-- ENOENT is returned if appropriate before buffer handling. */
-- file_failure (command_line_arg, _("reading directory %s"), name);
-- }
-- break;
-- }
--#endif
- else
- break;
-
-diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
-index e8c835d..fe8f929 100755
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -26,20 +26,14 @@ case $host_triplet in
- *) skip_ 'non linux kernel' ;;
- esac
-
--LS_FAILURE=2
--
--cat <<\EOF >exp-err || framework_failure_
--ls: reading directory '.': No such file or directory
--EOF
--
- cwd=$(pwd)
- mkdir d || framework_failure_
- cd d || framework_failure_
- rmdir ../d || framework_failure_
-
--returns_ $LS_FAILURE ls >../out 2>../err || fail=1
-+ls >../out 2>../err || fail=1
- cd "$cwd" || framework_failure_
- compare /dev/null out || fail=1
--compare exp-err err || fail=1
-+compare /dev/null err || fail=1
-
- Exit $fail
diff --git a/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch b/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch
deleted file mode 100644
index e68c2135506..00000000000
--- a/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Subject: revert inconsistent ls quoting
-
-This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc.
-
-Bug-Debian: https://bugs.debian.org/813164
-
-Upstream-Status: Submitted
-
-Originally-by: Adam Borowski <kilobyte@angband.pl>
-[PG: patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813164#78 ]
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-
----
-
---- coreutils-8.25.orig/NEWS
-+++ coreutils-8.25/NEWS
-@@ -71,9 +71,6 @@ GNU coreutils NEWS
- df now prefers sources towards the root of a device when
- eliding duplicate bind mounted entries.
-
-- ls now quotes file names unambiguously and appropriate for use in a shell,
-- when outputting to a terminal.
--
- join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter.
-
- ** Improvements
---- coreutils-8.25.orig/doc/coreutils.texi
-+++ coreutils-8.25/doc/coreutils.texi
-@@ -7750,8 +7750,8 @@ this"} in the default C locale. This lo
-
- You can specify the default value of the @option{--quoting-style} option
- with the environment variable @env{QUOTING_STYLE}@. If that environment
--variable is not set, the default value is @samp{shell-escape} when the
--output is a terminal, and @samp{literal} otherwise.
-+variable is not set, the default value is @samp{literal}, but this
-+default may change to @samp{shell} in a future version of this package.
-
- @item --show-control-chars
- @opindex --show-control-chars
---- coreutils-8.25.orig/src/ls.c
-+++ coreutils-8.25/src/ls.c
-@@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv)
- if (isatty (STDOUT_FILENO))
- {
- format = many_per_line;
-- set_quoting_style (NULL, shell_escape_quoting_style);
- /* See description of qmark_funny_chars, above. */
- qmark_funny_chars = true;
- }
diff --git a/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch b/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
new file mode 100644
index 00000000000..d69ee95e4a8
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
@@ -0,0 +1,93 @@
+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: [PATCH] chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ src/chmod.c | 4 ++--
+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
+ tests/local.mk | 1 +
+ 4 files changed, 40 insertions(+), 2 deletions(-)
+ create mode 100755 tests/chmod/ignore-symlink.sh
+
+diff --git a/src/chmod.c b/src/chmod.c
+index 37b04f500..57ac47f33 100644
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+ enum
+ {
+ CH_NO_STAT,
+- CH_NOT_APPLIED,
+ CH_FAILED,
++ CH_NOT_APPLIED,
+ CH_NO_CHANGE_REQUESTED,
+ CH_SUCCEEDED
+ }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+ if ( ! recurse)
+ fts_set (fts, ent, FTS_SKIP);
+
+- return CH_NO_CHANGE_REQUESTED <= ch.status;
++ return CH_NOT_APPLIED <= ch.status;
+ }
+
+ /* Recursively change the modes of the specified FILES (the last entry
+diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
+new file mode 100755
+index 000000000..5ce3de816
+--- /dev/null
++++ b/tests/chmod/ignore-symlink.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++# Test for proper exit code of chmod on a processed symlink.
++
++# Copyright (C) 2021 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ chmod
++
++mkdir dir || framework_failure_
++touch dir/f || framework_failure_
++ln -s f dir/l || framework_failure_
++
++# This operation ignores symlinks but should succeed.
++chmod u+w -R dir 2> out || fail=1
++
++compare /dev/null out || fail=1
++
++Exit $fail
+diff --git a/tests/local.mk b/tests/local.mk
+index 228d0e368..b5b893fb7 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -456,6 +456,7 @@ all_tests = \
+ tests/chmod/c-option.sh \
+ tests/chmod/equal-x.sh \
+ tests/chmod/equals.sh \
++ tests/chmod/ignore-symlink.sh \
+ tests/chmod/inaccessible.sh \
+ tests/chmod/octal.sh \
+ tests/chmod/setgid.sh \
diff --git a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
index 173a57925ba..4f126ad67c6 100644
--- a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
+++ b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
@@ -1,4 +1,4 @@
-From 7e20a7242ba2657f73311bbf5278093da67f0721 Mon Sep 17 00:00:00 2001
+From b04363018b4b9b45fdf23384f30d02caa5564602 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 16 Sep 2014 01:59:08 -0700
Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
@@ -19,16 +19,17 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
-index dead90e..0abf0bd 100644
+index 3857233..c01fb30 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
-@@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT],
+@@ -1953,11 +1953,11 @@ AC_DEFUN([gl_INIT],
AC_LIBOBJ([select])
fi
gl_SYS_SELECT_MODULE_INDICATOR([select])
- AC_CHECK_HEADERS([selinux/flask.h])
gl_HEADERS_SELINUX_SELINUX_H
gl_HEADERS_SELINUX_CONTEXT_H
+ gl_HEADERS_SELINUX_LABEL_H
if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
+ AC_CHECK_HEADERS([selinux/flask.h])
AC_LIBOBJ([getfilecon])
diff --git a/meta/recipes-core/coreutils/coreutils_8.32.bb b/meta/recipes-core/coreutils/coreutils_9.0.bb
similarity index 94%
rename from meta/recipes-core/coreutils/coreutils_8.32.bb
rename to meta/recipes-core/coreutils/coreutils_9.0.bb
index 01acf9a8747..0800bc3b6d4 100644
--- a/meta/recipes-core/coreutils/coreutils_8.32.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/"
BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
- file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \
+ file://src/ls.c;beginline=1;endline=15;md5=3b8fbaee597c8a9bb88d30840d53048c \
"
DEPENDS = "gmp libcap"
DEPENDS:class-native = ""
@@ -17,21 +17,17 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://remove-usr-local-lib-from-m4.patch \
file://fix-selinux-flask.patch \
file://0001-uname-report-processor-and-hardware-correctly.patch \
- file://disable-ls-output-quoting.patch \
file://0001-local.mk-fix-cross-compiling-problem.patch \
+ file://e8b56ebd536e82b15542a00c888109471936bfda.patch \
file://run-ptest \
- file://0001-ls-restore-8.31-behavior-on-removed-directories.patch \
- file://0001-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch \
"
-SRC_URI[md5sum] = "022042695b7d5bcf1a93559a9735e668"
-SRC_URI[sha256sum] = "4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa"
+SRC_URI[sha256sum] = "ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce"
# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
# runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue.
CVE_CHECK_WHITELIST += "CVE-2016-2781"
-EXTRA_OECONF:class-native = "--without-gmp"
EXTRA_OECONF:class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
EXTRA_OECONF:class-nativesdk = "--enable-install-program=arch,hostname"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 19/25] itstool: update 2.0.6 -> 2.0.7
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (16 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 18/25] coreutils: update 8.32 -> 9.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 20/25] nghttp2: add recipe from meta-oe Alexander Kanavin
` (5 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
...ve-Don-t-use-build-time-hardcoded-python-binary-.patch | 8 +++-----
.../itstool/{itstool_2.0.6.bb => itstool_2.0.7.bb} | 6 +++---
2 files changed, 6 insertions(+), 8 deletions(-)
rename meta/recipes-support/itstool/{itstool_2.0.6.bb => itstool_2.0.7.bb} (81%)
diff --git a/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
index 19a858bd75e..fdcbe46fedb 100644
--- a/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
+++ b/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch
@@ -1,4 +1,4 @@
-From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001
+From c47820450ce7f55d22c672cf94d20a5f9fd208bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 27 Oct 2019 16:38:52 +0100
Subject: [PATCH] Native: Don't use build time hardcoded python binary path.
@@ -16,12 +16,13 @@ don't support it [2]
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
---
itstool.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/itstool.in b/itstool.in
-index e64cd34..05d264f 100755
+index c21ad4b..daea177 100755
--- a/itstool.in
+++ b/itstool.in
@@ -1,4 +1,4 @@
@@ -30,6 +31,3 @@ index e64cd34..05d264f 100755
#
# Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org>
#
---
-2.21.0
-
diff --git a/meta/recipes-support/itstool/itstool_2.0.6.bb b/meta/recipes-support/itstool/itstool_2.0.7.bb
similarity index 81%
rename from meta/recipes-support/itstool/itstool_2.0.6.bb
rename to meta/recipes-support/itstool/itstool_2.0.7.bb
index eba53e728d1..2416835d370 100644
--- a/meta/recipes-support/itstool/itstool_2.0.6.bb
+++ b/meta/recipes-support/itstool/itstool_2.0.7.bb
@@ -11,13 +11,13 @@ inherit autotools python3native
DEPENDS = "libxml2-native"
-SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2 \
+ "
SRC_URI:append:class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
SRC_URI:append:class-nativesdk = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
SRC_URI:append:class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch"
-SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1"
-SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
+SRC_URI[sha256sum] = "6b9a7cd29a12bb95598f5750e8763cee78836a1a207f85b74d8b3275b27e87ca"
BBCLASSEXTEND = "native nativesdk"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 20/25] nghttp2: add recipe from meta-oe
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (17 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 19/25] itstool: update 2.0.6 -> 2.0.7 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 21/25] libsoup: add a 3.x recipe Alexander Kanavin
` (4 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
It is needed for latest libsoup.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/conf/distro/include/maintainers.inc | 1 +
...0001-fetch-ocsp-response-use-python3.patch | 27 ++++++++++++++
.../recipes-support/nghttp2/nghttp2_1.45.1.bb | 35 +++++++++++++++++++
3 files changed, 63 insertions(+)
create mode 100644 meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
create mode 100644 meta/recipes-support/nghttp2/nghttp2_1.45.1.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index e359da3cd04..c203f352caf 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -535,6 +535,7 @@ RECIPE_MAINTAINER:pn-netbase = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-nettle = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-nfs-export-root = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER:pn-nfs-utils = "Robert Yang <liezhi.yang@windriver.com>"
+RECIPE_MAINTAINER:pn-nghttp2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-ninja = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch b/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
new file mode 100644
index 00000000000..e4db09638f8
--- /dev/null
+++ b/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
@@ -0,0 +1,27 @@
+From 73ec79432fc557a8be4f1500982b1c0f5fdf12a9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
+Date: Thu, 7 Nov 2019 09:58:52 +0000
+Subject: [PATCH] fetch-ocsp-response: use python3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: André Draszik <git@andred.net>
+---
+ script/fetch-ocsp-response | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/script/fetch-ocsp-response b/script/fetch-ocsp-response
+index 0ff7461..185116b 100755
+--- a/script/fetch-ocsp-response
++++ b/script/fetch-ocsp-response
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+
+ # nghttp2 - HTTP/2 C Library
+--
+2.23.0.rc1
+
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.45.1.bb b/meta/recipes-support/nghttp2/nghttp2_1.45.1.bb
new file mode 100644
index 00000000000..3de509a27c1
--- /dev/null
+++ b/meta/recipes-support/nghttp2/nghttp2_1.45.1.bb
@@ -0,0 +1,35 @@
+SUMMARY = "HTTP/2 C Library and tools"
+HOMEPAGE = "https://nghttp2.org/"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
+
+UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases"
+
+SRC_URI = "\
+ https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \
+ file://0001-fetch-ocsp-response-use-python3.patch \
+"
+SRC_URI[sha256sum] = "abdc4addccadbc7d89abe27c4d6427d78e57d139f69c1f45749227393c68bf79"
+
+inherit cmake manpages python3native
+PACKAGECONFIG[manpages] = ""
+
+# examples are never installed, and don't need to be built in the
+# first place
+EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF"
+
+PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
+
+RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})"
+RDEPENDS:${PN}:class-native = ""
+RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell"
+
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
+FILES:lib${PN} = "${libdir}/*${SOLIBS}"
+FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
+FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
+FILES:${PN}-server = "${bindir}/nghttpd"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 21/25] libsoup: add a 3.x recipe
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (18 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 20/25] nghttp2: add recipe from meta-oe Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-12 10:08 ` [OE-core] " Ross Burton
2021-10-11 9:40 ` [PATCH 22/25] webkitgtk: trim down DEPENDS Alexander Kanavin
` (3 subsequent siblings)
23 siblings, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
libsoup 2.x is still needed until all consumers update to 3.x.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/conf/distro/include/maintainers.inc | 1 +
.../libsoup/libsoup-2.4_2.72.0.bb | 2 +
meta/recipes-support/libsoup/libsoup_3.0.1.bb | 44 +++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 100644 meta/recipes-support/libsoup/libsoup_3.0.1.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index c203f352caf..3ffb065804e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -384,6 +384,7 @@ RECIPE_MAINTAINER:pn-libsecret = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER:pn-libsm = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libsndfile1 = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-libsoup = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-libssh2 = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-libssp-nonshared = "Khem Raj <raj.khem@gmail.com>"
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb
index e888202b775..351bc9de73b 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb
@@ -20,6 +20,8 @@ S = "${WORKDIR}/libsoup-${PV}"
inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc
+UPSTREAM_CHECK_REGEX = "libsoup-(?P<pver>2(\.(?!99)\d+)+)\.tar"
+
GIR_MESON_ENABLE_FLAG = 'enabled'
GIR_MESON_DISABLE_FLAG = 'disabled'
diff --git a/meta/recipes-support/libsoup/libsoup_3.0.1.bb b/meta/recipes-support/libsoup/libsoup_3.0.1.bb
new file mode 100644
index 00000000000..1e4d3b272bc
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup_3.0.1.bb
@@ -0,0 +1,44 @@
+SUMMARY = "An HTTP library implementation in C"
+DESCRIPTION = "libsoup is an HTTP client/server library for GNOME. It uses GObjects \
+and the glib main loop, to integrate well with GNOME applications."
+HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2"
+
+SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
+
+SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
+SRC_URI[sha256sum] = "6f0c316d10f8458b96f564c7644be3c2011bd75ad5054c8db26afb0c9a91bc47"
+
+PROVIDES = "libsoup-3.0"
+CVE_PRODUCT = "libsoup"
+
+S = "${WORKDIR}/libsoup-${PV}"
+
+inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc
+
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
+# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default.
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5"
+
+EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+# When built without gnome support, libsoup will contain only one shared lib
+# and will therefore become subject to renaming by debian.bbclass. Prevent
+# renaming in order to keep the package name consistent regardless of whether
+# gnome support is enabled or disabled.
+DEBIAN_NOAUTONAME:${PN} = "1"
+
+# glib-networking is needed for SSL, proxies, etc.
+RRECOMMENDS:${PN} = "glib-networking"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 21/25] libsoup: add a 3.x recipe
2021-10-11 9:40 ` [PATCH 21/25] libsoup: add a 3.x recipe Alexander Kanavin
@ 2021-10-12 10:08 ` Ross Burton
2021-10-12 10:45 ` Alexander Kanavin
0 siblings, 1 reply; 38+ messages in thread
From: Ross Burton @ 2021-10-12 10:08 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core, Alexander Kanavin
On Mon, 11 Oct 2021 at 10:41, Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> +DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2"
libxml2 was removed as a build dependency.
> +PROVIDES = "libsoup-3.0"
As they appear to be continuing the parallel installable theme, should
we just name the recipe libsoup-3.0 as we did with the 2.4 series?
Otherwise when a hypothetical 4.0 comes out, what is that called?
> +S = "${WORKDIR}/libsoup-${PV}"
Redundant if you keep PN as libsoup.
> +# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default.
Redundant comment, libsoup-gnome is entirely gone now.
> +EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false"
Might be worth adding -Dtests=false to make that explicit.
> +# When built without gnome support, libsoup will contain only one shared lib
> +# and will therefore become subject to renaming by debian.bbclass. Prevent
> +# renaming in order to keep the package name consistent regardless of whether
> +# gnome support is enabled or disabled.
> +DEBIAN_NOAUTONAME:${PN} = "1"
Redundant, as above.
Ross
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 21/25] libsoup: add a 3.x recipe
2021-10-12 10:08 ` [OE-core] " Ross Burton
@ 2021-10-12 10:45 ` Alexander Kanavin
0 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-12 10:45 UTC (permalink / raw)
To: Ross Burton; +Cc: OE-core, Alexander Kanavin
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
On Tue, 12 Oct 2021 at 12:08, Ross Burton <ross@burtonini.com> wrote:
>
> As they appear to be continuing the parallel installable theme, should
> we just name the recipe libsoup-3.0 as we did with the 2.4 series?
> Otherwise when a hypothetical 4.0 comes out, what is that called?
>
libsoup, and if existing one needs to be kept, then it is renamed to
libsoup-3.0, with consumer adjustment where needed. I do not like those
never-ending version suffixes at all, and want to have them only for legacy
stuff.
gtk 4 recipe will be named simply gtk :)
Alex
[-- Attachment #2: Type: text/html, Size: 963 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 22/25] webkitgtk: trim down DEPENDS
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (19 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 21/25] libsoup: add a 3.x recipe Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 23/25] epiphany: " Alexander Kanavin
` (2 subsequent siblings)
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-sato/webkit/webkitgtk_2.32.3.bb | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
index 1f3f7a9c00a..db2357002c8 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
@@ -30,12 +30,20 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '
CVE_PRODUCT = "webkitgtk webkitgtk\+"
-DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \
- gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
- pango icu bison-native gawk intltool-native libwebp \
- atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis \
- ruby-native libnotify gstreamer1.0-plugins-bad \
- gettext-native glib-2.0 glib-2.0-native libtasn1 \
+DEPENDS = " \
+ ruby-native \
+ cairo \
+ harfbuzz \
+ jpeg \
+ atk \
+ libwebp \
+ gtk+3 \
+ libsoup-2.4 \
+ libxslt \
+ libtasn1 \
+ libnotify \
+ gstreamer1.0 \
+ gstreamer1.0-plugins-base \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 23/25] epiphany: trim down DEPENDS
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (20 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 22/25] webkitgtk: trim down DEPENDS Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 9:40 ` [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0 Alexander Kanavin
2021-10-11 9:40 ` [PATCH 25/25] epiphany: update 40.3 -> 41.0 Alexander Kanavin
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/recipes-gnome/epiphany/epiphany_40.3.bb | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-gnome/epiphany/epiphany_40.3.bb b/meta/recipes-gnome/epiphany/epiphany_40.3.bb
index c5dc0baefac..e74b75c802a 100644
--- a/meta/recipes-gnome/epiphany/epiphany_40.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_40.3.bb
@@ -6,10 +6,18 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr gnutls \
- gsettings-desktop-schemas libxml2-native \
- glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal \
- libarchive"
+DEPENDS = " \
+ webkitgtk \
+ gcr \
+ gsettings-desktop-schemas \
+ nettle \
+ json-glib \
+ libarchive \
+ libdazzle \
+ libhandy \
+ libportal \
+ glib-2.0-native \
+ "
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings features_check gettext mime-xdg
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (21 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 23/25] epiphany: " Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
2021-10-11 16:08 ` Khem Raj
2021-10-26 19:38 ` [OE-core] " Martin Jansa
2021-10-11 9:40 ` [PATCH 25/25] epiphany: update 40.3 -> 41.0 Alexander Kanavin
23 siblings, 2 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin, Khem Raj
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../0001-ANGLE-do-not-enable-SSE-on-x86.patch | 26 ++++++++++++++++
...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 10 +++---
.../0001-MiniBrowser-Fix-reproduciblity.patch | 31 -------------------
.../webkit/webkitgtk/include_xutil.patch | 8 ++---
.../webkitgtk/musl-lower-stack-usage.patch | 14 ++++-----
...ebkitgtk_2.32.3.bb => webkitgtk_2.34.0.bb} | 23 ++++++++------
6 files changed, 55 insertions(+), 57 deletions(-)
create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.32.3.bb => webkitgtk_2.34.0.bb} (90%)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
new file mode 100644
index 00000000000..1c6ba970376
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
@@ -0,0 +1,26 @@
+From c71a4e18afb4869a0fbb0efd59c4860b72f493f7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Tue, 5 Oct 2021 13:32:28 +0200
+Subject: [PATCH] ANGLE: do not enable SSE on x86
+
+The code does not actually build there.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h
+index 41f3cf4f..cab85a82 100644
+--- a/Source/ThirdParty/ANGLE/src/common/platform.h
++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
+@@ -89,7 +89,7 @@
+ #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
+ # include <intrin.h>
+ # define ANGLE_USE_SSE
+-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
++#elif defined(__GNUC__) && (defined(__x86_64__))
+ # include <x86intrin.h>
+ # define ANGLE_USE_SSE
+ #endif
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
index 6d7d7067e4e..a65cfc8b5a4 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
@@ -1,4 +1,4 @@
-From acf26a385d17a59ccd4b767d6303ec3dbf78e788 Mon Sep 17 00:00:00 2001
+From b055bd199f9c40148334725a227796c0d7d14788 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 3 Feb 2020 17:06:27 -0800
Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
@@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 2 insertions(+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index f316f49..de81ce0 100644
+index 3cb5a495..dfba9900 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
-@@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN()
- SET_PROJECT_VERSION(2 32 3)
+@@ -7,6 +7,7 @@ SET_PROJECT_VERSION(2 34 0)
+
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
+set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -32,7 +32,7 @@ index f316f49..de81ce0 100644
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
-index 1066440..d9aca95 100644
+index e892b427..73bf9e4d 100644
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -1,3 +1,4 @@
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
deleted file mode 100644
index 98d2d1ded96..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dcf9ae0dc0b4510eddbeeea09e11edfb123f95af Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 2 May 2021 13:10:49 -0700
-Subject: [PATCH] MiniBrowser: Fix reproduciblity
-
-Do not emit references to source dir in generated sourcecode
-
-Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=225283]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Tools/MiniBrowser/gtk/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
-index 93b62521..482d3b00 100644
---- a/Tools/MiniBrowser/gtk/CMakeLists.txt
-+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -51,8 +51,8 @@ add_custom_command(
- OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
- ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
- MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list
-- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
-- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
-+ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
-+ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
- VERBATIM)
-
- if (USE_GTK4)
---
-2.31.1
-
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
index ffe1b74be3d..e7a4cc25ade 100644
--- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
@@ -1,4 +1,4 @@
-From d95f46e149226f634830e76cc1f4f8e3ee04ff5a Mon Sep 17 00:00:00 2001
+From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 6 Nov 2020 04:38:13 +0100
Subject: [PATCH] webkitgtk: fix build with x11 enabled
@@ -21,12 +21,12 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-index 2d66b9cd..424fb5a1 100644
+index bad56eba..fc141f98 100644
--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-@@ -30,6 +30,7 @@
-
+@@ -31,6 +31,7 @@
#if PLATFORM(X11)
+ #include <X11/Xatom.h>
#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include <X11/extensions/Xcomposite.h>
diff --git a/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch b/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch
index f71f8452fdb..d8d36fad6b1 100644
--- a/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch
@@ -1,4 +1,4 @@
-From 04e4999c6fa2e9810634745a07f1e380f27b8e61 Mon Sep 17 00:00:00 2001
+From 358a8f053c367aab7fba8ab059244e0530c7ff82 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 17 Mar 2021 13:24:57 -0700
Subject: [PATCH] reduce thread stack and heap usage for javascriptcore on musl
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h
-index bb6d2f1d..a6209742 100644
+index a0c2170e..9e107af7 100644
--- a/Source/JavaScriptCore/runtime/OptionsList.h
+++ b/Source/JavaScriptCore/runtime/OptionsList.h
-@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
+@@ -77,6 +77,18 @@ bool canUseWebAssemblyFastMemory();
// On instantiation of the first VM instance, the Options will be write protected
// and cannot be modified thereafter.
@@ -47,7 +47,7 @@ index bb6d2f1d..a6209742 100644
#define FOR_EACH_JSC_OPTION(v) \
v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \
v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
-@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
+@@ -92,9 +104,9 @@ bool canUseWebAssemblyFastMemory();
\
v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
\
@@ -61,11 +61,11 @@ index bb6d2f1d..a6209742 100644
v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h
-index 9495d6c1..190b3811 100644
+index 178f9808..95ec5a85 100644
--- a/Source/WTF/wtf/Threading.h
+++ b/Source/WTF/wtf/Threading.h
-@@ -60,6 +60,10 @@
- #include <dispatch/dispatch.h>
+@@ -67,6 +67,10 @@
+ #undef None
#endif
+#if OS(LINUX) && !defined(__GLIBC__)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb
similarity index 90%
rename from meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.34.0.bb
index db2357002c8..25e1d422cc7 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb
@@ -18,10 +18,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://include_xutil.patch \
file://reduce-memory-overheads.patch \
file://musl-lower-stack-usage.patch \
- file://0001-MiniBrowser-Fix-reproduciblity.patch \
+ file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \
"
-SRC_URI[sha256sum] = "c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc"
+SRC_URI[sha256sum] = "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34"
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
@@ -38,7 +38,7 @@ DEPENDS = " \
atk \
libwebp \
gtk+3 \
- libsoup-2.4 \
+ libsoup \
libxslt \
libtasn1 \
libnotify \
@@ -48,12 +48,13 @@ DEPENDS = " \
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \
enchant \
libsecret \
"
PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
+PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF"
PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt"
PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
@@ -66,6 +67,7 @@ PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
+PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
# webkitgtk is full of /usr/bin/env python, particular for generating docs
do_configure[postfuncs] += "setup_python_link"
@@ -120,7 +122,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
SECURITY_CFLAGS:remove:aarch64 = "-fpie"
SECURITY_CFLAGS:append:aarch64 = " -fPIE"
-FILES:${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
+FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
@@ -149,10 +151,11 @@ PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess"
src_package_preprocess () {
# Trim build paths from comments in generated sources to ensure reproducibility
sed -i -e "s,${WORKDIR},,g" \
- ${B}/DerivedSources/webkit2gtk/webkit2/*.cpp \
- ${B}/DerivedSources/ForwardingHeaders/JavaScriptCore/*.h \
- ${B}/DerivedSources/JavaScriptCore/*.h \
- ${B}/DerivedSources/JavaScriptCore/yarr/*.h \
- ${B}/DerivedSources/MiniBrowser/*.c
+ ${B}/JavaScriptCore/DerivedSources/*.h \
+ ${B}/JavaScriptCore/DerivedSources/yarr/*.h \
+ ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \
+ ${B}/WebKit2Gtk/DerivedSources/webkit2/*.cpp \
+ ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h
+
}
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-11 9:40 ` [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0 Alexander Kanavin
@ 2021-10-11 16:08 ` Khem Raj
2021-10-26 19:38 ` [OE-core] " Martin Jansa
1 sibling, 0 replies; 38+ messages in thread
From: Khem Raj @ 2021-10-11 16:08 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer, Alexander Kanavin
On Mon, Oct 11, 2021 at 2:41 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> .../0001-ANGLE-do-not-enable-SSE-on-x86.patch | 26 ++++++++++++++++
> ...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 10 +++---
> .../0001-MiniBrowser-Fix-reproduciblity.patch | 31 -------------------
> .../webkit/webkitgtk/include_xutil.patch | 8 ++---
> .../webkitgtk/musl-lower-stack-usage.patch | 14 ++++-----
> ...ebkitgtk_2.32.3.bb => webkitgtk_2.34.0.bb} | 23 ++++++++------
> 6 files changed, 55 insertions(+), 57 deletions(-)
> create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
> rename meta/recipes-sato/webkit/{webkitgtk_2.32.3.bb => webkitgtk_2.34.0.bb} (90%)
>
looks good to me.
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> new file mode 100644
> index 00000000000..1c6ba970376
> --- /dev/null
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> @@ -0,0 +1,26 @@
> +From c71a4e18afb4869a0fbb0efd59c4860b72f493f7 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Tue, 5 Oct 2021 13:32:28 +0200
> +Subject: [PATCH] ANGLE: do not enable SSE on x86
> +
> +The code does not actually build there.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h
> +index 41f3cf4f..cab85a82 100644
> +--- a/Source/ThirdParty/ANGLE/src/common/platform.h
> ++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
> +@@ -89,7 +89,7 @@
> + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
> + # include <intrin.h>
> + # define ANGLE_USE_SSE
> +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
> ++#elif defined(__GNUC__) && (defined(__x86_64__))
> + # include <x86intrin.h>
> + # define ANGLE_USE_SSE
> + #endif
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
> index 6d7d7067e4e..a65cfc8b5a4 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
> @@ -1,4 +1,4 @@
> -From acf26a385d17a59ccd4b767d6303ec3dbf78e788 Mon Sep 17 00:00:00 2001
> +From b055bd199f9c40148334725a227796c0d7d14788 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Mon, 3 Feb 2020 17:06:27 -0800
> Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
> @@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 2 files changed, 2 insertions(+)
>
> diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
> -index f316f49..de81ce0 100644
> +index 3cb5a495..dfba9900 100644
> --- a/Source/cmake/OptionsGTK.cmake
> +++ b/Source/cmake/OptionsGTK.cmake
> -@@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN()
> - SET_PROJECT_VERSION(2 32 3)
> +@@ -7,6 +7,7 @@ SET_PROJECT_VERSION(2 34 0)
> +
>
> set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
> +set(THREADS_PREFER_PTHREAD_FLAG ON)
> @@ -32,7 +32,7 @@ index f316f49..de81ce0 100644
> find_package(Cairo 1.14.0 REQUIRED)
> find_package(Fontconfig 2.8.0 REQUIRED)
> diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
> -index 1066440..d9aca95 100644
> +index e892b427..73bf9e4d 100644
> --- a/Source/cmake/OptionsJSCOnly.cmake
> +++ b/Source/cmake/OptionsJSCOnly.cmake
> @@ -1,3 +1,4 @@
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch b/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
> deleted file mode 100644
> index 98d2d1ded96..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From dcf9ae0dc0b4510eddbeeea09e11edfb123f95af Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 2 May 2021 13:10:49 -0700
> -Subject: [PATCH] MiniBrowser: Fix reproduciblity
> -
> -Do not emit references to source dir in generated sourcecode
> -
> -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=225283]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - Tools/MiniBrowser/gtk/CMakeLists.txt | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
> -index 93b62521..482d3b00 100644
> ---- a/Tools/MiniBrowser/gtk/CMakeLists.txt
> -+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
> -@@ -51,8 +51,8 @@ add_custom_command(
> - OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
> - ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
> - MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list
> -- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
> -- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
> -+ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
> -+ COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header --skip-source > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
> - VERBATIM)
> -
> - if (USE_GTK4)
> ---
> -2.31.1
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
> index ffe1b74be3d..e7a4cc25ade 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
> @@ -1,4 +1,4 @@
> -From d95f46e149226f634830e76cc1f4f8e3ee04ff5a Mon Sep 17 00:00:00 2001
> +From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001
> From: Martin Jansa <Martin.Jansa@gmail.com>
> Date: Fri, 6 Nov 2020 04:38:13 +0100
> Subject: [PATCH] webkitgtk: fix build with x11 enabled
> @@ -21,12 +21,12 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> 1 file changed, 1 insertion(+)
>
> diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
> -index 2d66b9cd..424fb5a1 100644
> +index bad56eba..fc141f98 100644
> --- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
> +++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
> -@@ -30,6 +30,7 @@
> -
> +@@ -31,6 +31,7 @@
> #if PLATFORM(X11)
> + #include <X11/Xatom.h>
> #include <X11/Xlib.h>
> +#include <X11/Xutil.h>
> #include <X11/extensions/Xcomposite.h>
> diff --git a/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch b/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch
> index f71f8452fdb..d8d36fad6b1 100644
> --- a/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch
> +++ b/meta/recipes-sato/webkit/webkitgtk/musl-lower-stack-usage.patch
> @@ -1,4 +1,4 @@
> -From 04e4999c6fa2e9810634745a07f1e380f27b8e61 Mon Sep 17 00:00:00 2001
> +From 358a8f053c367aab7fba8ab059244e0530c7ff82 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Wed, 17 Mar 2021 13:24:57 -0700
> Subject: [PATCH] reduce thread stack and heap usage for javascriptcore on musl
> @@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 2 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h
> -index bb6d2f1d..a6209742 100644
> +index a0c2170e..9e107af7 100644
> --- a/Source/JavaScriptCore/runtime/OptionsList.h
> +++ b/Source/JavaScriptCore/runtime/OptionsList.h
> -@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
> +@@ -77,6 +77,18 @@ bool canUseWebAssemblyFastMemory();
> // On instantiation of the first VM instance, the Options will be write protected
> // and cannot be modified thereafter.
>
> @@ -47,7 +47,7 @@ index bb6d2f1d..a6209742 100644
> #define FOR_EACH_JSC_OPTION(v) \
> v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \
> v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
> -@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
> +@@ -92,9 +104,9 @@ bool canUseWebAssemblyFastMemory();
> \
> v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
> \
> @@ -61,11 +61,11 @@ index bb6d2f1d..a6209742 100644
> v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
> v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
> diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h
> -index 9495d6c1..190b3811 100644
> +index 178f9808..95ec5a85 100644
> --- a/Source/WTF/wtf/Threading.h
> +++ b/Source/WTF/wtf/Threading.h
> -@@ -60,6 +60,10 @@
> - #include <dispatch/dispatch.h>
> +@@ -67,6 +67,10 @@
> + #undef None
> #endif
>
> +#if OS(LINUX) && !defined(__GLIBC__)
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb
> similarity index 90%
> rename from meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
> rename to meta/recipes-sato/webkit/webkitgtk_2.34.0.bb
> index db2357002c8..25e1d422cc7 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.0.bb
> @@ -18,10 +18,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
> file://include_xutil.patch \
> file://reduce-memory-overheads.patch \
> file://musl-lower-stack-usage.patch \
> - file://0001-MiniBrowser-Fix-reproduciblity.patch \
> + file://0001-ANGLE-do-not-enable-SSE-on-x86.patch \
> "
>
> -SRC_URI[sha256sum] = "c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc"
> +SRC_URI[sha256sum] = "880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34"
>
> inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
>
> @@ -38,7 +38,7 @@ DEPENDS = " \
> atk \
> libwebp \
> gtk+3 \
> - libsoup-2.4 \
> + libsoup \
> libxslt \
> libtasn1 \
> libnotify \
> @@ -48,12 +48,13 @@ DEPENDS = " \
>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \
> enchant \
> libsecret \
> "
>
> PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
> +PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF"
> PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt"
> PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
> PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
> @@ -66,6 +67,7 @@ PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
> PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
> PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
> PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
> +PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
>
> # webkitgtk is full of /usr/bin/env python, particular for generating docs
> do_configure[postfuncs] += "setup_python_link"
> @@ -120,7 +122,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "
> SECURITY_CFLAGS:remove:aarch64 = "-fpie"
> SECURITY_CFLAGS:append:aarch64 = " -fPIE"
>
> -FILES:${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
> +FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
>
> RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
>
> @@ -149,10 +151,11 @@ PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess"
> src_package_preprocess () {
> # Trim build paths from comments in generated sources to ensure reproducibility
> sed -i -e "s,${WORKDIR},,g" \
> - ${B}/DerivedSources/webkit2gtk/webkit2/*.cpp \
> - ${B}/DerivedSources/ForwardingHeaders/JavaScriptCore/*.h \
> - ${B}/DerivedSources/JavaScriptCore/*.h \
> - ${B}/DerivedSources/JavaScriptCore/yarr/*.h \
> - ${B}/DerivedSources/MiniBrowser/*.c
> + ${B}/JavaScriptCore/DerivedSources/*.h \
> + ${B}/JavaScriptCore/DerivedSources/yarr/*.h \
> + ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \
> + ${B}/WebKit2Gtk/DerivedSources/webkit2/*.cpp \
> + ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h
> +
> }
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-11 9:40 ` [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0 Alexander Kanavin
2021-10-11 16:08 ` Khem Raj
@ 2021-10-26 19:38 ` Martin Jansa
2021-10-26 20:07 ` Alexander Kanavin
[not found] ` <16B1AD7283CD4D45.19566@lists.openembedded.org>
1 sibling, 2 replies; 38+ messages in thread
From: Martin Jansa @ 2021-10-26 19:38 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 2717 bytes --]
On Mon, Oct 11, 2021 at 11:42 AM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
> .../0001-ANGLE-do-not-enable-SSE-on-x86.patch | 26 ++++++++++++++++
> ...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 10 +++---
> .../0001-MiniBrowser-Fix-reproduciblity.patch | 31 -------------------
> .../webkit/webkitgtk/include_xutil.patch | 8 ++---
> .../webkitgtk/musl-lower-stack-usage.patch | 14 ++++-----
> ...ebkitgtk_2.32.3.bb => webkitgtk_2.34.0.bb} | 23 ++++++++------
> 6 files changed, 55 insertions(+), 57 deletions(-)
> create mode 100644
> meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> delete mode 100644
> meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
> rename meta/recipes-sato/webkit/{webkitgtk_2.32.3.bb =>
> webkitgtk_2.34.0.bb} (90%)
>
> diff --git
> a/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> new file mode 100644
> index 00000000000..1c6ba970376
> --- /dev/null
> +++
> b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> @@ -0,0 +1,26 @@
> +From c71a4e18afb4869a0fbb0efd59c4860b72f493f7 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Tue, 5 Oct 2021 13:32:28 +0200
> +Subject: [PATCH] ANGLE: do not enable SSE on x86
> +
> +The code does not actually build there.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h
> b/Source/ThirdParty/ANGLE/src/common/platform.h
> +index 41f3cf4f..cab85a82 100644
> +--- a/Source/ThirdParty/ANGLE/src/common/platform.h
> ++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
> +@@ -89,7 +89,7 @@
> + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
> + # include <intrin.h>
> + # define ANGLE_USE_SSE
> +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
> ++#elif defined(__GNUC__) && (defined(__x86_64__))
> + # include <x86intrin.h>
> + # define ANGLE_USE_SSE
> + #endif
>
Can you improve the commit message of this patch to show what "does not
actually build there"?
Because it fails to build here for qemux86 with:
webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h:20:7:
error: 'size_t' does not name a type
20 | const size_t kDefaultMaxProgramCacheMemoryBytes = 0;
| ^~~~~~
and deleting this patch fixes the build.
[-- Attachment #2: Type: text/html, Size: 3783 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-26 19:38 ` [OE-core] " Martin Jansa
@ 2021-10-26 20:07 ` Alexander Kanavin
2021-10-26 20:40 ` Martin Jansa
[not found] ` <16B1AD7283CD4D45.19566@lists.openembedded.org>
1 sibling, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-26 20:07 UTC (permalink / raw)
To: Martin Jansa
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
On Tue, 26 Oct 2021 at 21:38, Martin Jansa <martin.jansa@gmail.com> wrote:
> 0200
>
>> +Subject: [PATCH] ANGLE: do not enable SSE on x86
>> +
>> +The code does not actually build there.
>> +
>> +Upstream-Status: Pending
>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> +---
>> + Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h
>> b/Source/ThirdParty/ANGLE/src/common/platform.h
>> +index 41f3cf4f..cab85a82 100644
>> +--- a/Source/ThirdParty/ANGLE/src/common/platform.h
>> ++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
>> +@@ -89,7 +89,7 @@
>> + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
>> + # include <intrin.h>
>> + # define ANGLE_USE_SSE
>> +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
>> ++#elif defined(__GNUC__) && (defined(__x86_64__))
>> + # include <x86intrin.h>
>> + # define ANGLE_USE_SSE
>> + #endif
>>
>
> Can you improve the commit message of this patch to show what "does not
> actually build there"?
>
> Because it fails to build here for qemux86 with:
>
> webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h:20:7:
> error: 'size_t' does not name a type
> 20 | const size_t kDefaultMaxProgramCacheMemoryBytes = 0;
> | ^~~~~~
>
> and deleting this patch fixes the build.
>
Is it in the same 'building nodistro without enabling opengl' setup? Please
try to use plain poky, with opengl, and you'll see the issue.
Alex
[-- Attachment #2: Type: text/html, Size: 2381 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-26 20:07 ` Alexander Kanavin
@ 2021-10-26 20:40 ` Martin Jansa
2021-10-26 21:35 ` Alexander Kanavin
0 siblings, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2021-10-26 20:40 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 1929 bytes --]
On Tue, Oct 26, 2021 at 10:07 PM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> On Tue, 26 Oct 2021 at 21:38, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> 0200
>>
>>> +Subject: [PATCH] ANGLE: do not enable SSE on x86
>>> +
>>> +The code does not actually build there.
>>> +
>>> +Upstream-Status: Pending
>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>>> +---
>>> + Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
>>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>>> +
>>> +diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h
>>> b/Source/ThirdParty/ANGLE/src/common/platform.h
>>> +index 41f3cf4f..cab85a82 100644
>>> +--- a/Source/ThirdParty/ANGLE/src/common/platform.h
>>> ++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
>>> +@@ -89,7 +89,7 @@
>>> + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
>>> + # include <intrin.h>
>>> + # define ANGLE_USE_SSE
>>> +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
>>> ++#elif defined(__GNUC__) && (defined(__x86_64__))
>>> + # include <x86intrin.h>
>>> + # define ANGLE_USE_SSE
>>> + #endif
>>>
>>
>> Can you improve the commit message of this patch to show what "does not
>> actually build there"?
>>
>> Because it fails to build here for qemux86 with:
>>
>> webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h:20:7:
>> error: 'size_t' does not name a type
>> 20 | const size_t kDefaultMaxProgramCacheMemoryBytes = 0;
>> | ^~~~~~
>>
>> and deleting this patch fixes the build.
>>
>
> Is it in the same 'building nodistro without enabling opengl' setup?
> Please try to use plain poky, with opengl, and you'll see the issue.
>
No, this one was with opengl enabled, which was failing in do_configure do
to missing gperf-native, but now when that was fixed it fails in do_compile.
Build without opengl still works with works with my patch.
[-- Attachment #2: Type: text/html, Size: 2971 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-26 20:40 ` Martin Jansa
@ 2021-10-26 21:35 ` Alexander Kanavin
2021-10-26 21:51 ` Martin Jansa
0 siblings, 1 reply; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-26 21:35 UTC (permalink / raw)
To: Martin Jansa
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
On Tue, 26 Oct 2021 at 22:40, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> No, this one was with opengl enabled, which was failing in do_configure do
> to missing gperf-native, but now when that was fixed it fails in do_compile.
>
> Build without opengl still works with works with my patch.
>
I can no longer see the issue the patch was supposed to be fixing :-/ Maybe
I had a broken build tree at some point. The patch can probably be dropped,
but I need to run it on the AB to be sure.
What does 'bitbake-getvar -r webkitgtk PACKAGECONFIG' say on your side? I
wonder what combination of options triggers your issue.
Alex
[-- Attachment #2: Type: text/html, Size: 1079 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-26 21:35 ` Alexander Kanavin
@ 2021-10-26 21:51 ` Martin Jansa
2021-10-26 21:59 ` Alexander Kanavin
0 siblings, 1 reply; 38+ messages in thread
From: Martin Jansa @ 2021-10-26 21:51 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 935 bytes --]
PACKAGECONFIG="systemd wayland webgl
gles2 angle opengl-or-es enchant
libsecret "
On Tue, Oct 26, 2021 at 11:35 PM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> On Tue, 26 Oct 2021 at 22:40, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>>
>> No, this one was with opengl enabled, which was failing in do_configure
>> do to missing gperf-native, but now when that was fixed it fails in
>> do_compile.
>>
>> Build without opengl still works with works with my patch.
>>
>
> I can no longer see the issue the patch was supposed to be fixing :-/
> Maybe I had a broken build tree at some point. The patch can probably be
> dropped, but I need to run it on the AB to be sure.
>
> What does 'bitbake-getvar -r webkitgtk PACKAGECONFIG' say on your side? I
> wonder what combination of options triggers your issue.
>
> Alex
>
[-- Attachment #2: Type: text/html, Size: 1730 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
2021-10-26 21:51 ` Martin Jansa
@ 2021-10-26 21:59 ` Alexander Kanavin
0 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-26 21:59 UTC (permalink / raw)
To: Martin Jansa
Cc: Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]
The only difference to my setup is 'systemd'. I'm testing dropping the
patch on the AB now.
Alex
On Tue, 26 Oct 2021 at 23:51, Martin Jansa <martin.jansa@gmail.com> wrote:
> PACKAGECONFIG="systemd wayland
> webgl gles2 angle opengl-or-es
> enchant libsecret "
>
> On Tue, Oct 26, 2021 at 11:35 PM Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
>
>> On Tue, 26 Oct 2021 at 22:40, Martin Jansa <martin.jansa@gmail.com>
>> wrote:
>>
>>>
>>> No, this one was with opengl enabled, which was failing in do_configure
>>> do to missing gperf-native, but now when that was fixed it fails in
>>> do_compile.
>>>
>>> Build without opengl still works with works with my patch.
>>>
>>
>> I can no longer see the issue the patch was supposed to be fixing :-/
>> Maybe I had a broken build tree at some point. The patch can probably be
>> dropped, but I need to run it on the AB to be sure.
>>
>> What does 'bitbake-getvar -r webkitgtk PACKAGECONFIG' say on your side? I
>> wonder what combination of options triggers your issue.
>>
>> Alex
>>
>
[-- Attachment #2: Type: text/html, Size: 2254 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
[parent not found: <16B1AD7283CD4D45.19566@lists.openembedded.org>]
* Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
[not found] ` <16B1AD7283CD4D45.19566@lists.openembedded.org>
@ 2021-10-26 20:21 ` Alexander Kanavin
0 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-26 20:21 UTC (permalink / raw)
To: Alexander Kanavin
Cc: Martin Jansa, Patches and discussions about the oe-core layer,
Alexander Kanavin, Khem Raj
[-- Attachment #1: Type: text/plain, Size: 2261 bytes --]
I'll run a build now to reproduce again.
Alex
On Tue, 26 Oct 2021 at 22:07, Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:
> On Tue, 26 Oct 2021 at 21:38, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> 0200
>>
>>> +Subject: [PATCH] ANGLE: do not enable SSE on x86
>>> +
>>> +The code does not actually build there.
>>> +
>>> +Upstream-Status: Pending
>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>>> +---
>>> + Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
>>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>>> +
>>> +diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h
>>> b/Source/ThirdParty/ANGLE/src/common/platform.h
>>> +index 41f3cf4f..cab85a82 100644
>>> +--- a/Source/ThirdParty/ANGLE/src/common/platform.h
>>> ++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
>>> +@@ -89,7 +89,7 @@
>>> + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
>>> + # include <intrin.h>
>>> + # define ANGLE_USE_SSE
>>> +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
>>> ++#elif defined(__GNUC__) && (defined(__x86_64__))
>>> + # include <x86intrin.h>
>>> + # define ANGLE_USE_SSE
>>> + #endif
>>>
>>
>> Can you improve the commit message of this patch to show what "does not
>> actually build there"?
>>
>> Because it fails to build here for qemux86 with:
>>
>> webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h:20:7:
>> error: 'size_t' does not name a type
>> 20 | const size_t kDefaultMaxProgramCacheMemoryBytes = 0;
>> | ^~~~~~
>>
>> and deleting this patch fixes the build.
>>
>
> Is it in the same 'building nodistro without enabling opengl' setup?
> Please try to use plain poky, with opengl, and you'll see the issue.
>
> Alex
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157451):
> https://lists.openembedded.org/g/openembedded-core/message/157451
> Mute This Topic: https://lists.openembedded.org/mt/86232785/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 3881 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 25/25] epiphany: update 40.3 -> 41.0
2021-10-11 9:40 [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts Alexander Kanavin
` (22 preceding siblings ...)
2021-10-11 9:40 ` [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0 Alexander Kanavin
@ 2021-10-11 9:40 ` Alexander Kanavin
23 siblings, 0 replies; 38+ messages in thread
From: Alexander Kanavin @ 2021-10-11 9:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Correct an option to use libsoup 3.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../epiphany/{epiphany_40.3.bb => epiphany_41.0.bb} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
rename meta/recipes-gnome/epiphany/{epiphany_40.3.bb => epiphany_41.0.bb} (91%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_40.3.bb b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
similarity index 91%
rename from meta/recipes-gnome/epiphany/epiphany_40.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_41.0.bb
index e74b75c802a..09210b68aaf 100644
--- a/meta/recipes-gnome/epiphany/epiphany_40.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
@@ -28,7 +28,9 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
file://migrator.patch \
file://distributor.patch \
"
-SRC_URI[archive.sha256sum] = "dad138b9f2d55de271128fca38b61f53fd980c587d29e1ba6b508fff3b19f564"
+SRC_URI[archive.sha256sum] = "b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0"
+
+EXTRA_OEMESON += "-Dsoup2=disabled"
# Developer mode enables debugging
PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
--
2.20.1
^ permalink raw reply related [flat|nested] 38+ messages in thread