Index: head/sysutils/py-salt/Makefile =================================================================== --- head/sysutils/py-salt/Makefile (revision 472445) +++ head/sysutils/py-salt/Makefile (revision 472446) @@ -1,102 +1,102 @@ # Created by: Christer Edwards # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2018.3.0 -PORTREVISION= 1 +PORTVERSION= 2018.3.1 +PORTREVISION= 0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= christer.edwards@gmail.com COMMENT= Distributed remote execution and configuration management system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \ ${PY_ENUM34} \ ${PY_FUTURES} \ ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado4>=4.2.1:www/py-tornado4@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= cpe python CPE_VENDOR= saltstack CPE_PRODUCT= salt USE_PYTHON= autoplist distutils NO_ARCH= yes # we must pass these options before the target name, and python.mk has no # early-arguments variable, so we have to manipulate the target PYDISTUTILS_INSTALL_TARGET=\ --salt-root-dir=/ \ --salt-config-dir=${ETCDIR} \ --salt-cache-dir=/var/cache/salt \ --salt-sock-dir=/var/run/salt \ --salt-srv-root-dir=${ETCDIR} \ --salt-base-file-roots-dir=${ETCDIR}/states \ --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 \ install USE_RC_SUBR= salt_api \ salt_master \ salt_minion \ salt_proxy \ salt_syndic SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} SUB_FILES= pkg-message OPTIONS_DEFINE= AWS RAET TCP ZEROMQ OPTIONS_DEFAULT=ZEROMQ AWS_DESC= Install dependencies required for Amazon Web Services RAET_DESC= Install dependencies required for RAET transport TCP_DESC= Install dependencies required for TCP transport ZEROMQ_DESC= Install dependencies required for ZeroMQ transport # AWS dependencies (Note: the devel/py-botocore port is updated very frequently) AWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${FLAVOR} RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${FLAVOR} TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} post-patch: .for file in conf/minion conf/master doc/man/salt-key.1 \ doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \ doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \ doc/man/salt-call.1 \ salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \ salt/modules/postgres.py salt/utils/migrations.py @${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \ -e 's|/srv/salt|${ETCDIR}/states|' \ -e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion @${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/requirements/base.txt post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample ${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample .include Index: head/sysutils/py-salt/distinfo =================================================================== --- head/sysutils/py-salt/distinfo (revision 472445) +++ head/sysutils/py-salt/distinfo (revision 472446) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523675641 -SHA256 (salt-2018.3.0.tar.gz) = a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31 -SIZE (salt-2018.3.0.tar.gz) = 13448567 +TIMESTAMP = 1528982610 +SHA256 (salt-2018.3.1.tar.gz) = 7b1d59067b8eb61a23884078e0b8afc02ed8800c5c00f09405ae9e03491ed3db +SIZE (salt-2018.3.1.tar.gz) = 12939682 Index: head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh =================================================================== --- head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh (revision 472445) +++ head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh (nonexistent) @@ -1,14 +0,0 @@ ---- salt/cloud/deploy/bootstrap-salt.sh.orig 2018-03-21 17:37:20 UTC -+++ salt/cloud/deploy/bootstrap-salt.sh -@@ -4885,9 +4885,9 @@ install_freebsd_9_stable_deps() { - __configure_freebsd_pkg_details || return 1 - fi - -- # Now install swig -+ # Now install swig30 - # shellcheck disable=SC2086 -- /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig || return 1 -+ /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig30 || return 1 - - # YAML module is used for generating custom master/minion configs - # shellcheck disable=SC2086 Property changes on: head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py (nonexistent) +++ head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py (revision 472446) @@ -0,0 +1,21 @@ +commit 101f170fe525d7f9f8d0c9b80a78af2ed1f6f069 +Author: Mathieu Arnold +Date: 2018-06-13 13:02:37 +0200 + + Fix patching sysctl.conf on FreeBSD. + + In b3c1be27fb the lines were stripped of their ending \n, but the \n was + never added back to the lines, so calling writelines generates a broken + one line file. + +--- salt/modules/freebsd_sysctl.py.orig 2018-04-02 16:35:12 UTC ++++ salt/modules/freebsd_sysctl.py +@@ -165,7 +165,7 @@ def persist(name, value, config='/etc/sy + if not edited: + nlines.append("{0}\n".format(_formatfor(name, value, config))) + with salt.utils.files.fopen(config, 'w+') as ofile: +- nlines = [salt.utils.stringutils.to_str(_l) for _l in nlines] ++ nlines = [salt.utils.stringutils.to_str(_l) + '\n' for _l in nlines] + ofile.writelines(nlines) + if config != '/boot/loader.conf': + assign(name, value) Property changes on: head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property