View | Details | Raw Unified | Return to bug 220869 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/py-salt/Makefile (-27 / +35 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	salt
4
PORTNAME=	salt
5
PORTVERSION=	2016.11.6
5
PORTVERSION=	2017.7.1
6
PORTREVISION=	1
7
CATEGORIES=	sysutils python
6
CATEGORIES=	sysutils python
8
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
9
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 14-46 Link Here
14
LICENSE=	APACHE20
13
LICENSE=	APACHE20
15
LICENSE_FILE=	${WRKSRC}/LICENSE
14
LICENSE_FILE=	${WRKSRC}/LICENSE
16
15
17
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
16
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
18
		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
17
		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
18
		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \
19
		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
20
		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \
19
		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
21
		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
20
		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \
22
		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
21
		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \
22
		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
23
		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests \
23
		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests \
24
		${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \
24
		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado \
25
		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
25
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
26
		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
27
		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado
28
26
29
OPTIONS_DEFINE=	ZEROMQ RAET
27
USES=		cpe python:2.7+
30
OPTIONS_DEFAULT=	ZEROMQ
31
32
ZEROMQ_DESC=	Enable ZeroMQ transport
33
RAET_DESC=	Enable RAET transport
34
35
ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
36
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
37
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
38
39
RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl \
40
		${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \
41
		${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet
42
43
USES=		cpe python:2
44
CPE_VENDOR=	saltstack
28
CPE_VENDOR=	saltstack
45
CPE_PRODUCT=	salt
29
CPE_PRODUCT=	salt
46
USE_PYTHON=	autoplist distutils
30
USE_PYTHON=	autoplist distutils
Lines 71-76 Link Here
71
55
72
SUB_FILES=	pkg-message
56
SUB_FILES=	pkg-message
73
57
58
OPTIONS_DEFINE=	RAET TCP ZEROMQ
59
OPTIONS_DEFAULT=ZEROMQ
60
61
RAET_DESC=	Install dependencies required for RAET transport
62
TCP_DESC=	Install dependencies required for TCP transport
63
ZEROMQ_DESC=	Install dependencies required for ZeroMQ transport
64
65
RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl \
66
			${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \
67
			${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet
68
69
TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
70
71
ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
72
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
73
			${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
74
75
.include <bsd.port.pre.mk>
76
77
# Python 2.7-3.3 require enum34, unnecessary for Python 3.4+
78
.if ${PYTHON_REL} < 3400
79
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
80
.endif
81
74
post-patch:
82
post-patch:
75
.for file in conf/minion conf/master doc/man/salt-key.1 \
83
.for file in conf/minion conf/master doc/man/salt-key.1 \
76
	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
84
	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
Lines 89-92 Link Here
89
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
97
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
90
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
98
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
91
99
92
.include <bsd.port.mk>
100
.include <bsd.port.post.mk>
(-)sysutils/py-salt/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1499072109
1
TIMESTAMP = 1503211965
2
SHA256 (salt-2016.11.6.tar.gz) = 9031af68d31d0416fe3161526ef122a763afc6182bd63fe48b6c4d0a16a0703a
2
SHA256 (salt-2017.7.1.tar.gz) = fe868415d0e1162157186f4c5263e9af902b0571870ad2da210e7edf5ff5331d
3
SIZE (salt-2016.11.6.tar.gz) = 9410028
3
SIZE (salt-2017.7.1.tar.gz) = 11408839
(-)sysutils/py-salt/files/pkg-message.in (+9 lines)
Lines 23-27 Link Here
23
  o sysrc salt_proxy_list=""
23
  o sysrc salt_proxy_list=""
24
  o Update the salt_proxy_list with the proxy minion name(s)
24
  o Update the salt_proxy_list with the proxy minion name(s)
25
25
26
---------------------------------------------------------------------------------------------------
27
28
To change the Transport method from the default option of Zeromq to either TCP or RAET:
29
30
  o Re-build the port with the desired options enabled to install the correct runtime dependencies
31
  o Ensure the master and minions all have salt installed with these same options and dependencies
32
  o Add the line 'transport: [tcp|raet]' to both the master and minion configuration files
33
  o Restart salt on the master and minions
34
26
===================================================================================================
35
===================================================================================================
27
36

Return to bug 220869