Merge pull request 'Unpatch Red Hat help message' (#3) from metalefty/openssh:a10s-redhat-help into a10s

Reviewed-on: #3

openssh.spec

@@ -43,7 +43,7 @@
 Summary: An open source implementation of SSH protocol version 2
 Name: openssh
 Version: %{openssh_ver}
-Release: 9%{?dist}
+Release: 9%{?dist}.alma.1
 URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -193,7 +193,7 @@ Patch1014: openssh-8.7p1-nohostsha1proof.patch
 
 Patch1015: openssh-9.6p1-pam-rhost.patch
 Patch1016: openssh-9.9p1-separate-keysign.patch
-Patch1017: openssh-8.7p1-redhat-help.patch
+#Patch1017: openssh-8.7p1-redhat-help.patch
 Patch1018: openssh-8.7p1-openssl-log.patch
 # upstream cf3e48ee8ba1beeccddd2f203b558fa102be67a2
 # upstream 0c3927c45f8a57b511c874c4d51a8c89414f74ef
@@ -393,7 +393,7 @@ gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
 %patch -P 1014 -p1 -b .nosha1hostproof
 %patch -P 1015 -p1 -b .pam-rhost
 %patch -P 1016 -p1 -b .sep-keysign
-%patch -P 1017 -p1 -b .help
+#%patch -P 1017 -p1 -b .help
 %patch -P 1018 -p1 -b .openssl-log
 %patch -P 1019 -p1 -b .mlkembe
 %patch -P 1020 -p1 -b .match
@@ -683,6 +683,9 @@ test -f %{sysconfig_anaconda} && \
 %attr(0755,root,root) %{_libdir}/sshtest/sk-dummy.so
 
 %changelog
+* Wed Jun 25 2025 Koichiro Iwao <meta@almalinux.org> - 9.9p1-9.alma.1
+- Unpatch Red Hat help message
+
 * Tue Apr 29 2025 Zoltan Fridrich <zfridric@redhat.com> - 9.9p1-9
 - CVE-2025-32728: Fix logic error in DisableForwarding option
   Resolves: RHEL-86819