Date: Sunday, December 19, 2021 @ 18:36:06 Author: foxboron Revision: 1079083
upgpkg: salt 3004-4 - FS#73020 and FS#72699 Modified: salt/trunk/PKGBUILD ----------+ PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-19 18:33:12 UTC (rev 1079082) +++ PKGBUILD 2021-12-19 18:36:06 UTC (rev 1079083) @@ -7,7 +7,7 @@ pkgname=salt pkgver=3004 -pkgrel=3 +pkgrel=4 pkgdesc='Central system and configuration manager' arch=('any') @@ -26,6 +26,7 @@ 'python-m2crypto' 'python-systemd' 'python-distro' + 'python-importlib-metadata' 'python-pycryptodomex') optdepends=('dmidecode: decode SMBIOS/DMI tables' 'python-pygit2: gitfs support') @@ -37,13 +38,17 @@ install=salt.install source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz" + "patch-requirements.patch::https://github.com/saltstack/salt/commit/be9879c5d5b30ea0997b1cfca9ad830a54a900b0.patch" salt.logrotate) sha256sums=('3d53561bc86e014dca2ec3dc981079be04d55ea047890cabde25e5b10bfa5b13' + '84e9f80f684a3d7059e8a3636ec67f3d088c6250643ee17e58fb0032f2ef84a0' 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215') prepare() { - sed -i '/^contextvars/d' $pkgname-$pkgver/requirements/base.txt + cd salt-$pkgver + patch -Np1 < "$srcdir/patch-requirements.patch" + sed -i '/^contextvars/d' requirements/base.txt } build() {