diff --git a/.qubesbuilder b/.qubesbuilder index 06cae79..de4c99d 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -14,6 +14,14 @@ vm-fc41: rpm: build: - salt.spec +vm-fc42: + rpm: + build: + - salt.spec +vm-fc43: + rpm: + build: + - salt.spec vm-bookworm: deb: build: diff --git a/0001-Drop-versioned-dependencies.patch b/0001-Drop-versioned-dependencies.patch index d795e3b..fd1d7f6 100644 --- a/0001-Drop-versioned-dependencies.patch +++ b/0001-Drop-versioned-dependencies.patch @@ -18,7 +18,7 @@ diff --git a/requirements/base.txt b/requirements/base.txt index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -1,34 +1,32 @@ +@@ -1,35 +1,33 @@ --constraint=constraints.txt -Jinja2>=3.1.5 @@ -42,7 +42,7 @@ index 0061087e35..a42ff50f7d 100644 +packaging>=21.3 looseversion -tornado>=6.4.1 --aiohttp>=3.9.0 +-aiohttp>=3.10.2 +tornado +aiohttp @@ -57,12 +57,14 @@ index 0061087e35..a42ff50f7d 100644 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,10 +43,7 @@ +@@ -44,14 +43,9 @@ # We need contextvars for salt-ssh @@ -76,6 +78,12 @@ index 0061087e35..a42ff50f7d 100644 -jaraco.functools>=4.1.0 +jaraco.text +jaraco.functools +-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' ++timelib ++frozenlist diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt index 4000f5eb01..ec03558d33 100644 --- a/requirements/zeromq.txt diff --git a/0001-Prepare-salt.utils.process-for-python-3.14.patch b/0001-Prepare-salt.utils.process-for-python-3.14.patch new file mode 100644 index 0000000..c373a2a --- /dev/null +++ b/0001-Prepare-salt.utils.process-for-python-3.14.patch @@ -0,0 +1,35 @@ +From ae4d59aab65f4070422909b63ada813e8d9ac273 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= + +Date: Sun, 14 Sep 2025 04:08:44 +0200 +Subject: [PATCH] Prepare salt.utils.process for python 3.14 + +Python 3.14 changed multiprocessing method from 'fork' to 'forkserver' +on Linux too: +https://github.com/python/cpython/issues/84559 + +This leads to issue similar to when Python 3.8 changed it on Mac OS: +https://github.com/saltstack/salt/issues/57742 + +Change the condition to check for != 'fork' instead of == 'spawn'. +--- + changelog/68148.changed.md | 1 + + salt/utils/process.py | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/salt/utils/process.py b/salt/utils/process.py +index eeac663c03a..fcc93147dbd 100644 +--- a/salt/utils/process.py ++++ b/salt/utils/process.py +@@ -897,7 +897,7 @@ class Process(multiprocessing.Process): + instance._finalize_methods = [] + instance.__logging_config__ = salt._logging.get_logging_options_dict() + +- if salt.utils.platform.spawning_platform(): ++ if multiprocessing.get_start_method() != "fork": + # On spawning platforms, subclasses should call super if they define + # __setstate__ and/or __getstate__ + instance._args_for_getstate = copy.copy(args) +-- +2.51.0 + diff --git a/0002-Drop-Windows-dependencies.patch b/0002-Drop-Windows-dependencies.patch index 74ad9af..2234e0c 100644 --- a/0002-Drop-Windows-dependencies.patch +++ b/0002-Drop-Windows-dependencies.patch @@ -13,8 +13,8 @@ index a42ff50f7d..73f058c5ff 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -33,17 +33,6 @@ cryptography - cherrypy>=18.6.1 importlib-metadata>=3.3.0 + zipp cryptography - -# From old windows.txt requirements file diff --git a/contextvars.patch b/contextvars.patch index 45175ec..9f42346 100644 --- a/contextvars.patch +++ b/contextvars.patch @@ -2,11 +2,15 @@ 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,7 +45,6 @@ aiohttp>=3.9.0 +@@ -45,11 +45,7 @@ aiohttp>=3.9.0 croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' # We need contextvars for salt-ssh -contextvars +-# 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' diff --git a/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch b/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch index 6ed1cf3..fd1d7f6 100644 --- a/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch +++ b/debian-pkg/debian/patches/0001-Drop-versioned-dependencies.patch @@ -18,7 +18,13 @@ diff --git a/requirements/base.txt b/requirements/base.txt index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt -@@ -7,29 +7,27 @@ +@@ -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' @@ -36,7 +42,7 @@ index 0061087e35..a42ff50f7d 100644 +packaging>=21.3 looseversion -tornado>=6.4.1 --aiohttp>=3.9.0 +-aiohttp>=3.10.2 +tornado +aiohttp @@ -51,12 +57,14 @@ index 0061087e35..a42ff50f7d 100644 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,10 +43,7 @@ +@@ -44,14 +43,9 @@ # We need contextvars for salt-ssh @@ -70,6 +78,12 @@ index 0061087e35..a42ff50f7d 100644 -jaraco.functools>=4.1.0 +jaraco.text +jaraco.functools +-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' ++timelib ++frozenlist diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt index 4000f5eb01..ec03558d33 100644 --- a/requirements/zeromq.txt diff --git a/debian-pkg/debian/patches/0001-Use-timezone-aware-datetime-objects-for-UTC-too.patch b/debian-pkg/debian/patches/0001-Use-timezone-aware-datetime-objects-for-UTC-too.patch index ceb56dd..a43a1c4 100644 --- a/debian-pkg/debian/patches/0001-Use-timezone-aware-datetime-objects-for-UTC-too.patch +++ b/debian-pkg/debian/patches/0001-Use-timezone-aware-datetime-objects-for-UTC-too.patch @@ -144,4 +144,3 @@ index 7574a068e8..d8f7d20b06 100644 else: -- 2.45.2 - diff --git a/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch b/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch index 74ad9af..2234e0c 100644 --- a/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch +++ b/debian-pkg/debian/patches/0002-Drop-Windows-dependencies.patch @@ -13,8 +13,8 @@ index a42ff50f7d..73f058c5ff 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -33,17 +33,6 @@ cryptography - cherrypy>=18.6.1 importlib-metadata>=3.3.0 + zipp cryptography - -# From old windows.txt requirements file diff --git a/debian-pkg/debian/patches/contextvars.patch b/debian-pkg/debian/patches/contextvars.patch index 45175ec..9f42346 100644 --- a/debian-pkg/debian/patches/contextvars.patch +++ b/debian-pkg/debian/patches/contextvars.patch @@ -2,11 +2,15 @@ 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,7 +45,6 @@ aiohttp>=3.9.0 +@@ -45,11 +45,7 @@ aiohttp>=3.9.0 croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' # We need contextvars for salt-ssh -contextvars +-# 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' diff --git a/debian-pkg/debian/patches/rpmvercmp.patch b/debian-pkg/debian/patches/rpmvercmp.patch index a872b77..c930ad7 100644 --- a/debian-pkg/debian/patches/rpmvercmp.patch +++ b/debian-pkg/debian/patches/rpmvercmp.patch @@ -11,8 +11,8 @@ index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -28,9 +28,6 @@ - cherrypy>=18.6.1 importlib-metadata>=3.3.0 + zipp>=3.19.1 cryptography>=42.0.0 - -# From old requirements/static/pkg/linux.in diff --git a/rel b/rel index 0cfbf08..d00491f 100644 --- a/rel +++ b/rel @@ -1 +1 @@ -2 +1 diff --git a/rpmvercmp.patch b/rpmvercmp.patch index a872b77..c930ad7 100644 --- a/rpmvercmp.patch +++ b/rpmvercmp.patch @@ -11,8 +11,8 @@ index 0061087e35..a42ff50f7d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -28,9 +28,6 @@ - cherrypy>=18.6.1 importlib-metadata>=3.3.0 + zipp>=3.19.1 cryptography>=42.0.0 - -# From old requirements/static/pkg/linux.in diff --git a/salt-3007.6.tar.gz.sha512 b/salt-3007.6.tar.gz.sha512 deleted file mode 100644 index 7d2854b..0000000 --- a/salt-3007.6.tar.gz.sha512 +++ /dev/null @@ -1 +0,0 @@ -6706f2925531980210178a8d7c186676e39782f102c23bd3e99cc63846c0c7d49fa53b39368badd961fa267cd48bf72fd5234921316ba83770cf6d2932b6f2fb diff --git a/salt-3007.7.tar.gz.sha512 b/salt-3007.7.tar.gz.sha512 new file mode 100644 index 0000000..33b264e --- /dev/null +++ b/salt-3007.7.tar.gz.sha512 @@ -0,0 +1 @@ +f20dc717baab42acfe33d380bbe3124432fc6b984b87549eb145188e70bebf241f028fb37f23fac54b26d030c28195878b86f3184faabc19a013f4a2c4dfce35 diff --git a/salt.spec.in b/salt.spec.in index 3314198..cb258dc 100644 --- a/salt.spec.in +++ b/salt.spec.in @@ -51,6 +51,7 @@ Patch5: urllib.patch Patch6: 0001-Drop-versioned-dependencies.patch Patch7: 0002-Drop-Windows-dependencies.patch Patch9: 0001-Fix-Python3.13-compatibility-regarding-maxsplit.patch +Patch10: 0001-Prepare-salt.utils.process-for-python-3.14.patch BuildArch: noarch %ifarch %{ix86} x86_64 diff --git a/version b/version index aeb2d85..48019ba 100644 --- a/version +++ b/version @@ -1 +1 @@ -3007.6 +3007.7