27aee8f99b
- Create minion_id with reproducible mtime - Fix detection of Salt codename by "salt_version" execution module - Fix regression: multiple values for keyword argument 'saltenv' (bsc#1212844) - Fix the regression of user.present state when group is unset (bsc#1212855) - Fix zypper repositories always being reconfigured - Fix utf8 handling in 'pass' renderer and make it more robust - Prevent _pygit2.GitError: error loading known_hosts when $HOME is not set (bsc#1210994) - Fix ModuleNotFoundError and other issues raised by salt-support module (bsc#1211591) - tornado: Fix an open redirect in StaticFileHandler (CVE-2023-28370, bsc#1211741) - Make master_tops compatible with Salt 3000 and older minions (bsc#1212516) (bsc#1212517) - Avoid failures due transactional_update module not available in Salt 3006.0 (bsc#1211754) - Avoid conflicts with Salt dependencies versions (bsc#1211612) - Added: * fix-utf8-handling-in-pass-renderer-and-make-it-more-.patch * fix-the-regression-of-user.present-state-when-group-.patch * make-master_tops-compatible-with-salt-3000-and-older.patch * avoid-conflicts-with-dependencies-versions-bsc-12116.patch * tornado-fix-an-open-redirect-in-staticfilehandler-cv.patch * fix-regression-multiple-values-for-keyword-argument-.patch * zypper-pkgrepo-alreadyconfigured-585.patch * mark-salt-3006-as-released-586.patch * fix-some-issues-detected-in-salt-support-cli-module-.patch * define-__virtualname__-for-transactional_update-modu.patch * 3006.0-prevent-_pygit2.giterror-error-loading-known_.patch OBS-URL: https://build.opensuse.org/request/show/1103185 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=212
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 8e9f2587aea52c1d0a5c07d5f9bb77a23ae4d4a6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Tue, 23 May 2023 10:40:02 +0100
|
|
Subject: [PATCH] Avoid conflicts with dependencies versions
|
|
(bsc#1211612) (#581)
|
|
|
|
This commit fixes the Salt requirements file that are used to
|
|
generate the "requires.txt" file that is included in Salt egginfo
|
|
in order to be consistent with the installed packages
|
|
of Salt dependencies.
|
|
|
|
This prevents issues when resolving and validating Salt dependencies
|
|
with "pkg_resources" Python module.
|
|
---
|
|
requirements/base.txt | 2 +-
|
|
requirements/zeromq.txt | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/requirements/base.txt b/requirements/base.txt
|
|
index c19d8804a2..437aa01d31 100644
|
|
--- a/requirements/base.txt
|
|
+++ b/requirements/base.txt
|
|
@@ -6,7 +6,7 @@ MarkupSafe
|
|
requests>=1.0.0
|
|
distro>=1.0.1
|
|
psutil>=5.0.0
|
|
-packaging>=21.3
|
|
+packaging>=17.1
|
|
looseversion
|
|
# We need contextvars for salt-ssh
|
|
contextvars
|
|
diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
|
|
index 1e9a815c1b..23d1ef25dc 100644
|
|
--- a/requirements/zeromq.txt
|
|
+++ b/requirements/zeromq.txt
|
|
@@ -1,5 +1,5 @@
|
|
-r base.txt
|
|
-r crypto.txt
|
|
|
|
-pyzmq>=20.0.0
|
|
+pyzmq>=17.1.2
|
|
pyzmq==25.0.2 ; sys_platform == "win32"
|
|
--
|
|
2.39.2
|
|
|
|
|