Mon Feb 6 12:48:18 2017 UTC ()
Fix NetBSD sockstat parsing.
Bump PKGREVISION


(sborrill)
diff -r1.45 -r1.46 pkgsrc/sysutils/salt/Makefile
diff -r1.23 -r1.24 pkgsrc/sysutils/salt/distinfo
diff -r0 -r1.5 pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py
cvs diff -r1.45 -r1.46 pkgsrc/sysutils/salt/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/salt/Makefile 2017/02/03 13:39:00 1.45
+++ pkgsrc/sysutils/salt/Makefile 2017/02/06 12:48:18 1.46
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.45 2017/02/03 13:39:00 sborrill Exp $ 1# $NetBSD: Makefile,v 1.46 2017/02/06 12:48:18 sborrill Exp $
2 2
3DISTNAME= salt-2016.11.2 3DISTNAME= salt-2016.11.2
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://saltstack.org/ 9HOMEPAGE= http://saltstack.org/
9COMMENT= Remote execution and configuration management system 10COMMENT= Remote execution and configuration management system
10LICENSE= apache-2.0 11LICENSE= apache-2.0
11 12
12DEPENDS+= zeromq>=2.1.9:../../net/zeromq 13DEPENDS+= zeromq>=2.1.9:../../net/zeromq
13DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq 14DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq
14DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto 15DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
15DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto 16DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
16DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack 17DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
cvs diff -r1.23 -r1.24 pkgsrc/sysutils/salt/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/salt/distinfo 2017/02/03 13:39:00 1.23
+++ pkgsrc/sysutils/salt/distinfo 2017/02/06 12:48:18 1.24
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.23 2017/02/03 13:39:00 sborrill Exp $ 1$NetBSD: distinfo,v 1.24 2017/02/06 12:48:18 sborrill Exp $
2 2
3SHA1 (salt-2016.11.2.tar.gz) = 00cc3ad1af9e40e4cfa2572c45058e3342944413 3SHA1 (salt-2016.11.2.tar.gz) = 00cc3ad1af9e40e4cfa2572c45058e3342944413
4RMD160 (salt-2016.11.2.tar.gz) = cd6b75fb78e9bf52116c05866682a49cb96f67d2 4RMD160 (salt-2016.11.2.tar.gz) = cd6b75fb78e9bf52116c05866682a49cb96f67d2
5SHA512 (salt-2016.11.2.tar.gz) = 0dbc861424643af664edd2d9cb8bcbde7e9bcf7c1d202a5e844af83c21dc2d75fd7034db27dffc58dc2a6e47cfe2ea2c42e2a9af867c7ca78f93166eb4fd03ad 5SHA512 (salt-2016.11.2.tar.gz) = 0dbc861424643af664edd2d9cb8bcbde7e9bcf7c1d202a5e844af83c21dc2d75fd7034db27dffc58dc2a6e47cfe2ea2c42e2a9af867c7ca78f93166eb4fd03ad
6Size (salt-2016.11.2.tar.gz) = 9114042 bytes 6Size (salt-2016.11.2.tar.gz) = 9114042 bytes
 7SHA1 (patch-salt_utils_network.py) = 54a1b8fb53b6b65aa6c07b39506e2c1dcd57b54a
File Added: pkgsrc/sysutils/salt/patches/Attic/patch-salt_utils_network.py
$NetBSD: patch-salt_utils_network.py,v 1.5 2017/02/06 12:48:18 sborrill Exp $

Fix sockstat parsing on NetBSD.
https://github.com/saltstack/salt/pull/39189

--- salt/utils/network.py.orig	2017-01-30 18:13:20.000000000 +0000
+++ salt/utils/network.py	2017-02-06 11:38:34.000000000 +0000
@@ -1057,23 +1057,23 @@
     Parses output of shell 'sockstat' (NetBSD)
     to get connections
 
-    $ sudo sockstat -4
+    $ sudo sockstat -4 -n
     USER    COMMAND     PID     FD  PROTO  LOCAL ADDRESS    FOREIGN ADDRESS
-    root    python2.7   1456    29  tcp4   *.4505           *.*
-    root    python2.7   1445    17  tcp4   *.4506           *.*
-    root    python2.7   1294    14  tcp4   127.0.0.1.11813  127.0.0.1.4505
-    root    python2.7   1294    41  tcp4   127.0.0.1.61115  127.0.0.1.4506
+    root    python2.7   1456    29  tcp    *.4505           *.*
+    root    python2.7   1445    17  tcp    *.4506           *.*
+    root    python2.7   1294    14  tcp    127.0.0.1.11813  127.0.0.1.4505
+    root    python2.7   1294    41  tcp    127.0.0.1.61115  127.0.0.1.4506
 
-    $ sudo sockstat -4 -c -p 4506
+    $ sudo sockstat -4 -c -n -p 4506
     USER    COMMAND     PID     FD  PROTO  LOCAL ADDRESS    FOREIGN ADDRESS
-    root    python2.7   1294    41  tcp4   127.0.0.1.61115  127.0.0.1.4506
+    root    python2.7   1294    41  tcp    127.0.0.1.61115  127.0.0.1.4506
     '''
 
     port = int(port)
     remotes = set()
 
     try:
-        cmd = salt.utils.shlex_split('sockstat -4 -c -p {0}'.format(port))
+        cmd = salt.utils.shlex_split('sockstat -4 -c -n -p {0}'.format(port))
         data = subprocess.check_output(cmd)  # pylint: disable=minimum-python-version
     except subprocess.CalledProcessError as ex:
         log.error('Failed "sockstat" with returncode = {0}'.format(ex.returncode))
@@ -1085,7 +1085,7 @@
         chunks = line.split()
         if not chunks:
             continue
-        # ['root', 'python2.7', '1456', '37', 'tcp4',
+        # ['root', 'python2.7', '1456', '37', 'tcp',
         #  '127.0.0.1.4505-', '127.0.0.1.55703']
         # print chunks
         if 'COMMAND' in chunks[1]: