Attachment 178052 Details for Bug 215380 – patch

patch

py-salt-2016.11.1.diff.txt (text/plain), 5.15 KB, created by Christer Edwards on 2016-12-18 15:37:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2016-12-18 15:37:39 UTC

Size: 5.15 KB

patch

obsolete

>diff -ruN py-salt/distinfo py-salt-2016.11.1/distinfo
>--- py-salt/distinfo	2016-12-05 08:00:49.000000000 -0700
>+++ py-salt-2016.11.1/distinfo	2016-12-18 08:09:47.910518000 -0700
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1479913379
>-SHA256 (salt-2016.11.0.tar.gz) = b516285926ee95cedc64ecddab05d14422b7c8819c9f6d046a431c41d608e6bc
>-SIZE (salt-2016.11.0.tar.gz) = 9044879
>+TIMESTAMP = 1482073787
>+SHA256 (salt-2016.11.1.tar.gz) = 00343e190dcf6dfa27dbec996d1161f7aef16cf99510b67970136cf24f092992
>+SIZE (salt-2016.11.1.tar.gz) = 9075078
>diff -ruN py-salt/files/patch-freebsd_sysctl.py py-salt-2016.11.1/files/patch-freebsd_sysctl.py
>--- py-salt/files/patch-freebsd_sysctl.py	2016-12-06 12:56:51.000000000 -0700
>+++ py-salt-2016.11.1/files/patch-freebsd_sysctl.py	1969-12-31 17:00:00.000000000 -0700
>@@ -1,44 +0,0 @@
>---- salt/modules/freebsd_sysctl.py.orig	2016-10-31 11:21:36.000000000 -0600
>-+++ salt/modules/freebsd_sysctl.py      2016-11-02 08:44:19.743993000 -0600
>-@@ -56,17 +56,31 @@
>-     )
>-     cmd = 'sysctl -ae'
>-     ret = {}
>--    out = __salt__['cmd.run'](cmd, output_loglevel='trace')
>-     comps = ['']
>--    for line in out.splitlines():
>--        if any([line.startswith('{0}.'.format(root)) for root in roots]):
>--            comps = line.split('=', 1)
>--            ret[comps[0]] = comps[1]
>--        elif comps[0]:
>--            ret[comps[0]] += '{0}\n'.format(line)
>--        else:
>--            continue
>--    return ret
>-+
>-+    if config_file:
>-+        try:
>-+            with salt.utils.fopen(config_file, 'r') as f:
>-+                for line in f.readlines():
>-+                    l = line.strip()
>-+                    if l != "" and not l.startswith("#"):
>-+                        comps = line.split('=', 1)
>-+                        ret[comps[0]] = comps[1]
>-+            return ret
>-+        except (OSError, IOError):
>-+            log.error('Could not open sysctl config file')
>-+            return None
>-+    else:
>-+        out = __salt__['cmd.run'](cmd, output_loglevel='trace')
>-+        for line in out.splitlines():
>-+            if any([line.startswith('{0}.'.format(root)) for root in roots]):
>-+                comps = line.split('=', 1)
>-+                ret[comps[0]] = comps[1]
>-+            elif comps[0]:
>-+                ret[comps[0]] += '{0}\n'.format(line)
>-+            else:
>-+                 continue
>-+        return ret
>- 
>- 
>- def get(name):
>diff -ruN py-salt/files/patch-salt_utils_rsax931.py py-salt-2016.11.1/files/patch-salt_utils_rsax931.py
>--- py-salt/files/patch-salt_utils_rsax931.py	2016-12-05 08:00:49.000000000 -0700
>+++ py-salt-2016.11.1/files/patch-salt_utils_rsax931.py	1969-12-31 17:00:00.000000000 -0700
>@@ -1,32 +0,0 @@
>---- salt/utils/rsax931.py.orig	2016-11-22 17:52:40 UTC
>-+++ salt/utils/rsax931.py
>-@@ -16,6 +16,11 @@ import salt.utils
>- from ctypes import cdll, c_char_p, c_int, c_void_p, pointer, create_string_buffer
>- from ctypes.util import find_library
>- 
>-+# Constants taken from openssl-1.1.0c/include/openssl/crypto.h
>-+OPENSSL_INIT_ADD_ALL_CIPHERS = 0x00000004
>-+OPENSSL_INIT_ADD_ALL_DIGESTS = 0x00000008
>-+OPENSSL_INIT_NO_LOAD_CONFIG = 0x00000080
>-+
>- 
>- def _load_libcrypto():
>-     '''
>-@@ -62,8 +67,15 @@ def _init_libcrypto():
>-     libcrypto.RSA_private_encrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
>-     libcrypto.RSA_public_decrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
>- 
>--    libcrypto.OPENSSL_no_config()
>--    libcrypto.OPENSSL_add_all_algorithms_noconf()
>-+    try:
>-+        if libcrypto.OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG |
>-+                                         OPENSSL_INIT_ADD_ALL_CIPHERS |
>-+                                         OPENSSL_INIT_ADD_ALL_DIGESTS, None) != 1:
>-+            raise OSError("Failed to initialize OpenSSL library (OPENSSL_init_crypto failed)")
>-+    except AttributeError:
>-+        # Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
>-+        libcrypto.OPENSSL_no_config()
>-+        libcrypto.OPENSSL_add_all_algorithms_noconf()
>- 
>-     return libcrypto
>- 
>diff -ruN py-salt/Makefile py-salt-2016.11.1/Makefile
>--- py-salt/Makefile	2016-12-06 12:56:51.000000000 -0700
>+++ py-salt-2016.11.1/Makefile	2016-12-18 08:09:44.472111000 -0700
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/py-salt/Makefile 427986 2016-12-06 19:56:51Z swills $
> 
> PORTNAME=	salt
>-PORTVERSION=	2016.11.0
>-PORTREVISION=	1
>+PORTVERSION=	2016.11.1
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/pkg-plist py-salt-2016.11.1/pkg-plist
>--- py-salt/pkg-plist	2016-12-05 08:00:49.000000000 -0700
>+++ py-salt-2016.11.1/pkg-plist	2016-12-18 08:12:17.414429000 -0700
>@@ -1,3 +1,4 @@
>+
> %%ETCDIR%%/master.sample
> %%ETCDIR%%/minion.sample
> %%PYTHON_SITELIBDIR%%/salt/__init__.py
>@@ -3658,6 +3659,9 @@
> %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.py
> %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/saltminionservice.pyo
>+%%PYTHON_SITELIBDIR%%/salt/utils/sanitizers.py
>+%%PYTHON_SITELIBDIR%%/salt/utils/sanitizers.pyc
>+%%PYTHON_SITELIBDIR%%/salt/utils/sanitizers.pyo
> %%PYTHON_SITELIBDIR%%/salt/utils/schedule.py
> %%PYTHON_SITELIBDIR%%/salt/utils/schedule.pyc
> %%PYTHON_SITELIBDIR%%/salt/utils/schedule.pyo

Flags:

christer.edwards: maintainer-approval+

Actions: View

Attachments on bug 215380: 178052 | 178053