summaryrefslogtreecommitdiff
path: root/sysutils/py-salt/files
diff options
context:
space:
mode:
authorBen Woods <woodsb02@FreeBSD.org>2017-08-22 23:02:21 +0000
committerBen Woods <woodsb02@FreeBSD.org>2017-08-22 23:02:21 +0000
commitacf30df65831b3b675532050be83c83e042b71ea (patch)
tree7b8b5a2d364aa3319b44e58fcb4be6e4ddba97d3 /sysutils/py-salt/files
parentDocument salt security vulnerability (diff)
Update sysutils/py-salt to 2017.7.1
- Includes fix for security vulnerability CVE-2017-12791 - Include patch to fix bug in the freebsdservice module [1] - Add TCP transport option - Clarify the port options for transports only install the runtime dependencies - Add note to pkg-message explaining how to change to non-default transports - Change supported python releases to exclude 2.6 and allow python3 [2] - Only depend on py-enum34 if python version is < 3.4 (included in python >= 3.4) - Reorder Makefile to move OPTIONS after USES/USE/standard variables [3] - Ensure Makefile lists are sorted alphabetically [1] https://github.com/saltstack/salt/issues/36675#issuecomment-323586323 [2] https://docs.saltstack.com/en/latest/topics/releases/2017.7.0.html#python-3 [3] https://www.freebsd.org/doc/en/books/porters-handbook/porting-order.html Changes this release: https://docs.saltstack.com/en/latest/topics/releases/2017.7.0.html https://docs.saltstack.com/en/latest/topics/releases/2017.7.1.html PR: 220869 Reported by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Security: CVE-2017-12791 Security: https://vuxml.freebsd.org/freebsd/3531141d-a708-477c-954a-2a0549e49ca9.html
Notes
Notes: svn path=/head/; revision=448586
Diffstat (limited to 'sysutils/py-salt/files')
-rw-r--r--sysutils/py-salt/files/patch-salt_modules_freebsdservice.py18
-rw-r--r--sysutils/py-salt/files/pkg-message.in9
2 files changed, 27 insertions, 0 deletions
diff --git a/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py b/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py
new file mode 100644
index 000000000000..d6a019a3c598
--- /dev/null
+++ b/sysutils/py-salt/files/patch-salt_modules_freebsdservice.py
@@ -0,0 +1,18 @@
+--- 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
diff --git a/sysutils/py-salt/files/pkg-message.in b/sysutils/py-salt/files/pkg-message.in
index c5cd25c792aa..4aedb8e3c137 100644
--- a/sysutils/py-salt/files/pkg-message.in
+++ b/sysutils/py-salt/files/pkg-message.in
@@ -23,5 +23,14 @@ To configure a Salt Proxy Minion, do the following:
o sysrc salt_proxy_list=""
o Update the salt_proxy_list with the proxy minion name(s)
+---------------------------------------------------------------------------------------------------
+
+To change the Transport method from the default option of Zeromq to either TCP or RAET:
+
+ o Re-build the port with the desired options enabled to install the correct runtime dependencies
+ o Ensure the master and minions all have salt installed with these same options and dependencies
+ o Add the line 'transport: [tcp|raet]' to both the master and minion configuration files
+ o Restart salt on the master and minions
+
===================================================================================================