[Buildroot] [PATCH 1/1] package/exim: fix libressl build

* [Buildroot] [PATCH 1/1] package/exim: fix libressl build
@ 2024-02-11 21:10 Fabrice Fontaine
  2024-02-11 21:38 ` Thomas Petazzoni via buildroot
  2024-03-16 20:27 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2024-02-11 21:10 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Luca Ceresoli, Fabrice Fontaine

Fix the following libressl build failure raised since bump to version
4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and
https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8:

In file included from tls.c:473:
tls-openssl.c: In function 'tls_client_stapling_cb':
tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'}
 2652 |         bs->certs
      |           ^~

Fixes: faec3ca30e358575f70a036879029f63f7da9b29
 - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/exim/0007-typoes.patch                | 58 +++++++++++++++++++
 ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 package/exim/0007-typoes.patch
 create mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch

diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch
new file mode 100644
index 0000000000..6bbfc9eecd
--- /dev/null
+++ b/package/exim/0007-typoes.patch
@@ -0,0 +1,58 @@
+From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Wed, 8 Nov 2023 14:22:37 +0000
+Subject: [PATCH] typoes
+
+Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/src/tls-openssl.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/tls-openssl.c b/src/tls-openssl.c
+index 851ac77c5..237303ba9 100644
+--- a/src/tls-openssl.c
++++ b/src/tls-openssl.c
+@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */
+ #  define EXIM_HAVE_OPENSSL_KEYLOG
+ #  define EXIM_HAVE_OPENSSL_CIPHER_GET_ID
+ #  define EXIM_HAVE_SESSION_TICKET
+-#  define EXIM_HAVE_OPESSL_TRACE
+-#  define EXIM_HAVE_OPESSL_GET0_SERIAL
+-#  define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS
++#  define EXIM_HAVE_OPENSSL_TRACE
++#  define EXIM_HAVE_OPENSSL_GET0_SERIAL
++#  define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
+ #  define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN
+ #  ifndef DISABLE_OCSP
+ #   define EXIM_HAVE_OCSP
+@@ -1756,7 +1756,7 @@ level. */
+ DEBUG(D_tls)
+   {
+   SSL_CTX_set_info_callback(ctx, info_callback);
+-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE)
++#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE)
+   /* this needs a debug build of OpenSSL */
+   SSL_CTX_set_msg_callback(ctx, SSL_trace);
+ #endif
+@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP;
+ if (!olist)
+   return SSL_TLSEXT_ERR_NOACK;
+ 
+-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL
++#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL
+  {
+   const X509 * cert_sent = SSL_get_certificate(s);
+   const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent);
+@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp)))
+ 
+       debug_printf("certs contained in basicresp:\n");
+       x509_stack_dump_cert_s_names(
+-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS
++#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
+ 	OCSP_resp_get0_certs(bs)
+ #else
+ 	bs->certs
+-- 
+2.30.2
+
diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch
new file mode 100644
index 0000000000..67d96fc1af
--- /dev/null
+++ b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch
@@ -0,0 +1,43 @@
+From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 11 Feb 2024 21:45:42 +0100
+Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0
+
+OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and
+https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954
+resulting in the following build failure since version 4.97 and
+https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8:
+
+In file included from tls.c:473:
+tls-openssl.c: In function 'tls_client_stapling_cb':
+tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'}
+ 2652 |         bs->certs
+      |           ^~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Upstream: https://bugs.exim.org/show_bug.cgi?id=3074
+---
+ src/src/tls-openssl.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tls-openssl.c b/src/tls-openssl.c
+index 237303ba9..c7f94c160 100644
+--- a/src/tls-openssl.c
++++ b/src/tls-openssl.c
+@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */
+ # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID
+ #endif
+ 
++#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL
++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS
++#endif
++
+ #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L)
+ # define EXIM_HAVE_EXPORT_CHNL_BNGNG
+ # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS
+-- 
+2.43.0
+
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread