diff --git a/.files b/.files
index 5e05930..75fe4d1 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d3081a9..fda3667 100644
--- a/.rev
+++ b/.rev
@@ -707,4 +707,12 @@ numbers for further reference.
782796
+
+ fddfcdc4c1c5a569b70abb58c1b044d6
+ 2.9.6
+
+ dimstar_suse
+
+ 793006
+
diff --git a/ansible.changes b/ansible.changes
index 55a25ff..aefd87f 100644
--- a/ansible.changes
+++ b/ansible.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Apr 6 20:45:04 UTC 2020 - lars@linux-schulserver.de - 2.9.6
+
+- create missing (empty) template and files directories for
+ 'ansible-galaxy init' during package build (fixes boo#1137479)
+- require python-xml on python 2 systems (boo#1142542)
+
+-------------------------------------------------------------------
Thu Mar 5 08:23:57 UTC 2020 - Michael Ströder
- update to version 2.9.6 (maintenance release)
@@ -19,8 +26,8 @@ Thu Jan 16 17:34:28 UTC 2020 - Michael Ströder
- update to version 2.9.3 (maintenance release)
* security fixes
- - CVE-2019-14904 (solaris_zone module)
- - CVE-2019-14905 (nxos_file_copy module),
+ - CVE-2019-14904 (solaris_zone module) (boo#1157968)
+ - CVE-2019-14905 (nxos_file_copy module) (boo#1157969)
* various bugfixes
-------------------------------------------------------------------
@@ -81,7 +88,7 @@ Fri Nov 15 12:44:55 UTC 2019 - lars@linux-schulserver.de - 2.9.1
and also available online at
https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst
+ CVE-2019-14864: fixed Splunk and Sumologic callback plugins leak
- sensitive data in logs
+ sensitive data in logs (boo#1154830)
- replace all #!/usr/bin/env lines to use #!/usr/bin/$1 directly
-------------------------------------------------------------------
diff --git a/ansible.spec b/ansible.spec
index 280e795..19a77da 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -135,6 +135,9 @@ Requires: %{python}-paramiko
Requires: %{python}-passlib
Requires: %{python}-pycrypto >= 2.6
Requires: %{python}-setuptools > 0.6
+%if ! %{with python3}
+Requires: %{python}-xml
+%endif
Recommends: %{python}-boto3
Recommends: %{python}-botocore
Recommends: %{python}-dnspython
@@ -367,6 +370,9 @@ for location in $DATADIR_LOCATIONS ; do
done
mkdir -p %{buildroot}%{_sysconfdir}/ansible/
mkdir -p %{buildroot}%{_sysconfdir}/ansible/roles/
+# fix for https://github.com/ansible/ansible/pull/24381
+# resp. https://bugzilla.opensuse.org/show_bug.cgi?id=1137479
+mkdir -p %{buildroot}%{python3_sitelib}/ansible/galaxy/data/default/role/{files,templates}
cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/
cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/