diff --git a/.gitignore b/.gitignore index 4adc35d..12dbebf 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /ansible-2.5.1.tar.gz /ansible-2.5.2.tar.gz /ansible-2.5.3.tar.gz +/ansible-2.5.5.tar.gz diff --git a/28015d8ae9831c272d16ce0ae2a57ccff3b445c7.patch b/28015d8ae9831c272d16ce0ae2a57ccff3b445c7.patch deleted file mode 100644 index 2bea93b..0000000 --- a/28015d8ae9831c272d16ce0ae2a57ccff3b445c7.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 28015d8ae9831c272d16ce0ae2a57ccff3b445c7 Mon Sep 17 00:00:00 2001 -From: Brian Coca -Date: Tue, 13 Feb 2018 17:43:26 -0500 -Subject: [PATCH] ensure cli dir exists before saving files to it - ---- - docs/docsite/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/docs/docsite/Makefile b/docs/docsite/Makefile -index 3bb3c454c35..4b5d8d9d203 100644 ---- a/docs/docsite/Makefile -+++ b/docs/docsite/Makefile -@@ -74,6 +74,7 @@ clean: - - # TODO: make generate_man output dir cli option - cli: $(GENERATE_CLI) -+ mkdir -p rst/cli - PYTHONPATH=../../lib $(GENERATE_CLI) --template-file=../templates/cli_rst.j2 --output-dir=rst/cli/ --output-format rst ../../lib/ansible/cli/*.py - - keywords: $(FORMATTER) ../templates/playbooks_keywords.rst.j2 diff --git a/30568.patch b/30568.patch deleted file mode 100644 index b1991e6..0000000 --- a/30568.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 4a407ade9f00d9731df1b588d120b1634f07af4c Mon Sep 17 00:00:00 2001 -From: Toshio Kuratomi -Date: Tue, 19 Sep 2017 11:51:07 -0700 -Subject: [PATCH] Fix jenkins_plugin test for no net situations - -Unittests are sometimes run without network connectivity in build -systems. Make that work correctly by mocking out _get_url_data with the -expected return value. ---- - .../web_infrastructure/test_jenkins_plugin.py | 127 ++++++++++++++++++++- - 1 file changed, 122 insertions(+), 5 deletions(-) - -diff --git a/test/units/modules/web_infrastructure/test_jenkins_plugin.py b/test/units/modules/web_infrastructure/test_jenkins_plugin.py -index c7955b684f1d0..ea3adce478745 100644 ---- a/test/units/modules/web_infrastructure/test_jenkins_plugin.py -+++ b/test/units/modules/web_infrastructure/test_jenkins_plugin.py -@@ -1,5 +1,5 @@ - import collections --import mock -+from io import BytesIO - - from ansible.modules.web_infrastructure.jenkins_plugin import JenkinsPlugin - -@@ -8,24 +8,141 @@ def pass_function(*args, **kwargs): - pass - - -+GITHUB_DATA = {"url": u'https://api.github.com/repos/ansible/ansible', -+ "response": b""" -+{ -+ "id": 3638964, -+ "name": "ansible", -+ "full_name": "ansible/ansible", -+ "owner": { -+ "login": "ansible", -+ "id": 1507452, -+ "avatar_url": "https://avatars2.githubusercontent.com/u/1507452?v=4", -+ "gravatar_id": "", -+ "url": "https://api.github.com/users/ansible", -+ "html_url": "https://github.com/ansible", -+ "followers_url": "https://api.github.com/users/ansible/followers", -+ "following_url": "https://api.github.com/users/ansible/following{/other_user}", -+ "gists_url": "https://api.github.com/users/ansible/gists{/gist_id}", -+ "starred_url": "https://api.github.com/users/ansible/starred{/owner}{/repo}", -+ "subscriptions_url": "https://api.github.com/users/ansible/subscriptions", -+ "organizations_url": "https://api.github.com/users/ansible/orgs", -+ "repos_url": "https://api.github.com/users/ansible/repos", -+ "events_url": "https://api.github.com/users/ansible/events{/privacy}", -+ "received_events_url": "https://api.github.com/users/ansible/received_events", -+ "type": "Organization", -+ "site_admin": false -+ }, -+ "private": false, -+ "html_url": "https://github.com/ansible/ansible", -+ "description": "Ansible is a radically simple IT automation platform that makes your applications and systems easier to deploy.", -+ "fork": false, -+ "url": "https://api.github.com/repos/ansible/ansible", -+ "forks_url": "https://api.github.com/repos/ansible/ansible/forks", -+ "keys_url": "https://api.github.com/repos/ansible/ansible/keys{/key_id}", -+ "collaborators_url": "https://api.github.com/repos/ansible/ansible/collaborators{/collaborator}", -+ "teams_url": "https://api.github.com/repos/ansible/ansible/teams", -+ "hooks_url": "https://api.github.com/repos/ansible/ansible/hooks", -+ "issue_events_url": "https://api.github.com/repos/ansible/ansible/issues/events{/number}", -+ "events_url": "https://api.github.com/repos/ansible/ansible/events", -+ "assignees_url": "https://api.github.com/repos/ansible/ansible/assignees{/user}", -+ "branches_url": "https://api.github.com/repos/ansible/ansible/branches{/branch}", -+ "tags_url": "https://api.github.com/repos/ansible/ansible/tags", -+ "blobs_url": "https://api.github.com/repos/ansible/ansible/git/blobs{/sha}", -+ "git_tags_url": "https://api.github.com/repos/ansible/ansible/git/tags{/sha}", -+ "git_refs_url": "https://api.github.com/repos/ansible/ansible/git/refs{/sha}", -+ "trees_url": "https://api.github.com/repos/ansible/ansible/git/trees{/sha}", -+ "statuses_url": "https://api.github.com/repos/ansible/ansible/statuses/{sha}", -+ "languages_url": "https://api.github.com/repos/ansible/ansible/languages", -+ "stargazers_url": "https://api.github.com/repos/ansible/ansible/stargazers", -+ "contributors_url": "https://api.github.com/repos/ansible/ansible/contributors", -+ "subscribers_url": "https://api.github.com/repos/ansible/ansible/subscribers", -+ "subscription_url": "https://api.github.com/repos/ansible/ansible/subscription", -+ "commits_url": "https://api.github.com/repos/ansible/ansible/commits{/sha}", -+ "git_commits_url": "https://api.github.com/repos/ansible/ansible/git/commits{/sha}", -+ "comments_url": "https://api.github.com/repos/ansible/ansible/comments{/number}", -+ "issue_comment_url": "https://api.github.com/repos/ansible/ansible/issues/comments{/number}", -+ "contents_url": "https://api.github.com/repos/ansible/ansible/contents/{+path}", -+ "compare_url": "https://api.github.com/repos/ansible/ansible/compare/{base}...{head}", -+ "merges_url": "https://api.github.com/repos/ansible/ansible/merges", -+ "archive_url": "https://api.github.com/repos/ansible/ansible/{archive_format}{/ref}", -+ "downloads_url": "https://api.github.com/repos/ansible/ansible/downloads", -+ "issues_url": "https://api.github.com/repos/ansible/ansible/issues{/number}", -+ "pulls_url": "https://api.github.com/repos/ansible/ansible/pulls{/number}", -+ "milestones_url": "https://api.github.com/repos/ansible/ansible/milestones{/number}", -+ "notifications_url": "https://api.github.com/repos/ansible/ansible/notifications{?since,all,participating}", -+ "labels_url": "https://api.github.com/repos/ansible/ansible/labels{/name}", -+ "releases_url": "https://api.github.com/repos/ansible/ansible/releases{/id}", -+ "deployments_url": "https://api.github.com/repos/ansible/ansible/deployments", -+ "created_at": "2012-03-06T14:58:02Z", -+ "updated_at": "2017-09-19T18:10:54Z", -+ "pushed_at": "2017-09-19T18:04:51Z", -+ "git_url": "git://github.com/ansible/ansible.git", -+ "ssh_url": "git@github.com:ansible/ansible.git", -+ "clone_url": "https://github.com/ansible/ansible.git", -+ "svn_url": "https://github.com/ansible/ansible", -+ "homepage": "https://www.ansible.com/", -+ "size": 91174, -+ "stargazers_count": 25552, -+ "watchers_count": 25552, -+ "language": "Python", -+ "has_issues": true, -+ "has_projects": true, -+ "has_downloads": true, -+ "has_wiki": false, -+ "has_pages": false, -+ "forks_count": 8893, -+ "mirror_url": null, -+ "open_issues_count": 4283, -+ "forks": 8893, -+ "open_issues": 4283, -+ "watchers": 25552, -+ "default_branch": "devel", -+ "organization": { -+ "login": "ansible", -+ "id": 1507452, -+ "avatar_url": "https://avatars2.githubusercontent.com/u/1507452?v=4", -+ "gravatar_id": "", -+ "url": "https://api.github.com/users/ansible", -+ "html_url": "https://github.com/ansible", -+ "followers_url": "https://api.github.com/users/ansible/followers", -+ "following_url": "https://api.github.com/users/ansible/following{/other_user}", -+ "gists_url": "https://api.github.com/users/ansible/gists{/gist_id}", -+ "starred_url": "https://api.github.com/users/ansible/starred{/owner}{/repo}", -+ "subscriptions_url": "https://api.github.com/users/ansible/subscriptions", -+ "organizations_url": "https://api.github.com/users/ansible/orgs", -+ "repos_url": "https://api.github.com/users/ansible/repos", -+ "events_url": "https://api.github.com/users/ansible/events{/privacy}", -+ "received_events_url": "https://api.github.com/users/ansible/received_events", -+ "type": "Organization", -+ "site_admin": false -+ }, -+ "network_count": 8893, -+ "subscribers_count": 1733 -+} -+""" -+ } -+ -+ - def test__get_json_data(mocker): - "test the json conversion of _get_url_data" - -- url = 'https://api.github.com/repos/ansible/ansible' - timeout = 30 - params = { -- 'url': url, -+ 'url': GITHUB_DATA['url'], - 'timeout': timeout - } -- module = mock.Mock() -+ module = mocker.Mock() - module.params = params - - JenkinsPlugin._csrf_enabled = pass_function - JenkinsPlugin._get_installed_plugins = pass_function -+ JenkinsPlugin._get_url_data = mocker.Mock() -+ JenkinsPlugin._get_url_data.return_value = BytesIO(GITHUB_DATA['response']) - jenkins_plugin = JenkinsPlugin(module) - - json_data = jenkins_plugin._get_json_data( -- "{url}".format(url=url), -+ "{url}".format(url=GITHUB_DATA['url']), - 'CSRF') - - assert isinstance(json_data, collections.Mapping) diff --git a/4b406de19ae66263c3623d82db6b93d7d112018a.patch b/4b406de19ae66263c3623d82db6b93d7d112018a.patch deleted file mode 100644 index b8601c3..0000000 --- a/4b406de19ae66263c3623d82db6b93d7d112018a.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4b406de19ae66263c3623d82db6b93d7d112018a Mon Sep 17 00:00:00 2001 -From: Matt Davis -Date: Fri, 23 Mar 2018 05:04:13 -0700 -Subject: [PATCH] pick up missing plugin docs boolean coercion backport - ---- - docs/templates/plugin.rst.j2 | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) - -diff --git a/docs/templates/plugin.rst.j2 b/docs/templates/plugin.rst.j2 -index 106d82b64ff..2572232c79c 100644 ---- a/docs/templates/plugin.rst.j2 -+++ b/docs/templates/plugin.rst.j2 -@@ -107,7 +107,7 @@ Parameters - {# default / choices #} - -
-- {# Recalculate choices and boolean values #} -+ {# Turn boolean values in 'yes' and 'no' values #} - {% if value.default is defined %} - {% if value.default == true %} - {% set _x = value.update({'default': 'yes'}) %} -@@ -122,10 +122,16 @@ Parameters - {% if value.choices %} -
    Choices: - {% for choice in value.choices %} -- {% if (value.default is string and choice == value.default) or (value.default is iterable and choice in value.default) %} --
  • @{ choice | escape }@ ←
    • -+ {# Turn boolean values in 'yes' and 'no' values #} -+ {% if choice == true %} -+ {% set choice = 'yes' %} -+ {% elif choice == false %} -+ {% set choice = 'no' %} -+ {% endif %} -+ {% if (value.default is string and value.default == choice) or (value.default is iterable and value.default is not string and choice in value.default) %} -+
  • @{ choice | escape }@ ←
    • - {% else %} --
  • @{ choice | escape }@
    • -+
  • @{ choice | escape }@
    • - {% endif %} - {% endfor %} -
-@@ -305,7 +311,6 @@ Common return values are documented :ref:`here `, the foll -
- {% for i in range(1, loop.depth) %} -
 
--
- {% endfor %} -
- @{ key }@ -@@ -324,9 +329,9 @@ Common return values are documented :ref:`here `, the foll - {% endfor %} - {% endif %} -
-- {% if value.sample is defined and value.sample %} -+ {% if value.sample is defined and value.sample %} -
Sample:
-- {# TODO: The sample should be escaped, using | escape or | htmlify, but both mess things up beyond repair with dicts #} -+ {# TODO: The sample should be escaped, using |escape or |htmlify, but both mess things up beyond repair with dicts #} -
@{ value.sample | replace('\n', '\n ') | html_ify }@
- {% endif %} -
diff --git a/ansible.spec b/ansible.spec index 54d9964..a4f876a 100644 --- a/ansible.spec +++ b/ansible.spec @@ -28,7 +28,7 @@ Name: ansible Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.5.3 +Version: 2.5.5 Release: 1%{?dist} Group: Development/Libraries @@ -94,6 +94,8 @@ BuildRequires: python-pytest BuildRequires: python-pytest-xdist BuildRequires: python-pytest-mock BuildRequires: python-packaging +BuildRequires: python2-pexpect +BuildRequires: python2-winrm %endif %endif @@ -179,6 +181,8 @@ BuildRequires: python3-PyYAML BuildRequires: python3-paramiko BuildRequires: python3-crypto BuildRequires: python3-packaging +BuildRequires: python3-pexpect +BuildRequires: python3-winrm # For Docs/tests BuildRequires: git-core @@ -384,6 +388,14 @@ popd %endif %changelog +* Thu Jun 14 2018 Kevin Fenzi - 2.5.5-1 +- Update to 2.5.5. Fixes bug #1580530 and #1584927 +- Fixes 1588855,1590200 (fedora) and 1588855,1590199 (epel) + CVE-2018-10855 (security bug with no_log handling) + +* Thu May 31 2018 Kevin Fenzi - 2.5.4-1 +- Update to 2.5.4. Fixes bug #1584927 + * Thu May 17 2018 Kevin Fenzi - 2.5.3-1 - Update to 2.5.3. Fixes bug #1579577 and #1574221 diff --git a/f237508caa6e99aafb8691b148b41371105d12e7.patch b/f237508caa6e99aafb8691b148b41371105d12e7.patch deleted file mode 100644 index 8293780..0000000 --- a/f237508caa6e99aafb8691b148b41371105d12e7.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f237508caa6e99aafb8691b148b41371105d12e7 Mon Sep 17 00:00:00 2001 -From: Dag Wieers -Date: Thu, 22 Mar 2018 22:33:51 +0100 -Subject: [PATCH] Fix nested parameters in module docs (#37793) - -(cherry picked from commit 69c0f96112de16e45cd089d765d43c1573116d35) ---- - docs/templates/plugin.rst.j2 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/docs/templates/plugin.rst.j2 b/docs/templates/plugin.rst.j2 -index 84bc5a4f66c..106d82b64ff 100644 ---- a/docs/templates/plugin.rst.j2 -+++ b/docs/templates/plugin.rst.j2 -@@ -95,7 +95,7 @@ Parameters - -
- {% for i in range(1, loop.depth) %} --
-+
 
- {% endfor %} -
- @{ key }@ -@@ -240,7 +240,7 @@ Facts returned by this module are added/updated in the ``hostvars`` host facts a - -
- {% for i in range(1, loop.depth) %} --
-+
 
- {% endfor %} -
- @{ key }@ -@@ -304,7 +304,7 @@ Common return values are documented :ref:`here `, the foll - -
- {% for i in range(1, loop.depth) %} --
-+
 
-
- {% endfor %} -
diff --git a/sources b/sources index b74cecb..9c7c09e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansible-2.5.3.tar.gz) = 74aa767118773aa557cd43f2a9e17322d7a6b45ea643a9175fe4f613fd4566453dc6f1859768fce179db3331b3beba103e89dfe4eae66ed82b1a83cd7d261269 +SHA512 (ansible-2.5.5.tar.gz) = a3d50539d2a109dc0bbcdb440e0800b917f63141dce935e6426cb6bdc51e3a93e02f05c23714c24ab00b19842a86677b8d2f2455d20ca15410fa8d3c8ba379ca