Attachment 170578 Details for Bug 209721 – patch

[patch] patch

py-salt-2015.8.10.diff.txt (text/plain), 8.00 KB, created by Christer Edwards on 2016-05-23 18:49:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2016-05-23 18:49:25 UTC

Size: 8.00 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2015.8.10/Makefile
>--- py-salt/Makefile	2016-04-06 14:11:24.000000000 -0600
>+++ py-salt-2015.8.10/Makefile	2016-05-20 11:34:12.909175244 -0600
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/py-salt/Makefile 412641 2016-04-06 20:11:24Z madpilot $
> 
> PORTNAME=	salt
>-PORTVERSION=	2015.8.8
>-PORTREVISION=	1
>+PORTVERSION=	2015.8.10
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/distinfo py-salt-2015.8.10/distinfo
>--- py-salt/distinfo	2016-03-24 08:08:09.000000000 -0600
>+++ py-salt-2015.8.10/distinfo	2016-05-20 11:35:48.559164510 -0600
>@@ -1,2 +1,3 @@
>-SHA256 (salt-2015.8.8.tar.gz) = b2ecce7bf562cfcd6586d66ade278f268bb89023f0fa0accaa55f90b8a668ef5
>-SIZE (salt-2015.8.8.tar.gz) = 6982904
>+TIMESTAMP = 1463765748
>+SHA256 (salt-2015.8.10.tar.gz) = 4a81273ab4b01e0f1d29b28ab99a16eb94e5c430107b05491c94f3baf8b95c99
>+SIZE (salt-2015.8.10.tar.gz) = 6972776
>diff -ruN py-salt/files/patch-salt__config.py py-salt-2015.8.10/files/patch-salt__config.py
>--- py-salt/files/patch-salt__config.py	2016-04-06 14:11:24.000000000 -0600
>+++ py-salt-2015.8.10/files/patch-salt__config.py	1969-12-31 17:00:00.000000000 -0700
>@@ -1,116 +0,0 @@
>-diff --git a/salt/config.py b/salt/config.py
>-index 071e06b..1f83c33 100644
>---- salt/config.py.orig
>-+++ salt/config.py
>-@@ -63,7 +63,7 @@
>- 
>- VALID_OPTS = {
>-     # The address of the salt master. May be specified as IP address or hostname
>--    'master': str,
>-+    'master': (str, list),
>- 
>-     # The TCP/UDP port of the master to connect to in order to listen to publications
>-     'master_port': int,
>-@@ -541,7 +541,7 @@
>-     'file_recv': bool,
>-     'file_recv_max_size': int,
>-     'file_ignore_regex': list,
>--    'file_ignore_glob': bool,
>-+    'file_ignore_glob': list,
>-     'fileserver_backend': list,
>-     'fileserver_followsymlinks': bool,
>-     'fileserver_ignoresymlinks': bool,
>-@@ -833,7 +833,7 @@
>-     'file_recv': False,
>-     'file_recv_max_size': 100,
>-     'file_ignore_regex': [],
>--    'file_ignore_glob': None,
>-+    'file_ignore_glob': [],
>-     'fileserver_backend': ['roots'],
>-     'fileserver_followsymlinks': True,
>-     'fileserver_ignoresymlinks': False,
>-@@ -1348,26 +1348,30 @@ def _validate_opts(opts):
>-     Check that all of the types of values passed into the config are
>-     of the right types
>-     '''
>-+    def format_multi_opt(valid_type):
>-+        try:
>-+            num_types = len(valid_type)
>-+        except TypeError:
>-+            # Bare type name won't have a length, return the name of the type
>-+            # passed.
>-+            return valid_type.__name__
>-+        else:
>-+            if num_types == 1:
>-+                return valid_type.__name__
>-+            elif num_types > 1:
>-+                ret = ', '.join(x.__name__ for x in valid_type[:-1])
>-+                ret += ' or ' + valid_type[-1].__name__
>-+
>-     errors = []
>--    err = ('Key {0} with value {1} has an invalid type of {2}, a {3} is '
>-+
>-+    err = ('Key \'{0}\' with value {1} has an invalid type of {2}, a {3} is '
>-            'required for this value')
>-     for key, val in six.iteritems(opts):
>-         if key in VALID_OPTS:
>--            if isinstance(VALID_OPTS[key](), list):
>--                if isinstance(val, VALID_OPTS[key]):
>--                    continue
>--                else:
>--                    errors.append(
>--                        err.format(key, val, type(val).__name__, 'list')
>--                    )
>--            if isinstance(VALID_OPTS[key](), dict):
>--                if isinstance(val, VALID_OPTS[key]):
>--                    continue
>--                else:
>--                    errors.append(
>--                        err.format(key, val, type(val).__name__, 'dict')
>--                    )
>--            else:
>-+            if isinstance(val, VALID_OPTS[key]):
>-+                continue
>-+
>-+            if hasattr(VALID_OPTS[key], '__call__'):
>-                 try:
>-                     VALID_OPTS[key](val)
>-                     if isinstance(val, (list, dict)):
>-@@ -1384,14 +1388,21 @@ def _validate_opts(opts):
>-                                 VALID_OPTS[key].__name__
>-                             )
>-                         )
>--                except ValueError:
>-+                except (TypeError, ValueError):
>-                     errors.append(
>--                        err.format(key, val, type(val).__name__, VALID_OPTS[key])
>--                    )
>--                except TypeError:
>--                    errors.append(
>--                        err.format(key, val, type(val).__name__, VALID_OPTS[key])
>-+                        err.format(key,
>-+                                   val,
>-+                                   type(val).__name__,
>-+                                   VALID_OPTS[key].__name__)
>-                     )
>-+                continue
>-+
>-+            errors.append(
>-+                err.format(key,
>-+                           val,
>-+                           type(val).__name__,
>-+                           format_multi_opt(VALID_OPTS[key].__name__))
>-+            )
>- 
>-     # RAET on Windows uses 'win32file.CreateMailslot()' for IPC. Due to this,
>-     # sock_dirs must start with '\\.\mailslot\' and not contain any colons.
>-@@ -1404,7 +1415,7 @@ def _validate_opts(opts):
>-                 '\\\\.\\mailslot\\' + opts['sock_dir'].replace(':', ''))
>- 
>-     for error in errors:
>--        log.warning(error)
>-+        log.debug(error)
>-     if errors:
>-         return False
>-     return True
>-
>diff -ruN py-salt/files/patch-salt__grains__core.py py-salt-2015.8.10/files/patch-salt__grains__core.py
>--- py-salt/files/patch-salt__grains__core.py	2015-05-23 21:25:44.000000000 -0600
>+++ py-salt-2015.8.10/files/patch-salt__grains__core.py	1969-12-31 17:00:00.000000000 -0700
>@@ -1,11 +0,0 @@
>---- salt/grains/core.py.orig	2015-04-17 18:44:50 UTC
>-+++ salt/grains/core.py
>-@@ -1387,7 +1387,7 @@ def path():
>-     '''
>-     # Provides:
>-     #   path
>--    return {'path': os.environ.get('PATH', '').strip()}
>-+    return {'path': os.environ.get('PATH', '').strip() + ':/usr/local/bin:/usr/local/sbin'}
>- 
>- 
>- def pythonversion():
>diff -ruN py-salt/files/patch-salt__modules__win_dacl.py py-salt-2015.8.10/files/patch-salt__modules__win_dacl.py
>--- py-salt/files/patch-salt__modules__win_dacl.py	2016-04-06 14:11:24.000000000 -0600
>+++ py-salt-2015.8.10/files/patch-salt__modules__win_dacl.py	1969-12-31 17:00:00.000000000 -0700
>@@ -1,34 +0,0 @@
>-diff --git a/salt/modules/win_dacl.py b/salt/modules/win_dacl.py
>-index d57bb7b..d9ee27a 100644
>---- salt/modules/win_dacl.py
>-+++ salt/modules/win_dacl.py
>-@@ -44,9 +44,10 @@ class daclConstants(object):
>-     # in ntsecuritycon has the extra bits 0x200 enabled.
>-     # Note that you when you set this permission what you'll generally get back is it
>-     # ORed with 0x200 (SI_NO_ACL_PROTECT), which is what ntsecuritycon incorrectly defines.
>--    FILE_ALL_ACCESS = (ntsecuritycon.STANDARD_RIGHTS_REQUIRED | ntsecuritycon.SYNCHRONIZE | 0x1ff)
>- 
>-     def __init__(self):
>-+        self.FILE_ALL_ACCESS = (ntsecuritycon.STANDARD_RIGHTS_REQUIRED | ntsecuritycon.SYNCHRONIZE | 0x1ff)
>-+
>-         self.hkeys_security = {
>-             'HKEY_LOCAL_MACHINE': 'MACHINE',
>-             'HKEY_USERS': 'USERS',
>-@@ -88,7 +89,7 @@ def __init__(self):
>-                     ntsecuritycon.DELETE,
>-                     'TEXT': 'modify'},
>-                 'FULLCONTROL': {
>--                    'BITS': daclConstants.FILE_ALL_ACCESS,
>-+                    'BITS': self.FILE_ALL_ACCESS,
>-                     'TEXT': 'full control'}
>-             }
>-         }
>-@@ -368,7 +369,7 @@ def add_ace(path, objectType, user, permission, acetype, propagation):
>-     path:  path to the object (i.e. c:\\temp\\file, HKEY_LOCAL_MACHINE\\SOFTWARE\\KEY, etc)
>-     user: user to add
>-     permission:  permissions for the user
>--    acetypes:  either allow/deny for each user/permission (ALLOW, DENY)
>-+    acetype:  either allow/deny for each user/permission (ALLOW, DENY)
>-     propagation: how the ACE applies to children for Registry Keys and Directories(KEY, KEY&SUBKEYS, SUBKEYS)
>- 
>-     CLI Example:

Flags:

christer.edwards: maintainer-approval+

Actions: View | Diff

Attachments on bug 209721: 170578 | 170579