* [PR PATCH] salt: updated to 3005
@ 2022-09-24 18:42 Noah-Huppert
2022-10-02 21:28 ` [PR PATCH] [Merged]: " Vaelatern
0 siblings, 1 reply; 2+ messages in thread
From: Noah-Huppert @ 2022-09-24 18:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is a new pull request by Noah-Huppert against master on the void-packages repository
https://github.com/Noah-Huppert/void-packages salt-3005
https://github.com/void-linux/void-packages/pull/39449
salt: updated to 3005
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/39449.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-3005-39449.patch --]
[-- Type: text/x-diff, Size: 2714 bytes --]
From 88e010518ff39236bcf7c07e522f90ea9866303f Mon Sep 17 00:00:00 2001
From: Noah Huppert <contact@noahh.io>
Date: Sat, 24 Sep 2022 14:42:22 -0400
Subject: [PATCH] salt: updated to 3005
---
srcpkgs/salt/patches/requirements.patch | 6 ------
srcpkgs/salt/patches/zeromq-transport.patch | 13 -------------
srcpkgs/salt/template | 6 +++---
3 files changed, 3 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/salt/patches/requirements.patch
delete mode 100644 srcpkgs/salt/patches/zeromq-transport.patch
diff --git a/srcpkgs/salt/patches/requirements.patch b/srcpkgs/salt/patches/requirements.patch
deleted file mode 100644
index 8b1217a30c44..000000000000
--- a/srcpkgs/salt/patches/requirements.patch
+++ /dev/null
@@ -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"
diff --git a/srcpkgs/salt/patches/zeromq-transport.patch b/srcpkgs/salt/patches/zeromq-transport.patch
deleted file mode 100644
index f77dec599503..000000000000
--- a/srcpkgs/salt/patches/zeromq-transport.patch
+++ /dev/null
@@ -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))
-
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 07a6fbb004a0..d56ad6547cde 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
# Template file for 'salt'
pkgname=salt
-version=3003.3
-revision=4
+version=3005
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="http://saltstack.org/"
changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=a6f9c8c8b5e2600ea8620b4a67371de17611beb4f8d97e4bb9b0b308a37ed1e2
+checksum=1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: salt: updated to 3005
2022-09-24 18:42 [PR PATCH] salt: updated to 3005 Noah-Huppert
@ 2022-10-02 21:28 ` Vaelatern
0 siblings, 0 replies; 2+ messages in thread
From: Vaelatern @ 2022-10-02 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
There's a merged pull request on the void-packages repository
salt: updated to 3005
https://github.com/void-linux/void-packages/pull/39449
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-02 21:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-24 18:42 [PR PATCH] salt: updated to 3005 Noah-Huppert
2022-10-02 21:28 ` [PR PATCH] [Merged]: " Vaelatern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).