Update Python and other reqs

pkg/osx/build.sh

@@ -66,7 +66,7 @@ fi
 # Create the Build Environment
 ############################################################################
 echo -n -e "\033]0;Build: Build Environment\007"
-sudo $PKGRESOURCES/build_env.sh
+sudo $PKGRESOURCES/build_env_2.sh
 
 ############################################################################
 # Install Salt

pkg/osx/build_env_2.sh

@@ -121,8 +121,8 @@ BUILDDIR=$SCRIPTDIR/build
 ############################################################################
 echo -n -e "\033]0;Build_Env: pkg-config\007"
 
-PKGURL="http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz"
-PKGDIR="pkg-config-0.29"
+PKGURL="http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz"
+PKGDIR="pkg-config-0.29.2"
 
 download $PKGURL
 
@@ -140,8 +140,8 @@ sudo -H $MAKE install
 ############################################################################
 echo -n -e "\033]0;Build_Env: libsodium\007"
 
-PKGURL="https://download.libsodium.org/libsodium/releases/libsodium-1.0.12.tar.gz"
-PKGDIR="libsodium-1.0.12"
+PKGURL="https://download.libsodium.org/libsodium/releases/libsodium-1.0.13.tar.gz"
+PKGDIR="libsodium-1.0.13"
 
 download $PKGURL
 
@@ -159,8 +159,8 @@ sudo -H $MAKE install
 ############################################################################
 echo -n -e "\033]0;Build_Env: zeromq\007"
 
-PKGURL="http://download.zeromq.org/zeromq-4.1.3.tar.gz"
-PKGDIR="zeromq-4.1.3"
+PKGURL="http://download.zeromq.org/zeromq-4.1.4.tar.gz"
+PKGDIR="zeromq-4.1.4"
 
 download $PKGURL
 
@@ -178,13 +178,13 @@ sudo -H $MAKE install
 ############################################################################
 echo -n -e "\033]0;Build_Env: OpenSSL\007"
 
-PKGURL="http://openssl.org/source/openssl-1.0.2f.tar.gz"
-PKGDIR="openssl-1.0.2f"
+PKGURL="http://openssl.org/source/openssl-1.0.2l.tar.gz"
+PKGDIR="openssl-1.0.2l"
 
 download $PKGURL
 
 echo "################################################################################"
-echo "Building OpenSSL 1.0.2f"
+echo "Building OpenSSL"
 echo "################################################################################"
 cd $PKGDIR
 ./Configure darwin64-x86_64-cc --prefix=/opt/salt --openssldir=/opt/salt/openssl
@@ -197,13 +197,13 @@ sudo -H $MAKE install
 ############################################################################
 echo -n -e "\033]0;Build_Env: Python\007"
 
-PKGURL="https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz"
-PKGDIR="Python-2.7.12"
+PKGURL="https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz"
+PKGDIR="Python-2.7.13"
 
 download $PKGURL
 
 echo "################################################################################"
-echo "Building Python 2.7.12"
+echo "Building Python"
 echo "################################################################################"
 echo "Note there are some test failures"
 cd $PKGDIR

pkg/osx/req.txt

@@ -1,34 +1,31 @@
-apache-libcloud==0.20.1
+apache-libcloud==2.1.0
 backports.ssl_match_hostname==3.5.0.1
-backports_abc==0.4
+backports_abc==0.5
 certifi
-cffi==1.5.0
-CherryPy==4.0.0
-click==6.2
-enum34==1.1.2
+cffi==1.10.0
+CherryPy==11.0.0
+click==6.7
+enum34==1.1.6
 gitdb==0.6.4
-GitPython==1.0.1
-idna==2.0
-ioflo==1.5.0
-ipaddress==1.0.16
-Jinja2==2.9.4
-libnacl==1.4.4
+GitPython==2.1.5
+idna==2.5
+ipaddress==1.0.18
+Jinja2==2.9.6
 linode-python==1.1.1
-Mako==1.0.3
-MarkupSafe==0.23
-msgpack-python==0.4.7
-pyasn1==0.1.9
-pycparser==2.14
+Mako==1.0.7
+MarkupSafe==1.0
+msgpack-python==0.4.8
+pyasn1==0.2.3
+pycparser==2.18
 pycrypto==2.6.1
-python-dateutil==2.4.2
-python-gnupg==0.3.8
-PyYAML==3.11
-pyzmq==15.2.0
-raet==0.6.5
-requests==2.9.1
+python-dateutil==2.6.1
+python-gnupg==0.4.1
+PyYAML==3.12
+pyzmq==16.0.2
+requests==2.18.1
 singledispatch==3.4.0.3
 six==1.10.0
 smmap==0.9.0
 timelib==0.2.4
-tornado==4.3
-vultr==0.1.2
+tornado==4.5.1
+vultr==1.0rc1

pkg/osx/req_ext.txt

@@ -1,2 +1,2 @@
-cryptography==1.2.2
-pyOpenSSL==0.15.1
+cryptography==2.0
+pyOpenSSL==17.1.0

pkg/osx/shasums/Python-2.7.12.tar.xz.sha512

@@ -1 +0,0 @@
-6ddbbce47cc49597433d98ca05c2f62f07ed1070807b645602a8e9e9b996adc6fa66fa20a33cd7d23d4e7e925e25071d7301d288149fbe4e8c5f06d5438dda1f  ./Python-2.7.12.tar.xz

pkg/osx/shasums/Python-2.7.13.tar.xz.sha512

@@ -0,0 +1 @@
+f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b  ./Python-2.7.13.tar.xz

pkg/osx/shasums/libsodium-1.0.12.tar.gz.sha512

@@ -1 +0,0 @@
-1e63960da42bcc90945463ae1f5b1355849881dce5bba6d293391f8d6f0932063a5bfd433a071cb184af90ebeab469acc34710587116922144d61f3d7661901b  ./libsodium-1.0.12.tar.gz

pkg/osx/shasums/libsodium-1.0.13.tar.gz.sha512

@@ -0,0 +1 @@
+c619b12fdf0b2e59174b6e383a62d5499ebcd720fdbb2c1a41a98a46c285df075202423454b294fefee185432441e943805397d7656f7cd7837de425da623929  ./libsodium-1.0.13.tar.gz

pkg/osx/shasums/openssl-1.0.2f.tar.gz.sha512

@@ -1 +0,0 @@
-50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351  ./openssl-1.0.2f.tar.gz

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

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

pkg/osx/shasums/pkg-config-0.29.2.tar.gz.sha512

@@ -0,0 +1 @@
+4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75  ./pkg-config-0.29.2.tar.gz

pkg/osx/shasums/pkg-config-0.29.tar.gz.sha512

@@ -1 +0,0 @@
-c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63  ./pkg-config-0.29.tar.gz

pkg/osx/shasums/zeromq-4.1.3.tar.gz.sha512

@@ -1 +0,0 @@
-2c993d18ea44e1cba890e024176af65b85b842ca4f8a22d319be4ace8388ab8828dd706b065f02754025bf271b1d7aa878c3f6655878248f7826452cb2a6134c  ./zeromq-4.1.3.tar.gz

pkg/osx/shasums/zeromq-4.1.4.tar.gz.sha512

@@ -0,0 +1 @@
+8a8cf4f52ad78dddfff104bfba0f80bbc12566920906a0fafb9fc340aa92f5577c2923cb2e5346c69835cd2ea1609647a8893c2883cd22c1f0340a720511460c  ./zeromq-4.1.4.tar.gz