starlingx/integ
Code Issues Proposed changes

de-fuzz pam patches

Browse Source 
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: I3268f01064e23e9a4e3b43ac4229e445e135de6c
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 07:47:18 +08:00
parent 61ab0029fe
commit 15896eea00
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/pam/centos/meta_patches/pam-spec-add-custome-config-files.patch
View File

@ -1,9 +1,5 @@
---
SPECS/pam.spec | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/SPECS/pam.spec b/SPECS/pam.spec diff --git a/SPECS/pam.spec b/SPECS/pam.spec
index 0cbf153..a702aca 100644 index 0faa1d3..0ee1747 100644
--- a/SPECS/pam.spec --- a/SPECS/pam.spec
+++ b/SPECS/pam.spec +++ b/SPECS/pam.spec
@@ -27,6 +27,11 @@ Source14: 20-nproc.conf @@ -27,6 +27,11 @@ Source14: 20-nproc.conf
@ -18,7 +14,7 @@ index 0cbf153..a702aca 100644
Patch1: pam-1.0.90-redhat-modules.patch Patch1: pam-1.0.90-redhat-modules.patch
Patch2: pam-1.1.6-std-noclose.patch Patch2: pam-1.1.6-std-noclose.patch
Patch4: pam-1.1.0-console-nochmod.patch Patch4: pam-1.1.0-console-nochmod.patch
@@ -207,6 +212,11 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_pamconfdir}/fingerprint-auth @@ -217,6 +222,11 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_pamconfdir}/fingerprint-auth
install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_pamconfdir}/smartcard-auth install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_pamconfdir}/smartcard-auth
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_pamconfdir}/config-util install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_pamconfdir}/config-util
install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_pamconfdir}/postlogin install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_pamconfdir}/postlogin
@ -30,7 +26,7 @@ index 0cbf153..a702aca 100644
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/20-nproc.conf install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/20-nproc.conf
install -m 600 /dev/null $RPM_BUILD_ROOT%{_secconfdir}/opasswd install -m 600 /dev/null $RPM_BUILD_ROOT%{_secconfdir}/opasswd
install -d -m 755 $RPM_BUILD_ROOT/var/log install -d -m 755 $RPM_BUILD_ROOT/var/log
@@ -297,6 +307,11 @@ fi @@ -307,6 +317,11 @@ fi
%config(noreplace) %{_pamconfdir}/smartcard-auth %config(noreplace) %{_pamconfdir}/smartcard-auth
%config(noreplace) %{_pamconfdir}/config-util %config(noreplace) %{_pamconfdir}/config-util
%config(noreplace) %{_pamconfdir}/postlogin %config(noreplace) %{_pamconfdir}/postlogin
@ -42,6 +38,3 @@ index 0cbf153..a702aca 100644
%doc Copyright %doc Copyright
%doc doc/txts %doc doc/txts
%doc doc/sag/*.txt doc/sag/html %doc doc/sag/*.txt doc/sag/html
--
1.8.3.1