* [PR PATCH] salt: upgrade to 3001.1; convert depends to py3
@ 2020-08-08 5:41 Goorzhel
2020-08-08 5:49 ` Goorzhel
` (28 more replies)
0 siblings, 29 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-08 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
There is a new pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: upgrade to 3001.1; convert depends to py3
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 1640 bytes --]
From c9791c78c9fdaf0573573fcd36e2006fd25332aa Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 7 Aug 2020 21:34:54 -0700
Subject: [PATCH] salt: upgrade to 3001.1; convert depends to py3
---
srcpkgs/salt/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..47305e05d7b 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,21 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
+build_style=python3-module
pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
@ 2020-08-08 5:49 ` Goorzhel
2020-08-08 5:49 ` Goorzhel
` (27 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-08 5:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670828676
Comment:
> srcpkgs/salt/template:7: do not set pycompile_module, it is autodetected
TIL about xlint. 😅
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
2020-08-08 5:49 ` Goorzhel
@ 2020-08-08 5:49 ` Goorzhel
2020-08-08 5:49 ` [PR PATCH] [Updated] " Goorzhel
` (26 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-08 5:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670828676
Comment:
> srcpkgs/salt/template:7: do not set pycompile_module, it is autodetected
TIL about xlint. 😅
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
2020-08-08 5:49 ` Goorzhel
2020-08-08 5:49 ` Goorzhel
@ 2020-08-08 5:49 ` Goorzhel
2020-08-08 18:57 ` Goorzhel
` (25 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-08 5:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: upgrade to 3001.1; convert depends to py3
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 1641 bytes --]
From f711bfdc5ad63f7f5d0f7cf98d52fc1d1629e38f Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 7 Aug 2020 21:34:54 -0700
Subject: [PATCH] salt: upgrade to 3001.1; convert depends to py3
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..82af58efa1f 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (2 preceding siblings ...)
2020-08-08 5:49 ` [PR PATCH] [Updated] " Goorzhel
@ 2020-08-08 18:57 ` Goorzhel
2020-08-09 1:08 ` fosslinux
` (24 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-08 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670962101
Comment:
Hmm:
```
ag@server $ sudo salt-key -L
Password:
Error: The 'pycryptodomex>=3.9.7' distribution was not found and is required by salt
ag@server $ xbps-query -f salt | grep requires | tee $(tty) | xargs cat
/usr/lib/python3.8/site-packages/salt-3001.1-py3.8.egg-info/requires.txt
Jinja2
msgpack>=0.5,!=0.5.5
PyYAML
MarkupSafe
requests>=1.0.0
distro
pycryptodomex>=3.9.7
pyzmq>=17.0.0
```
We have `pycryptodome` in void-packages, but not `pycryptodomex` (I imagine that's deliberate). For the time being I've papered over this with `sudo pip install pycryptodomex`.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (3 preceding siblings ...)
2020-08-08 18:57 ` Goorzhel
@ 2020-08-09 1:08 ` fosslinux
2020-08-09 1:13 ` ericonr
` (23 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: fosslinux @ 2020-08-09 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670991244
Comment:
I think the only reason that we don't have `pycryptodomex` is because no-one ever added it to the repositories. You should make a template for that and add it to this PR (I think), unless there is something I am missing about `pycryptodome` and `pycryptodomex`.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (4 preceding siblings ...)
2020-08-09 1:08 ` fosslinux
@ 2020-08-09 1:13 ` ericonr
2020-08-09 1:29 ` Goorzhel
` (22 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ericonr @ 2020-08-09 1:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670991556
Comment:
I needed it for something once, and they are indeed different packages. I can't find the template for it, unfortunately.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (5 preceding siblings ...)
2020-08-09 1:13 ` ericonr
@ 2020-08-09 1:29 ` Goorzhel
2020-08-09 2:26 ` [PR PATCH] [Updated] " Goorzhel
` (21 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 1:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670962101
Comment:
Hmm:
```
ag@server $ sudo salt-key -L
Password:
Error: The 'pycryptodomex>=3.9.7' distribution was not found and is required by salt
ag@server $ xbps-query -f salt | grep requires | tee $(tty) | xargs cat
/usr/lib/python3.8/site-packages/salt-3001.1-py3.8.egg-info/requires.txt
Jinja2
msgpack>=0.5,!=0.5.5
PyYAML
MarkupSafe
requests>=1.0.0
distro
pycryptodomex>=3.9.7
pyzmq>=17.0.0
```
We have `pycryptodome` in void-packages, but not `pycryptodomex` (~~I imagine that's deliberate~~ per comments below, I should Be the Change). For the time being I've papered over this with `sudo pip install pycryptodomex`.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: upgrade to 3001.1; convert depends to py3
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (6 preceding siblings ...)
2020-08-09 1:29 ` Goorzhel
@ 2020-08-09 2:26 ` Goorzhel
2020-08-09 2:43 ` [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package Goorzhel
` (20 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 2:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: upgrade to 3001.1; convert depends to py3
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3517 bytes --]
From f711bfdc5ad63f7f5d0f7cf98d52fc1d1629e38f Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 7 Aug 2020 21:34:54 -0700
Subject: [PATCH 1/2] salt: upgrade to 3001.1; convert depends to py3
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..82af58efa1f 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
From ac9a575b696d3bd561402a2bcd5c2635b21e5c9f Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 2/2] pycryptodomex: new package, 3.9.8_1
---
srcpkgs/python-pycryptodomex/template | 31 +++++++++++++++++++++++++++
srcpkgs/python3-pycryptodomex | 1 +
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/python-pycryptodomex/template
create mode 120000 srcpkgs/python3-pycryptodomex
diff --git a/srcpkgs/python-pycryptodomex/template b/srcpkgs/python-pycryptodomex/template
new file mode 100644
index 00000000000..1d4ea473a51
--- /dev/null
+++ b/srcpkgs/python-pycryptodomex/template
@@ -0,0 +1,31 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+do_check() {
+ python2 setup.py test
+ python3 setup.py test
+}
+
+post_install() {
+ vlicense LICENSE.rst
+}
+
+python3-pycryptodomex_package() {
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE.rst
+ }
+}
diff --git a/srcpkgs/python3-pycryptodomex b/srcpkgs/python3-pycryptodomex
new file mode 120000
index 00000000000..7671a57800e
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex
@@ -0,0 +1 @@
+python-pycryptodomex
\ No newline at end of file
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (7 preceding siblings ...)
2020-08-09 2:26 ` [PR PATCH] [Updated] " Goorzhel
@ 2020-08-09 2:43 ` Goorzhel
2020-08-09 2:53 ` Goorzhel
` (19 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3517 bytes --]
From f711bfdc5ad63f7f5d0f7cf98d52fc1d1629e38f Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 7 Aug 2020 21:34:54 -0700
Subject: [PATCH 1/2] salt: upgrade to 3001.1; convert depends to py3
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..82af58efa1f 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
From a17d1d2304e8d7afc0eb3165cc3982f06d5c5276 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 2/2] pycryptodomex: new package, 3.9.8_1
---
srcpkgs/python-pycryptodomex/template | 31 +++++++++++++++++++++++++++
srcpkgs/python3-pycryptodomex | 1 +
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/python-pycryptodomex/template
create mode 120000 srcpkgs/python3-pycryptodomex
diff --git a/srcpkgs/python-pycryptodomex/template b/srcpkgs/python-pycryptodomex/template
new file mode 100644
index 00000000000..e3fe3c04cf8
--- /dev/null
+++ b/srcpkgs/python-pycryptodomex/template
@@ -0,0 +1,31 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+do_check() {
+ python2 setup.py test
+ python3 setup.py test
+}
+
+post_install() {
+ vlicense LICENSE.rst
+}
+
+python3-pycryptodomex_package() {
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE.rst
+ }
+}
diff --git a/srcpkgs/python3-pycryptodomex b/srcpkgs/python3-pycryptodomex
new file mode 120000
index 00000000000..7671a57800e
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex
@@ -0,0 +1 @@
+python-pycryptodomex
\ No newline at end of file
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (8 preceding siblings ...)
2020-08-09 2:43 ` [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package Goorzhel
@ 2020-08-09 2:53 ` Goorzhel
2020-08-09 3:08 ` [PR PATCH] [Updated] " Goorzhel
` (18 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-670998519
Comment:
```
$ salt-master -V | grep cryptodome
pycryptodome: Not Installed
$ xi python3-pycryptodomex
<...>
$ salt-master -V | grep cryptodome
pycryptodome: 3.9.8
```
Not bad, not bad at all.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (9 preceding siblings ...)
2020-08-09 2:53 ` Goorzhel
@ 2020-08-09 3:08 ` Goorzhel
2020-08-09 4:49 ` fosslinux
` (17 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 3:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3517 bytes --]
From 6d07b305dde0b6c0ecbca8631394ffccd34f3db4 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 1/2] pycryptodomex: new package, 3.9.8_1
---
srcpkgs/python-pycryptodomex/template | 31 +++++++++++++++++++++++++++
srcpkgs/python3-pycryptodomex | 1 +
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/python-pycryptodomex/template
create mode 120000 srcpkgs/python3-pycryptodomex
diff --git a/srcpkgs/python-pycryptodomex/template b/srcpkgs/python-pycryptodomex/template
new file mode 100644
index 00000000000..e3fe3c04cf8
--- /dev/null
+++ b/srcpkgs/python-pycryptodomex/template
@@ -0,0 +1,31 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+do_check() {
+ python2 setup.py test
+ python3 setup.py test
+}
+
+post_install() {
+ vlicense LICENSE.rst
+}
+
+python3-pycryptodomex_package() {
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE.rst
+ }
+}
diff --git a/srcpkgs/python3-pycryptodomex b/srcpkgs/python3-pycryptodomex
new file mode 120000
index 00000000000..7671a57800e
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex
@@ -0,0 +1 @@
+python-pycryptodomex
\ No newline at end of file
From c3f9d16f3ecd962e0aaaa33887d8b0653b8b2d1b Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 7 Aug 2020 21:34:54 -0700
Subject: [PATCH 2/2] salt: upgrade to 3001.1; convert depends to py3
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..82af58efa1f 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (10 preceding siblings ...)
2020-08-09 3:08 ` [PR PATCH] [Updated] " Goorzhel
@ 2020-08-09 4:49 ` fosslinux
2020-08-09 4:53 ` Goorzhel
` (16 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: fosslinux @ 2020-08-09 4:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671006013
Comment:
Correct commit naming format would be `New package: pycryptodomex-3.9.8`
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (11 preceding siblings ...)
2020-08-09 4:49 ` fosslinux
@ 2020-08-09 4:53 ` Goorzhel
2020-08-09 4:56 ` fosslinux
` (15 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 4:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671006207
Comment:
Whoops. Should I format the `salt` commit accordingly?
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (12 preceding siblings ...)
2020-08-09 4:53 ` Goorzhel
@ 2020-08-09 4:56 ` fosslinux
2020-08-09 5:06 ` Goorzhel
` (14 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: fosslinux @ 2020-08-09 4:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671006403
Comment:
For salt, normally it would be `salt: update to 3001.1, (something else important)`, or the somethign else important on a new line what you have is currently fine for salt (although if you push again maybe s/upgrade/update`). New packages use the `New package: package-version` format though.
Here is the documentation on this https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (13 preceding siblings ...)
2020-08-09 4:56 ` fosslinux
@ 2020-08-09 5:06 ` Goorzhel
2020-08-09 5:06 ` [PR PATCH] [Updated] " Goorzhel
` (13 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 5:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671007144
Comment:
I appreciate the pointers, @fosslinux — commits fixed.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (14 preceding siblings ...)
2020-08-09 5:06 ` Goorzhel
@ 2020-08-09 5:06 ` Goorzhel
2020-08-09 5:13 ` ericonr
` (12 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 5:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3669 bytes --]
From 5b271516ea2272b07b9cfe591e280e7f1fb5de2c Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 1/2] New package: pycryptodomex-3.9.8
---
srcpkgs/python-pycryptodomex/template | 31 +++++++++++++++++++++++++++
srcpkgs/python3-pycryptodomex | 1 +
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/python-pycryptodomex/template
create mode 120000 srcpkgs/python3-pycryptodomex
diff --git a/srcpkgs/python-pycryptodomex/template b/srcpkgs/python-pycryptodomex/template
new file mode 100644
index 00000000000..e3fe3c04cf8
--- /dev/null
+++ b/srcpkgs/python-pycryptodomex/template
@@ -0,0 +1,31 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+do_check() {
+ python2 setup.py test
+ python3 setup.py test
+}
+
+post_install() {
+ vlicense LICENSE.rst
+}
+
+python3-pycryptodomex_package() {
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE.rst
+ }
+}
diff --git a/srcpkgs/python3-pycryptodomex b/srcpkgs/python3-pycryptodomex
new file mode 120000
index 00000000000..7671a57800e
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex
@@ -0,0 +1 @@
+python-pycryptodomex
\ No newline at end of file
From bf1855344cbaed5a5b112bed572d3a47479f4ffa Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 22:02:27 -0700
Subject: [PATCH 2/2] salt: update to 3001.1.
Salt dropped Python 2 support in version 3001 [1], so all the
dependencies have been converted to `python3-*`.
[1] https://docs.saltstack.com/en/latest/topics/releases/3001.html
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..82af58efa1f 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (15 preceding siblings ...)
2020-08-09 5:06 ` [PR PATCH] [Updated] " Goorzhel
@ 2020-08-09 5:13 ` ericonr
2020-08-09 5:17 ` [PR REVIEW] " fosslinux
` (11 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: ericonr @ 2020-08-09 5:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671007588
Comment:
We aren't taking new python2 packages, so you can just build the python3 one without worrying about py2.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR REVIEW] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (16 preceding siblings ...)
2020-08-09 5:13 ` ericonr
@ 2020-08-09 5:17 ` fosslinux
2020-08-09 5:18 ` Goorzhel
` (10 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: fosslinux @ 2020-08-09 5:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#discussion_r467537939
Comment:
Should `python3-pycryptodomex` be added here?
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR REVIEW] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (17 preceding siblings ...)
2020-08-09 5:17 ` [PR REVIEW] " fosslinux
@ 2020-08-09 5:18 ` Goorzhel
2020-08-09 5:47 ` [PR PATCH] [Updated] " Goorzhel
` (9 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 5:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#discussion_r467537954
Comment:
🤦♂️ Dunno how I missed that.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (18 preceding siblings ...)
2020-08-09 5:18 ` Goorzhel
@ 2020-08-09 5:47 ` Goorzhel
2020-08-09 5:47 ` Goorzhel
` (8 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 5:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3149 bytes --]
From 2289ae6037acbc0c76288c2cd1e43c8643e3ba49 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 1/2] New package: pycryptodomex-3.9.8
---
srcpkgs/python3-pycryptodomex/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-pycryptodomex/template
diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
new file mode 100644
index 00000000000..e0bd32f27e2
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -0,0 +1,19 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 03e8a22a1343f1ef2083149fd42e339f48bdd182 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 22:02:27 -0700
Subject: [PATCH 2/2] salt: update to 3001.1.
Salt dropped Python 2 support in version 3001 [1], so all the
dependencies have been converted to `python3-*`.
[1] https://docs.saltstack.com/en/latest/topics/releases/3001.html
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..82af58efa1f 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (19 preceding siblings ...)
2020-08-09 5:47 ` [PR PATCH] [Updated] " Goorzhel
@ 2020-08-09 5:47 ` Goorzhel
2020-08-09 18:41 ` Goorzhel
` (7 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 5:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3171 bytes --]
From 2289ae6037acbc0c76288c2cd1e43c8643e3ba49 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 1/2] New package: pycryptodomex-3.9.8
---
srcpkgs/python3-pycryptodomex/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-pycryptodomex/template
diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
new file mode 100644
index 00000000000..e0bd32f27e2
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -0,0 +1,19 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 32679f097ca3a20cc0f476ebf2c0ffa3c5c2cca4 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 22:02:27 -0700
Subject: [PATCH 2/2] salt: update to 3001.1.
Salt dropped Python 2 support in version 3001 [1], so all the
dependencies have been converted to `python3-*`.
[1] https://docs.saltstack.com/en/latest/topics/releases/3001.html
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..80525f92686 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro python3-pycryptodomex"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (20 preceding siblings ...)
2020-08-09 5:47 ` Goorzhel
@ 2020-08-09 18:41 ` Goorzhel
2020-08-09 21:43 ` Vaelatern
` (6 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3795 bytes --]
From 2289ae6037acbc0c76288c2cd1e43c8643e3ba49 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 18:44:33 -0700
Subject: [PATCH 1/2] New package: pycryptodomex-3.9.8
---
srcpkgs/python3-pycryptodomex/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-pycryptodomex/template
diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
new file mode 100644
index 00000000000..e0bd32f27e2
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -0,0 +1,19 @@
+# Template file for 'python-pycryptodomex'
+pkgname=python-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+post_install() {
+ vlicense LICENSE.rst
+}
From c343507265830a78a6d3ab807deef6b85219c298 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 8 Aug 2020 22:02:27 -0700
Subject: [PATCH 2/2] salt: update to 3001.1.
Salt dropped Python 2 support in version 3001 [1], so all the
dependencies have been converted to `python3-*`.
[1] https://docs.saltstack.com/en/latest/topics/releases/3001.html
---
srcpkgs/python3-pycryptodomex/template | 2 +-
srcpkgs/salt/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index e0bd32f27e2..bdc88b867c6 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -3,7 +3,7 @@ pkgname=python-pycryptodomex
version=3.9.8
revision=1
wrksrc="pycryptodomex-${version}"
-build_style=python-module
+build_style=python3-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..80525f92686 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro python3-pycryptodomex"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (21 preceding siblings ...)
2020-08-09 18:41 ` Goorzhel
@ 2020-08-09 21:43 ` Vaelatern
2020-08-09 21:54 ` Vaelatern
` (5 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Vaelatern @ 2020-08-09 21:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671104609
Comment:
Thanks for the work on this, I'll review and get back on this.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (22 preceding siblings ...)
2020-08-09 21:43 ` Vaelatern
@ 2020-08-09 21:54 ` Vaelatern
2020-08-09 23:50 ` Goorzhel
` (4 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Vaelatern @ 2020-08-09 21:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671105533
Comment:
Looks like python3-pycrptodome already exists.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (23 preceding siblings ...)
2020-08-09 21:54 ` Vaelatern
@ 2020-08-09 23:50 ` Goorzhel
2020-08-09 23:56 ` [PR PATCH] [Updated] " Goorzhel
` (3 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 23:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 713 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671116087
Comment:
It does, but Salt [seems rather particular](https://github.com/void-linux/void-packages/pull/24136#issuecomment-670962101) about having pycryptodomex as opposed to non-x. As far as I can tell, [their only difference](https://pycryptodome.readthedocs.io/en/latest/src/introduction.html?highlight=pycryptodomex) is that with-x installs to the Python module `Cryptodome`, and non-x installs to `Crypto`. @ericonr stated a need for pycryptodomex in the repo, anyway, so I figured I'd fill it.
_Hopefully_ this is my last force-push — I had to iron out some subtle typos.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (24 preceding siblings ...)
2020-08-09 23:50 ` Goorzhel
@ 2020-08-09 23:56 ` Goorzhel
2020-08-10 3:28 ` [PR PATCH] [Closed]: " Vaelatern
` (2 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-09 23:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
There is an updated pull request by Goorzhel against master on the void-packages repository
https://github.com/Goorzhel/void-packages salt
https://github.com/void-linux/void-packages/pull/24136
salt: to 3001.1; python{,3}-pycryptodomex: new package
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
A patch file from https://github.com/void-linux/void-packages/pull/24136.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-salt-24136.patch --]
[-- Type: text/x-diff, Size: 3143 bytes --]
From 764cd7e2d09c565f3a40c391d44d81a30a8a690b Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sun, 9 Aug 2020 16:53:27 -0700
Subject: [PATCH 1/2] New package: pycryptodomex-3.9.8
---
| 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-pycryptodomex/template
--git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
new file mode 100644
index 00000000000..c9391add01f
--- /dev/null
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pycryptodomex'
+pkgname=python3-pycryptodomex
+version=3.9.8
+revision=1
+wrksrc="pycryptodomex-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Pycryptodome equivalent that installs to \`Cryptodome\` module"
+maintainer="Antonio Gurgel <antonio@goorzhel.com>"
+license="Public Domain, BSD-2-Clause"
+homepage="https://www.pycryptodome.org/"
+changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst"
+distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
+checksum=48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9
+
+post_install() {
+ vlicense LICENSE.rst
+}
From 2bdd0d6d1f4bef1274526ac9ab3ef198fddf54ad Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sun, 9 Aug 2020 16:54:07 -0700
Subject: [PATCH 2/2] salt: update to 3001.1.
Salt dropped Python 2 support in version 3001 [1], so all the
dependencies have been converted to `python3-*`.
[1] https://docs.saltstack.com/en/latest/topics/releases/3001.html
---
srcpkgs/salt/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index fc8052a8dd2..80525f92686 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,21 +1,20 @@
# Template file for 'salt'
pkgname=salt
-version=3000.2
+version=3001.1
revision=1
archs=noarch
-build_style=python2-module
-pycompile_module="salt"
-hostmakedepends="python-devel python-setuptools"
-depends="python-yaml python-Jinja2 python-requests python-pyzmq
- python-M2Crypto python-tornado python-msgpack dmidecode pciutils
- python-psutil"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
+ python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
+ python3-psutil python3-distro python3-pycryptodomex"
short_desc="Remote execution system, and configuration manager"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
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=0e33429d094a6109dfed955c4b1c638baee9641eca2f7609bbc4adad21c620d9
+checksum=e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PR PATCH] [Closed]: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (25 preceding siblings ...)
2020-08-09 23:56 ` [PR PATCH] [Updated] " Goorzhel
@ 2020-08-10 3:28 ` Vaelatern
2020-08-10 3:29 ` Vaelatern
2020-08-10 3:29 ` Goorzhel
28 siblings, 0 replies; 30+ messages in thread
From: Vaelatern @ 2020-08-10 3:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]
There's a closed pull request on the void-packages repository
salt: to 3001.1; python{,3}-pycryptodomex: new package
https://github.com/void-linux/void-packages/pull/24136
Description:
@Vaelatern
With saltstack/salt#55310 wrapped up, I figured I'd take a stab at updating our `salt` package. This _should_ also obsolete saltstack/salt#56551.
```
[ag@server~]# salt-master -V
Salt Version:
Salt: 3001.1
Dependency Versions:
cffi: 1.14.0
cherrypy: Not Installed
dateutil: Not Installed
docker-py: 4.2.0
gitdb: Not Installed
gitpython: Not Installed
Jinja2: 2.10.1
libgit2: Not Installed
M2Crypto: 0.35.2
Mako: Not Installed
msgpack-pure: Not Installed
msgpack-python: 1.0.0
mysql-python: Not Installed
pycparser: 2.19
pycrypto: Not Installed
pycryptodome: Not Installed
pygit2: Not Installed
Python: 3.8.4 (default, Jul 17 2020, 11:12:18)
python-gnupg: Not Installed
PyYAML: 5.3
PyZMQ: 19.0.2
smmap: Not Installed
timelib: Not Installed
Tornado: 4.5.3
ZMQ: 4.3.2
System Versions:
dist: void rolling void
locale: utf-8
machine: x86_64
release: 5.7.10_1
system: Linux
version: void rolling void
```
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (26 preceding siblings ...)
2020-08-10 3:28 ` [PR PATCH] [Closed]: " Vaelatern
@ 2020-08-10 3:29 ` Vaelatern
2020-08-10 3:29 ` Goorzhel
28 siblings, 0 replies; 30+ messages in thread
From: Vaelatern @ 2020-08-10 3:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671147380
Comment:
Thank you!
I'm going to test salt more, but I know this change does make our salt more usable than before!
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: salt: to 3001.1; python{,3}-pycryptodomex: new package
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
` (27 preceding siblings ...)
2020-08-10 3:29 ` Vaelatern
@ 2020-08-10 3:29 ` Goorzhel
28 siblings, 0 replies; 30+ messages in thread
From: Goorzhel @ 2020-08-10 3:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by Goorzhel on void-packages repository
https://github.com/void-linux/void-packages/pull/24136#issuecomment-671147476
Comment:
Glad to help!
^ permalink raw reply [flat|nested] 30+ messages in thread
end of thread, other threads:[~2020-08-10 3:29 UTC | newest]
Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-08 5:41 [PR PATCH] salt: upgrade to 3001.1; convert depends to py3 Goorzhel
2020-08-08 5:49 ` Goorzhel
2020-08-08 5:49 ` Goorzhel
2020-08-08 5:49 ` [PR PATCH] [Updated] " Goorzhel
2020-08-08 18:57 ` Goorzhel
2020-08-09 1:08 ` fosslinux
2020-08-09 1:13 ` ericonr
2020-08-09 1:29 ` Goorzhel
2020-08-09 2:26 ` [PR PATCH] [Updated] " Goorzhel
2020-08-09 2:43 ` [PR PATCH] [Updated] salt: to 3001.1; python{,3}-pycryptodomex: new package Goorzhel
2020-08-09 2:53 ` Goorzhel
2020-08-09 3:08 ` [PR PATCH] [Updated] " Goorzhel
2020-08-09 4:49 ` fosslinux
2020-08-09 4:53 ` Goorzhel
2020-08-09 4:56 ` fosslinux
2020-08-09 5:06 ` Goorzhel
2020-08-09 5:06 ` [PR PATCH] [Updated] " Goorzhel
2020-08-09 5:13 ` ericonr
2020-08-09 5:17 ` [PR REVIEW] " fosslinux
2020-08-09 5:18 ` Goorzhel
2020-08-09 5:47 ` [PR PATCH] [Updated] " Goorzhel
2020-08-09 5:47 ` Goorzhel
2020-08-09 18:41 ` Goorzhel
2020-08-09 21:43 ` Vaelatern
2020-08-09 21:54 ` Vaelatern
2020-08-09 23:50 ` Goorzhel
2020-08-09 23:56 ` [PR PATCH] [Updated] " Goorzhel
2020-08-10 3:28 ` [PR PATCH] [Closed]: " Vaelatern
2020-08-10 3:29 ` Vaelatern
2020-08-10 3:29 ` Goorzhel
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).