gentoo auto-resync : 10:05:2023 - 23:44:41

1 files changed, 51 insertions, 0 deletions

diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch
new file mode 100644
index 000000000000..1c437e81bc05
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-libressl.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/903001
+https://github.com/apache/serf/commit/df0d2d0dbdf88576f26da9c71df3ab6249d351dc
+
+From df0d2d0dbdf88576f26da9c71df3ab6249d351dc Mon Sep 17 00:00:00 2001
+From: Stefan Sperling <stsp@apache.org>
+Date: Tue, 20 Dec 2016 09:57:08 +0000
+Subject: [PATCH] Fix another build problem with LibreSSL.
+
+* SConstruct: Check for OpenSSL_malloc_init() and provide the
+   SERF_HAVE_OPENSSL_MALLOC_INIT feature flag.
+
+* buckets/ssl_buckets.c
+  (init_ssl_libraries): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead
+   of USE_LEGACY_OPENSSL.
+
+git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68
+---
+ SConstruct            | 6 ++++++
+ buckets/ssl_buckets.c | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4358a23..115f409 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -373,6 +373,12 @@ else:
+   env.Append(CPPPATH=['$OPENSSL/include'])
+   env.Append(LIBPATH=['$OPENSSL/lib'])
+ 
++  # Check for OpenSSL functions which are only available in some of
++  # the versions we support. Also handles forks like LibreSSL.
++  conf = Configure(env)
++  if conf.CheckFunc('OPENSSL_malloc_init'):
++    env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
++  env = conf.Finish()
+ 
+ # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
+ if gssapi and CALLOUT_OKAY:
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
+index b01e535..27c84c7 100644
+--- a/buckets/ssl_buckets.c
++++ b/buckets/ssl_buckets.c
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
+         }
+ #endif
+ 
+-#ifdef USE_OPENSSL_1_1_API
++#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT
+         OPENSSL_malloc_init();
+ #else
+         CRYPTO_malloc_init();