84c6cae443
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I0a701722187a3fd34ad710c86dbcf31318fbfda5 Signed-off-by: slin14 <shuicheng.lin@intel.com>
40 lines
954 B
Diff
40 lines
954 B
Diff
From 2056c72dc2aa852397c59b864ed3011c71998d36 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:32:15 -0400
|
|
Subject: [1/6] WRS: spec-include-TiS-config-files.patch
|
|
|
|
---
|
|
SPECS/openssh.spec | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
|
|
index 5c030bc..e137156 100644
|
|
--- a/SPECS/openssh.spec
|
|
+++ b/SPECS/openssh.spec
|
|
@@ -88,6 +88,10 @@ Source11: sshd.service
|
|
Source12: sshd-keygen.service
|
|
Source13: sshd-keygen
|
|
|
|
+# WRS
|
|
+Source14: sshd_config
|
|
+Source15: ssh_config
|
|
+
|
|
# Internal debug
|
|
Patch0: openssh-5.9p1-wIm.patch
|
|
|
|
@@ -701,6 +705,11 @@ pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
popd
|
|
%endif
|
|
+
|
|
+# WRS: Overwrite with our config
|
|
+install -m 0640 %{SOURCE14} $RPM_BUILD_ROOT/etc/ssh/sshd_config
|
|
+install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT/etc/ssh/ssh_config
|
|
+
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
--
|
|
2.7.4
|
|
|