Merging debian version 9.4.0+dfsg-1.

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

8 files changed, 25 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index a5d005da0..a3a8092b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ansible (9.4.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1042906)
+    - fixes CVE-2023-4237 (Closes: #1055300)
+    - Support bookworm in zabbix plugin (Closes: #1054544)
+  * Drop dependency on python3-distutils (Closes: #1065825)
+  * Drop 0001-fix-libvirt-connection-plugin-warning.patch (applied upstream)
+  * Refreshen patches
+
+ -- Lee Garrett <debian@rocketjump.eu>  Thu, 18 Apr 2024 00:34:02 +0200
+
 ansible (7.7.0+dfsg-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index d12660112..dd196428b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: ansible
 Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
-XSBC-Original-Maintainer: Lee Garrett <debian@rocketjump.eu>
-XSBC-Original-Uploaders: Harlan Lieberman-Berg <hlieberman@debian.org>
+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
+XSBC-Original-Uploaders: Lee Garrett <debian@rocketjump.eu>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Section: admin
 Priority: optional
@@ -31,7 +31,6 @@ Depends: ${misc:Depends},
          ${python3:Depends},
          ansible-core (>= 2.11.5-1~),
          openssh-client | python3-paramiko (>= 2.6.0),
-         python3-distutils,
          python3-dnspython,
          python3-httplib2,
          python3-jinja2,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index ac9066d22..2e3926b48 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,6 @@
 debian-branch = master
 upstream-branch = upstream
 pristine-tar = True
+
+[import-orig]
+merge-mode = replace
diff --git a/debian/patches/0001-fix-libvirt-connection-plugin-warning.patch b/debian/patches/0001-fix-libvirt-connection-plugin-warning.patch
deleted file mode 100644
index d3daee66b..000000000
--- a/debian/patches/0001-fix-libvirt-connection-plugin-warning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix libvirt connection plugin warning
-Origin: upstream, https://github.com/ansible-collections/community.libvirt/pull/147
-Forwarded: not-needed
-Reviewed-by: Lee Garrett <debian@rocketjump.eu> 
-Last-Update: 2023-07-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- /dev/null
-+++ b/ansible_collections/community/libvirt/changelogs/fragments/147_fix_qemu_remote_target_warning.yml
-@@ -0,0 +1,2 @@
-+bugfixes:
-+  - libvirt_qemu - connection plugin threw a warning about an improperly configured remote target. Fix adds `inventory_hostname` to `options.remote_addr.vars` (https://github.com/ansible-collections/community.libvirt/pull/147).
---- a/ansible_collections/community/libvirt/plugins/connection/libvirt_qemu.py
-+++ b/ansible_collections/community/libvirt/plugins/connection/libvirt_qemu.py
-@@ -29,6 +29,7 @@
-     default: inventory_hostname
-     vars:
-       - name: ansible_host
-+      - name: inventory_hostname
-   executable:
-     description:
-       - Shell to use for execution inside container.
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 4c8e2926c..78a8baf3e 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
@@ -17,9 +17,9 @@ This patch ensures that the proper encoding is set on every command.
 
 --- a/ansible_collections/community/libvirt/plugins/connection/libvirt_qemu.py
 +++ b/ansible_collections/community/libvirt/plugins/connection/libvirt_qemu.py
-@@ -161,6 +161,10 @@
-             # prompt that will not occur
-             sudoable = False
+@@ -164,6 +164,10 @@
+             # utf-8, this must be done via chcp to get utf-8 (65001)
+             cmd = ' '.join(["chcp.com", "65001", self._shell._SHELL_REDIRECT_ALLNULL, self._shell._SHELL_AND, cmd])
  
 +            # Make sure our first command is to set the console encoding to
 +            # utf-8, this must be done via chcp to get utf-8 (65001)
diff --git a/debian/patches/0003-fix-libvirt-path-resolution.patch b/debian/patches/0003-fix-libvirt-path-resolution.patch
index 3153b6fd3..1dec5a535 100644
--- a/debian/patches/0003-fix-libvirt-path-resolution.patch
+++ b/debian/patches/0003-fix-libvirt-path-resolution.patch
@@ -24,7 +24,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  import shlex
  import time
  import traceback
-@@ -99,6 +100,7 @@
+@@ -98,6 +99,7 @@
          super(Connection, self).__init__(play_context, new_stdin, *args, **kwargs)
  
          self._host = self._play_context.remote_addr
@@ -32,7 +32,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
          # Windows operates differently from a POSIX connection/shell plugin,
          # we need to set various properties to ensure SSH on Windows continues
-@@ -147,6 +149,21 @@
+@@ -146,6 +148,21 @@
              display.vvv(u"ESTABLISH {0} CONNECTION".format(self.transport), host=self._host)
              self._connected = True
  
@@ -54,7 +54,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      def exec_command(self, cmd, in_data=None, sudoable=True):
          """ execute a command on the virtual machine host """
          super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
-@@ -154,6 +171,7 @@
+@@ -153,6 +170,7 @@
          self._display.vvv(u"EXEC {0}".format(cmd), host=self._host)
  
          cmd_args_list = shlex.split(to_native(cmd, errors='surrogate_or_strict'))
@@ -62,7 +62,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
          if getattr(self._shell, "_IS_WINDOWS", False):
              # Become method 'runas' is done in the wrapper that is executed,
-@@ -242,6 +260,7 @@
+@@ -245,6 +263,7 @@
      def put_file(self, in_path, out_path):
          ''' transfer a file from local to domain '''
          super(Connection, self).put_file(in_path, out_path)
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          display.vvv("PUT %s TO %s" % (in_path, out_path), host=self._host)
  
          if not exists(to_bytes(in_path, errors='surrogate_or_strict')):
-@@ -304,6 +323,7 @@
+@@ -307,6 +326,7 @@
      def fetch_file(self, in_path, out_path):
          ''' fetch a file from domain to local '''
          super(Connection, self).fetch_file(in_path, out_path)
diff --git a/debian/patches/series b/debian/patches/series
index 593fcdb88..69c96cea0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-fix-libvirt-connection-plugin-warning.patch
 0002-fix-libvirt-encoding-errors-on-windows-guests.patch
 0003-fix-libvirt-path-resolution.patch
diff --git a/debian/watch b/debian/watch
index d9e7d4d58..e10eeae1f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
 opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg,pgpmode=auto \
-https://pypi.debian.net/ansible/ ansible-(7\.[0-9]+\.[0-9]+).tar.gz
+https://pypi.debian.net/ansible/ ansible-([0-9]+\.[0-9]+\.[0-9]+).tar.gz