CVS commit: pkgsrc/sysutils/salt

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Sep 19 13:34:37 UTC 2016

Modified Files:
        pkgsrc/sysutils/salt: Makefile PLIST distinfo
        pkgsrc/sysutils/salt/patches: patch-salt_modules_status.py
            patch-salt_utils_network.py

Log Message:
Update sysutils/salt to 2016.3.3.  As usual the changelogs are far too long
to be useful, but are available here:

  https://docs.saltstack.com/en/latest/topics/releases/2016.3.2.html
  https://docs.saltstack.com/en/latest/topics/releases/2016.3.3.html

Based on joyent/pkgsrc#410 from Filip Chabik.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/salt/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/salt/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/salt/patches/patch-salt_modules_status.py \
    pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.41 pkgsrc/sysutils/salt/Makefile:1.42
--- pkgsrc/sysutils/salt/Makefile:1.41  Thu Jul 21 17:05:39 2016
+++ pkgsrc/sysutils/salt/Makefile       Mon Sep 19 13:34:37 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2016/07/21 17:05:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.42 2016/09/19 13:34:37 jperkin Exp $
 
-DISTNAME=      salt-2016.3.1
+DISTNAME=      salt-2016.3.4
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
 

Index: pkgsrc/sysutils/salt/PLIST
diff -u pkgsrc/sysutils/salt/PLIST:1.16 pkgsrc/sysutils/salt/PLIST:1.17
--- pkgsrc/sysutils/salt/PLIST:1.16     Thu Jul 21 17:05:39 2016
+++ pkgsrc/sysutils/salt/PLIST  Mon Sep 19 13:34:37 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/07/21 17:05:39 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/09/19 13:34:37 jperkin Exp $
 bin/salt
 bin/salt-api
 bin/salt-call
@@ -983,6 +983,9 @@ ${PYSITELIB}/salt/modules/inspectlib/dbh
 ${PYSITELIB}/salt/modules/inspectlib/exceptions.py
 ${PYSITELIB}/salt/modules/inspectlib/exceptions.pyc
 ${PYSITELIB}/salt/modules/inspectlib/exceptions.pyo
+${PYSITELIB}/salt/modules/inspectlib/kiwiproc.py
+${PYSITELIB}/salt/modules/inspectlib/kiwiproc.pyc
+${PYSITELIB}/salt/modules/inspectlib/kiwiproc.pyo
 ${PYSITELIB}/salt/modules/inspectlib/query.py
 ${PYSITELIB}/salt/modules/inspectlib/query.pyc
 ${PYSITELIB}/salt/modules/inspectlib/query.pyo

Index: pkgsrc/sysutils/salt/distinfo
diff -u pkgsrc/sysutils/salt/distinfo:1.21 pkgsrc/sysutils/salt/distinfo:1.22
--- pkgsrc/sysutils/salt/distinfo:1.21  Thu Jul 21 17:05:39 2016
+++ pkgsrc/sysutils/salt/distinfo       Mon Sep 19 13:34:37 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2016/07/21 17:05:39 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2016/09/19 13:34:37 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_modules_status.py) = 4b2bec94a8554c656baa227ad973b71d2a56d48d
 SHA1 (patch-salt_utils_____init____.py) = 61f11da63f26af69334f3eca957d596486396ab0
-SHA1 (patch-salt_utils_network.py) = f217b0c16fcee9044ab1c583209829dc001c4e4b
+SHA1 (patch-salt_utils_network.py) = 13db1609939b8e8390656904af86ba92408bb44a

Index: pkgsrc/sysutils/salt/patches/patch-salt_modules_status.py
diff -u pkgsrc/sysutils/salt/patches/patch-salt_modules_status.py:1.2 pkgsrc/sysutils/salt/patches/patch-salt_modules_status.py:1.3
--- pkgsrc/sysutils/salt/patches/patch-salt_modules_status.py:1.2       Tue Feb 16 01:52:34 2016
+++ pkgsrc/sysutils/salt/patches/patch-salt_modules_status.py   Mon Sep 19 13:34:37 2016
@@ -1,12 +1,12 @@
-$NetBSD: patch-salt_modules_status.py,v 1.2 2016/02/16 01:52:34 khorben Exp $
+$NetBSD: patch-salt_modules_status.py,v 1.3 2016/09/19 13:34:37 jperkin 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.orig        2016-08-26 18:55:37.000000000 +0000
 +++ salt/modules/status.py
-@@ -457,6 +457,8 @@ def diskusage(*args):
-             ifile = salt.utils.fopen(procf, 'r').readlines()
-         elif __grains__['kernel'] == 'FreeBSD':
+@@ -603,6 +603,8 @@ def diskusage(*args):
+             ifile = __salt__['cmd.run']('mount -p').splitlines()
+         elif __grains__['kernel'] == 'SunOS':
              ifile = __salt__['cmd.run']('mount -p').splitlines()
 +        else:
 +            ifile = []
Index: pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py
diff -u pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py:1.2 pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py:1.3
--- pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py:1.2        Thu Jul 21 17:05:39 2016
+++ pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py    Mon Sep 19 13:34:37 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-salt_utils_network.py,v 1.2 2016/07/21 17:05:39 jperkin Exp $
+$NetBSD: patch-salt_utils_network.py,v 1.3 2016/09/19 13:34:37 jperkin Exp $
 
 Use sockstat(1) on NetBSD
 
---- salt/utils/network.py.orig 2016-06-13 22:17:50.000000000 +0000
+--- salt/utils/network.py.orig 2016-08-26 18:55:37.000000000 +0000
 +++ salt/utils/network.py
 @@ -1086,6 +1086,8 @@ def _remotes_on(port, which_end):
              return _sunos_remotes_on(port, which_end)
@@ -13,17 +13,10 @@ Use sockstat(1) on NetBSD
          if salt.utils.is_openbsd():
              return _openbsd_remotes_on(port, which_end)
          if salt.utils.is_windows():
-@@ -1201,6 +1203,65 @@ def _freebsd_remotes_on(port, which_end)
-         if which_end == 'local' and int(lport) != port:  # ignore if local port not port
-             continue
-         if which_end == 'remote' and int(rport) != port:  # ignore if remote port not port
-+            continue
-+
-+        remotes.add(rhost)
-+
-+    return remotes
-+
-+
+@@ -1208,6 +1210,65 @@ def _freebsd_remotes_on(port, which_end)
+     return remotes
+ 
+ 
 +def _netbsd_remotes_on(port, which_end):
 +    '''
 +    Returns set of ipv4 host addresses of remote established connections
@@ -76,6 +69,13 @@ Use sockstat(1) on NetBSD
 +        if which_end == 'local' and int(lport) != port:  # ignore if local port not port
 +            continue
 +        if which_end == 'remote' and int(rport) != port:  # ignore if remote port not port
-             continue
- 
-         remotes.add(rhost)
++            continue
++
++        remotes.add(rhost)
++
++    return remotes
++
++
+ def _openbsd_remotes_on(port, which_end):
+     '''
+     OpenBSD specific helper function.