diff --git a/.gitignore b/.gitignore index 87f810a..6b8fb84 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /ansible-unittests-2.2.2.0.tar.xz /ansible-2.2.2.0.tar.gz /ansible-2.3.0.0.tar.gz +/ansible-2.3.1.0.tar.gz diff --git a/ansible-pr-23703.patch b/ansible-pr-23703.patch deleted file mode 100644 index 9426e22..0000000 --- a/ansible-pr-23703.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b9ee0c547797f253771489542f0f5ac08bf04bf6 Mon Sep 17 00:00:00 2001 -From: Timo Benk -Date: Wed, 19 Apr 2017 20:15:20 +0200 -Subject: [PATCH] fix ansible galaxy file mangling (#23703) - -without this patch, ansible-galaxy will mangle files containing -the archive parent directory name, eg 'owncloud/files/owncloud.cron' -will become 'owncloud/files/.cron'. - -The previous code could affect the entire path and even filenames. -If a file path has the top level dir name as a substring, galaxy -replaces it with ''. In one example, the archive top level dir -is 'go', so 'files/go-bin.sh' becomes 'files/-bin.sh'. - -Fixes #22572, #23694, #23623 -(cherry picked from commit 79943b86a1ee9338049149824bbb12f99d8186ee) ---- - lib/ansible/galaxy/role.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py -index 67bdc95..3b89176 100644 ---- a/lib/ansible/galaxy/role.py -+++ b/lib/ansible/galaxy/role.py -@@ -316,7 +316,7 @@ def install(self): - # bits that might be in the file for security purposes - # and drop any containing directory, as mentioned above - if member.isreg() or member.issym(): -- parts = member.name.replace(archive_parent_dir, "").split(os.sep) -+ parts = member.name.replace(archive_parent_dir, "", 1).split(os.sep) - final_parts = [] - for part in parts: - if part != '..' and '~' not in part and '$' not in part: diff --git a/ansible.spec b/ansible.spec index 5b9112d..60d9508 100644 --- a/ansible.spec +++ b/ansible.spec @@ -19,17 +19,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Name: ansible Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.3.0.0 -Release: 3%{?dist} +Version: 2.3.1.0 +Release: 1%{?dist} Group: Development/Libraries License: GPLv3+ Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz -# Needed for unittests to run. Will be in future upstream tarballs. -Source1: .coveragerc - -# Fixes a regression in 2.3.0 - see https://github.com/ansible/ansible/issues/22572 -Patch0: ansible-pr-23703.patch # Patch to utilize a newer jinja2 package on epel6 # Non-upstreamable as it creates a dependency on a specific version of jinja. @@ -211,11 +206,6 @@ This package installs extensive documentation for ansible %prep %setup -q -%patch0 -p1 - -# Unittests -#tar -xJvf %{SOURCE1} -cp %{SOURCE1} . %if 0%{?rhel} == 6 %patch100 -p1 @@ -331,6 +321,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jun 01 2017 Kevin Fenzi - 2.3.1.0-1 +- Update to 2.3.1.0. + * Wed Apr 19 2017 James Hogarth - 2.3.0.0-3 - Update backported patch to the one actually merged upstream diff --git a/sources b/sources index a8c679e..479edf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansible-2.3.0.0.tar.gz) = 88ac28befefd7a70c36d8c33bc1aba1b0a5ffdea4bddd0b9e6c5488c70057662812208c221e47721c5a194fc30282a33490f196a719d9eb6d9b1e7dcfd1ff941 +SHA512 (ansible-2.3.1.0.tar.gz) = 7b4b33c56a15c41d756f095944d7a0dbf894557350879430df21061b717b9574aae624a276bf7e1a13d043b718aeaccac1ce510a3cb085983311ddf06fa832bc