sysutils/py-salt: Update to 3006.1

4 files changed, 5 insertions, 86 deletions

diff --git a/sysutils/py-salt/files/patch-disable-distutils-warn.patch b/sysutils/py-salt/files/patch-disable-distutils-warn.patch
deleted file mode 100644
index 72e8fb774d9a..000000000000
--- a/sysutils/py-salt/files/patch-disable-distutils-warn.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1b7fac1599a50c970fdef49abca7151cb11bdcd0 Mon Sep 17 00:00:00 2001
-From: Pedro Algarvio <palgarvio@vmware.com>
-Date: Tue, 11 Oct 2022 21:19:21 +0100
-Subject: [PATCH] Disable the setuptools user warning "Setuptools is replacing
- distutils."
-
-Once we stop relying on distutils, this filter can be removed.
-
-Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
----
- salt/__init__.py | 8 ++++++++
- setup.py         | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/salt/__init__.py b/salt/__init__.py
-index ebc54ac8443c..ec551abbc62a 100644
---- salt/__init__.py
-+++ salt/__init__.py
-@@ -69,6 +69,14 @@ def load_module(self, name):
-     append=True,
- )
- 
-+# Filter the setuptools UserWarning until we stop relying on distutils
-+warnings.filterwarnings(
-+    "ignore",
-+    message="Setuptools is replacing distutils.",
-+    category=UserWarning,
-+    module="_distutils_hack",
-+)
-+
- 
- def __define_global_system_encoding_variable__():
-     import sys
-diff --git a/setup.py b/setup.py
-index 0fac50ab4bc6..9d994ac8730c 100755
---- setup.py
-+++ setup.py
-@@ -4,6 +4,8 @@
- """
- 
- # pylint: disable=file-perms,resource-leakage
-+import setuptools  # isort:skip
-+
- import contextlib
- import distutils.dist
- import glob
-
diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt
deleted file mode 100644
index ca1de7a491be..000000000000
--- a/sysutils/py-salt/files/patch-requirements_base.txt
+++ /dev/null
@@ -1,7 +0,0 @@
---- requirements/base.txt.orig	2021-06-23 23:39:55.270387000 +0200
-+++ requirements/base.txt	2021-06-23 23:40:00.325729000 +0200
-@@ -4,4 +4,3 @@
- MarkupSafe
- requests>=1.0.0
- distro>=1.0.1
--contextvars
diff --git a/sysutils/py-salt/files/patch-salt_utils_entrypoints.py b/sysutils/py-salt/files/patch-salt_utils_entrypoints.py
deleted file mode 100644
index 6dcfa3725648..000000000000
--- a/sysutils/py-salt/files/patch-salt_utils_entrypoints.py
+++ /dev/null
@@ -1,27 +0,0 @@
---- salt/utils/entrypoints.py.orig	2022-09-26 21:22:01 UTC
-+++ salt/utils/entrypoints.py
-@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None):
-     entry_points_listing = []
-     entry_points = importlib_metadata.entry_points()
- 
--    for entry_point_group, entry_points_list in entry_points.items():
--        if entry_point_group != group:
--            continue
--        for entry_point in entry_points_list:
-+    try:
-+        for entry_point in entry_points.select(group=group):
-             if name is not None and entry_point.name != name:
-                 continue
-             entry_points_listing.append(entry_point)
-+    except AttributeError:
-+        # importlib-metadata<5.0.0
-+        for entry_point_group, entry_points_list in entry_points.items():
-+            if entry_point_group != group:
-+                continue
-+            for entry_point in entry_points_list:
-+                if name is not None and entry_point.name != name:
-+                    continue
-+                entry_points_listing.append(entry_point)
- 
-     return entry_points_listing
- 
diff --git a/sysutils/py-salt/files/patch-setup.py b/sysutils/py-salt/files/patch-setup.py
index 57f656f3b492..3c7447d42a75 100644
--- a/sysutils/py-salt/files/patch-setup.py
+++ b/sysutils/py-salt/files/patch-setup.py
@@ -1,13 +1,13 @@
---- setup.py.orig	2020-06-18 07:24:31 UTC
+--- setup.py.orig	2023-06-13 13:00:08 UTC
 +++ setup.py
-@@ -1119,8 +1119,8 @@ class SaltDistribution(distutils.dist.Distribution):
+@@ -951,8 +951,8 @@ class SaltDistribution(distutils.dist.Distribution):
      def _property_data_files(self):
          # Data files common to all scenarios
          data_files = [
--            ("share/man/man1", ["doc/man/salt-call.1", "doc/man/salt-run.1"]),
+-            ("share/man/man1", ["doc/man/salt-call.1"]),
 -            ("share/man/man7", ["doc/man/salt.7"]),
-+            ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),
-+            ('man/man7', ['doc/man/salt.7'])
++            ("man/man1", ["doc/man/salt-call.1"]),
++            ("man/man7", ["doc/man/salt.7"]),
          ]
          if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
              data_files[0][1].append("doc/man/salt-ssh.1")