diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/libssh2 | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libssh2')
3 files changed, 32 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix b/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix deleted file mode 100644 index edba7a84ef2b..000000000000 --- a/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ libssh2, fetchurl }: - -libssh2.overrideAttrs (attrs: rec { - version = "1.10.0"; - src = fetchurl { - url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; - }; - patches = []; -}) diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix index d6817550fe7b..1b5d65335b8d 100644 --- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + patches = [ + # https://github.com/libssh2/libssh2/pull/700 + # openssl: add support for LibreSSL 3.5.x + ./openssl_add_support_for_libressl_3_5.patch + ]; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; diff --git a/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch b/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch new file mode 100644 index 000000000000..d72a67a63403 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch @@ -0,0 +1,26 @@ +From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001 +From: Viktor Szakats <commit@vsz.me> +Date: Thu, 19 May 2022 13:25:06 +0000 +Subject: [PATCH] openssl: add support for LibreSSL 3.5.x + +LibreSSL 3.5.0 made more structures opaque, so let's enable existing +support for that when building against these LibreSSL versions. + +Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt +--- + src/openssl.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/openssl.h b/src/openssl.h +index 658b040..1733b9e 100644 +--- a/src/openssl.h ++++ b/src/openssl.h +@@ -58,7 +58,8 @@ + #include <openssl/rand.h> + + #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++ !defined(LIBRESSL_VERSION_NUMBER) || \ ++ LIBRESSL_VERSION_NUMBER >= 0x3050000fL + # define HAVE_OPAQUE_STRUCTS 1 + #endif |