From 13100a4ff2d9fcacc4978ac0513ea287d4f78667 Mon Sep 17 00:00:00 2001 From: Filip Chabik Date: Mon, 19 Sep 2016 11:00:18 +0200 Subject: [PATCH 1/3] SunOS-based operating systems now have their own elif, this patch should be no longer needed. --- .../salt/patches/patch-salt_modules_status.py | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 sysutils/salt/patches/patch-salt_modules_status.py diff --git a/sysutils/salt/patches/patch-salt_modules_status.py b/sysutils/salt/patches/patch-salt_modules_status.py deleted file mode 100644 index c2a6615a9426b..0000000000000 --- a/sysutils/salt/patches/patch-salt_modules_status.py +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-salt_modules_status.py,v 1.2 2016/02/16 01:52:34 khorben Exp $ - -Avoid a crash in "status.diskusage" when not on Linux or FreeBSD - ---- salt/modules/status.py.orig 2016-02-01 19:40:31.000000000 +0000 -+++ salt/modules/status.py -@@ -457,6 +457,8 @@ def diskusage(*args): - ifile = salt.utils.fopen(procf, 'r').readlines() - elif __grains__['kernel'] == 'FreeBSD': - ifile = __salt__['cmd.run']('mount -p').splitlines() -+ else: -+ ifile = [] - - for line in ifile: - comps = line.split() From e6d95274b6ce911e7a3400a429d28de02226545b Mon Sep 17 00:00:00 2001 From: Filip Chabik Date: Mon, 19 Sep 2016 11:01:59 +0200 Subject: [PATCH 2/3] Updating checksums for the files. --- sysutils/salt/distinfo | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 76983fd063b56..8de25df6be927 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,9 +1,8 @@ $NetBSD: distinfo,v 1.21 2016/07/21 17:05:39 jperkin Exp $ -SHA1 (salt-2016.3.1.tar.gz) = 501f32fd42077ad3c21b684b5ea91cbf710e90d7 -RMD160 (salt-2016.3.1.tar.gz) = dba0017b707e484b4fbf88e4705c40beebbca62b -SHA512 (salt-2016.3.1.tar.gz) = 74122020a83df79171b9aa3bc311d1b16930140ec6b063c888d41e10fb8e696f69188b62cf925045b40d8b8fe713759de08978b08bc3b8e1f12722de3a8ddb7b -Size (salt-2016.3.1.tar.gz) = 7932479 bytes -SHA1 (patch-salt_modules_status.py) = f444cce79e2b0edd79066d7c78e807556d191f98 +SHA1 (salt-2016.3.3.tar.gz) = 9c52a7401c0600cc422ccaa2406909bd6ac71db0 +RMD160 (salt-2016.3.3.tar.gz) = 66f5b1615d59d200f82184a142a1a0597fe877ff +SHA512 (salt-2016.3.3.tar.gz) = 46a8f8b3213e4cc02eaed95e7fc28ce224fe07fe2aea39b68ff3e97043021951558f04690f7043510c8dfb62d76fe82192d67de6151c7f1076a23c0f8d796c9e +Size (salt-2016.3.3.tar.gz) = 7952361 bytes SHA1 (patch-salt_utils_____init____.py) = 61f11da63f26af69334f3eca957d596486396ab0 SHA1 (patch-salt_utils_network.py) = f217b0c16fcee9044ab1c583209829dc001c4e4b From 0fd7139b13c25cd5fc7b17a6d8572ed45d6a904a Mon Sep 17 00:00:00 2001 From: Filip Chabik Date: Mon, 19 Sep 2016 11:03:05 +0200 Subject: [PATCH 3/3] Bumping up Salt to version 2016.3.3. --- sysutils/salt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index b8a5aa3bec76e..f14b4dd98df84 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.41 2016/07/21 17:05:39 jperkin Exp $ -DISTNAME= salt-2016.3.1 +DISTNAME= salt-2016.3.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}