- Update to 2016.11.1

- While I'm here:
  - Update version requirement
  - Use USE_PYTHON=autoplist
  - Remove PYDISTUTILS_EGGINFO
  - Sort USE_RC_SUBR
  - Sort PLIST

Changes:	https://docs.saltstack.com/en/latest/topics/releases/2016.11.1.html
PR:		215380
Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)

sysutils/py-salt/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2016.11.0
-PORTREVISION=	1
+PORTVERSION=	2016.11.1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,11 +15,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.13:devel/py-msgpack-python \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \
 		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}requests>1:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \
 		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
 		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
@@ -34,23 +33,22 @@ RAET_DESC=	Enable RAET transport
 
 ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
 ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>2.6.1:security/py-pycrypto
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
 
-RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:security/py-libnacl \
-		${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:devel/py-ioflo \
-		${PYTHON_PKGNAMEPREFIX}raet>0:net/py-raet
+RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl \
+		${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \
+		${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet
 
 USES=		cpe python:2
 CPE_VENDOR=	saltstack
 CPE_PRODUCT=	salt
-USE_PYTHON=	distutils
+USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
-PYDISTUTILS_EGGINFO=	salt-${DISTVERSION}-py${PYTHON_VER}.egg-info
 
 USE_RC_SUBR=	salt_api \
-		salt_proxy \
 		salt_master \
 		salt_minion \
+		salt_proxy \
 		salt_syndic
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}

sysutils/py-salt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1479913379
-SHA256 (salt-2016.11.0.tar.gz) = b516285926ee95cedc64ecddab05d14422b7c8819c9f6d046a431c41d608e6bc
-SIZE (salt-2016.11.0.tar.gz) = 9044879
+TIMESTAMP = 1482073787
+SHA256 (salt-2016.11.1.tar.gz) = 00343e190dcf6dfa27dbec996d1161f7aef16cf99510b67970136cf24f092992
+SIZE (salt-2016.11.1.tar.gz) = 9075078

sysutils/py-salt/files/patch-freebsd_sysctl.py

@@ -1,44 +0,0 @@
---- salt/modules/freebsd_sysctl.py.orig	2016-10-31 11:21:36.000000000 -0600
-+++ salt/modules/freebsd_sysctl.py      2016-11-02 08:44:19.743993000 -0600
-@@ -56,17 +56,31 @@
-     )
-     cmd = 'sysctl -ae'
-     ret = {}
--    out = __salt__['cmd.run'](cmd, output_loglevel='trace')
-     comps = ['']
--    for line in out.splitlines():
--        if any([line.startswith('{0}.'.format(root)) for root in roots]):
--            comps = line.split('=', 1)
--            ret[comps[0]] = comps[1]
--        elif comps[0]:
--            ret[comps[0]] += '{0}\n'.format(line)
--        else:
--            continue
--    return ret
-+
-+    if config_file:
-+        try:
-+            with salt.utils.fopen(config_file, 'r') as f:
-+                for line in f.readlines():
-+                    l = line.strip()
-+                    if l != "" and not l.startswith("#"):
-+                        comps = line.split('=', 1)
-+                        ret[comps[0]] = comps[1]
-+            return ret
-+        except (OSError, IOError):
-+            log.error('Could not open sysctl config file')
-+            return None
-+    else:
-+        out = __salt__['cmd.run'](cmd, output_loglevel='trace')
-+        for line in out.splitlines():
-+            if any([line.startswith('{0}.'.format(root)) for root in roots]):
-+                comps = line.split('=', 1)
-+                ret[comps[0]] = comps[1]
-+            elif comps[0]:
-+                ret[comps[0]] += '{0}\n'.format(line)
-+            else:
-+                 continue
-+        return ret
- 
- 
- def get(name):

sysutils/py-salt/files/patch-salt_utils_rsax931.py

@@ -1,32 +0,0 @@
---- salt/utils/rsax931.py.orig	2016-11-22 17:52:40 UTC
-+++ salt/utils/rsax931.py
-@@ -16,6 +16,11 @@ import salt.utils
- from ctypes import cdll, c_char_p, c_int, c_void_p, pointer, create_string_buffer
- from ctypes.util import find_library
- 
-+# Constants taken from openssl-1.1.0c/include/openssl/crypto.h
-+OPENSSL_INIT_ADD_ALL_CIPHERS = 0x00000004
-+OPENSSL_INIT_ADD_ALL_DIGESTS = 0x00000008
-+OPENSSL_INIT_NO_LOAD_CONFIG = 0x00000080
-+
- 
- def _load_libcrypto():
-     '''
-@@ -62,8 +67,15 @@ def _init_libcrypto():
-     libcrypto.RSA_private_encrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
-     libcrypto.RSA_public_decrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
- 
--    libcrypto.OPENSSL_no_config()
--    libcrypto.OPENSSL_add_all_algorithms_noconf()
-+    try:
-+        if libcrypto.OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG |
-+                                         OPENSSL_INIT_ADD_ALL_CIPHERS |
-+                                         OPENSSL_INIT_ADD_ALL_DIGESTS, None) != 1:
-+            raise OSError("Failed to initialize OpenSSL library (OPENSSL_init_crypto failed)")
-+    except AttributeError:
-+        # Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
-+        libcrypto.OPENSSL_no_config()
-+        libcrypto.OPENSSL_add_all_algorithms_noconf()
- 
-     return libcrypto
-