diff --git a/utshell-0.4.tar.gz b/utshell-0.4.tar.gz index 00023904b7dbed6ac8cf8aedb2ea5f9e5504f415..a9a72e8d0c4b6ff7cd90728f4168df2c66b41329 100644 Binary files a/utshell-0.4.tar.gz and b/utshell-0.4.tar.gz differ diff --git a/utshell.spec b/utshell.spec index 5a248b58d8ff29d4c3e8f6e31ac0f4a5fb0a5d3b..e9241affae280b83a4bdeb4d99dc5bbc432c46af 100644 --- a/utshell.spec +++ b/utshell.spec @@ -1,69 +1,55 @@ #% define beta_tag rc2 -%define patchleveltag .30411 +%define patchleveltag .40321 %define baseversion 0.4 %bcond_with tests - -Version: 0.4.30411 +Version: %{baseversion}%{patchleveltag} Name: utshell Summary: The utshell respect Bash -Release: 0%{?dist}.01 +Release: 1%{?dist} License: GPLv3+ Source0: utshell-%{baseversion}.tar.gz # Official upstream patches # Patches are converted to apply with '-p1' - # Other patches # We don't want to add '/etc:/usr/etc' in standard utils path. - BuildRequires: gcc, cargo, rust -BuildRequires: texinfo bison +BuildRequires: info bison BuildRequires: ncurses-devel BuildRequires: autoconf, gettext BuildRequires: make Requires: filesystem >= 3 #Provides: /bin/sh Provides: /bin/utshell - ExclusiveArch: x86_64 aarch64 arm %description The GNU Bourne Again shell (Bash) is a shell or command language interpreter that is compatible with the Bourne shell (sh). Bash incorporates useful features from the Korn shell (ksh) and the C shell (csh). Most sh scripts can be run by utshell without modification. - - %prep %autosetup -n %{name}-%{baseversion} -p1 - # echo %{version} > _distribution # echo %{release} > _patchlevel - # force refreshing the generated files # rm y.tab.* - %build autoconf %configure --with-bash-malloc=no --with-afs - # Recycles pids is neccessary. When utshell 's last fork's pid was X # and new fork's pid is also X, utshell has to wait for this same pid. # Without Recycles pids utshell will not wait. MFLAGS="CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" - # work around missing deps in Makefiles -make "$MFLAGS" version.h -make "$MFLAGS" %{?_smp_mflags} -C builtins -make "$MFLAGS" %{?_smp_mflags} - +#make version.h +#make -C builtins +make %install if [ -e autoconf ]; then # Yuck. We're using autoconf 2.1x. export PATH=.:$PATH fi - %make_install install-headers - mkdir -p %{buildroot}/%{_sysconfdir} mkdir -p %{buildroot}/%{_datadir}/utshell/resources/{zh-CN,en-US,zh-HK} rm -f %{buildroot}%{_infodir}/dir @@ -72,12 +58,10 @@ LONG_BIT=$(getconf LONG_BIT) mv %{buildroot}%{_bindir}/utshellbug \ %{buildroot}%{_bindir}/utshellbug-"${LONG_BIT}" ln -s utshellbug-"${LONG_BIT}" %{buildroot}%{_bindir}/utshellbug - %if %{with tests} %check make check %endif - # post is in lua so that we can run it without any external deps. Helps # for bootstrapping a new install. # Jesse Keating 2009-01-29 (code from Ignacio Vazquez-Abrams) @@ -93,7 +77,6 @@ if f then if not shells:find(nl..utshell) then f:write(utshell) end f:close() end - %postun -p -- Run it only if we are uninstalling if arg[2] == 0 @@ -106,7 +89,6 @@ then table.insert(t,line) end end - f = io.open("/etc/shells", "w+") for n,line in pairs(t) do @@ -114,7 +96,6 @@ then end f:close() end - %files #config(noreplace) /etc/skel/.b* /usr/share/locale/*/LC_MESSAGES/utshell.mo @@ -127,60 +108,82 @@ end %{_datadir}/utshell/resources/zh-HK/message.ftl %{_libdir}/pkgconfig/utshell.pc %{_includedir}/%{name} - %changelog -* Tue Apr 11 2023 Zhanghuanhuan - 0.4.30411-0.01 +* Thu Mar 21 2024 Bianguangze - 0.4.40321-0 +- solve the error of kill -9 noprocess; +* Mon Mar 18 2024 wangmeng - 0.4.40318-0 +- solve shopt -p return error +- 此次提交解决之前遗留问题： +- shopt -q 返回值不正确造成非登陆utshell部分别名没设置上 +* Tue Mar 12 2024 bianguangze - 0.4.40312-0 +- solve the error of type -a pwd && cd -; +- 此次提交为解决了之前的两个遗留问题： +- type -a pwd 显示内容多双引号问题; +- cd - 报没有目录问题; +* Wed Dec 27 2023 wangmeng - 0.4.31228-0 +- fix: add patch 0011-fix-exec-command-error-for-hash-p-set.patch(bugid:236297) +* Thu Dec 14 2023 mengfansheng - 0.4.31214-0 +- fix: add patch 0010-fix-help-variables-display-exception.patch(bugid:233845) +* Wed Dec 13 2023 wangmeng - 0.4.31213-1 +- fix: add patch 0009-fix-delete-print-for-run-script.patch(bugid:229563) +- fix: add patch 0009-fix-delete-print-for-run-script.patch(bugid:233359) +* Wed Dec 13 2023 mengfansheng - 0.4.31213-0 +- fix: add patch 0008-fix-kill-l-display-exception.patch(bugid:229591) +* Tue Dec 12 2023 binlingyu - 0.4.31212-0 +- fix: add patch 0007-fix-caller-bug.patch(bugid:229599) +* Wed Nov 29 2023 bianguangze - 0.4.31129-0 +- fix: add patch 0004-fixed-error_of-kill-help.patch(bugid:229577) +- fix: add patch 0005-fix-typeset-f-bug.patch(bugid:229527) +- fix: add patch 0006-fix-error_of-kill-l.patch(bugid:229591) +* Wed Nov 29 2023 wangmengc - 0.4.31129-0 +- fix: function keyword unusable(bugid:229563) +* Mon Nov 27 2023 wangmengc - 0.4.31127-0 +- fix: typeset -n error(bugid:229589) +- fix: declare -n error(bugid:229597) +* Tue Nov 21 2023 wangmengc - 0.4.31121-0 +- fix: wait and kill Segment error(bugid:229125) +* Fri Nov 10 2023 Liutong - 0.4.31110-0 +- re-vendor and modify code, cargo.toml. +* Tue Nov 7 2023 Wangmeng - 0.4.31107-0 +- feat: add Added principal code refactoring +* Tue Apr 11 2023 Zhanghuanhuan - 0.4.30411-0 - fix:193533 utshell环境，Ctrl+D退出会话时，提示exit_builtin（刘彤） - fix:193535 history -p mount和用例中预期不符（刘彤） - fix:193581 utshell环境，未执行kill -CONT 恢复进程时，执行ctrl+C无法结束wait -f 进程（刘彤） - fix:193557 declare 命令变量输出异常，和用例中预期不一致（张欢欢） - -* Tue Mar 21 2023 Zhanghuanhuan - 0.4.30321 +* Tue Mar 21 2023 Zhanghuanhuan - 0.4.30321-0 - fix : solve translation err (bugid :191483) - -* Thu Mar 16 2023 Liutong - 0.4.30316 +* Thu Mar 16 2023 Liutong - 0.4.30316-0 - fix translation issue - -* Tue Nov 01 2022 Liutong - 0.4.14 +* Tue Nov 01 2022 Liutong - 0.4.14-0 - fix enable bug - -* Tue Nov 01 2022 Liutong - 0.4.13 +* Tue Nov 01 2022 Liutong - 0.4.13-0 - fix mem error, and modify mo - -* Thu Oct 13 2022 Liutong - 0.4.12 +* Thu Oct 13 2022 Liutong - 0.4.12-0 - change vendor, add po. - -* Wed Oct 12 2022 Liutong - 0.4.10 +* Wed Oct 12 2022 Liutong - 0.4.10-0 - add CARGO_HOME=${HOME}/.cargo - -* Mon Oct 10 2022 Liutong - 0.4.9 +* Mon Oct 10 2022 Liutong - 0.4.9-0 - rename project rash to utshell - -* Sun Oct 9 2022 Zhanghuanhuan - 0.4.8 +* Sun Oct 9 2022 Zhanghuanhuan - 0.4.8-0 - fix: declare command issue and history command issue - -* Thu Sep 29 2022 Wangmeng - 0.4.7 +* Thu Sep 29 2022 Wangmeng - 0.4.7-0 - fix: add help translation for all commands. - -* Wed Sep 28 2022 Liutong - 0.4.6 +* Wed Sep 28 2022 Liutong - 0.4.6-0 - fix: disown -r issue. - -* Wed Sep 28 2022 Liutong - 0.4.5 +* Wed Sep 28 2022 Liutong - 0.4.5-0 - fix: alias translation-core. - -* Tue Sep 27 2022 Liutong - 0.4.3 +* Tue Sep 27 2022 Liutong - 0.4.3-4 - fix: translation. - fix: coredump in continue. - fix: umask fmt error. - fix: disown issue. +* Mon Sep 26 2022 Liutong - 0.4.3-0 - add translation frame - -* Mon Sep 19 2022 Liutong - 0.4.2 +* Mon Sep 19 2022 Liutong - 0.4.2-0 - add loongarch64 arch and remove debug msg - -* Wed Aug 31 2022 Liutong - 0.4.1 +* Wed Aug 31 2022 Liutong - 0.4.1-0 - modify spec remove /usr/bin - -* Fri Aug 26 2022 Zhanghuanhuan - 0.4.0 +* Fri Aug 26 2022 Zhanghuanhuan - 0.4.0-0 - build rash on aarch_64 - +0012-fix_cd-_AND_type-a.patch