diff --git a/fix-delete-the-chinese-translate-for-entering-the-ro.patch b/fix-delete-the-chinese-translate-for-entering-the-ro.patch new file mode 100644 index 0000000000000000000000000000000000000000..fd69bd1bb17eb7c91c0def532ba27af3f32ee410 --- /dev/null +++ b/fix-delete-the-chinese-translate-for-entering-the-ro.patch @@ -0,0 +1,74 @@ +From 309738f3920826a400b974792f9087888e2d9adc Mon Sep 17 00:00:00 2001 +From: yangchenguang +Date: Mon, 17 Apr 2023 10:24:54 +0800 +Subject: [PATCH] fix(*): delete the chinese translate for entering the root + maintenance password and login (#52728) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 删除中文翻译导致的单用户乱码 + +Signed-off-by: yangchenguang +--- + po/zh_CN.po | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 39157dc..509e04f 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -7974,8 +7974,8 @@ msgid "" + "Login incorrect\n" + "\n" + msgstr "" +-"登录不正确\n" +-"\n" ++"" ++"" + + #: login-utils/login.c:967 + #, fuzzy, c-format +@@ -7983,8 +7983,8 @@ msgid "" + "Password incorrect\n" + "\n" + msgstr "" +-"登录不正确\n" +-"\n" ++"" ++"" + + #: login-utils/login.c:981 + #, c-format +@@ -8002,8 +8002,8 @@ msgid "" + "\n" + "Login incorrect\n" + msgstr "" +-"\n" +-"登录不正确\n" ++"" ++"" + + #: login-utils/login.c:1022 login-utils/login.c:1409 login-utils/login.c:1435 + msgid "" +@@ -8830,7 +8830,7 @@ msgstr "按 Enter 键登录:" + #: login-utils/sulogin.c:544 + #, c-format + msgid "Give root password for maintenance\n" +-msgstr "指定 root 的维护密码\n" ++msgstr "" + + #: login-utils/sulogin.c:546 + #, c-format +@@ -8840,7 +8840,7 @@ msgstr "按 Enter 键进行维护\n" + #: login-utils/sulogin.c:547 + #, c-format + msgid "(or press Control-D to continue): " +-msgstr "(或按 Control-D 键继续):" ++msgstr "" + + #: login-utils/sulogin.c:742 + msgid "change directory to system root failed" +-- +2.33.0 + diff --git a/util-linux.spec b/util-linux.spec index d4d000865e1a067c3cadcddf814931a4ca7eb5d3..6681c0211f5fbc96c3dc1e713d904b66ac61ca61 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.37.2 -Release: 21 +Release: 22 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -31,7 +31,7 @@ Patch6009: backport-CVE-2022-0563.patch Patch6010: backport-su-bash-completion-offer-usernames-rather-than-files.patch Patch6011: backport-Fix-memory-leaks-in-the-chcpu.patch Patch6012: backport-logger-fix-prio-prefix-doesn-t-use-priority-default.patch -Patch6013: backport-vipw-flush-stdout-before-getting-answer.patch +Patch6013: backport-vipw-flush-stdout-before-getting-answer.patch Patch6014: backport-login-Restore-tty-size-after-calling-vhangup.patch Patch6015: backport-Forward-value-of-sector_size-instead-of-its-address.patch Patch6016: backport-libfdisk-dereference-of-possibly-NULL-gcc-analyzer.patch @@ -115,6 +115,7 @@ Patch9001: SKIPPED-no-root-permissions-test.patch %ifarch sw_64 Patch9002: util-linux-Add-sw64-architecture.patch %endif +Patch9003: fix-delete-the-chinese-translate-for-entering-the-ro.patch BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc autoconf automake @@ -122,7 +123,7 @@ BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng- Requires(post): coreutils Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth audit-libs >= 1.0.6 Requires: libblkid = %{version}-%{release} libmount = %{version}-%{release} libsmartcols = %{version}-%{release} -Requires: libfdisk = %{version}-%{release} libuuid = %{version}-%{release} +Requires: libfdisk = %{version}-%{release} libuuid = %{version}-%{release} Conflicts: initscripts < 9.79-4 bash-completion < 1:2.1-1 coreutils < 8.20 sysvinit-tools < 2.88-14 Conflicts: e2fsprogs < 1.41.8-5 filesystem < 3 @@ -234,6 +235,9 @@ This package contains some doc and man help files for %{name}. %prep %autosetup -n %{name}-%{version} -p1 +pushd po/ +msgfmt zh_CN.po -o zh_CN.gmo +popd %build %define _build_arg0__ CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS" SUID_CFLAGS="-fpie" @@ -332,7 +336,7 @@ then ln -sf ../proc/self/mounts /etc/mtab || : fi -%post -n libblkid +%post -n libblkid /sbin/ldconfig [ -d /run/blkid ] || mkdir -p /run/blkid @@ -480,6 +484,12 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Mon Apr 24 2023 panchenbo - 2.37.2-22 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:delete the chinese translate for entering the root maintenance password and login + * Thu Aug 3 2023 zhangyao - 2.37.2-21 - Type:bugfix - CVE:NA