From: tsndqst <tsndqst@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] salt: fix compatibility with pyzmq 23.0.0
Date: Wed, 01 Jun 2022 00:56:13 +0200 [thread overview]
Message-ID: <20220531225613.eJ-gteIKCWGHSq58YkbmeScpBQTs4itWVL1L5bY2wC0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37369@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]
There is an updated pull request by tsndqst against master on the void-packages repository
https://github.com/tsndqst/void-packages salt-zeromq-error
https://github.com/void-linux/void-packages/pull/37369
salt: fix compatibility with pyzmq 23.0.0
The recent update to python3-pyzmq 23.0.0 broke Salt. salt-master no longer binds to the publisher port.
Issue is described here: https://github.com/saltstack/salt/issues/62092
Proposed fix is here: https://github.com/saltstack/salt/pull/62119
I ported the change to 3003.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37369.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-zeromq-error-37369.patch --]
[-- Type: text/x-diff, Size: 1764 bytes --]
From 597206abe2aaec4739e468fce4ff38a98847523b Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 31 May 2022 13:05:50 -0500
Subject: [PATCH] salt: fix compatibility with pyzmq 23.0.0
---
srcpkgs/salt/patches/zeromq-transport.patch | 13 +++++++++++++
srcpkgs/salt/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/salt/patches/zeromq-transport.patch
diff --git a/srcpkgs/salt/patches/zeromq-transport.patch b/srcpkgs/salt/patches/zeromq-transport.patch
new file mode 100644
index 000000000000..f77dec599503
--- /dev/null
+++ b/srcpkgs/salt/patches/zeromq-transport.patch
@@ -0,0 +1,13 @@
+Code taken from https://github.com/saltstack/salt/pull/62119/
+--- a/salt/transport/zeromq.py 2021-08-24 14:17:07.000000000 -0500
++++ b/salt/transport/zeromq.py 2022-05-31 09:50:44.113967910 -0500
+@@ -977,7 +977,7 @@
+ try:
+ pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
+ # in zmq >= 3.0, there are separate send and receive HWM settings
+- except AttributeError:
++ except (AttributeError, zmq.error.ZMQError):
+ # Set the High Water Marks. For more information on HWM, see:
+ # http://api.zeromq.org/4-1:zmq-setsockopt
+ pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))
+
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 2265082b8f4e..07a6fbb004a0 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
# Template file for 'salt'
pkgname=salt
version=3003.3
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
next prev parent reply other threads:[~2022-05-31 22:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-31 21:53 [PR PATCH] " tsndqst
2022-05-31 21:57 ` paper42
2022-05-31 21:58 ` tsndqst
2022-05-31 22:33 ` Vaelatern
2022-05-31 22:56 ` tsndqst [this message]
2022-05-31 23:04 ` [PR PATCH] [Merged]: " Vaelatern
2022-05-31 23:04 ` 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=20220531225613.eJ-gteIKCWGHSq58YkbmeScpBQTs4itWVL1L5bY2wC0@z \
--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).