Index: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	(revision 1243928)
+++ trunk/PKGBUILD	(working copy)
@@ -7,7 +7,7 @@
 
 pkgname=salt
 pkgver=3004.1
-pkgrel=3
+pkgrel=4
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -39,10 +39,12 @@
 install=salt.install
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz"
         jinja-3.1.patch
+        zmq-23.patch
         salt.logrotate)
 
 sha256sums=('7f344a2432648a4f078daa5accc68dcdffe1095cea13ec21e50413560f04c298'
             'bfce486e45a37c6e78af545cd653f932da20c6d13c2bbbc874686924838fbcdf'
+            'a82dcec84d7f2eb5b136ef8112397a1dc1234392741dc6a6db66c868c495eb76'
             'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {
@@ -52,6 +54,9 @@
   # https://github.com/saltstack/salt/pull/61856
   patch -Np1 -i ../jinja-3.1.patch
 
+  # https://github.com/saltstack/salt/pull/62119
+  patch -Np1 -i ../zmq-23.patch
+
   # remove version requirements for pyzmq, there's no point in it
   # we only have one version and the "python_version <=> *" checks are discarded
   # so pyzmq<=20.0.0 ends up in the final requirements.txt
Index: trunk/zmq-23.patch
===================================================================
--- trunk/zmq-23.patch	(nonexistent)
+++ trunk/zmq-23.patch	(working copy)
@@ -0,0 +1,27 @@
+From 6ec8b90e402ff3fa8f27c7da70ece898592416bc Mon Sep 17 00:00:00 2001
+From: Mircea Ulinic <mulinic@digitalocean.com>
+Date: Mon, 30 May 2022 11:35:00 +0100
+Subject: [PATCH] Fix #62092: Catch zmq.error.ZMQError to set HWM for zmq >= 3
+
+It looks like before release 23.0.0, when trying to access zmq.HWM it
+was raising ``AttributeError``, which is now wrapped under pyzmq's own
+``zmq.error.ZMQError``.
+Simply caching that, should then set the HWM correctly for zmq >= 3
+and therefore fix #62092.
+---
+ salt/transport/zeromq.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
+index 5735c1bc15ba..c704b1ec2b23 100644
+--- a/salt/transport/zeromq.py
++++ b/salt/transport/zeromq.py
+@@ -723,7 +723,7 @@ def publish_daemon(
+         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))