From 00e3f026f3b1ef61452432566001842ca439073f Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Thu, 18 Jun 2020 21:38:54 +0200
Subject: [PATCH] salt: 3000.3 -> 3001
---
pkgs/tools/admin/salt/default.nix | 7 ++++---
pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 15 +++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index f3c375a9966..3cfd805d482 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -25,18 +25,19 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "salt";
- version = "3000.3";
+ version = "3001";
src = py.pkgs.fetchPypi {
inherit pname version;
- sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw";
+ sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw";
};
propagatedBuildInputs = with py.pkgs; [
+ distro
jinja2
markupsafe
msgpack
- pycrypto
+ pycryptodomex
pyyaml
pyzmq
requests
diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
index f7560b1fc56..e011a15b43f 100644
--- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
+++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
@@ -2,13 +2,12 @@ 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
-@@ -47,6 +47,9 @@ def _load_libcrypto():
- lib = lib[0] if len(lib) > 0 else None
- if lib:
- return cdll.LoadLibrary(lib)
-+ else:
-+ return cdll.LoadLibrary('@libcrypto@')
-+
- raise OSError('Cannot locate OpenSSL libcrypto')
+@@ -74,7 +74,7 @@
+ """
+ Attempt to load libcrypto.
+ """
+- return cdll.LoadLibrary(_find_libcrypto())
++ return cdll.LoadLibrary('@libcrypto@')
+ def _init_libcrypto():