diff options
author | danbst <abcz2.uprola@gmail.com> | 2017-09-05 15:54:16 +0300 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2017-09-05 15:54:16 +0300 |
commit | a5b8c0c2de7c8e17d35f48be6f88631509f42b3b (patch) | |
tree | 3106ce36ceead29dc7498c49fd2b6cc85e794eee /pkgs/tools | |
parent | 8502d94b31fb1aadbd984a7a0e8febbe274e8664 (diff) |
salt: 2016.11.5 -> 2017.7.1, patch fix
The libcrypto patch didn't work well with `salt-ssh` (that code failed on remote machines), so let's make Nix-based library lookup as fallback. https://github.com/saltstack/salt/issues/43350
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/salt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 7fdef68f30f77..5afe14209f645 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,12 +8,12 @@ python2Packages.buildPythonApplication rec { pname = "salt"; - version = "2016.11.5"; + version = "2017.7.1"; name = "${pname}-${version}"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "1gpq6s87vy782z4b5h6s7zwndcxnllbdr2wldxr9hyp4lfj2f55q"; + sha256 = "079kymgxyzhf47dd42l7f42jp45gx5im4k3g31bj25p1s0aq91py"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch index fa2c5c0aa5214..f7560b1fc56df 100644 --- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -1,11 +1,14 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py -index 9eb1f4a..d764f7a 100644 +index f827cc6db8..b728595186 100644 --- a/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py -@@ -36,7 +36,6 @@ def _load_libcrypto(): - 'libcrypto.so*')) +@@ -47,6 +47,9 @@ def _load_libcrypto(): lib = lib[0] if len(lib) > 0 else None -- if lib: -- return cdll.LoadLibrary(lib) -+ return cdll.LoadLibrary('@libcrypto@') + if lib: + return cdll.LoadLibrary(lib) ++ else: ++ return cdll.LoadLibrary('@libcrypto@') ++ raise OSError('Cannot locate OpenSSL libcrypto') + + |