[packages/mysql/MYSQL_5_6] - up to 5.6.46-86.2
arekm
arekm at pld-linux.org
Mon Jan 13 21:44:11 CET 2020
commit 75e29e43a3d8b0ec97147a80e8b772777cdd2824
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Jan 13 21:43:58 2020 +0100
- up to 5.6.46-86.2
mysql-chain-certs.patch | 17 -----------------
mysql-opt.patch | 17 ++++++++++++-----
mysql.spec | 6 +++---
3 files changed, 15 insertions(+), 25 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 72f4344..8b410d5 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -31,7 +31,7 @@
%endif
%define rel 1
-%define percona_rel 86.1
+%define percona_rel 86.2
%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
@@ -42,14 +42,14 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер
Summary(uk.UTF-8): MySQL - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MySQL数据库服务器
Name: mysql
-Version: 5.6.45
+Version: 5.6.46
Release: %{percona_rel}.%{rel}
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
# Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
# Source0: http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
Source0: http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: 7bdb5a78fba21c82d198b6c995c00af2
+# Source0-md5: 469740aee5deaea8d2ca8f889ef4e679
Source100: http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
# Source100-md5: 5cac34f3d78a9d612ca4301abfcbd666
Source1: %{name}.init
diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch
index 3914311..7f18fe2 100644
--- a/mysql-chain-certs.patch
+++ b/mysql-chain-certs.patch
@@ -22,20 +22,3 @@ diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactor
{
*error= SSL_INITERR_CERT;
DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
-diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
---- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp 2010-05-06 11:24:26.000000000 -0400
-+++ mysql-5.1.47/extra/yassl/src/ssl.cpp 2010-05-26 23:29:13.000000000 -0400
-@@ -1606,10 +1606,10 @@
- }
-
-
-- int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-+ int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
- {
-- // TDOD:
-- return SSL_SUCCESS;
-+ // For the moment, treat like use_certificate_file
-+ return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
- }
-
-
diff --git a/mysql-opt.patch b/mysql-opt.patch
index df5d210..c7db343 100644
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -11,14 +11,14 @@
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -39,20 +39,20 @@
+@@ -52,26 +52,26 @@ IF(UNIX)
IF(WITH_VALGRIND)
SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
ENDIF()
- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
ENDIF()
# Default Clang flags
@@ -27,14 +27,21 @@
- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
ENDIF()
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+ IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
+ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
++ SET(COMMON_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} -std=gnu++03")
+ ENDIF()
+ ENDIF()
- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
ENDIF()
# Solaris flags
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/75e29e43a3d8b0ec97147a80e8b772777cdd2824
More information about the pld-cvs-commit
mailing list