Index: head/sysutils/py-salt/Makefile =================================================================== --- head/sysutils/py-salt/Makefile (revision 418454) +++ head/sysutils/py-salt/Makefile (revision 418455) @@ -1,90 +1,91 @@ # Created by: Christer Edwards # $FreeBSD$ PORTNAME= salt PORTVERSION= 2016.3.1 +PORTREVISION= 1 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}yaml>0:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.13:devel/py-msgpack-python \ ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \ ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \ ${PYTHON_PKGNAMEPREFIX}requests>1:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \ ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \ ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado OPTIONS_DEFINE= ZEROMQ RAET OPTIONS_DEFAULT= ZEROMQ ZEROMQ_DESC= Enable ZeroMQ transport RAET_DESC= Enable RAET transport ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \ ${PYTHON_PKGNAMEPREFIX}pycrypto>2.6.1:security/py-pycrypto RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:security/py-libnacl \ ${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:devel/py-ioflo \ ${PYTHON_PKGNAMEPREFIX}raet>0:net/py-raet USES= cpe python:2 CPE_VENDOR= saltstack CPE_PRODUCT= salt USE_PYTHON= distutils NO_ARCH= yes PYDISTUTILS_EGGINFO= salt-${DISTVERSION}-py${PYTHON_VER}.egg-info PYDISTUTILS_INSTALLARGS+=\ --prefix=${PREFIX} \ --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 USE_RC_SUBR= salt_api \ salt_proxy \ salt_master \ salt_minion \ salt_syndic SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} SUB_FILES= pkg-message 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/files/patch-salt_grains_core.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_grains_core.py (nonexistent) +++ head/sysutils/py-salt/files/patch-salt_grains_core.py (revision 418455) @@ -0,0 +1,12 @@ +# Issue #33608 +# https://github.com/saltstack/salt/issues/33608 +--- salt/grains/core.py.orig 2016-05-25 22:30:31 UTC ++++ salt/grains/core.py +@@ -1422,6 +1422,7 @@ def os_data(): + else: + grains['os'] = grains['kernel'] + if grains['kernel'] == 'FreeBSD': ++ grains.update(_bsd_cpudata(grains)) + try: + grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0] + except salt.exceptions.CommandExecutionError: Property changes on: head/sysutils/py-salt/files/patch-salt_grains_core.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 Index: head/sysutils/py-salt/files/patch-salt_states_cron.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_states_cron.py (nonexistent) +++ head/sysutils/py-salt/files/patch-salt_states_cron.py (revision 418455) @@ -0,0 +1,28 @@ +# Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in +# 2016.3.2. +# https://github.com/saltstack/salt/issues/34094 +# https://github.com/saltstack/salt/pull/34095 +--- salt/states/cron.py.orig 2016-06-13 22:17:50 UTC ++++ salt/states/cron.py +@@ -540,6 +540,7 @@ def file(name, + __env__, + context, + defaults, ++ False, # skip_verify + **kwargs + ) + except Exception as exc: +@@ -573,12 +574,12 @@ def file(name, + ret['comment'] = 'Unable to manage file: {0}'.format(exc) + return ret + ++ cron_ret = None + if ret['changes']: + cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path) + ret['changes'] = {'diff': ret['changes']['diff']} + ret['comment'] = 'Crontab for user {0} was updated'.format(user) + elif ret['result']: +- cron_ret = None + ret['comment'] = 'Crontab for user {0} is in the correct ' \ + 'state'.format(user) + Property changes on: head/sysutils/py-salt/files/patch-salt_states_cron.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