pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #153529 from dmacvicar/patch-1

authored by

Bernardo Meurer and committed by
GitHub 26b9c980 e656a888

+8 -8
unified split
+8 -8
pkgs/tools/admin/salt/fix-libcrypto-loading.patch
··· 1 - diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py 2 - index f827cc6db8..b728595186 100644 3 - --- a/salt/utils/rsax931.py 4 - +++ b/salt/utils/rsax931.py 5 - @@ -74,7 +74,7 @@ 1 + --- a/salt/utils/rsax931.py 2021-11-24 00:39:57.940790184 +0100 2 + +++ b/salt/utils/rsax931.py 2021-11-24 00:38:35.436728341 +0100 3 + @@ -85,6 +85,10 @@ 6 4 """ 7 5 Attempt to load libcrypto. 8 6 """ 9 - - return cdll.LoadLibrary(_find_libcrypto()) 10 - + return cdll.LoadLibrary('@libcrypto@') 7 + + try: 8 + + return cdll.LoadLibrary('@libcrypto@') 9 + + except OSError: 10 + + pass 11 + return cdll.LoadLibrary(_find_libcrypto()) 11 12 12 13 13 - def _init_libcrypto():