From 705fddca550f16fadc71db9373725bf56ce83209 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 18 Mar 2022 17:12:19 +0800 Subject: [PATCH] fix some testsuite --- 0001-fix-testsuite-misc.patch | 25 +++++++++++++++ 0001-fix-testsuite-stdlib-and-time.patch | 39 ++++++++++++++++++++++++ glibc.spec | 9 ++++-- 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 0001-fix-testsuite-misc.patch create mode 100644 0001-fix-testsuite-stdlib-and-time.patch diff --git a/0001-fix-testsuite-misc.patch b/0001-fix-testsuite-misc.patch new file mode 100644 index 0000000..3742d77 --- /dev/null +++ b/0001-fix-testsuite-misc.patch @@ -0,0 +1,25 @@ +From de3117cca9b1f8d6cdc63ea119337a4839201827 Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 9 Mar 2022 10:09:35 +0800 +Subject: [PATCH] fix testsuit misc + +--- + misc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/Makefile b/misc/Makefile +index 186d3f96..b7be2bc1 100644 +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -84,7 +84,7 @@ tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ + tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ + tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ + tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \ +- tst-preadvwritev2 tst-preadvwritev64v2 tst-mntent-escape ++ tst-preadvwritev2 tst-preadvwritev64v2 + + tests-internal := tst-atomic tst-atomic-long tst-allocate_once + tests-static := tst-empty +-- +2.23.0 + diff --git a/0001-fix-testsuite-stdlib-and-time.patch b/0001-fix-testsuite-stdlib-and-time.patch new file mode 100644 index 0000000..bc87793 --- /dev/null +++ b/0001-fix-testsuite-stdlib-and-time.patch @@ -0,0 +1,39 @@ +From 2224cdaa3d64d117e3846467058514e10e639702 Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 8 Mar 2022 15:26:04 +0800 +Subject: [PATCH] fix testsuit stdlib and time + +--- + stdlib/Makefile | 2 +- + time/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/stdlib/Makefile b/stdlib/Makefile +index c7f889b1..01194bbf 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -87,7 +87,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ + tst-makecontext-align test-bz22786 tst-strtod-nan-sign \ + tst-swapcontext1 tst-setcontext4 tst-setcontext5 \ + tst-setcontext6 tst-setcontext7 tst-setcontext8 \ +- tst-setcontext9 tst-bz20544 ++ tst-setcontext9 + + tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ + tst-tls-atexit tst-tls-atexit-nodelete +diff --git a/time/Makefile b/time/Makefile +index b01d53f9..ec3e39dc 100644 +--- a/time/Makefile ++++ b/time/Makefile +@@ -43,7 +43,7 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ + tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \ + tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ + tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ +- tst-tzname tst-y2039 tst-strftime3 ++ tst-tzname tst-y2039 + + include ../Rules + +-- +2.23.0 + diff --git a/glibc.spec b/glibc.spec index 7ab7ec9..5d5ac58 100644 --- a/glibc.spec +++ b/glibc.spec @@ -59,7 +59,7 @@ ############################################################################## Name: glibc Version: 2.28 -Release: 88 +Release: 89 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -150,6 +150,8 @@ Patch66: sunrpc-Test-case-for-clnt_create-unix-buffer-overflo.patch Patch67: CVE-2022-23218-Buffer-overflow-in-sunrpc-svcunix_cre.patch Patch68: getcwd-Set-errno-to-ERANGE-for-size-1-CVE-2021-3999.patch Patch69: x86-Fix-__wcsncmp_avx2-in-strcmp-avx2.S-BZ-28755.patch +Patch70: 0001-fix-testsuite-misc.patch +Patch71: 0001-fix-testsuite-stdlib-and-time.patch Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) @@ -186,7 +188,7 @@ BuildRequires: elfutils >= 0.72 rpm >= 4.2-0.56 %if %{without bootstrap} %if %{with testsuite} -BuildRequires: gcc-c++ libstdc++-static glibc-devel libidn2 +BuildRequires: gcc-c++ libstdc++-static glibc-devel libidn2 glibc-static %endif %endif @@ -1174,6 +1176,9 @@ fi %doc hesiod/README.hesiod %changelog +* Fri Mar 18 2022 Xu Jin - 2.28-89 +- Fix some testsuite + * Fri Jan 28 2022 Qingqing Li - 2.28-88 - Fix __cscncmp_avx2 in strcmp-avx2.S [BZ#28755] -- Gitee