[arch-commits] Commit in salt/repos/community-any (6 files)

Johannes Löthberg demize at archlinux.org
Thu Apr 30 16:21:17 UTC 2020


    Date: Thursday, April 30, 2020 @ 16:21:16
  Author: demize
Revision: 623338

archrelease: copy trunk to community-any

Added:
  salt/repos/community-any/PKGBUILD
    (from rev 623337, salt/trunk/PKGBUILD)
  salt/repos/community-any/salt.install
    (from rev 623337, salt/trunk/salt.install)
  salt/repos/community-any/salt.logrotate
    (from rev 623337, salt/trunk/salt.logrotate)
Deleted:
  salt/repos/community-any/PKGBUILD
  salt/repos/community-any/salt.install
  salt/repos/community-any/salt.logrotate

----------------+
 PKGBUILD       |  132 +++++++++++++++++++++++++++----------------------------
 salt.install   |   44 +++++++++---------
 salt.logrotate |   24 +++++-----
 3 files changed, 100 insertions(+), 100 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-30 16:21:10 UTC (rev 623337)
+++ PKGBUILD	2020-04-30 16:21:16 UTC (rev 623338)
@@ -1,66 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Sébastien Luttringer
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Christer Edwards <christer.edwards at gmail.com>
-
-pkgname=salt
-pkgver=2019.2.3
-pkgrel=1
-
-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=('python2-jinja'
-         'python2-msgpack'
-         'python2-yaml'
-         'python2-markupsafe'
-         'python2-requests'
-         'python2-pyzmq'
-         'python2-crypto'
-         'python2-m2crypto'
-         'python2-systemd'
-         'python2-tornado'
-         'python2-futures')
-optdepends=('dmidecode: decode SMBIOS/DMI tables'
-            'python2-pygit2: gitfs support')
-
-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=('7497e7dbfd4dc3799bbbc8da63da98b8301bbb644150f3905fe5775a7d81271a'
-            'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
-
-build() {
-  cd salt-$pkgver
-  python2 setup.py build
-}
-
-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
-
-  # default config
-  install -Dm644 conf/master "$pkgdir/etc/salt/master"
-  install -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"
-  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"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: salt/repos/community-any/PKGBUILD (from rev 623337, salt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-30 16:21:16 UTC (rev 623338)
@@ -0,0 +1,66 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Sébastien Luttringer
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Christer Edwards <christer.edwards at gmail.com>
+
+pkgname=salt
+pkgver=2019.2.4
+pkgrel=1
+
+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=('python2-jinja'
+         'python2-msgpack'
+         'python2-yaml'
+         'python2-markupsafe'
+         'python2-requests'
+         'python2-pyzmq'
+         'python2-crypto'
+         'python2-m2crypto'
+         'python2-systemd'
+         'python2-tornado'
+         'python2-futures')
+optdepends=('dmidecode: decode SMBIOS/DMI tables'
+            'python2-pygit2: gitfs support')
+
+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=('afeb1c95db61c9008f95259c0b27e525c8a9957cbc6f51c40e824a92637d2847'
+            'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
+
+build() {
+  cd salt-$pkgver
+  python2 setup.py build
+}
+
+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
+
+  # default config
+  install -Dm644 conf/master "$pkgdir/etc/salt/master"
+  install -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"
+  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"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: salt.install
===================================================================
--- salt.install	2020-04-30 16:21:10 UTC (rev 623337)
+++ salt.install	2020-04-30 16:21:16 UTC (rev 623338)
@@ -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 623337, salt/trunk/salt.install)
===================================================================
--- salt.install	                        (rev 0)
+++ salt.install	2020-04-30 16:21:16 UTC (rev 623338)
@@ -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	2020-04-30 16:21:10 UTC (rev 623337)
+++ salt.logrotate	2020-04-30 16:21:16 UTC (rev 623338)
@@ -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 623337, salt/trunk/salt.logrotate)
===================================================================
--- salt.logrotate	                        (rev 0)
+++ salt.logrotate	2020-04-30 16:21:16 UTC (rev 623338)
@@ -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