diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | 0002-pycryptodome.patch | 8 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
3 files changed, 26 insertions, 13 deletions
@@ -1,7 +1,7 @@ pkgbase = salt-py3 pkgdesc = Central system and configuration manager - pkgver = 2019.2.3 - pkgrel = 3 + pkgver = 3000 + pkgrel = 1 url = http://saltstack.org/ install = salt.install arch = any @@ -12,10 +12,10 @@ pkgbase = salt-py3 depends = python-markupsafe depends = python-requests depends = python-pyzmq - depends = python-crypto depends = python-m2crypto depends = python-systemd - depends = python-tornado5 + depends = python-distro + depends = python-pycryptodomex optdepends = dmidecode: decode SMBIOS/DMI tables optdepends = python-pygit2: gitfs support provides = salt @@ -28,12 +28,14 @@ pkgbase = salt-py3 backup = etc/logrotate.d/salt backup = etc/salt/master backup = etc/salt/minion - source = https://pypi.io/packages/source/s/salt/salt-2019.2.3.tar.gz + source = https://pypi.io/packages/source/s/salt/salt-3000.tar.gz source = salt.logrotate source = 0001-saltssh-py38.patch - sha256sums = 7497e7dbfd4dc3799bbbc8da63da98b8301bbb644150f3905fe5775a7d81271a + source = 0002-pycryptodome.patch + sha256sums = 04fbc64933b375cbbefc9576bcc65167b74d5eec7f58e64d096d67529ea66500 sha256sums = abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215 sha256sums = 8029d67585bab0b0858c3e2fb317b08bfbeee94d8c785c74472e9c9ecd4c0d3c + sha256sums = e4e075506ccb8632415e0748d36e5f97ea7e3dad951024b11604ae3f5c36561b pkgname = salt-py3 diff --git a/0002-pycryptodome.patch b/0002-pycryptodome.patch new file mode 100644 index 000000000000..640e59e0be01 --- /dev/null +++ b/0002-pycryptodome.patch @@ -0,0 +1,8 @@ +diff --git a/requirements/crypto.txt b/requirements/crypto.txt +index 9a62bb31f8..acdfd2028e 100644 +--- a/requirements/crypto.txt ++++ b/requirements/crypto.txt +@@ -1,2 +1 @@ +-pycrypto>=2.6.1; sys.platform not in 'win32,darwin' +-pycryptodomex; sys.platform == 'win32' ++pycryptodomex @@ -6,8 +6,8 @@ # Contributor: Christer Edwards <christer.edwards@gmail.com> pkgname=salt-py3 -pkgver=2019.2.3 -pkgrel=3 +pkgver=3000 +pkgrel=1 pkgdesc='Central system and configuration manager' arch=('any') @@ -24,10 +24,10 @@ depends=('python-jinja' 'python-markupsafe' 'python-requests' 'python-pyzmq' - 'python-crypto' 'python-m2crypto' 'python-systemd' - 'python-tornado5') + 'python-distro' + 'python-pycryptodomex') optdepends=('dmidecode: decode SMBIOS/DMI tables' 'python-pygit2: gitfs support') @@ -38,15 +38,18 @@ backup=('etc/logrotate.d/salt' install=salt.install source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz" "salt.logrotate" - "0001-saltssh-py38.patch") + "0001-saltssh-py38.patch" + "0002-pycryptodome.patch") -sha256sums=('7497e7dbfd4dc3799bbbc8da63da98b8301bbb644150f3905fe5775a7d81271a' +sha256sums=('04fbc64933b375cbbefc9576bcc65167b74d5eec7f58e64d096d67529ea66500' 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215' - '8029d67585bab0b0858c3e2fb317b08bfbeee94d8c785c74472e9c9ecd4c0d3c') + '8029d67585bab0b0858c3e2fb317b08bfbeee94d8c785c74472e9c9ecd4c0d3c' + 'e4e075506ccb8632415e0748d36e5f97ea7e3dad951024b11604ae3f5c36561b') prepare() { cd salt-$pkgver patch -p1 < ../0001-saltssh-py38.patch + patch -p1 < ../0002-pycryptodome.patch } build() { |