aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Sinatra <wpsinatra@gmail.com>2020-09-28 15:53:15 -0400
committerLeo <thinkabit.ukim@gmail.com>2020-09-29 00:29:38 +0000
commitcbae1544bac2bc5e2cc791defb490d2dbef713a4 (patch)
treea78967581444509738beae33a5d2fc07d909636a
parent6d6dee03c85cb7c4ca059a3ad1a3049e2b1ba1ba (diff)
downloadaports-cbae1544bac2bc5e2cc791defb490d2dbef713a4.tar.gz
aports-cbae1544bac2bc5e2cc791defb490d2dbef713a4.tar.bz2
aports-cbae1544bac2bc5e2cc791defb490d2dbef713a4.tar.xz
community/salt: add missing patch
fix-runtime-dependencies.patch was removed when the packaged was bumped from 3001 to 3001.1, but a patch is still required, as Alpine ships py3-pycrptodome in lieu of pycryptodomex
-rw-r--r--community/salt/APKBUILD7
-rw-r--r--community/salt/fix-cryptodome-dependency.patch6
2 files changed, 11 insertions, 2 deletions
diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD
index 4dafe7507d..8f82a6cd92 100644
--- a/community/salt/APKBUILD
+++ b/community/salt/APKBUILD
@@ -1,9 +1,10 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: Olivier Mauras <olivier@mauras.ch>
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=salt
pkgver=3001.1
-pkgrel=0
+pkgrel=1
pkgdesc="A parallel remote execution system"
url="https://github.com/saltstack/salt"
arch="noarch !s390x !mips !mips64"
@@ -28,6 +29,7 @@ source="https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz
salt-minion.initd
salt-syndic.confd
salt-syndic.initd
+ fix-cryptodome-dependency.patch
"
options="!check" # depends on pytestsalt
@@ -161,4 +163,5 @@ cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f
0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed salt-minion.confd
31521a7bf9455a805652ebb2c2a258148d654169caed500dbf1fe0c26baf26b330217117fe84a13706ded75a9eedadc0bbd671ede0957ed4d60d1e766fea6b39 salt-minion.initd
bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd
-d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd"
+d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd
+c5cff2fb2c63144312ba863f8cd39ceddf35a5b4762886e4befaf76ec099fe016048478209078cda4573b970e52cacee1462c7dce2fefe545d6d5d4dcbfec92c fix-cryptodome-dependency.patch"
diff --git a/community/salt/fix-cryptodome-dependency.patch b/community/salt/fix-cryptodome-dependency.patch
new file mode 100644
index 0000000000..5148afd701
--- /dev/null
+++ b/community/salt/fix-cryptodome-dependency.patch
@@ -0,0 +1,6 @@
+#We ship pycryptodome as a full replacement of pycrypto, so the dependency is on pycryptodome, not pycryptodomex
+--- a/requirements/crypto.txt
++++ b/requirements/crypto.txt
+@@ -1 +1 @@
+-pycryptodomex>=3.9.7
++pycryptodome>=3.9.7