From 887accf681bc61f85d0b90e2728e919463a0674e Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Wed, 13 Dec 2023 11:21:07 +0100 Subject: [PATCH] fix: update patches for OpenSSL --- CDEPS/openssl/000.patch | 2 +- CDEPS/openssl/001.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CDEPS/openssl/000.patch b/CDEPS/openssl/000.patch index e313ac356a..6273aeece6 100644 --- a/CDEPS/openssl/000.patch +++ b/CDEPS/openssl/000.patch @@ -2,7 +2,7 @@ diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index b819337..e479bd6 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c -@@ -34,6 +34,10 @@ static COMP_METHOD zlib_method_nozlib = { +@@ -34,6 +34,10 @@ COMP_METHOD *COMP_zlib(void); # include diff --git a/CDEPS/openssl/001.patch b/CDEPS/openssl/001.patch index 844752e292..80c426b2de 100644 --- a/CDEPS/openssl/001.patch +++ b/CDEPS/openssl/001.patch @@ -1,15 +1,15 @@ diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in -index 3f47a2a..af1db51 100644 +index 3f47a2ac08..b413461ca7 100644 --- a/include/openssl/opensslv.h.in +++ b/include/openssl/opensslv.h.in -@@ -101,6 +101,10 @@ extern "C" { - |(OPENSSL_VERSION_PATCH<<4) \ - |_OPENSSL_VERSION_PRE_RELEASE ) +@@ -13,6 +13,10 @@ + # define OPENSSL_OPENSSLV_H + # pragma once +/* OPENSSL_OONI is used by dependencies to ensure they are using the + correct OpenSSL headers and not some other headers. */ +#define OPENSSL_OONI 1 + # ifdef __cplusplus - } + extern "C" { # endif