gentoo auto-resync : 26:07:2022 - 02:57:39

4 files changed, 40 insertions, 2 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 71b598d9b950..fb6b1180619f 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -23,6 +23,7 @@ AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d
 AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa8c8ff843d4f9b46ff32d98d07d245d308599d0a93814d80ff9b1cb120da4296b6f06f64825da4ce603ec37d4fb SHA512 4634fe96479c481fdb9daf8decd3632e9ed8daa9ab62942d71bd6c11e603ae5ac96acfdb68e4e91ec2c829efd33689fa122bc53979b7b5ce02ea63189bebe349
 AUX salt-3004.2-importlib.patch 584 BLAKE2B f9ccf7a6205228dc12847d9c86b7d9e539fdbccc1e27a77fccf05622b53f58504226f2eb4aecb2a5bf95789cf72c43e86ab22cb190d62aca903b0d14373a3df0 SHA512 61b966f010445c8a594a5c618441b33e9f7feb9481972aa4c7246d977003c5605c152459eeebc0922c2d9d7e28436243f891e738856a86a88a82a7489825f52a
 AUX salt-3004.2-jinja-3.patch 589 BLAKE2B 249e81ea2760cbe75ff66bfd86cbfaab58ea673fea240bb9e787896b89645ef523c0d98305214bcce545a7372e8bc545b6ae385ca3311d71cf7bd6fd66f52c7c SHA512 6615f5824c5b53a426395bf7def9c8f54f3c753f28f3e3b23119849900f10686968cec0787d4ffa16bbbd763a19072348617165e1af6a0f87bb81e9fd8be20e6
+AUX salt-3004.2-pyzmq-23.patch 1605 BLAKE2B b0c3e9722f0ff88b586f7e9f863d246a35bc10789568e1f4c3f9728022032dc8686ba0988a35225d2d01d00198c8a00253ec33331e24d6c3a7100d4a10c576ab SHA512 57a5c5a23ec1fd450e1f24740d6cd1d4b29947de5b5d984b7a55c89791e7b7f0eef44390cd9f959210b6c27fdb325650edeb2a53b3302f925ad182ee4ac8ac1c
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -36,7 +37,7 @@ DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c
 DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
 EBUILD salt-3002.9.ebuild 6672 BLAKE2B 01d02dd2411a676649d24af08a24d32426c98c1a6f8e3f0ebb96244bd55183e57f3a713fe9e65ea96093f0121374ba8dc933653b625be393c9a67620e06e2d55 SHA512 fbf0cfcde4fcb77614784a251d349a6d79e206fba8e673cc62419d23c8b2672d88a6b8adaa0b3840cb5771fbea3700b6f4bb57d8bbbb417d144f7fc5310f8554
 EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0
-EBUILD salt-3003.5.ebuild 6977 BLAKE2B 351fab851936ea48deeb04f7906a517c17ba8afe01e2e5de577f38f53c6dae2f44b472a8e48762cae87d400b6d2cb1f6f1a0ca5a9c03bb9cd2b54c9f4fd902b4 SHA512 e3369d27258116f6f49d3d182654899f8be044b1210140af73a39d020d2cb3dd4f44245ff70ab0d8d0c303c89ae0a22d5a2efb87a600e13d1fc8895f62e0aefc
+EBUILD salt-3003.5-r1.ebuild 7019 BLAKE2B 950714a06b7eb3f531c2a00cd8c58283db9750567b3f4f5434123b1bdbc57c19f97de507f8c307f200a92c6659167024aa2dae736ef4b061f7252337d3be54c5 SHA512 9ca17e369d90f7e52b9809debfdb36a6ad8d1049ba5ac585ead0d2281903d23d276af75356ffe3fb791e5c7c3a3f1aa6f26c1f6215274aa2c1136175d72725aa
 EBUILD salt-3004.1-r4.ebuild 7044 BLAKE2B fd253f8e588516e95519f0c503993887305952541dcbc3a62577a47909bd8160c6f2f46043843a3c473817f85bb8e2fd4eac6aea50e299a11a12f0ba7eb76084 SHA512 45d34cf7e65102f1f3c70a922b07cd419ad9fea8af9407cd6c2a84308cf9823bb31e7cb39ab0b4bb4b572025bd83a8e2a916353722e16b5bbacdb4d2d225d75a
-EBUILD salt-3004.2.ebuild 7089 BLAKE2B d157190c3455e865038f79c4c2c4058a48df4490858b06c18d799dd7fcdbc74b57e873404065e4c1de90c6196d14932b421d7ef17200f03160eb7b1c26f92166 SHA512 2398b3360f90992027d9dd49c524a315638e6399adfd865b06f78148be4332e1d57cafb3d9a969501fae47d6e64b4a193d34436be00b6e0aba0f5aec69aae3e0
+EBUILD salt-3004.2-r1.ebuild 7131 BLAKE2B 3ec4877f34a0ad3f3a410246cb85392edecd36c4c555f29405d988792f184f966dab438083223daa4a0152f17761b2ba2177efa9c362e05b7a13750143c4542a SHA512 bcd078ccb72cf1aa197f938e13c9be7ef7dbeeab56f6fa82e6652d9d6e2290d0482227a7397af8bd82b91eb738ad3343a287ca16116e6f452160cc8fd6f994bc
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7
diff --git a/app-admin/salt/files/salt-3004.2-pyzmq-23.patch b/app-admin/salt/files/salt-3004.2-pyzmq-23.patch
new file mode 100644
index 000000000000..d912757ba7b8
--- /dev/null
+++ b/app-admin/salt/files/salt-3004.2-pyzmq-23.patch
@@ -0,0 +1,35 @@
+diff --git a/salt/log/handlers/logstash_mod.py b/salt/log/handlers/logstash_mod.py
+index bc462018f5..7e0d98c5ba 100644
+--- a/salt/log/handlers/logstash_mod.py
++++ b/salt/log/handlers/logstash_mod.py
+@@ -160,6 +160,8 @@ import logging
+ import logging.handlers
+ import os
+ 
++import zmq
++
+ import salt.utils.json
+ import salt.utils.network
+ import salt.utils.stringutils
+@@ -435,7 +437,7 @@ class ZMQLogstashHander(logging.Handler, NewStyleClassMixIn):
+                 # Above the defined high water mark(unsent messages), start
+                 # dropping them
+                 self._publisher.setsockopt(zmq.HWM, self._zmq_hwm)
+-            except AttributeError:
++            except (AttributeError, zmq.error.ZMQError):
+                 # In ZMQ >= 3.0, there are separate send and receive HWM
+                 # settings
+                 self._publisher.setsockopt(zmq.SNDHWM, self._zmq_hwm)
+diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
+index dc024d7eff..4c989095a5 100644
+--- a/salt/transport/zeromq.py
++++ b/salt/transport/zeromq.py
+@@ -902,7 +902,7 @@ class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):
+         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/app-admin/salt/salt-3003.5.ebuild b/app-admin/salt/salt-3003.5-r1.ebuild
index c3ba4ac9a49e..e46b069a8edb 100644
--- a/app-admin/salt/salt-3003.5.ebuild
+++ b/app-admin/salt/salt-3003.5-r1.ebuild
@@ -114,6 +114,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3004.2-jinja-3.patch"
 	"${FILESDIR}/salt-3003.4-tests.patch"
 	"${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch"
+	"${FILESDIR}/salt-3004.2-pyzmq-23.patch"
 )
 
 python_prepare_all() {
diff --git a/app-admin/salt/salt-3004.2.ebuild b/app-admin/salt/salt-3004.2-r1.ebuild
index dcc6f23bd8b9..373dd7c97624 100644
--- a/app-admin/salt/salt-3004.2.ebuild
+++ b/app-admin/salt/salt-3004.2-r1.ebuild
@@ -113,6 +113,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
 	"${FILESDIR}/salt-3004.1-py310.patch"
 	"${FILESDIR}/salt-3004.2-importlib.patch"
+	"${FILESDIR}/salt-3004.2-pyzmq-23.patch"
 )
 
 python_prepare_all() {