Cherry-pick patch for SSH's PubkeyAcceptedAlgorithms

The upstream patch does not apply cleanly, so fix it locally.

3 files changed, 35 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index ef23e874..88ce08b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 bash-completion (1:2.11-7) UNRELEASED; urgency=medium
 
   * Remove downstream patch (Closes: #1033847).
+  * Cherry-pick fix for ssh PubkeyAcceptedKeytypes (Closes: #1033642).
 
  -- Gabriel F. T. Gomes <gabriel@debian.org>  Sun, 03 Apr 2022 09:17:08 -0300
 
diff --git a/debian/patches/17-ssh-pubacceptedalgorithms.patch b/debian/patches/17-ssh-pubacceptedalgorithms.patch
new file mode 100644
index 00000000..7cb62e5b
--- /dev/null
+++ b/debian/patches/17-ssh-pubacceptedalgorithms.patch
@@ -0,0 +1,33 @@
+commit 7c0084e0f4d82a9b4d76f72e28b8afe773146de7
+Author: Gabriel F. T. Gomes <gabriel@inconstante.net.br>
+Date:   Sun Apr 9 22:34:28 2023 -0700
+
+    fix(ssh): deprecated option PubkeyAcceptedKeyTypes
+    
+    As reported by a Debian user in https://bugs.debian.org/1033642, ssh
+    changed the option name from PubkeyAcceptedKeyTypes to
+    PubkeyAcceptedAlgorithms. The old name still works, but no longer
+    presented in the manpages.
+
+diff --git a/completions/ssh b/completions/ssh
+index 907c039..4f83c48 100644
+--- a/completions/ssh
++++ b/completions/ssh
+@@ -53,7 +53,7 @@ _ssh_options()
+         NoHostAuthenticationForLocalhost NumberOfPasswordPrompts
+         PasswordAuthentication PermitLocalCommand PKCS11Provider Port
+         PreferredAuthentications ProxyCommand ProxyJump ProxyUseFdpass
+-        PubkeyAcceptedKeyTypes PubkeyAuthentication RekeyLimit RemoteCommand
++        PubkeyAcceptedAlgorithms PubkeyAuthentication RekeyLimit RemoteCommand
+         RemoteForward RequestTTY RevokedHostKeys SendEnv ServerAliveCountMax
+         ServerAliveInterval SmartcardDevice StreamLocalBindMask
+         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
+@@ -172,7 +172,7 @@ _ssh_suboption()
+         proxycommand | remotecommand | localcommand)
+             COMPREPLY=($(compgen -c -- "$cur"))
+             ;;
+-        pubkeyacceptedkeytypes)
++        pubkeyacceptedalgorithms | pubkeyacceptedkeytypes)
+             COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
+             ;;
+         requesttty)
diff --git a/debian/patches/series b/debian/patches/series
index 2b5a43e2..597cc436 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 14-backport-support-for-long-options-in-perltidy.patch
 15-find-exec.patch
 16-freecad-extension.patch
+17-ssh-pubacceptedalgorithms.patch