Index: head/sysutils/py-salt/Makefile =================================================================== --- head/sysutils/py-salt/Makefile (revision 457438) +++ head/sysutils/py-salt/Makefile (revision 457439) @@ -1,107 +1,108 @@ # Created by: Christer Edwards # $FreeBSD$ PORTNAME= salt PORTVERSION= 2017.7.2 +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}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \ ${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} \ ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado@${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= RAET TCP ZEROMQ OPTIONS_DEFAULT=ZEROMQ RAET_DESC= Install dependencies required for RAET transport TCP_DESC= Install dependencies required for TCP transport ZEROMQ_DESC= Install dependencies required for ZeroMQ transport 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} .include # Python 2.7-3.3 require enum34, unnecessary for Python 3.4+ .if ${PYTHON_REL} < 3400 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif # Python 3+ comes with futures built-in .if ${PYTHON_REL} < 3200 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures@${FLAVOR} .endif 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_modules_pkgng.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_modules_pkgng.py (nonexistent) +++ head/sysutils/py-salt/files/patch-salt_modules_pkgng.py (revision 457439) @@ -0,0 +1,92 @@ +--- 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 ___________________________________________________________________ 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