sync form openEuler-22.03-LTS-SP4

This commit is contained in:
zhangxianting 2024-06-26 21:28:31 +08:00
parent 83227dedb5
commit fdb47cc381
2 changed files with 43 additions and 11 deletions

View File

@ -0,0 +1,25 @@
From 0b91a6d77bfc88374558f6931020cec7475f24ed Mon Sep 17 00:00:00 2001
From: biubiuzy <294772273@qq.com>
Date: Sat, 11 May 2024 10:33:48 +0800
Subject: [PATCH] sfdisk: fix crash casued by out-of-bounds access
---
po/zh_CN.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 39157dc..f684178 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4518,7 +4518,7 @@ msgid ""
"Type 'help' to get more information.\n"
msgstr ""
"\n"
-"请执行“%s --help”了解更多信息。\n"
+"请执行“help”了解更多信息。\n"
#: disk-utils/sfdisk.c:1850
msgid "All partitions used."
--
2.43.0

View File

@ -3,7 +3,7 @@
Name: util-linux
Version: 2.37.2
Release: 34
Release: 35
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
@ -161,6 +161,7 @@ Patch9001: SKIPPED-no-root-permissions-test.patch
Patch9002: util-linux-Add-sw64-architecture.patch
%endif
Patch9003: backport-uuidd-fix-open-lock-state-issue.patch
Patch9004: sfdisk-fix-crash-casued-by-out-of-bounds-access.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
@ -531,6 +532,12 @@ fi
%{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
%changelog
* Wed Jul 03 2024 zhangxianting <zhangxianting@uniontech.com> - 2.37.2-35
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:fix sfdisk crash caused by wrong translate file
* Sat Jun 29 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-34
- Type:bugfix
- CVE:NA
@ -547,7 +554,14 @@ fi
- SUG:NA
- DESC:add support for ppc64le
* Tue May 7 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-32
* Fri Jun 07 2024 yanglongkang <yanglongkang@h-partners.com> - 2.37.2-32
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:sync community patches
backport-uuidd-fix-open-lock-state-issue.patch
* Tue May 7 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-31
- Type:bugfix
- CVE:NA
- SUG:NA
@ -557,7 +571,7 @@ fi
backport-last-avoid-out-of-bounds-array-access.patch
backport-lsipc-fix-semaphore-USED-counter.patch
* Sun Apr 28 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-31
* Sun Apr 28 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-30
- Type:bugfix
- CVE:NA
- SUG:NA
@ -566,7 +580,7 @@ fi
backport-lscpu-use-topology-maps-in-more-robust-way.patch
* Mon Apr 22 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-30
* Mon Apr 22 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-29
- Type:bugfix
- CVE:NA
- SUG:NA
@ -574,13 +588,6 @@ fi
The current version of the kernel also supports the raw driver.
To keep consistent with the previous version, roll back the modification.
* Fri Mar 29 2024 cenhuilin <cenhuilin@kylinos.cn> - 2.37.2-29
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:sync community patches
backport-uuidd-fix-open-lock-state-issue.patch
* Fri Mar 29 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-28
- Type:CVE
- CVE:CVE-2024-28085