Attachment 194251 Details for Bug 229012 – patch

[patch] patch

py-salt-2018.3.1.diff.1.txt (text/plain), 2.74 KB, created by Christer Edwards on 2018-06-14 14:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2018-06-14 14:58:52 UTC

Size: 2.74 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2018.3.1/Makefile
>--- py-salt/Makefile	2018-04-25 15:01:46.000000000 -0600
>+++ py-salt-2018.3.1/Makefile	2018-06-14 07:36:14.598142000 -0600
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/sysutils/py-salt/Makefile 468304 2018-04-25 21:01:46Z sunpoet $
> 
> PORTNAME=	salt
>-PORTVERSION=	2018.3.0
>-PORTREVISION=	1
>+PORTVERSION=	2018.3.1
>+PORTREVISION=	0
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/distinfo py-salt-2018.3.1/distinfo
>--- py-salt/distinfo	2018-04-23 10:53:36.000000000 -0600
>+++ py-salt-2018.3.1/distinfo	2018-06-14 07:23:30.358584000 -0600
>@@ -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
>diff -ruN py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh py-salt-2018.3.1/files/patch-salt_cloud_deploy_bootstrap-salt.sh
>--- py-salt/files/patch-salt_cloud_deploy_bootstrap-salt.sh	2018-04-13 10:06:33.000000000 -0600
>+++ py-salt-2018.3.1/files/patch-salt_cloud_deploy_bootstrap-salt.sh	1969-12-31 17:00:00.000000000 -0700
>@@ -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 -ruN py-salt/files/patch-salt_modules_freebsd__sysctl.py py-salt-2018.3.1/files/patch-salt_modules_freebsd__sysctl.py
>--- py-salt/files/patch-salt_modules_freebsd__sysctl.py	1969-12-31 17:00:00.000000000 -0700
>+++ py-salt-2018.3.1/files/patch-salt_modules_freebsd__sysctl.py	2018-06-14 07:50:46.506072000 -0600
>@@ -0,0 +1,11 @@
>+--- salt/modules/freebsd_sysctl.py	2018-06-13 10:03:06.000000000 -0600
>++++ salt/modules/freebsd_sysctl.py	2018-06-14 07:47:40.380542000 -0600
>+@@ -165,7 +165,7 @@
>+     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:

christer.edwards: maintainer-approval+

Actions: View | Diff

Attachments on bug 229012: 194248 | 194251