Commit 5c42c3e1 authored by Olivier Mauras's avatar Olivier Mauras Committed by Jakub Jirutka
Browse files

community/salt: Update to 2016.3.4

parent 86e593f1
Upstream code not yet released
Upstream code not released yet that will happen in next major version
---
diff --git a/salt/modules/apk.py b/salt/modules/apk.py
new file mode 100644
......@@ -626,17 +627,18 @@ index 0000000..4c0efe0
+
+ return ret
diff --git a/salt/modules/gentoo_service.py b/salt/modules/gentoo_service.py
index 92cf48a..32dfcde 100644
index 228a3fe..32dfcde 100644
--- a/salt/modules/gentoo_service.py
+++ b/salt/modules/gentoo_service.py
@@ -12,6 +12,14 @@ to the correct service manager
@@ -12,9 +12,14 @@ to the correct service manager
# Import Python libs
from __future__ import absolute_import
+import logging
+
-# Import Salt modules
+# Import salt libs
+import salt.utils.systemd
import salt.utils.systemd
+import salt.utils.odict as odict
+
+# Set up logging
......@@ -644,14 +646,15 @@ index 92cf48a..32dfcde 100644
# Define the module's virtual name
__virtualname__ = 'service'
@@ -19,12 +27,65 @@ __virtualname__ = 'service'
@@ -22,13 +27,65 @@ __virtualname__ = 'service'
def __virtual__():
'''
- Only work on systems which default to systemd
+ Only work on systems which default to OpenRC
'''
- if __grains__['os'] == 'Gentoo':
- if __grains__['os'] == 'Gentoo' \
- and not salt.utils.systemd.booted(__context__):
+ if __grains__['os'] == 'Gentoo' and not salt.utils.systemd.booted(__context__):
+ return __virtualname__
+ if __grains__['os'] == 'Alpine':
......@@ -713,7 +716,7 @@ index 92cf48a..32dfcde 100644
def get_enabled():
@@ -37,15 +98,8 @@ def get_enabled():
@@ -41,15 +98,8 @@ def get_enabled():
salt '*' service.get_enabled
'''
......@@ -731,7 +734,7 @@ index 92cf48a..32dfcde 100644
def get_disabled():
@@ -58,17 +112,9 @@ def get_disabled():
@@ -62,17 +112,9 @@ def get_disabled():
salt '*' service.get_disabled
'''
......@@ -752,7 +755,7 @@ index 92cf48a..32dfcde 100644
def available(name):
@@ -82,7 +128,9 @@ def available(name):
@@ -86,7 +128,9 @@ def available(name):
salt '*' service.available sshd
'''
......@@ -763,7 +766,7 @@ index 92cf48a..32dfcde 100644
def missing(name):
@@ -97,7 +145,7 @@ def missing(name):
@@ -101,7 +145,7 @@ def missing(name):
salt '*' service.missing sshd
'''
......@@ -772,7 +775,7 @@ index 92cf48a..32dfcde 100644
def get_all():
@@ -110,7 +158,10 @@ def get_all():
@@ -114,7 +158,10 @@ def get_all():
salt '*' service.get_all
'''
......@@ -784,7 +787,7 @@ index 92cf48a..32dfcde 100644
def start(name):
@@ -123,8 +174,8 @@ def start(name):
@@ -127,8 +174,8 @@ def start(name):
salt '*' service.start <service name>
'''
......@@ -795,7 +798,7 @@ index 92cf48a..32dfcde 100644
def stop(name):
@@ -137,8 +188,8 @@ def stop(name):
@@ -141,8 +188,8 @@ def stop(name):
salt '*' service.stop <service name>
'''
......@@ -806,7 +809,7 @@ index 92cf48a..32dfcde 100644
def restart(name):
@@ -151,8 +202,36 @@ def restart(name):
@@ -155,8 +202,36 @@ def restart(name):
salt '*' service.restart <service name>
'''
......@@ -845,7 +848,7 @@ index 92cf48a..32dfcde 100644
def status(name, sig=None):
@@ -167,7 +246,10 @@ def status(name, sig=None):
@@ -171,7 +246,10 @@ def status(name, sig=None):
salt '*' service.status <service name> [service signature]
'''
......@@ -857,7 +860,7 @@ index 92cf48a..32dfcde 100644
def enable(name, **kwargs):
@@ -178,10 +260,26 @@ def enable(name, **kwargs):
@@ -182,10 +260,26 @@ def enable(name, **kwargs):
.. code-block:: bash
......@@ -887,7 +890,7 @@ index 92cf48a..32dfcde 100644
def disable(name, **kwargs):
@@ -192,10 +290,18 @@ def disable(name, **kwargs):
@@ -196,10 +290,18 @@ def disable(name, **kwargs):
.. code-block:: bash
......@@ -909,7 +912,7 @@ index 92cf48a..32dfcde 100644
def enabled(name, **kwargs):
@@ -206,9 +312,17 @@ def enabled(name, **kwargs):
@@ -210,9 +312,17 @@ def enabled(name, **kwargs):
.. code-block:: bash
......@@ -929,7 +932,7 @@ index 92cf48a..32dfcde 100644
def disabled(name):
@@ -219,6 +333,6 @@ def disabled(name):
@@ -223,6 +333,6 @@ def disabled(name):
.. code-block:: bash
......@@ -937,3 +940,6 @@ index 92cf48a..32dfcde 100644
+ salt '*' service.disabled <service name> <runlevels=[runlevel]>
'''
return name in get_disabled()
--
2.10.0
......@@ -2,8 +2,8 @@
# Contributor: Olivier Mauras <olivier@mauras.ch>
# Maintainer: Olivier Mauras <olivier@mauras.ch>
pkgname=salt
pkgver=2016.3.3
pkgrel=9
pkgver=2016.3.4
pkgrel=0
pkgdesc="A parallel remote execution system"
url="https://github.com/saltstack/salt"
arch="noarch"
......@@ -110,7 +110,7 @@ _conf_copy() {
cp -r "$builddir"/conf/$type* "$subpkgdir"/etc/salt/
}
md5sums="5db25ad762a0780ff5d74561516a97fa salt-2016.3.3.tar.gz
md5sums="1ce25b16c7d4de5058cad59cdc7651f1 salt-2016.3.4.tar.gz
322f17cc48aabdc8cbf5f0bccf3e2059 salt-api.confd
014e02c0aafafcd74179e32f5a3b55a8 salt-api.initd
7bb58f256213aaaa23d86d5127c9ffe3 salt-master.confd
......@@ -119,8 +119,8 @@ md5sums="5db25ad762a0780ff5d74561516a97fa salt-2016.3.3.tar.gz
c8326b9cff0df6065a1320eefea09b2c salt-minion.initd
a24d13b018a35b31b34167bcaa749db5 salt-syndic.confd
dffce15d3a16a2dc40dd02d0c24fb4c6 salt-syndic.initd
49349ad8522a07226ed1aaeaab15c695 0001-alpine-support.patch"
sha256sums="7d09bc9142d96ecdfe779cf813e43ab62b9b4632f6e0711af383809661b87e1d salt-2016.3.3.tar.gz
1e1707f34e0f9af609ad1cd66d1b2c11 0001-alpine-support.patch"
sha256sums="09112bffb004afc78c68a2cd4cfd30e17570f7f5a37d409143218077ff8c2cc7 salt-2016.3.4.tar.gz
b25cfdb769305f2245b27f6753adee590bac10faeb8c43ba605dbf7e931fe258 salt-api.confd
f8918f2819b81e69af1b8564b90ec370942ed733aefd4b97e5d2446a892880eb salt-api.initd
383475b21261ac22c5930e99060d53630dfb35aac67aa03a18ec738e0f4dff50 salt-master.confd
......@@ -129,8 +129,8 @@ f8918f2819b81e69af1b8564b90ec370942ed733aefd4b97e5d2446a892880eb salt-api.initd
ae9236919c3fee3eef0ef8ad54334d6f833a51bbd4d42c40214614498acbe573 salt-minion.initd
66a663c426e2fa157ea78f7f9b2f33f17b72dbc48e119f8dd2609aab8f8370e7 salt-syndic.confd
6a453f63e51f2cc1ecb024ee8e7fa1beab7fbcea010f3eb10ea23bdb2383e7f5 salt-syndic.initd
d1a4868c389fa95b3fb97e39eaead450857ce1f779f2288666838ca97956bfe3 0001-alpine-support.patch"
sha512sums="89a6f9e7d8a337ec5addda2374c833d251162150c4e57ce34f7f9e81a75f540539071064c0e7c4486ef6e447c6422363f868e9b035e4c5af2f3d320e98e0226d salt-2016.3.3.tar.gz
c38f11633625ce968a64d85819f7fa494d8734517ec3f70afb9be2ac402173da 0001-alpine-support.patch"
sha512sums="16305a4321cb12044639ee975bafe79a7ed1edd5607e5dc98a78eabf3cfbd23d51e2c4281a68693fa7924725698ef9378416b65ef21a603efaf9e1bc064aa2a2 salt-2016.3.4.tar.gz
975ba2f5e681fbd62045da61cc3dc065b148683a07b5df7eca9f131e47314eb6bfa8660ca1c06a3bd93683c7097d0ff9f8e514273dd24d82fb2de6a255e6b275 salt-api.confd
435d399bfecf431d0c713031e2ae57ce25b5c6edc98b62f33bd7a4ff1c587e3cdeb988445ae0c3e9ffc1911555c3694654d98815f9562b8a14bf0688ec1ebea6 salt-api.initd
cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f0941b7348a3af6d1dca7cd6f2bcb3612ca10e1ec98997e5a salt-master.confd
......@@ -139,4 +139,4 @@ cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f
c6634a592c6f3e65dd2b704cb500486bf8004c5b287d4a4d42b09af36ef129c59d6a89f005af058cf7911e8587d927b3db931186569084f13ebaca56f6ef93a0 salt-minion.initd
bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd
d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd
ebb30fd9e63c87d6acbaab588f474b1c3ee503be4535a868af041435eab334d7ad841814a4a4b385cb2c5ae0d10b597d1de7073af05606dee846d864973553e5 0001-alpine-support.patch"
5581671e030f6af53b48016aa31e80b1908cb15721f3b113b9945484616f5cd6e22af80f6f25b2d68044bf8f59be9673a8a0577f6c2f4422130f5055bb960b35 0001-alpine-support.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment