From: Noah-Huppert <Noah-Huppert@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] salt: update to 3002
Date: Sat, 24 Oct 2020 22:52:58 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25860@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 795 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-3002
https://github.com/void-linux/void-packages/pull/25860
salt: update to 3002
Salt 3001 and 3002 would not work on Python 3.9 because the Salt team was using internal fields (`_underscore_prefixed`) from the Python standard library internally for Salt. When Python updated from 3.8 -> 3.9 some of those internal fields changed, so Salt broke.
This PR updates Salt to version 3002 and includes [a patch by this lovely GitHub user](https://github.com/fepitre/salt/commit/4c5e18bfd092d9003d12c89131f787a57d54cf38) which fixes Salt's internal field issues.
A patch file from https://github.com/void-linux/void-packages/pull/25860.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-3002-25860.patch --]
[-- Type: text/x-diff, Size: 1973 bytes --]
From 1dc07fc20001e12c1a179846a0448215624bf9ee Mon Sep 17 00:00:00 2001
From: Noah Huppert <contact@noahh.io>
Date: Sat, 24 Oct 2020 16:46:36 -0400
Subject: [PATCH] salt: update to 3002
---
srcpkgs/salt/patches/ipv6addressscoped.patch | 15 +++++++++++++++
srcpkgs/salt/template | 6 +++---
2 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/salt/patches/ipv6addressscoped.patch
diff --git a/srcpkgs/salt/patches/ipv6addressscoped.patch b/srcpkgs/salt/patches/ipv6addressscoped.patch
new file mode 100644
index 00000000000..89dc35c2685
--- /dev/null
+++ b/srcpkgs/salt/patches/ipv6addressscoped.patch
@@ -0,0 +1,15 @@
+--- salt/_compat.py
++++ salt/_compat.py
+@@ -162,6 +162,9 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
+ else:
+ self.__scope = None
+
++ # For compatibility with python3.9 ipaddress
++ self._scope_id = self.__scope
++
+ if sys.version_info.major == 2:
+ ipaddress._BaseAddress.__init__(self, address)
+ ipaddress._BaseV6.__init__(self, address)
+--
+2.29.0
+
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index f32b4e29e8d..a778a780b5a 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
# Template file for 'salt'
pkgname=salt
-version=3001.1
-revision=2
+version=3002
+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=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
+checksum=b622c9de9fde571db96bfd659a183bea553dd26e71cac85659387e937221aae6
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
next reply other threads:[~2020-10-24 20:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-24 20:52 Noah-Huppert [this message]
2020-10-25 1:20 ` ahesford
2020-10-25 1:20 ` [PR PATCH] [Merged]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25860@inbox.vuxu.org \
--to=noah-huppert@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).