Adding upstream version 9.4.0+dfsg.upstream/9.4.0+dfsg

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

5 files changed, 38 insertions, 14 deletions

diff --git a/ansible_collections/community/sops/.github/workflows/ansible-test.yml b/ansible_collections/community/sops/.github/workflows/ansible-test.yml
index eeec801aa..f31dfca6b 100644
--- a/ansible_collections/community/sops/.github/workflows/ansible-test.yml
+++ b/ansible_collections/community/sops/.github/workflows/ansible-test.yml
@@ -33,6 +33,7 @@ jobs:
           - stable-2.13
           - stable-2.14
           - stable-2.15
+          - stable-2.16
           - devel
     # Ansible-test on various stable branches does not yet work well with cgroups v2.
     # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
@@ -69,11 +70,12 @@ jobs:
         docker_container:
           - ubuntu2004
           - ubuntu2204
-          - fedora37
+          - fedora38
         sops_version:
           - 3.5.0
           - 3.6.0
           - 3.7.3
+          - 3.8.0
         python_version:
           - ''
         include:
@@ -108,19 +110,27 @@ jobs:
           - ansible: stable-2.15
             docker_container: ubuntu2204
             sops_version: 3.7.3
+          # 2.16
+          - ansible: stable-2.16
+            docker_container: ubuntu2204
+            sops_version: 3.8.0
+          - ansible: stable-2.16
+            docker_container: quay.io/ansible-community/test-image:centos-stream8
+            python_version: '3.6'
+            sops_version: latest
           # devel
           - ansible: devel
             docker_container: quay.io/ansible-community/test-image:archlinux
             python_version: '3.11'
             sops_version: latest
           - ansible: devel
+            docker_container: quay.io/ansible-community/test-image:debian-bookworm
+            python_version: '3.11'
+            sops_version: latest
+          - ansible: stable-2.15
             docker_container: quay.io/ansible-community/test-image:debian-bullseye
             python_version: '3.9'
             sops_version: latest
-          - ansible: devel
-            docker_container: quay.io/ansible-community/test-image:centos-stream8
-            python_version: '3.6'
-            sops_version: latest
     steps:
       - name: >-
           Perform integration testing against
@@ -177,6 +187,10 @@ jobs:
             docker_container: ubuntu2204
             python_version: ''
             target: gha/install/1/
+          - ansible: devel
+            docker_container: fedora38
+            python_version: ''
+            target: gha/install/1/
           # Install on localhost vs. remote host
           - ansible: devel
             docker_container: ubuntu2004
@@ -191,18 +205,23 @@ jobs:
             # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
             pre-test-cmd: |-
               git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general
-          - ansible: devel
+          - ansible: stable-2.15
             docker_container: quay.io/ansible-community/test-image:centos-stream8
             python_version: '3.9'
             target: gha/install/3/
             github_latest_detection: auto
           - ansible: devel
+            docker_container: quay.io/ansible-community/test-image:debian-bookworm
+            python_version: '3.11'
+            target: gha/install/3/
+            github_latest_detection: auto
+          - ansible: stable-2.16
             docker_container: quay.io/ansible-community/test-image:debian-bullseye
             python_version: '3.9'
             target: gha/install/3/
             github_latest_detection: auto
           - ansible: devel
-            docker_container: fedora37
+            docker_container: fedora38
             python_version: ''
             target: gha/install/3/
             github_latest_detection: auto
@@ -224,6 +243,7 @@ jobs:
           #   # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
           #   pre-test-cmd: |-
           #     git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general
+          # Install 3.8.0-rc.1 prerelease
     steps:
       - name: >-
           Perform sops installation integration testing against
diff --git a/ansible_collections/community/sops/.github/workflows/ee.yml b/ansible_collections/community/sops/.github/workflows/ee.yml
index 22ec55014..3fccaa057 100644
--- a/ansible_collections/community/sops/.github/workflows/ee.yml
+++ b/ansible_collections/community/sops/.github/workflows/ee.yml
@@ -48,6 +48,10 @@ jobs:
           - name: ansible-core devel @ RHEL UBI 9
             ansible_core: https://github.com/ansible/ansible/archive/devel.tar.gz
             ansible_runner: ansible-runner
+            other_deps: |2
+                python_interpreter:
+                  package_system: python3.11 python3.11-pip python3.11-wheel python3.11-cryptography
+                  python_path: "/usr/bin/python3.11"
             base_image: docker.io/redhat/ubi9:latest
             pre_base: '"#"'
             execute_playbook: ansible-playbook -v community.sops.install_localhost
@@ -90,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }}
 
diff --git a/ansible_collections/community/sops/.github/workflows/extra-tests.yml b/ansible_collections/community/sops/.github/workflows/extra-tests.yml
index fd2f7f55e..af386ec83 100644
--- a/ansible_collections/community/sops/.github/workflows/extra-tests.yml
+++ b/ansible_collections/community/sops/.github/workflows/extra-tests.yml
@@ -26,14 +26,14 @@ jobs:
     steps:
 
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install ansible-core
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
diff --git a/ansible_collections/community/sops/.github/workflows/import-galaxy.yml b/ansible_collections/community/sops/.github/workflows/import-galaxy.yml
index ae472845d..420dafb68 100644
--- a/ansible_collections/community/sops/.github/workflows/import-galaxy.yml
+++ b/ansible_collections/community/sops/.github/workflows/import-galaxy.yml
@@ -23,14 +23,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ./checkout
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install ansible-core
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
@@ -71,7 +71,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install ansible-core
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
diff --git a/ansible_collections/community/sops/.github/workflows/reuse.yml b/ansible_collections/community/sops/.github/workflows/reuse.yml
index f487d7969..dbdc1d499 100644
--- a/ansible_collections/community/sops/.github/workflows/reuse.yml
+++ b/ansible_collections/community/sops/.github/workflows/reuse.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |