[arch-commits] Commit in salt/repos/community-any (4 files)
Johannes Löthberg
demize at archlinux.org
Wed Oct 24 18:42:31 UTC 2018
Date: Wednesday, October 24, 2018 @ 18:42:30
Author: demize
Revision: 398874
archrelease: copy trunk to community-any
Added:
salt/repos/community-any/PKGBUILD
(from rev 398873, salt/trunk/PKGBUILD)
salt/repos/community-any/salt.install
(from rev 398873, salt/trunk/salt.install)
Deleted:
salt/repos/community-any/PKGBUILD
salt/repos/community-any/salt.install
--------------+
PKGBUILD | 119 ++++++++++++++++++++++++++-------------------------------
salt.install | 44 ++++++++++-----------
2 files changed, 78 insertions(+), 85 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-24 18:42:26 UTC (rev 398873)
+++ PKGBUILD 2018-10-24 18:42:30 UTC (rev 398874)
@@ -1,63 +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=2018.3.2
-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=('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/salt/master'
- 'etc/salt/minion')
-
-install=salt.install
-source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz"
- https://github.com/saltstack/salt/commit/736b382e913e46bce69940350e32d530f7560dac.patch)
-md5sums=('6de86799b65ca4cc0305f5f1d61bc524'
- '693cfe46003ecfd0bbd9aefea49935c2')
-
-prepare() {
- cd salt-$pkgver
- patch -p1 <"$srcdir"/736b382e913e46bce69940350e32d530f7560dac.patch
-}
-
-package() {
- cd salt-$pkgver
- python2 setup.py clean
- python2 setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1
-
- # 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 398873, salt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-24 18:42:30 UTC (rev 398874)
@@ -0,0 +1,56 @@
+# 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=2018.3.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/salt/master'
+ 'etc/salt/minion')
+
+install=salt.install
+source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz")
+md5sums=('13ba421e4bea1f33617b30b1116a9d32')
+
+package() {
+ cd salt-$pkgver
+ python2 setup.py clean
+ python2 setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1
+
+ # 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 2018-10-24 18:42:26 UTC (rev 398873)
+++ salt.install 2018-10-24 18:42:30 UTC (rev 398874)
@@ -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 398873, salt/trunk/salt.install)
===================================================================
--- salt.install (rev 0)
+++ salt.install 2018-10-24 18:42:30 UTC (rev 398874)
@@ -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:
More information about the arch-commits
mailing list