[rpms/openssh] f44: Remove duplicate manpage entries from ssh(1)

[rpms/openssh] f44: Remove duplicate manpage entries from ssh(1)

[Zoltan Fridrich]

            A new commit has been pushed.

            Repo   : rpms/openssh
            Branch : f44
            Commit : 14954c0655aad19edfb80df689b1a2c8291e5684
            Author : Zoltan Fridrich <zfridric@redhat.com>
            Date   : 2026-07-07T13:14:56+02:00
            Stats  : +2/-51 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/openssh/c/14954c0655aad19edfb80df689b1a2c8291e5684?branch=f44

            Log:
            Remove duplicate manpage entries from ssh(1)

Resolves: rhbz#2442505

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

---
diff --git a/0039-openssh-8.7p1-ssh-manpage.patch b/0039-openssh-8.7p1-ssh-manpage.patch
deleted file mode 100644
index d0e984d..0000000
--- a/0039-openssh-8.7p1-ssh-manpage.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7167a191776dacf7e31cf8a8a2ed89887e49f4ee Mon Sep 17 00:00:00 2001
-From: Dmitry Belyavskiy <beldmit@gmail.com>
-Date: Thu, 15 May 2025 13:43:29 +0200
-Subject: [PATCH 39/53] openssh-8.7p1-ssh-manpage
-
----
- ssh.1 | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/ssh.1 b/ssh.1
-index 6a9fbdc5b..755cdef2b 100644
---- a/ssh.1
-+++ b/ssh.1
-@@ -510,12 +510,12 @@ For full details of the options listed below, and their possible values, see
- .It BatchMode
- .It BindAddress
- .It BindInterface
--.It CASignatureAlgorithms
- .It CanonicalDomains
- .It CanonicalizeFallbackLocal
- .It CanonicalizeHostname
- .It CanonicalizeMaxDots
- .It CanonicalizePermittedCNAMEs
-+.It CASignatureAlgorithms
- .It CertificateFile
- .It ChannelTimeout
- .It CheckHostIP
-@@ -528,6 +528,7 @@ For full details of the options listed below, and their possible values, see
- .It ControlPath
- .It ControlPersist
- .It DynamicForward
-+.It EnableSSHKeysign
- .It EnableEscapeCommandline
- .It EnableSSHKeysign
- .It EscapeChar
-@@ -588,6 +589,8 @@ For full details of the options listed below, and their possible values, see
- .It RemoteCommand
- .It RemoteForward
- .It RequestTTY
-+.It RevokedHostKeys
-+.It SecurityKeyProvider
- .It RequiredRSASize
- .It RevokedHostKeys
- .It SecurityKeyProvider
--- 
-2.52.0
-

diff --git a/openssh.spec b/openssh.spec
index b30285f..43f9acb 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -145,10 +145,6 @@ Patch0036: 0036-openssh-7.1p2-audit-race-condition.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2049947
 Patch0037: 0037-openssh-9.0p1-audit-log.patch
 Patch0038: 0038-openssh-7.7p1-fips.patch
-# Add missing options from ssh_config into ssh manpage
-# upstream bug:
-# https://bugzilla.mindrot.org/show_bug.cgi?id=3455
-Patch0039: 0039-openssh-8.7p1-ssh-manpage.patch
 # Don't propose disallowed algorithms during hostkey negotiation
 # upstream MR:
 # https://github.com/openssh/openssh-portable/pull/323
@@ -599,6 +595,8 @@ test -f %{sysconfig_anaconda} && \
   cleanup due to missing NULL terminator
 - CVE-2026-55655: Fix MITM of X11 forwarding via abstract UNIX socket
   pre-binding
+- Remove duplicate manpage entries from ssh(1)
+  Resolves: rhbz#2442505
 
 * Thu Apr 30 2026 Manuel Fombuena <fombuena@outlook.com> - 10.2p1-10
 - Fix error message when fetching certs and keys on PKCS11 smartcards