Attachment #192890 for bug #227836

Lines 1-9 Link Here

(-)py-salt-2018.3.0/Makefile (-2 / +5 lines)
1	# Created by: Christer Edwards <christer.edwards@gmail.com>	1	# Created by: Christer Edwards <christer.edwards@gmail.com>
2	# $FreeBSD: head/sysutils/py-salt/Makefile 468304 2018-04-25 21:01:46Z sunpoet $	2	# $FreeBSD: head/sysutils/py-salt/Makefile 467246 2018-04-13 16:06:33Z garga $
3		3
4	PORTNAME= salt	4	PORTNAME= salt
5	PORTVERSION= 2018.3.0	5	PORTVERSION= 2018.3.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils python	7	CATEGORIES= sysutils python
8	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 32-37 Link Here
32	USE_PYTHON= autoplist distutils	32	USE_PYTHON= autoplist distutils
33	NO_ARCH= yes	33	NO_ARCH= yes
34		34
		35	PYDISTUTILS_INSTALLARGS=-c --prefix=${PREFIX}
		36
35	# we must pass these options before the target name, and python.mk has no	37	# we must pass these options before the target name, and python.mk has no
36	# early-arguments variable, so we have to manipulate the target	38	# early-arguments variable, so we have to manipulate the target
37	PYDISTUTILS_INSTALL_TARGET=\	39	PYDISTUTILS_INSTALL_TARGET=\
Lines 94-99 Link Here
94	@${REINPLACE_CMD} -e 's\|yumpkg5\|pkgng\|' ${WRKSRC}/conf/minion	96	@${REINPLACE_CMD} -e 's\|yumpkg5\|pkgng\|' ${WRKSRC}/conf/minion
95	@${REINPLACE_CMD} -e 's\|msgpack-python\|msgpack\|' ${WRKSRC}/requirements/base.txt	97	@${REINPLACE_CMD} -e 's\|msgpack-python\|msgpack\|' ${WRKSRC}/requirements/base.txt
96		98
		99
97	post-install:	100	post-install:
98	@${MKDIR} ${STAGEDIR}${ETCDIR}	101	@${MKDIR} ${STAGEDIR}${ETCDIR}
99	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample	102	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample




--- salt/grains/marathon.py.old	2018-04-02 10:35:12.000000000 -0600
+++ salt/grains/marathon.py	2018-04-12 17:50:24.018368000 -0600
@@ -14,10 +14,10 @@
 
 
 def __virtual__():
-    if not salt.utils.platform.is_proxy() or 'proxy' not in __opts__:
-        return False
-    else:
+    if salt.utils.platform.is_proxy() and 'proxy' in __opts__:
         return __virtualname__
+    else:
+        return False
 
 
 def kernel():

Lines 1-6 Link Here

(-)py-salt-2018.3.0/files/patch-setup.py (-2 / +2 lines)
1	--- setup.py.orig 2018-04-02 16:35:13 UTC	1	--- setup.py.orig 2016-11-22 16:50:54 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -992,8 +992,8 @@ class SaltDistribution(distutils.dist.Di	3	@@ -988,8 +988,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 4-8 Link Here

(-)py-salt-2018.3.0/pkg-descr (-1 / +1 lines)
4	Salt is a powerful remote execution and state manager that can be	4	Salt is a powerful remote execution and state manager that can be
5	used to administer servers in a fast and efficient way.	5	used to administer servers in a fast and efficient way.
6		6
7	WWW: https://pypi.org/project/salt/	7	WWW: https://pypi.python.org/pypi/salt
8	WWW: http://saltstack.org/	8	WWW: http://saltstack.org/

Lines 1-7 Link Here

(-)py-salt-2018.3.0/pkg-plist (-3 / +1 lines)
1	@sample %%ETCDIR%%/master.sample	1	@sample %%ETCDIR%%/master.sample
2	@sample %%ETCDIR%%/minion.sample	2	@sample %%ETCDIR%%/minion.sample
3	%%PYTHON_SITELIBDIR%%/salt/_syspaths.py	3	%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
4	%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc	4	%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
5	%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
6	%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc	5	%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
7	%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%

Return to bug 227836

Line 0 Link Here

(-)py-salt-2018.3.0/files/patch-salt_grains_marathon.py (+16 lines)
	1	--- salt/grains/marathon.py.old 2018-04-02 10:35:12.000000000 -0600
	2	+++ salt/grains/marathon.py 2018-04-12 17:50:24.018368000 -0600
	3	@@ -14,10 +14,10 @@
	4
	5
	6	def __virtual__():
	7	- if not salt.utils.platform.is_proxy() or 'proxy' not in __opts__:
	8	- return False
	9	- else:
	10	+ if salt.utils.platform.is_proxy() and 'proxy' in __opts__:
	11	return __virtualname__
	12	+ else:
	13	+ return False
	14
	15
	16	def kernel():