[arch-commits] Commit in salt/trunk (PKGBUILD)

2022-08-27 Thread Morten Linderud via arch-commits 
Date: Saturday, August 27, 2022 @ 10:47:48
  Author: foxboron
Revision: 1284685

upgpkg: salt 3005-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-27 10:45:02 UTC (rev 1284684)
+++ PKGBUILD2022-08-27 10:47:48 UTC (rev 1284685)
@@ -6,7 +6,7 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3004.2
+pkgver=3005
 pkgrel=1
 
 pkgdesc='Central system and configuration manager'
@@ -38,11 +38,9 @@
 
 install=salt.install
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
-
"zmq-23.patch::https://github.com/saltstack/salt/commit/6ec8b90e402ff3fa8f27c7da70ece898592416bc.patch;
 salt.logrotate)
 
-sha256sums=('2fa644f6200d4e36b55846cb372b6e67b6ca0fbec0697f1d8d73e771b665ed70'
-'a82dcec84d7f2eb5b136ef8112397a1dc1234392741dc6a6db66c868c495eb76'
+sha256sums=('1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {
@@ -49,9 +47,6 @@
   cd salt-$pkgver
   sed -i '/^contextvars/d' requirements/base.txt
 
-  # https://bugs.archlinux.org/task/75114#comment209320
-  patch -Np1 < "$srcdir/zmq-23.patch"
-
   # remove version requirements for pyzmq, there's no point in it
   # we only have one version and the "python_version <=> *" checks are 
discarded
   # so pyzmq<=20.0.0 ends up in the final requirements.txt

[arch-commits] Commit in salt/trunk (PKGBUILD jinja-3.1.patch)

2022-07-04 Thread Morten Linderud via arch-commits 
Date: Monday, July 4, 2022 @ 17:28:13
  Author: foxboron
Revision: 1243941

upgpkg: salt 3004.2-1

Modified:
  salt/trunk/PKGBUILD
Deleted:
  salt/trunk/jinja-3.1.patch

-+
 PKGBUILD|   14 ++--
 jinja-3.1.patch |   62 --
 2 files changed, 7 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-04 17:19:16 UTC (rev 1243940)
+++ PKGBUILD2022-07-04 17:28:13 UTC (rev 1243941)
@@ -6,8 +6,8 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3004.1
-pkgrel=3
+pkgver=3004.2
+pkgrel=1
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -38,11 +38,11 @@
 
 install=salt.install
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
-jinja-3.1.patch
+
"zmq-23.patch::https://github.com/saltstack/salt/commit/6ec8b90e402ff3fa8f27c7da70ece898592416bc.patch;
 salt.logrotate)
 
-sha256sums=('7f344a2432648a4f078daa5accc68dcdffe1095cea13ec21e50413560f04c298'
-'bfce486e45a37c6e78af545cd653f932da20c6d13c2bbbc874686924838fbcdf'
+sha256sums=('2fa644f6200d4e36b55846cb372b6e67b6ca0fbec0697f1d8d73e771b665ed70'
+'a82dcec84d7f2eb5b136ef8112397a1dc1234392741dc6a6db66c868c495eb76'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {
@@ -49,8 +49,8 @@
   cd salt-$pkgver
   sed -i '/^contextvars/d' requirements/base.txt
 
-  # https://github.com/saltstack/salt/pull/61856
-  patch -Np1 -i ../jinja-3.1.patch
+  # https://bugs.archlinux.org/task/75114#comment209320
+  patch -Np1 < "$srcdir/zmq-23.patch"
 
   # remove version requirements for pyzmq, there's no point in it
   # we only have one version and the "python_version <=> *" checks are 
discarded

Deleted: jinja-3.1.patch
===
--- jinja-3.1.patch 2022-07-04 17:19:16 UTC (rev 1243940)
+++ jinja-3.1.patch 2022-07-04 17:28:13 UTC (rev 1243941)
@@ -1,62 +0,0 @@
-From 240e165ebcd06370a1aa47f37c6842581c82e3f8 Mon Sep 17 00:00:00 2001
-From: Megan Wilhite 
-Date: Fri, 25 Mar 2022 08:31:24 -0600
-Subject: [PATCH] Use the correct Markup from jinja for each version
-

- salt/utils/jinja.py | 8 +++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 207a2cb77035..558f063d7206 100644
 a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -26,7 +26,7 @@
- import salt.utils.stringutils
- import salt.utils.url
- import salt.utils.yaml
--from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
-+from jinja2 import BaseLoader, TemplateNotFound, nodes
- from jinja2.environment import TemplateModule
- from jinja2.exceptions import TemplateRuntimeError
- from jinja2.ext import Extension
-@@ -35,6 +35,12 @@
- from salt.utils.odict import OrderedDict
- from salt.utils.versions import LooseVersion
- 
-+try:
-+from jinja2 import Markup
-+except ImportError:
-+# Markup moved to markupsafe in jinja>= 3.1
-+from markupsafe import Markup
-+
- log = logging.getLogger(__name__)
- 
- __all__ = ["SaltCacheLoader", "SerializerExtension"]
-
-From 2c39d8626527d1d753f5447753855bc7e265874b Mon Sep 17 00:00:00 2001
-From: jonyhy96 
-Date: Thu, 10 Mar 2022 10:41:48 +0800
-Subject: [PATCH] fix: jinja2 contextfuntion base on version
-

- salt/utils/jinja.py | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 4c430b5ccf32..9a1938c2d69b 100644
 a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -707,7 +707,11 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
- return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, 
**f_kwargs)
- 
- 
--@jinja2.contextfunction
-+if jinja2.__version__ < '3.0.0' :
-+contextfunction = jinja2.contextfunction
-+else:
-+contextfunction =  jinja2.pass_context
-+@contextfunction
- def show_full_context(ctx):
- return salt.utils.data.simple_types_filter(
- {key: value for key, value in ctx.items()}

[arch-commits] Commit in salt/trunk (PKGBUILD jinja-3.1.patch)

2022-05-24 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, May 24, 2022 @ 13:19:08
  Author: foutrelis
Revision: 1210205

upgpkg: salt 3004.1-3: fix for jinja 3.1

Added:
  salt/trunk/jinja-3.1.patch
Modified:
  salt/trunk/PKGBUILD

-+
 PKGBUILD|7 +-
 jinja-3.1.patch |   62 ++
 2 files changed, 68 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-24 12:58:52 UTC (rev 1210204)
+++ PKGBUILD2022-05-24 13:19:08 UTC (rev 1210205)
@@ -7,7 +7,7 @@
 
 pkgname=salt
 pkgver=3004.1
-pkgrel=2
+pkgrel=3
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -38,9 +38,11 @@
 
 install=salt.install
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
+jinja-3.1.patch
 salt.logrotate)
 
 sha256sums=('7f344a2432648a4f078daa5accc68dcdffe1095cea13ec21e50413560f04c298'
+'bfce486e45a37c6e78af545cd653f932da20c6d13c2bbbc874686924838fbcdf'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {
@@ -47,6 +49,9 @@
   cd salt-$pkgver
   sed -i '/^contextvars/d' requirements/base.txt
 
+  # https://github.com/saltstack/salt/pull/61856
+  patch -Np1 -i ../jinja-3.1.patch
+
   # remove version requirements for pyzmq, there's no point in it
   # we only have one version and the "python_version <=> *" checks are 
discarded
   # so pyzmq<=20.0.0 ends up in the final requirements.txt

Added: jinja-3.1.patch
===
--- jinja-3.1.patch (rev 0)
+++ jinja-3.1.patch 2022-05-24 13:19:08 UTC (rev 1210205)
@@ -0,0 +1,62 @@
+From 240e165ebcd06370a1aa47f37c6842581c82e3f8 Mon Sep 17 00:00:00 2001
+From: Megan Wilhite 
+Date: Fri, 25 Mar 2022 08:31:24 -0600
+Subject: [PATCH] Use the correct Markup from jinja for each version
+
+---
+ salt/utils/jinja.py | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
+index 207a2cb77035..558f063d7206 100644
+--- a/salt/utils/jinja.py
 b/salt/utils/jinja.py
+@@ -26,7 +26,7 @@
+ import salt.utils.stringutils
+ import salt.utils.url
+ import salt.utils.yaml
+-from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
++from jinja2 import BaseLoader, TemplateNotFound, nodes
+ from jinja2.environment import TemplateModule
+ from jinja2.exceptions import TemplateRuntimeError
+ from jinja2.ext import Extension
+@@ -35,6 +35,12 @@
+ from salt.utils.odict import OrderedDict
+ from salt.utils.versions import LooseVersion
+ 
++try:
++from jinja2 import Markup
++except ImportError:
++# Markup moved to markupsafe in jinja>= 3.1
++from markupsafe import Markup
++
+ log = logging.getLogger(__name__)
+ 
+ __all__ = ["SaltCacheLoader", "SerializerExtension"]
+
+From 2c39d8626527d1d753f5447753855bc7e265874b Mon Sep 17 00:00:00 2001
+From: jonyhy96 
+Date: Thu, 10 Mar 2022 10:41:48 +0800
+Subject: [PATCH] fix: jinja2 contextfuntion base on version
+
+---
+ salt/utils/jinja.py | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
+index 4c430b5ccf32..9a1938c2d69b 100644
+--- a/salt/utils/jinja.py
 b/salt/utils/jinja.py
+@@ -707,7 +707,11 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
+ return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, 
**f_kwargs)
+ 
+ 
+-@jinja2.contextfunction
++if jinja2.__version__ < '3.0.0' :
++contextfunction = jinja2.contextfunction
++else:
++contextfunction =  jinja2.pass_context
++@contextfunction
+ def show_full_context(ctx):
+ return salt.utils.data.simple_types_filter(
+ {key: value for key, value in ctx.items()}

[arch-commits] Commit in salt/trunk (PKGBUILD)

2022-03-30 Thread Massimiliano Torromeo via arch-commits 
Date: Wednesday, March 30, 2022 @ 10:43:38
  Author: mtorromeo
Revision: 114

removed unnecessary patch

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |3 ---
 1 file changed, 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-30 10:42:45 UTC (rev 113)
+++ PKGBUILD2022-03-30 10:43:38 UTC (rev 114)
@@ -38,16 +38,13 @@
 
 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=('7f344a2432648a4f078daa5accc68dcdffe1095cea13ec21e50413560f04c298'
-'84e9f80f684a3d7059e8a3636ec67f3d088c6250643ee17e58fb0032f2ef84a0'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {
   cd salt-$pkgver
-  patch -Np1 < "$srcdir/patch-requirements.patch"
   sed -i '/^contextvars/d' requirements/base.txt
 
   # remove version requirements for pyzmq, there's no point in it

[arch-commits] Commit in salt/trunk (PKGBUILD)

2022-03-30 Thread Massimiliano Torromeo via arch-commits 
Date: Wednesday, March 30, 2022 @ 10:42:36
  Author: mtorromeo
Revision: 112

upgpkg: salt 3004.1-2: fixed pyzmq version requirements

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-30 10:42:05 UTC (rev 111)
+++ PKGBUILD2022-03-30 10:42:36 UTC (rev 112)
@@ -7,7 +7,7 @@
 
 pkgname=salt
 pkgver=3004.1
-pkgrel=1
+pkgrel=2
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -49,6 +49,11 @@
   cd salt-$pkgver
   patch -Np1 < "$srcdir/patch-requirements.patch"
   sed -i '/^contextvars/d' requirements/base.txt
+
+  # remove version requirements for pyzmq, there's no point in it
+  # we only have one version and the "python_version <=> *" checks are 
discarded
+  # so pyzmq<=20.0.0 ends up in the final requirements.txt
+  echo -e '-r crypto.txt\n\npyzmq' > requirements/zeromq.txt
 }
 
 build() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2022-03-30 Thread Massimiliano Torromeo via arch-commits 
Date: Wednesday, March 30, 2022 @ 08:27:19
  Author: mtorromeo
Revision: 1177768

upgpkg: salt 3004.1-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-30 08:08:00 UTC (rev 1177767)
+++ PKGBUILD2022-03-30 08:27:19 UTC (rev 1177768)
@@ -6,8 +6,8 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3004
-pkgrel=4
+pkgver=3004.1
+pkgrel=1
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -41,7 +41,7 @@
 
"patch-requirements.patch::https://github.com/saltstack/salt/commit/be9879c5d5b30ea0997b1cfca9ad830a54a900b0.patch;
 salt.logrotate)
 
-sha256sums=('3d53561bc86e014dca2ec3dc981079be04d55ea047890cabde25e5b10bfa5b13'
+sha256sums=('7f344a2432648a4f078daa5accc68dcdffe1095cea13ec21e50413560f04c298'
 '84e9f80f684a3d7059e8a3636ec67f3d088c6250643ee17e58fb0032f2ef84a0'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-12-19 Thread Morten Linderud via arch-commits 
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
===
--- PKGBUILD2021-12-19 18:33:12 UTC (rev 1079082)
+++ PKGBUILD2021-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() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-10-30 Thread Morten Linderud via arch-commits 
Date: Saturday, October 30, 2021 @ 20:09:29
  Author: foxboron
Revision: 1035004

upgpkg: salt 3004-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-30 19:50:10 UTC (rev 1035003)
+++ PKGBUILD2021-10-30 20:09:29 UTC (rev 1035004)
@@ -6,7 +6,7 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3003.3
+pkgver=3004
 pkgrel=1
 
 pkgdesc='Central system and configuration manager'
@@ -39,7 +39,7 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('a6f9c8c8b5e2600ea8620b4a67371de17611beb4f8d97e4bb9b0b308a37ed1e2'
+sha256sums=('3d53561bc86e014dca2ec3dc981079be04d55ea047890cabde25e5b10bfa5b13'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {
@@ -66,15 +66,16 @@
   python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" 
--optimize=1 --skip-build
 
   # default config
-  install -Dm644 conf/master "$pkgdir/etc/salt/master"
-  install -Dm644 conf/minion "$pkgdir/etc/salt/minion"
+  install -v -Dm644 conf/master "$pkgdir/etc/salt/master"
+  install -v -Dm644 conf/minion "$pkgdir/etc/salt/minion"
 
   # systemd services
   for _svc in salt-master.service salt-syndic.service salt-minion.service 
salt-api.service; do
-install -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
+install -v -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
   done
-  install -Dm644 pkg/salt.bash 
"$pkgdir/usr/share/bash-completion/completions/salt"
-  install -Dm644 pkg/zsh_completion.zsh 
"$pkgdir/usr/share/zsh/site-functions/_salt"
+  install -v -Dm644 pkg/salt.bash 
"$pkgdir/usr/share/bash-completion/completions/salt"
+  install -v -Dm644 pkg/salt.zsh "$pkgdir/usr/share/zsh/site-functions/_salt"
+  install -v -Dm644 -t "$pkgdir/usr/share/fish/vendor_completions.d" 
pkg/fish-completions/*
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-09-04 Thread Morten Linderud via arch-commits 
Date: Saturday, September 4, 2021 @ 11:22:16
  Author: foxboron
Revision: 1011083

upgpkg: salt 3003.3-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-09-04 11:21:51 UTC (rev 1011082)
+++ PKGBUILD2021-09-04 11:22:16 UTC (rev 1011083)
@@ -6,7 +6,7 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3003.2
+pkgver=3003.3
 pkgrel=1
 
 pkgdesc='Central system and configuration manager'
@@ -39,7 +39,7 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('73c86c44b176d8cfdc033bb1e42e4fdc8dd3424833faa2ea0d0938fa173856a9'
+sha256sums=('a6f9c8c8b5e2600ea8620b4a67371de17611beb4f8d97e4bb9b0b308a37ed1e2'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-08-14 Thread Johannes Löthberg via arch-commits 
Date: Saturday, August 14, 2021 @ 09:00:01
  Author: demize
Revision: 998343

upgpkg: salt 3003.2-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-08-14 08:59:57 UTC (rev 998342)
+++ PKGBUILD2021-08-14 09:00:01 UTC (rev 998343)
@@ -6,8 +6,8 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3003.1
-pkgrel=2
+pkgver=3003.2
+pkgrel=1
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -39,7 +39,7 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('8a7184d3de4d1727618f0d3fbba79e54389aeff85b72f4ceb8200bcc167f6ebe'
+sha256sums=('73c86c44b176d8cfdc033bb1e42e4fdc8dd3424833faa2ea0d0938fa173856a9'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 prepare() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-06-26 Thread Morten Linderud via arch-commits 
Date: Saturday, June 26, 2021 @ 10:05:44
  Author: foxboron
Revision: 967528

upgpkg: salt 3003.1-2 - Fixes FS#71344: removes contextvars

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-26 09:59:59 UTC (rev 967527)
+++ PKGBUILD2021-06-26 10:05:44 UTC (rev 967528)
@@ -7,7 +7,7 @@
 
 pkgname=salt
 pkgver=3003.1
-pkgrel=1
+pkgrel=2
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -42,6 +42,10 @@
 sha256sums=('8a7184d3de4d1727618f0d3fbba79e54389aeff85b72f4ceb8200bcc167f6ebe'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
+prepare() {
+  sed -i '/^contextvars/d' $pkgname-$pkgver/requirements/base.txt
+}
+
 build() {
   cd salt-$pkgver
   python setup.py build

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-06-23 Thread Morten Linderud via arch-commits 
Date: Wednesday, June 23, 2021 @ 18:46:37
  Author: foxboron
Revision: 967114

upgpkg: salt 3003.1-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-23 18:41:23 UTC (rev 967113)
+++ PKGBUILD2021-06-23 18:46:37 UTC (rev 967114)
@@ -6,8 +6,8 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3003
-pkgrel=2
+pkgver=3003.1
+pkgrel=1
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -39,7 +39,7 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('c4689733dfe738cf287e31cb3fdd3cb8d1606295202b18d8e66d48d372d5ca77'
+sha256sums=('8a7184d3de4d1727618f0d3fbba79e54389aeff85b72f4ceb8200bcc167f6ebe'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 build() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-04-28 Thread Morten Linderud via arch-commits 
Date: Wednesday, April 28, 2021 @ 19:29:10
  Author: foxboron
Revision: 925005

upgpkg: salt 3003-2 - Reproducible builds fixup

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-28 19:25:40 UTC (rev 925004)
+++ PKGBUILD2021-04-28 19:29:10 UTC (rev 925005)
@@ -7,7 +7,7 @@
 
 pkgname=salt
 pkgver=3003
-pkgrel=1
+pkgrel=2
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -58,6 +58,8 @@
   install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt
 
   cd salt-$pkgver
+
+  export PYTHONHASHSEED=0
   python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" 
--optimize=1 --skip-build
 
   # default config

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-04-03 Thread Morten Linderud via arch-commits 
Date: Saturday, April 3, 2021 @ 14:57:51
  Author: foxboron
Revision: 911518

upgpkg: salt 3003-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-03 14:55:20 UTC (rev 911517)
+++ PKGBUILD2021-04-03 14:57:51 UTC (rev 911518)
@@ -6,7 +6,7 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3002.6
+pkgver=3003
 pkgrel=1
 
 pkgdesc='Central system and configuration manager'
@@ -39,7 +39,7 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('ffc478569363e1d17b6a3a0c421eaae9c079bbeabc4c7725a222d0fbf903a0a5'
+sha256sums=('c4689733dfe738cf287e31cb3fdd3cb8d1606295202b18d8e66d48d372d5ca77'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 build() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-03-24 Thread Morten Linderud via arch-commits 
Date: Wednesday, March 24, 2021 @ 22:18:18
  Author: foxboron
Revision: 901916

upgpkg: salt 3002.6-1

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-03-24 22:17:54 UTC (rev 901915)
+++ PKGBUILD2021-03-24 22:18:18 UTC (rev 901916)
@@ -6,8 +6,8 @@
 # Contributor: zer0def 
 
 pkgname=salt
-pkgver=3002.5
-pkgrel=3
+pkgver=3002.6
+pkgrel=1
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -39,7 +39,7 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('c8ab404335104351066ec1bcc42278aa77e24aaacc308603939d75aba05519af'
+sha256sums=('ffc478569363e1d17b6a3a0c421eaae9c079bbeabc4c7725a222d0fbf903a0a5'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 build() {

[arch-commits] Commit in salt/trunk (PKGBUILD)

2021-02-27 Thread Morten Linderud via arch-commits 
Date: Saturday, February 27, 2021 @ 12:05:28
  Author: foxboron
Revision: 874869

upgpkg: salt 3002.5-3

Modified:
  salt/trunk/PKGBUILD

--+
 PKGBUILD |   43 ++-
 1 file changed, 26 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-02-27 12:04:58 UTC (rev 874868)
+++ PKGBUILD2021-02-27 12:05:28 UTC (rev 874869)
@@ -1,11 +1,13 @@
 # Maintainer: Johannes Löthberg 
+# Maintainer: Morten Linderud 
 # Contributor: Sébastien Luttringer
 # Contributor: Daniel Wallace 
 # Contributor: Christer Edwards 
+# Contributor: zer0def 
 
 pkgname=salt
-pkgver=2019.2.7
-pkgrel=1
+pkgver=3002.5
+pkgrel=3
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -15,19 +17,19 @@
 replaces=('salt-zmq' 'salt-raet')
 conflicts=('salt-zmq' 'salt-raet')
 
-depends=('python2-jinja'
- 'python2-msgpack'
- 'python2-yaml'
- 'python2-markupsafe'
- 'python2-requests'
- 'python2-pyzmq'
- 'python2-crypto'
- 'python2-m2crypto'
- 'python2-systemd'
- 'python2-tornado'
- 'python2-futures')
+depends=('python-jinja'
+ 'python-msgpack'
+ 'python-yaml'
+ 'python-markupsafe'
+ 'python-requests'
+ 'python-pyzmq'
+ 'python-m2crypto'
+ 'python-systemd'
+ 'python-distro'
+ 'python-pycryptodomex')
 optdepends=('dmidecode: decode SMBIOS/DMI tables'
-'python2-pygit2: gitfs support')
+'python-pygit2: gitfs support')
+#checkdepends=('python-pytest' 'python-psutil')
 
 backup=('etc/logrotate.d/salt'
 'etc/salt/master'
@@ -37,19 +39,26 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz;
 salt.logrotate)
 
-sha256sums=('d648bcfb7f6c3f2e13b5dfd67dec1043fc25cc72ebebec94b00b1dc5b2e1b873'
+sha256sums=('c8ab404335104351066ec1bcc42278aa77e24aaacc308603939d75aba05519af'
 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
 build() {
   cd salt-$pkgver
-  python2 setup.py build
+  python setup.py build
 }
 
+# TODO: Missing salt-factories, pytest-tempdir
+# check() {
+#   cd salt-$pkgver
+#   python setup.py install --root="$PWD/tmp_install" --optimize=1
+#   PYTHONPATH="$PWD/tmp_install/usr/lib/python3.9/site-packages:$PYTHONPATH" 
py.test
+# }
+
 package() {
   install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt
 
   cd salt-$pkgver
-  python2 setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" 
--optimize=1 --skip-build
+  python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" 
--optimize=1 --skip-build
 
   # default config
   install -Dm644 conf/master "$pkgdir/etc/salt/master"