[packages/mysql/MYSQL_5_6] - rel 2; drop fpermissive

[arekm]

commit 4b78bd5bf98ddd6add38cd6eaf030abbfd16d5e0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Oct 10 09:22:36 2017 +0200

    - rel 2; drop fpermissive

 mysql-build.patch | 12 ++++++++++++
 mysql.spec        |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 0f4d7a3..8a75d40 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -30,7 +30,7 @@
 %undefine	with_tokudb
 %endif
 
-%define		rel	1
+%define		rel	2
 %define		percona_rel	82.2
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
@@ -571,7 +571,7 @@ CPPFLAGS="%{rpmcppflags}" \
 %cmake .. \
 	-DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
-	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive" \
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
 	-DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \
 	-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
 	%{?with_systemtap:-DENABLE_DTRACE=ON} \
diff --git a/mysql-build.patch b/mysql-build.patch
index e9c2efd..7c87749 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -91,3 +91,15 @@ diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
  
  set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers")
  if (USE_VALGRIND)
+--- percona-server-5.6.37-82.2/sql-common/client_authentication.cc~	2017-08-24 13:30:44.000000000 +0200
++++ percona-server-5.6.37-82.2/sql-common/client_authentication.cc	2017-10-10 07:08:19.782991745 +0200
+@@ -83,8 +83,7 @@ RSA *rsa_init(MYSQL *mysql)
+   FILE *pub_key_file= NULL;
+ 
+   if (mysql->options.extension != NULL &&
+-      mysql->options.extension->server_public_key_path != NULL &&
+-      mysql->options.extension->server_public_key_path != '\0')
++      mysql->options.extension->server_public_key_path != NULL)
+   {
+     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+                         "r");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/4b78bd5bf98ddd6add38cd6eaf030abbfd16d5e0