Update to 3007.1

RPM packaging based on salt-3007.1-1.fc42.src.
Debian adjusted manually.

On Fedora 37 drop optional timelib dependency, as it isn't available
there.

Author: marmarek

0001-Drop-versioned-dependencies.patch

@@ -0,0 +1,57 @@
+From cdc4bc6fa37e3d5173b3cad3d0f2e2d9816f8eb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <[email protected]>
+Date: Sun, 15 Dec 2024 16:13:42 +0100
+Subject: [PATCH 1/2] Drop versioned dependencies
+
+Upstream bumps version requirements arbitrarily, in most cases without
+any specific API or functional requirement.
+Use package version available in the distribution instead.
+---
+ requirements/base.txt   | 12 ++++++------
+ requirements/zeromq.txt |  3 +--
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/requirements/base.txt b/requirements/base.txt
+index 0061087e35..a42ff50f7d 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -10,20 +10,20 @@ distro>=1.0.1
+ psutil>=5.0.0
+ packaging>=21.3
+ looseversion
+-tornado>=6.3.3
+-aiohttp>=3.9.0
++tornado
++aiohttp
+ 
+ # We need contextvars for salt-ssh.
+ # Even on python versions which ships with contextvars in the standard library!
+ 
+ setproctitle>=1.2.3
+-timelib>=0.2.5
+-pyopenssl>=24.0.0
++timelib
++pyopenssl
+ python-dateutil>=2.8.1
+ python-gnupg>=0.4.7
+ cherrypy>=18.6.1
+ importlib-metadata>=3.3.0
+-cryptography>=42.0.0
++cryptography
+ 
+ # From old requirements/static/pkg/linux.in
+ rpm-vercmp; sys_platform == 'linux'
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 4000f5eb01..ec03558d33 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,4 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq>=25.1.1
++pyzmq
+-- 
+2.46.0
+

0001-Drop-versioned-certifi-dependency.patch renamed to 0001-Drop-versioned-requests-dependency.patch

@@ -2,10 +2,9 @@ From 668a5a89109526e39540174b4a8a56574d0d09bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Thu, 15 Aug 2024 03:46:12 +0200
-Subject: [PATCH] Drop versioned certifi dependency
+Subject: [PATCH] Drop versioned requests dependency
 
 Let it pick the version from the distribution.
-Similarly for requests.
 ---
  requirements/base.txt | 2 --
  1 file changed, 2 deletions(-)
@@ -14,15 +13,12 @@ diff --git a/requirements/base.txt b/requirements/base.txt
 index de9cbaab17..bce14bc510 100644
 --- a/requirements/base.txt
 +++ b/requirements/base.txt
-@@ -7,10 +7,7 @@ PyYAML
+@@ -7,7 +7,7 @@ PyYAML
  msgpack>=1.0.0
  PyYAML
  MarkupSafe
--requests<2.32.0 ; python_version < '3.10'
--requests>=2.32.3 ; python_version >= '3.10'
+-requests>=2.25.1
 +requests
--certifi==2023.07.22; python_version < '3.10'
--certifi>=2024.7.4; python_version >= '3.10'
  distro>=1.0.1
  psutil>=5.0.0
  packaging>=21.3

0002-Drop-Windows-dependencies.patch

@@ -0,0 +1,31 @@
+From a861b8c1b6a9f9062c42c902614800548838fe04 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <[email protected]>
+Date: Sun, 15 Dec 2024 16:15:47 +0100
+Subject: [PATCH 2/2] Drop Windows dependencies
+
+---
+ requirements/base.txt | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/requirements/base.txt b/requirements/base.txt
+index a42ff50f7d..73f058c5ff 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -33,13 +33,3 @@ cryptography
+ 
+ # From old requirements/static/pkg/linux.in
+ rpm-vercmp; sys_platform == 'linux'
+-
+-# From old windows.txt requirements file
+-gitpython>=3.1.37; sys_platform == 'win32'
+-lxml>=4.6.3; sys_platform == 'win32'
+-pymssql>=2.2.1; sys_platform == 'win32'
+-pymysql>=1.0.2; sys_platform == 'win32'
+-pythonnet>=3.0.1; sys_platform == 'win32'
+-pywin32>=305; sys_platform == 'win32'
+-wmi>=1.5.1; sys_platform == 'win32'
+-xmltodict>=0.13.0; sys_platform == 'win32'
+-- 
+2.46.0
+

contextvars.patch

@@ -1,15 +1,22 @@
---- salt-3006.1/requirements/base.txt~	2023-05-05 12:53:34.000000000 -0500
-+++ salt-3006.1/requirements/base.txt	2023-05-24 09:59:08.874838801 -0500
-@@ -9,4 +9,3 @@
- looseversion
- croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
- # We need contextvars for salt-ssh
+Index: salt-3007.1/requirements/base.txt
+===================================================================
+--- salt-3007.1.orig/requirements/base.txt	2024-11-06 20:25:51.898374912 +0100
++++ salt-3007.1/requirements/base.txt	2024-11-06 20:26:23.586354279 +0100
+@@ -15,7 +15,6 @@ aiohttp>=3.9.0
+ 
+ # We need contextvars for salt-ssh.
+ # Even on python versions which ships with contextvars in the standard library!
 -contextvars
---- salt-3006.1/requirements/zeromq.txt~	2023-05-05 12:53:34.000000000 -0500
-+++ salt-3006.1/requirements/zeromq.txt	2023-05-24 10:02:57.943989348 -0500
-@@ -2,5 +2,3 @@
+ 
+ setproctitle>=1.2.3
+ timelib>=0.2.5
+Index: salt-3007.1/requirements/zeromq.txt
+===================================================================
+--- salt-3007.1.orig/requirements/zeromq.txt	2024-11-06 20:25:51.899374912 +0100
++++ salt-3007.1/requirements/zeromq.txt	2024-11-06 20:27:44.898301325 +0100
+@@ -1,4 +1,4 @@
+ -r base.txt
  -r crypto.txt
 
- pyzmq>=20.0.0
--pyzmq==25.0.2 ; sys_platform == "win32"
--pyzmq==25.1.2 ; sys_platform == "darwin"
+-pyzmq>=25.1.2
++pyzmq>=25.1.1

debian-pkg/debian/control

@@ -65,6 +65,7 @@ Build-Depends: bash-completion,
                python3-sphinxcontrib.httpdomain,
                python3-sphinxcontrib.spelling,
                python3-toml,
+               python3-tornado,
                python3-requests (>= 1.0.0),
                python3-setuptools,
                python3-six,
@@ -91,6 +92,7 @@ Depends: iproute2,
          python3-pkg-resources,
          python3-psutil,
          python3-requests (>= 1.0.0),
+         python3-tornado,
          python3-yaml,
          ${misc:Depends},
          ${python3:Depends}

debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch

@@ -0,0 +1,58 @@
+From cdc4bc6fa37e3d5173b3cad3d0f2e2d9816f8eb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <[email protected]>
+Date: Sun, 15 Dec 2024 16:13:42 +0100
+Subject: [PATCH 1/2] Drop versioned dependencies
+
+Upstream bumps version requirements arbitrarily, in most cases without
+any specific API or functional requirement.
+Use package version available in the distribution instead.
+---
+ requirements/base.txt   | 12 ++++++------
+ requirements/zeromq.txt |  3 +--
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/requirements/base.txt b/requirements/base.txt
+index 0061087e35..a42ff50f7d 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -10,21 +10,21 @@ distro>=1.0.1
+ psutil>=5.0.0
+ packaging>=21.3
+ looseversion
+-tornado>=6.3.3
+-aiohttp>=3.9.0
++tornado
++aiohttp
+ 
+ # We need contextvars for salt-ssh.
+ # Even on python versions which ships with contextvars in the standard library!
+ contextvars
+ 
+ setproctitle>=1.2.3
+-timelib>=0.2.5
+-pyopenssl>=24.0.0
++timelib
++pyopenssl
+ python-dateutil>=2.8.1
+ python-gnupg>=0.4.7
+ cherrypy>=18.6.1
+ importlib-metadata>=3.3.0
+-cryptography>=42.0.0
++cryptography
+ 
+ # From old requirements/static/pkg/linux.in
+ rpm-vercmp; sys_platform == 'linux'
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 4000f5eb01..ec03558d33 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,4 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq>=25.1.2
++pyzmq
+-- 
+2.46.0
+

debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch

@@ -0,0 +1,31 @@
+From a861b8c1b6a9f9062c42c902614800548838fe04 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <[email protected]>
+Date: Sun, 15 Dec 2024 16:15:47 +0100
+Subject: [PATCH 2/2] Drop Windows dependencies
+
+---
+ requirements/base.txt | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/requirements/base.txt b/requirements/base.txt
+index a42ff50f7d..73f058c5ff 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -33,13 +33,3 @@ cryptography
+ 
+ # From old requirements/static/pkg/linux.in
+ rpm-vercmp; sys_platform == 'linux'
+-
+-# From old windows.txt requirements file
+-gitpython>=3.1.37; sys_platform == 'win32'
+-lxml>=4.6.3; sys_platform == 'win32'
+-pymssql>=2.2.1; sys_platform == 'win32'
+-pymysql>=1.0.2; sys_platform == 'win32'
+-pythonnet>=3.0.1; sys_platform == 'win32'
+-pywin32>=305; sys_platform == 'win32'
+-wmi>=1.5.1; sys_platform == 'win32'
+-xmltodict>=0.13.0; sys_platform == 'win32'
+-- 
+2.46.0
+

debian-pkg/debian/patches/doc-Exclude-documentation_options.js-from-default-th.patch

@@ -1,5 +1,4 @@
 Make-the-Salt-Proxy-environment-aware.patch
-doc-Exclude-documentation_options.js-from-default-th.patch
 remove-privacy-breach.patch
 #run-salt-master-as-salt-user.patch
 doc-fix-logo-link.patch
@@ -8,4 +7,5 @@ ensure-searchtools.js-gets-included.patch
 dpkg_lowpkg-Do-not-access-var-lib-dpkg-info-package-.patch
 dpkg_lowpkg-Drop-reading-var-lib-dpkg-available-dire.patch
 0002-Hide-known-DeprecationWarning-related-to-PEP-594.patch
-match_hostname.patch
+0001-Drop-versioned-dependencies.patch
+0002-Drop-Windows-dependencies.patch