From f0c14d832f04cd073a0743ad00bbc33a0b48627b Mon Sep 17 00:00:00 2001 From: wangmeng Date: Tue, 15 Jul 2025 15:18:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmaster=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=B8=8A=20rustc=20=E7=89=88=E6=9C=AC=E4=B8=BA1.88=E6=97=B6?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 859e18c48e0c64db5ab16b22bb24f8a1de1bcfc5) --- 0012-fix-rustc-1.88-build-error.patch | 41 +++++++++++++++++++++++++++ utshell.spec | 6 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0012-fix-rustc-1.88-build-error.patch diff --git a/0012-fix-rustc-1.88-build-error.patch b/0012-fix-rustc-1.88-build-error.patch new file mode 100644 index 0000000..09d9d80 --- /dev/null +++ b/0012-fix-rustc-1.88-build-error.patch @@ -0,0 +1,41 @@ +From 32e1795f12cf34ea5fed2af6934a67e712035427 Mon Sep 17 00:00:00 2001 +From: wangmengc +Date: Tue, 15 Jul 2025 14:56:02 +0800 +Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8rustc=201.88?= + =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=94=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + r_sig/src/lib.rs | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/r_sig/src/lib.rs b/r_sig/src/lib.rs +index 4f4d042..291dc48 100644 +--- a/r_sig/src/lib.rs ++++ b/r_sig/src/lib.rs +@@ -647,13 +647,6 @@ pub unsafe extern "C" fn termsig_handler(mut sig: c_int) { + i += 1; + } + sigprocmask(SIG_SETMASK as c_int, &mut mask, 0 as *mut c_void as *mut sigset_t); +- if core != 0 { +- ::std::ptr::write_volatile( +- (0 as *mut c_void as *mut libc::c_ulong), +- (0xdead0000 as libc::c_uint).wrapping_add(sig as libc::c_uint) +- as libc::c_ulong, +- ); +- } + exit(128 as c_int + sig); + } + +@@ -748,4 +741,4 @@ pub unsafe extern "C" fn set_signal_handler( + } else { + return None + }; +-} +\ No newline at end of file ++} +-- +2.33.0 + diff --git a/utshell.spec b/utshell.spec index aa24a40..1eb13c3 100644 --- a/utshell.spec +++ b/utshell.spec @@ -6,7 +6,7 @@ Version: %{baseversion}%{patchleveltag} Name: utshell Summary: The utshell respect Bash -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Source0: utshell-%{baseversion}.tar.gz @@ -23,6 +23,7 @@ Patch0008: 0008-fix-echo-a.z.patch Patch0009: 0009-fix-type-return-error.patch Patch0010: 0010-fix-coproc-command-error.patch Patch0011: 0011-fix-arch-display.patch +Patch0012: 0012-fix-rustc-1.88-build-error.patch # Other patches # We don't want to add '/etc:/usr/etc' in standard utils path. @@ -139,6 +140,9 @@ end %{_includedir}/%{name} %changelog +* Tue Jul 15 2025 wangmeng - 0.5.0-5 +- fix: 修复在rustc版本为1.88时编译报错问题(bugid:ICLF9D) + * Wed Mar 5 2025 wangmeng - 0.5.0-4 - feat: 修复coproc命令错误问题 - feat: 修复utshell --help 显示信息问题 -- Gitee