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

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

6 files changed, 20 insertions, 18 deletions

diff --git a/ansible_collections/community/sops/roles/install/meta/argument_specs.yml b/ansible_collections/community/sops/roles/install/meta/argument_specs.yml
index e6f3e8746..83c890a5b 100644
--- a/ansible_collections/community/sops/roles/install/meta/argument_specs.yml
+++ b/ansible_collections/community/sops/roles/install/meta/argument_specs.yml
@@ -8,7 +8,7 @@ argument_specs:
     short_description: Install Mozilla sops
     version_added: 1.5.0
     description:
-      - This role installs L(Mozilla sops,https://github.com/mozilla/sops) and Gnu Privacy Guard (GPG).
+      - This role installs L(Mozilla sops,https://github.com/getsops/sops) and Gnu Privacy Guard (GPG).
       - >-
         This role supports the following operating systems:
         Alpine (new enough),
@@ -19,7 +19,7 @@ argument_specs:
         RHEL 7 or newer,
         Ubuntu 16.04 or newer LTS versions
       - The Ansible facts C(ansible_facts.architecture), C(ansible_facts.distribution), C(ansible_facts.distribution_major_version),
-        C(ansible_facts.distribution_version), and C(ansible_facts.os_family) are expected to be present if I(sops_install_on_localhost) is C(false).
+        C(ansible_facts.distribution_version), and C(ansible_facts.os_family) are expected to be present if O(sops_install_on_localhost) is V(false).
     author:
       - Felix Fontein (@felixfontein)
     options:
@@ -27,15 +27,15 @@ argument_specs:
         default: latest
         description:
           - The version of sops to install.
-          - Should be a version like C(3.7.2). The special value C(latest) will select the latest version available form the given source.
+          - Should be a version like V(3.7.2). The special value V(latest) will select the latest version available form the given source.
         type: str
       sops_source:
         default: auto
         description:
           - Determines the source from where sops is installed.
-          - The value C(github) will install sops from the Mozilla sops releases on GitHub (U(https://github.com/mozilla/sops/releases/)).
-          - The value C(system) will install sops from the system packages. Note that not all system package repositories support sops.
-          - The value C(auto) will determine the best source to install sops from. Here, system package repositories are preferred over GitHub.
+          - The value V(github) will install sops from the Mozilla sops releases on GitHub (U(https://github.com/getsops/sops/releases/)).
+          - The value V(system) will install sops from the system packages. Note that not all system package repositories support sops.
+          - The value V(auto) will determine the best source to install sops from. Here, system package repositories are preferred over GitHub.
         type: str
         choices:
           - auto
@@ -54,9 +54,9 @@ argument_specs:
       sops_github_latest_detection:
         description:
           - When installing the latest sops version from GitHub, configures how the latest release is detected.
-          - C(auto) tries C(api) first and then uses C(latest-release).
-          - C(api) asks the GitHub API for a list of recent releases and picks the highest version.
-          - C(latest-release) uses a not fully documented URL to retrieve the release marked as "latest" by the repository maintainers.
+          - V(auto) tries V(api) first and then uses V(latest-release).
+          - V(api) asks the GitHub API for a list of recent releases and picks the highest version. Pre-releases are avoided.
+          - V(latest-release) uses a not fully documented URL to retrieve the release marked as "latest" by the repository maintainers.
         type: str
         choices:
           - auto
diff --git a/ansible_collections/community/sops/roles/install/meta/main.yml b/ansible_collections/community/sops/roles/install/meta/main.yml
index f6dc6814e..376d956b6 100644
--- a/ansible_collections/community/sops/roles/install/meta/main.yml
+++ b/ansible_collections/community/sops/roles/install/meta/main.yml
@@ -6,6 +6,6 @@
 galaxy_info:
   standalone: false
   description: >
-    Install Mozilla sops (https://github.com/mozilla/sops).
+    Install Mozilla sops (https://github.com/getsops/sops).
 
 dependencies: []
diff --git a/ansible_collections/community/sops/roles/install/tasks/github_api.yml b/ansible_collections/community/sops/roles/install/tasks/github_api.yml
index 01d9b77b3..43dc526b4 100644
--- a/ansible_collections/community/sops/roles/install/tasks/github_api.yml
+++ b/ansible_collections/community/sops/roles/install/tasks/github_api.yml
@@ -11,7 +11,7 @@
     status_code:
       - 200
       - 403  # "HTTP Error 403: rate limit exceeded"
-    url: https://api.github.com/repos/mozilla/sops/releases
+    url: https://api.github.com/repos/getsops/sops/releases
   register: _community_sops_install_github_releases
   delegate_to: localhost
   run_once: true
diff --git a/ansible_collections/community/sops/roles/install/tasks/github_latest_release.yml b/ansible_collections/community/sops/roles/install/tasks/github_latest_release.yml
index ca67b3cd6..748918657 100644
--- a/ansible_collections/community/sops/roles/install/tasks/github_latest_release.yml
+++ b/ansible_collections/community/sops/roles/install/tasks/github_latest_release.yml
@@ -9,7 +9,7 @@
     status_code:
       - 302
       - 307
-    url: https://github.com/mozilla/sops/releases/latest/
+    url: https://github.com/getsops/sops/releases/latest/
   register: _community_sops_install_github_latest_release
   delegate_to: localhost
   run_once: true
@@ -28,7 +28,7 @@
 - name: In case this failed, inform user
   ansible.builtin.debug:
     msg: >-
-      Could not obtain latest version from https://github.com/mozilla/sops/releases/latest/.
+      Could not obtain latest version from https://github.com/getsops/sops/releases/latest/.
       Please create an issue in https://github.com/ansible-collections/community.sops/issues/
       if there is not already one.
   when: _community_sops_install_effective_sops_version == ''
diff --git a/ansible_collections/community/sops/roles/install/vars/OS-Debian.yml b/ansible_collections/community/sops/roles/install/vars/OS-Debian.yml
index 5f9cf2609..64e23f2d5 100644
--- a/ansible_collections/community/sops/roles/install/vars/OS-Debian.yml
+++ b/ansible_collections/community/sops/roles/install/vars/OS-Debian.yml
@@ -16,10 +16,10 @@ _community_sops_install_system_packages_unsigned: []
 _community_sops_install_arch_transform:
   x86_64: amd64
 _community_sops_install_system_package_deb_github: >-
-  https://github.com/mozilla/sops/releases/download/v{{
+  https://github.com/getsops/sops/releases/download/v{{
     _community_sops_install_effective_sops_version
   }}/sops_{{
-    _community_sops_install_effective_sops_version
+    _community_sops_install_effective_sops_version.replace('-', '.')
   }}_{{
     _community_sops_install_arch_transform.get(ansible_facts.architecture, ansible_facts.architecture)
   }}.deb
diff --git a/ansible_collections/community/sops/roles/install/vars/OS-RedHat.yml b/ansible_collections/community/sops/roles/install/vars/OS-RedHat.yml
index 95f7d2abe..e06c62806 100644
--- a/ansible_collections/community/sops/roles/install/vars/OS-RedHat.yml
+++ b/ansible_collections/community/sops/roles/install/vars/OS-RedHat.yml
@@ -17,13 +17,15 @@ _community_sops_install_system_package_deb_github: false
 _community_sops_install_system_packages_github: []
 _community_sops_install_system_packages_unsigned_github:
   - >-
-    https://github.com/mozilla/sops/releases/download/v{{
+    https://github.com/getsops/sops/releases/download/v{{
       _community_sops_install_effective_sops_version
     }}/sops-{{
       (_community_sops_install_effective_sops_version is version('3.6.0', '<')) | ternary('v', '')
     }}{{
-      _community_sops_install_effective_sops_version
-    }}-1.{{
+      _community_sops_install_effective_sops_version.replace('-', '.')
+    }}{{
+      (_community_sops_install_effective_sops_version is version('3.8.0', '<')) | ternary('-1', '')
+    }}.{{
       ansible_facts.architecture
     }}.rpm