Date: Wednesday, October 19, 2016 @ 20:16:57 Author: demize Revision: 192621
upgpkg: salt 2016.3.3-2 Drop RAET support which is dead anyway, and rename salt-zeromq to salt. Modified: salt/trunk/PKGBUILD salt/trunk/salt.install --------------+ PKGBUILD | 100 ++++++++++++++++++--------------------------------------- salt.install | 11 +++++- 2 files changed, 41 insertions(+), 70 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-19 17:50:51 UTC (rev 192620) +++ PKGBUILD 2016-10-19 20:16:57 UTC (rev 192621) @@ -4,88 +4,52 @@ # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Christer Edwards <christer.edwa...@gmail.com> -pkgbase=salt -pkgname=(salt-zmq salt-raet) +pkgname=salt pkgver=2016.3.3 -pkgrel=1 +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=("salt-$pkgver.tar.gz::https://github.com/saltstack/salt/archive/v$pkgver.tar.gz") -md5sums=('5db25ad762a0780ff5d74561516a97fa') -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 --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 +replaces=('salt-zmq' 'salt-raet') +conflicts=('salt-zmq' 'salt-raet') - # default config - install -Dm644 conf/master "$pkgdir/etc/salt/master" - install -Dm644 conf/minion "$pkgdir/etc/salt/minion" +depends=( + 'python2-jinja' + 'python2-msgpack' + 'python2-yaml' + 'python2-markupsafe' + 'python2-requests' + 'python2-pyzmq' + 'python2-crypto' + 'python2-m2crypto' + 'python2-systemd' + 'python2-tornado' +) +optdepends=( + 'dmidecode: decode SMBIOS/DMI tables' + 'python2-pygit2: gitfs support' +) - # 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" -} +backup=( + 'etc/salt/master' + 'etc/salt/minion' +) -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') +install=salt.install +source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz") +md5sums=('47dc52c372c42535b99cb04ebb21947b') + +package() { + cd salt-$pkgver python2 setup.py clean - python2 setup.py --salt-pidfile-dir="/run/salt" --salt-transport=raet install --root="$pkgdir" --optimize=1 + 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" - 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 Modified: salt.install =================================================================== --- salt.install 2016-10-19 17:50:51 UTC (rev 192620) +++ salt.install 2016-10-19 20:16:57 UTC (rev 192621) @@ -3,13 +3,20 @@ # arg 1: the new package version # arg 2: the old package version post_upgrade() { - if [ "$(vercmp $2 2014.1.1-1)" -le 0 ]; then + 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 + 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: