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 2

Merge branch '2017.7.8' into '2017.7'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2018-09-10 12:53:13 -04:00
commit 09247a33a2
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/osx/build_env.sh
View file

@ -199,8 +199,8 @@ sudo -H $MAKE install
############################################################################
echo -n -e "\033]0;Build_Env: OpenSSL\007"
PKGURL="http://openssl.org/source/openssl-1.0.2l.tar.gz"
PKGDIR="openssl-1.0.2l"
PKGURL="http://openssl.org/source/openssl-1.0.2p.tar.gz"
PKGDIR="openssl-1.0.2p"
download $PKGURL

2
pkg/osx/req.txt
View file

@ -25,7 +25,7 @@ PyYAML==3.12
pyzmq==16.0.2
requests==2.18.1
singledispatch==3.4.0.3
six==1.10.0
six==1.11.0
smmap==0.9.0
timelib==0.2.4
tornado==4.5.1

1
pkg/osx/shasums/openssl-1.0.2l.tar.gz.sha512
View file

@ -1 +0,0 @@
047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3 ./openssl-1.0.2l.tar.gz

1
pkg/osx/shasums/openssl-1.0.2p.tar.gz.sha512 Normal file
View file

@ -0,0 +1 @@
958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 ./openssl-1.0.2p.tar.gz

2
salt/modules/pkgng.py
View file

@ -836,7 +836,7 @@ def install(name=None,
opts += 'x'
if salt.utils.is_true(pcre):
opts += 'X'
if salt.utils.data.is_true(batch):
if salt.utils.is_true(batch):
env = {
"BATCH": "true",
"ASSUME_ALWAYS_YES": "YES"