Refactor patches for pam package

Use pam-config package to package config files for pam package.
We can remove related patch of pam and use RPM instead of SRPM
for pam.

Deployment test and ping test between VMs pass
Config files check pass.

Story: 2003768
Task: 27589
Depends-on: https://review.openstack.org/#/c/617454/

Change-Id: Ib19aa8ef023c184c7dcf0e4086adb516be0d947d
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-11-13 23:33:10 +08:00
parent de1994430a
commit 2bd19e3f8f
15 changed files with 44 additions and 76 deletions

View File

@ -1,3 +0,0 @@
COPY_LIST="files/pam.d/*"
TIS_PATCH_VER=4
BUILD_IS_SLOW=8

View File

@ -1,25 +0,0 @@
From ebeb61340d3bc91c2489846a00878c557310634d Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 27 Sep 2016 10:49:05 -0400
Subject: [PATCH] Update package versioning for TIS format
---
SPECS/pam.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/pam.spec b/SPECS/pam.spec
index 0ee1747..e397385 100644
--- a/SPECS/pam.spec
+++ b/SPECS/pam.spec
@@ -3,7 +3,7 @@
Summary: An extensible library which provides authentication for applications
Name: pam
Version: 1.1.8
-Release: 22%{?dist}
+Release: 22.el7%{?_tis_dist}.%{tis_patch_ver}
# The library is BSD licensed with option to relicense as GPLv2+
# - this option is redundant as the BSD license allows that anyway.
# pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.
--
2.7.4

View File

@ -1,2 +0,0 @@
pam-spec-add-custome-config-files.patch
0001-Update-package-versioning-for-TIS-format.patch

View File

@ -1,40 +0,0 @@
diff --git a/SPECS/pam.spec b/SPECS/pam.spec
index 0faa1d3..0ee1747 100644
--- a/SPECS/pam.spec
+++ b/SPECS/pam.spec
@@ -27,6 +27,11 @@ Source14: 20-nproc.conf
Source15: pamtmp.conf
Source16: postlogin.pamd
Source17: postlogin.5
+Source18: common-account
+Source19: common-auth
+Source20: common-password
+Source21: common-session
+Source22: common-session-noninteractive
Patch1: pam-1.0.90-redhat-modules.patch
Patch2: pam-1.1.6-std-noclose.patch
Patch4: pam-1.1.0-console-nochmod.patch
@@ -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 %{SOURCE10} $RPM_BUILD_ROOT%{_pamconfdir}/config-util
install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_pamconfdir}/postlogin
+install -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_pamconfdir}/common-account
+install -m 644 %{SOURCE19} $RPM_BUILD_ROOT%{_pamconfdir}/common-auth
+install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_pamconfdir}/common-password
+install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_pamconfdir}/common-session
+install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_pamconfdir}/common-session-noninteractive
install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/20-nproc.conf
install -m 600 /dev/null $RPM_BUILD_ROOT%{_secconfdir}/opasswd
install -d -m 755 $RPM_BUILD_ROOT/var/log
@@ -307,6 +317,11 @@ fi
%config(noreplace) %{_pamconfdir}/smartcard-auth
%config(noreplace) %{_pamconfdir}/config-util
%config(noreplace) %{_pamconfdir}/postlogin
+%config(noreplace) %{_pamconfdir}/common-account
+%config(noreplace) %{_pamconfdir}/common-auth
+%config(noreplace) %{_pamconfdir}/common-password
+%config(noreplace) %{_pamconfdir}/common-session
+%config(noreplace) %{_pamconfdir}/common-session-noninteractive
%doc Copyright
%doc doc/txts
%doc doc/sag/*.txt doc/sag/html

View File

@ -1 +0,0 @@
mirror:Source/pam-1.1.8-22.el7.src.rpm

View File

@ -211,9 +211,6 @@ lighttpd-mod_mysql_vhost
logrotate logrotate
logrotate-config logrotate-config
# pam
pam
# novnc # novnc
novnc novnc
@ -226,6 +223,7 @@ shadow-utils-config
ntp-config ntp-config
syslog-ng-config syslog-ng-config
rsync-config rsync-config
pam-config
# net-snmp # net-snmp
net-snmp-utils net-snmp-utils

View File

@ -29,7 +29,6 @@ networking/lldpd
logging/logrotate logging/logrotate
logging/logrotate-config logging/logrotate-config
utilities/nova-utils utilities/nova-utils
base/pam
security/shim-unsigned security/shim-unsigned
security/shim-signed security/shim-signed
base/sudo base/sudo
@ -112,6 +111,7 @@ config-files/shadow-utils-config
config-files/ntp-config config-files/ntp-config
config-files/syslog-ng-config config-files/syslog-ng-config
config-files/rsync-config config-files/rsync-config
config-files/pam-config
tools/collector tools/collector
grub/grubby grub/grubby
utilities/platform-util utilities/platform-util

View File

@ -0,0 +1,2 @@
SRC_DIR="files"
TIS_PATCH_VER=0

View File

@ -0,0 +1,39 @@
Summary: pam-config
Name: pam-config
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
License: Apache-2.0
Group: base
Packager: StarlingX
URL: unknown
BuildArch: noarch
Source: %name-%version.tar.gz
Requires: pam
Summary: package StarlingX configuration files of pam to system folder.
%description
package StarlingX configuration files of pam to system folder.
%prep
%setup
%build
%install
%define _pamconfdir %{_sysconfdir}/pam.d
%{__install} -d %{buildroot}%{_pamconfdir}
%{__install} -m 644 common-account %{buildroot}%{_pamconfdir}/common-account
%{__install} -m 644 common-auth %{buildroot}%{_pamconfdir}/common-auth
%{__install} -m 644 common-password %{buildroot}%{_pamconfdir}/common-password
%{__install} -m 644 common-session %{buildroot}%{_pamconfdir}/common-session
%{__install} -m 644 common-session-noninteractive %{buildroot}%{_pamconfdir}/common-session-noninteractive
%post
%files
%config(noreplace) %{_pamconfdir}/common-account
%config(noreplace) %{_pamconfdir}/common-auth
%config(noreplace) %{_pamconfdir}/common-password
%config(noreplace) %{_pamconfdir}/common-session
%config(noreplace) %{_pamconfdir}/common-session-noninteractive

View File

@ -9,7 +9,7 @@ account sufficient pam_localuser.so
account sufficient pam_succeed_if.so uid < 1000 quiet account sufficient pam_succeed_if.so uid < 1000 quiet
account required pam_permit.so account required pam_permit.so
################# Titanium Cloud Password Rules ####################### ################# StarlingX Cloud Password Rules #######################
# Enforce a password containing atleast 1 lower case, 1 upper case, # # Enforce a password containing atleast 1 lower case, 1 upper case, #
# 1 digit and 1 special character. Such a password will have a # # 1 digit and 1 special character. Such a password will have a #
# minimum length of 7 characters. A user may not re-use the last most # # minimum length of 7 characters. A user may not re-use the last most #