Attachment 215908 Details for Bug 247504 – Port for Salt 3000.x

Port for Salt 3000.x

py-salt-3000.shar (text/plain), 15.05 KB, created by James TD Smith on 2020-06-24 15:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James TD Smith

Created: 2020-06-24 15:30:11 UTC

Size: 15.05 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	.
>#	./pkg-descr
>#	./distinfo
>#	./files
>#	./files/pkg-message.in
>#	./files/salt_syndic.in
>#	./files/salt_proxy.in
>#	./files/salt_api.in
>#	./files/patch-requirements-crypto.txt
>#	./files/patch-salt_loader.py
>#	./files/patch-setup.py
>#	./files/salt_minion.in
>#	./files/salt_master.in
>#	./Makefile
>#	./pkg-plist
>#
>echo c - .
>mkdir -p . > /dev/null 2>&1
>echo x - ./pkg-descr
>sed 's/^X//' >./pkg-descr << '0e313719ff012ceaf97a028d51caa8f5'
>XSalt : Remote Execution and State Manager
>X======================================
>X
>XSalt is a powerful remote execution and state manager that can be
>Xused to administer servers in a fast and efficient way.
>X
>XWWW: https://pypi.org/project/salt/
>XWWW: http://saltstack.org/
>0e313719ff012ceaf97a028d51caa8f5
>echo x - ./distinfo
>sed 's/^X//' >./distinfo << 'aec8793adfd5b7c3f00e62ae41a09ac2'
>XTIMESTAMP = 1590047008
>XSHA256 (salt-3000.3.tar.gz) = fcca49985e697d914e5a7f34b2fd8bbd833bcf7779d30174a279a4de2294cea7
>XSIZE (salt-3000.3.tar.gz) = 15237557
>aec8793adfd5b7c3f00e62ae41a09ac2
>echo c - ./files
>mkdir -p ./files > /dev/null 2>&1
>echo x - ./files/pkg-message.in
>sed 's/^X//' >./files/pkg-message.in << 'f63be51668f70461c30a5539f7c148ef'
>X[
>X{ type: install
>X  message: <<EOM
>XTo configure a Salt Master, do the following:
>X
>X  o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
>X  o Update to meet your needs
>X  o sysrc salt_master_enable="YES"
>X
>X
>X
>XTo configure a Salt Minion, do the following:
>X
>X  o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion
>X  o Update 'master: salt' to point to your Salt Master's hostname or IP
>X  o sysrc salt_minion_enable="YES"
>X
>X
>X
>XTo configure a Salt Proxy Minion, do the following:
>X
>X  o sysrc salt_proxy_enable="YES"
>X  o sysrc salt_proxy_list=""
>X  o Update the salt_proxy_list with the proxy minion name(s)
>X
>X
>X
>XTo change the Transport method from the default option of Zeromq to either TCP or RAET:
>X
>X  o Re-build the port with the desired options enabled to install the correct runtime dependencies
>X  o Ensure the master and minions all have salt installed with these same options and dependencies
>X  o Add the line 'transport: [tcp|raet]' to both the master and minion configuration files
>X  o Restart salt on the master and minions
>XEOM
>X}
>X]
>f63be51668f70461c30a5539f7c148ef
>echo x - ./files/salt_syndic.in
>sed 's/^X//' >./files/salt_syndic.in << 'b393f953b027c84fb34c73eedc8a2ba2'
>X#!/bin/sh
>X
>X# $FreeBSD: head/sysutils/py-salt/files/salt_syndic.in 398042 2015-09-27 14:32:04Z junovitch $
>X#
>X# Salt Synic startup script
>X#
>X# PROVIDE: salt_syndic
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X
>X# Add the following to /etc/rc.conf[.local] to enable this service
>X#
>X# salt_syndic_enable (bool):       Set to NO by default.
>X#               Set it to YES to enable salt_syndic
>X#
>X
>X. /etc/rc.subr
>X
>Xname=salt_syndic
>Xrcvar=salt_syndic_enable
>X
>Xload_rc_config ${name}
>X
>X: ${salt_syndic_enable:=NO}
>X
>Xcommand="%%PREFIX%%/bin/salt-syndic"
>Xcommand_interpreter="%%PYTHON_CMD%%"
>Xrequired_files="%%PREFIX%%/etc/salt"
>Xcommand_args="-c ${required_files} -d"
>X
>Xrun_rc_command "$1"
>b393f953b027c84fb34c73eedc8a2ba2
>echo x - ./files/salt_proxy.in
>sed 's/^X//' >./files/salt_proxy.in << '11879634a7f51563e1b8b33f5b9f4aea'
>X#!/bin/sh
>X
>X# $FreeBSD: head/sysutils/py-salt/files/salt_proxy.in 500487 2019-04-30 13:13:10Z swills $
>X#
>X# Salt Proxy startup script
>X#
>X# PROVIDE: salt_proxy
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X
>X# Add the following to /etc/rc.conf[.local] to enable this service
>X#
>X# salt_proxy_enable (bool):        Set to NO by default.
>X#               Set it to YES to enable salt_proxy.
>X# salt_proxy_paths (string):       Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
>X#               Default $PATH for Salt
>X# salt_proxy_eggcache (string):    Set to "/tmp" by default.
>X#               Allows defining egg cache directory to fix runtime on diskless systems.
>X# salt_proxy_list (string):        Set to "" by default.
>X#               Space separated list of proxies.
>X#
>X
>X. /etc/rc.subr
>X
>Xname=salt_proxy
>Xrcvar=salt_proxy_enable
>X
>Xload_rc_config ${name}
>X
>X: ${salt_proxy_enable:=NO}
>X: ${salt_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
>X: ${salt_proxy_eggcache=/tmp}
>X
>Xstart_cmd=salt_proxy_start
>X
>Xcommand="%%PREFIX%%/bin/salt-proxy"
>Xcommand_interpreter="%%PYTHON_CMD%%"
>Xrequired_files="%%PREFIX%%/etc/salt"
>Xcommand_args="-c ${required_files} -d"
>X
>Xexport PATH="${salt_proxy_paths}"
>Xexport PYTHON_EGG_CACHE="${salt_proxy_eggcache}"
>X
>Xsalt_proxy_start()
>X{
>X    if [ ! -n "${salt_proxy_list}" ]; then
>X        echo "${salt_proxy_list} is undefined"
>X        return 1
>X    fi
>X
>X    local _proxy
>X
>X    for _proxy in ${salt_proxy_list}; do
>X        echo "Starting salt-proxy: ${_proxy}"
>X        ${command_interpreter} ${command} --proxyid ${_proxy} ${command_args}
>X    done
>X}
>X
>Xrun_rc_command "$1"
>11879634a7f51563e1b8b33f5b9f4aea
>echo x - ./files/salt_api.in
>sed 's/^X//' >./files/salt_api.in << '08f5468eff6b52851e5b42e0731d1053'
>X#!/bin/sh
>X
>X# $FreeBSD: head/sysutils/py-salt/files/salt_api.in 398042 2015-09-27 14:32:04Z junovitch $
>X#
>X# Salt API startup script
>X#
>X# PROVIDE: salt_api
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X
>X# Add the following to /etc/rc.conf[.local] to enable this service
>X#
>X# salt_api_enable (bool):          Set to NO by default.
>X#               Set it to YES to enable salt_api
>X#
>X
>X. /etc/rc.subr
>X
>Xname=salt_api
>Xrcvar=salt_api_enable
>X
>Xload_rc_config ${name}
>X
>X: ${salt_api_enable:=NO}
>X
>Xcommand="%%PREFIX%%/bin/salt-api"
>Xcommand_interpreter="%%PYTHON_CMD%%"
>Xrequired_files="%%PREFIX%%/etc/salt"
>Xcommand_args="-c ${required_files} -d"
>X
>Xrun_rc_command "$1"
>08f5468eff6b52851e5b42e0731d1053
>echo x - ./files/patch-requirements-crypto.txt
>sed 's/^X//' >./files/patch-requirements-crypto.txt << 'f69969a76fd2d920bf85fa862ecfd161'
>X--- requirements/crypto.txt.orig     2020-06-24 15:05:30.142009000 +0000
>X+++ requirements/crypto.txt  2020-06-24 15:05:47.533241000 +0000
>X@@ -1,2 +1 @@
>X-pycrypto>=2.6.1; sys.platform not in 'win32,darwin'
>X-pycryptodomex; sys.platform == 'win32'
>X+pycryptodomex
>f69969a76fd2d920bf85fa862ecfd161
>echo x - ./files/patch-salt_loader.py
>sed 's/^X//' >./files/patch-salt_loader.py << '611de0404369ccac574db2337f2a9fa1'
>X--- salt/loader.py
>X+++ salt/loader.py
>X@@ -1240,7 +1240,7 @@
>X                 try:
>X                     pycache_files = [
>X                         os.path.join('__pycache__', x) for x in
>X-                        sorted(os.listdir(os.path.join(mod_dir, '__pycache__')))
>X+                        sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc')
>X                     ]
>X                 except OSError:
>X                     pass
>611de0404369ccac574db2337f2a9fa1
>echo x - ./files/patch-setup.py
>sed 's/^X//' >./files/patch-setup.py << '6a3a2d1daf69a038a35d278559b9cd59'
>X--- setup.py.orig	2018-04-02 16:35:13 UTC
>X+++ setup.py
>X@@ -992,8 +992,8 @@ class SaltDistribution(distutils.dist.Di
>X     def _property_data_files(self):
>X         # Data files common to all scenarios
>X         data_files = [
>X-            ('share/man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),
>X-            ('share/man/man7', ['doc/man/salt.7'])
>X+            ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),
>X+            ('man/man7', ['doc/man/salt.7'])
>X         ]
>X         if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
>X             data_files[0][1].append('doc/man/salt-ssh.1')
>6a3a2d1daf69a038a35d278559b9cd59
>echo x - ./files/salt_minion.in
>sed 's/^X//' >./files/salt_minion.in << 'f793b286dc0b93eae24fecb413a10365'
>X#!/bin/sh
>X
>X# $FreeBSD: head/sysutils/py-salt/files/salt_minion.in 434287 2017-02-17 15:59:58Z brd $
>X#
>X# Salt Minion startup script
>X#
>X# PROVIDE: salt_minion
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X
>X# Add the following to /etc/rc.conf[.local] to enable this service
>X#
>X# salt_minion_enable (bool):       Set to NO by default.
>X#               Set it to YES to enable salt_minion
>X# salt_minion_paths (string):      Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
>X#               Default $PATH for salt_minion
>X# salt_minion_eggcache (string):   Set to "/tmp" by default.
>X#               Allows defining egg cache directory to fix runtime on diskless systems.
>X#
>X
>X. /etc/rc.subr
>X
>Xname=salt_minion
>Xrcvar=salt_minion_enable
>X
>Xload_rc_config ${name}
>X
>X: ${salt_minion_enable:=NO}
>X: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
>X: ${salt_minion_pidfile:=/var/run/salt-minion.pid}
>X: ${salt_minion_eggcache=/tmp}
>X
>Xcommand="%%PREFIX%%/bin/salt-minion"
>Xcommand_interpreter="%%PYTHON_CMD%%"
>Xrequired_files="%%PREFIX%%/etc/salt"
>Xcommand_args="-c ${required_files} -d"
>Xpidfile=${salt_minion_pidfile}
>X
>Xexport PATH="${salt_minion_paths}"
>Xexport PYTHON_EGG_CACHE="${salt_minion_eggcache}"
>X
>Xrun_rc_command "$1"
>f793b286dc0b93eae24fecb413a10365
>echo x - ./files/salt_master.in
>sed 's/^X//' >./files/salt_master.in << '83195bcfa3b0376d0a00a34ac3f31062'
>X#!/bin/sh
>X
>X# $FreeBSD: head/sysutils/py-salt/files/salt_master.in 434287 2017-02-17 15:59:58Z brd $
>X#
>X# Salt Master startup script
>X#
>X# PROVIDE: salt_master
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X
>X# Add the following to /etc/rc.conf[.local] to enable this service
>X#
>X# salt_master_enable (bool):       Set to NO by default.
>X#               Set it to YES to enable salt_master.
>X# salt_master_paths (string):      Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
>X#               Default $PATH for salt_master.
>X# salt_master_eggcache (string):   Set to "/tmp" by default.
>X#               Allows defining egg cache directory to fix runtime on diskless systems.
>X#
>X
>X. /etc/rc.subr
>X
>Xname=salt_master
>Xrcvar=salt_master_enable
>X
>Xload_rc_config ${name}
>X
>X: ${salt_master_enable:=NO}
>X: ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
>X: ${salt_master_pidfile:=/var/run/salt-master.pid}
>X: ${salt_master_eggcache=/tmp}
>X
>Xcommand="%%PREFIX%%/bin/salt-master"
>Xcommand_interpreter="%%PYTHON_CMD%%"
>Xrequired_files="%%PREFIX%%/etc/salt"
>Xcommand_args="-c ${required_files} -d"
>Xpidfile=${salt_master_pidfile}
>X
>Xexport PATH="${salt_master_paths}"
>Xexport PYTHON_EGG_CACHE="${salt_master_eggcache}"
>X
>Xrun_rc_command "$1"
>83195bcfa3b0376d0a00a34ac3f31062
>echo x - ./Makefile
>sed 's/^X//' >./Makefile << '464ef7c6571951809b23e262cbe26e19'
>X# Created by: Christer Edwards <christer.edwards@gmail.com>
>X# $FreeBSD: head/sysutils/py-salt/Makefile 539568 2020-06-18 20:22:19Z krion $
>X
>XPORTNAME=	salt
>XPORTVERSION=	3000.3
>XPORTREVISION=	1
>XCATEGORIES=	sysutils python
>XMASTER_SITES=	CHEESESHOP
>XPKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>XPKGNAMESUFFIX=	-3000
>X
>XMAINTAINER=	christer.edwards@gmail.com
>XCOMMENT=	Distributed remote execution and configuration management system
>X
>XLICENSE=	APACHE20
>XLICENSE_FILE=	${WRKSRC}/LICENSE
>X
>XRUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR} \
>X		${PY_ENUM34} \
>X		${PY_FUTURES} \
>X		${PYTHON_PKGNAMEPREFIX}distro>1.4.0:sysutils/py-distro@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}tornado4>=4.2.1:www/py-tornado4@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
>X		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR}
>X
>XUSES=		cpe python:3.6-3.7
>X
>XCPE_VENDOR=	saltstack
>XCPE_PRODUCT=	salt
>XUSE_PYTHON=	autoplist distutils
>XNO_ARCH=	yes
>X
>XCONFLICTS=	py[0-9]*-salt-2019*
>X
>X# we must pass these options before the target name, and python.mk has no
>X# early-arguments variable, so we have to manipulate the target
>XPYDISTUTILS_INSTALL_TARGET=\
>X	--salt-root-dir=/ \
>X	--salt-config-dir=${ETCDIR} \
>X	--salt-cache-dir=/var/cache/salt \
>X	--salt-sock-dir=/var/run/salt \
>X	--salt-srv-root-dir=${ETCDIR} \
>X	--salt-base-file-roots-dir=${ETCDIR}/states \
>X	--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
>X	--salt-base-master-roots-dir=${ETCDIR}/salt-master \
>X	--salt-logs-dir=/var/log/salt \
>X	--salt-pidfile-dir=/var/run \
>X	install
>X
>XUSE_RC_SUBR=	salt_api \
>X		salt_master \
>X		salt_minion \
>X		salt_proxy \
>X		salt_syndic
>X
>XSUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
>X
>XSUB_FILES=	pkg-message
>X
>XOPTIONS_DEFINE=	AWS RAET TCP ZEROMQ
>XOPTIONS_DEFAULT=ZEROMQ
>X
>XAWS_DESC=	Install dependencies required for Amazon Web Services
>XRAET_DESC=	Install dependencies required for RAET transport
>XTCP_DESC=	Install dependencies required for TCP transport
>XZEROMQ_DESC=	Install dependencies required for ZeroMQ transport
>X
>X# AWS dependencies (Note: the devel/py-botocore port is updated very frequently)
>XAWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
>X			${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
>X			${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}
>X
>XRAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${PY_FLAVOR}
>X
>XTCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
>X
>XZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}
>XZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \
>X			${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
>X
>Xpost-patch:
>X.for file in conf/minion conf/master doc/man/salt-key.1 \
>X	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
>X	doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
>X	doc/man/salt-call.1 salt/modules/mysql.py salt/modules/tls.py salt/modules/postgres.py
>X	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
>X		-e 's|/srv/salt|${ETCDIR}/states|' \
>X		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
>X.endfor
>X	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
>X
>Xpost-install:
>X	@${MKDIR} ${STAGEDIR}${ETCDIR}
>X	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
>X	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
>X
>X.include <bsd.port.mk>
>464ef7c6571951809b23e262cbe26e19
>echo x - ./pkg-plist
>sed 's/^X//' >./pkg-plist << 'ef3e7f63841ae908ba397c2bef1fbad6'
>X@sample %%ETCDIR%%/master.sample
>X@sample %%ETCDIR%%/minion.sample
>X%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
>X%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
>X%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
>X%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
>X%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>ef3e7f63841ae908ba397c2bef1fbad6
>exit
>

Actions: View

Attachments on bug 247504: 215908 | 219327