aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-06-20 08:56:48 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-07-03 11:03:54 +0000
commit2855ec4815665645f36b56e8acab9271f8052501 (patch)
tree1e107a15d2bfa3baa5fb06c04e2313f2c7cbb264
parent4b9187f4b9d6e79a650511d1d896411d3f0ec944 (diff)
downloadaports-2855ec4815665645f36b56e8acab9271f8052501.tar.gz
aports-2855ec4815665645f36b56e8acab9271f8052501.tar.bz2
aports-2855ec4815665645f36b56e8acab9271f8052501.tar.xz
community/salt: upgrade to 3001
-rw-r--r--community/salt/APKBUILD8
-rw-r--r--community/salt/fix-runtime-dependencies.patch13
2 files changed, 10 insertions, 11 deletions
diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD
index f9cc5b034b..23929990cf 100644
--- a/community/salt/APKBUILD
+++ b/community/salt/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Olivier Mauras <olivier@mauras.ch>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=salt
-pkgver=3000.3
+pkgver=3001
pkgrel=0
pkgdesc="A parallel remote execution system"
url="https://github.com/saltstack/salt"
@@ -28,7 +28,6 @@ source="https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz
salt-minion.initd
salt-syndic.confd
salt-syndic.initd
- fix-grains-dist-detection.patch
fix-runtime-dependencies.patch
"
options="!check" # depends on pytestsalt
@@ -155,7 +154,7 @@ _conf_copy() {
cp -r "$builddir"/conf/$type* "$subpkgdir"/etc/salt/
}
-sha512sums="a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208 salt-3000.3.tar.gz
+sha512sums="b99b46135eb511813e2a3b07b3226e3c41da10d138c9d7d672eab0d0ec65bd68330d712f14e5cd3489333aca996820f30e98e407adba52ddf056a645cd74e992 salt-3001.tar.gz
975ba2f5e681fbd62045da61cc3dc065b148683a07b5df7eca9f131e47314eb6bfa8660ca1c06a3bd93683c7097d0ff9f8e514273dd24d82fb2de6a255e6b275 salt-api.confd
435d399bfecf431d0c713031e2ae57ce25b5c6edc98b62f33bd7a4ff1c587e3cdeb988445ae0c3e9ffc1911555c3694654d98815f9562b8a14bf0688ec1ebea6 salt-api.initd
cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f0941b7348a3af6d1dca7cd6f2bcb3612ca10e1ec98997e5a salt-master.confd
@@ -164,5 +163,4 @@ cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f
31521a7bf9455a805652ebb2c2a258148d654169caed500dbf1fe0c26baf26b330217117fe84a13706ded75a9eedadc0bbd671ede0957ed4d60d1e766fea6b39 salt-minion.initd
bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd
d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd
-377fea82f4ad62804a89cae556e74ac04e8fc401364f5ae570cbea00d21417d6e00fcc0aca52c9f8c158e067f0588f54915fb8ea8a970bacf26df653c2779110 fix-grains-dist-detection.patch
-071b9a47124d58fa2b4876154b7b10928ad152c379dec3c9bf99ee788115ef13fe2ea93d4faf3539d8582797383b64a393222f4f379b3820ee2e7ac90d3f2668 fix-runtime-dependencies.patch"
+4c9ecd2a81de8e156f3fc6adf1810ed551a319b2478fe53200a1f527f70d62c512dafbfa1753a0970fbcdf21cddcee6efdd6fa4ba3a957d97fff7cc1dfc9b210 fix-runtime-dependencies.patch"
diff --git a/community/salt/fix-runtime-dependencies.patch b/community/salt/fix-runtime-dependencies.patch
index f16eaa0597..3f607510ad 100644
--- a/community/salt/fix-runtime-dependencies.patch
+++ b/community/salt/fix-runtime-dependencies.patch
@@ -1,5 +1,7 @@
+We ship pycryptodome as full replacement of pycrypto, so the dependency is on
+pycryptodome, not pycryptodomex.
diff --git a/requirements/base.txt b/requirements/base.txt
-index 922aec4..96da429 100644
+index 27923c0..088dbb0 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,5 +1,5 @@
@@ -10,10 +12,9 @@ index 922aec4..96da429 100644
MarkupSafe
requests>=1.0.0
diff --git a/requirements/crypto.txt b/requirements/crypto.txt
-index 9a62bb3..fa12ef3 100644
+index 00e98d3..781a89f 100644
--- a/requirements/crypto.txt
+++ b/requirements/crypto.txt
-@@ -1,2 +1,2 @@
--pycrypto>=2.6.1; sys.platform not in 'win32,darwin'
-+pycryptodome>=3.9.7; sys.platform not in 'win32,darwin'
- pycryptodomex; sys.platform == 'win32'
+@@ -1 +1 @@
+-pycryptodomex>=3.9.7
++pycryptodome>=3.9.7