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

!12 upgrade the version to 8.0.21 to fix some CVEs

Browse Source 
From: @maminjie
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-09-19 10:46:45 +08:00 committed by Gitee
commit 674aa637ef
7 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-fix-internal-compiler-error-Segmentation-fault.patch Normal file
View File

@ -0,0 +1,49 @@
From 216086b1de9daef9cf74194354e0504b44b0519d Mon Sep 17 00:00:00 2001
From: maminjie <maminjie1@huawei.com>
Date: Thu, 10 Sep 2020 16:44:50 +0800
Subject: [PATCH] fix internal compiler error: Segmentation fault
---
sql/dd/impl/types/partition_impl.cc | 6 +++++-
sql/dd/impl/types/partition_impl.h | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sql/dd/impl/types/partition_impl.cc b/sql/dd/impl/types/partition_impl.cc
index da8b057..fae0bac 100644
--- a/sql/dd/impl/types/partition_impl.cc
+++ b/sql/dd/impl/types/partition_impl.cc
@@ -291,7 +291,7 @@ bool Partition_impl::deserialize(Sdi_rcontext *rctx, const RJ_Value &val) {
deserialize_each(
rctx, [this]() { return add_index(nullptr); }, val, "indexes");
deserialize_each(
- rctx, [this]() { return add_subpartition(); }, val, "subpartitions");
+ rctx, [this]() { return add_subpartition_impl(); }, val, "subpartitions");
return deserialize_tablespace_ref(rctx, &m_tablespace_id, val,
"tablespace_ref");
@@ -371,6 +371,10 @@ Partition_index *Partition_impl::add_index(Index *idx) {
///////////////////////////////////////////////////////////////////////////
Partition *Partition_impl::add_subpartition() {
+ return add_subpartition_impl();
+}
+
+Partition_impl *Partition_impl::add_subpartition_impl() {
/// Support just one level of sub partitions.
DBUG_ASSERT(!parent());
diff --git a/sql/dd/impl/types/partition_impl.h b/sql/dd/impl/types/partition_impl.h
index 3b3068a..7a10649 100644
--- a/sql/dd/impl/types/partition_impl.h
+++ b/sql/dd/impl/types/partition_impl.h
@@ -247,6 +247,7 @@ class Partition_impl : public Entity_object_impl, public Partition {
/////////////////////////////////////////////////////////////////////////
virtual Partition *add_subpartition();
+ virtual Partition_impl *add_subpartition_impl();
virtual const Table::Partition_collection &subpartitions() const {
return m_subpartitions;
--
2.23.0

22
all-mysql-8.0.18-add-protobuf-support.patch
View File

@ -1,22 +0,0 @@
diff -Nur a/plugin/x/client/mysqlxclient/xmessage.h b/plugin/x/client/mysqlxclient/xmessage.h
--- a/plugin/x/client/mysqlxclient/xmessage.h 2019-09-20 16:30:51.000000000 +0800
+++ b/plugin/x/client/mysqlxclient/xmessage.h 2020-06-03 10:50:50.605147957 +0800
@@ -36,7 +36,6 @@
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/text_format.h>
#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/wire_format_lite_inl.h>
#ifdef USE_MYSQLX_FULL_PROTO
diff -Nur a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h
--- a/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-09-20 16:30:51.000000000 +0800
+++ b/plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2020-06-03 10:51:54.566083039 +0800
@@ -38,7 +38,6 @@
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/text_format.h>
#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/wire_format_lite_inl.h>
#ifdef USE_MYSQLX_FULL_PROTO
#include "plugin/x/generated/protobuf/mysqlx.pb.h"

6
boost-1.57.0-mpl-print.patch
View File

@ -1,6 +1,6 @@
diff -up a/boost/boost_1_70_0/boost/mpl/print.hpp b/boost/boost_1_70_0/boost/mpl/print.hpp diff -up a/boost/boost_1_72_0/boost/mpl/print.hpp b/boost/boost_1_72_0/boost/mpl/print.hpp
--- a/boost/boost_1_70_0/boost/mpl/print.hpp 2014-07-09 23:12:31.000000000 +0200 --- a/boost/boost_1_72_0/boost/mpl/print.hpp 2014-07-09 23:12:31.000000000 +0200
+++ b/boost/boost_1_70_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +++ b/boost/boost_1_72_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100
@@ -52,16 +52,15 @@ struct print @@ -52,16 +52,15 @@ struct print
enum { n = sizeof(T) + -1 }; enum { n = sizeof(T) + -1 };
#elif defined(__MWERKS__) #elif defined(__MWERKS__)

6
boost-1.58.0-pool.patch
View File

@ -1,7 +1,7 @@
Index: boost/boost_1_70_0/boost/pool/pool.hpp Index: boost/boost_1_72_0/boost/pool/pool.hpp
=================================================================== ===================================================================
--- a/boost/boost_1_70_0/boost/pool/pool.hpp (revision 78317) --- a/boost/boost_1_72_0/boost/pool/pool.hpp (revision 78317)
+++ b/boost/boost_1_70_0/boost/pool/pool.hpp (revision 78326) +++ b/boost/boost_1_72_0/boost/pool/pool.hpp (revision 78326)
@@ -27,4 +27,6 @@ @@ -27,4 +27,6 @@
#include <boost/pool/poolfwd.hpp> #include <boost/pool/poolfwd.hpp>

20
community-mysql-paths.patch
View File

@ -4,10 +4,10 @@ Software Collections. Removing these hard-coded paths should fix it.
Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485 Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 94d9ecf5..69058c22 100644 index 9f7945d8..6734cdfd 100644
--- a/cmake/install_layout.cmake --- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake
@@ -109,7 +109,7 @@ IF(UNIX) @@ -105,7 +105,7 @@ IF(UNIX)
" Choose between ${VALID_INSTALL_LAYOUTS}" ) " Choose between ${VALID_INSTALL_LAYOUTS}" )
ENDIF() ENDIF()
@ -16,7 +16,7 @@ index 94d9ecf5..69058c22 100644
CACHE PATH "config directory (for my.cnf)") CACHE PATH "config directory (for my.cnf)")
MARK_AS_ADVANCED(SYSCONFDIR) MARK_AS_ADVANCED(SYSCONFDIR)
ENDIF() ENDIF()
@@ -271,6 +271,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path}) @@ -189,6 +189,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
# #
SET(INSTALL_BINDIR_RPM "bin") SET(INSTALL_BINDIR_RPM "bin")
SET(INSTALL_SBINDIR_RPM "sbin") SET(INSTALL_SBINDIR_RPM "sbin")
@ -25,10 +25,10 @@ index 94d9ecf5..69058c22 100644
IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES) IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES)
SET(INSTALL_LIBDIR_RPM "lib64/mysql") SET(INSTALL_LIBDIR_RPM "lib64/mysql")
diff --git a/mysys/my_default.cc b/mysys/my_default.cc diff --git a/mysys/my_default.cc b/mysys/my_default.cc
index a8f6132a..3b448ef3 100644 index 290f1666..8403425f 100644
--- a/mysys/my_default.cc --- a/mysys/my_default.cc
+++ b/mysys/my_default.cc +++ b/mysys/my_default.cc
@@ -1565,12 +1565,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { @@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) {
#else #else
@ -45,7 +45,7 @@ index a8f6132a..3b448ef3 100644
#endif #endif
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index c64bfb52..1b2a76cf 100644 index 4149a764..b091d5e2 100644
--- a/scripts/CMakeLists.txt --- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt
@@ -288,9 +288,9 @@ IF(UNIX) @@ -288,9 +288,9 @@ IF(UNIX)
@ -60,10 +60,10 @@ index c64bfb52..1b2a76cf 100644
SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
SET(libsubdir ${INSTALL_LIBDIR}) SET(libsubdir ${INSTALL_LIBDIR})
SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR}) SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR})
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh diff --git a/scripts/mysqld_multi.pl.in b/scripts/mysqld_multi.pl.in
index 8cd63ecc..21ad556c 100644 index 84dd4d7c..50397ddd 100644
--- a/scripts/mysqld_multi.sh --- a/scripts/mysqld_multi.pl.in
+++ b/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.pl.in
@@ -586,9 +586,7 @@ sub list_defaults_files @@ -586,9 +586,7 @@ sub list_defaults_files
my %seen; # Don't list the same file more than once my %seen; # Don't list the same file more than once

6
community-mysql-scripts.patch
View File

@ -1,8 +1,8 @@
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index c64bfb52..4da9e699 100644 index 8217bb76..4149a764 100644
--- a/scripts/CMakeLists.txt --- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt
@@ -523,6 +523,32 @@ ELSE() @@ -513,4 +513,30 @@ ELSE()
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
) )
ENDIF() ENDIF()
@ -33,5 +33,3 @@ index c64bfb52..4da9e699 100644
+ ENDIF() + ENDIF()
+ ENDFOREACH() + ENDFOREACH()
ENDIF() ENDIF()
# Install libgcc as mylibgcc.a

24
mysql.spec
View File

@ -1,6 +1,6 @@
#%{!?runselftest:%global runselftest 0} #%{!?runselftest:%global runselftest 0}
Name: mysql Name: mysql
Version: 8.0.18 Version: 8.0.21
Release: 2 Release: 2
Summary: The package provides MySQL programs and shared libraries Summary: The package provides MySQL programs and shared libraries
License: GPLv2 with exceptions and LGPLv2 and BSD License: GPLv2 with exceptions and LGPLv2 and BSD
@ -28,7 +28,7 @@ Patch0005: community-mysql-sharedir.patch
Patch0006: community-mysql-rpath.patch Patch0006: community-mysql-rpath.patch
Patch0007: boost-1.58.0-pool.patch Patch0007: boost-1.58.0-pool.patch
Patch0008: boost-1.57.0-mpl-print.patch Patch0008: boost-1.57.0-mpl-print.patch
Patch9001: all-mysql-8.0.18-add-protobuf-support.patch Patch0009: 0001-fix-internal-compiler-error-Segmentation-fault.patch
BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel
BuildRequires: lz4-devel mecab-devel bison libzstd-devel openssl openssl-devel BuildRequires: lz4-devel mecab-devel bison libzstd-devel openssl openssl-devel
BuildRequires: perl-interpreter perl-generators rpcgen libtirpc-devel lz4 BuildRequires: perl-interpreter perl-generators rpcgen libtirpc-devel lz4
@ -123,7 +123,7 @@ Requires: mysql-server = %{version}-%{release} gzip lz4 openssl perl(
Requires: perl(Digest::MD5) perl(Env) perl(Exporter) perl(Fcntl) perl(File::Temp) Requires: perl(Digest::MD5) perl(Env) perl(Exporter) perl(Fcntl) perl(File::Temp)
Requires: perl(Data::Dumper) perl(Getopt::Long) perl(IPC::Open3) perl(JSON) Requires: perl(Data::Dumper) perl(Getopt::Long) perl(IPC::Open3) perl(JSON)
Requires: perl(LWP::Simple) perl(Memoize) perl(Socket) perl(Sys::Hostname) Requires: perl(LWP::Simple) perl(Memoize) perl(Socket) perl(Sys::Hostname)
Requires: perl(Test::More) perl(Time::HiRes) Requires: perl(Test::More) perl(Time::HiRes) perl(FindBin)
Conflicts: mariadb-test Conflicts: mariadb-test
Provides: mysql-test = %{version}-%{release} Provides: mysql-test = %{version}-%{release}
%description test %description test
@ -144,6 +144,9 @@ add_test () {
touch platform-specific-tests.list touch platform-specific-tests.list
add_test innodb.redo_log_archive_04 failed since 8.0.17 add_test innodb.redo_log_archive_04 failed since 8.0.17
add_test clone.remote_dml_no_binlog failed since 8.0.17 add_test clone.remote_dml_no_binlog failed since 8.0.17
add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
add_test collations.chinese sporadic since 8.0.19
add_test main.mysql_load_data_local_dir local infile on
%ifarch %arm aarch64 %ifarch %arm aarch64
add_test gis.st_latitude add_test gis.st_latitude
add_test gis.st_longitude add_test gis.st_longitude
@ -151,6 +154,8 @@ add_test perfschema.func_file_io missing hw on arm32
add_test perfschema.func_mutex missing hw on arm32 add_test perfschema.func_mutex missing hw on arm32
add_test perfschema.global_read_lock missing hw on arm32 add_test perfschema.global_read_lock missing hw on arm32
add_test perfschema.setup_objects missing hw on arm32 add_test perfschema.setup_objects missing hw on arm32
add_test clone.remote_error_basic max_allowed_packet is 0
add_test innodb.create_tablespace
%endif %endif
cd - cd -
cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} \ cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
@ -187,7 +192,7 @@ cmake .. \
%endif %endif
-DCMAKE_CXX_LINK_FLAGS"%{build_ldflags}" -DCMAKE_CXX_LINK_FLAGS"%{build_ldflags}"
cmake .. -LAH cmake .. -LAH
%make_build VERBOSE=1 %make_build
cd - cd -
%install %install
@ -283,6 +288,8 @@ fi
%{_datadir}/mysql/charsets %{_datadir}/mysql/charsets
%files errmsg %files errmsg
%{_datadir}/mysql/messages_to_error_log.txt
%{_datadir}/mysql/messages_to_clients.txt
%{_datadir}/mysql/{errmsg-utf8.txt,english} %{_datadir}/mysql/{errmsg-utf8.txt,english}
%lang(bg) %{_datadir}/mysql/bulgarian %lang(bg) %{_datadir}/mysql/bulgarian
%lang(cs) %{_datadir}/mysql/czech %lang(cs) %{_datadir}/mysql/czech
@ -344,6 +351,7 @@ fi
%files test %files test
%{_bindir}/{mysql_client_test,mysqltest,mysqltest_safe_process,mysqlxtest} %{_bindir}/{mysql_client_test,mysqltest,mysqltest_safe_process,mysqlxtest}
%{_bindir}/{mysqld_safe,comp_err}
%attr(-,mysql,mysql) %{_datadir}/mysql-test %attr(-,mysql,mysql) %{_datadir}/mysql-test
%files help %files help
@ -360,10 +368,16 @@ fi
%exclude %{_mandir}/man1/{mysqld_multi.1*,mysqld_safe.1*,comp_err.1*} %exclude %{_mandir}/man1/{mysqld_multi.1*,mysqld_safe.1*,comp_err.1*}
%changelog %changelog
* Sat Sep 19 2020 maminjie <maminjie1@huawei.com> - 8.0.21-2
* fix internal compiler error: Segmentation fault
* Mon Sep 14 2020 maminjie <maminjie1@huawei.com> - 8.0.21-1
- upgrade to 8.0.21
* Mon Jun 1 2020 Jeffery.Gao <gaojianxing@huawei.com> - 8.0.18-2 * Mon Jun 1 2020 Jeffery.Gao <gaojianxing@huawei.com> - 8.0.18-2
- Package upgrade. - Package upgrade.
* Wed Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3 * Sun 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