<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97d38fad62ebe3064ada1e4221248b627dcc7ce0">https://github.com/macports/macports-ports/commit/97d38fad62ebe3064ada1e4221248b627dcc7ce0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 97d38fa salt: update to 2017.7.1, + python2/3 variants enhancements: - test phase introduced - new maintainer syntax - upgrade: Maintainer fixed: https://trac.macports.org/ticket/54665 see: CVE-2017-12791
</span>97d38fa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 97d38fad62ebe3064ada1e4221248b627dcc7ce0
</span>Author: Jeremy McMillan <jeremy.mcmillan@gmail.com>
AuthorDate: Sun Jul 30 14:33:22 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> salt: update to 2017.7.1, + python2/3 variants
</span><span style='display:block; white-space:pre;color:#404040;'> enhancements:
</span><span style='display:block; white-space:pre;color:#404040;'> - test phase introduced
</span><span style='display:block; white-space:pre;color:#404040;'> - new maintainer syntax
</span><span style='display:block; white-space:pre;color:#404040;'> - upgrade:
</span><span style='display:block; white-space:pre;color:#404040;'> Maintainer fixed: https://trac.macports.org/ticket/54665
</span><span style='display:block; white-space:pre;color:#404040;'> see: CVE-2017-12791
</span>---
sysutils/salt/Portfile | 125 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 88 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/salt/Portfile b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 938c53d..9c7b46b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2017.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers gmail.com:jeremy.mcmillan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Apache-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Salt is a Python-based remote execution, automation, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2017.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories sysutils python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@aphor gmail.com:jeremy.mcmillan}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Salt is a Python-based remote execution, automation, \
</span> configuration, and orchestration engine.
long_description SaltStack is fast, scalable and flexible software for data \
center automation, from infrastructure and any cloud, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,42 +17,94 @@ long_description SaltStack is fast, scalable and flexible software for data \
</span> homepage http://saltstack.com/
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup saltstack salt ${version} v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup python 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup saltstack salt ${version} v
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0a1472ead01e543d0a39007f65406030943e5cf2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 90a27911216be7485c36182e6953b19a857ecd560a138f49b3b40c802e976ffe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories sysutils python
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fe86b7cb73d1836301796f62e8a5fc4e200d43ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ea256ee31f7fd9057f843fa1f496a535cf0a41a02d190319d6fb66ea202fe4ee
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-crypto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python27 conflicts python34 python35 python36 description {experimental python-2.7 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python34 conflicts python27 python35 python36 description {experimental python-3.4 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api. " \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Support for Python 3 versions is experimental."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python35 conflicts python27 python34 python36 description {experimental python-3.5 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api. " \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Support for Python 3 versions is experimental."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python27 python34 python35 description {experimental python-3.6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api. " \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Support for Python 3 versions is experimental."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "salt startupitems are now installed by subports salt-minion, salt-master, salt-syndic, salt-api"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHONPATH=${worksrcpath}/build/lib ${python.bin} scripts-${python.branch}/salt-call --log-file=${worksrcpath}/build/minion.log --config-dir=${worksrcpath}/conf --local test.versions_information"
</span> }
foreach daemon [list minion master syndic api] {
subport salt-${daemon} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.name salt-${daemon}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.netchange yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.logevents yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.logfile ${prefix}/var/log/salt/${daemon}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.executable ${prefix}/bin/salt-${daemon} --config-dir=${prefix}/etc/salt --pid-file=${prefix}/var/run/salt-${daemon}.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:salt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description install startupitem for salt-${daemon}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.name salt-${daemon}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.netchange yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.logevents yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.logfile ${prefix}/var/log/salt/${daemon}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.executable ${prefix}/bin/salt-${daemon} --config-dir=${prefix}/etc/salt --pid-file=${prefix}/var/run/salt-${daemon}.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:salt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description install startupitem for salt-${daemon}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span> distfiles
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure {}
</span> build {}
destroot {}
}
</pre><pre style='margin:0'>
</pre>