开源软件构建与测试

Changes of Revision 2

_service:tar_scm:ksh.spec Changed

@@ -1,6 +1,6 @@
 Name:             ksh
 Version:          2020.0.0
-Release:          9
+Release:          11
 Summary:          The Original ATT Korn Shell
 License:          EPL-1.0
 URL:              http://www.kornshell.com/
@@ -16,8 +16,10 @@
 Patch6001:        backport-functions-with-not-loaded-autoloaded-functions.patch
 Patch6002:        backport-Fix-interactive-restricted-shell-behavior.patch
 
-Patch9000:	  openEuler-skip-some-test.patch
-Patch9001:        backport-Fix-handling-of-skipped-directories.patch
+Patch9000:        skip-some-test.patch
+
+Patch6003:        backport-Fix-handling-of-skipped-directories.patch
+Patch6004:        backport-Change-default-build-type-to-minsize-to-imporve-the-performance.patch
 
 Provides:         /bin/ksh /usr/bin/ksh
 BuildRequires:    meson gcc glibc-devel ed
@@ -94,6 +96,18 @@
 %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf
 
 %changelog
+* Tue Dec 6 2022 wangyuhang <wangyuhang27@huawei.com> - 1:2020.0.0-11
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:change patch name
+
+* Sat Aug 27 2022 shixuantong <shixuantong@h-partners.com> - 1:2020.0.0-10
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Change default build type to "minsize"
+
 * Thu Jun 30 2022 wangjiang <wangjiang37@h-partners.com> - 1:2020.0.0-9
 - Type:bugfix
 - CVE:NA

_service:tar_scm:backport-Change-default-build-type-to-minsize-to-imporve-the-performance.patch Added

@@ -0,0 +1,80 @@
+From f967b5a25509d7495445b392307fdaa046e84be7 Mon Sep 17 00:00:00 2001
+From: Kurtis Rader <krader@skepticism.us>
+Date: Sun, 26 Jan 2020 21:00:50 -0800
+Subject: PATCH Change default build type to "minsize"
+
+People (and distros) have been building ksh from this project using the
+default "debug" build type since we switched from Nmake to Meson. That
+results in a ksh program whose performance is far from optimal. So change
+the default build type. If a debugging enabled binary is needed, such as
+in a CI environment, it must be requested explicitly.
+
+Related #1449
+
+(cherry picked from commit db54d369002a0e942d695838986af6bf8962d763)
+---
+ CHANGELOG.md               |  3 +++
+ meson.build                | 11 ++++++++++-
+ scripts/build-on-docker.sh |  2 +-
+ scripts/build-on-macos.sh  |  2 +-
+ 4 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 0e38b780456e..8657ab1a2a15 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -2,6 +2,9 @@
+ 
+ ## Notable fixes and improvements
+ 
++- The default build type is now "minsize" since that dramatically improves the
++  performance of ksh. You can still request a debug build via `meson
++  --buildtype=debug` (issue #1449).
+ - Fix `history` command behavior when the *~/.sh_history* file has
+   specific content (issue #1432).
+ 
+diff --git a/meson.build b/meson.build
+index 0e5dc2483fb1..aecfe737c3f1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,4 +1,13 @@
+-project('ksh93', 'c', default_options: 'b_lundef=false', 'default_library=static')
++project('ksh9', 'c', default_options: 
++    # This is the optimal production build type for this project. If you need
++    # a debug build you must explicitly run `meson --buildtype=debug`. This
++    # helps ensure that each distro (or user) gets a performance optimized build
++    # even if they don't know to add the `--buildtype=minsize` option.
++    'buildtype=minsize',
++    'b_lundef=false',
++    'default_library=static',
++    'c_std=c99', # we require the C99 (aka ISO9899:1999) language standard
++)
+ 
+ source_dir = meson.current_source_dir()
+ cc = meson.get_compiler('c')
+diff --git a/scripts/build-on-docker.sh b/scripts/build-on-docker.sh
+index cd8138be9ab2..0b5af4a1d698 100755
+--- a/scripts/build-on-docker.sh
++++ b/scripts/build-on-docker.sh
+@@ -18,7 +18,7 @@ mkdir build
+ cd build
+ 
+ echo ==== Configuring the build
+-if ! meson -Dwarnings-are-errors=true
++if ! meson -Dwarnings-are-errors=true --buildtype=debug
+ then
+     cat meson-logs/meson-log.txt
+     exit 1
+diff --git a/scripts/build-on-macos.sh b/scripts/build-on-macos.sh
+index 2732e370f8d8..163195accfff 100755
+--- a/scripts/build-on-macos.sh
++++ b/scripts/build-on-macos.sh
+@@ -15,7 +15,7 @@ mkdir build
+ cd build
+ 
+ echo ==== Configuring the build
+-if ! meson -Dwarnings-are-errors=true
++if ! meson -Dwarnings-are-errors=true --buildtype=debug
+ then
+     cat meson-logs/meson-log.txt
+     exit 1

_service:tar_scm:openEuler-skip-some-test.patch Deleted

@@ -1,151 +0,0 @@
-From 97795806fda12850b896d2dde4442568f38d7c48 Mon Sep 17 00:00:00 2001
-From: wangjiang <wangjiang37@h-partners.com>
-Date: Fri, 11 Mar 2022 14:34:29 +0800
-Subject: PATCH openEuler-skip-some-test
-
----
- src/cmd/ksh93/tests/b_ulimit.sh | 4 ++--
- src/cmd/ksh93/tests/b_uname.sh  | 6 +++---
- src/cmd/ksh93/tests/bracket.sh  | 8 ++++----
- src/cmd/ksh93/tests/builtins.sh | 2 +-
- src/cmd/ksh93/tests/meson.build | 4 ----
- src/cmd/ksh93/tests/path.sh     | 2 +-
- 6 files changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/src/cmd/ksh93/tests/b_ulimit.sh b/src/cmd/ksh93/tests/b_ulimit.sh
-index 0250926..4c9dd0f 100644
---- a/src/cmd/ksh93/tests/b_ulimit.sh
-+++ b/src/cmd/ksh93/tests/b_ulimit.sh
-@@ -66,7 +66,7 @@ actual=$(ulimit -t)
- 
- # ==========
- # -v The number of K-bytes for virtual memory.
--if  $OS_NAME != openbsd 
-+if  $OS_NAME != linux 
- then
-     ulimit -v unlimited
-     expect=unlimited
-@@ -76,7 +76,7 @@ fi
- 
- # ==========
- # -M, --as  The address space limit in Kibytes.
--if  $OS_NAME != openbsd 
-+if  $OS_NAME != linux 
- then
-     ulimit -M unlimited
-     expect=unlimited
-diff --git a/src/cmd/ksh93/tests/b_uname.sh b/src/cmd/ksh93/tests/b_uname.sh
-index 4c9c06a..69ef430 100644
---- a/src/cmd/ksh93/tests/b_uname.sh
-+++ b/src/cmd/ksh93/tests/b_uname.sh
-@@ -29,9 +29,9 @@ expect=$($bin_uname -n)
- # ==========
- # -r, --release|kernel-release
- # The kernel release level.
--actual=$(uname -r)
--expect=$($bin_uname -r)
-- "$actual" = "$expect"  || log_error "'uname -r' failed" "$expect" "$actual"
-+#actual=$(uname -r)
-+#expect=$($bin_uname -r)
-+# "$actual" = "$expect"  || log_error "'uname -r' failed" "$expect" "$actual"
- 
- # ==========
- # -v, --version|kernel-version
-diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
-index 07029f1..6915583 100644
---- a/src/cmd/ksh93/tests/bracket.sh
-+++ b/src/cmd/ksh93/tests/bracket.sh
-@@ -99,7 +99,7 @@ then
- fi
- 
- chmod 000 $file
--if  $OS_NAME == cygwin* 
-+if  $OS_NAME == linux 
- then
-     log_info 'skipping  -r $file  test on Cygwin'
- else
-@@ -114,7 +114,7 @@ then
-     log_error "-r: $file should be owned by me"
- fi
- 
--if  $OS_NAME == cygwin* 
-+if  $OS_NAME == linux 
- then
-     log_info 'skipping  -w $file  test on Cygwin'
- else
-@@ -124,7 +124,7 @@ else
-     fi
- fi
- 
--if  $OS_NAME == cygwin* 
-+if  $OS_NAME == linux 
- then
-     log_info 'skipping  -x $file  test on Cygwin'
- else
-@@ -134,7 +134,7 @@ else
-     fi
- fi
- 
--if  $OS_NAME == cygwin* 
-+if  $OS_NAME == linux 
- then
-     log_info 'skipping  -w $file || -r $file  test on Cygwin'
- else
-diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh
-index 55b1f4f..8f9fbba 100644
---- a/src/cmd/ksh93/tests/builtins.sh
-+++ b/src/cmd/ksh93/tests/builtins.sh
-@@ -551,7 +551,7 @@ print ". $TEST_DIR/evalbug" >$TEST_DIR/envfile
-  $(ENV=$TEST_DIR/envfile $SHELL -i -c : 2> /dev/null) == ok  || log_error 'eval inside dot script called from profile file not working'
- 
- # test cd to a directory that doesn't have execute permission
--if  $OS_NAME == cygwin* 
-+if  $OS_NAME == linux 
- then
-     log_warning 'skipping test of cd to dir without execute permission on Cygwin'
- else
-diff --git a/src/cmd/ksh93/tests/meson.build b/src/cmd/ksh93/tests/meson.build
-index 6a07d7c..7728b88 100644
---- a/src/cmd/ksh93/tests/meson.build
-+++ b/src/cmd/ksh93/tests/meson.build
-@@ -9,7 +9,6 @@ all_tests = 
-     'b_alias',
-     'b_basename',
-     'b_cat',
--    'b_chmod',
-     'b_cmp',
-     'b_command',
-     'b_cut',
-@@ -34,7 +33,6 @@ all_tests = 
-     'b_sleep',
-     'b_sync',
-     'b_test.exp',
--    'b_test',
-     'b_time.exp',
-     'b_times.exp',
-     'b_ulimit',
-@@ -49,8 +47,6 @@ all_tests = 
-     'arrays2',
-     'attributes',
-     'basic', 90,
--    'bracket',
--    'builtins',
-     'case',
-     'comvar',
-     'comvario',
-diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh
-index 6920f19..4999d8f 100644
---- a/src/cmd/ksh93/tests/path.sh
-+++ b/src/cmd/ksh93/tests/path.sh
-@@ -276,7 +276,7 @@ exp=126
- #
- # TODO: Figure out if there is some way to make ksh behave on Cygwin like it does on real UNIX/POSIX
- # compliant systems for these edge cases without greatly complicating the code.
--if  $OS_NAME != cygwin* 
-+if  $OS_NAME != linux 
- then
- 
- : > $scr
--- 
-1.8.3.1
-

_service:tar_scm:skip-some-test.patch Added

@@ -0,0 +1,151 @@
+From 97795806fda12850b896d2dde4442568f38d7c48 Mon Sep 17 00:00:00 2001
+From: wangjiang <wangjiang37@h-partners.com>
+Date: Fri, 11 Mar 2022 14:34:29 +0800
+Subject: PATCH openEuler-skip-some-test
+
+---
+ src/cmd/ksh93/tests/b_ulimit.sh | 4 ++--
+ src/cmd/ksh93/tests/b_uname.sh  | 6 +++---
+ src/cmd/ksh93/tests/bracket.sh  | 8 ++++----
+ src/cmd/ksh93/tests/builtins.sh | 2 +-
+ src/cmd/ksh93/tests/meson.build | 4 ----
+ src/cmd/ksh93/tests/path.sh     | 2 +-
+ 6 files changed, 11 insertions(+), 15 deletions(-)
+
+diff --git a/src/cmd/ksh93/tests/b_ulimit.sh b/src/cmd/ksh93/tests/b_ulimit.sh
+index 0250926..4c9dd0f 100644
+--- a/src/cmd/ksh93/tests/b_ulimit.sh
++++ b/src/cmd/ksh93/tests/b_ulimit.sh
+@@ -66,7 +66,7 @@ actual=$(ulimit -t)
+ 
+ # ==========
+ # -v The number of K-bytes for virtual memory.
+-if  $OS_NAME != openbsd 
++if  $OS_NAME != linux 
+ then
+     ulimit -v unlimited
+     expect=unlimited
+@@ -76,7 +76,7 @@ fi
+ 
+ # ==========
+ # -M, --as  The address space limit in Kibytes.
+-if  $OS_NAME != openbsd 
++if  $OS_NAME != linux 
+ then
+     ulimit -M unlimited
+     expect=unlimited
+diff --git a/src/cmd/ksh93/tests/b_uname.sh b/src/cmd/ksh93/tests/b_uname.sh
+index 4c9c06a..69ef430 100644
+--- a/src/cmd/ksh93/tests/b_uname.sh
++++ b/src/cmd/ksh93/tests/b_uname.sh
+@@ -29,9 +29,9 @@ expect=$($bin_uname -n)
+ # ==========
+ # -r, --release|kernel-release
+ # The kernel release level.
+-actual=$(uname -r)
+-expect=$($bin_uname -r)
+- "$actual" = "$expect"  || log_error "'uname -r' failed" "$expect" "$actual"
++#actual=$(uname -r)
++#expect=$($bin_uname -r)
++# "$actual" = "$expect"  || log_error "'uname -r' failed" "$expect" "$actual"
+ 
+ # ==========
+ # -v, --version|kernel-version
+diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
+index 07029f1..6915583 100644
+--- a/src/cmd/ksh93/tests/bracket.sh
++++ b/src/cmd/ksh93/tests/bracket.sh
+@@ -99,7 +99,7 @@ then
+ fi
+ 
+ chmod 000 $file
+-if  $OS_NAME == cygwin* 
++if  $OS_NAME == linux 
+ then
+     log_info 'skipping  -r $file  test on Cygwin'
+ else
+@@ -114,7 +114,7 @@ then
+     log_error "-r: $file should be owned by me"
+ fi
+ 
+-if  $OS_NAME == cygwin* 
++if  $OS_NAME == linux 
+ then
+     log_info 'skipping  -w $file  test on Cygwin'
+ else
+@@ -124,7 +124,7 @@ else
+     fi
+ fi
+ 
+-if  $OS_NAME == cygwin* 
++if  $OS_NAME == linux 
+ then
+     log_info 'skipping  -x $file  test on Cygwin'
+ else
+@@ -134,7 +134,7 @@ else
+     fi
+ fi
+ 
+-if  $OS_NAME == cygwin* 
++if  $OS_NAME == linux 
+ then
+     log_info 'skipping  -w $file || -r $file  test on Cygwin'
+ else
+diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh
+index 55b1f4f..8f9fbba 100644
+--- a/src/cmd/ksh93/tests/builtins.sh
++++ b/src/cmd/ksh93/tests/builtins.sh
+@@ -551,7 +551,7 @@ print ". $TEST_DIR/evalbug" >$TEST_DIR/envfile
+  $(ENV=$TEST_DIR/envfile $SHELL -i -c : 2> /dev/null) == ok  || log_error 'eval inside dot script called from profile file not working'
+ 
+ # test cd to a directory that doesn't have execute permission
+-if  $OS_NAME == cygwin* 
++if  $OS_NAME == linux 
+ then
+     log_warning 'skipping test of cd to dir without execute permission on Cygwin'
+ else
+diff --git a/src/cmd/ksh93/tests/meson.build b/src/cmd/ksh93/tests/meson.build
+index 6a07d7c..7728b88 100644
+--- a/src/cmd/ksh93/tests/meson.build
++++ b/src/cmd/ksh93/tests/meson.build
+@@ -9,7 +9,6 @@ all_tests = 
+     'b_alias',
+     'b_basename',
+     'b_cat',
+-    'b_chmod',
+     'b_cmp',
+     'b_command',
+     'b_cut',
+@@ -34,7 +33,6 @@ all_tests = 
+     'b_sleep',
+     'b_sync',
+     'b_test.exp',
+-    'b_test',
+     'b_time.exp',
+     'b_times.exp',
+     'b_ulimit',
+@@ -49,8 +47,6 @@ all_tests = 
+     'arrays2',
+     'attributes',
+     'basic', 90,
+-    'bracket',
+-    'builtins',
+     'case',
+     'comvar',
+     'comvario',
+diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh
+index 6920f19..4999d8f 100644
+--- a/src/cmd/ksh93/tests/path.sh
++++ b/src/cmd/ksh93/tests/path.sh
+@@ -276,7 +276,7 @@ exp=126
+ #
+ # TODO: Figure out if there is some way to make ksh behave on Cygwin like it does on real UNIX/POSIX
+ # compliant systems for these edge cases without greatly complicating the code.
+-if  $OS_NAME != cygwin* 
++if  $OS_NAME != linux 
+ then
+ 
+ : > $scr
+-- 
+1.8.3.1
+

_service Changed