salt: updated to 2019.2.2

SALT 2019.2.2 RELEASE NOTES

Version 2019.2.2 is a bugfix release for 2019.2.0.

ISSUE 54817: (tomlaredo) [REGRESSION] git.latest displays errors (refs: 54844)
* (garethgreenaway) [master] Fix to git state module when calling git.config_get_regexp
52fee6f Merge pull request 54844 from garethgreenaway/54817_git_latest_error_calling_git_config_get_regexp
cb1b75a Adding test.
6ba8ff2 When calling git.config_get_regexp to check for filter.lfs. in git config, if the option is not available this would result with a return code of 1 which would result in an error being logged. Since one possible result is that the configuration would not be there, we ignore the return code.
* (frogunder) update 2019.2.2 release notes
d6593c2 Merge pull request 54973 from frogunder/update_releasenotes_2019.2.2
0c01cfb update 2019.2.2 release notes
* (twangboy) Add missing docs for win_wusa state and module (2019.2.1)
7d253bc Merge pull request 54919 from twangboy/update_docs
57ff199 Add docs for win_wusa
ISSUE 54941: (UtahDave) Pillar data is refreshed for EVERY salt command in 2019.2.1 and 2019.2.2 (refs: 54942)
* (dwoz) Fix for 54941 pillar_refresh regression
2f817bc Merge pull request 54942 from dwoz/fix-54941
cb5d326 Add a test for 54941 using test.ping
348d1c4 Add regression tests for issue 54941
766f3ca Initial commit of a potential fix for 54941
* (bryceml) update version numbers to be correct
f783108 Merge pull request 54897 from bryceml/2019.2.1_fix_docs
e9a2a70 update version numbers to be correct
* (bryceml) 2019.2.1 fix docs
3233663 Merge pull request 54894 from bryceml/2019.2.1_fix_docs
c7b7474 modifying saltconf ads
d48057b add new saltconf ads
* (frogunder) remove in progress from releasenotes 2019.2.2
4b06eca Merge pull request 54858 from frogunder/releasenotes_remove2019.2.2
a697abd remove in progress from releasenotes 2019.2.2
* (frogunder) releasenotes 2019.2.2
aaf2d1c Merge pull request 54854 from frogunder/release_notes_2019.2.2
a41dc59 Update 2019.2.2.rst
9bea043 releasenotes 2019.2.2
* (frogunder) Update man pages for 2019.2.2
10d433f Merge pull request 54852 from frogunder/man_pages_2019.2.2
92bc4b2 Update man pages for 2019.2.2
* (s0undt3ch) Remove debug print
8ca6b20 Merge pull request 54845 from s0undt3ch/hotfix/event-return-fix-2019.2.1
3937890 Remove debug print
ISSUE 54755: (Reiner030) 2019.2.1/2019.2.0 pip failures even when not using pip (refs: 54826)
* (dwoz) Fix issue 54755 and add regression tests
9e3914a Merge pull request 54826 from dwoz/issue_54755
0bad9cb Handle locals and globals separatly
bcbe9a2 Only purge pip when needed
d2f98ca Fix issue 54755 and add regression tests
* (frogunder) Add known issues to 2019.2.1 release notes
ba569d0 Merge pull request 54830 from frogunder/update_relasenotes_2019.2.1
8cdb27b Update 2019.2.1.rst
14f955c Add known issues to 2019.2.1 release notes
ISSUE 54521: (Oloremo) [Regression] Failhard, batch and retcodes (refs: 54806)
* (Oloremo) [Regression] Batch with failhard fix
433b6fa Merge pull request 54806 from Oloremo/failhard-batch-fix-2019.2.1
6684793 Merge branch '2019.2.1' into failhard-batch-fix-2019.2.1
3e0e928 Added tests for cli and runner
2416516 Made batch work properly with failhard in cli and runner
ISSUE 54820: (OrangeDog) schedule.present not idempotent when scheduler disabled (refs: 54828)
* (garethgreenaway) [2019.2.1] Fix global disabling code in scheduler
ed94aa5 Merge pull request 54828 from garethgreenaway/54820_fix_schedule_disabled_job_enabled_bug
be15a28 Rework code that handles individual jobs being disabled and scheduler being globally being disabled. Previously disabling the schedule would result in individual jobs being disabled when they were run through eval. This change does not change schedule items.
* (Akm0d) fix broken salt-cloud openstack query
435b40c Merge pull request 54778 from Akm0d/master_openstack_query_fix
ba4ba2a fixed pylint errors in openstack test
d9a8517 Added openstack tests for openstack --query fix
59214ad Fallback to image id if we don't have an image name
3a42a4d fixed pylint error
0074d18 created unit tests for openstack
4255e3e Merge branch '2019.2.1' of https://github.com/saltstack/salt into HEAD
1c2821b Return a configured provider, not a bool
c585550 fix broken salt-cloud openstack query
ISSUE 54762: (margau) 2019.2.1: Breaks Minion-Master Communication (refs: 54784, 54823, 54807)
* (dhiltonp) ip_bracket can now accept ipv6 addresses with brackets
93b1c4d Merge pull request 54823 from dhiltonp/maybe-bracket
faa1d98 ip_bracket can now accept ipv6 addresses with brackets
ISSUE 54762: (margau) 2019.2.1: Breaks Minion-Master Communication (refs: 54784, 54823, 54807)
* (dwoz) Fix pip state pip >=10.0 and <=18.0
* (OrlandoArcapix) Fix import of pip modules (refs: 54807)
b61b30d Merge pull request 54807 from dwoz/patch-2
664806b Add unit test for pip state fix
e637658 Revert change to pip version query
42810a2 Fix import of pip modules
ISSUE 54741: (kjkeane) Schedulers Fail to Run (refs: 54799)
* (garethgreenaway) Fix to scheduler when job without a time element is run with schedule.run_job
4ee1ff6 Merge pull request 54799 from garethgreenaway/54741_run_job_fails_without_time_element
44caa81 Merge branch '54741_run_job_fails_without_time_element' of github.com:garethgreenaway/salt into 54741_run_job_fails_without_time_element
3ae4f75 Merge branch '2019.2.1' into 54741_run_job_fails_without_time_element
8afd2d8 Removing extra, unnecessary code.
549cfb8 Fixing test_run_job test to ensure the right data is being asserted. Updating unit/test_module_names.py to include integration.scheduler.test_run_job.
7d716d6 Fixing lint.
ec68591 If a scheduled job does not contains a time element parameter then running that job with schedule.run_job fails with a traceback because data['run'] does not exist.
* (Ch3LL) Fix state.show_states when sls file missing in top file
b90c3f2 Merge pull request 54785 from Ch3LL/fix_show_states
96540be Clean up files after state.show_states test
ad265ae Fix state.show_states when sls file missing
ISSUE 54768: (paul-palmer) 2019.2.1 Some Jinja imports not found (refs: 54780)
ISSUE 54765: (awerner) 2019.2.1: Jinja from import broken (refs: 54780)
* (dwoz) Fix masterless jinja imports
b9459e6 Merge pull request 54780 from dwoz/fix-masterless-jinja-imports
5d873cc Merge branch '2019.2.1' into fix-masterless-jinja-imports
e901a83 Add regression tests for jinja import bug
3925bb7 Fix broken jinja imports in masterless salt-call
ISSUE 54776: (javierbertoli) Setting ping_interval in salt-minion's config (version 2019.2.1) prevents it from starting (refs: 54777)
* (javierbertoli) Fix minion's remove_periodic_callback()
4c240e5 Merge pull request 54777 from netmanagers/2019.2.1
459c790 Merge branch '2019.2.1' into 2019.2.1
* (bryceml) improve lint job
83f8f5c Merge pull request 54805 from bryceml/2019.2.1_update_lint_salt
ffa4ed6 improve lint job
fa1a767 Merge branch '2019.2.1' into 2019.2.1
ISSUE 54751: (jnmatlock) NXOS_API Proxy Minions Error KeyError: 'proxy.post_master_init' after upgrading to 2019.2.1 (refs: 54783)
* (garethgreenaway) Ensure metaproxy directory is included in sdist
6b43fbe Merge pull request 54783 from garethgreenaway/54751_fixing_missing_metaproxy_directory
67d9938 Merge branch '2019.2.1' into 54751_fixing_missing_metaproxy_directory
a35e609 Adding __init__.py to metaproxy directory so that metaproxy is included when running setup.py.
ISSUE 54762: (margau) 2019.2.1: Breaks Minion-Master Communication (refs: 54784, 54823, 54807)
* (dhiltonp) fix dns_check to return uri-compatible ipv6 addresses, add tests
7912b67 Merge pull request 54784 from dhiltonp/ipv46
042a101 Merge branch '2019.2.1' into ipv46
* (frogunder) Add 2019.2.2 release notes
2f94b44 Merge pull request 54779 from frogunder/releasenotes_2019.2.2
67f564b Add 2019.2.2 release notes
ac6b54f Merge branch '2019.2.1' into ipv46
93ebd09 update mock (py2) from 2.0.0 to 3.0.5
37bcc4c fix dns_check to return uri-compatible ipv6 addresses, add tests
dd86c46 Merge pull request 1 from waynew/pull/54777-callback-typo
a57f7d0 Add tests
c19d0b0 Fix minion's remove_periodic_callback()
* (pizzapanther) Fix returners not loading properly
46bec3c Merge pull request 54731 from pizzapanther/not-so-__new__-and-shiny
bdf24f4 Make sure we tests salt-master's event_return setting
5499518 remove unnecessary import
3f8a382 fix module import
0746aa7 remove __new__ method since it was removed from parent class
* (bryceml) 2019.2.1 ruby
e2b86bf Merge pull request 54706 from bryceml/2019.2.1_ruby
168a6c1 switch to ruby 2.6.3

3 files changed, 137 insertions, 129 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 61f40471862..2313d6eab16 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2019/07/08 18:54:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.71 2019/11/13 14:47:59 adam Exp $
 
-DISTNAME=	salt-2019.2.0
-PKGREVISION=	2
+DISTNAME=	salt-2019.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/salt/}
 
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index b9f7b38754c..77336098578 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2019/02/28 10:21:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2019/11/13 14:47:59 adam Exp $
 bin/salt
 bin/salt-api
 bin/salt-call
@@ -797,6 +797,12 @@ ${PYSITELIB}/salt/matchers/pillar_pcre_match.pyo
 ${PYSITELIB}/salt/matchers/range_match.py
 ${PYSITELIB}/salt/matchers/range_match.pyc
 ${PYSITELIB}/salt/matchers/range_match.pyo
+${PYSITELIB}/salt/metaproxy/__init__.py
+${PYSITELIB}/salt/metaproxy/__init__.pyc
+${PYSITELIB}/salt/metaproxy/__init__.pyo
+${PYSITELIB}/salt/metaproxy/proxy.py
+${PYSITELIB}/salt/metaproxy/proxy.pyc
+${PYSITELIB}/salt/metaproxy/proxy.pyo
 ${PYSITELIB}/salt/minion.py
 ${PYSITELIB}/salt/minion.pyc
 ${PYSITELIB}/salt/minion.pyo
@@ -833,9 +839,9 @@ ${PYSITELIB}/salt/modules/apcups.pyo
 ${PYSITELIB}/salt/modules/apf.py
 ${PYSITELIB}/salt/modules/apf.pyc
 ${PYSITELIB}/salt/modules/apf.pyo
-${PYSITELIB}/salt/modules/apk.py
-${PYSITELIB}/salt/modules/apk.pyc
-${PYSITELIB}/salt/modules/apk.pyo
+${PYSITELIB}/salt/modules/apkpkg.py
+${PYSITELIB}/salt/modules/apkpkg.pyc
+${PYSITELIB}/salt/modules/apkpkg.pyo
 ${PYSITELIB}/salt/modules/aptly.py
 ${PYSITELIB}/salt/modules/aptly.pyc
 ${PYSITELIB}/salt/modules/aptly.pyo
@@ -884,9 +890,9 @@ ${PYSITELIB}/salt/modules/beacons.pyo
 ${PYSITELIB}/salt/modules/bigip.py
 ${PYSITELIB}/salt/modules/bigip.pyc
 ${PYSITELIB}/salt/modules/bigip.pyo
-${PYSITELIB}/salt/modules/bluez.py
-${PYSITELIB}/salt/modules/bluez.pyc
-${PYSITELIB}/salt/modules/bluez.pyo
+${PYSITELIB}/salt/modules/bluez_bluetooth.py
+${PYSITELIB}/salt/modules/bluez_bluetooth.pyc
+${PYSITELIB}/salt/modules/bluez_bluetooth.pyo
 ${PYSITELIB}/salt/modules/boto3_elasticache.py
 ${PYSITELIB}/salt/modules/boto3_elasticache.pyc
 ${PYSITELIB}/salt/modules/boto3_elasticache.pyo
@@ -1088,9 +1094,6 @@ ${PYSITELIB}/salt/modules/deb_apache.pyo
 ${PYSITELIB}/salt/modules/deb_postgres.py
 ${PYSITELIB}/salt/modules/deb_postgres.pyc
 ${PYSITELIB}/salt/modules/deb_postgres.pyo
-${PYSITELIB}/salt/modules/debbuild.py
-${PYSITELIB}/salt/modules/debbuild.pyc
-${PYSITELIB}/salt/modules/debbuild.pyo
 ${PYSITELIB}/salt/modules/debconfmod.py
 ${PYSITELIB}/salt/modules/debconfmod.pyc
 ${PYSITELIB}/salt/modules/debconfmod.pyo
@@ -1100,6 +1103,9 @@ ${PYSITELIB}/salt/modules/debian_ip.pyo
 ${PYSITELIB}/salt/modules/debian_service.py
 ${PYSITELIB}/salt/modules/debian_service.pyc
 ${PYSITELIB}/salt/modules/debian_service.pyo
+${PYSITELIB}/salt/modules/debuild_pkgbuild.py
+${PYSITELIB}/salt/modules/debuild_pkgbuild.pyc
+${PYSITELIB}/salt/modules/debuild_pkgbuild.pyo
 ${PYSITELIB}/salt/modules/defaults.py
 ${PYSITELIB}/salt/modules/defaults.pyc
 ${PYSITELIB}/salt/modules/defaults.pyo
@@ -1127,9 +1133,9 @@ ${PYSITELIB}/salt/modules/dockercompose.pyo
 ${PYSITELIB}/salt/modules/dockermod.py
 ${PYSITELIB}/salt/modules/dockermod.pyc
 ${PYSITELIB}/salt/modules/dockermod.pyo
-${PYSITELIB}/salt/modules/dpkg.py
-${PYSITELIB}/salt/modules/dpkg.pyc
-${PYSITELIB}/salt/modules/dpkg.pyo
+${PYSITELIB}/salt/modules/dpkg_lowpkg.py
+${PYSITELIB}/salt/modules/dpkg_lowpkg.pyc
+${PYSITELIB}/salt/modules/dpkg_lowpkg.pyo
 ${PYSITELIB}/salt/modules/drac.py
 ${PYSITELIB}/salt/modules/drac.pyc
 ${PYSITELIB}/salt/modules/drac.pyo
@@ -1139,15 +1145,15 @@ ${PYSITELIB}/salt/modules/dracr.pyo
 ${PYSITELIB}/salt/modules/drbd.py
 ${PYSITELIB}/salt/modules/drbd.pyc
 ${PYSITELIB}/salt/modules/drbd.pyo
-${PYSITELIB}/salt/modules/dummyproxy_package.py
-${PYSITELIB}/salt/modules/dummyproxy_package.pyc
-${PYSITELIB}/salt/modules/dummyproxy_package.pyo
+${PYSITELIB}/salt/modules/dummyproxy_pkg.py
+${PYSITELIB}/salt/modules/dummyproxy_pkg.pyc
+${PYSITELIB}/salt/modules/dummyproxy_pkg.pyo
 ${PYSITELIB}/salt/modules/dummyproxy_service.py
 ${PYSITELIB}/salt/modules/dummyproxy_service.pyc
 ${PYSITELIB}/salt/modules/dummyproxy_service.pyo
-${PYSITELIB}/salt/modules/ebuild.py
-${PYSITELIB}/salt/modules/ebuild.pyc
-${PYSITELIB}/salt/modules/ebuild.pyo
+${PYSITELIB}/salt/modules/ebuildpkg.py
+${PYSITELIB}/salt/modules/ebuildpkg.pyc
+${PYSITELIB}/salt/modules/ebuildpkg.pyo
 ${PYSITELIB}/salt/modules/eix.py
 ${PYSITELIB}/salt/modules/eix.pyc
 ${PYSITELIB}/salt/modules/eix.pyo
@@ -1292,9 +1298,6 @@ ${PYSITELIB}/salt/modules/hipchat.pyo
 ${PYSITELIB}/salt/modules/hosts.py
 ${PYSITELIB}/salt/modules/hosts.pyc
 ${PYSITELIB}/salt/modules/hosts.pyo
-${PYSITELIB}/salt/modules/htpasswd.py
-${PYSITELIB}/salt/modules/htpasswd.pyc
-${PYSITELIB}/salt/modules/htpasswd.pyo
 ${PYSITELIB}/salt/modules/http.py
 ${PYSITELIB}/salt/modules/http.pyc
 ${PYSITELIB}/salt/modules/http.pyo
@@ -1310,12 +1313,12 @@ ${PYSITELIB}/salt/modules/ilo.pyo
 ${PYSITELIB}/salt/modules/incron.py
 ${PYSITELIB}/salt/modules/incron.pyc
 ${PYSITELIB}/salt/modules/incron.pyo
-${PYSITELIB}/salt/modules/influx.py
-${PYSITELIB}/salt/modules/influx.pyc
-${PYSITELIB}/salt/modules/influx.pyo
-${PYSITELIB}/salt/modules/influx08.py
-${PYSITELIB}/salt/modules/influx08.pyc
-${PYSITELIB}/salt/modules/influx08.pyo
+${PYSITELIB}/salt/modules/influxdb08mod.py
+${PYSITELIB}/salt/modules/influxdb08mod.pyc
+${PYSITELIB}/salt/modules/influxdb08mod.pyo
+${PYSITELIB}/salt/modules/influxdbmod.py
+${PYSITELIB}/salt/modules/influxdbmod.pyc
+${PYSITELIB}/salt/modules/influxdbmod.pyo
 ${PYSITELIB}/salt/modules/infoblox.py
 ${PYSITELIB}/salt/modules/infoblox.pyc
 ${PYSITELIB}/salt/modules/infoblox.pyo
@@ -1412,12 +1415,12 @@ ${PYSITELIB}/salt/modules/keystoneng.pyo
 ${PYSITELIB}/salt/modules/kmod.py
 ${PYSITELIB}/salt/modules/kmod.pyc
 ${PYSITELIB}/salt/modules/kmod.pyo
-${PYSITELIB}/salt/modules/kubernetes.py
-${PYSITELIB}/salt/modules/kubernetes.pyc
-${PYSITELIB}/salt/modules/kubernetes.pyo
-${PYSITELIB}/salt/modules/launchctl.py
-${PYSITELIB}/salt/modules/launchctl.pyc
-${PYSITELIB}/salt/modules/launchctl.pyo
+${PYSITELIB}/salt/modules/kubernetesmod.py
+${PYSITELIB}/salt/modules/kubernetesmod.pyc
+${PYSITELIB}/salt/modules/kubernetesmod.pyo
+${PYSITELIB}/salt/modules/launchctl_service.py
+${PYSITELIB}/salt/modules/launchctl_service.pyc
+${PYSITELIB}/salt/modules/launchctl_service.pyo
 ${PYSITELIB}/salt/modules/layman.py
 ${PYSITELIB}/salt/modules/layman.pyc
 ${PYSITELIB}/salt/modules/layman.pyo
@@ -1478,12 +1481,9 @@ ${PYSITELIB}/salt/modules/lxd.pyo
 ${PYSITELIB}/salt/modules/mac_assistive.py
 ${PYSITELIB}/salt/modules/mac_assistive.pyc
 ${PYSITELIB}/salt/modules/mac_assistive.pyo
-${PYSITELIB}/salt/modules/mac_brew.py
-${PYSITELIB}/salt/modules/mac_brew.pyc
-${PYSITELIB}/salt/modules/mac_brew.pyo
-${PYSITELIB}/salt/modules/mac_defaults.py
-${PYSITELIB}/salt/modules/mac_defaults.pyc
-${PYSITELIB}/salt/modules/mac_defaults.pyo
+${PYSITELIB}/salt/modules/mac_brew_pkg.py
+${PYSITELIB}/salt/modules/mac_brew_pkg.pyc
+${PYSITELIB}/salt/modules/mac_brew_pkg.pyo
 ${PYSITELIB}/salt/modules/mac_desktop.py
 ${PYSITELIB}/salt/modules/mac_desktop.pyc
 ${PYSITELIB}/salt/modules/mac_desktop.pyo
@@ -1493,15 +1493,12 @@ ${PYSITELIB}/salt/modules/mac_group.pyo
 ${PYSITELIB}/salt/modules/mac_keychain.py
 ${PYSITELIB}/salt/modules/mac_keychain.pyc
 ${PYSITELIB}/salt/modules/mac_keychain.pyo
-${PYSITELIB}/salt/modules/mac_package.py
-${PYSITELIB}/salt/modules/mac_package.pyc
-${PYSITELIB}/salt/modules/mac_package.pyo
 ${PYSITELIB}/salt/modules/mac_pkgutil.py
 ${PYSITELIB}/salt/modules/mac_pkgutil.pyc
 ${PYSITELIB}/salt/modules/mac_pkgutil.pyo
-${PYSITELIB}/salt/modules/mac_ports.py
-${PYSITELIB}/salt/modules/mac_ports.pyc
-${PYSITELIB}/salt/modules/mac_ports.pyo
+${PYSITELIB}/salt/modules/mac_portspkg.py
+${PYSITELIB}/salt/modules/mac_portspkg.pyc
+${PYSITELIB}/salt/modules/mac_portspkg.pyo
 ${PYSITELIB}/salt/modules/mac_power.py
 ${PYSITELIB}/salt/modules/mac_power.pyc
 ${PYSITELIB}/salt/modules/mac_power.pyo
@@ -1529,6 +1526,12 @@ ${PYSITELIB}/salt/modules/mac_user.pyo
 ${PYSITELIB}/salt/modules/mac_xattr.py
 ${PYSITELIB}/salt/modules/mac_xattr.pyc
 ${PYSITELIB}/salt/modules/mac_xattr.pyo
+${PYSITELIB}/salt/modules/macdefaults.py
+${PYSITELIB}/salt/modules/macdefaults.pyc
+${PYSITELIB}/salt/modules/macdefaults.pyo
+${PYSITELIB}/salt/modules/macpackage.py
+${PYSITELIB}/salt/modules/macpackage.pyc
+${PYSITELIB}/salt/modules/macpackage.pyo
 ${PYSITELIB}/salt/modules/makeconf.py
 ${PYSITELIB}/salt/modules/makeconf.pyc
 ${PYSITELIB}/salt/modules/makeconf.pyo
@@ -1544,9 +1547,9 @@ ${PYSITELIB}/salt/modules/match.pyo
 ${PYSITELIB}/salt/modules/mattermost.py
 ${PYSITELIB}/salt/modules/mattermost.pyc
 ${PYSITELIB}/salt/modules/mattermost.pyo
-${PYSITELIB}/salt/modules/mdadm.py
-${PYSITELIB}/salt/modules/mdadm.pyc
-${PYSITELIB}/salt/modules/mdadm.pyo
+${PYSITELIB}/salt/modules/mdadm_raid.py
+${PYSITELIB}/salt/modules/mdadm_raid.pyc
+${PYSITELIB}/salt/modules/mdadm_raid.pyo
 ${PYSITELIB}/salt/modules/mdata.py
 ${PYSITELIB}/salt/modules/mdata.pyc
 ${PYSITELIB}/salt/modules/mdata.pyo
@@ -1598,24 +1601,21 @@ ${PYSITELIB}/salt/modules/nagios.pyo
 ${PYSITELIB}/salt/modules/nagios_rpc.py
 ${PYSITELIB}/salt/modules/nagios_rpc.pyc
 ${PYSITELIB}/salt/modules/nagios_rpc.pyo
-${PYSITELIB}/salt/modules/namecheap_dns.py
-${PYSITELIB}/salt/modules/namecheap_dns.pyc
-${PYSITELIB}/salt/modules/namecheap_dns.pyo
 ${PYSITELIB}/salt/modules/namecheap_domains.py
 ${PYSITELIB}/salt/modules/namecheap_domains.pyc
 ${PYSITELIB}/salt/modules/namecheap_domains.pyo
-${PYSITELIB}/salt/modules/namecheap_ns.py
-${PYSITELIB}/salt/modules/namecheap_ns.pyc
-${PYSITELIB}/salt/modules/namecheap_ns.pyo
+${PYSITELIB}/salt/modules/namecheap_domains_dns.py
+${PYSITELIB}/salt/modules/namecheap_domains_dns.pyc
+${PYSITELIB}/salt/modules/namecheap_domains_dns.pyo
+${PYSITELIB}/salt/modules/namecheap_domains_ns.py
+${PYSITELIB}/salt/modules/namecheap_domains_ns.pyc
+${PYSITELIB}/salt/modules/namecheap_domains_ns.pyo
 ${PYSITELIB}/salt/modules/namecheap_ssl.py
 ${PYSITELIB}/salt/modules/namecheap_ssl.pyc
 ${PYSITELIB}/salt/modules/namecheap_ssl.pyo
 ${PYSITELIB}/salt/modules/namecheap_users.py
 ${PYSITELIB}/salt/modules/namecheap_users.pyc
 ${PYSITELIB}/salt/modules/namecheap_users.pyo
-${PYSITELIB}/salt/modules/napalm_acl.py
-${PYSITELIB}/salt/modules/napalm_acl.pyc
-${PYSITELIB}/salt/modules/napalm_acl.pyo
 ${PYSITELIB}/salt/modules/napalm_bgp.py
 ${PYSITELIB}/salt/modules/napalm_bgp.pyc
 ${PYSITELIB}/salt/modules/napalm_bgp.pyo
@@ -1625,6 +1625,9 @@ ${PYSITELIB}/salt/modules/napalm_formula.pyo
 ${PYSITELIB}/salt/modules/napalm_mod.py
 ${PYSITELIB}/salt/modules/napalm_mod.pyc
 ${PYSITELIB}/salt/modules/napalm_mod.pyo
+${PYSITELIB}/salt/modules/napalm_netacl.py
+${PYSITELIB}/salt/modules/napalm_netacl.pyc
+${PYSITELIB}/salt/modules/napalm_netacl.pyo
 ${PYSITELIB}/salt/modules/napalm_network.py
 ${PYSITELIB}/salt/modules/napalm_network.pyc
 ${PYSITELIB}/salt/modules/napalm_network.pyo
@@ -1715,9 +1718,9 @@ ${PYSITELIB}/salt/modules/openbsd_sysctl.pyo
 ${PYSITELIB}/salt/modules/openbsdpkg.py
 ${PYSITELIB}/salt/modules/openbsdpkg.pyc
 ${PYSITELIB}/salt/modules/openbsdpkg.pyo
-${PYSITELIB}/salt/modules/openbsdrcctl.py
-${PYSITELIB}/salt/modules/openbsdrcctl.pyc
-${PYSITELIB}/salt/modules/openbsdrcctl.pyo
+${PYSITELIB}/salt/modules/openbsdrcctl_service.py
+${PYSITELIB}/salt/modules/openbsdrcctl_service.pyc
+${PYSITELIB}/salt/modules/openbsdrcctl_service.pyo
 ${PYSITELIB}/salt/modules/openbsdservice.py
 ${PYSITELIB}/salt/modules/openbsdservice.pyc
 ${PYSITELIB}/salt/modules/openbsdservice.pyo
@@ -1748,9 +1751,9 @@ ${PYSITELIB}/salt/modules/osquery.pyo
 ${PYSITELIB}/salt/modules/out.py
 ${PYSITELIB}/salt/modules/out.pyc
 ${PYSITELIB}/salt/modules/out.pyo
-${PYSITELIB}/salt/modules/pacman.py
-${PYSITELIB}/salt/modules/pacman.pyc
-${PYSITELIB}/salt/modules/pacman.pyo
+${PYSITELIB}/salt/modules/pacmanpkg.py
+${PYSITELIB}/salt/modules/pacmanpkg.pyc
+${PYSITELIB}/salt/modules/pacmanpkg.pyo
 ${PYSITELIB}/salt/modules/pagerduty.py
 ${PYSITELIB}/salt/modules/pagerduty.pyc
 ${PYSITELIB}/salt/modules/pagerduty.pyo
@@ -1766,9 +1769,9 @@ ${PYSITELIB}/salt/modules/panos.pyo
 ${PYSITELIB}/salt/modules/parallels.py
 ${PYSITELIB}/salt/modules/parallels.pyc
 ${PYSITELIB}/salt/modules/parallels.pyo
-${PYSITELIB}/salt/modules/parted.py
-${PYSITELIB}/salt/modules/parted.pyc
-${PYSITELIB}/salt/modules/parted.pyo
+${PYSITELIB}/salt/modules/parted_partition.py
+${PYSITELIB}/salt/modules/parted_partition.pyc
+${PYSITELIB}/salt/modules/parted_partition.pyo
 ${PYSITELIB}/salt/modules/pcs.py
 ${PYSITELIB}/salt/modules/pcs.pyc
 ${PYSITELIB}/salt/modules/pcs.pyo
@@ -1889,9 +1892,9 @@ ${PYSITELIB}/salt/modules/redismod.pyo
 ${PYSITELIB}/salt/modules/reg.py
 ${PYSITELIB}/salt/modules/reg.pyc
 ${PYSITELIB}/salt/modules/reg.pyo
-${PYSITELIB}/salt/modules/rest_package.py
-${PYSITELIB}/salt/modules/rest_package.pyc
-${PYSITELIB}/salt/modules/rest_package.pyo
+${PYSITELIB}/salt/modules/rest_pkg.py
+${PYSITELIB}/salt/modules/rest_pkg.pyc
+${PYSITELIB}/salt/modules/rest_pkg.pyo
 ${PYSITELIB}/salt/modules/rest_sample_utils.py
 ${PYSITELIB}/salt/modules/rest_sample_utils.pyc
 ${PYSITELIB}/salt/modules/rest_sample_utils.pyo
@@ -1913,12 +1916,12 @@ ${PYSITELIB}/salt/modules/rh_service.pyo
 ${PYSITELIB}/salt/modules/riak.py
 ${PYSITELIB}/salt/modules/riak.pyc
 ${PYSITELIB}/salt/modules/riak.pyo
-${PYSITELIB}/salt/modules/rpm.py
-${PYSITELIB}/salt/modules/rpm.pyc
-${PYSITELIB}/salt/modules/rpm.pyo
-${PYSITELIB}/salt/modules/rpmbuild.py
-${PYSITELIB}/salt/modules/rpmbuild.pyc
-${PYSITELIB}/salt/modules/rpmbuild.pyo
+${PYSITELIB}/salt/modules/rpm_lowpkg.py
+${PYSITELIB}/salt/modules/rpm_lowpkg.pyc
+${PYSITELIB}/salt/modules/rpm_lowpkg.pyo
+${PYSITELIB}/salt/modules/rpmbuild_pkgbuild.py
+${PYSITELIB}/salt/modules/rpmbuild_pkgbuild.pyc
+${PYSITELIB}/salt/modules/rpmbuild_pkgbuild.pyo
 ${PYSITELIB}/salt/modules/rsync.py
 ${PYSITELIB}/salt/modules/rsync.pyc
 ${PYSITELIB}/salt/modules/rsync.pyo
@@ -2003,9 +2006,9 @@ ${PYSITELIB}/salt/modules/smartos_vmadm.pyo
 ${PYSITELIB}/salt/modules/smbios.py
 ${PYSITELIB}/salt/modules/smbios.pyc
 ${PYSITELIB}/salt/modules/smbios.pyo
-${PYSITELIB}/salt/modules/smf.py
-${PYSITELIB}/salt/modules/smf.pyc
-${PYSITELIB}/salt/modules/smf.pyo
+${PYSITELIB}/salt/modules/smf_service.py
+${PYSITELIB}/salt/modules/smf_service.pyc
+${PYSITELIB}/salt/modules/smf_service.pyo
 ${PYSITELIB}/salt/modules/smtp.py
 ${PYSITELIB}/salt/modules/smtp.pyc
 ${PYSITELIB}/salt/modules/smtp.pyo
@@ -2027,9 +2030,9 @@ ${PYSITELIB}/salt/modules/solaris_system.pyo
 ${PYSITELIB}/salt/modules/solaris_user.py
 ${PYSITELIB}/salt/modules/solaris_user.pyc
 ${PYSITELIB}/salt/modules/solaris_user.pyo
-${PYSITELIB}/salt/modules/solarisips.py
-${PYSITELIB}/salt/modules/solarisips.pyc
-${PYSITELIB}/salt/modules/solarisips.pyo
+${PYSITELIB}/salt/modules/solarisipspkg.py
+${PYSITELIB}/salt/modules/solarisipspkg.pyc
+${PYSITELIB}/salt/modules/solarisipspkg.pyo
 ${PYSITELIB}/salt/modules/solarispkg.py
 ${PYSITELIB}/salt/modules/solarispkg.pyc
 ${PYSITELIB}/salt/modules/solarispkg.pyo
@@ -2051,9 +2054,9 @@ ${PYSITELIB}/salt/modules/sqlite3.pyo
 ${PYSITELIB}/salt/modules/ssh.py
 ${PYSITELIB}/salt/modules/ssh.pyc
 ${PYSITELIB}/salt/modules/ssh.pyo
-${PYSITELIB}/salt/modules/ssh_package.py
-${PYSITELIB}/salt/modules/ssh_package.pyc
-${PYSITELIB}/salt/modules/ssh_package.pyo
+${PYSITELIB}/salt/modules/ssh_pkg.py
+${PYSITELIB}/salt/modules/ssh_pkg.pyc
+${PYSITELIB}/salt/modules/ssh_pkg.pyo
 ${PYSITELIB}/salt/modules/ssh_service.py
 ${PYSITELIB}/salt/modules/ssh_service.pyc
 ${PYSITELIB}/salt/modules/ssh_service.pyo
@@ -2102,9 +2105,9 @@ ${PYSITELIB}/salt/modules/system.pyo
 ${PYSITELIB}/salt/modules/system_profiler.py
 ${PYSITELIB}/salt/modules/system_profiler.pyc
 ${PYSITELIB}/salt/modules/system_profiler.pyo
-${PYSITELIB}/salt/modules/systemd.py
-${PYSITELIB}/salt/modules/systemd.pyc
-${PYSITELIB}/salt/modules/systemd.pyo
+${PYSITELIB}/salt/modules/systemd_service.py
+${PYSITELIB}/salt/modules/systemd_service.pyc
+${PYSITELIB}/salt/modules/systemd_service.pyo
 ${PYSITELIB}/salt/modules/telegram.py
 ${PYSITELIB}/salt/modules/telegram.pyc
 ${PYSITELIB}/salt/modules/telegram.pyo
@@ -2150,9 +2153,9 @@ ${PYSITELIB}/salt/modules/twilio_notify.pyo
 ${PYSITELIB}/salt/modules/udev.py
 ${PYSITELIB}/salt/modules/udev.pyc
 ${PYSITELIB}/salt/modules/udev.pyo
-${PYSITELIB}/salt/modules/upstart.py
-${PYSITELIB}/salt/modules/upstart.pyc
-${PYSITELIB}/salt/modules/upstart.pyo
+${PYSITELIB}/salt/modules/upstart_service.py
+${PYSITELIB}/salt/modules/upstart_service.pyc
+${PYSITELIB}/salt/modules/upstart_service.pyo
 ${PYSITELIB}/salt/modules/uptime.py
 ${PYSITELIB}/salt/modules/uptime.pyc
 ${PYSITELIB}/salt/modules/uptime.pyo
@@ -2195,6 +2198,9 @@ ${PYSITELIB}/salt/modules/vmctl.pyo
 ${PYSITELIB}/salt/modules/vsphere.py
 ${PYSITELIB}/salt/modules/vsphere.pyc
 ${PYSITELIB}/salt/modules/vsphere.pyo
+${PYSITELIB}/salt/modules/webutil.py
+${PYSITELIB}/salt/modules/webutil.pyc
+${PYSITELIB}/salt/modules/webutil.pyo
 ${PYSITELIB}/salt/modules/win_auditpol.py
 ${PYSITELIB}/salt/modules/win_auditpol.pyc
 ${PYSITELIB}/salt/modules/win_auditpol.pyo
@@ -2261,9 +2267,6 @@ ${PYSITELIB}/salt/modules/win_powercfg.pyo
 ${PYSITELIB}/salt/modules/win_psget.py
 ${PYSITELIB}/salt/modules/win_psget.pyc
 ${PYSITELIB}/salt/modules/win_psget.pyo
-${PYSITELIB}/salt/modules/win_repo.py
-${PYSITELIB}/salt/modules/win_repo.pyc
-${PYSITELIB}/salt/modules/win_repo.pyo
 ${PYSITELIB}/salt/modules/win_servermanager.py
 ${PYSITELIB}/salt/modules/win_servermanager.pyc
 ${PYSITELIB}/salt/modules/win_servermanager.pyo
@@ -2300,15 +2303,18 @@ ${PYSITELIB}/salt/modules/win_wua.pyo
 ${PYSITELIB}/salt/modules/win_wusa.py
 ${PYSITELIB}/salt/modules/win_wusa.pyc
 ${PYSITELIB}/salt/modules/win_wusa.pyo
+${PYSITELIB}/salt/modules/winrepo.py
+${PYSITELIB}/salt/modules/winrepo.pyc
+${PYSITELIB}/salt/modules/winrepo.pyo
 ${PYSITELIB}/salt/modules/wordpress.py
 ${PYSITELIB}/salt/modules/wordpress.pyc
 ${PYSITELIB}/salt/modules/wordpress.pyo
 ${PYSITELIB}/salt/modules/x509.py
 ${PYSITELIB}/salt/modules/x509.pyc
 ${PYSITELIB}/salt/modules/x509.pyo
-${PYSITELIB}/salt/modules/xapi.py
-${PYSITELIB}/salt/modules/xapi.pyc
-${PYSITELIB}/salt/modules/xapi.pyo
+${PYSITELIB}/salt/modules/xapi_virt.py
+${PYSITELIB}/salt/modules/xapi_virt.pyc
+${PYSITELIB}/salt/modules/xapi_virt.pyo
 ${PYSITELIB}/salt/modules/xbpspkg.py
 ${PYSITELIB}/salt/modules/xbpspkg.pyc
 ${PYSITELIB}/salt/modules/xbpspkg.pyo
@@ -2351,9 +2357,9 @@ ${PYSITELIB}/salt/modules/zookeeper.pyo
 ${PYSITELIB}/salt/modules/zpool.py
 ${PYSITELIB}/salt/modules/zpool.pyc
 ${PYSITELIB}/salt/modules/zpool.pyo
-${PYSITELIB}/salt/modules/zypper.py
-${PYSITELIB}/salt/modules/zypper.pyc
-${PYSITELIB}/salt/modules/zypper.pyo
+${PYSITELIB}/salt/modules/zypperpkg.py
+${PYSITELIB}/salt/modules/zypperpkg.pyc
+${PYSITELIB}/salt/modules/zypperpkg.pyo
 ${PYSITELIB}/salt/netapi/__init__.py
 ${PYSITELIB}/salt/netapi/__init__.pyc
 ${PYSITELIB}/salt/netapi/__init__.pyo
@@ -2408,9 +2414,9 @@ ${PYSITELIB}/salt/output/nested.pyo
 ${PYSITELIB}/salt/output/newline_values_only.py
 ${PYSITELIB}/salt/output/newline_values_only.pyc
 ${PYSITELIB}/salt/output/newline_values_only.pyo
-${PYSITELIB}/salt/output/no_out.py
-${PYSITELIB}/salt/output/no_out.pyc
-${PYSITELIB}/salt/output/no_out.pyo
+${PYSITELIB}/salt/output/no_out_quiet.py
+${PYSITELIB}/salt/output/no_out_quiet.pyc
+${PYSITELIB}/salt/output/no_out_quiet.pyo
 ${PYSITELIB}/salt/output/no_return.py
 ${PYSITELIB}/salt/output/no_return.pyc
 ${PYSITELIB}/salt/output/no_return.pyo
@@ -2804,9 +2810,9 @@ ${PYSITELIB}/salt/returners/multi_returner.pyo
 ${PYSITELIB}/salt/returners/mysql.py
 ${PYSITELIB}/salt/returners/mysql.pyc
 ${PYSITELIB}/salt/returners/mysql.pyo
-${PYSITELIB}/salt/returners/nagios_return.py
-${PYSITELIB}/salt/returners/nagios_return.pyc
-${PYSITELIB}/salt/returners/nagios_return.pyo
+${PYSITELIB}/salt/returners/nagios_nrdp_return.py
+${PYSITELIB}/salt/returners/nagios_nrdp_return.pyc
+${PYSITELIB}/salt/returners/nagios_nrdp_return.pyo
 ${PYSITELIB}/salt/returners/odbc.py
 ${PYSITELIB}/salt/returners/odbc.pyc
 ${PYSITELIB}/salt/returners/odbc.pyo
@@ -3470,9 +3476,6 @@ ${PYSITELIB}/salt/states/hipchat.pyo
 ${PYSITELIB}/salt/states/host.py
 ${PYSITELIB}/salt/states/host.pyc
 ${PYSITELIB}/salt/states/host.pyo
-${PYSITELIB}/salt/states/htpasswd.py
-${PYSITELIB}/salt/states/htpasswd.pyc
-${PYSITELIB}/salt/states/htpasswd.pyo
 ${PYSITELIB}/salt/states/http.py
 ${PYSITELIB}/salt/states/http.pyc
 ${PYSITELIB}/salt/states/http.pyo
@@ -3635,27 +3638,27 @@ ${PYSITELIB}/salt/states/lxd_profile.pyo
 ${PYSITELIB}/salt/states/mac_assistive.py
 ${PYSITELIB}/salt/states/mac_assistive.pyc
 ${PYSITELIB}/salt/states/mac_assistive.pyo
-${PYSITELIB}/salt/states/mac_defaults.py
-${PYSITELIB}/salt/states/mac_defaults.pyc
-${PYSITELIB}/salt/states/mac_defaults.pyo
 ${PYSITELIB}/salt/states/mac_keychain.py
 ${PYSITELIB}/salt/states/mac_keychain.pyc
 ${PYSITELIB}/salt/states/mac_keychain.pyo
-${PYSITELIB}/salt/states/mac_package.py
-${PYSITELIB}/salt/states/mac_package.pyc
-${PYSITELIB}/salt/states/mac_package.pyo
 ${PYSITELIB}/salt/states/mac_xattr.py
 ${PYSITELIB}/salt/states/mac_xattr.pyc
 ${PYSITELIB}/salt/states/mac_xattr.pyo
+${PYSITELIB}/salt/states/macdefaults.py
+${PYSITELIB}/salt/states/macdefaults.pyc
+${PYSITELIB}/salt/states/macdefaults.pyo
+${PYSITELIB}/salt/states/macpackage.py
+${PYSITELIB}/salt/states/macpackage.pyc
+${PYSITELIB}/salt/states/macpackage.pyo
 ${PYSITELIB}/salt/states/makeconf.py
 ${PYSITELIB}/salt/states/makeconf.pyc
 ${PYSITELIB}/salt/states/makeconf.pyo
 ${PYSITELIB}/salt/states/marathon_app.py
 ${PYSITELIB}/salt/states/marathon_app.pyc
 ${PYSITELIB}/salt/states/marathon_app.pyo
-${PYSITELIB}/salt/states/mdadm.py
-${PYSITELIB}/salt/states/mdadm.pyc
-${PYSITELIB}/salt/states/mdadm.pyo
+${PYSITELIB}/salt/states/mdadm_raid.py
+${PYSITELIB}/salt/states/mdadm_raid.pyc
+${PYSITELIB}/salt/states/mdadm_raid.pyo
 ${PYSITELIB}/salt/states/memcached.py
 ${PYSITELIB}/salt/states/memcached.pyc
 ${PYSITELIB}/salt/states/memcached.pyo
@@ -3707,6 +3710,9 @@ ${PYSITELIB}/salt/states/mysql_query.pyo
 ${PYSITELIB}/salt/states/mysql_user.py
 ${PYSITELIB}/salt/states/mysql_user.pyc
 ${PYSITELIB}/salt/states/mysql_user.pyo
+${PYSITELIB}/salt/states/net_napalm_yang.py
+${PYSITELIB}/salt/states/net_napalm_yang.pyc
+${PYSITELIB}/salt/states/net_napalm_yang.pyo
 ${PYSITELIB}/salt/states/netacl.py
 ${PYSITELIB}/salt/states/netacl.pyc
 ${PYSITELIB}/salt/states/netacl.pyo
@@ -3725,9 +3731,6 @@ ${PYSITELIB}/salt/states/netusers.pyo
 ${PYSITELIB}/salt/states/network.py
 ${PYSITELIB}/salt/states/network.pyc
 ${PYSITELIB}/salt/states/network.pyo
-${PYSITELIB}/salt/states/netyang.py
-${PYSITELIB}/salt/states/netyang.pyc
-${PYSITELIB}/salt/states/netyang.pyo
 ${PYSITELIB}/salt/states/neutron_network.py
 ${PYSITELIB}/salt/states/neutron_network.pyc
 ${PYSITELIB}/salt/states/neutron_network.pyo
@@ -4031,6 +4034,9 @@ ${PYSITELIB}/salt/states/virt.pyo
 ${PYSITELIB}/salt/states/virtualenv_mod.py
 ${PYSITELIB}/salt/states/virtualenv_mod.pyc
 ${PYSITELIB}/salt/states/virtualenv_mod.pyo
+${PYSITELIB}/salt/states/webutil.py
+${PYSITELIB}/salt/states/webutil.pyc
+${PYSITELIB}/salt/states/webutil.pyo
 ${PYSITELIB}/salt/states/win_certutil.py
 ${PYSITELIB}/salt/states/win_certutil.pyc
 ${PYSITELIB}/salt/states/win_certutil.pyo
@@ -4775,6 +4781,9 @@ ${PYSITELIB}/salt/utils/yamlencoding.pyo
 ${PYSITELIB}/salt/utils/yamlloader.py
 ${PYSITELIB}/salt/utils/yamlloader.pyc
 ${PYSITELIB}/salt/utils/yamlloader.pyo
+${PYSITELIB}/salt/utils/yamlloader_old.py
+${PYSITELIB}/salt/utils/yamlloader_old.pyc
+${PYSITELIB}/salt/utils/yamlloader_old.pyo
 ${PYSITELIB}/salt/utils/yast.py
 ${PYSITELIB}/salt/utils/yast.pyc
 ${PYSITELIB}/salt/utils/yast.pyo
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index 82132823c54..a7859349cd1 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.41 2019/02/28 10:21:21 adam Exp $
+$NetBSD: distinfo,v 1.42 2019/11/13 14:47:59 adam Exp $
 
-SHA1 (salt-2019.2.0.tar.gz) = de6b0189c6e3e5df81e1dfe69c913b153af5ac8b
-RMD160 (salt-2019.2.0.tar.gz) = e23415a11ec6f26eaf3b8560b5b081d91a8c7361
-SHA512 (salt-2019.2.0.tar.gz) = de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
-Size (salt-2019.2.0.tar.gz) = 14952746 bytes
+SHA1 (salt-2019.2.2.tar.gz) = d92a63cb3073a71765bab09ff7695a2b3760a44b
+RMD160 (salt-2019.2.2.tar.gz) = e5e8bf87072e51ca953c3183df5aa308414faf5d
+SHA512 (salt-2019.2.2.tar.gz) = 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
+Size (salt-2019.2.2.tar.gz) = 14420887 bytes
 SHA1 (patch-salt_version.py) = 1827dac3609a938fae38ee5dfd2a873c9723dfbd