Update to 2016.11.4. Changelog:

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

Also ensure PID file paths are correct.

6 files changed, 26 insertions, 11 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 6a4d2d5e249..c1aec805b7f 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2017/03/03 09:29:48 sborrill Exp $
+# $NetBSD: Makefile,v 1.49 2017/05/03 08:24:57 sborrill Exp $
 
-DISTNAME=	salt-2016.11.3
+DISTNAME=	salt-2016.11.4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/salt/}
 
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index ccc5ff78e93..07bee3cc2f9 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2017/02/03 13:39:00 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/05/03 08:24:57 sborrill Exp $
 bin/salt
 bin/salt-api
 bin/salt-call
@@ -635,6 +635,9 @@ ${PYSITELIB}/salt/modules/__init__.pyo
 ${PYSITELIB}/salt/modules/acme.py
 ${PYSITELIB}/salt/modules/acme.pyc
 ${PYSITELIB}/salt/modules/acme.pyo
+${PYSITELIB}/salt/modules/aix_group.py
+${PYSITELIB}/salt/modules/aix_group.pyc
+${PYSITELIB}/salt/modules/aix_group.pyo
 ${PYSITELIB}/salt/modules/aliases.py
 ${PYSITELIB}/salt/modules/aliases.pyc
 ${PYSITELIB}/salt/modules/aliases.pyo
@@ -1355,6 +1358,9 @@ ${PYSITELIB}/salt/modules/openbsdrcctl.pyo
 ${PYSITELIB}/salt/modules/openbsdservice.py
 ${PYSITELIB}/salt/modules/openbsdservice.pyc
 ${PYSITELIB}/salt/modules/openbsdservice.pyo
+${PYSITELIB}/salt/modules/openscap.py
+${PYSITELIB}/salt/modules/openscap.pyc
+${PYSITELIB}/salt/modules/openscap.pyo
 ${PYSITELIB}/salt/modules/openstack_config.py
 ${PYSITELIB}/salt/modules/openstack_config.pyc
 ${PYSITELIB}/salt/modules/openstack_config.pyo
@@ -3627,6 +3633,9 @@ ${PYSITELIB}/salt/utils/parsers.pyo
 ${PYSITELIB}/salt/utils/pkg/__init__.py
 ${PYSITELIB}/salt/utils/pkg/__init__.pyc
 ${PYSITELIB}/salt/utils/pkg/__init__.pyo
+${PYSITELIB}/salt/utils/pkg/deb.py
+${PYSITELIB}/salt/utils/pkg/deb.pyc
+${PYSITELIB}/salt/utils/pkg/deb.pyo
 ${PYSITELIB}/salt/utils/pkg/rpm.py
 ${PYSITELIB}/salt/utils/pkg/rpm.pyc
 ${PYSITELIB}/salt/utils/pkg/rpm.pyo
@@ -3699,6 +3708,9 @@ ${PYSITELIB}/salt/utils/smtp.pyo
 ${PYSITELIB}/salt/utils/stormpath.py
 ${PYSITELIB}/salt/utils/stormpath.pyc
 ${PYSITELIB}/salt/utils/stormpath.pyo
+${PYSITELIB}/salt/utils/stringio.py
+${PYSITELIB}/salt/utils/stringio.pyc
+${PYSITELIB}/salt/utils/stringio.pyo
 ${PYSITELIB}/salt/utils/systemd.py
 ${PYSITELIB}/salt/utils/systemd.pyc
 ${PYSITELIB}/salt/utils/systemd.pyo
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index e07a64b1a8a..a84cfe056ec 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2017/03/03 09:29:48 sborrill Exp $
+$NetBSD: distinfo,v 1.26 2017/05/03 08:24:57 sborrill Exp $
 
-SHA1 (salt-2016.11.3.tar.gz) = c9735d68ad2574b9b8ba1bea720c06e22c4b0277
-RMD160 (salt-2016.11.3.tar.gz) = 9d58a8d549f724c6b920914b711c414c4b7f3d03
-SHA512 (salt-2016.11.3.tar.gz) = 24bc75c50b4d6bd38a6f2dedc0a8c12142cc1b9d551455e49ea0ede405c78eb6a939f741dd8c0cbb8f206937ee69582bebe2fc127a24a4c2cf06cf3c3c16e507
-Size (salt-2016.11.3.tar.gz) = 9163351 bytes
+SHA1 (salt-2016.11.4.tar.gz) = 3bc69ef7ef81d6e654a3de81e5b20957cd7757fa
+RMD160 (salt-2016.11.4.tar.gz) = d5f5ddd7f7741e4dc163319fdc287e685a042962
+SHA512 (salt-2016.11.4.tar.gz) = ba928b61766d34774ce2e623fa79a46f6d373295c55b336e1b451e6a4afb0d547d78ceb9e466b64d8ba8bdbf2e750cbb77d008bc76308602729ae08241b8d346
+Size (salt-2016.11.4.tar.gz) = 9360198 bytes
diff --git a/sysutils/salt/files/salt_master.sh b/sysutils/salt/files/salt_master.sh
index 7bed26d118c..e8f1b820deb 100644
--- a/sysutils/salt/files/salt_master.sh
+++ b/sysutils/salt/files/salt_master.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: salt_master.sh,v 1.2 2013/05/05 12:26:23 imil Exp $
+# $NetBSD: salt_master.sh,v 1.3 2017/05/03 08:24:57 sborrill Exp $
 #
 
 # PROVIDE: salt_master
@@ -15,6 +15,7 @@ command="@PREFIX@/bin/salt-master"
 command_args="-d"
 command_interpreter=@PYTHON@
 required_files="@PKG_SYSCONFDIR@/master"
+pidfile="@VARBASE@/run/salt-master.pid"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/sysutils/salt/files/salt_minion.sh b/sysutils/salt/files/salt_minion.sh
index f6ffc5eee30..c18278c132d 100644
--- a/sysutils/salt/files/salt_minion.sh
+++ b/sysutils/salt/files/salt_minion.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: salt_minion.sh,v 1.2 2013/05/05 12:26:23 imil Exp $
+# $NetBSD: salt_minion.sh,v 1.3 2017/05/03 08:24:57 sborrill Exp $
 #
 
 # PROVIDE: salt_minion
@@ -15,6 +15,7 @@ command="@PREFIX@/bin/salt-minion"
 command_args="-d"
 command_interpreter=@PYTHON@
 required_files="@PKG_SYSCONFDIR@/minion"
+pidfile="@VARBASE@/run/salt-minion.pid"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/sysutils/salt/files/salt_syndic.sh b/sysutils/salt/files/salt_syndic.sh
index 246d97b5ac8..4fca158e186 100644
--- a/sysutils/salt/files/salt_syndic.sh
+++ b/sysutils/salt/files/salt_syndic.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: salt_syndic.sh,v 1.1 2016/02/16 00:00:08 khorben Exp $
+# $NetBSD: salt_syndic.sh,v 1.2 2017/05/03 08:24:57 sborrill Exp $
 #
 
 # PROVIDE: salt_syndic
@@ -15,6 +15,7 @@ command="@PREFIX@/bin/salt-syndic"
 command_args="-d"
 command_interpreter=@PYTHON@
 required_files="@PKG_SYSCONFDIR@/master @PKG_SYSCONFDIR@/minion"
+pidfile="@VARBASE@/run/salt-syndic.pid"
 
 load_rc_config $name
 run_rc_command "$1"