cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to salt-2016.3.2.

Browse Source
This commit is contained in:
ajacoutot 2016-07-30 14:27:29 +00:00
parent 3053051a4c
commit 793a5adac7
5 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/salt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.94 2016/07/10 08:50:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.95 2016/07/30 14:27:29 ajacoutot Exp $
# optional dependencies
# https://github.com/saltstack/salt/blob/develop/doc/conf.py#L42
@ -15,9 +15,8 @@
COMMENT = remote execution and configuration management system
MODPY_EGG_VERSION = 2016.3.1
MODPY_EGG_VERSION = 2016.3.2
DISTNAME = salt-${MODPY_EGG_VERSION}
REVISION = 1
CATEGORIES = sysutils net devel

4
sysutils/salt/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (salt-2016.3.1.tar.gz) = 5r26RpMRZDDCr1dJfrYzmeOhOawKcBb6CHC0n76Yf3U=
SIZE (salt-2016.3.1.tar.gz) = 7932479
SHA256 (salt-2016.3.2.tar.gz) = aoS3JNArDbpDjepXZQckBkZ12CYg5mdJvS/o8h2nG+A=
SIZE (salt-2016.3.2.tar.gz) = 8014793

28
sysutils/salt/patches/patch-salt_modules_mount_py
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-salt_modules_mount_py,v 1.9 2016/06/16 16:37:23 ajacoutot Exp $
https://github.com/saltstack/salt/commit/afd7836711c7b01611df563101243f644345d969
--- salt/modules/mount.py.orig Tue Jun 14 00:17:49 2016
+++ salt/modules/mount.py Thu Jun 16 10:39:32 2016
@@ -140,10 +140,10 @@ def _active_mounts_openbsd(ret):
'''
for line in __salt__['cmd.run_stdout']('mount -v').split('\n'):
comps = re.sub(r"\s+", " ", line).split()
- nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
- nod = ' '.join(nod.split()).split(" ")
parens = re.findall(r'\((.*?)\)', line, re.DOTALL)
if len(parens) > 1:
+ nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
+ nod = ' '.join(nod.split()).split(" ")
ret[comps[3]] = {'device': comps[0],
'fstype': comps[5],
'opts': _resolve_user_group_names(parens[1].split(", ")),
@@ -153,7 +153,7 @@ def _active_mounts_openbsd(ret):
else:
ret[comps[2]] = {'device': comps[0],
'fstype': comps[4],
- 'opts': _resolve_user_group_names(parens[1].split(", "))}
+ 'opts': _resolve_user_group_names(parens[0].split(", "))}
return ret

8
sysutils/salt/patches/patch-salt_states_archive_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-salt_states_archive_py,v 1.2 2016/07/11 14:24:32 ajacoutot Exp $
$OpenBSD: patch-salt_states_archive_py,v 1.3 2016/07/30 14:27:29 ajacoutot Exp $
https://github.com/saltstack/salt/commit/701f4d13abb26236f31bbfcf2cd2a9dfad26d43f
--- salt/states/archive.py.orig Sun Jul 10 10:47:47 2016
+++ salt/states/archive.py Sun Jul 10 10:47:54 2016
@@ -350,6 +350,9 @@ def extracted(name,
--- salt/states/archive.py.orig Mon Jul 25 23:24:23 2016
+++ salt/states/archive.py Sat Jul 30 07:56:59 2016
@@ -450,6 +450,9 @@ def extracted(name,
append_opt = append_opt.replace('x', '').replace('f', '')
tar_shortopts = tar_shortopts + append_opt

4
sysutils/salt/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.37 2016/06/16 06:30:20 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.38 2016/07/30 14:27:29 ajacoutot Exp $
@ask-update salt-<2014.1.5p0 Make sure the _salt-master user does not exist
@comment needs a homedir to store ssh keys for GitFS
@newgroup _salt:722
@ -704,6 +704,8 @@ lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/dbhandle.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/dbhandle.pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/exceptions.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/kiwiproc.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/kiwiproc.pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/query.py
lib/python${MODPY_VERSION}/site-packages/salt/modules/inspectlib/query.pyc
lib/python${MODPY_VERSION}/site-packages/salt/modules/introspect.py