Skip to contentSkip to conversation

strongswan: upgrade 5.9.12 -> 5.9.13

PATCH New Armin Kuster 1 participant 11 messages Jan 17, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 strongswan: upgrade 5.9.12 -> 5.9.13

From: Wang Mingyu <[email protected]>

Changelog:
- Fixes a regression with handling OCSP error responses and adds a new option to specify the length of nonces in OCSP requests. Also adds some other improvements for OCSP handling and fuzzers for OCSP requests/responses.

(cherry picked from commit 5be2e20157f3025f9e2370933267a56fd526c58e)
---
 .../strongswan/{strongswan_5.9.12.bb => strongswan_5.9.13.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-support/strongswan/{strongswan_5.9.12.bb => strongswan_5.9.13.bb} (99%)
meta-networking/recipes-support/strongswan/strongswan_5.9.13.bb renamed from meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb +1 -1
similarity index 99%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.13.bb
index 87d12bc6c8..4523187af2 100644
@@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '  tpm2-tss',
 SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
           "
 
-SRC_URI[sha256sum] = "5e6018b07cbe9f72c044c129955a13be3e2f799ceb53f53a4459da6a922b95e5"
+SRC_URI[sha256sum] = "56e30effb578fd9426d8457e3b76c8c3728cd8a5589594b55649b2719308ba55"
 
 UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/11 nginx: upgrade 1.25.2 -> 1.25.3

From: Meenali Gupta <[email protected]>

Changelog:
===========
https://nginx.org/en/CHANGES

*) Change: improved detection of misbehaving clients when using HTTP/2.

*) Feature: startup speedup when using a large number of locations.
Thanks to Yusuke Nojima.

*) Bugfix: a segmentation fault might occur in a worker process when
using HTTP/2 without SSL; the bug had appeared in 1.25.1.

*) Bugfix: the "Status" backend response header line with an empty
reason phrase was handled incorrectly.

*) Bugfix: memory leak during reconfiguration when using the PCRE2
library.
Thanks to ZhenZhong Wu.

*) Bugfixes and improvements in HTTP/3.

(cherry picked from commit dc4bef4648ea5ff73230ff2d343f498c93bd333b)
---
 .../recipes-httpd/nginx/{nginx_1.25.2.bb => nginx_1.25.3.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-webserver/recipes-httpd/nginx/{nginx_1.25.2.bb => nginx_1.25.3.bb} (51%)
meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb renamed from meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb +1 -1
similarity index 51%
rename from meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
rename to meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
index 66eef23895..8aa9fa0267 100644
@@ -2,5 +2,5 @@ require nginx.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
 
-SRC_URI[sha256sum] = "05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711"
+SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86"
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/11 mariadb: Upgrade to 10.11.6

In reply to Armin Kuster

From: Mingli Yu <[email protected]>

Remove one patch as the logic is included in the new version [1] [2].

Upgrade mariadb to 10.11.6 [3].

[1] https://github.com/MariaDB/server/commit/f4cec369a392c8a6056207012992ad4a5639965a
[2] https://github.com/MariaDB/server/commit/cd5808eb8da13c5626d4bdeb452cef6ada29cb1d
[3] https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/

(cherry picked from commit 702cf1dc114d7c65cde4fe1d3f19a3314fccb7ff)
---
 ...e_10.11.5.bb => mariadb-native_10.11.6.bb} |  0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  3 +-
 .../mysql/mariadb/libfmt_make_fmt.patch       | 68 -------------------
 ...{mariadb_10.11.5.bb => mariadb_10.11.6.bb} |  0
 4 files changed, 1 insertion(+), 70 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.5.bb => mariadb-native_10.11.6.bb} (100%)
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/libfmt_make_fmt.patch
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.5.bb => mariadb_10.11.6.bb} (100%)
meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb
meta-oe/recipes-dbs/mysql/mariadb.inc +1 -2
index d64d5b0e42..7e6ef42bc3 100644
@@ -23,10 +23,9 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
            file://lfs64.patch \
            file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
-           file://libfmt_make_fmt.patch \
           "
 SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
-SRC_URI[sha256sum] = "4c9484048d4d0c71dd076ab33fc2a9ce8510bdf762886de0d63fe52496f3dbbb"
+SRC_URI[sha256sum] = "1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
meta-oe/recipes-dbs/mysql/mariadb/libfmt_make_fmt.patch deleted +0 -68

68 lines not on this page · raw message

meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb +0 -0
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/11 webkitgtk3: upgrade 2.42.0 -> 2.42.1

In reply to Armin Kuster

From: Khem Raj <[email protected]>

(cherry picked from commit 32bae13bb8b8edf6b4af12ee7057493101c5fb14)
---
 .../webkitgtk/{webkitgtk3_2.42.0.bb => webkitgtk3_2.42.1.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/webkitgtk/{webkitgtk3_2.42.0.bb => webkitgtk3_2.42.1.bb} (99%)
meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.1.bb renamed from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb +1 -1
similarity index 99%
rename from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb
rename to meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.1.bb
index f682cd9f03..9aabfb123c 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
            file://no-musttail-arm.patch \
            "
-SRC_URI[sha256sum] = "828f95935861fae583fb8f2ae58cf64c63c178ae2b7c2d6f73070813ad64ed1b"
+SRC_URI[sha256sum] = "6f41fac9989d3ee51c08c48de1d439cdeddecbc757e34b6180987d99b16d2499"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
Signature · 1 line
2.34.1
#4 lore raw

PATCH 5/11 webkitgtk3: upgrade 2.42.1 -> 2.42.2

In reply to Armin Kuster

From: Wang Mingyu <[email protected]>

Changelog:
==========
- Bump Safari version in user agent header.
- Fix CSP regression that broke Unity WebGL applications.
- Fix the build with GBM disabled.
- Fix several crashes and rendering issues.

(cherry picked from commit 700e3a36fbc70ef7ecd5fa2bc820f0922df5a528)
---
 .../webkitgtk/{webkitgtk3_2.42.1.bb => webkitgtk3_2.42.2.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/webkitgtk/{webkitgtk3_2.42.1.bb => webkitgtk3_2.42.2.bb} (99%)
meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.2.bb renamed from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.1.bb +1 -1
similarity index 99%
rename from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.1.bb
rename to meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.2.bb
index 9aabfb123c..ac75afb90e 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
            file://no-musttail-arm.patch \
            "
-SRC_URI[sha256sum] = "6f41fac9989d3ee51c08c48de1d439cdeddecbc757e34b6180987d99b16d2499"
+SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
Signature · 1 line
2.34.1
#5 lore raw

PATCH 6/11 webkitgtk3: upgrade 2.42.2 -> 2.42.3

In reply to Armin Kuster

From: Wang Mingyu <[email protected]>

Changelog:
===========
- Fix flickering while playing videos with DMA-BUF sink.
- Fix color picker being triggered in the inspector when typing "tan".
- Do not special case the "sans" font family name.
- Fix build failure with libxml2 version 2.12.0 due to an API change.
- Fix several crashes and rendering issues.

(cherry picked from commit 1a474db2702c59702c414f4c8ed4487251f10df6)
---
 .../webkitgtk/{webkitgtk3_2.42.2.bb => webkitgtk3_2.42.3.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/webkitgtk/{webkitgtk3_2.42.2.bb => webkitgtk3_2.42.3.bb} (99%)
meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb renamed from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.2.bb +1 -1
similarity index 99%
rename from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.2.bb
rename to meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb
index ac75afb90e..6149a7ac49 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
            file://no-musttail-arm.patch \
            "
-SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118"
+SRC_URI[sha256sum] = "0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
Signature · 1 line
2.34.1
#6 lore raw

PATCH 7/11 webkitgtk3: upgrade 2.42.3 -> 2.42.4

In reply to Armin Kuster

From: Wang Mingyu <[email protected]>

(cherry picked from commit 466370a087534eded974a1eef2a4431dda6900b3)
---
 .../webkitgtk/{webkitgtk3_2.42.3.bb => webkitgtk3_2.42.4.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/webkitgtk/{webkitgtk3_2.42.3.bb => webkitgtk3_2.42.4.bb} (99%)
meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb renamed from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb +1 -1
similarity index 99%
rename from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb
rename to meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb
index 6149a7ac49..3c6b7db811 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
            file://no-musttail-arm.patch \
            "
-SRC_URI[sha256sum] = "0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2"
+SRC_URI[sha256sum] = "52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
Signature · 1 line
2.34.1
#7 lore raw

PATCH 8/11 postgresql: upgrade 15.4 -> 15.5

In reply to Armin Kuster

From: Changqing Li <[email protected]>

Refer https://www.postgresql.org/docs/release/15.5/

(cherry picked from commit bcedf9f99ca683764ef19ab008e042c82da616ff)
---
 ...-configure.ac-bypass-autoconf-2.69-version-check.patch | 8 ++++----
 .../postgresql/{postgresql_15.4.bb => postgresql_15.5.bb} | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-dbs/postgresql/{postgresql_15.4.bb => postgresql_15.5.bb} (86%)
meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +4 -4
index fb70b22720..ab578056ff 100644
@@ -1,4 +1,4 @@
-From 5f9dedc91a0a9710033fa155ea759f765ce5b58b Mon Sep 17 00:00:00 2001
+From d44c83ed0f30462a31930d6d925762b3f8412ce2 Mon Sep 17 00:00:00 2001
 From: Yi Fan Yu <[email protected]>
 Date: Fri, 5 Feb 2021 17:15:42 -0500
 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check
@@ -13,12 +13,12 @@ Signed-off-by: Yi Fan Yu <[email protected]>
  1 file changed, 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 524fdf1..3bea642 100644
+index e988503..d1b2cfd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
- AC_INIT([PostgreSQL], [15.4], [[email protected]], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [15.5], [[email protected]], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -28,5 +28,5 @@ index 524fdf1..3bea642 100644
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
 -- 
-2.34.1
+2.25.1
 
meta-oe/recipes-dbs/postgresql/postgresql_15.5.bb renamed from meta-oe/recipes-dbs/postgresql/postgresql_15.4.bb +1 -1
similarity index 86%
rename from meta-oe/recipes-dbs/postgresql/postgresql_15.4.bb
rename to meta-oe/recipes-dbs/postgresql/postgresql_15.5.bb
index 3aa2662891..cb90ff930a 100644
@@ -11,6 +11,6 @@ SRC_URI += "\
    file://0001-postgresql-fix-ptest-failure-of-sysviews.patch \
 "
 
-SRC_URI[sha256sum] = "baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9"
+SRC_URI[sha256sum] = "8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6"
 
 CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it."
Signature · 1 line
2.34.1
#8 lore raw

PATCH 9/11 samba: upgrade 4.18.8 -> 4.18.9

In reply to Armin Kuster

From: Yi Zhao <[email protected]>

This is the latest stable release of the Samba 4.18 release series. It contains the security-relevant bugfix CVE-2018-14628:

Wrong ntSecurityDescriptor values for "CN=Deleted Objects" allow read of object tombstones over LDAP (Administrator action required!)
https://www.samba.org/samba/security/CVE-2018-14628.html

Release Notes:
https://www.samba.org/samba/history/samba-4.18.9.html

(cherry picked from commit f4c3c747d6df6015eb1231f2867ffe43ddb9620e)
---
 .../samba/{samba_4.18.8.bb => samba_4.18.9.bb}                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-connectivity/samba/{samba_4.18.8.bb => samba_4.18.9.bb} (99%)
meta-networking/recipes-connectivity/samba/samba_4.18.9.bb renamed from meta-networking/recipes-connectivity/samba/samba_4.18.8.bb +1 -1
similarity index 99%
rename from meta-networking/recipes-connectivity/samba/samba_4.18.8.bb
rename to meta-networking/recipes-connectivity/samba/samba_4.18.9.bb
index f80742640f..73ceb7b754 100644
@@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \
            file://samba-4.3.9-remove-getpwent_r.patch \
            "
 
-SRC_URI[sha256sum] = "4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1"
+SRC_URI[sha256sum] = "f455c1d6351ed3a36fc2cb6e8ab1bfd0effe54a56686ffd495d64ab52d50f245"
 
 UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz"
 
Signature · 1 line
2.34.1
#9 lore raw

PATCH 10/11 redis: upgrade 6.2.13 -> 6.2.14

In reply to Armin Kuster

From: Changqing Li <[email protected]>

Upgrade urgency SECURITY: See security fixes below.

Security fixes:
(CVE-2023-45145) The wrong order of listen(2) and chmod(2) calls creates a race condition that can be used by another process to bypass desired Unix socket permissions on startup.

(cherry picked from commit 5b34766daadf8f1e8ef3d55b24e0037c4d0727f5)
---
 .../recipes-extended/redis/{redis_6.2.13.bb => redis_6.2.14.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/redis/{redis_6.2.13.bb => redis_6.2.14.bb} (96%)
meta-oe/recipes-extended/redis/redis_6.2.14.bb renamed from meta-oe/recipes-extended/redis/redis_6.2.13.bb +1 -1
similarity index 96%
rename from meta-oe/recipes-extended/redis/redis_6.2.13.bb
rename to meta-oe/recipes-extended/redis/redis_6.2.14.bb
index 640831c525..fa430ce402 100644
@@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://GNU_SOURCE.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
            "
-SRC_URI[sha256sum] = "89ff27c80d420456a721ccfb3beb7cc628d883c53059803513749e13214a23d1"
+SRC_URI[sha256sum] = "34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
Signature · 1 line
2.34.1
#10 lore raw

PATCH 11/11 libssh: upgrade 0.10.5 -> 0.10.6

In reply to Armin Kuster

From: Wang Mingyu <[email protected]>

0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch 0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch refreshed for 0.10.6

Changelog:
==========
* Fix CVE-2023-6004: Command injection using proxycommand
* Fix CVE-2023-48795: Potential downgrade attack using strict kex
* Fix CVE-2023-6918: Missing checks for return values of MD functions
* Fix ssh_send_issue_banner() for CMD(PowerShell)
* Avoid passing other events to callbacks when poll is called recursively (#202)
* Allow @ in usernames when parsing from URI composes

(cherry picked from commit 1bea2e8c3053e7ecffb04adaaded54555f2afa0b)
---
 ...pt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch | 10 ++++------
 ...MakeLists.txt-do-not-search-ssh-sshd-commands.patch | 10 ++++------
 .../libssh/{libssh_0.10.5.bb => libssh_0.10.6.bb}      |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)
 rename meta-oe/recipes-support/libssh/{libssh_0.10.5.bb => libssh_0.10.6.bb} (96%)
meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch +4 -6
index 19775fa529..d2d1fb5955 100644
@@ -1,4 +1,4 @@
-From 0cade4573334571055127a2d4fe3641e2397948d Mon Sep 17 00:00:00 2001
+From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 20 Mar 2023 21:59:19 -0700
 Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt
@@ -18,15 +18,16 @@ TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  src/libgcrypt.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/libgcrypt.c b/src/libgcrypt.c
-index da5588ad..e482b654 100644
+index f410d997..e3f66781 100644
 --- a/src/libgcrypt.c
 +++ b/src/libgcrypt.c
-@@ -469,12 +469,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
+@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
  }
  
  static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in,
@@ -41,6 +42,3 @@ index da5588ad..e482b654 100644
    gcry_cipher_decrypt(cipher->key[0], out, len, in, len);
  }
  
--- 
-2.40.0
-
meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch +4 -6
index 0c7f53029e..d6bc75c3a6 100644
@@ -1,4 +1,4 @@
-From d2525ba0bc7b11de12c54ea1a3d1eb862537136d Mon Sep 17 00:00:00 2001
+From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <[email protected]>
 Date: Wed, 15 Mar 2023 16:51:58 +0800
 Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host
@@ -9,12 +9,13 @@ not required by unittests, we can skip the search.
 Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yi Zhao <[email protected]>
+
 ---
  tests/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 22a36f37..aa32ca2e 100644
+index f5c30061..885c926a 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
 @@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES
@@ -25,7 +26,7 @@ index 22a36f37..aa32ca2e 100644
  # OpenSSH Capabilities are required for all unit tests
  find_program(SSH_EXECUTABLE NAMES ssh)
  if (SSH_EXECUTABLE)
-@@ -293,6 +294,7 @@ if (CLIENT_TESTING OR SERVER_TESTING)
+@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING)
  
      message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}")
  endif ()
@@ -33,6 +34,3 @@ index 22a36f37..aa32ca2e 100644
  
  configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h)
  
--- 
-2.25.1
-
meta-oe/recipes-support/libssh/libssh_0.10.6.bb renamed from meta-oe/recipes-support/libssh/libssh_0.10.5.bb +1 -1
similarity index 96%
rename from meta-oe/recipes-support/libssh/libssh_0.10.5.bb
rename to meta-oe/recipes-support/libssh/libssh_0.10.6.bb
index f33987acf5..31f29c1b7d 100644
@@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable
            file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \
            file://run-ptest \
           "
-SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34"
+SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.34.1