From: Uwe Werler <uwe@werler.is>
Subject: Update: salt-3007.0
To: ports <ports@openbsd.org>
Cc: Robert Nagy <robert@openbsd.org>
Date: Wed, 13 Mar 2024 11:15:27 +0100

Hi all,

update to latest greatest salt 3007.0.

I removed the back ported patch for minion keys and additionally added
a login.conf.d file for salt_minion - because per default the minion
dies because it has not enough file descriptors available. With this
file I didn't notice any problems anymore.

-- 

With kind regards / Með bestu kveðju / Mit freundlichen Grüßen

Uwe Werler

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/salt/Makefile,v
diff -u -p -u -r1.184 Makefile
--- Makefile	7 Mar 2024 06:14:33 -0000	1.184
+++ Makefile	13 Mar 2024 10:06:55 -0000
@@ -15,10 +15,8 @@
 
 COMMENT =		remote execution and configuration management system
 
-MODPY_EGG_VERSION =	3006.7
+MODPY_EGG_VERSION =	3007.0
 DISTNAME =		salt-${MODPY_EGG_VERSION}
-
-REVISION =		0
 
 CATEGORIES =		sysutils net devel
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/salt/distinfo,v
diff -u -p -u -r1.68 distinfo
--- distinfo	1 Mar 2024 12:02:55 -0000	1.68
+++ distinfo	13 Mar 2024 10:06:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (salt-3006.7.tar.gz) = 7ZLSG4TrnUefk7qJRoRTQIEX4NwQEGFCFJmejQwhCv0=
-SIZE (salt-3006.7.tar.gz) = 20562663
+SHA256 (salt-3007.0.tar.gz) = Qb+E5x/GVb+KS1LrRA0GIa6WEJaghtIOEy4VEuLt3/g=
+SIZE (salt-3007.0.tar.gz) = 20304228
cvs server: Diffing patches
Index: patches/patch-salt_channel_server_py
===================================================================
RCS file: patches/patch-salt_channel_server_py
diff -N patches/patch-salt_channel_server_py
--- patches/patch-salt_channel_server_py	7 Mar 2024 06:14:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-52d98866200384dbaf3dbdecf66de00ff6d2195c fix: Older keys end with a newline, this breaks minion auth.
-4e72e2f0a57b594c3f7e14cc385a066097a268b2 fix: typo's
-0f4c022fdaabb41962e7fde1baca7bf73122f534 Simply check against cleaned key from disk.
-ecc39aa994c55b22c10320380abf6bd24529496d Refactor and add some tests
-
-Index: salt/channel/server.py
---- salt/channel/server.py.orig
-+++ salt/channel/server.py
-@@ -52,6 +52,16 @@ class ReqServerChannel:
-         transport = salt.transport.request_server(opts, **kwargs)
-         return cls(opts, transport)
- 
-+    @classmethod
-+    def compare_keys(cls, key1, key2):
-+        """
-+        Normalize and compare two keys
-+
-+        Returns:
-+            bool: ``True`` if the keys match, otherwise ``False``
-+        """
-+        return salt.crypt.clean_key(key1) == salt.crypt.clean_key(key2)
-+
-     def __init__(self, opts, transport):
-         self.opts = opts
-         self.transport = transport
-@@ -371,7 +381,7 @@ class ReqServerChannel:
-         elif os.path.isfile(pubfn):
-             # The key has been accepted, check it
-             with salt.utils.files.fopen(pubfn, "r") as pubfn_handle:
--                if salt.crypt.clean_key(pubfn_handle.read()) != load["pub"]:
-+                if not self.compare_keys(pubfn_handle.read(), load["pub"]):
-                     log.error(
-                         "Authentication attempt from %s failed, the public "
-                         "keys did not match. This may be an attempt to compromise "
-@@ -480,7 +490,7 @@ class ReqServerChannel:
-                 # case. Otherwise log the fact that the minion is still
-                 # pending.
-                 with salt.utils.files.fopen(pubfn_pend, "r") as pubfn_handle:
--                    if salt.crypt.clean_key(pubfn_handle.read()) != load["pub"]:
-+                    if not self.compare_keys(pubfn_handle.read(), load["pub"]):
-                         log.error(
-                             "Authentication attempt from %s failed, the public "
-                             "key in pending did not match. This may be an "
-@@ -536,7 +546,7 @@ class ReqServerChannel:
-                 # so, pass on doing anything here, and let it get automatically
-                 # accepted below.
-                 with salt.utils.files.fopen(pubfn_pend, "r") as pubfn_handle:
--                    if salt.crypt.clean_key(pubfn_handle.read()) != load["pub"]:
-+                    if not self.compare_keys(pubfn_handle.read(), load["pub"]):
-                         log.error(
-                             "Authentication attempt from %s failed, the public "
-                             "keys in pending did not match. This may be an "
Index: patches/patch-salt_client_ssh_shell_py
===================================================================
RCS file: /cvs/ports/sysutils/salt/patches/patch-salt_client_ssh_shell_py,v
diff -u -p -u -r1.7 patch-salt_client_ssh_shell_py
--- patches/patch-salt_client_ssh_shell_py	3 Apr 2023 06:33:06 -0000	1.7
+++ patches/patch-salt_client_ssh_shell_py	13 Mar 2024 10:06:55 -0000
@@ -9,7 +9,7 @@ Index: salt/client/ssh/shell.py
              options.append("PasswordAuthentication=no")
 -        if self.opts.get("_ssh_version", (0,)) > (4, 9):
 -            options.append("GSSAPIAuthentication=no")
-         options.append("ConnectTimeout={}".format(self.timeout))
+         options.append(f"ConnectTimeout={self.timeout}")
          if self.opts.get("ignore_host_keys"):
              options.append("StrictHostKeyChecking=no")
 @@ -162,8 +160,6 @@ class Shell:
@@ -18,6 +18,6 @@ Index: salt/client/ssh/shell.py
          ]
 -        if self.opts["_ssh_version"] > (4, 9):
 -            options.append("GSSAPIAuthentication=no")
-         options.append("ConnectTimeout={}".format(self.timeout))
+         options.append(f"ConnectTimeout={self.timeout}")
          if self.opts.get("ignore_host_keys"):
              options.append("StrictHostKeyChecking=no")
Index: patches/patch-salt_grains_core_py
===================================================================
RCS file: /cvs/ports/sysutils/salt/patches/patch-salt_grains_core_py,v
diff -u -p -u -r1.13 patch-salt_grains_core_py
--- patches/patch-salt_grains_core_py	7 Mar 2024 06:14:33 -0000	1.13
+++ patches/patch-salt_grains_core_py	13 Mar 2024 10:06:55 -0000
@@ -6,17 +6,17 @@ https://github.com/saltstack/salt/pull/5
 Index: salt/grains/core.py
 --- salt/grains/core.py.orig
 +++ salt/grains/core.py
-@@ -602,13 +602,15 @@ def _bsd_memdata(osdata):
+@@ -603,13 +603,15 @@ def _bsd_memdata(osdata):
          if osdata["kernel"] in ["OpenBSD", "NetBSD"]:
              swapctl = salt.utils.path.which("swapctl")
-             swap_data = __salt__["cmd.run"]("{} -sk".format(swapctl))
+             swap_data = __salt__["cmd.run"](f"{swapctl} -sk")
 -            if swap_data == "no swap devices configured":
 +            if re.match(r"(swapctl: )?no swap devices configured", swap_data):
                  swap_total = 0
              else:
                  swap_total = swap_data.split(" ")[1]
          else:
-             swap_total = __salt__["cmd.run"]("{} -n vm.swap_total".format(sysctl))
+             swap_total = __salt__["cmd.run"](f"{sysctl} -n vm.swap_total")
 -        grains["swap_total"] = int(swap_total) // 1024 // 1024
 +        grains["swap_total"] = int(swap_total) // 1024
 +        if osdata["kernel"] != "OpenBSD":
@@ -24,7 +24,7 @@ Index: salt/grains/core.py
      return grains
  
  
-@@ -2744,10 +2746,12 @@ def os_data():
+@@ -2735,10 +2737,12 @@ def os_data():
              # derive osrelease from kernelversion prior to that
              grains["osrelease"] = grains["kernelrelease"].split("-")[0]
          grains.update(_bsd_cpudata(grains))
Index: patches/patch-salt_returners_zabbix_return_py
===================================================================
RCS file: /cvs/ports/sysutils/salt/patches/patch-salt_returners_zabbix_return_py,v
diff -u -p -u -r1.5 patch-salt_returners_zabbix_return_py
--- patches/patch-salt_returners_zabbix_return_py	3 Apr 2023 06:33:06 -0000	1.5
+++ patches/patch-salt_returners_zabbix_return_py	13 Mar 2024 10:06:55 -0000
@@ -1,7 +1,7 @@
 Index: salt/returners/zabbix_return.py
 --- salt/returners/zabbix_return.py.orig
 +++ salt/returners/zabbix_return.py
-@@ -36,10 +36,10 @@ def zbx():
+@@ -42,10 +42,10 @@ def zbx():
          zabbix_sender = "/usr/local/zabbix/bin/zabbix_sender"
          zabbix_config = "/usr/local/zabbix/etc/zabbix_agentd.conf"
          return {"sender": zabbix_sender, "config": zabbix_config}
cvs server: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/salt/pkg/PLIST,v
diff -u -p -u -r1.63 PLIST
--- pkg/PLIST	24 Feb 2024 14:07:55 -0000	1.63
+++ pkg/PLIST	13 Mar 2024 10:06:55 -0000
@@ -239,21 +239,29 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}cmdmod.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}cp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}grains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}logmod.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}mine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}pillar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}publish.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}saltcheck.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}slsutil.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/cmdmod.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/config.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/cp.py
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/defaults.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/grains.py
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/logmod.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/mine.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/pillar.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/publish.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/saltcheck.py
+lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/slsutil.py
 lib/python${MODPY_VERSION}/site-packages/salt/client/ssh/wrapper/state.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/__init__.py
@@ -268,7 +276,6 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}aliyun.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}azurearm.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}clc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}cloudstack.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}digitalocean.${MODPY_PYC_MAGIC_TAG}pyc
@@ -281,7 +288,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}libvirt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}linode.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}lxc.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}msazure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}oneandone.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}opennebula.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}openstack.${MODPY_PYC_MAGIC_TAG}pyc
@@ -302,7 +308,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}vultrpy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/${MODPY_PYCACHE}xen.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/aliyun.py
-lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/azurearm.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/clc.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/cloudstack.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/digitalocean.py
@@ -315,7 +320,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/libvirt.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/linode.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/lxc.py
-lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/msazure.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/oneandone.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/opennebula.py
 lib/python${MODPY_VERSION}/site-packages/salt/cloud/clouds/openstack.py
@@ -476,176 +480,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/ext/ipaddress.py
 lib/python${MODPY_VERSION}/site-packages/salt/ext/saslprep.py
 lib/python${MODPY_VERSION}/site-packages/salt/ext/ssl_match_hostname.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}_locale_data.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}autoreload.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}concurrent.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}curl_httpclient.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}gen.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}http1connection.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}httpclient.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}httpserver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}httputil.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}ioloop.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}iostream.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}locale.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}locks.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}netutil.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}queues.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}routing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}simple_httpclient.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}stack_context.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}tcpclient.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}tcpserver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/${MODPY_PYCACHE}wsgi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/_locale_data.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/auth.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/autoreload.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/concurrent.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/curl_httpclient.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/escape.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/gen.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/http1connection.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/httpclient.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/httpserver.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/httputil.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/ioloop.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/iostream.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/locale.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/locks.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/log.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/netutil.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/options.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}auto.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}caresresolver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}epoll.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}kqueue.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}posix.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}select.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}twisted.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/asyncio.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/auto.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/caresresolver.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/common.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/epoll.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/interface.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/kqueue.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/posix.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/select.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/twisted.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/platform/windows.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/process.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/queues.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/routing.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/simple_httpclient.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/stack_context.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/tcpclient.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/tcpserver.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/template.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/__init__.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/__main__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}asyncio_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}auth_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}concurrent_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}curl_httpclient_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}escape_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}gen_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}http1connection_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}httpclient_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}httpserver_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}httputil_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}import_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}ioloop_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}iostream_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}locale_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}locks_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}log_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}netutil_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}options_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}process_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}queues_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}resolve_test_helper.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}routing_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}simple_httpclient_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}stack_context_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}tcpclient_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}tcpserver_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}template_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}testing_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}twisted_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}util_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}web_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}websocket_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}windows_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/${MODPY_PYCACHE}wsgi_test.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/asyncio_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/auth_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/concurrent_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/curl_httpclient_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/escape_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/gen_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/http1connection_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/httpclient_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/httpserver_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/httputil_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/import_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/ioloop_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/iostream_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/locale_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/locks_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/log_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/netutil_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/options_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/process_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/queues_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/resolve_test_helper.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/routing_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/runtests.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/simple_httpclient_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/stack_context_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/tcpclient_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/tcpserver_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/template_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/testing_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/twisted_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/util.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/util_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/web_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/websocket_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/windows_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/test/wsgi_test.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/testing.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/util.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/web.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/websocket.py
-lib/python${MODPY_VERSION}/site-packages/salt/ext/tornado/wsgi.py
 lib/python${MODPY_VERSION}/site-packages/salt/ext/vsan/
 lib/python${MODPY_VERSION}/site-packages/salt/ext/vsan/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/ext/vsan/${MODPY_PYCACHE}/
@@ -662,14 +496,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}azurefs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}gitfs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}hgfs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}minionfs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}roots.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}s3fs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/${MODPY_PYCACHE}svnfs.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/fileserver/azurefs.py
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/gitfs.py
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/hgfs.py
 lib/python${MODPY_VERSION}/site-packages/salt/fileserver/minionfs.py
@@ -695,13 +527,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}mdadm.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}mdata.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}metadata_azure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}metadata_gce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}minion_process.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}napalm.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}nvme.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}nxos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}opts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}package.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}panos.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}pending_reboot.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/grains/${MODPY_PYCACHE}philips_hue.${MODPY_PYC_MAGIC_TAG}pyc
@@ -724,13 +556,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/grains/mdadm.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/mdata.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/metadata.py
-lib/python${MODPY_VERSION}/site-packages/salt/grains/metadata_azure.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/metadata_gce.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/minion_process.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/napalm.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/nvme.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/nxos.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/opts.py
+lib/python${MODPY_VERSION}/site-packages/salt/grains/package.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/panos.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/pending_reboot.py
 lib/python${MODPY_VERSION}/site-packages/salt/grains/philips_hue.py
@@ -749,18 +581,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/loader/context.py
 lib/python${MODPY_VERSION}/site-packages/salt/loader/dunder.py
 lib/python${MODPY_VERSION}/site-packages/salt/loader/lazy.py
-lib/python${MODPY_VERSION}/site-packages/salt/log/
-lib/python${MODPY_VERSION}/site-packages/salt/log/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/log/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/log/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/log/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/log/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/log/handlers/
-lib/python${MODPY_VERSION}/site-packages/salt/log/handlers/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/log/handlers/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/salt/log/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/log/mixins.py
-lib/python${MODPY_VERSION}/site-packages/salt/log/setup.py
 lib/python${MODPY_VERSION}/site-packages/salt/log_handlers/
 lib/python${MODPY_VERSION}/site-packages/salt/log_handlers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/log_handlers/${MODPY_PYCACHE}/
@@ -843,10 +663,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}at_solaris.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}augeas_cfg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}aws_sqs.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}azurearm_compute.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}azurearm_dns.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}azurearm_network.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}azurearm_resource.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}bamboohr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}baredoc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}bcache.${MODPY_PYC_MAGIC_TAG}pyc
@@ -894,7 +710,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cabal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}capirca_acl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cassandra_cql.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}cassandra_mod.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}celery.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}ceph.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}chassis.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1295,6 +1110,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}vmctl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}vsphere.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}webutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}win_appx.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}win_auditpol.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}win_autoruns.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/modules/${MODPY_PYCACHE}win_certutil.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1374,10 +1190,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/modules/at_solaris.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/augeas_cfg.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/aws_sqs.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_compute.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_dns.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_network.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_resource.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/bamboohr.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/baredoc.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/bcache.py
@@ -1425,7 +1237,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/modules/cabal.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/capirca_acl.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/cassandra_cql.py
-lib/python${MODPY_VERSION}/site-packages/salt/modules/cassandra_mod.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/celery.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/ceph.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/chassis.py
@@ -1844,6 +1655,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/modules/vmctl.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/vsphere.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/webutil.py
+lib/python${MODPY_VERSION}/site-packages/salt/modules/win_appx.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/win_auditpol.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/win_autoruns.py
 lib/python${MODPY_VERSION}/site-packages/salt/modules/win_certutil.py
@@ -1980,7 +1792,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}azureblob.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}cmd_json.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}cmd_yaml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}cmd_yamlex.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2028,7 +1839,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}venafi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}virtkey.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/${MODPY_PYCACHE}vmware_pillar.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/pillar/azureblob.py
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/cmd_json.py
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/cmd_yaml.py
 lib/python${MODPY_VERSION}/site-packages/salt/pillar/cmd_yamlex.py
@@ -2195,10 +2005,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}appoptics_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}carbon_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}cassandra_cql_return.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}cassandra_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}couchbase_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}couchdb_return.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}django_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}elasticsearch_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}etcd_return.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/returners/${MODPY_PYCACHE}highstate_return.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2235,10 +2043,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/returners/appoptics_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/carbon_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/cassandra_cql_return.py
-lib/python${MODPY_VERSION}/site-packages/salt/returners/cassandra_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/couchbase_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/couchdb_return.py
-lib/python${MODPY_VERSION}/site-packages/salt/returners/django_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/elasticsearch_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/etcd_return.py
 lib/python${MODPY_VERSION}/site-packages/salt/returners/highstate_return.py
@@ -2323,6 +2129,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}launchd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}lxc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}manage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}match.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}mattermost.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}mine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/runners/${MODPY_PYCACHE}nacl.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2368,6 +2175,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/runners/launchd.py
 lib/python${MODPY_VERSION}/site-packages/salt/runners/lxc.py
 lib/python${MODPY_VERSION}/site-packages/salt/runners/manage.py
+lib/python${MODPY_VERSION}/site-packages/salt/runners/match.py
 lib/python${MODPY_VERSION}/site-packages/salt/runners/mattermost.py
 lib/python${MODPY_VERSION}/site-packages/salt/runners/mine.py
 lib/python${MODPY_VERSION}/site-packages/salt/runners/nacl.py
@@ -2483,10 +2291,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}at.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}augeas.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}aws_sqs.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}azurearm_compute.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}azurearm_dns.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}azurearm_network.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}azurearm_resource.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}beacon.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}bigip.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}blockdev.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2783,6 +2587,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}virt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}virtualenv_mod.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}webutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_appx.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_certutil.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_dacl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_dism.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2801,6 +2606,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_smtp_server.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_snmp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_task.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_wua.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}win_wusa.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/states/${MODPY_PYCACHE}winrepo.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2839,10 +2645,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/states/at.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/augeas.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/aws_sqs.py
-lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_compute.py
-lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_dns.py
-lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_network.py
-lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_resource.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/beacon.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/bigip.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/blockdev.py
@@ -3139,6 +2941,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/states/virt.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/virtualenv_mod.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/webutil.py
+lib/python${MODPY_VERSION}/site-packages/salt/states/win_appx.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_certutil.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_dacl.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_dism.py
@@ -3157,6 +2960,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_smtp_server.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_snmp.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_system.py
+lib/python${MODPY_VERSION}/site-packages/salt/states/win_task.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_wua.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/win_wusa.py
 lib/python${MODPY_VERSION}/site-packages/salt/states/winrepo.py
@@ -3280,6 +3084,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/transport/${MODPY_PYCACHE}local.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/transport/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/transport/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/transport/${MODPY_PYCACHE}ws.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/transport/${MODPY_PYCACHE}zeromq.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/transport/base.py
 lib/python${MODPY_VERSION}/site-packages/salt/transport/client.py
@@ -3288,6 +3093,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/transport/local.py
 lib/python${MODPY_VERSION}/site-packages/salt/transport/server.py
 lib/python${MODPY_VERSION}/site-packages/salt/transport/tcp.py
+lib/python${MODPY_VERSION}/site-packages/salt/transport/ws.py
 lib/python${MODPY_VERSION}/site-packages/salt/transport/zeromq.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/
 lib/python${MODPY_VERSION}/site-packages/salt/utils/__init__.py
@@ -3299,7 +3105,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}asynchronous.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}atomicfile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}azurearm.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}beacons.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}boto3mod.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}boto_elb_tag.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3363,7 +3168,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}minion.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}minions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}mount.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}msazure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}msgpack.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}nacl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}namecheap.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3374,6 +3178,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}nxos_api.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}odict.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}oset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}package.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}pagerduty.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3417,7 +3222,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}url.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}value.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}vault.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}verify.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}versions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}virt.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3436,6 +3240,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_network.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_osinfo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_pdh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_pwsh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_reg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_runas.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/${MODPY_PYCACHE}win_service.${MODPY_PYC_MAGIC_TAG}pyc
@@ -3460,7 +3265,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/asynchronous.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/atomicfile.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/aws.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/azurearm.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/beacons.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/boto3mod.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/boto_elb_tag.py
@@ -3482,9 +3286,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}extension_deprecation.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}jinja.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/extension_deprecation.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/jinja.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/path.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/decorators/state.py
@@ -3548,7 +3354,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/minion.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/minions.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/mount.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/msazure.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/msgpack.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/nacl.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/namecheap.py
@@ -3577,6 +3382,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/openstack/pyrax/queues.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/openstack/swift.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/oset.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/package.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/pagerduty.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/parsers.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/path.py
@@ -3640,7 +3446,28 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/validate/path.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/validate/user.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/value.py
-lib/python${MODPY_VERSION}/site-packages/salt/utils/vault.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}kv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/${MODPY_PYCACHE}leases.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/api.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/auth.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/cache.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/client.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/factory.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/helpers.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/kv.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/vault/leases.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/verify.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/versions.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/virt.py
@@ -3659,6 +3486,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/salt/utils/win_network.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/win_osinfo.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/win_pdh.py
+lib/python${MODPY_VERSION}/site-packages/salt/utils/win_pwsh.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/win_reg.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/win_runas.py
 lib/python${MODPY_VERSION}/site-packages/salt/utils/win_service.py
@@ -3710,6 +3538,8 @@ lib/python${MODPY_VERSION}/site-packages
 @man man/man7/salt.7
 share/examples/login.conf.d/salt_master
 @sample ${SYSCONFDIR}/login.conf.d/salt_master
+share/examples/login.conf.d/salt_minion
+@sample ${SYSCONFDIR}/login.conf.d/salt_minion
 share/examples/salt/
 @sample ${SYSCONFDIR}/salt/
 @owner _salt
Index: pkg/salt_minion.login
===================================================================
RCS file: pkg/salt_minion.login
diff -N pkg/salt_minion.login
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/salt_minion.login	13 Mar 2024 10:06:55 -0000
@@ -0,0 +1,4 @@
+salt_minion:\
+  :openfiles-cur=2048:\
+  :openfiles-max=8192:\
+	:tc=daemon: