[PR PATCH] salt: update to 3002

[PR PATCH] salt: update to 3002

[Noah-Huppert]

[-- 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

Re: salt: update to 3002

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 981 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/25860#issuecomment-716078424

Comment:
This patch hasn't been accepted upstream, but I've reviewed what's happening here and don't have a problem with it. The issue is that the custom `IPv6AddressScoped` subclass of `ipaddress.IPv6Address` in the standard library does not use the superclass initializer, and in Python 3.9, the superclass defines a read-only `scope_id` backed by a private `_scope_id` attribute created in the initializer. This private attribute is referenced when computing a hash of the `IPv6Address` object.

The proposed patch appears to set the private attribute the same way the superclass initializer would if that initializer were used. If upstream accepts the patch, we should see it folded into a future release; otherwise, I would expect upstream to refactor the subclass to avoid this issue with Python 3.9. For now, let's get the package working.

Re: [PR PATCH] [Merged]: salt: update to 3002

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]

There's a merged pull request on the void-packages repository

salt: update to 3002
https://github.com/void-linux/void-packages/pull/25860

Description:
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.