From c8982c015c82de2fcf97e60399d1461076b9d42b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 23 Dec 2016 12:28:06 +0100 Subject: [PATCH] salt: fix patch after upstream code change fixes #20458 --- pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch index c5cc1bde5d0..fa2c5c0aa52 100644 --- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -2,10 +2,10 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py index 9eb1f4a..d764f7a 100644 --- a/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py -@@ -36,7 +36,7 @@ def _load_libcrypto(): +@@ -36,7 +36,6 @@ def _load_libcrypto(): 'libcrypto.so*')) lib = lib[0] if len(lib) > 0 else None - if lib: +- if lib: - return cdll.LoadLibrary(lib) -+ return cdll.LoadLibrary('@libcrypto@') ++ return cdll.LoadLibrary('@libcrypto@') raise OSError('Cannot locate OpenSSL libcrypto')