[arch-commits] Commit in salt/repos (5 files)

Daniel Wallace dwallace at archlinux.org
Fri Jul 17 22:39:56 UTC 2015


    Date: Saturday, July 18, 2015 @ 00:39:56
  Author: dwallace
Revision: 137076

archrelease: copy trunk to community-any

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

----------------------------+
 /PKGBUILD                  |   99 +++++++++++++++++++++++++++++++++++++++++++
 /salt.install              |   15 ++++++
 community-any/PKGBUILD     |   98 ------------------------------------------
 community-any/salt.install |   15 ------
 4 files changed, 114 insertions(+), 113 deletions(-)

Deleted: community-any/PKGBUILD
===================================================================
--- community-any/PKGBUILD	2015-07-17 22:36:58 UTC (rev 137075)
+++ community-any/PKGBUILD	2015-07-17 22:39:56 UTC (rev 137076)
@@ -1,98 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contibutor: Christer Edwards <christer.edwards at gmail.com>
-
-pkgbase=salt
-pkgname=(salt-zmq salt-raet)
-pkgver=2015.5.3
-pkgrel=1
-pkgdesc='Central system and configuration manager'
-arch=('any')
-url='http://saltstack.org/'
-license=('Apache')
-makedepends=('python2'
-             'python2-jinja'
-             'python2-msgpack'
-             'python2-yaml'
-             'python2-markupsafe'
-             'python2-requests'
-             'python2-libnacl'
-             'python2-ioflo'
-             'python2-raet'
-             'python2-pyzmq'
-             'python2-crypto'
-             'python2-m2crypto'
-             'python2-systemd'
-             'python2-tornado')
-optdepends=('dmidecode: decode SMBIOS/DMI tables'
-            'python2-pygit2: gitfs support')
-backup=('etc/salt/master'
-        'etc/salt/minion')
-install=salt.install
-conflicts=('salt')
-source=("http://pypi.python.org/packages/source/s/salt/salt-$pkgver.tar.gz")
-md5sums=('7217299e13d929b8ac939d932f00f0f6')
-
-package_salt-zmq() {
-  cd $pkgbase-$pkgver
-  provides=('salt' 'salt-api')
-  replaces=('salt<=2014.1.13' 'salt-api<2014.7')
-  depends=('python2-jinja'
-           'python2-msgpack'
-           'python2-yaml'
-           'python2-markupsafe'
-           'python2-requests'
-           'python2-pyzmq'
-           'python2-crypto'
-           'python2-m2crypto'
-           'python2-systemd'
-           'python2-tornado')
-  python2 setup.py clean
-  python2 setup.py install --root="$pkgdir" --optimize=1 \
-    --salt-pidfile-dir="/run/salt"
-
-  # 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"
-}
-
-package_salt-raet() {
-  cd $pkgbase-$pkgver
-  provides=('salt' 'salt-api')
-  depends=('python2-jinja'
-           'python2-msgpack'
-           'python2-yaml'
-           'python2-markupsafe'
-           'python2-requests'
-           'python2-libnacl'
-           'python2-ioflo'
-           'python2-raet'
-           'python2-tornado'
-           'python2-systemd')
-  python2 setup.py clean
-  python2 setup.py --salt-transport=raet install --root="$pkgdir" --optimize=1 \
-    --salt-pidfile-dir="/run/salt"
-
-  # default config
-  install -Dm644 conf/master "$pkgdir/etc/salt/master"
-  install -Dm644 conf/minion "$pkgdir/etc/salt/minion"
-  install -d "$pkgdir/etc/salt/master.d/"
-  echo 'transport: raet' > "$pkgdir/etc/salt/master.d/transport.conf"
-
-  # 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 137075, salt/trunk/PKGBUILD)
===================================================================
--- community-any/PKGBUILD	                        (rev 0)
+++ community-any/PKGBUILD	2015-07-17 22:39:56 UTC (rev 137076)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contibutor: Christer Edwards <christer.edwards at gmail.com>
+
+pkgbase=salt
+pkgname=(salt-zmq salt-raet)
+pkgver=2015.5.3
+pkgrel=2
+pkgdesc='Central system and configuration manager'
+arch=('any')
+url='http://saltstack.org/'
+license=('Apache')
+makedepends=('python2'
+             'python2-jinja'
+             'python2-msgpack'
+             'python2-yaml'
+             'python2-markupsafe'
+             'python2-requests'
+             'python2-libnacl'
+             'python2-ioflo'
+             'python2-raet'
+             'python2-pyzmq'
+             'python2-crypto'
+             'python2-m2crypto'
+             'python2-systemd'
+             'python2-tornado')
+optdepends=('dmidecode: decode SMBIOS/DMI tables'
+            'python2-pygit2: gitfs support')
+backup=('etc/salt/master'
+        'etc/salt/minion')
+install=salt.install
+conflicts=('salt')
+source=("http://pypi.python.org/packages/source/s/salt/salt-$pkgver.tar.gz")
+md5sums=('7217299e13d929b8ac939d932f00f0f6')
+
+package_salt-zmq() {
+  cd $pkgbase-$pkgver
+  provides=('salt' 'salt-api')
+  replaces=('salt<=2014.1.13' 'salt-api<2014.7')
+  depends=('python2-jinja'
+           'python2-msgpack'
+           'python2-yaml'
+           'python2-markupsafe'
+           'python2-requests'
+           'python2-pyzmq'
+           'python2-crypto'
+           'python2-m2crypto'
+           'python2-systemd'
+           'python2-tornado')
+  python2 setup.py clean
+  python2 setup.py install --root="$pkgdir" --optimize=1 \
+    --salt-pidfile-dir="/run/salt"
+
+  # 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"
+}
+
+package_salt-raet() {
+  cd $pkgbase-$pkgver
+  provides=('salt' 'salt-api')
+  depends=('python2-jinja'
+           'python2-msgpack'
+           'python2-yaml'
+           'python2-markupsafe'
+           'python2-requests'
+           'python2-libnacl'
+           'python2-ioflo'
+           'python2-raet'
+           'python2-tornado'
+           'python2-systemd')
+  python2 setup.py clean
+  python2 setup.py --salt-transport=raet install --root="$pkgdir" --optimize=1 \
+    --salt-pidfile-dir="/run/salt"
+
+  # default config
+  install -Dm644 conf/master "$pkgdir/etc/salt/master"
+  install -Dm644 conf/minion "$pkgdir/etc/salt/minion"
+  install -d "$pkgdir/etc/salt/master.d/" "$pkgdir/etc/salt/minion.d/"
+  echo 'transport: raet' > "$pkgdir/etc/salt/master.d/transport.conf"
+  echo 'transport: raet' > "$pkgdir/etc/salt/minion.d/transport.conf"
+
+  # 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: community-any/salt.install
===================================================================
--- community-any/salt.install	2015-07-17 22:36:58 UTC (rev 137075)
+++ community-any/salt.install	2015-07-17 22:39:56 UTC (rev 137076)
@@ -1,15 +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
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

Copied: salt/repos/community-any/salt.install (from rev 137075, salt/trunk/salt.install)
===================================================================
--- community-any/salt.install	                        (rev 0)
+++ community-any/salt.install	2015-07-17 22:39:56 UTC (rev 137076)
@@ -0,0 +1,15 @@
+#!/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
+}
+
+# vim:set ts=2 sw=2 ft=sh et:



More information about the arch-commits mailing list