!54 update version to 1.5.2

Merge pull request !54 from xinyingchao/master

Linux-PAM-1.5.1.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCAAGBQJfvo0CAAoJEKgEH6g54W42L+0P/19bgVH4cRd7ONZLwYvWvWlQ
-NXkjwn26MEXElWESlKnQQz08W5QASWCz3vgAn9NGDmS+lJ38i4Li4aGpn3COPE2g
-BAN9LEaAErK60b3ZkWwDEARDs1JntA1vUuuHx0EoLEMtFEeU20h5PPMrsDwu7LGF
-sD6KYdM6TWLMXcRybqGOeWmWxfp8S8MVNwVN3C3q0aVIOMxky0i4rzCL7zRTJztQ
-q7FaX2xrTGfUiAI7smT/KGoK7pbQTzZtoR67uE/2WZ4bSyWMZcuDkt16WP/L6x9v
-c5DnVaLazM9xYUAOn4tlPiG8LLmfXo1MjD+KOS9byAx+uTij3avxaC/vv0BDcATH
-jywxH8iTPkvYXP0uJIa4Gbs1qi3vNZn+gaQt/T+rCVNo3dfFZZxBvLbTQ8AN1hKr
-MnoQbIQh0buuSuwmAxF0EDIefX3bDCurKOTQrRajK7huFm0w2NgBqL8WR8f1Wmm9
-mGSdKuVpWSk5uEygCUFOfwviYbi1I1K2Dmo3TsLBgNPKvAF3LAGJC7KzD+Q+Nmos
-XBOljilcAfdJ7t2P8W7xTSMEnXu7nI1TM+Er80ukfu0fipJEP0xyi+XWh+2n0Bx+
-3wwt8fSL7rmI4I4l6GRb3Jk/Gq1bKy956tgm3TE6gXTXVGZqNs0E28rNRURXDqZu
-XrjVwhlpsH/Auk17hU65
-=E0ev
------END PGP SIGNATURE-----

Linux-PAM-1.5.2.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJhMg48AAoJEKgEH6g54W42TUgP/0feavEYuZpjTWche32Ug2nu
+h6TGQbqkAasDexkHf6S2p+LYbt/6Nl+EpzOtELY/F3qRq8aYgTlHpJETSSBcZ++t
+tIhoaPAhEt+N5vb4YfTQcYIGihdgAzQCj0LViEuG/1PgSUjPdbW8RyvfJTw6I3Ch
+XUulrEwyudPCZHDpdW06DMv2we/7oTzrWHVDEmY/TTFKCvDSuAixLrxZrLO/MRK4
+huhXhe3oGv+TtLCqPcr0nJDTl44XNQOTbP/Dl+EI/5tXlDLXLH+IiPEMvnDRbsdd
+ngqdwM6wsOenEtlcA27YkDID/FRwgGJILKNaaUKSIa/uk8Tzy+Lx0j1wKEmE8P4T
+JI+24IIP5Gw8Sxd+NB8lSjtHXlyJF8psAFRWnTb67mgVTXruDXo771Mhqqy2Vu74
+sjf03w6jYrcGGKHlr7Q08jncghmMHFdW6jAcOG02oNO1oNrSu67MjAIqFox36Byu
+FmCajrGBwCR6bWmHCFRGT9qESWg9zRjPL7vkVBmAQg4J4og8FExUi8wBqt1zFH8W
+vGTgCDB/Oue3nYTws27hNKEeYumA8emOHyCG4n80vyA6DbRp+7nrtcDnJQir0lzf
+8UfWxooIJNqFH9ohnAqMTqJbKJkjLswLnTVpuyJvgzDwGl4sdSvIToxTo/2jp2W+
+q1y3BpSxAA1wOd9/mTM+
+=KMIz
+-----END PGP SIGNATURE-----

bugfix-pam-1.1.8-faillock-failmessages.patch

@@ -1,27 +0,0 @@
-From 7caf16119e3ed87818eb36a09d2fd84c4e027575 Mon Sep 17 00:00:00 2001
-From: openEuler Buildteam <buildteam@openeuler.org>
-Date: Mon, 27 Jul 2020 09:11:29 +0800
-Subject: [PATCH] bugfix pam 1.1.8 faillock failmessages
-
----
- modules/pam_faillock/pam_faillock.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/modules/pam_faillock/pam_faillock.c b/modules/pam_faillock/pam_faillock.c
-index f592d0a..5b5cc2c 100644
---- a/modules/pam_faillock/pam_faillock.c
-+++ b/modules/pam_faillock/pam_faillock.c
-@@ -645,9 +645,7 @@ faillock_message(pam_handle_t *pamh, struct options *opts)
- 		pam_info(pamh, _("The account is locked due to %u failed logins."),
- 			(unsigned int)opts->failures);
- 		if (left > 0) {
--			left = (left + 59)/60; /* minutes */
--
--			pam_info(pamh, _("(%d minutes left to unlock)"), (int)left);
-+			pam_info(pamh, _("(%d seconds left to unlock)"), (int)left);
- 		}
- 	}
- }
--- 
-2.23.0
-

fix-login-message.patch

@@ -1,32 +0,0 @@
-From 1a79e750977c2c809d5fc8f44c1c90f58a261926 Mon Sep 17 00:00:00 2001
-From: openEuler Buildteam <buildteam@openeuler.org>
-Date: Wed, 17 Jun 2020 15:14:25 +0800
-Subject: [PATCH] fix login message
-
----
- po/zh_CN.po | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index b7d2c83..4227e4f 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -290,13 +290,13 @@ msgstr "最后一次失败的登录：%s%s%s"
- msgid "There was %d failed login attempt since the last successful login."
- msgid_plural ""
- "There were %d failed login attempts since the last successful login."
--msgstr[0] "最有一次成功登录后有 %d 次失败的登录尝试。"
-+msgstr[0] "最后一次成功登录后有 %d 次失败的登录尝试。"
- 
- #. TRANSLATORS: only used if dngettext is not supported
- #: modules/pam_lastlog/pam_lastlog.c:631
- #, c-format
- msgid "There were %d failed login attempts since the last successful login."
--msgstr "最有一次成功登录后有 %d 次失败的登录尝试。"
-+msgstr "最后一次成功登录后有 %d 次失败的登录尝试。"
- 
- #: modules/pam_limits/pam_limits.c:1115
- #, c-format
--- 
-2.23.0
-

pam.spec

@@ -3,8 +3,8 @@
 %define _secconfdir %{_sysconfdir}/security
 %define _pamconfdir %{_sysconfdir}/pam.d
 Name: pam
-Version: 1.5.1
-Release: 5
+Version: 1.5.2
+Release: 1
 Summary: Pluggable Authentication Modules for Linux
 License: BSD and GPLv2+
 URL: http://www.linux-pam.org/
@@ -18,9 +18,7 @@ Source15: pamtmp.conf
 Source16: postlogin.pamd
 Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-Patch0: bugfix-pam-1.1.8-faillock-failmessages.patch
 Patch1: bugfix-pam-1.1.8-faillock-systemtime.patch
-Patch2: fix-login-message.patch
 Patch9000:openEuler-change-ndbm-to-gdbm.patch
 Patch9001:0001-bugfix-cannot-open-database-file.patch
 
@@ -79,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/Linux-PAM
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/environment
 
 install -d -m 755 $RPM_BUILD_ROOT%{_pamconfdir}
+
+install -m 644 -D modules/pam_namespace/pam_namespace.service \
+  %{buildroot}%{_unitdir}/pam_namespace.service
+
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_pamconfdir}/other
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pamconfdir}/system-auth
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pamconfdir}/password-auth
@@ -136,7 +138,7 @@ fi
 %dir %{_moduledir}
 %{_moduledir}/pam*.so
 %{_moduledir}/pam_filter/
-%{_prefix}/lib/systemd/system/pam_namespace.service
+%{_unitdir}/pam_namespace.service
 %dir %{_secconfdir}
 %config(noreplace) %{_secconfdir}/access.conf
 %config(noreplace) %{_secconfdir}/group.conf
@@ -161,6 +163,9 @@ fi
 %{_libdir}/libpam.so
 %{_libdir}/libpamc.so
 %{_libdir}/libpam_misc.so
+%{_libdir}/pkgconfig/pam.pc
+%{_libdir}/pkgconfig/pam_misc.pc
+%{_libdir}/pkgconfig/pamc.pc
 
 %files help
 %defattr(-,root,root)
@@ -170,6 +175,9 @@ fi
 
 
 %changelog
+* Mon Dec 27 2021 yuanxin <yuanxin24@huawei.com> - 1.5.2-1
+- update version to 1.5.2
+
 * Wed Nov 10 2021 renhongxun <renhongxun@huawei.com> - 1.5.1-5
 - cleancode