From afede72d91f1ebc3a84934b9b23e3342c75491b4 Mon Sep 17 00:00:00 2001
From: Zoltan Fridrich <zfridric@redhat.com>
Date: Jul 12 2022 09:52:38 +0000
Subject: Add missing options from ssh_config into ssh manpage


Resolves: rhbz#2033372

Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>

---

diff --git a/openssh-8.7p1-ssh-manpage.patch b/openssh-8.7p1-ssh-manpage.patch
new file mode 100644
index 0000000..bd0bdb7
--- /dev/null
+++ b/openssh-8.7p1-ssh-manpage.patch
@@ -0,0 +1,53 @@
+diff --color -ru a/ssh.1 b/ssh.1
+--- a/ssh.1	2022-07-12 11:47:51.307295880 +0200
++++ b/ssh.1	2022-07-12 11:50:28.793363263 +0200
+@@ -493,6 +493,7 @@
+ .It AddressFamily
+ .It BatchMode
+ .It BindAddress
++.It BindInterface
+ .It CanonicalDomains
+ .It CanonicalizeFallbackLocal
+ .It CanonicalizeHostname
+@@ -510,6 +511,7 @@
+ .It ControlPath
+ .It ControlPersist
+ .It DynamicForward
++.It EnableSSHKeysign
+ .It EscapeChar
+ .It ExitOnForwardFailure
+ .It FingerprintHash
+@@ -538,6 +540,8 @@
+ .It IdentitiesOnly
+ .It IdentityAgent
+ .It IdentityFile
++.It IgnoreUnknown
++.It Include
+ .It IPQoS
+ .It KbdInteractiveAuthentication
+ .It KbdInteractiveDevices
+@@ -546,6 +550,7 @@
+ .It LocalCommand
+ .It LocalForward
+ .It LogLevel
++.It LogVerbose
+ .It MACs
+ .It Match
+ .It RSAMinSize
+@@ -566,6 +571,8 @@
+ .It RemoteCommand
+ .It RemoteForward
+ .It RequestTTY
++.It RevokedHostKeys
++.It SecurityKeyProvider
+ .It SendEnv
+ .It ServerAliveInterval
+ .It ServerAliveCountMax
+@@ -575,6 +582,7 @@
+ .It StreamLocalBindMask
+ .It StreamLocalBindUnlink
+ .It StrictHostKeyChecking
++.It SyslogFacility
+ .It TCPKeepAlive
+ .It Tunnel
+ .It TunnelDevice
diff --git a/openssh.spec b/openssh.spec
index f853cb6..42b08e3 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -226,6 +226,10 @@ Patch1000: openssh-8.7p1-minimize-sha1-use.patch
 # upstream commits:
 # 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee
 Patch1001: openssh-8.7p1-scp-clears-file.patch
+# Add missing options from ssh_config into ssh manpage
+# upstream bug:
+# https://bugzilla.mindrot.org/show_bug.cgi?id=3455
+Patch1002: openssh-8.7p1-ssh-manpage.patch
 
 License: BSD
 Requires: /sbin/nologin
@@ -416,6 +420,7 @@ popd
 
 %patch1000 -p1 -b .minimize-sha1-use
 %patch1001 -p1 -b .scp-clears-file
+%patch1002 -p1 -b .ssh-manpage
 
 %patch100 -p1 -b .coverity
 
@@ -699,6 +704,8 @@ test -f %{sysconfig_anaconda} && \
 * Mon Jul 11 2022 Zoltan Fridrich <zfridric@redhat.com> - 8.7p1-11
 - Fix scp clearing file when src and dest are the same
   Resolves: rhbz#2056884
+- Add missing options from ssh_config into ssh manpage
+  Resolves: rhbz#2033372
 
 * Wed Jun 29 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-10
 - Set minimal value of RSA key length via configuration option