!10 openEuler-pam

Merge pull request !10 from Liquor/liquor

fix-login-message.patch

@@ -0,0 +1,32 @@
+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 translation inaccurate
+
+---
+ 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 33c257d..398d8b6 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -320,13 +320,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:548
+ #, c-format
+ msgid "There were %d failed login attempts since the last successful login."
+-msgstr "最有一次成功登录后有 %d 次失败的登录尝试。"
++msgstr "最后一次成功登录后有 %d 次失败的登录尝试。"
+ 
+ #: modules/pam_limits/pam_limits.c:1091
+ #, c-format
+-- 
+1.8.3.1
+

pam.spec

@@ -4,7 +4,7 @@
 %define _pamconfdir %{_sysconfdir}/pam.d
 Name: pam
 Version: 1.3.1
-Release: 8
+Release: 9
 Summary: Pluggable Authentication Modules for Linux
 License: BSD and GPLv2+
 URL: http://www.linux-pam.org/
@@ -18,11 +18,12 @@ Source15: pamtmp.conf
 Source16: postlogin.pamd
 Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-Patch6:  pam-1.2.1-faillock.patch
+Patch0000:  pam-1.2.1-faillock.patch
-Patch7:  pam-1.2.1-faillock-admin-group.patch
+Patch0001:  pam-1.2.1-faillock-admin-group.patch
 
-Patch6000: bugfix-pam-1.1.8-faillock-failmessages.patch
+Patch0002: bugfix-pam-1.1.8-faillock-failmessages.patch
-Patch6001: bugfix-pam-1.1.8-faillock-systemtime.patch
+Patch0003: bugfix-pam-1.1.8-faillock-systemtime.patch
+Patch0004: fix-login-message.patch
 
 BuildRequires: autoconf automake libtool bison flex sed cracklib-devel
 BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel
@@ -167,6 +168,9 @@ fi
 
 
 %changelog
+* Wed Jun 17 2020 Liquor <lirui130@huawei.com> - 1.3.1-9
+- fix login message
+
 * Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.1-8
 - update config