salt: updated to 3005
This commit is contained in:
parent
bc3bb3dc50
commit
3a4b215f05
|
@ -1,6 +0,0 @@
|
||||||
--- a/requirements/base.txt
|
|
||||||
+++ b/requirements/base.txt
|
|
||||||
@@ -6,2 +6,2 @@
|
|
||||||
distro>=1.0.1
|
|
||||||
-contextvars
|
|
||||||
+contextvars; python_version < "3.7"
|
|
|
@ -1,13 +0,0 @@
|
||||||
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))
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'salt'
|
# Template file for 'salt'
|
||||||
pkgname=salt
|
pkgname=salt
|
||||||
version=3003.3
|
version=3005
|
||||||
revision=4
|
revision=1
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
hostmakedepends="python3-setuptools"
|
hostmakedepends="python3-setuptools"
|
||||||
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
|
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
|
||||||
|
@ -13,7 +13,7 @@ license="Apache-2.0"
|
||||||
homepage="http://saltstack.org/"
|
homepage="http://saltstack.org/"
|
||||||
changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
|
changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
|
||||||
distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
|
distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
|
||||||
checksum=a6f9c8c8b5e2600ea8620b4a67371de17611beb4f8d97e4bb9b0b308a37ed1e2
|
checksum=1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4
|
||||||
conf_files="
|
conf_files="
|
||||||
/etc/salt/cloud.providers.d/digitalocean.conf
|
/etc/salt/cloud.providers.d/digitalocean.conf
|
||||||
/etc/salt/cloud.providers.d/vsphere.conf
|
/etc/salt/cloud.providers.d/vsphere.conf
|
||||||
|
|
Loading…
Reference in New Issue