From a0e1bc5e9a7fa3b0bc578106a6e0d68b92ad8296 Mon Sep 17 00:00:00 2001
From: guoqinglan <guoqinglan@uniontech.com>
Date: Thu, 29 Jul 2021 05:54:27 +0000
Subject: [PATCH] Fix zh_CN msgstr meaning error

---
 pam.spec                             | 10 +++++++---
 zh_CN_po_fix_str_meaning_error.patch | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 zh_CN_po_fix_str_meaning_error.patch

diff --git a/pam.spec b/pam.spec
index 1588e5b..82e8dac 100644
--- a/pam.spec
+++ b/pam.spec
@@ -4,7 +4,7 @@
 %define _pamconfdir %{_sysconfdir}/pam.d
 Name: pam
 Version: 1.4.0
-Release: 3
+Release: 4
 Summary: Pluggable Authentication Modules for Linux
 License: BSD and GPLv2+
 URL: http://www.linux-pam.org/
@@ -25,6 +25,7 @@ Patch3: Move-check_user_in_passwd-from-pam_localuser.c-to-pa.patch
 Patch4: pam_faillock-fix-build-on-musl.patch
 Patch5: pam_modutil_check_user_in_passwd-avoid-timing-attack.patch
 Patch6: Prevent-SEGFAULT-for-unknown-UID.patch
+Patch7: zh_CN_po_fix_str_meaning_error.patch
 
 BuildRequires: autoconf automake libtool bison flex sed cracklib-devel
 BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel
@@ -95,7 +96,7 @@ install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/tallylog
 install -d -m 755 $RPM_BUILD_ROOT/var/run/faillock
 
 for phase in auth acct passwd session ; do
-	ln -sf pam_unix.so $RPM_BUILD_ROOT%{_moduledir}/pam_unix_${phase}.so 
+	ln -sf pam_unix.so $RPM_BUILD_ROOT%{_moduledir}/pam_unix_${phase}.so
 done
 
 install -m644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/pam.conf
@@ -118,7 +119,7 @@ fi
 
 %files -f Linux-PAM.lang
 %defattr(-,root,root)
-%license Copyright COPYING gpl-2.0.txt 
+%license Copyright COPYING gpl-2.0.txt
 %doc AUTHORS README ChangeLog NEWS
 %doc doc/README.d/
 %dir %{_pamconfdir}
@@ -175,6 +176,9 @@ fi
 
 
 %changelog
+* Thu Jul 29 2021 guoqinglan <guoqinglan@uniontech.com> - 1.4.0-4
+- Fix zh_CN msgstr meaning error
+
 * Sat Oct 31 2020 panxiaohe <panxiaohe@huawei.com> - 1.4.0-3
 - Prevent SEGFAULT for unknown UID
 
diff --git a/zh_CN_po_fix_str_meaning_error.patch b/zh_CN_po_fix_str_meaning_error.patch
new file mode 100644
index 0000000..f95e1d0
--- /dev/null
+++ b/zh_CN_po_fix_str_meaning_error.patch
@@ -0,0 +1,22 @@
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index 4227e4f..8836488 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -44,14 +44,13 @@ msgid "Password: "
+ msgstr "密码："
+
+ #: libpam/pam_get_authtok.c:41
+-#, fuzzy, c-format
++#, c-format
+ msgid "Current %s password: "
+-msgstr "新的 %s 密码："
++msgstr "当前的 %s 密码："
+
+ #: libpam/pam_get_authtok.c:42
+-#, fuzzy
+ msgid "Current password: "
+-msgstr "新的 密码："
++msgstr "当前的密码："
+
+ #: libpam/pam_get_authtok.c:44
+ #, c-format
-- 
Gitee