Attachment 202381 Details for Bug 236054 – patch

[patch] patch

py-salt-2019.2.0.diff.txt (text/plain), 2.16 KB, created by Christer Edwards on 2019-02-26 13:49:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2019-02-26 13:49:27 UTC

Size: 2.16 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2019.2.0/Makefile
>--- py-salt/Makefile	2018-11-17 17:45:39.000000000 +0000
>+++ py-salt-2019.2.0/Makefile	2019-02-26 13:19:07.791404000 +0000
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/py-salt/Makefile 485178 2018-11-17 17:45:39Z sunpoet $
> 
> PORTNAME=	salt
>-PORTVERSION=	2018.3.3
>-PORTREVISION=	1
>+PORTVERSION=	2019.2.0
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/distinfo py-salt-2019.2.0/distinfo
>--- py-salt/distinfo	2018-10-27 08:07:37.000000000 +0000
>+++ py-salt-2019.2.0/distinfo	2019-02-26 13:19:14.590418000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1540613424
>-SHA256 (salt-2018.3.3.tar.gz) = dcf30d2e8eae105a72977c51cfc253fbc4dc28b2f71277fdce9d35de1eb63e15
>-SIZE (salt-2018.3.3.tar.gz) = 13953724
>+TIMESTAMP = 1551187154
>+SHA256 (salt-2019.2.0.tar.gz) = 5695bb2b3fa288bcfc0e3b93d9449afd75220bd8f0deefb5e7fc03af381df6cd
>+SIZE (salt-2019.2.0.tar.gz) = 14952746
>diff -ruN py-salt/files/patch-salt_modules_freebsd__sysctl.py py-salt-2019.2.0/files/patch-salt_modules_freebsd__sysctl.py
>--- py-salt/files/patch-salt_modules_freebsd__sysctl.py	2018-06-15 13:25:56.000000000 +0000
>+++ py-salt-2019.2.0/files/patch-salt_modules_freebsd__sysctl.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,21 +0,0 @@
>-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)

Flags:

woodsb02: maintainer-approval+

Actions: View | Diff

Attachments on bug 236054: 202381 | 202382 | 202383