packages/mysql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!10 upgrade to 8.0.21

Browse Source 
Merge pull request !10 from sigui/openEuler-20.03-LTS
This commit is contained in:
openeuler-ci-bot 2020-08-11 21:25:32 +08:00 committed by Gitee
commit 7015ce28b4
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0000-mysql-add-fstack-protector-strong.patch
View File

@ -1,20 +1,29 @@
From d770dfea36dcbe8d63ad0819e796d180ab2ea638 Mon Sep 17 00:00:00 2001
---
cmake/build_configurations/compiler_options.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
index fecf2a2..f3e012f 100644 index a319983..aea15a3 100644
--- a/cmake/build_configurations/compiler_options.cmake --- a/cmake/build_configurations/compiler_options.cmake
+++ b/cmake/build_configurations/compiler_options.cmake +++ b/cmake/build_configurations/compiler_options.cmake
@@ -43,6 +43,7 @@ IF(UNIX) @@ -45,6 +45,7 @@ IF(UNIX)
# Default GCC flags # Default GCC flags
IF(CMAKE_COMPILER_IS_GNUCC) IF(MY_COMPILER_IS_GNU)
SET(COMMON_C_FLAGS "-fno-omit-frame-pointer") SET(COMMON_C_FLAGS "-fno-omit-frame-pointer")
+ SET(COMMON_C_FLAGS "-fstack-protector-strong") + SET(COMMON_C_FLAGS "-fstack-protector-strong")
# Disable inline optimizations for valgrind testing to avoid false positives # Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND) IF(WITH_VALGRIND)
STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
@@ -57,6 +58,7 @@ IF(UNIX) @@ -55,6 +56,7 @@ IF(UNIX)
ENDIF() ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(COMMON_CXX_FLAGS "-std=c++14 -fno-omit-frame-pointer") SET(COMMON_CXX_FLAGS "-std=c++14 -fno-omit-frame-pointer")
+ SET(COMMON_CXX_FLAGS "-fstack-protector-strong") + SET(COMMON_CXX_FLAGS "-fstack-protector-strong")
# Disable inline optimizations for valgrind testing to avoid false positives # Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND) IF(WITH_VALGRIND)
STRING_PREPEND(COMMON_CXX_FLAGS "-fno-inline ") STRING_PREPEND(COMMON_CXX_FLAGS "-fno-inline ")
--
2.23.0

11
mysql.spec
View File

@ -5,13 +5,12 @@
%{nil} %{nil}
Name: mysql Name: mysql
Version: 8.0.17 Version: 8.0.21
Release: 3 Release: 1
License: GPLv2 License: GPLv2
Summary: The world's most popular open source database Summary: The world's most popular open source database
URL: http://www.mysql.com/ URL: http://www.mysql.com/
Source0: https://cdn.mysql.com/archives/%{name}-8.0/%{name}-boost-%{version}.tar.gz Source0: https://cdn.mysql.com/archives/%{name}-8.0/%{name}-boost-%{version}.tar.gz
Patch0000: 0000-mysql-add-fstack-protector-strong.patch Patch0000: 0000-mysql-add-fstack-protector-strong.patch
BuildRequires: cmake openssl-devel ncurses-devel libtirpc-devel rpcgen BuildRequires: cmake openssl-devel ncurses-devel libtirpc-devel rpcgen
Requires: libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl Requires: libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl
@ -71,16 +70,20 @@ if [ -f %{_initddir}/mysql ];then
fi fi
%postun %postun
rm -rf %{_prefix}/local/%{name}
userdel -r %{name} &>/dev/null userdel -r %{name} &>/dev/null
%files %files
%dir %{_prefix}/local/%{name}
%attr(755, %{name}, %{name}) %{_prefix}/local/%{name}/* %attr(755, %{name}, %{name}) %{_prefix}/local/%{name}/*
%exclude /usr/src/debug %exclude /usr/src/debug
%exclude /usr/lib/debug %exclude /usr/lib/debug
%changelog %changelog
* Sat Aug 8 2020 Guoshuai Sun <sunguoshuai@huawei.com> 8.0.21-1
- Upgrade to 8.0.21 and fix the upgrade bug in old version
* Wed Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3 * Wed Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3
- add fstack-protector-strong - add fstack-protector-strong
* Fri Feb 28 2020 catastrowings <jianghuhao1994@163.com> 8.0.17-2 * Fri Feb 28 2020 catastrowings <jianghuhao1994@163.com> 8.0.17-2
- openEuler package init. - openEuler package init.