JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

salt: 2016.11.5 -> 2017.7.1, patch fix

Browse Source 
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
This commit is contained in:
danbst 2017-09-05 15:54:16 +03:00
parent 8502d94b31
commit a5b8c0c2de
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/admin/salt/default.nix
View File

@ -8,12 +8,12 @@
python2Packages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "salt"; pname = "salt";
version = "2016.11.5"; version = "2017.7.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = python2Packages.fetchPypi { src = python2Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1gpq6s87vy782z4b5h6s7zwndcxnllbdr2wldxr9hyp4lfj2f55q"; sha256 = "079kymgxyzhf47dd42l7f42jp45gx5im4k3g31bj25p1s0aq91py";
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [

15
pkgs/tools/admin/salt/fix-libcrypto-loading.patch
View File

@ -1,11 +1,14 @@
diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py 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 --- a/salt/utils/rsax931.py
+++ b/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py
@@ -36,7 +36,6 @@ def _load_libcrypto(): @@ -47,6 +47,9 @@ def _load_libcrypto():
'libcrypto.so*'))
lib = lib[0] if len(lib) > 0 else None lib = lib[0] if len(lib) > 0 else None
- if lib: if lib:
- return cdll.LoadLibrary(lib) return cdll.LoadLibrary(lib)
+ return cdll.LoadLibrary('@libcrypto@') + else:
+ return cdll.LoadLibrary('@libcrypto@')
+
raise OSError('Cannot locate OpenSSL libcrypto') raise OSError('Cannot locate OpenSSL libcrypto')