View | Details | Raw Unified | Return to bug 236054
Collapse All | Expand All

(-)py-salt-2019.2.0/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/sysutils/py-salt/Makefile 485178 2018-11-17 17:45:39Z sunpoet $
2
# $FreeBSD: head/sysutils/py-salt/Makefile 485178 2018-11-17 17:45:39Z sunpoet $
3
3
4
PORTNAME=	salt
4
PORTNAME=	salt
5
PORTVERSION=	2018.3.3
5
PORTVERSION=	2019.2.0
6
PORTREVISION=	1
7
CATEGORIES=	sysutils python
6
CATEGORIES=	sysutils python
8
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
9
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
(-)py-salt-2019.2.0/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1540613424
1
TIMESTAMP = 1551187154
2
SHA256 (salt-2018.3.3.tar.gz) = dcf30d2e8eae105a72977c51cfc253fbc4dc28b2f71277fdce9d35de1eb63e15
2
SHA256 (salt-2019.2.0.tar.gz) = 5695bb2b3fa288bcfc0e3b93d9449afd75220bd8f0deefb5e7fc03af381df6cd
3
SIZE (salt-2018.3.3.tar.gz) = 13953724
3
SIZE (salt-2019.2.0.tar.gz) = 14952746
(-)py-salt-2019.2.0/files/patch-salt_modules_freebsd__sysctl.py (-21 lines)
Lines 1-21 Link Here
1
commit 101f170fe525d7f9f8d0c9b80a78af2ed1f6f069
2
Author: Mathieu Arnold <mat@mat.cc>
3
Date:   2018-06-13 13:02:37 +0200
4
5
    Fix patching sysctl.conf on FreeBSD.
6
7
    In b3c1be27fb the lines were stripped of their ending \n, but the \n was
8
    never added back to the lines, so calling writelines generates a broken
9
    one line file.
10
11
--- salt/modules/freebsd_sysctl.py.orig	2018-04-02 16:35:12 UTC
12
+++ salt/modules/freebsd_sysctl.py
13
@@ -165,7 +165,7 @@ def persist(name, value, config='/etc/sy
14
     if not edited:
15
         nlines.append("{0}\n".format(_formatfor(name, value, config)))
16
     with salt.utils.files.fopen(config, 'w+') as ofile:
17
-        nlines = [salt.utils.stringutils.to_str(_l) for _l in nlines]
18
+        nlines = [salt.utils.stringutils.to_str(_l) + '\n' for _l in nlines]
19
         ofile.writelines(nlines)
20
     if config != '/boot/loader.conf':
21
         assign(name, value)

Return to bug 236054