[pkgsrc/pkgsrc-2017Q3]: pkgsrc/sysutils/salt Pullup ticket #5570 - requested ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b74aaee5f03
branches:  pkgsrc-2017Q3
changeset: 408523:9b74aaee5f03
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Oct 15 11:11:02 2017 +0000

description:
Pullup ticket #5570 - requested by sevan
sysutils/salt: security update

Revisions pulled up:
- sysutils/salt/Makefile                                        1.55
- sysutils/salt/distinfo                                        1.31
- sysutils/salt/patches/patch-salt_grains_core.py               deleted

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   sborrill
   Date:           Wed Oct 11 09:40:28 UTC 2017

   Modified Files:
           pkgsrc/sysutils/salt: Makefile distinfo
   Removed Files:
           pkgsrc/sysutils/salt/patches: patch-salt_grains_core.py

   Log Message:
   salt: update to 2017.7.2

   Changelog:
   https://docs.saltstack.com/en/latest/topics/releases/2017.7.2.html

   Fixes CVE-2017-14695 and CVE-2017-14696


   To generate a diff of this commit:
   cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/salt/Makefile
   cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/salt/distinfo
   cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py

diffstat:

 sysutils/salt/Makefile                          |   4 ++--
 sysutils/salt/distinfo                          |  11 +++++------
 sysutils/salt/patches/patch-salt_grains_core.py |  18 ------------------
 3 files changed, 7 insertions(+), 26 deletions(-)

diffs (50 lines):

diff -r c15befcc66ba -r 9b74aaee5f03 sysutils/salt/Makefile
--- a/sysutils/salt/Makefile    Mon Oct 09 12:32:16 2017 +0000
+++ b/sysutils/salt/Makefile    Sun Oct 15 11:11:02 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2017/08/21 10:28:29 sborrill Exp $
+# $NetBSD: Makefile,v 1.54.4.1 2017/10/15 11:11:02 spz Exp $
 
-DISTNAME=      salt-2017.7.1
+DISTNAME=      salt-2017.7.2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
 
diff -r c15befcc66ba -r 9b74aaee5f03 sysutils/salt/distinfo
--- a/sysutils/salt/distinfo    Mon Oct 09 12:32:16 2017 +0000
+++ b/sysutils/salt/distinfo    Sun Oct 15 11:11:02 2017 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.30 2017/08/21 10:28:29 sborrill Exp $
+$NetBSD: distinfo,v 1.30.4.1 2017/10/15 11:11:02 spz Exp $
 
-SHA1 (salt-2017.7.1.tar.gz) = 216a63ba32647eacfa68a61b9b5c3db8971ae4c1
-RMD160 (salt-2017.7.1.tar.gz) = 1e5abd593974bd0eedbd5700e5a5f001d3cce0e2
-SHA512 (salt-2017.7.1.tar.gz) = c12db2361e04ce7bf4d663fafdeebdb318f210e0669d1ae26db6daf3dd19a7549b4151cb4e53acacda24d11eec7bbd06190b01cf4962d9027783ffd4617a2e52
-Size (salt-2017.7.1.tar.gz) = 11408839 bytes
-SHA1 (patch-salt_grains_core.py) = b1f21880b329571c92510c9cdb4d45878c458ee8
+SHA1 (salt-2017.7.2.tar.gz) = c0e7db44328e5400b17c8cd15033991855c6fe2e
+RMD160 (salt-2017.7.2.tar.gz) = 1030d0e9fcd2de0ffe4604b550135413faab9fe9
+SHA512 (salt-2017.7.2.tar.gz) = 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
+Size (salt-2017.7.2.tar.gz) = 11471191 bytes
diff -r c15befcc66ba -r 9b74aaee5f03 sysutils/salt/patches/patch-salt_grains_core.py
--- a/sysutils/salt/patches/patch-salt_grains_core.py   Mon Oct 09 12:32:16 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-salt_grains_core.py,v 1.1 2017/08/01 12:09:57 sborrill Exp $
-
-Disable ZFS grains on NetBSD.
-https://github.com/saltstack/salt/pull/42654
-
---- salt/grains/core.py        2017-07-29 21:46:25.000000000 +0000
-+++ salt/grains/core.py        2017-07-31 18:49:59.000000000 +0000
-@@ -2359,6 +2359,10 @@
-     if salt.utils.is_windows() or 'proxyminion' in __opts__:
-         return {}
- 
-+    # quickly return if NetBSD (ZFS still under development)
-+    if salt.utils.is_netbsd():
-+        return {}
-+
-     # quickly return if no zpool and zfs command
-     if not salt.utils.which('zpool'):
-         return {}