X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql.spec;h=c32ad6717bc410217280da8e684a1bfe1d0efea3;hp=825f3e054fb95ee354b8fa54326aa799ef95ab1c;hb=a67b37d89d380010f5573ae2449ae05f68bc437d;hpb=e370ad03be04a1befd4bc207f6b090bbf59b97f5

diff --git a/mysql.spec b/mysql.spec
index 825f3e0..c32ad67 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -44,7 +44,7 @@
 %endif
 
 %define		rel	1
-%define		percona_rel	22
+%define		percona_rel	23
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -55,12 +55,12 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.7.22
+Version:	5.7.23
 Release:	%{percona_rel}.%{rel}
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 Source0:	https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5:	a0b0488015d3d38a77c093b476452722
+# Source0-md5:	8bf4dca1bd9593803a48c522728ade50
 Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:	5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -82,17 +82,12 @@ Source13:	%{name}-client.conf
 Source14:	my.cnf
 Patch0:		mysql-opt.patch
 Patch1:		mysql-versioning.patch
-
-Patch7:		lz4.patch
-
-Patch11:	mysql-upgrade.patch
-Patch12:	mysql-config.patch
-Patch18:	mysql-sphinx.patch
-Patch19:	mysql-chain-certs.patch
+Patch2:		mysql-sphinx.patch
+Patch3:		mysql-chain-certs.patch
 # from fedora
-Patch20:	mysql-dubious-exports.patch
-
-Patch24:	mysql-cmake.patch
+Patch4:		mysql-dubious-exports.patch
+Patch5:		mysql-cmake.patch
+Patch6:		mysql-bug-91914.patch
 URL:		https://www.percona.com/software/mysql-database/percona-server
 BuildRequires:	bison >= 1.875
 BuildRequires:	cmake >= 2.8.2
@@ -498,20 +493,16 @@ find . -name CMakeLists.txt -exec sed -i -e 's#perconaserverclient#mysqlclient#g
 sed -i -e 's#perconaserverclient#mysqlclient#g' libmysql/libmysql.{ver.in,map} scripts/mysql_config.*
 
 %patch0 -p1
-
+%patch1 -p1
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
 mv sphinx-*/mysqlse storage/sphinx
-%patch18 -p1
+%patch2 -p1
 %endif
-%patch1 -p1
-
-%patch7 -p1
-
-%patch19 -p1
-%patch20 -p1
-
-%patch24 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
@@ -532,8 +523,8 @@ CPPFLAGS="%{rpmcppflags}" \
 	-DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
 	-DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
 	-DCMAKE_CXX_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
-	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
-	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
+	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0 -Wno-shadow" \
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0 -Wno-shadow" \
 	-DCOMPILATION_COMMENT="TLD Linux MySQL RPM" \
 	-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
 	%{?with_systemtap:-DENABLE_DTRACE=ON} \