saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't download OpenSSL Libs

Browse source
This commit is contained in:
twangboy 2021-03-22 15:15:56 -06:00 • committed by Gareth J. Greenaway
parent 00ec910e6a
commit dcd1925475
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/windows/build_pkg.bat
View file

@ -174,8 +174,10 @@ powershell -ExecutionPolicy RemoteSigned -File download_url_file.ps1 -url %Url%
:: Remove the fixed path in .exe files
@echo Removing fixed path from .exe files
@echo ----------------------------------------------------------------------
"%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\easy_install.exe"
"%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\easy_install-%PyVerMajor%.%PyVerMinor%.exe"
:: As of setuptools 53.0 easy_install has been removed
:: https://github.com/pypa/setuptools/pull/2544
:: "%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\easy_install.exe"
:: "%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\easy_install-%PyVerMajor%.%PyVerMinor%.exe"
"%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\pip.exe"
"%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\pip%PyVerMajor%.%PyVerMinor%.exe"
"%PyDir%\python" "%CurDir%\portable.py" -f "%BinDir%\Scripts\pip%PyVerMajor%.exe"

16
setup.py
View file

@ -501,19 +501,17 @@ class DownloadWindowsDlls(Command):
yield
platform_bits, _ = platform.architecture()
url = "https://repo.saltstack.com/windows/dependencies/{bits}/{fname}.dll"
dest = os.path.join(os.path.dirname(sys.executable), "{fname}.dll")
url = "https://repo.saltstack.com/windows/dependencies/{bits}/{fname}"
dest = os.path.join(os.path.dirname(sys.executable), "{fname}")
with indent_log():
for fname in ("libeay32", "ssleay32", "libsodium"):
for fname in ("libsodium/1.0.18/libsodium.dll",):
# See if the library is already on the system
if find_library(fname):
continue
furl = url.format(bits=platform_bits[:2], fname=fname)
fdest = dest.format(fname=fname)
fdest = dest.format(fname=fname.split("/")[-1])
if not os.path.exists(fdest):
log.info(
"Downloading {}.dll to {} from {}".format(fname, fdest, furl)
)
log.info("Downloading {} to {} from {}".format(fname, fdest, furl))
try:
from contextlib import closing
@ -528,7 +526,7 @@ class DownloadWindowsDlls(Command):
wfh.flush()
else:
log.error(
"Failed to download {}.dll to {} from {}".format(
"Failed to download {} to {} from {}".format(
fname, fdest, furl
)
)
@ -545,7 +543,7 @@ class DownloadWindowsDlls(Command):
wfh.flush()
else:
log.error(
"Failed to download {}.dll to {} from {}".format(
"Failed to download {} to {} from {}".format(
fname, fdest, furl
)
)