diff --git a/meta/recipes-connectivity/kea/files/0001-Add-const-qualifiers-to-OpenSSL-X509-pointers.patch b/meta/recipes-connectivity/kea/files/0001-Add-const-qualifiers-to-OpenSSL-X509-pointers.patch deleted file mode 100644 index 987890f4ff1..00000000000 --- a/meta/recipes-connectivity/kea/files/0001-Add-const-qualifiers-to-OpenSSL-X509-pointers.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 82d28b1be73bbc00e73e59d0c59c51a1e76519a5 Mon Sep 17 00:00:00 2001 -From: Simo Sorce -Date: Mon, 27 Apr 2026 17:49:56 -0400 -Subject: [PATCH] Add const qualifiers to OpenSSL X509 pointers - -Added const qualifiers to the X509_NAME and X509_NAME_ENTRY pointers when -retrieving subject and issuer names from TLS certificates. This ensures const- -correctness and maintains compatibility with newer OpenSSL versions, which -return const pointers from these getter functions. - -Signed-off-by: Simo Sorce - -Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/4673] -Signed-off-by: Jaipaul Cheernam ---- - src/lib/asiolink/openssl_tls.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/lib/asiolink/openssl_tls.h b/src/lib/asiolink/openssl_tls.h -index 57c3323..52a969b 100644 ---- a/src/lib/asiolink/openssl_tls.h -+++ b/src/lib/asiolink/openssl_tls.h -@@ -175,9 +175,9 @@ public: - if (!cert) { - return (""); - } -- ::X509_NAME *name = ::X509_get_subject_name(cert); -+ const ::X509_NAME *name = ::X509_get_subject_name(cert); - int loc = ::X509_NAME_get_index_by_NID(name, NID_commonName, -1); -- ::X509_NAME_ENTRY* ne = ::X509_NAME_get_entry(name, loc); -+ const ::X509_NAME_ENTRY* ne = ::X509_NAME_get_entry(name, loc); - if (!ne) { - ::X509_free(cert); - return (""); -@@ -209,9 +209,9 @@ public: - if (!cert) { - return (""); - } -- ::X509_NAME *name = ::X509_get_issuer_name(cert); -+ const ::X509_NAME *name = ::X509_get_issuer_name(cert); - int loc = ::X509_NAME_get_index_by_NID(name, NID_commonName, -1); -- ::X509_NAME_ENTRY* ne = ::X509_NAME_get_entry(name, loc); -+ const ::X509_NAME_ENTRY* ne = ::X509_NAME_get_entry(name, loc); - if (!ne) { - ::X509_free(cert); - return (""); --- -2.53.0 - diff --git a/meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch b/meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch index 20a68e5e564..e3ab78525b4 100644 --- a/meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch +++ b/meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch @@ -1,4 +1,4 @@ -From 312f5b7e8286c306502bed348fe5da765c20f98d Mon Sep 17 00:00:00 2001 +From 8f832387e2e31683dca5df092c464ad655a417d2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 28 Aug 2025 17:02:49 -0700 Subject: [PATCH] meson: use a runtime-safe interpreter string @@ -44,10 +44,10 @@ index 5fc5ee9..6485ce2 100644 if PDFLATEX.found() doc_conf.set('HAVE_PDFLATEX', 'yes') diff --git a/meson.build b/meson.build -index f3ef0ea..11a41cf 100644 +index 4e9ce4b..3cd8987 100644 --- a/meson.build +++ b/meson.build -@@ -648,9 +648,13 @@ link_args = [] +@@ -655,9 +655,13 @@ link_args = [] # Also, Meson might use it by default, but might not use it on all systems, so lots of variables... # EXECUTABLE_RPATH = f'$ORIGIN/../@LIBDIR@' # HOOK_RPATH = '$ORIGIN/../..' @@ -62,7 +62,7 @@ index f3ef0ea..11a41cf 100644 # Add rpaths for NETCONF dependencies. if NETCONF_DEP.found() -@@ -769,7 +773,13 @@ report_conf_data.set('CXX_ARGS', ' '.join(compile_args)) +@@ -776,7 +780,13 @@ report_conf_data.set('CXX_ARGS', ' '.join(compile_args)) report_conf_data.set('LD_ID', cpp.get_linker_id()) link_args += get_option('cpp_link_args') report_conf_data.set('LD_ARGS', ' '.join(link_args)) diff --git a/meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch b/meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch index beee04e1593..38703edba91 100644 --- a/meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch +++ b/meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch @@ -1,4 +1,4 @@ -From 97599e59234b8d79748eb7b1cdd451c91e94152f Mon Sep 17 00:00:00 2001 +From 9389b17972f09a6629d5a5fe5d869df6614c3109 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 28 Aug 2025 17:31:39 -0700 Subject: [PATCH] mk_cfgrpt.sh: strip prefixes diff --git a/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch b/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch index 22a26f345dd..2a0db44e61b 100644 --- a/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch +++ b/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch @@ -1,4 +1,4 @@ -From 39281b6199b1307b6b70f3163a70ab9ce4f445d0 Mon Sep 17 00:00:00 2001 +From 98e5871081dec4953d7f92992a8167feb4fe8fa1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 10 Nov 2020 15:57:03 +0000 Subject: [PATCH] src/lib/log/logger_unittest_support.cc: do not write build diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index c1ac4854254..e78e7792626 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch @@ -1,4 +1,4 @@ -From 5180d1866b99125d3353f76151e84644a5791e3d Mon Sep 17 00:00:00 2001 +From 414842987006bf8f1b6e447901360c230966a908 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 14 Oct 2025 01:37:35 +0000 Subject: [PATCH] There are conflict of config files between kea and lib32-kea: diff --git a/meta/recipes-connectivity/kea/kea_3.2.0.bb b/meta/recipes-connectivity/kea/kea_3.2.1.bb similarity index 96% rename from meta/recipes-connectivity/kea/kea_3.2.0.bb rename to meta/recipes-connectivity/kea/kea_3.2.1.bb index 38b24eed1f0..3e98e334335 100644 --- a/meta/recipes-connectivity/kea/kea_3.2.0.bb +++ b/meta/recipes-connectivity/kea/kea_3.2.1.bb @@ -19,9 +19,8 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ file://0001-meson-use-a-runtime-safe-interpreter-string.patch \ file://0001-mk_cfgrpt.sh-strip-prefixes.patch \ - file://0001-Add-const-qualifiers-to-OpenSSL-X509-pointers.patch \ " -SRC_URI[sha256sum] = "14bf695d37b65b9b1bf550fea5d0adaf9806c50e5419ef2a176a4b8e9aade3df" +SRC_URI[sha256sum] = "3478220be62b3aa361a2c7f97d5d2989b934f7864e82d4bd17056e1e208b9735" inherit meson pkgconfig systemd update-rc.d upstream-version-is-even python3-dir