Index: head/sysutils/py-salt/Makefile =================================================================== --- head/sysutils/py-salt/Makefile (revision 468103) +++ head/sysutils/py-salt/Makefile (revision 468104) @@ -1,101 +1,100 @@ # Created by: Christer Edwards # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2017.7.4 -PORTREVISION= 3 +PORTVERSION= 2018.3.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 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 468103) +++ head/sysutils/py-salt/distinfo (revision 468104) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520059286 -SHA256 (salt-2017.7.4.tar.gz) = 1d573095776ba052eec7d7cae1472f4b1d4c15f16e1d79c2dc48db3129dbae97 -SIZE (salt-2017.7.4.tar.gz) = 11718327 +TIMESTAMP = 1523675641 +SHA256 (salt-2018.3.0.tar.gz) = a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31 +SIZE (salt-2018.3.0.tar.gz) = 13448567 Index: head/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py (revision 468103) +++ head/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py (nonexistent) @@ -1,18 +0,0 @@ ---- salt/modules/freebsdservice.py.orig 2017-08-15 15:26:36 UTC -+++ salt/modules/freebsdservice.py -@@ -16,7 +16,6 @@ import os - - # Import salt libs - import salt.utils --import salt.utils.decorators as decorators - from salt.exceptions import CommandNotFoundError - - __func_alias__ = { -@@ -39,7 +38,6 @@ def __virtual__(): - return (False, 'The freebsdservice execution module cannot be loaded: only available on FreeBSD systems.') - - --@decorators.memoize - def _cmd(jail=None): - ''' - Return full path to service command Property changes on: head/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py ___________________________________________________________________ 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_pkgng.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_modules_pkgng.py (revision 468103) +++ head/sysutils/py-salt/files/patch-salt_modules_pkgng.py (nonexistent) @@ -1,92 +0,0 @@ ---- salt/modules/pkgng.py.orig 2017-10-09 16:37:42 UTC -+++ salt/modules/pkgng.py -@@ -1154,8 +1154,6 @@ def upgrade(*names, **kwargs): - opts += 'n' - if not dryrun: - opts += 'y' -- if opts: -- opts = '-' + opts - - cmd = _pkg(jail, chroot, root) - cmd.append('upgrade') -@@ -1181,7 +1179,11 @@ def upgrade(*names, **kwargs): - return ret - - --def clean(jail=None, chroot=None, root=None): -+def clean(jail=None, -+ chroot=None, -+ root=None, -+ clean_all=False, -+ dryrun=False): - ''' - Cleans the local cache of fetched remote packages - -@@ -1190,11 +1192,64 @@ def clean(jail=None, chroot=None, root=None): - .. code-block:: bash - - salt '*' pkg.clean -- salt '*' pkg.clean jail= -- salt '*' pkg.clean chroot=/path/to/chroot -+ -+ jail -+ Cleans the package cache in the specified jail -+ -+ CLI Example: -+ -+ .. code-block:: bash -+ -+ salt '*' pkg.clean jail= -+ -+ chroot -+ Cleans the package cache in the specified chroot (ignored if ``jail`` -+ is specified) -+ -+ root -+ Cleans the package cache in the specified root (ignored if ``jail`` -+ is specified) -+ -+ CLI Example: -+ -+ .. code-block:: bash -+ -+ salt '*' pkg.clean chroot=/path/to/chroot -+ -+ clean_all -+ Clean all packages from the local cache (not just those that have been -+ superseded by newer versions). -+ -+ CLI Example: -+ -+ .. code-block:: bash -+ -+ salt '*' pkg.clean clean_all=True -+ -+ dryrun -+ Dry-run mode. This list of changes to the local cache is always -+ printed, but no changes are actually made. -+ -+ CLI Example: -+ -+ .. code-block:: bash -+ -+ salt '*' pkg.clean dryrun=True - ''' -+ opts = '' -+ if clean_all: -+ opts += 'a' -+ if dryrun: -+ opts += 'n' -+ else: -+ opts += 'y' -+ -+ cmd = _pkg(jail, chroot, root) -+ cmd.append('clean') -+ if opts: -+ cmd.append('-' + opts) - return __salt__['cmd.run']( -- _pkg(jail, chroot, root) + ['clean'], -+ cmd, - output_loglevel='trace', - python_shell=False - ) Property changes on: head/sysutils/py-salt/files/patch-salt_modules_pkgng.py ___________________________________________________________________ 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-setup.py =================================================================== --- head/sysutils/py-salt/files/patch-setup.py (revision 468103) +++ head/sysutils/py-salt/files/patch-setup.py (revision 468104) @@ -1,13 +1,13 @@ ---- setup.py.orig 2016-11-22 16:50:54 UTC +--- setup.py.orig 2018-04-02 16:35:13 UTC +++ setup.py -@@ -988,8 +988,8 @@ class SaltDistribution(distutils.dist.Di +@@ -992,8 +992,8 @@ class SaltDistribution(distutils.dist.Di def _property_data_files(self): # Data files common to all scenarios data_files = [ - ('share/man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']), - ('share/man/man7', ['doc/man/salt.7']) + ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']), + ('man/man7', ['doc/man/salt.7']) ] if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: data_files[0][1].append('doc/man/salt-ssh.1')