Attachment #157094 for bug #200044




# $FreeBSD: head/sysutils/py-salt/Makefile 384339 2015-04-20 09:01:00Z culot $

PORTNAME=	salt
PORTVERSION=	2015.5.1
CATEGORIES=	sysutils python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	APACHE20

RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
		${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
		${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.13:${PORTSDIR}/devel/py-msgpack \
		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \
		${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \
		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
		${PYTHON_PKGNAMEPREFIX}requests>1:${PORTSDIR}/www/py-requests \
		${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34 \
		${PYTHON_PKGNAMEPREFIX}progressbar>0:${PORTSDIR}/misc/py-progressbar

OPTIONS_DEFINE=	ZEROMQ RAET
OPTIONS_DEFAULT=	ZEROMQ

ZEROMQ_DESC=	Enable ZeroMQ transport
RAET_DESC=	Enable RAET transport

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MZEROMQ}
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
.endif

.if ${PORT_OPTIONS:MRAET}
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:${PORTSDIR}/security/py-libnacl \
		${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:${PORTSDIR}/devel/py-ioflo \
		${PYTHON_PKGNAMEPREFIX}raet>0:${PORTSDIR}/net/py-raet
.endif

USES=		python:2
USE_PYTHON=	distutils

		--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
		--salt-base-master-roots-dir=${ETCDIR}/salt-master \
		--salt-logs-dir=/var/log/salt \
		--salt-pidfile-dir=/var/run \

USE_RC_SUBR=	salt_master \
		salt_minion \

Lines 1-2 Link Here

(-)py-salt-2015.5.1/distinfo (-2 / +2 lines)
1	SHA256 (salt-2014.7.5.tar.gz) = 474d0a23866e42c664f46e04bc8ead87fc57ee16ff2cc8945248f1e0706f6eb8	1	SHA256 (salt-2015.5.1.tar.gz) = 0edb1d0584f53e805ad6ffc21c163a637b23d187052ba2dbb7e641c2d7099c4d
2	SIZE (salt-2014.7.5.tar.gz) = 3845643	2	SIZE (salt-2015.5.1.tar.gz) = 4970135

Lines 1-6 Link Here

(-)py-salt-2015.5.1/files/patch-salt__grains__core.py (-3 / +3 lines)
1	--- salt/grains/core.py.orig 2015-01-24 14:54:03.078736129 -0700	1	--- salt/grains/core.py.orig 2015-04-17 18:44:50 UTC
2	+++ salt/grains/core.py 2015-01-24 14:53:12.000000000 -0700	2	+++ salt/grains/core.py
3	@@ -1321,7 +1321,7 @@	3	@@ -1387,7 +1387,7 @@ def path():
4	'''	4	'''
5	# Provides:	5	# Provides:
6	# path	6	# path

Lines 1-7 Link Here

(-)py-salt-2015.5.1/files/patch-salt__utils____init__.py (-4 / +4 lines)
1	--- ./salt/utils/__init__.py.orig 2014-02-19 22:21:15.000000000 +0200	1	--- salt/utils/__init__.py.orig 2015-04-17 18:44:50 UTC
2	+++ ./salt/utils/__init__.py 2014-03-06 10:50:07.000000000 +0200	2	+++ salt/utils/__init__.py
3	@@ -316,6 +316,15 @@	3	@@ -372,6 +372,15 @@ def which(exe=None):
4	if os.access(exe, os.X_OK):	4	# executable in cwd or fullpath
5	return exe	5	return exe
6		6
7	+ p = os.environ.get('PATH')	7	+ p = os.environ.get('PATH')

Lines 1-6 Link Here

(-)py-salt-2015.5.1/files/patch-setup.py (-3 / +3 lines)
1	--- setup.py.orig 2015-01-24 14:55:05.507732433 -0700	1	--- setup.py.orig 2015-04-17 18:44:50 UTC
2	+++ setup.py 2015-01-24 14:59:07.595716022 -0700	2	+++ setup.py
3	@@ -621,8 +621,8 @@	3	@@ -623,8 +623,8 @@ class SaltDistribution(distutils.dist.Di
4	def _property_data_files(self):	4	def _property_data_files(self):
5	# Data files common to all scenarios	5	# Data files common to all scenarios
6	data_files = [	6	data_files = [

Lines 5-11 Link Here

(-)py-salt-2015.5.1/files/pkg-message.in (-3 / +2 lines)
5		5
6	o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master	6	o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
7	o Update to meet your needs	7	o Update to meet your needs
8	o Set salt_master_enable="YES" in rc.conf	8	o sysrc salt_master_enable="YES"
9		9
10	---------------------------------------------------------------------------------------------------	10	---------------------------------------------------------------------------------------------------
11		11
Lines 13-20 Link Here
13		13
14	o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion	14	o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion
15	o Update 'master: salt' to point to your Salt Master's hostname or IP	15	o Update 'master: salt' to point to your Salt Master's hostname or IP
16	o Set salt_minion_enable="YES" in rc.conf	16	o sysrc salt_minion_enable="YES"
17	o Set salt_minion_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" in rc.conf
18		17
19	===================================================================================================	18	===================================================================================================
20		19

Return to bug 200044

Lines 2-8 Link Here

(-)py-salt-2015.5.1/Makefile (-8 / +26 lines)
2	# $FreeBSD: head/sysutils/py-salt/Makefile 384339 2015-04-20 09:01:00Z culot $	2	# $FreeBSD: head/sysutils/py-salt/Makefile 384339 2015-04-20 09:01:00Z culot $
3		3
4	PORTNAME= salt	4	PORTNAME= salt
5	PORTVERSION= 2014.7.5	5	PORTVERSION= 2015.5.1
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 12-29 Link Here
12		12
13	LICENSE= APACHE20	13	LICENSE= APACHE20
14		14
15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq	15	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
17	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
18	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
19	${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \	16	${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
20	${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.13:${PORTSDIR}/devel/py-msgpack \	17	${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.13:${PORTSDIR}/devel/py-msgpack \
21	${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \	18	${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \
22	${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \	19	${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \
23	${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
24	${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \	20	${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
25	${PYTHON_PKGNAMEPREFIX}requests>1:${PORTSDIR}/www/py-requests \	21	${PYTHON_PKGNAMEPREFIX}requests>1:${PORTSDIR}/www/py-requests \
26	lsof>0:${PORTSDIR}/sysutils/lsof	22	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34 \
		23	${PYTHON_PKGNAMEPREFIX}progressbar>0:${PORTSDIR}/misc/py-progressbar
		24
		25	OPTIONS_DEFINE= ZEROMQ RAET
		26	OPTIONS_DEFAULT= ZEROMQ
		27
		28	ZEROMQ_DESC= Enable ZeroMQ transport
		29	RAET_DESC= Enable RAET transport
		30
		31	.include <bsd.port.options.mk>
		32
		33	.if ${PORT_OPTIONS:MZEROMQ}
		34	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq
		35	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
		36	${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
		37	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
		38	.endif
		39
		40	.if ${PORT_OPTIONS:MRAET}
		41	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:${PORTSDIR}/security/py-libnacl \
		42	${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:${PORTSDIR}/devel/py-ioflo \
		43	${PYTHON_PKGNAMEPREFIX}raet>0:${PORTSDIR}/net/py-raet
		44	.endif
27		45
28	USES= python:2	46	USES= python:2
29	USE_PYTHON= distutils	47	USE_PYTHON= distutils
Lines 40-46 Link Here
40	--salt-base-pillar-roots-dir=${ETCDIR}/pillar \	58	--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
41	--salt-base-master-roots-dir=${ETCDIR}/salt-master \	59	--salt-base-master-roots-dir=${ETCDIR}/salt-master \
42	--salt-logs-dir=/var/log/salt \	60	--salt-logs-dir=/var/log/salt \
43	--salt-pidfile-dir=/var/run	61	--salt-pidfile-dir=/var/run \
44		62
45	USE_RC_SUBR= salt_master \	63	USE_RC_SUBR= salt_master \
46	salt_minion \	64	salt_minion \

Lines 18-37 Link Here

(-)py-salt-2015.5.1/pkg-plist (-8 / +287 lines)
18	%%PYTHON_SITELIBDIR%%/salt/auth/keystone.pyc	18	%%PYTHON_SITELIBDIR%%/salt/auth/keystone.pyc
19	%%PYTHON_SITELIBDIR%%/salt/auth/ldap.py	19	%%PYTHON_SITELIBDIR%%/salt/auth/ldap.py
20	%%PYTHON_SITELIBDIR%%/salt/auth/ldap.pyc	20	%%PYTHON_SITELIBDIR%%/salt/auth/ldap.pyc
		21	%%PYTHON_SITELIBDIR%%/salt/auth/mysql.py
		22	%%PYTHON_SITELIBDIR%%/salt/auth/mysql.pyc
21	%%PYTHON_SITELIBDIR%%/salt/auth/pam.py	23	%%PYTHON_SITELIBDIR%%/salt/auth/pam.py
22	%%PYTHON_SITELIBDIR%%/salt/auth/pam.pyc	24	%%PYTHON_SITELIBDIR%%/salt/auth/pam.pyc
23	%%PYTHON_SITELIBDIR%%/salt/auth/pki.py	25	%%PYTHON_SITELIBDIR%%/salt/auth/pki.py
24	%%PYTHON_SITELIBDIR%%/salt/auth/pki.pyc	26	%%PYTHON_SITELIBDIR%%/salt/auth/pki.pyc
		27	%%PYTHON_SITELIBDIR%%/salt/auth/rest.py
		28	%%PYTHON_SITELIBDIR%%/salt/auth/rest.pyc
25	%%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.py	29	%%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.py
26	%%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.pyc	30	%%PYTHON_SITELIBDIR%%/salt/auth/stormpath_mod.pyc
		31	%%PYTHON_SITELIBDIR%%/salt/auth/yubico.py
		32	%%PYTHON_SITELIBDIR%%/salt/auth/yubico.pyc
		33	%%PYTHON_SITELIBDIR%%/salt/beacons/__init__.py
		34	%%PYTHON_SITELIBDIR%%/salt/beacons/__init__.pyc
		35	%%PYTHON_SITELIBDIR%%/salt/beacons/btmp.py
		36	%%PYTHON_SITELIBDIR%%/salt/beacons/btmp.pyc
		37	%%PYTHON_SITELIBDIR%%/salt/beacons/diskusage.py
		38	%%PYTHON_SITELIBDIR%%/salt/beacons/diskusage.pyc
		39	%%PYTHON_SITELIBDIR%%/salt/beacons/inotify.py
		40	%%PYTHON_SITELIBDIR%%/salt/beacons/inotify.pyc
		41	%%PYTHON_SITELIBDIR%%/salt/beacons/journald.py
		42	%%PYTHON_SITELIBDIR%%/salt/beacons/journald.pyc
		43	%%PYTHON_SITELIBDIR%%/salt/beacons/load.py
		44	%%PYTHON_SITELIBDIR%%/salt/beacons/load.pyc
		45	%%PYTHON_SITELIBDIR%%/salt/beacons/network_info.py
		46	%%PYTHON_SITELIBDIR%%/salt/beacons/network_info.pyc
		47	%%PYTHON_SITELIBDIR%%/salt/beacons/service.py
		48	%%PYTHON_SITELIBDIR%%/salt/beacons/service.pyc
		49	%%PYTHON_SITELIBDIR%%/salt/beacons/sh.py
		50	%%PYTHON_SITELIBDIR%%/salt/beacons/sh.pyc
		51	%%PYTHON_SITELIBDIR%%/salt/beacons/twilio_txt_msg.py
		52	%%PYTHON_SITELIBDIR%%/salt/beacons/twilio_txt_msg.pyc
		53	%%PYTHON_SITELIBDIR%%/salt/beacons/wtmp.py
		54	%%PYTHON_SITELIBDIR%%/salt/beacons/wtmp.pyc
27	%%PYTHON_SITELIBDIR%%/salt/cli/__init__.py	55	%%PYTHON_SITELIBDIR%%/salt/cli/__init__.py