Date: Fri, 15 Jun 2018 13:25:56 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472446 - in head/sysutils/py-salt: . files Message-ID: <201806151325.w5FDPuoC018196@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Jun 15 13:25:56 2018 New Revision: 472446 URL: https://svnweb.freebsd.org/changeset/ports/472446 Log: sysutils/py-salt : update to 2018.3.1 PR: 229012 Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Added: head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py (contents, props changed) Deleted: head/sysutils/py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh Modified: head/sysutils/py-salt/Makefile (contents, props changed) head/sysutils/py-salt/distinfo (contents, props changed) Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Fri Jun 15 13:16:38 2018 (r472445) +++ head/sysutils/py-salt/Makefile Fri Jun 15 13:25:56 2018 (r472446) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2018.3.0 -PORTREVISION= 1 +PORTVERSION= 2018.3.1 +PORTREVISION= 0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/sysutils/py-salt/distinfo ============================================================================== --- head/sysutils/py-salt/distinfo Fri Jun 15 13:16:38 2018 (r472445) +++ head/sysutils/py-salt/distinfo Fri Jun 15 13:25:56 2018 (r472446) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523675641 -SHA256 (salt-2018.3.0.tar.gz) = a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31 -SIZE (salt-2018.3.0.tar.gz) = 13448567 +TIMESTAMP = 1528982610 +SHA256 (salt-2018.3.1.tar.gz) = 7b1d59067b8eb61a23884078e0b8afc02ed8800c5c00f09405ae9e03491ed3db +SIZE (salt-2018.3.1.tar.gz) = 12939682 Added: head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt_modules_freebsd__sysctl.py Fri Jun 15 13:25:56 2018 (r472446) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806151325.w5FDPuoC018196>