starlingx
/
integ
Code Issues Proposed changes

de-fuzz openssh patches 

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>
This commit is contained in:
slin14 2018-09-28 07:37:14 +08:00
parent 15e737c47b
commit 84c6cae443
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/openssh/centos/meta_patches/0001-Further-parallelize-openssh-build.patch
View File

@ -1,17 +1,17 @@
From e9d5aad98db3731eb73837773ab8117b54598196 Mon Sep 17 00:00:00 2001 From 43675576fe1d5780e042852365981bd2b8fa9e0e Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:32:16 -0400 Date: Mon, 2 Oct 2017 15:32:16 -0400
Subject: [PATCH 7/7] WRS: 0001-Further-parallelize-openssh-build.patch Subject: [4/6] WRS: 0001-Further-parallelize-openssh-build.patch
--- ---
SPECS/openssh.spec | 4 ++-- SPECS/openssh.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
index 332152d..52d080a 100644 index be83a63..39bbcac 100644
--- a/SPECS/openssh.spec --- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec +++ b/SPECS/openssh.spec
@@ -589,7 +589,7 @@ fi @@ -606,7 +606,7 @@ fi
perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
%endif %endif
@ -20,7 +20,7 @@ index 332152d..52d080a 100644
# Define a variable to toggle gnome1/gtk2 building. This is necessary # Define a variable to toggle gnome1/gtk2 building. This is necessary
# because RPM doesn't handle nested %if statements. # because RPM doesn't handle nested %if statements.
@@ -615,7 +615,7 @@ popd @@ -632,7 +632,7 @@ popd
pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
LDFLAGS="$SAVE_LDFLAGS" LDFLAGS="$SAVE_LDFLAGS"
%configure --with-selinux --libexecdir=/%{_libdir}/security --with-mantype=man %configure --with-selinux --libexecdir=/%{_libdir}/security --with-mantype=man
@ -30,5 +30,5 @@ index 332152d..52d080a 100644
%endif %endif
-- --
1.9.1 2.7.4

10
base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,14 +1,14 @@
From 5c046dab0c2f53a7a4ff643011fb367d8f5fbe6e Mon Sep 17 00:00:00 2001 From 4da56227f47a96f37eb0e46e0222f7e1d2f95c2b Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:32:16 -0400 Date: Mon, 2 Oct 2017 15:32:16 -0400
Subject: [PATCH 5/7] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [3/6] WRS: 0001-Update-package-versioning-for-TIS-format.patch
--- ---
SPECS/openssh.spec | 4 ++-- SPECS/openssh.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
index 9607a75..332152d 100644 index d10e73e..be83a63 100644
--- a/SPECS/openssh.spec --- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec +++ b/SPECS/openssh.spec
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
@ -20,7 +20,7 @@ index 9607a75..332152d 100644
URL: http://www.openssh.com/portable.html URL: http://www.openssh.com/portable.html
#URL1: http://pamsshagentauth.sourceforge.net #URL1: http://pamsshagentauth.sourceforge.net
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -339,7 +339,7 @@ Requires: openssh = %{version}-%{release} @@ -350,7 +350,7 @@ Requires: openssh = %{version}-%{release}
Summary: PAM module for authentication with ssh-agent Summary: PAM module for authentication with ssh-agent
Group: System Environment/Base Group: System Environment/Base
Version: %{pam_ssh_agent_ver} Version: %{pam_ssh_agent_ver}
@ -30,5 +30,5 @@ index 9607a75..332152d 100644
%description %description
-- --
1.9.1 2.7.4

12
base/openssh/centos/meta_patches/openssh-spec-file-add-init.patch
View File

@ -1,17 +1,17 @@
From 49c227e1ec30dc7b0417f74972cd5414ac68ce46 Mon Sep 17 00:00:00 2001 From 788beea32cfa09f61c27db117ec3b3b0500fbad8 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:32:16 -0400 Date: Mon, 2 Oct 2017 15:32:16 -0400
Subject: [PATCH 4/7] WRS: openssh-spec-file-add-init.patch Subject: [2/6] WRS: openssh-spec-file-add-init.patch
--- ---
SPECS/openssh.spec | 5 ----- SPECS/openssh.spec | 5 -----
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
index 2302061..9607a75 100644 index e137156..d10e73e 100644
--- a/SPECS/openssh.spec --- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec +++ b/SPECS/openssh.spec
@@ -711,9 +711,6 @@ getent passwd sshd >/dev/null || \ @@ -728,9 +728,6 @@ getent passwd sshd >/dev/null || \
%preun server %preun server
%systemd_preun sshd.service sshd.socket %systemd_preun sshd.service sshd.socket
@ -21,7 +21,7 @@ index 2302061..9607a75 100644
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@@ -776,8 +773,6 @@ getent passwd sshd >/dev/null || \ @@ -793,8 +790,6 @@ getent passwd sshd >/dev/null || \
%attr(0644,root,root) %{_unitdir}/sshd.socket %attr(0644,root,root) %{_unitdir}/sshd.socket
%attr(0644,root,root) %{_unitdir}/sshd-keygen.service %attr(0644,root,root) %{_unitdir}/sshd-keygen.service
@ -31,5 +31,5 @@ index 2302061..9607a75 100644
%endif %endif
-- --
1.9.1 2.7.4

10
base/openssh/centos/meta_patches/spec-include-TiS-config-files.patch
View File

@ -1,14 +1,14 @@
From f4b2a7d1f5f139ffd622a5617e63cbdc1fd838bd Mon Sep 17 00:00:00 2001 From 2056c72dc2aa852397c59b864ed3011c71998d36 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:32:15 -0400 Date: Mon, 2 Oct 2017 15:32:15 -0400
Subject: [PATCH 1/7] WRS: spec-include-TiS-config-files.patch Subject: [1/6] WRS: spec-include-TiS-config-files.patch
--- ---
SPECS/openssh.spec | 9 +++++++++ SPECS/openssh.spec | 9 +++++++++
1 file changed, 9 insertions(+) 1 file changed, 9 insertions(+)
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
index 69a8ae4..2302061 100644 index 5c030bc..e137156 100644
--- a/SPECS/openssh.spec --- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec +++ b/SPECS/openssh.spec
@@ -88,6 +88,10 @@ Source11: sshd.service @@ -88,6 +88,10 @@ Source11: sshd.service
@ -22,7 +22,7 @@ index 69a8ae4..2302061 100644
# Internal debug # Internal debug
Patch0: openssh-5.9p1-wIm.patch Patch0: openssh-5.9p1-wIm.patch
@@ -684,6 +688,11 @@ pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -701,6 +705,11 @@ pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
popd popd
%endif %endif
@ -35,5 +35,5 @@ index 69a8ae4..2302061 100644
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
-- --
1.9.1 2.7.4

10
base/openssh/centos/meta_patches/spec-remove-TC-config-files.patch
View File

@ -1,7 +1,7 @@
From a0a4b7c9e1cdc4d77c2e6aa61d74e3898aca86a5 Mon Sep 17 00:00:00 2001 From a67b7364d9d4d8891f593d35b6685483ab6d8225 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com> From: Andy Ning <andy.ning@windriver.com>
Date: Tue, 20 Mar 2018 10:14:56 -0400 Date: Tue, 20 Mar 2018 10:14:56 -0400
Subject: [PATCH 1/1] CGTS-9265: remove TC specific config files Subject: [5/6] CGTS-9265: remove TC specific config files
The hardcoded sshd_config and ssh_config files are replaced by The hardcoded sshd_config and ssh_config files are replaced by
patches to openssh. patches to openssh.
@ -10,7 +10,7 @@ patches to openssh.
1 file changed, 8 deletions(-) 1 file changed, 8 deletions(-)
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
index 72ec438..7ee5bd8 100644 index 39bbcac..442261e 100644
--- a/SPECS/openssh.spec --- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec +++ b/SPECS/openssh.spec
@@ -88,10 +88,6 @@ Source11: sshd.service @@ -88,10 +88,6 @@ Source11: sshd.service
@ -24,7 +24,7 @@ index 72ec438..7ee5bd8 100644
# Internal debug # Internal debug
Patch0: openssh-5.9p1-wIm.patch Patch0: openssh-5.9p1-wIm.patch
@@ -689,10 +685,6 @@ make install DESTDIR=$RPM_BUILD_ROOT @@ -706,10 +702,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
popd popd
%endif %endif
@ -36,5 +36,5 @@ index 72ec438..7ee5bd8 100644
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
-- --
1.8.3.1 2.7.4