Up to 5.7.43.

diff --git a/mysql.spec b/mysql.spec
index 48ceb15d3549b6d856a3727b63b3c6b9a68b5b24..b945848c6f5bcbe0c2da0635cdcd178aab2c3a8f 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,13 +35,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.7.39
-Release:       2
+Version:       5.7.43
+Release:       1
 License:       GPL v2 + MySQL FOSS License Exception
 Group:         Applications/Databases
 #Source0Download: https://dev.mysql.com/downloads/mysql/5.7.html#downloads
 Source0:       http://cdn.mysql.com/Downloads/MySQL-5.7/%{name}-%{version}.tar.gz
-# Source0-md5: db1b672fc257bd46356c7af26dd22801
+# Source0-md5: a06d002cebf649082f0f3aaad4b6b797
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -70,7 +70,6 @@ Patch5:               %{name}-chain-certs.patch
 Patch6:                %{name}-cmake.patch
 Patch7:                %{name}-readline.patch
 Patch8:                %{name}dumpslow-clusters.patch
-Patch9:                openssl-3.patch
 URL:           http://www.mysql.com/products/community/
 BuildRequires: automake
 BuildRequires: bison >= 1.875
@@ -483,7 +482,6 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
@@ -491,7 +489,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 
 # ensure sytstem lib
 # need to keep xxhash.[ch]
-%{__rm} -rv extra/lz4/lz4*/lz4*
+%{__rm} -rv extra/lz4/lz4*/lib/lz4*
 
 %build
 install -d build

diff --git a/openssl-3.patch b/openssl-3.patch
deleted file mode 100644 (file)
index eb1c1ad..0000000
--- a/openssl-3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- mysql-5.7.31/cmake/ssl.cmake.orig  2020-06-02 13:05:42.000000000 +0200
-+++ mysql-5.7.31/cmake/ssl.cmake       2021-09-26 10:27:27.431001078 +0200
-@@ -172,20 +172,28 @@
-       #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-       # Encoded as MNNFFPPS: major minor fix patch status
-       FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
--        OPENSSL_VERSION_NUMBER
--        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-+        OPENSSL_VERSION_MAJOR
-+        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+([0-9]+).*"
-         )
-       STRING(REGEX REPLACE
--        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
--        OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        "^#[ ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1"
-+        OPENSSL_MAJOR_VERSION ${OPENSSL_VERSION_MAJOR}
-+        )
-+      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-+        OPENSSL_VERSION_MINOR
-+        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+([0-9]+).*"
-         )
-       STRING(REGEX REPLACE
--        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
--        OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        "^#[ ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+([0-9]+).*" "\\1"
-+        OPENSSL_MINOR_VERSION ${OPENSSL_VERSION_MINOR}
-+        )
-+      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-+        OPENSSL_VERSION_PATCH
-+        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+([0-9]+).*"
-         )
-       STRING(REGEX REPLACE
--        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
--        OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        "^#[ ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+([0-9]+).*" "\\1"
-+        OPENSSL_FIX_VERSION ${OPENSSL_VERSION_PATCH}
-         )
-     ENDIF()
-     SET(OPENSSL_VERSION
-@@ -203,7 +211,7 @@
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "3")
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()