Attachment 167403 Details for Bug 207490 – sysutils/ansible: update to 2.0.1.0

[patch] sysutils/ansible: update to 2.0.1.0

ansible-2.0.1.0.diff (text/plain), 4.99 KB, created by Nikolai Lifanov on 2016-02-25 16:11:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2016-02-25 16:11:32 UTC

Size: 4.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 409530)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ansible
>-PORTVERSION?=	2.0.0.2
>-PORTREVISION?=	3
>+PORTVERSION?=	2.0.1.0
> CATEGORIES=	sysutils python
> MASTER_SITES=	http://releases.ansible.com/ansible/
> 
>@@ -18,9 +17,6 @@
> 		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2
> 
>-EXTRA_PATCHES?=	${FILESDIR}/extra-patch-8647fdc \
>-		${FILESDIR}/extra-patch-6bf2f45
>-
> NO_ARCH=	yes
> USES=		cpe python:2 shebangfix
> USE_PYTHON=	autoplist distutils
>Index: distinfo
>===================================================================
>--- distinfo	(revision 409530)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ansible-2.0.0.2.tar.gz) = 27db0b99113fab85b1430c361c7790a0aa7f5c614c9af13362e2adbba07e5828
>-SIZE (ansible-2.0.0.2.tar.gz) = 1497944
>+SHA256 (ansible-2.0.1.0.tar.gz) = cddc4fa6af4c1be6cd1d6634de1bd0397abad921c76b32cab6722c042744ee5d
>+SIZE (ansible-2.0.1.0.tar.gz) = 1510155
>Index: files/extra-patch-6bf2f45
>===================================================================
>--- files/extra-patch-6bf2f45	(revision 409530)
>+++ files/extra-patch-6bf2f45	(nonexistent)
>@@ -1,31 +0,0 @@
>---- lib/ansible/playbook/play_context.py.orig	2016-01-14 22:33:27 UTC
>-+++ lib/ansible/playbook/play_context.py
>-@@ -446,8 +446,10 @@ class PlayContext(Base):
>- 
>-             if self.become_method == 'sudo':
>-                 # If we have a password, we run sudo with a randomly-generated
>--                # prompt set using -p. Otherwise we run it with -n, which makes
>-+                # prompt set using -p. Otherwise we run it with default -n, which makes
>-                 # it fail if it would have prompted for a password.
>-+                # Cannot rely on -n as it can be removed from defaults, which should be
>-+                # done for older versions of sudo that do not support the option.
>-                 #
>-                 # Passing a quoted compound command to sudo (or sudo -s)
>-                 # directly doesn't work, so we shellquote it with pipes.quote()
>-@@ -463,12 +465,14 @@ class PlayContext(Base):
>- 
>-             elif self.become_method == 'su':
>- 
>-+                # passing code ref to examine prompt as simple string comparisson isn't good enough with su
>-                 def detect_su_prompt(data):
>-                     SU_PROMPT_LOCALIZATIONS_RE = re.compile("|".join(['(\w+\'s )?' + x + ' ?: ?' for x in SU_PROMPT_LOCALIZATIONS]), flags=re.IGNORECASE)
>-                     return bool(SU_PROMPT_LOCALIZATIONS_RE.match(data))
>--
>-                 prompt = detect_su_prompt
>--                becomecmd = '%s %s %s -c "%s -c %s"' % (exe, flags, self.become_user, executable, success_cmd)
>-+
>-+                su_success_cmd =  '%s -c %s' % (executable, success_cmd) # this is here cause su too succeptible to overquoting
>-+                becomecmd = '%s %s %s -c %s' % (exe, flags, self.become_user, su_success_cmd) #works with sh
>- 
>-             elif self.become_method == 'pbrun':
>- 
>
>Property changes on: files/extra-patch-6bf2f45
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/extra-patch-8647fdc
>===================================================================
>--- files/extra-patch-8647fdc	(revision 409530)
>+++ files/extra-patch-8647fdc	(nonexistent)
>@@ -1,21 +0,0 @@
>---- lib/ansible/plugins/action/__init__.py.orig	2016-01-14 22:33:27 UTC
>-+++ lib/ansible/plugins/action/__init__.py
>-@@ -475,8 +475,7 @@ class ActionBase(with_metaclass(ABCMeta,
>-         display.debug("done with _execute_module (%s, %s)" % (module_name, module_args))
>-         return data
>- 
>--    def _low_level_execute_command(self, cmd, sudoable=True, in_data=None,
>--            executable=None, encoding_errors='replace'):
>-+    def _low_level_execute_command(self, cmd, sudoable=True, in_data=None, executable=C.DEFAULT_EXECUTABLE, encoding_errors='replace'):
>-         '''
>-         This is the function which executes the low level shell command, which
>-         may be commands to create/remove directories for temporary files, or to
>-@@ -492,7 +491,7 @@ class ActionBase(with_metaclass(ABCMeta,
>-         '''
>- 
>-         if executable is not None:
>--            cmd = executable + ' -c ' + cmd
>-+            cmd = executable + ' -c ' + pipes.quote(cmd)
>- 
>-         display.debug("_low_level_execute_command(): starting")
>-         if not cmd:
>
>Property changes on: files/extra-patch-8647fdc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

lifanov: maintainer-approval+

Actions: View | Diff

Attachments on bug 207490: 167403