From 538421ef913b59b5f520b3bef510713d7b7b61ca Mon Sep 17 00:00:00 2001
From: renmingshuai <renmingshuai@huawei.com>
Date: Wed, 2 Nov 2022 17:22:20 +0800
Subject: [PATCH] add ssh-keygen bash completion

---
 openssh.spec | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/openssh.spec b/openssh.spec
index cbb54f2..cbddbd0 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 8
+%global openssh_release 9
 
 Name:           openssh
 Version:        8.8p1
@@ -27,9 +27,10 @@ Source10:       sshd.socket
 Source11:       sshd.service
 Source12:       sshd-keygen@.service
 Source13:       sshd-keygen
-Source14:	sshd.tmpfiles
+Source14:       sshd.tmpfiles
 Source15:       sshd-keygen.target
 Source16:       ssh-agent.service
+Source17:       ssh-keygen-bash-completion.sh
 Patch0:         backport-openssh-6.7p1-coverity.patch
 Patch1:         backport-openssh-7.6p1-audit.patch
 Patch2:         backport-openssh-7.1p2-audit-race-condition.patch
@@ -328,6 +329,7 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh/ssh_config.d
 mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh
 mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 %make_install
 
@@ -351,6 +353,7 @@ install -m755 contrib/ssh-copy-id $RPM_BUILD_ROOT%{_bindir}/
 install contrib/ssh-copy-id.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m644 -D %{SOURCE14} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
 install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass
+install -m644 %{SOURCE17} $RPM_BUILD_ROOT/etc/bash_completion.d/ssh-keygen-bash-completion.sh
 
 ln -s gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -389,6 +392,7 @@ getent passwd sshd >/dev/null || \
 %attr(0755,root,root) %{_bindir}/ssh-keygen
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 %attr(2555,root,ssh_keys) %{_libexecdir}/openssh/ssh-keysign
+%attr(0644,root,root) %{_sysconfdir}/bash_completion.d/ssh-keygen-bash-completion.sh
 
 %files clients
 %attr(0755,root,root) %{_bindir}/ssh
@@ -445,6 +449,12 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Wed Nov 2 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-9
+- Type:requirement
+- CVE:NA
+- SUG:NA
+- DESC:add ssh-keygen bash completion
+
 * Sun Oct 09 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-8
 - Type:bugfix
 - CVE:NA
-- 
Gitee