diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-06-15 13:25:56 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-06-15 13:25:56 +0000 |
| commit | 8f9941e6fd26bbfad3ff69606620b3cf1412120b (patch) | |
| tree | e245fb29319b4ee9853c6f930cc5f654ec10a858 /sysutils/py-salt/files | |
| parent | Second part of the previous commit, somehow lost the first time. (diff) | |
sysutils/py-salt : update to 2018.3.1
PR: 229012
Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=472446
Diffstat (limited to 'sysutils/py-salt/files')
| -rw-r--r-- | sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh | 14 | ||||
| -rw-r--r-- | sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py | 21 |
2 files changed, 21 insertions, 14 deletions
diff --git a/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh b/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh deleted file mode 100644 index 439923d109a6..000000000000 --- a/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- salt/cloud/deploy/bootstrap-salt.sh.orig 2018-03-21 17:37:20 UTC -+++ salt/cloud/deploy/bootstrap-salt.sh -@@ -4885,9 +4885,9 @@ install_freebsd_9_stable_deps() { - __configure_freebsd_pkg_details || return 1 - fi - -- # Now install swig -+ # Now install swig30 - # shellcheck disable=SC2086 -- /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig || return 1 -+ /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig30 || return 1 - - # YAML module is used for generating custom master/minion configs - # shellcheck disable=SC2086 diff --git a/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py b/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py new file mode 100644 index 000000000000..ecf227971d1a --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py @@ -0,0 +1,21 @@ +commit 101f170fe525d7f9f8d0c9b80a78af2ed1f6f069 +Author: Mathieu Arnold <mat@mat.cc> +Date: 2018-06-13 13:02:37 +0200 + + Fix patching sysctl.conf on FreeBSD. + + In b3c1be27fb the lines were stripped of their ending \n, but the \n was + never added back to the lines, so calling writelines generates a broken + one line file. + +--- salt/modules/freebsd_sysctl.py.orig 2018-04-02 16:35:12 UTC ++++ salt/modules/freebsd_sysctl.py +@@ -165,7 +165,7 @@ def persist(name, value, config='/etc/sy + if not edited: + nlines.append("{0}\n".format(_formatfor(name, value, config))) + with salt.utils.files.fopen(config, 'w+') as ofile: +- nlines = [salt.utils.stringutils.to_str(_l) for _l in nlines] ++ nlines = [salt.utils.stringutils.to_str(_l) + '\n' for _l in nlines] + ofile.writelines(nlines) + if config != '/boot/loader.conf': + assign(name, value) |