!86 Bump to 10.5.22

From: @zhengzhenyu 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2023-10-17 10:48:20 +00:00 committed by Gitee
commit 1b6b558bbe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 9 deletions

View File

@ -2,7 +2,7 @@
%global pkgnamepatch mariadb
%{!?runselftest:%global runselftest 0}
%global ignore_testsuite_result 0
%global last_tested_version 10.5.15
%global last_tested_version 10.5.22
%global force_run_testsuite 0
%global require_mysql_selinux 1
@ -73,9 +73,9 @@
%global sameevr %{epoch}:%{version}-%{release}
Name: mariadb
Version: 10.5.16
Release: 2
Epoch: 4
Version: 10.5.22
Release: 1
Epoch: 1
Summary: A very fast and robust SQL database server
URL: http://mariadb.org
@ -108,8 +108,6 @@ Patch4: %{pkgnamepatch}-logrotate.patch
Patch7: %{pkgnamepatch}-scripts.patch
# Patch9: pre-configure to comply with guidelines
Patch9: %{pkgnamepatch}-ownsetup.patch
# Patch10: Fix cipher name in the SSL Cipher name test
Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
# Patch11: Use PCDIR CMake option, if configured
Patch11: %{pkgnamepatch}-pcdir.patch
Patch12: mariadb-10.5.10-sw.patch
@ -622,7 +620,6 @@ sources.
%patch4 -p1
%patch7 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
@ -1476,10 +1473,13 @@ fi
%endif
%changelog
* Mon Oct 16 2023 ZhengZhenyu<zheng.zhenyu@outlook.com> - 1:10.5.22-1
- Bump to 10.5.22
* Mon Oct 24 2022 wuzx<wuzx1226@qq.com> - 4:10.5.16-2
- Add sw64 architecture
* Thur May 26 2022 bzhaoop<bzhaojyathousandy@gmail.com> - 4:10.5.16-1
* Thu May 26 2022 bzhaoop<bzhaojyathousandy@gmail.com> - 4:10.5.16-1
- Bump to 10.5.16 for resolving CVEs below
- CVE-2022-27385
- CVE-2022-27382
@ -1512,7 +1512,7 @@ fi
- Apply the patches from old branch.
- Adaption the cmake version and integrate into the spec file.
* Thur Mar 17 2022 bzhaoop<bzhaojyathousandy@gmail.com> -4:10.5.15-1
* Thu Mar 17 2022 bzhaoop<bzhaojyathousandy@gmail.com> -4:10.5.15-1
- Bump to 10.5.15
- For resolving CVEs:
- CVE-2022-24048