diff --git a/community-mysql-cmake.patch b/community-mysql-cmake.patch deleted file mode 100644 index 1653627..0000000 --- a/community-mysql-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -Include the library with function ADD_COMPILE_FLAGS() - ---- mysql-5.7.23/regex/CMakeLists.txt 2018-08-23 02:02:38.971432914 +0200 -+++ mysql-5.7.23/regex/CMakeLists.txt_patched 2018-08-23 02:02:29.711608104 +0200 -@@ -15,6 +15,8 @@ - - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) - -+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) -+ - MY_CHECK_C_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION) - IF(HAVE_STRINGOP_TRUNCATION) - ADD_COMPILE_FLAGS( diff --git a/community-mysql.spec b/community-mysql.spec index 57e64e0..fa68a9c 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -89,7 +89,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 5.7.23 +Version: 5.7.24 Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -135,8 +135,6 @@ Patch70: %{pkgnamepatch}-5.7.9-major.patch %if 0%{?fedora} >= 28 || 0%{?rhel} > 7 Patch73: %{pkgnamepatch}-libxcrypt.patch %endif -# Bug in 5.7.23 -Patch74: %{pkgnamepatch}-cmake.patch # Patches taken from boost 1.59 @@ -414,7 +412,6 @@ the MySQL sources. %if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %patch73 -p1 %endif -%patch74 -p1 # Patch Boost pushd boost/boost_1_59_0 @@ -991,6 +988,14 @@ fi %endif %changelog +* Wed Nov 14 2018 Michal Schorm - 5.7.24-1 +- Rebase to 5.7.24 version +- CVE fixes: #1640559 + CVE-2018-3276 CVE-2018-3200 CVE-2018-3284 CVE-2018-3173 CVE-2018-3162 + CVE-2018-3247 CVE-2018-3156 CVE-2018-3161 CVE-2018-3278 CVE-2018-3282 + CVE-2018-3187 CVE-2018-3277 CVE-2018-3144 CVE-2018-3133 CVE-2018-3143 + CVE-2018-3283 CVE-2018-3171 CVE-2018-3251 CVE-2018-3185 CVE-2018-3155 + * Thu Aug 23 2018 Michal Schorm - 5.7.23-1 - Rebase to 5.7.23 version - OpenSSL 1.1 patch removed; fixed by upstream diff --git a/sources b/sources index 548b284..f7049f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-boost-5.7.23.tar.gz) = e4317f89d108a68652cd95e41ffd670c37b6663aabd6af3985d18052fb7e8d8879b5822399caf9091cecc0a949ec588c121c87cfd60d69941f68d0ecbedd0953 +SHA512 (mysql-boost-5.7.24.tar.gz) = bbd411e15cd9e6053a353146808b74881d2d950f09e94794a699e7604dadf767b58b661a8321fbe1424f2c2e6cfc3adaa388242183e759082eae47b64cbfbcde