From a731846e46fde7aa5fc575e9b2e784e92f7161d0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Sep 2026 12:42:38 +0200 Subject: [PATCH] package/omniorb: Fix build with OpenSSL 4.0.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/omniorb/0001-openssl4.patch | 63 +++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/omniorb/0001-openssl4.patch diff --git a/package/omniorb/0001-openssl4.patch b/package/omniorb/0001-openssl4.patch new file mode 100644 index 0000000000..984d5dab25 --- /dev/null +++ b/package/omniorb/0001-openssl4.patch @@ -0,0 +1,63 @@ +From: Colin Watson +Date: Mon, 1 Jun 2026 11:07:35 +0100 +Subject: OpenSSL 4.0.0 returns const pointers from X509 functions + +Origin: upstream, https://sourceforge.net/p/omniorb/svn/6818/ +Bug-Debian: https://bugs.debian.org/1138480 +Last-Update: 2026-06-01 + +Downloaded from Debian: +https://sources.debian.org/src/omniorb-dfsg/4.3.4%2Bds1-1/debian/patches/openssl-4.patch + +Upstream: https://sourceforge.net/p/omniorb/svn/6818/ + +Signed-off-by: Bernd Kuhls +--- + src/lib/omniORB/orbcore/http/httpConnection.cc | 6 +++--- + src/lib/omniORB/orbcore/ssl/sslConnection.cc | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/lib/omniORB/orbcore/http/httpConnection.cc b/src/lib/omniORB/orbcore/http/httpConnection.cc +index 1e70f93..9da18cd 100644 +--- a/src/lib/omniORB/orbcore/http/httpConnection.cc ++++ b/src/lib/omniORB/orbcore/http/httpConnection.cc +@@ -2554,14 +2554,14 @@ httpConnection::setPeerDetails() { + + int lastpos = -1; + +- X509_NAME* name = X509_get_subject_name(peer_cert); ++ const X509_NAME* name = X509_get_subject_name(peer_cert); + lastpos = X509_NAME_get_index_by_NID(name, NID_commonName, lastpos); + + if (lastpos == -1) + return; + +- X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos); +- ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne); ++ const X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos); ++ const ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne); + + // Convert to native code set + cdrMemoryStream stream; +diff --git a/src/lib/omniORB/orbcore/ssl/sslConnection.cc b/src/lib/omniORB/orbcore/ssl/sslConnection.cc +index f02f3f0..d29d2b8 100644 +--- a/src/lib/omniORB/orbcore/ssl/sslConnection.cc ++++ b/src/lib/omniORB/orbcore/ssl/sslConnection.cc +@@ -548,14 +548,14 @@ sslConnection::setPeerDetails() { + + int lastpos = -1; + +- X509_NAME* name = X509_get_subject_name(peer_cert); ++ const X509_NAME* name = X509_get_subject_name(peer_cert); + lastpos = X509_NAME_get_index_by_NID(name, NID_commonName, lastpos); + + if (lastpos == -1) + return; + +- X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos); +- ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne); ++ const X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos); ++ const ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne); + + // Convert to native code set + cdrMemoryStream stream;