pyrox.dev
lol
libssh2: fix build with libressl 3.5.x
+32
+6
pkgs/development/libraries/libssh2/default.nix
+6
pkgs/development/libraries/libssh2/default.nix
···
11
11
12
12
outputs = [ "out" "dev" "devdoc" ];
13
13
14
+
patches = [
15
+
# https://github.com/libssh2/libssh2/pull/700
16
+
# openssl: add support for LibreSSL 3.5.x
17
+
./openssl_add_support_for_libressl_3_5.patch
18
+
];
19
+
14
20
buildInputs = [ openssl zlib ]
15
21
++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
16
22
+26
pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch
+26
pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch
···
1
+
From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001
2
+
From: Viktor Szakats <commit@vsz.me>
3
+
Date: Thu, 19 May 2022 13:25:06 +0000
4
+
Subject: [PATCH] openssl: add support for LibreSSL 3.5.x
5
+
6
+
LibreSSL 3.5.0 made more structures opaque, so let's enable existing
7
+
support for that when building against these LibreSSL versions.
8
+
9
+
Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt
10
+
---
11
+
src/openssl.h | 3 ++-
12
+
1 file changed, 2 insertions(+), 1 deletion(-)
13
+
14
+
diff --git a/src/openssl.h b/src/openssl.h
15
+
index 658b040..1733b9e 100644
16
+
--- a/src/openssl.h
17
+
+++ b/src/openssl.h
18
+
@@ -58,7 +58,8 @@
19
+
#include <openssl/rand.h>
20
+
21
+
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
22
+
- !defined(LIBRESSL_VERSION_NUMBER)
23
+
+ !defined(LIBRESSL_VERSION_NUMBER) || \
24
+
+ LIBRESSL_VERSION_NUMBER >= 0x3050000fL
25
+
# define HAVE_OPAQUE_STRUCTS 1
26
+
#endif