From cae10a5ce31ce3f0a4596fc90947b372c22a2a06 Mon Sep 17 00:00:00 2001
From: kircher <majun65@huawei.com>
Date: Tue, 8 Mar 2022 19:46:08 +0800
Subject: [PATCH] add sshd.tmpfiles

(cherry picked from commit 61b7914415ee171513d073172520c422b4132621)
---
 openssh.spec  | 11 ++++++++++-
 sshd.tmpfiles |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 sshd.tmpfiles

diff --git a/openssh.spec b/openssh.spec
index 7a9bddd..b99eede 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 1
+%global openssh_release 2
 
 Name:           openssh
 Version:        8.8p1
@@ -27,6 +27,7 @@ Source10:       sshd.socket
 Source11:       sshd.service
 Source12:       sshd-keygen@.service
 Source13:       sshd-keygen
+Source14:	sshd.tmpfiles
 Source15:       sshd-keygen.target
 Source16:       ssh-agent.service
 Patch0:         backport-openssh-6.7p1-coverity.patch
@@ -325,6 +326,7 @@ install -m644 %{SOURCE16} $RPM_BUILD_ROOT/%{_userunitdir}/ssh-agent.service
 install -m744 %{SOURCE13} $RPM_BUILD_ROOT/%{_libexecdir}/openssh/sshd-keygen
 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
 
 ln -s gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
@@ -392,6 +394,7 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_unitdir}/sshd.socket
 %attr(0644,root,root) %{_unitdir}/sshd-keygen@.service
 %attr(0644,root,root) %{_unitdir}/sshd-keygen.target
+%attr(0644,root,root) %{_tmpfilesdir}/openssh.conf
 
 %files keycat
 %attr(0755,root,root) %{_libexecdir}/openssh/ssh-keycat
@@ -419,6 +422,12 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Tue Mar 08 2021 kircher<majun65@huawei.com> - 8.8P1-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:add sshd.tmpfiles
+
 * Wed Dec 8 2021 renmingshuai<renmingshuai@huawei.com> - 8.8P1-1
 - Type:bugfix
 - CVE:NA
diff --git a/sshd.tmpfiles b/sshd.tmpfiles
new file mode 100644
index 0000000..c35a2b8
--- /dev/null
+++ b/sshd.tmpfiles
@@ -0,0 +1 @@
+d /var/empty/sshd 711 root root -
-- 
Gitee