diff --git a/pam.spec b/pam.spec index ddf23ed1244009fc3a27d8b216384a80aafe46e9..527b201c840d91e8bbad426c98433c41bcad9f6d 100644 --- a/pam.spec +++ b/pam.spec @@ -4,7 +4,7 @@ %define _pamconfdir %{_sysconfdir}/pam.d Name: pam Version: 1.4.0 -Release: 5 +Release: 6 Summary: Pluggable Authentication Modules for Linux License: BSD and GPLv2+ URL: http://www.linux-pam.org/ @@ -26,6 +26,7 @@ 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: change-ndbm-to-gdbm.patch +Patch8: zh_CN_po_fix_str_meaning_error.patch Patch6000: backport-Move-read_passwords-function-from-pam_unix-to-pam_inline.h.patch Patch6001: backport-add-helper-to-handle-SELinux.patch @@ -99,7 +100,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 @@ -122,7 +123,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} @@ -180,9 +181,12 @@ fi %changelog +* Thu Jul 29 2021 guoqinglan - 1.4.0-6 +- Fix zh_CN msgstr meaning error + * Mon May 17 2021 shixuantong - 1.4.0-5 - fix error in change-ndbm-to-gdbm.patch and sync community patch - + * Fri Jan 8 2021 wangchen - 1.4.0-4 - Use gdbm 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 0000000000000000000000000000000000000000..f95e1d08041b1b5d8ab1cceab23269878cf7770b --- /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