1290065966
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: I6ab8d2a32b2ea997411b479d1953efb3b6ccbdd1 Signed-off-by: slin14 <shuicheng.lin@intel.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 3db968a14a7a93d08d9d801e79d96d05dc100519 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 14:55:36 -0400
|
|
Subject: WRS: 0003-util-linux-login-pamd.patch
|
|
|
|
---
|
|
SOURCES/util-linux-login.pamd | 1 +
|
|
SPECS/util-linux.spec | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/SOURCES/util-linux-login.pamd b/SOURCES/util-linux-login.pamd
|
|
index 3c03927..9c57d31 100644
|
|
--- a/SOURCES/util-linux-login.pamd
|
|
+++ b/SOURCES/util-linux-login.pamd
|
|
@@ -7,6 +7,7 @@ account include system-auth
|
|
password include system-auth
|
|
# pam_selinux.so close should be the first session rule
|
|
session required pam_selinux.so close
|
|
+session required pam_mkhomedir.so skel=/etc/skel umask=0022
|
|
session required pam_loginuid.so
|
|
session optional pam_console.so
|
|
# pam_selinux.so open should only be followed by sessions to be executed in the user context
|
|
diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec
|
|
index 4b045fd..537a03c 100644
|
|
--- a/SPECS/util-linux.spec
|
|
+++ b/SPECS/util-linux.spec
|
|
@@ -738,7 +738,7 @@ fi
|
|
|
|
%config(noreplace) %{_sysconfdir}/pam.d/chfn
|
|
%config(noreplace) %{_sysconfdir}/pam.d/chsh
|
|
-%config(noreplace) %{_sysconfdir}/pam.d/login
|
|
+%config %{_sysconfdir}/pam.d/login
|
|
%config(noreplace) %{_sysconfdir}/pam.d/remote
|
|
%config(noreplace) %{_sysconfdir}/pam.d/su
|
|
%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
|
--
|
|
2.7.4
|
|
|