Merging debian version 10.0.1+dfsg-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 55 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 2a6f6f480..280962efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ansible (10.0.1+dfsg-1) unstable; urgency=medium
+
+  * Update patch to DEP-3 layout
+  * New upstream version 10.0.1+dfsg
+  * Drop Files-Excluded pattern again (fixed upstream)
+  * Update copyright year
+  * Remove community.sap and purestorage.fusion tests (removed upstream)
+  * Add quilt patch to fix import error for cyberark.conjur
+
+ -- Lee Garrett <debian@rocketjump.eu>  Thu, 06 Jun 2024 15:39:29 +0200
+
 ansible (10.0.0+dfsg-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/copyright b/debian/copyright
index 5afd28e87..08a093fb6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,8 +6,6 @@ Files-Excluded:
     ansible_collections/containers/podman/docs/_static/jquery.js
     ansible_collections/containers/podman/docs/_static/underscore.js
     ansible_collections/containers/podman/docs/searchindex.js
-    ansible_collections/inspur/ispim/venv
-    ansible_collections/kaytus/ksmanage/venv
 
 Files: *
 Copyright: 2017, <meiliu@fusionlayer.com>
@@ -616,7 +614,7 @@ License: GPL-3+
 Files: debian/*
 Copyright: 2014-2018, Harlan Lieberman-Berg <hlieberman@setec.io>
            2013-2014, Janos Guljas <janos@resenje.org>
-           2016-2022, Lee Garrett <debian@rocketjump.eu>
+           2016-2024, Lee Garrett <debian@rocketjump.eu>
            2013-2014, Michael Vogt <mvo@debian.org>
 License: GPL-3+
 
diff --git a/debian/patches/0002-fix-libvirt-encoding-errors-on-windows-guests.patch b/debian/patches/0002-fix-libvirt-encoding-errors-on-windows-guests.patch
index 78a8baf3e..41b30e4b6 100644
--- a/debian/patches/0002-fix-libvirt-encoding-errors-on-windows-guests.patch
+++ b/debian/patches/0002-fix-libvirt-encoding-errors-on-windows-guests.patch
@@ -1,20 +1,17 @@
-From fb6123b5419dee8de0bd739383ee1c67ad596216 Mon Sep 17 00:00:00 2001
-From: Lee Garrett <lgarrett@rocketjump.eu>
-Date: Fri, 1 Sep 2023 14:35:15 +0200
-Subject: [PATCH 1/2] Fix encoding errors on Windows guests (fixes: #156)
-
-On Windows guests the default encoding will be set to whatever
-default legacy encoding, not utf-8. This issue isn't apparent on English locale
-Windows guests, as there the encodings (ISO-8859-1, utf-8) happen to coincide.
-
-However, on e.g. German Windows guests this will cause an encoding error when
-reading any output from there.
-
-This patch ensures that the proper encoding is set on every command.
+Description: Fix encoding errors on Windows libvirt guests
+ On Windows guests the default encoding will be set to whatever
+ default legacy encoding, not utf-8. This issue isn't apparent on English locale
+ Windows guests, as there the encodings (ISO-8859-1, utf-8) happen to coincide.
+ However, on e.g. German Windows guests this will cause an encoding error when
+ reading any output from there.
+ This patch ensures that the proper encoding is set on every command.
+Author: Lee Garrett <debian@rocketjump.eu>
+Bug: https://github.com/ansible-collections/community.libvirt/issues/156
+Applied-Upstream: https://github.com/ansible-collections/community.libvirt/pull/157
+Reviewed-by: Lee Garrett <debian@rocketjump.eu>
+Last-Update: 2024-06-05
 ---
- plugins/connection/libvirt_qemu.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/ansible_collections/community/libvirt/plugins/connection/libvirt_qemu.py
 +++ b/ansible_collections/community/libvirt/plugins/connection/libvirt_qemu.py
 @@ -164,6 +164,10 @@
diff --git a/debian/patches/0004-fix-cyberark-conjur-import.patch b/debian/patches/0004-fix-cyberark-conjur-import.patch
new file mode 100644
index 000000000..0b5a5af1d
--- /dev/null
+++ b/debian/patches/0004-fix-cyberark-conjur-import.patch
@@ -0,0 +1,27 @@
+Description: fix cyberark.conjur import error
+Author: Lee Garrett <debian@rocketjump.eu>
+Origin: upstream, https://github.com/cyberark/ansible-conjur-collection/commit/1f1886f4f3eef61c85ef3fc1165882a7d8314533
+Forwarded: not-needed
+Applied-Upstream: https://github.com/cyberark/ansible-conjur-collection/commit/1f1886f4f3eef61c85ef3fc1165882a7d8314533
+Reviewed-by: Lee Garrett <debian@rocketjump.eu>
+Last-Update: 2024-06-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/ansible_collections/cyberark/conjur/plugins/lookup/conjur_variable.py
++++ b/ansible_collections/cyberark/conjur/plugins/lookup/conjur_variable.py
+@@ -87,6 +87,7 @@
+ 
+ import os.path
+ import socket
++import ansible.module_utils.six.moves.urllib.error as urllib_error
+ from ansible.errors import AnsibleError
+ from ansible.plugins.lookup import LookupBase
+ from base64 import b64encode
+@@ -94,7 +95,6 @@
+ from os import environ
+ from time import sleep
+ from ansible.module_utils.six.moves.urllib.parse import quote
+-from ansible.module_utils.urls import urllib_error
+ from stat import S_IRUSR, S_IWUSR
+ from tempfile import gettempdir, NamedTemporaryFile
+ import yaml
diff --git a/debian/patches/series b/debian/patches/series
index 69c96cea0..431ae0d5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-fix-libvirt-encoding-errors-on-windows-guests.patch
 0003-fix-libvirt-path-resolution.patch
+0004-fix-cyberark-conjur-import.patch
diff --git a/debian/tests/control b/debian/tests/control
index 4b85b722e..495884020 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -18,6 +18,7 @@ Depends: @,
          python3-msrestazure,
          python3-openssl,
          python3-paramiko,
+         python3-passlib,
          python3-proxmoxer,
          python3-pytest-forked,
          python3-pytest-mock,
diff --git a/debian/tests/flaky_tests_list.py b/debian/tests/flaky_tests_list.py
index 3a49c9b2d..893d11815 100755
--- a/debian/tests/flaky_tests_list.py
+++ b/debian/tests/flaky_tests_list.py
@@ -11,12 +11,11 @@ flaky_test_dirs = [
     'ansible_collections/community/general',                # import broken
     'ansible_collections/community/hrobot',                 # import broken
     'ansible_collections/community/library_inventory_filtering_v1', # [1]
-    'ansible_collections/community/sap',                    # E   ModuleNotFoundError: No module named 'ansible_collections.community.sap.plugins.modules.*'
+    'ansible_collections/ibm/qradar',                       # [0]
     'ansible_collections/junipernetworks/junos',            # test broken
     'ansible_collections/netapp_eseries/santricity',        # [0]
     'ansible_collections/netapp/ontap',                     # missing netapp_lib
     'ansible_collections/ngine_io/cloudstack',              # [0]
-    'ansible_collections/purestorage/fusion',               # E   ModuleNotFoundError: No module named 'fusion'
     'ansible_collections/sensu/sensu_go',                   # [2]
     'ansible_collections/splunk/es',                        # assert result["changed"] is True
 ]