[arch-commits] Commit in salt/repos/community-any (6 files)
Morten Linderud
foxboron at gemini.archlinux.org
Sun Dec 19 18:36:15 UTC 2021
Date: Sunday, December 19, 2021 @ 18:36:15
Author: foxboron
Revision: 1079084
archrelease: copy trunk to community-any
Added:
salt/repos/community-any/PKGBUILD
(from rev 1079083, salt/trunk/PKGBUILD)
salt/repos/community-any/salt.install
(from rev 1079083, salt/trunk/salt.install)
salt/repos/community-any/salt.logrotate
(from rev 1079083, salt/trunk/salt.logrotate)
Deleted:
salt/repos/community-any/PKGBUILD
salt/repos/community-any/salt.install
salt/repos/community-any/salt.logrotate
----------------+
PKGBUILD | 167 ++++++++++++++++++++++++++++---------------------------
salt.install | 44 +++++++-------
salt.logrotate | 24 +++----
3 files changed, 120 insertions(+), 115 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-19 18:36:06 UTC (rev 1079083)
+++ PKGBUILD 2021-12-19 18:36:15 UTC (rev 1079084)
@@ -1,81 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: Sébastien Luttringer
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Christer Edwards <christer.edwards at gmail.com>
-# Contributor: zer0def <zer0def at github>
-
-pkgname=salt
-pkgver=3004
-pkgrel=3
-
-pkgdesc='Central system and configuration manager'
-arch=('any')
-url='http://saltstack.org/'
-license=('Apache')
-
-replaces=('salt-zmq' 'salt-raet')
-conflicts=('salt-zmq' 'salt-raet')
-
-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'
- 'python-pygit2: gitfs support')
-#checkdepends=('python-pytest' 'python-psutil')
-
-backup=('etc/logrotate.d/salt'
- 'etc/salt/master'
- 'etc/salt/minion')
-
-install=salt.install
-source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz"
- salt.logrotate)
-
-sha256sums=('3d53561bc86e014dca2ec3dc981079be04d55ea047890cabde25e5b10bfa5b13'
- 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
-
-prepare() {
- sed -i '/^contextvars/d' $pkgname-$pkgver/requirements/base.txt
-}
-
-build() {
- cd salt-$pkgver
- 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.10/site-packages:$PYTHONPATH" py.test
-# }
-
-package() {
- install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt
-
- cd salt-$pkgver
-
- python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 --skip-build
-
- # default config
- 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 -v -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
- done
- 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:
Copied: salt/repos/community-any/PKGBUILD (from rev 1079083, salt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-19 18:36:15 UTC (rev 1079084)
@@ -0,0 +1,86 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Sébastien Luttringer
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Christer Edwards <christer.edwards at gmail.com>
+# Contributor: zer0def <zer0def at github>
+
+pkgname=salt
+pkgver=3004
+pkgrel=4
+
+pkgdesc='Central system and configuration manager'
+arch=('any')
+url='http://saltstack.org/'
+license=('Apache')
+
+replaces=('salt-zmq' 'salt-raet')
+conflicts=('salt-zmq' 'salt-raet')
+
+depends=('python-jinja'
+ 'python-msgpack'
+ 'python-yaml'
+ 'python-markupsafe'
+ 'python-requests'
+ 'python-pyzmq'
+ 'python-m2crypto'
+ 'python-systemd'
+ 'python-distro'
+ 'python-importlib-metadata'
+ 'python-pycryptodomex')
+optdepends=('dmidecode: decode SMBIOS/DMI tables'
+ 'python-pygit2: gitfs support')
+#checkdepends=('python-pytest' 'python-psutil')
+
+backup=('etc/logrotate.d/salt'
+ 'etc/salt/master'
+ 'etc/salt/minion')
+
+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() {
+ cd salt-$pkgver
+ patch -Np1 < "$srcdir/patch-requirements.patch"
+ sed -i '/^contextvars/d' requirements/base.txt
+}
+
+build() {
+ cd salt-$pkgver
+ 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.10/site-packages:$PYTHONPATH" py.test
+# }
+
+package() {
+ install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt
+
+ cd salt-$pkgver
+
+ python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 --skip-build
+
+ # default config
+ 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 -v -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc"
+ done
+ 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:
Deleted: salt.install
===================================================================
--- salt.install 2021-12-19 18:36:06 UTC (rev 1079083)
+++ salt.install 2021-12-19 18:36:15 UTC (rev 1079084)
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if [[ "$(vercmp $2 2014.1.1-1)" -le 0 ]]; then
- cat << EOF
-==> Since version 2014.1.1-2, salt-master runs by default as root user.
-==> You need to manually update your configuration and remove the salt user and
-==> group to follow the new default behavior.
-EOF
- fi
-
- if [[ "$(vercmp $2 2016.3.3-1)" -le 0 ]]; then
- cat << EOF
-==> Since version 2016.3.3-2 RAET is no longer supported. Please switch to either
-==> zeromq or tcp for transport instead.
-EOF
- fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: salt/repos/community-any/salt.install (from rev 1079083, salt/trunk/salt.install)
===================================================================
--- salt.install (rev 0)
+++ salt.install 2021-12-19 18:36:15 UTC (rev 1079084)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [[ "$(vercmp $2 2014.1.1-1)" -le 0 ]]; then
+ cat << EOF
+==> Since version 2014.1.1-2, salt-master runs by default as root user.
+==> You need to manually update your configuration and remove the salt user and
+==> group to follow the new default behavior.
+EOF
+ fi
+
+ if [[ "$(vercmp $2 2016.3.3-1)" -le 0 ]]; then
+ cat << EOF
+==> Since version 2016.3.3-2 RAET is no longer supported. Please switch to either
+==> zeromq or tcp for transport instead.
+EOF
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: salt.logrotate
===================================================================
--- salt.logrotate 2021-12-19 18:36:06 UTC (rev 1079083)
+++ salt.logrotate 2021-12-19 18:36:15 UTC (rev 1079084)
@@ -1,12 +0,0 @@
-/var/log/salt/master
-/var/log/salt/minion
-/var/log/salt/key
-/var/log/salt/cloud
-/var/log/salt/ssh
- {
- compress
- copytruncate
- missingok
- notifempty
- rotate 7
-}
Copied: salt/repos/community-any/salt.logrotate (from rev 1079083, salt/trunk/salt.logrotate)
===================================================================
--- salt.logrotate (rev 0)
+++ salt.logrotate 2021-12-19 18:36:15 UTC (rev 1079084)
@@ -0,0 +1,12 @@
+/var/log/salt/master
+/var/log/salt/minion
+/var/log/salt/key
+/var/log/salt/cloud
+/var/log/salt/ssh
+ {
+ compress
+ copytruncate
+ missingok
+ notifempty
+ rotate 7
+}
More information about the arch-commits
mailing list