summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzer0def2020-06-19 16:58:55 +0200
committerzer0def2020-06-19 16:59:14 +0200
commit6a607f6f34000ff95fa28a539d03ef83a24a268e (patch)
tree82ff60965a7a80c053b5935fbc676ab63e0f915f
parent88110531a40845c2d5de64c4994a7ce356b0bf9e (diff)
downloadaur-6a607f6f34000ff95fa28a539d03ef83a24a268e.tar.gz
Bump for msgpack version cap lift.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
-rw-r--r--msgpack-requirements-fix.patch11
3 files changed, 26 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c9c394fabd..a326a42de33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = salt-py3
pkgdesc = Central system and configuration manager
pkgver = 3001
- pkgrel = 1
+ pkgrel = 2
url = http://saltstack.org/
install = salt.install
arch = any
license = Apache
depends = python-jinja
- depends = python-msgpack<1.0.0
+ depends = python-msgpack
depends = python-yaml
depends = python-markupsafe
depends = python-requests
@@ -30,8 +30,10 @@ pkgbase = salt-py3
backup = etc/salt/minion
source = https://pypi.io/packages/source/s/salt/salt-3001.tar.gz
source = salt.logrotate
+ source = msgpack-requirements-fix.patch
sha256sums = 5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154
sha256sums = abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215
+ sha256sums = 0cb1b198acc79640072fe7925630f4d1950b39208d247e99a8ce6cc9252a27f1
pkgname = salt-py3
diff --git a/PKGBUILD b/PKGBUILD
index ce3487fba9f..89f9d46c3d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=salt-py3
pkgver=3001
-pkgrel=1
+pkgrel=2
pkgdesc='Central system and configuration manager'
arch=('any')
@@ -19,7 +19,7 @@ replaces=('salt' 'salt-zmq' 'salt-raet')
conflicts=('salt' 'salt-zmq' 'salt-raet')
depends=('python-jinja'
- 'python-msgpack<1.0.0'
+ 'python-msgpack'
'python-yaml'
'python-markupsafe'
'python-requests'
@@ -37,10 +37,17 @@ backup=('etc/logrotate.d/salt'
install=salt.install
source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz"
- "salt.logrotate")
+ "salt.logrotate"
+ "msgpack-requirements-fix.patch")
sha256sums=('5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154'
- 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
+ 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215'
+ '0cb1b198acc79640072fe7925630f4d1950b39208d247e99a8ce6cc9252a27f1')
+
+prepare() {
+ cd salt-$pkgver
+ patch -p1 <"${srcdir}/msgpack-requirements-fix.patch"
+}
build() {
cd salt-$pkgver
diff --git a/msgpack-requirements-fix.patch b/msgpack-requirements-fix.patch
new file mode 100644
index 00000000000..f6eb7c5ab43
--- /dev/null
+++ b/msgpack-requirements-fix.patch
@@ -0,0 +1,11 @@
+diff --git a/requirements/base.txt b/requirements/base.txt
+index 27923c00e4..56d9131f29 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -1,5 +1,5 @@
+ Jinja2
+-msgpack>=0.5,!=0.5.5,<1.0.0
++msgpack>=0.5,!=0.5.5
+ PyYAML
+ MarkupSafe
+ requests>=1.0.0