[PR PATCH] salt: fix compatibility with pyzmq 23.0.0

[PR PATCH] salt: fix compatibility with pyzmq 23.0.0

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]

There is a new 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: 1700 bytes --]

From 2cd34d89ab9d7926e15098e4bccb987ef87b80e2 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 | 12 ++++++++++++
 srcpkgs/salt/template                       |  2 +-
 2 files changed, 13 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..9a0312001b76
--- /dev/null
+++ b/srcpkgs/salt/patches/zeromq-transport.patch
@@ -0,0 +1,12 @@
+--- 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

Re: salt: fix compatibility with pyzmq 23.0.0

[paper42]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/37369#issuecomment-1142676703

Comment:
@Vaelatern 

Re: salt: fix compatibility with pyzmq 23.0.0

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/37369#issuecomment-1142677157

Comment:
@ahesford, your [recent update to python3-pyzmq](https://github.com/void-linux/void-packages/commit/1dbbdf3f17d7140860c0faba1ce8f4b03c7d3634) seems to have impacted `salt` 
cc @Vaelatern

Re: salt: fix compatibility with pyzmq 23.0.0

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/37369#issuecomment-1142701136

Comment:
@tsndqst Please add a line above the patch itself (before the `---` line ) with a link to the PR.

Then I will merge.

Re: [PR PATCH] [Updated] salt: fix compatibility with pyzmq 23.0.0

[tsndqst]

[-- 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

Re: [PR PATCH] [Merged]: salt: fix compatibility with pyzmq 23.0.0

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]

There's a merged pull request on the void-packages repository

salt: fix compatibility with pyzmq 23.0.0
https://github.com/void-linux/void-packages/pull/37369

Description:
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
-->

Re: salt: fix compatibility with pyzmq 23.0.0

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/37369#issuecomment-1142717746

Comment:
thanks all!