diff options
| author | Robin Gloster <mail@glob.in> | 2016-12-23 12:28:06 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-12-23 12:29:35 +0100 |
| commit | c8982c015c82de2fcf97e60399d1461076b9d42b (patch) | |
| tree | ec576520123d6bcd3345fdfd15b04b8fea06ea0e /pkgs/tools/admin | |
| parent | de44544cebe3cec242d752afcff71a8203b81102 (diff) | |
| download | nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.tar nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.tar.gz nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.tar.bz2 nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.tar.lz nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.tar.xz nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.tar.zst nixlib-c8982c015c82de2fcf97e60399d1461076b9d42b.zip | |
salt: fix patch after upstream code change
fixes #20458
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 6 |
1 files 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 c5cc1bde5d07..fa2c5c0aa521 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') |