diff --git a/0001-Drop-versioned-dependencies.patch b/0001-Drop-versioned-dependencies.patch index fd1d7f6..59e5bb4 100644 --- a/0001-Drop-versioned-dependencies.patch +++ b/0001-Drop-versioned-dependencies.patch @@ -7,8 +7,6 @@ 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. - -And also cryptography was twice. --- requirements/base.txt | 12 ++++++------ requirements/zeromq.txt | 3 +-- @@ -18,81 +16,70 @@ diff --git a/requirements/base.txt b/requirements/base.txt index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -1,35 +1,33 @@ - --constraint=constraints.txt - --Jinja2>=3.1.5 -+Jinja2 - jmespath - msgpack>=1.0.0 - PyYAML - MarkupSafe --requests<2.32.0 ; python_version < '3.10' --requests>=2.32.3 ; python_version >= '3.10' -+requests +@@ -3,23 +3,21 @@ + # Dependencies are listed alphabetically by package name. + # Multiple entries for the same package (with different version constraints) are grouped together. + +-aiohttp>=3.13.3 -certifi==2023.07.22; python_version < '3.10' -certifi>=2024.7.4; python_version >= '3.10' ++aiohttp +certifi + cffi>=2.0.0 + # cheroot 8.5.2 fails to build with modern setuptools due to setuptools_scm_git_archive dependency + cheroot>=10.0.1 + cherrypy>=18.6.1 + croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' +-cryptography>=42.0.0,<43.0.0 ++cryptography distro>=1.0.1 - psutil<6.0.0; python_version <= '3.9' - psutil>=5.0.0; python_version >= '3.10' +-frozenlist>=1.3.0; python_version < '3.11' +-frozenlist>=1.5.0; python_version >= '3.11' ++frozenlist + gitpython>=3.1.37; sys_platform == 'win32' + importlib-metadata>=8.7.0 +-jaraco.functools>=4.1.0 +-jaraco.text>=4.0.0 +-Jinja2>=3.1.5 ++jaraco.functools ++jaraco.text ++Jinja2 + jmespath + looseversion + lxml>=4.6.3; sys_platform == 'win32' +@@ -27,26 +25,23 @@ + msgpack>=1.0.0 # Packaging 24.1 imports annotations from __future__ which breaks salt ssh # tests on target hosts with older python versions. -packaging==24.0 +packaging>=21.3 - looseversion --tornado>=6.4.1 --aiohttp>=3.10.2 -+tornado -+aiohttp - - croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - - setproctitle>=1.2.3 --timelib>=0.2.5 + psutil<6.0.0; python_version <= '3.9' + psutil>=5.0.0; python_version >= '3.10' + pymssql>=2.2.11; sys_platform == 'win32' + pymysql>=1.0.2; sys_platform == 'win32' -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 --zipp>=3.19.1 --cryptography>=42.0.0 -+zipp -+cryptography - - # From old windows.txt requirements file - gitpython>=3.1.37; sys_platform == 'win32' -@@ -44,14 +43,9 @@ - - # We need contextvars for salt-ssh - --cryptography>=42.0.0 -+urllib3 - --urllib3>=1.26.20,<2.0.0; python_version < '3.10' --urllib3>=2.5.0; python_version >= '3.10' -- --jaraco.text>=4.0.0 --jaraco.functools>=4.1.0 -+jaraco.text -+jaraco.functools + pythonnet>=3.0.1; sys_platform == 'win32' + pywin32>=305; sys_platform == 'win32' + PyYAML +-requests<2.32.0 ; python_version < '3.10' +-requests>=2.32.5 ; python_version >= '3.10' ++requests + setproctitle>=1.2.3 -timelib>=0.2.5; python_version < '3.11' -timelib>=0.3.0; python_version >= '3.11' --frozenlist>=1.3.0; python_version < '3.11' --frozenlist>=1.5.0; python_version >= '3.11' +-tornado>=6.5.4 +-urllib3>=1.26.20,<2.0.0; python_version < '3.10' +-urllib3>=2.6.3; python_version >= '3.10' +timelib -+frozenlist -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 ++tornado ++urllib3 + virtualenv + wmi>=1.5.1; sys_platform == 'win32' + xmltodict>=0.13.0; sys_platform == 'win32' +-zipp>=3.19.1 ++zipp -- 2.46.0 diff --git a/0002-Drop-Windows-dependencies.patch b/0002-Drop-Windows-dependencies.patch index 2234e0c..6b1cc7b 100644 --- a/0002-Drop-Windows-dependencies.patch +++ b/0002-Drop-Windows-dependencies.patch @@ -12,24 +12,46 @@ diff --git a/requirements/base.txt b/requirements/base.txt index a42ff50f7d..73f058c5ff 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -33,17 +33,6 @@ cryptography - importlib-metadata>=3.3.0 - zipp +@@ -9,18 +9,15 @@ + # cheroot 8.5.2 fails to build with modern setuptools due to setuptools_scm_git_archive dependency + cheroot>=10.0.1 + cherrypy>=18.6.1 +-croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' cryptography -- --# From old windows.txt requirements file + distro>=1.0.1 + frozenlist -gitpython>=3.1.37; sys_platform == 'win32' + importlib-metadata>=8.7.0 + jaraco.functools + jaraco.text + Jinja2 + jmespath + looseversion -lxml>=4.6.3; sys_platform == 'win32' + MarkupSafe<3.0.0 + msgpack>=1.0.0 + # Packaging 24.1 imports annotations from __future__ which breaks salt ssh +@@ -28,13 +25,9 @@ + packaging>=21.3 + psutil<6.0.0; python_version <= '3.9' + psutil>=5.0.0; python_version >= '3.10' -pymssql>=2.2.11; sys_platform == 'win32' -pymysql>=1.0.2; sys_platform == 'win32' + pyopenssl + python-dateutil>=2.8.1 + python-gnupg>=0.4.7 -pythonnet>=3.0.1; sys_platform == 'win32' -pywin32>=305; sys_platform == 'win32' + PyYAML + requests + setproctitle>=1.2.3 +@@ -42,6 +35,4 @@ + tornado + urllib3 + virtualenv -wmi>=1.5.1; sys_platform == 'win32' -xmltodict>=0.13.0; sys_platform == 'win32' --croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - - # We need contextvars for salt-ssh - + zipp -- 2.46.0 diff --git a/contextvars.patch b/contextvars.patch index 9f42346..4f9150b 100644 --- a/contextvars.patch +++ b/contextvars.patch @@ -2,15 +2,20 @@ 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 -@@ -45,11 +45,7 @@ aiohttp>=3.9.0 - croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - - # We need contextvars for salt-ssh +@@ -10,16 +10,12 @@ + # cheroot 8.5.2 fails to build with modern setuptools due to setuptools_scm_git_archive dependency + cheroot>=10.0.1 + cherrypy>=18.6.1 +-# We need contextvars for salt-ssh -contextvars - + croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' + cryptography>=42.0.0,<43.0.0 + distro>=1.0.1 + frozenlist>=1.3.0; python_version < '3.11' + frozenlist>=1.5.0; python_version >= '3.11' + gitpython>=3.1.37; sys_platform == 'win32' -# immutables is a requirement of contextvars --immutables==0.15 ; sys_platform == 'linux' --immutables>=0.21 ; sys_platform != 'linux' - cryptography>=42.0.0 - - urllib3>=1.26.20,<2.0.0; python_version < '3.10' +-immutables>=0.21 + importlib-metadata>=8.7.0 + jaraco.functools>=4.1.0 + jaraco.text>=4.0.0 diff --git a/debian-pkg/debian/changelog b/debian-pkg/debian/changelog index a5cdbcc..12a272d 100644 --- a/debian-pkg/debian/changelog +++ b/debian-pkg/debian/changelog @@ -1,3 +1,15 @@ +salt (3007.13-1) unstable; urgency=medium + + * + + -- Marek Marczykowski-Górecki Wed, 18 Feb 2026 04:50:32 +0100 + +salt (3007.10-1) unstable; urgency=medium + + * Update patches and packaging for 3007.10 + + -- Marek Marczykowski-Górecki Sun, 04 Jan 2026 05:21:04 +0100 + salt (3007.8-1) unstable; urgency=medium * rpm: disable automatic dependencies diff --git a/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch b/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch index fd1d7f6..59e5bb4 100644 --- a/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch +++ b/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch @@ -7,8 +7,6 @@ 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. - -And also cryptography was twice. --- requirements/base.txt | 12 ++++++------ requirements/zeromq.txt | 3 +-- @@ -18,81 +16,70 @@ diff --git a/requirements/base.txt b/requirements/base.txt index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -1,35 +1,33 @@ - --constraint=constraints.txt - --Jinja2>=3.1.5 -+Jinja2 - jmespath - msgpack>=1.0.0 - PyYAML - MarkupSafe --requests<2.32.0 ; python_version < '3.10' --requests>=2.32.3 ; python_version >= '3.10' -+requests +@@ -3,23 +3,21 @@ + # Dependencies are listed alphabetically by package name. + # Multiple entries for the same package (with different version constraints) are grouped together. + +-aiohttp>=3.13.3 -certifi==2023.07.22; python_version < '3.10' -certifi>=2024.7.4; python_version >= '3.10' ++aiohttp +certifi + cffi>=2.0.0 + # cheroot 8.5.2 fails to build with modern setuptools due to setuptools_scm_git_archive dependency + cheroot>=10.0.1 + cherrypy>=18.6.1 + croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' +-cryptography>=42.0.0,<43.0.0 ++cryptography distro>=1.0.1 - psutil<6.0.0; python_version <= '3.9' - psutil>=5.0.0; python_version >= '3.10' +-frozenlist>=1.3.0; python_version < '3.11' +-frozenlist>=1.5.0; python_version >= '3.11' ++frozenlist + gitpython>=3.1.37; sys_platform == 'win32' + importlib-metadata>=8.7.0 +-jaraco.functools>=4.1.0 +-jaraco.text>=4.0.0 +-Jinja2>=3.1.5 ++jaraco.functools ++jaraco.text ++Jinja2 + jmespath + looseversion + lxml>=4.6.3; sys_platform == 'win32' +@@ -27,26 +25,23 @@ + msgpack>=1.0.0 # Packaging 24.1 imports annotations from __future__ which breaks salt ssh # tests on target hosts with older python versions. -packaging==24.0 +packaging>=21.3 - looseversion --tornado>=6.4.1 --aiohttp>=3.10.2 -+tornado -+aiohttp - - croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - - setproctitle>=1.2.3 --timelib>=0.2.5 + psutil<6.0.0; python_version <= '3.9' + psutil>=5.0.0; python_version >= '3.10' + pymssql>=2.2.11; sys_platform == 'win32' + pymysql>=1.0.2; sys_platform == 'win32' -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 --zipp>=3.19.1 --cryptography>=42.0.0 -+zipp -+cryptography - - # From old windows.txt requirements file - gitpython>=3.1.37; sys_platform == 'win32' -@@ -44,14 +43,9 @@ - - # We need contextvars for salt-ssh - --cryptography>=42.0.0 -+urllib3 - --urllib3>=1.26.20,<2.0.0; python_version < '3.10' --urllib3>=2.5.0; python_version >= '3.10' -- --jaraco.text>=4.0.0 --jaraco.functools>=4.1.0 -+jaraco.text -+jaraco.functools + pythonnet>=3.0.1; sys_platform == 'win32' + pywin32>=305; sys_platform == 'win32' + PyYAML +-requests<2.32.0 ; python_version < '3.10' +-requests>=2.32.5 ; python_version >= '3.10' ++requests + setproctitle>=1.2.3 -timelib>=0.2.5; python_version < '3.11' -timelib>=0.3.0; python_version >= '3.11' --frozenlist>=1.3.0; python_version < '3.11' --frozenlist>=1.5.0; python_version >= '3.11' +-tornado>=6.5.4 +-urllib3>=1.26.20,<2.0.0; python_version < '3.10' +-urllib3>=2.6.3; python_version >= '3.10' +timelib -+frozenlist -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 ++tornado ++urllib3 + virtualenv + wmi>=1.5.1; sys_platform == 'win32' + xmltodict>=0.13.0; sys_platform == 'win32' +-zipp>=3.19.1 ++zipp -- 2.46.0 diff --git a/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch b/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch index 2234e0c..6b1cc7b 100644 --- a/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch +++ b/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch @@ -12,24 +12,46 @@ diff --git a/requirements/base.txt b/requirements/base.txt index a42ff50f7d..73f058c5ff 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -33,17 +33,6 @@ cryptography - importlib-metadata>=3.3.0 - zipp +@@ -9,18 +9,15 @@ + # cheroot 8.5.2 fails to build with modern setuptools due to setuptools_scm_git_archive dependency + cheroot>=10.0.1 + cherrypy>=18.6.1 +-croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' cryptography -- --# From old windows.txt requirements file + distro>=1.0.1 + frozenlist -gitpython>=3.1.37; sys_platform == 'win32' + importlib-metadata>=8.7.0 + jaraco.functools + jaraco.text + Jinja2 + jmespath + looseversion -lxml>=4.6.3; sys_platform == 'win32' + MarkupSafe<3.0.0 + msgpack>=1.0.0 + # Packaging 24.1 imports annotations from __future__ which breaks salt ssh +@@ -28,13 +25,9 @@ + packaging>=21.3 + psutil<6.0.0; python_version <= '3.9' + psutil>=5.0.0; python_version >= '3.10' -pymssql>=2.2.11; sys_platform == 'win32' -pymysql>=1.0.2; sys_platform == 'win32' + pyopenssl + python-dateutil>=2.8.1 + python-gnupg>=0.4.7 -pythonnet>=3.0.1; sys_platform == 'win32' -pywin32>=305; sys_platform == 'win32' + PyYAML + requests + setproctitle>=1.2.3 +@@ -42,6 +35,4 @@ + tornado + urllib3 + virtualenv -wmi>=1.5.1; sys_platform == 'win32' -xmltodict>=0.13.0; sys_platform == 'win32' --croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - - # We need contextvars for salt-ssh - + zipp -- 2.46.0 diff --git a/debian-pkg/debian/patches/contextvars.patch b/debian-pkg/debian/patches/contextvars.patch index 9f42346..4f9150b 100644 --- a/debian-pkg/debian/patches/contextvars.patch +++ b/debian-pkg/debian/patches/contextvars.patch @@ -2,15 +2,20 @@ 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 -@@ -45,11 +45,7 @@ aiohttp>=3.9.0 - croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - - # We need contextvars for salt-ssh +@@ -10,16 +10,12 @@ + # cheroot 8.5.2 fails to build with modern setuptools due to setuptools_scm_git_archive dependency + cheroot>=10.0.1 + cherrypy>=18.6.1 +-# We need contextvars for salt-ssh -contextvars - + croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' + cryptography>=42.0.0,<43.0.0 + distro>=1.0.1 + frozenlist>=1.3.0; python_version < '3.11' + frozenlist>=1.5.0; python_version >= '3.11' + gitpython>=3.1.37; sys_platform == 'win32' -# immutables is a requirement of contextvars --immutables==0.15 ; sys_platform == 'linux' --immutables>=0.21 ; sys_platform != 'linux' - cryptography>=42.0.0 - - urllib3>=1.26.20,<2.0.0; python_version < '3.10' +-immutables>=0.21 + importlib-metadata>=8.7.0 + jaraco.functools>=4.1.0 + jaraco.text>=4.0.0 diff --git a/debian-pkg/debian/patches/rpmvercmp.patch b/debian-pkg/debian/patches/rpmvercmp.patch index c930ad7..20a94b0 100644 --- a/debian-pkg/debian/patches/rpmvercmp.patch +++ b/debian-pkg/debian/patches/rpmvercmp.patch @@ -10,15 +10,13 @@ diff --git a/requirements/base.txt b/requirements/base.txt index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -28,9 +28,6 @@ - importlib-metadata>=3.3.0 - zipp>=3.19.1 - cryptography>=42.0.0 -- --# From old requirements/static/pkg/linux.in +@@ -40,7 +40,6 @@ + PyYAML + requests<2.32.0 ; python_version < '3.10' + requests>=2.32.5 ; python_version >= '3.10' -rpm-vercmp; sys_platform == 'linux' - - # From old windows.txt requirements file - gitpython>=3.1.37; sys_platform == 'win32' + setproctitle>=1.2.3 + timelib>=0.2.5; python_version < '3.11' + timelib>=0.3.0; python_version >= '3.11' -- 2.46.0 diff --git a/debian-pkg/debian/salt-doc.manpages b/debian-pkg/debian/salt-doc.manpages index ce2ea17..e69de29 100644 --- a/debian-pkg/debian/salt-doc.manpages +++ b/debian-pkg/debian/salt-doc.manpages @@ -1 +0,0 @@ -doc/man/salt.7 diff --git a/rpmvercmp.patch b/rpmvercmp.patch index c930ad7..20a94b0 100644 --- a/rpmvercmp.patch +++ b/rpmvercmp.patch @@ -10,15 +10,13 @@ diff --git a/requirements/base.txt b/requirements/base.txt index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -28,9 +28,6 @@ - importlib-metadata>=3.3.0 - zipp>=3.19.1 - cryptography>=42.0.0 -- --# From old requirements/static/pkg/linux.in +@@ -40,7 +40,6 @@ + PyYAML + requests<2.32.0 ; python_version < '3.10' + requests>=2.32.5 ; python_version >= '3.10' -rpm-vercmp; sys_platform == 'linux' - - # From old windows.txt requirements file - gitpython>=3.1.37; sys_platform == 'win32' + setproctitle>=1.2.3 + timelib>=0.2.5; python_version < '3.11' + timelib>=0.3.0; python_version >= '3.11' -- 2.46.0 diff --git a/salt-3007.13.tar.gz.sha512 b/salt-3007.13.tar.gz.sha512 new file mode 100644 index 0000000..84cc570 --- /dev/null +++ b/salt-3007.13.tar.gz.sha512 @@ -0,0 +1 @@ +db2215429d513f9cf73875c73b7b9d08600f7e978ede1d05979f88c5d0809775ebc8740c6c1c1670e87533cf7466c13bbd3485825d86f3f2e3c672cdb4a26f02 diff --git a/salt-3007.8.tar.gz.sha512 b/salt-3007.8.tar.gz.sha512 deleted file mode 100644 index 3a7954d..0000000 --- a/salt-3007.8.tar.gz.sha512 +++ /dev/null @@ -1 +0,0 @@ -91e9ea7b7a7965bbed80d73943a6c0d36dcfa1c272b9b60c1eeca8fc1922db0de899164115de0af3d4a127830a53fdc5483a4bb1d31e9fd36d73afe2d81facf6 diff --git a/salt.spec.in b/salt.spec.in index 1c0d374..fd7bd25 100644 --- a/salt.spec.in +++ b/salt.spec.in @@ -295,7 +295,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/gpgkeys %{_bindir}/salt-pip %files master -%doc %{_mandir}/man7/%{name}.7* %doc %{_mandir}/man1/%{name}.1* %doc %{_mandir}/man1/%{name}-cp.1* %doc %{_mandir}/man1/%{name}-key.1* diff --git a/version b/version index d94ab2c..cd78f34 100644 --- a/version +++ b/version @@ -1 +1 @@ -3007.8 +3007.13