Date: Friday, January 23, 2015 @ 23:04:44 Author: dwallace Revision: 126471
archrelease: copy trunk to community-any Added: salt/repos/community-any/PKGBUILD (from rev 126470, salt/trunk/PKGBUILD) salt/repos/community-any/salt.install (from rev 126470, salt/trunk/salt.install) Deleted: salt/repos/community-any/PKGBUILD salt/repos/community-any/salt.install --------------+ PKGBUILD | 177 ++++++++++++++++++++++++++++----------------------------- salt.install | 30 ++++----- 2 files changed, 104 insertions(+), 103 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-01-23 22:04:23 UTC (rev 126470) +++ PKGBUILD 2015-01-23 22:04:44 UTC (rev 126471) @@ -1,88 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contibutor: Christer Edwards <christer.edwa...@gmail.com> - -pkgbase=salt -pkgname=(salt-zmq salt-raet) -pkgver=2014.7.0 -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') -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=('3bbb6194f9146a5efad8963c9340d4cd') - -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 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 -} - -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-systemd') - python2 setup.py clean - python2 setup.py install --root="$pkgdir" --optimize=1 \ - --salt-pidfile-dir="/run/salt" --salt-transport=raet - - # 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 -} - -# vim:set ts=2 sw=2 et: Copied: salt/repos/community-any/PKGBUILD (from rev 126470, salt/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-01-23 22:04:44 UTC (rev 126471) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contibutor: Christer Edwards <christer.edwa...@gmail.com> + +pkgbase=salt +pkgname=(salt-zmq salt-raet) +pkgver=2014.7.1 +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') +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=('adc939b973cb317b1efe5b6e4b2c80d2') + +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 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 +} + +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-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" + + # 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 +} + +# vim:set ts=2 sw=2 et: Deleted: salt.install =================================================================== --- salt.install 2015-01-23 22:04:23 UTC (rev 126470) +++ salt.install 2015-01-23 22:04:44 UTC (rev 126471) @@ -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 126470, salt/trunk/salt.install) =================================================================== --- salt.install (rev 0) +++ salt.install 2015-01-23 22:04:44 UTC (rev 126471) @@ -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: