Add all the rest releases of 1.6.x:

1.6.10
   Fixes an issue with the copy module when copying a directory that fails when changing file attributes and the target file already exists
   Improved unicode handling when splitting args

1.6.9
   Further improvements to module parameter parsing to address additional regressions caused by security fixes

1.6.8
   Corrects a regression in the way shell and command parameters were being parsed

1.6.7
   Security fixes:
   Strip lookup calls out of inventory variables and clean unsafe data returned from lookup plugins (CVE-2014-4966)
   Make sure vars don't insert extra parameters into module args and prevent duplicate params from superseding previous params (CVE-2014-4967)

1.6.6
   Security updates to further protect against the incorrect execution of untrusted data

1.6.4, 1.6.5
   Security updates related to evaluation of untrusted remote inputs

4 files changed, 15 insertions, 12 deletions

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index c4407c2977d..15ef657a3cf 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2014/06/15 00:54:26 rodent Exp $
+# $NetBSD: Makefile,v 1.13 2015/02/05 15:22:06 pettai Exp $
 
-DISTNAME=	ansible-1.6.3
+DISTNAME=	ansible-1.6.10
 #PKGNAME=	${PYPKGPREFIX}-${DISTNAME} # XXX: for when package is py3x-ready
 CATEGORIES=	python sysutils
 MASTER_SITES=	http://releases.ansible.com/ansible/
diff --git a/sysutils/ansible/PLIST b/sysutils/ansible/PLIST
index 2496ec5fa18..177b6eeaa6d 100644
--- a/sysutils/ansible/PLIST
+++ b/sysutils/ansible/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/06/15 00:15:08 rodent Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/02/05 15:22:06 pettai Exp $
 bin/ansible
 bin/ansible-doc
 bin/ansible-galaxy
@@ -298,6 +298,9 @@ ${PYSITELIB}/ansible/utils/module_docs_fragments/rackspace.pyo
 ${PYSITELIB}/ansible/utils/plugins.py
 ${PYSITELIB}/ansible/utils/plugins.pyc
 ${PYSITELIB}/ansible/utils/plugins.pyo
+${PYSITELIB}/ansible/utils/splitter.py
+${PYSITELIB}/ansible/utils/splitter.pyc
+${PYSITELIB}/ansible/utils/splitter.pyo
 ${PYSITELIB}/ansible/utils/string_functions.py
 ${PYSITELIB}/ansible/utils/string_functions.pyc
 ${PYSITELIB}/ansible/utils/string_functions.pyo
diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo
index 9d83509ccc8..80076c5e44d 100644
--- a/sysutils/ansible/distinfo
+++ b/sysutils/ansible/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2014/06/15 00:15:08 rodent Exp $
+$NetBSD: distinfo,v 1.7 2015/02/05 15:22:06 pettai Exp $
 
-SHA1 (ansible-1.6.3.tar.gz) = 9cac9de1357460a9692c015735c899519c85d0da
-RMD160 (ansible-1.6.3.tar.gz) = 00f30fc21a4064c5ae1c6136443bf63aca99fce7
-Size (ansible-1.6.3.tar.gz) = 650061 bytes
+SHA1 (ansible-1.6.10.tar.gz) = 35d4af5beaff73de339442962da286bd3d7bacf4
+RMD160 (ansible-1.6.10.tar.gz) = 2e9160769d06b14fcd4446a8337c5ef3447139bc
+Size (ansible-1.6.10.tar.gz) = 654605 bytes
 SHA1 (patch-examples_ansible.cfg) = 8951c1da381130e3de5178e858edabdd919868b5
 SHA1 (patch-lib_ansible_callbacks.py) = e712d8215221ff11920039aa8ed4efd4d6e5fae6
-SHA1 (patch-lib_ansible_constants.py) = d31157e1616d4ddc4982b7ede059fcca3118763e
+SHA1 (patch-lib_ansible_constants.py) = f54e5bb869382cc58b910463543a885b059a9ec3
 SHA1 (patch-library-system-ping) = 4b2c1fd8f9844f11cfbe0ba975f7bca7eb88079b
 SHA1 (patch-library_database_riak) = e78fa264f03353ee25c1b358fd4daa90fe27fd44
 SHA1 (patch-library_monitoring_nagios) = 4c101d9c16d7f29a4557c29a2870cfb6bd3ab537
diff --git a/sysutils/ansible/patches/patch-lib_ansible_constants.py b/sysutils/ansible/patches/patch-lib_ansible_constants.py
index d6608594f80..d9f15624665 100644
--- a/sysutils/ansible/patches/patch-lib_ansible_constants.py
+++ b/sysutils/ansible/patches/patch-lib_ansible_constants.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_ansible_constants.py,v 1.5 2014/06/15 00:15:08 rodent Exp $
+$NetBSD: patch-lib_ansible_constants.py,v 1.6 2015/02/05 15:22:06 pettai Exp $
 
 Fix hardcoded paths to be replaced with SUBST framework.
 
@@ -31,9 +31,9 @@ Fix hardcoded paths to be replaced with SUBST framework.
  DEFAULT_MODULE_PATH       = get_config(p, DEFAULTS, 'library',          'ANSIBLE_LIBRARY',          DIST_MODULE_PATH)
  DEFAULT_ROLES_PATH        = get_config(p, DEFAULTS, 'roles_path',       'ANSIBLE_ROLES_PATH',       '/etc/ansible/roles')
  DEFAULT_REMOTE_TMP        = shell_expand_path(get_config(p, DEFAULTS, 'remote_tmp',       'ANSIBLE_REMOTE_TEMP',      '$HOME/.ansible/tmp'))
-@@ -136,12 +136,12 @@ DEFAULT_SU_USER = get_config(p, DEFAULTS
- DEFAULT_ASK_SU_PASS = get_config(p, DEFAULTS, 'ask_su_pass', 'ANSIBLE_ASK_SU_PASS', False, boolean=True)
- DEFAULT_GATHERING = get_config(p, DEFAULTS, 'gathering', 'ANSIBLE_GATHERING', 'implicit').lower()
+@@ -138,12 +138,12 @@ DEFAULT_SU_USER           = get_config(p
+ DEFAULT_ASK_SU_PASS       = get_config(p, DEFAULTS, 'ask_su_pass', 'ANSIBLE_ASK_SU_PASS', False, boolean=True)
+ DEFAULT_GATHERING         = get_config(p, DEFAULTS, 'gathering', 'ANSIBLE_GATHERING', 'implicit').lower()
  
 -DEFAULT_ACTION_PLUGIN_PATH     = get_config(p, DEFAULTS, 'action_plugins',     'ANSIBLE_ACTION_PLUGINS', '/usr/share/ansible_plugins/action_plugins')
 -DEFAULT_CALLBACK_PLUGIN_PATH   = get_config(p, DEFAULTS, 'callback_plugins',   'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins')