mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
* Don't set db_dir twice [1] * Fix build with ports LibreSSL [2] PR: 280841 [1], 274494 [2] Reported by: <pradeep michchi gmail com> [1], Ivan Rozhuk <rozhuk im gmail com> [2]
29 lines
841 B
C
29 lines
841 B
C
--- mysys_ssl/openssl.c.orig 2024-02-01 17:44:37 UTC
|
|
+++ mysys_ssl/openssl.c
|
|
@@ -30,6 +30,11 @@ int check_openssl_compatibility()
|
|
{
|
|
return 0;
|
|
}
|
|
+#elif defined(LIBRESSL_VERSION_NUMBER)
|
|
+int check_openssl_compatibility()
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
#else
|
|
#include <openssl/evp.h>
|
|
|
|
@@ -36,8 +36,12 @@
|
|
static uint testing;
|
|
static size_t alloc_size, alloc_count;
|
|
|
|
-static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
|
|
- int l __attribute__((unused)))
|
|
+static void *coc_malloc(size_t size
|
|
+#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L)
|
|
+ , const char *f __attribute__((unused)),
|
|
+ int l __attribute__((unused))
|
|
+#endif
|
|
+)
|
|
{
|
|
if (unlikely(testing))
|
|
{
|