Date: Tuesday, August 25, 2015 @ 19:43:01 Author: dwallace Revision: 138758
archrelease: copy trunk to community-any Added: salt/repos/community-any/PKGBUILD (from rev 138757, salt/trunk/PKGBUILD) salt/repos/community-any/salt.install (from rev 138757, salt/trunk/salt.install) Deleted: salt/repos/community-any/0001-add-make-_prepare-an-alias-for-postinitio.patch salt/repos/community-any/PKGBUILD salt/repos/community-any/salt.install ------------------------------------------------------+ 0001-add-make-_prepare-an-alias-for-postinitio.patch | 93 ------- PKGBUILD | 205 ++++++++--------- salt.install | 30 +- 3 files changed, 114 insertions(+), 214 deletions(-) Deleted: 0001-add-make-_prepare-an-alias-for-postinitio.patch =================================================================== --- 0001-add-make-_prepare-an-alias-for-postinitio.patch 2015-08-25 17:42:00 UTC (rev 138757) +++ 0001-add-make-_prepare-an-alias-for-postinitio.patch 2015-08-25 17:43:01 UTC (rev 138758) @@ -1,93 +0,0 @@ -From 43950a5bc5ccb1b8f47235d889177a1df6d2bddb Mon Sep 17 00:00:00 2001 -From: Daniel Wallace <danielwall...@gtmanfred.com> -Date: Fri, 17 Jul 2015 18:12:28 -0500 -Subject: [PATCH] add make _prepare an alias for postinitio - -ioflo 1.2.1 deprecated postinitio, so if you have the newest version of -ioflo raet won't work. This just provides an alias for the new versions -of ioflo to keep everything working. - -closes #25432 ---- - salt/daemons/flo/core.py | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/salt/daemons/flo/core.py b/salt/daemons/flo/core.py -index 61c6c3b..8341cb5 100644 ---- a/salt/daemons/flo/core.py -+++ b/salt/daemons/flo/core.py -@@ -134,6 +134,8 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed): - RoadStack.Bk = raeting.BodyKind.msgpack.value - RoadStack.JoinentTimeout = 0.0 - -+ _prepare = postinitio -+ - def action(self): - ''' - enter action -@@ -237,6 +239,8 @@ class SaltRaetRoadStackJoiner(ioflo.base.deeding.Deed): - self.masters = daemons.extract_masters(self.opts.value) - # self.mha = (self.opts.value['master'], int(self.opts.value['master_port'])) - -+ _prepare = postinitio -+ - def action(self, **kwa): - ''' - Join with all masters -@@ -499,6 +503,8 @@ class SaltLoadModules(ioflo.base.deeding.Deed): - def postinitio(self): - self._load_modules() - -+ _prepare = postinitio -+ - def action(self): - self._load_modules() - -@@ -626,6 +632,8 @@ class SaltSchedule(ioflo.base.deeding.Deed): - self.modules.value, - self.returners.value) - -+ _prepare = postinitio -+ - def action(self): - ''' - Eval the schedule -@@ -665,6 +673,8 @@ class SaltRaetManorLaneSetup(ioflo.base.deeding.Deed): - ''' - pass - -+ _prepare = postinitio -+ - def action(self): - ''' - Run once at enter -@@ -1259,6 +1269,8 @@ class SaltRaetMasterEvents(ioflo.base.deeding.Deed): - def postinitio(self): - self.master_events.value = deque() - -+ _prepare = postinitio -+ - def action(self): - if not self.master_events.value: - return -@@ -1308,6 +1320,8 @@ class SaltRaetThreadShellJobber(ioflo.base.deeding.Deed): - def postinitio(self): - self.threads.value = deque() - -+ _prepare = postinitio -+ - def action(self): - ''' - Evaluate the fun options and execute them via salt-call -@@ -1383,6 +1397,8 @@ class SaltRaetNixJobber(ioflo.base.deeding.Deed): - self.serial = salt.payload.Serial(self.opts) - self.executors.value = {} - -+ _prepare = postinitio -+ - def _setup_jobber_stack(self): - ''' - Setup and return the LaneStack and Yard used by the jobber yard --- -2.3.2 (Apple Git-55) - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-08-25 17:42:00 UTC (rev 138757) +++ PKGBUILD 2015-08-25 17:43:01 UTC (rev 138758) @@ -1,106 +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=2015.5.3 -pkgrel=3 -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" - "0001-add-make-_prepare-an-alias-for-postinitio.patch") -md5sums=('7217299e13d929b8ac939d932f00f0f6' - 'df554edea892c6ac4dad4cabb52a58c2') - -prepare() { - cd $pkgbase-$pkgver - patch -Np1 -i $srcdir/0001-add-make-_prepare-an-alias-for-postinitio.patch -} - -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: Copied: salt/repos/community-any/PKGBUILD (from rev 138757, salt/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-08-25 17:43:01 UTC (rev 138758) @@ -0,0 +1,99 @@ +# $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=2015.5.5 +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=('1a8e9e658d900b314fc3720ba51cc663') + +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: salt.install =================================================================== --- salt.install 2015-08-25 17:42:00 UTC (rev 138757) +++ salt.install 2015-08-25 17:43:01 UTC (rev 138758) @@ -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 138757, salt/trunk/salt.install) =================================================================== --- salt.install (rev 0) +++ salt.install 2015-08-25 17:43:01 UTC (rev 138758) @@ -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: