From edd6a4e28fd4ecebe38d86b173a27f9a7656d93c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Apr 19 2016 23:47:23 +0000
Subject: Update to 2.0.2.0. https://github.com/ansible/ansible/blob/stable-2.0/CHANGELOG.md


- Fixes CVE-2016-3096
- Fix for failed to resolve remote temporary directory issue. bug #1328359

---

diff --git a/.gitignore b/.gitignore
index 57558e3..ea960be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
 /ansible-2.0.0.2.tar.gz
 /ansible-2.0.1.0.tar.gz
 /ansible-unittests-2.0.1.0.tar.xz
+/ansible-unittests-2.0.2.0.tar.xz
+/ansible-2.0.2.0.tar.gz
diff --git a/ansible-2.0.1.0-control_path.patch b/ansible-2.0.1.0-control_path.patch
deleted file mode 100644
index 2692467..0000000
--- a/ansible-2.0.1.0-control_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ansible-2.0.1.0/examples/ansible.cfg.bak ansible-2.0.1.0/examples/ansible.cfg
---- ansible-2.0.1.0/examples/ansible.cfg.bak	2016-02-25 10:56:08.511893227 -0800
-+++ ansible-2.0.1.0/examples/ansible.cfg	2016-02-25 10:57:43.628994138 -0800
-@@ -222,6 +222,7 @@
- # Example: 
- # control_path = %(directory)s/%%h-%%r
- #control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
-+control_path = %(directory)s/ansible-ssh-%%C
- 
- # Enabling pipelining reduces the number of SSH operations required to 
- # execute a module on the remote server. This can result in a significant 
diff --git a/ansible-2.0.2.0-control_path.patch b/ansible-2.0.2.0-control_path.patch
new file mode 100644
index 0000000..841be37
--- /dev/null
+++ b/ansible-2.0.2.0-control_path.patch
@@ -0,0 +1,11 @@
+diff -Nur ansible-2.0.2.0.orig/examples/ansible.cfg ansible-2.0.2.0/examples/ansible.cfg
+--- ansible-2.0.2.0.orig/examples/ansible.cfg	2016-04-19 15:55:21.000000000 -0600
++++ ansible-2.0.2.0/examples/ansible.cfg	2016-04-19 17:33:07.274148584 -0600
+@@ -222,6 +222,7 @@
+ # Example: 
+ # control_path = %(directory)s/%%h-%%r
+ #control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
++control_path = %(directory)s/ansible-ssh-%%C
+ 
+ # Enabling pipelining reduces the number of SSH operations required to 
+ # execute a module on the remote server. This can result in a significant 
diff --git a/ansible.spec b/ansible.spec
index 72836de..94ab59e 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -9,8 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 2.0.1.0
-Release: 2%{?dist}
+Version: 2.0.2.0
+Release: 1%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
@@ -25,7 +25,8 @@ Source100: get-unittests.sh
 # Patch control_path in the example config file to use %C so that it is shorter.
 # Helps with paths that exceed the system length.
 # Upstream issue: https://github.com/ansible/ansible/issues/11536
-Patch0: ansible-2.0.1.0-control_path.patch
+Patch0: ansible-2.0.2.0-control_path.patch
+
 # Patch to utilize a newer jinja2 package on epel6
 # Non-upstreamable as it creates a dependency on a specific version of jinja.
 # This is desirable for us as we have packages for that version but not for
@@ -163,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/ansible*
 
 %changelog
+* Tue Apr 19 2016 Kevin Fenzi <kevin@scrye.com> - 2.0.2.0-1
+- Update to 2.0.2.0. https://github.com/ansible/ansible/blob/stable-2.0/CHANGELOG.md
+- Fixes CVE-2016-3096
+- Fix for failed to resolve remote temporary directory issue. bug #1328359
+
 * Thu Feb 25 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0.1.0-2
 - Patch control_path to be not hit path length limitations (RH BZ #1311729)
 - Version the test tarball
diff --git a/sources b/sources
index 80edc93..8c583bc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-84c576762bc1a8a345fe12ac338bd2d8  ansible-2.0.1.0.tar.gz
-c3b64014fd23b9c8d53e261faab89720  ansible-unittests-2.0.1.0.tar.xz
+4174e74a7e27cd097e71605541fa52bf  ansible-unittests-2.0.2.0.tar.xz
+e210c7d696fe2c084f78a07b8cbc2981  ansible-2.0.2.0.tar.gz