Merge pull request #153529 from dmacvicar/patch-1

2022-01-23 17:17:21 +00:00 · 2022-01-23 17:17:21 +00:00 · 26b9c9800a
parent e656a888f9 7efd6c8260
commit 26b9c9800a
1 changed files with 8 additions and 8 deletions
--- 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():