From: tsndqst <tsndqst@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] salt: update dependencies
Date: Fri, 20 Oct 2023 02:36:55 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46788@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
There is a new pull request by tsndqst against master on the void-packages repository
https://github.com/tsndqst/void-packages salt-3006-contextvars
https://github.com/void-linux/void-packages/pull/46788
salt: update dependencies
Update to fix `contextvars` version issue again. See https://github.com/saltstack/salt/issues/60483 and https://github.com/void-linux/void-packages/pull/33331
This also adds a couple dependencies I found.
#### Testing the changes
- I tested the changes in this PR: **YES**
Salt runs now but I am having problems with connectivity between the master and minions. I am not sure if it's caused by the upgrade or not.
A patch file from https://github.com/void-linux/void-packages/pull/46788.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-3006-contextvars-46788.patch --]
[-- Type: text/x-diff, Size: 1750 bytes --]
From eb7424faa63108449c1795a7f7dc86e6a3978a04 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Thu, 19 Oct 2023 19:00:56 -0500
Subject: [PATCH] salt: update dependencies
---
srcpkgs/salt/patches/requirements.patch | 10 ++++++++++
srcpkgs/salt/template | 5 +++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/salt/patches/requirements.patch
diff --git a/srcpkgs/salt/patches/requirements.patch b/srcpkgs/salt/patches/requirements.patch
new file mode 100644
index 0000000000000..abf56d4a54299
--- /dev/null
+++ b/srcpkgs/salt/patches/requirements.patch
@@ -0,0 +1,10 @@
+diff --git a/requirements/base.txt b/requirements/base.txt
+index c19d8804a2b..62244c35152 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -9,4 +9,4 @@ psutil>=5.0.0
+ packaging>=21.3
+ looseversion
+ # We need contextvars for salt-ssh
+-contextvars
++contextvars; python_version < "3.7"
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 944ee4cb3118e..764f7716828e1 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,12 +1,13 @@
# Template file for 'salt'
pkgname=salt
version=3006.3
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
- python3-psutil python3-distro python3-pycryptodomex python3-looseversion"
+ python3-psutil python3-distro python3-pycryptodomex python3-looseversion
+ python3-jmespath python3-packaging"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="Apache-2.0"
next reply other threads:[~2023-10-20 0:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 0:36 tsndqst [this message]
2023-10-20 1:41 ` tsndqst
2023-10-20 10:54 ` [PR PATCH] [Merged]: " sgn
2023-10-20 17:06 ` Vaelatern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46788@inbox.vuxu.org \
--to=tsndqst@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).