From 7efd6c8260ad4d220996606b77623fd3b46c899c Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Wed, 5 Jan 2022 00:50:31 +0100 Subject: [PATCH] Fix loading of libcrypto when using salt-ssh When using salt-ssh, Salt would copy itself to the target machine. The libcrypto loading patch included in Nix hardcodes the location, but does not provide any fallback for the target machine, making salt-ssh unusable from a nix environment, which is ironically, one of the coolest use-cases of nix: a self contained git repo with a Saltfile and a shell.nix with dependencies. --- .../tools/admin/salt/fix-libcrypto-loading.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch index e011a15b43f9..e2d22fed7e51 100644 --- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -1,13 +1,13 @@ -diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py -index f827cc6db8..b728595186 100644 ---- a/salt/utils/rsax931.py -+++ b/salt/utils/rsax931.py -@@ -74,7 +74,7 @@ +--- a/salt/utils/rsax931.py 2021-11-24 00:39:57.940790184 +0100 ++++ b/salt/utils/rsax931.py 2021-11-24 00:38:35.436728341 +0100 +@@ -85,6 +85,10 @@ """ Attempt to load libcrypto. """ -- return cdll.LoadLibrary(_find_libcrypto()) -+ return cdll.LoadLibrary('@libcrypto@') ++ try: ++ return cdll.LoadLibrary('@libcrypto@') ++ except OSError: ++ pass + return cdll.LoadLibrary(_find_libcrypto()) - def _init_libcrypto():