Merge pull request #48476 from twangboy/fix_dependencies

Fix dependencies
saltstack · Jul 6, 2018 · 27ea8f3 · 27ea8f3
2 parents acf4286 + b0087d4
commit 27ea8f3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/pkg/windows/modules/get-settings.psm1 b/pkg/windows/modules/get-settings.psm1
@@ -77,6 +77,7 @@ Function Get-Settings {
             "SSLeay"     = "ssleay32.dll"
             "OpenSSLLic" = "OpenSSL_License.txt"
             "msvcr"      = "msvcr120.dll"
+            "Libsodium"  = "libsodium.dll"
         }
         $ini.Add("64bitDLLs", $64bitDLLs)
 
@@ -86,6 +87,7 @@ Function Get-Settings {
             "SSLeay"     = "ssleay32.dll"
             "OpenSSLLic" = "OpenSSL_License.txt"
             "msvcr"      = "msvcr120.dll"
+            "Libsodium"  = "libsodium.dll"
         }
         $ini.Add("32bitDLLs", $32bitDLLs)
 

diff --git a/pkg/windows/readme.md b/pkg/windows/readme.md
@@ -9,34 +9,36 @@ salt for Windows with their corresponding licenses:
 | certifi | ISC |
 | cffi | MIT |
 | CherryPy | BSD |
+| cryptography | BSD |
 | enum34 | BSD |
 | futures | BSD |
 | gitdb | BSD |
 | GitPython | BSD |
 | idna | BSD-like |
-| ioflo | Apache 2.0 |
 | ioloop | MIT |
 | ipaddress | PSF |
 | Jinja2 | BSD |
-| libnacl | --- |
+| libnacl | Apache |
+| lxml | BSD |
 | Mako | MIT |
 | MarkupSafe | BSD |
-| msgpack-python | --- |
+| msgpack-python | Apache 2.0 |
 | pip | MIT |
 | psutil | BSD |
 | pyasn1 | BSD |
 | pycparser | BSD |
 | pycurl | LGPL + MIT |
 | PyMySQL | MIT |
-| pypiwin32 | PSF |
+| PyOpenSSL | Apache 2.0 |
+| python-certifi-win32 | BSD |
 | python-dateutil | Simplified BSD |
 | python-gnupg | BSD |
+| pywin32 | PSF |
 | PyYAML | MIT |
 | pyzmq | LGPL + BSD |
 | requests | Apache 2.0 |
 | setuptools | MIT |
 | singledispatch | MIT |
-| six | MIT |
 | smmap | BSD |
 | timelib | ZLIB/PHP |
 | tornado | Apache 2.0 |

diff --git a/pkg/windows/req.txt b/pkg/windows/req.txt
@@ -12,6 +12,7 @@ idna==2.5
 ioloop==0.1a0
 ipaddress==1.0.18
 Jinja2==2.9.6
+libnacl==1.6.1  # required by the nacl module
 lxml==3.7.3
 Mako==1.0.6
 MarkupSafe==1.0
@@ -23,6 +24,7 @@ pycrypto==2.6.1
 pycurl==7.43.0
 PyMySQL==0.7.11
 pyOpenSSL==17.0.0
+python-certifi-win32==1.2
 python-dateutil==2.6.0
 python-gnupg==0.4.0
 pywin32==223

diff --git a/setup.py b/setup.py
@@ -373,7 +373,7 @@ def run(self):
         url = 'https://repo.saltstack.com/windows/dependencies/{bits}/{fname}.dll'
         dest = os.path.join(os.path.dirname(sys.executable), '{fname}.dll')
         with indent_log():
-            for fname in ('libeay32', 'ssleay32', 'msvcr120'):
+            for fname in ('libeay32', 'libsodium', 'ssleay32', 'msvcr120'):
                 # See if the library is already on the system
                 if find_library(fname):
                     continue