From 597206abe2aaec4739e468fce4ff38a98847523b Mon Sep 17 00:00:00 2001 From: Tim Sandquist 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