[mariadb/f19] Update to MariaDB 5.5.37, for various fixes described at https://kb.askmonty.org/en/mariadb-5537-cha
Honza Horak
hhorak at fedoraproject.org
Thu Apr 17 15:48:34 UTC 2014
commit 06986da16f1515876e850e4a134145adea899614
Author: Honza Horak <hhorak at redhat.com>
Date: Thu Apr 17 17:42:53 2014 +0200
Update to MariaDB 5.5.37, for various fixes described at
https://kb.askmonty.org/en/mariadb-5537-changelog/
Includes fixes for: CVE-2014-2440 CVE-2014-0384 CVE-2014-2432
CVE-2014-2431 CVE-2014-2430 CVE-2014-2436 CVE-2014-2438 CVE-2014-2419
.gitignore | 1 +
mariadb-versioning.patch | 75 ++++++++++++++++++++++++++++++---------------
mariadb.spec | 8 ++++-
sources | 2 +-
4 files changed, 59 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e92f058..a3aea7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/mariadb-5.5.34.tar.gz
/mariadb-5.5.35.tar.gz
/mariadb-5.5.36.tar.gz
+/mariadb-5.5.37.tar.gz
diff --git a/mariadb-versioning.patch b/mariadb-versioning.patch
index 3e6aacb..c5d0972 100644
--- a/mariadb-versioning.patch
+++ b/mariadb-versioning.patch
@@ -1,21 +1,6 @@
-The symbol versioning solution for libmysqlclient in mysql 5.1 was pretty
-awful (export everything) and as of 5.5.8 the cmake build scripts have
-forgotten the issue entirely. So we have maintained our own list of exported
-symbols and jam it into the build with this hack.
-
-Since Fedora 21 we'll use new layout comming from Fedora/MariaDB/Oracle
-collaboration and which resulted into exporting all symbols under
-libmysqlclient_18 version, while some of them also have alternative
-name versioned as libmysqlclient_16.
-
-Upstream bug: https://mariadb.atlassian.net/browse/MDEV-5529
-
-However, to stay binary compatible in F20 and lower, we need to use the
-former way.
-
-diff -up mariadb-5.5.36/libmysql/CMakeLists.txt.versioning mariadb-5.5.36/libmysql/CMakeLists.txt
---- mariadb-5.5.36/libmysql/CMakeLists.txt.versioning 2014-03-06 21:55:33.338842373 +0100
-+++ mariadb-5.5.36/libmysql/CMakeLists.txt 2014-03-06 21:55:36.778834151 +0100
+diff -up mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak mariadb-5.5.37/libmysql/CMakeLists.txt
+--- mariadb-5.5.37/libmysql/CMakeLists.txt.p5bak 2014-04-17 17:41:10.502124767 +0200
++++ mariadb-5.5.37/libmysql/CMakeLists.txt 2014-04-17 17:41:43.048127870 +0200
@@ -1,5 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates.
-# Copyright (c) 2009, 2013, SkySQL Ab.
@@ -54,7 +39,7 @@ diff -up mariadb-5.5.36/libmysql/CMakeLists.txt.versioning mariadb-5.5.36/libmys
mysql_fetch_row_cont
mysql_fetch_row_start
mysql_free_result_cont
-@@ -245,76 +238,73 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+@@ -245,114 +238,73 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# for compatibility with distribution packages, so client shared library can
# painlessly replace the one supplied by the distribution.
@@ -101,7 +86,45 @@ diff -up mariadb-5.5.36/libmysql/CMakeLists.txt.versioning mariadb-5.5.36/libmys
-
- # DBD::mysql requires this
- is_prefix
-- )
+- )
+-
+-
+- # And even more so on Debian
+- SET(CLIENT_API_5_5_EXTRA
+- # libmyodbc. Argh!
+- alloc_dynamic
+- alloc_root
+- delete_dynamic
+- dynstr_append
+- dynstr_append_mem
+- dynstr_append_os_quoted
+- dynstr_free
+- dynstr_realloc
+- free_root
+- get_dynamic
+- init_dynamic_array2
+- init_dynamic_string
+- int2str
+- list_add
+- list_delete
+- my_end
+- my_free
+- my_malloc
+- my_memdup
+- my_realloc
+- my_strdup
+- set_dynamic
+- strdup_root
+- strend
+- strfill
+- strmake
+- strmake_root
+- strxmov
+-
+- # pam_mysql.so
+- make_scrambled_password
+- make_scrambled_password_323
+- )
-
- # Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529
- SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_versions.ld.in)
@@ -119,7 +142,7 @@ diff -up mariadb-5.5.36/libmysql/CMakeLists.txt.versioning mariadb-5.5.36/libmys
- ENDFOREACH()
-
- SET (CLIENT_API_5_5_LIST)
-- FOREACH (f ${CLIENT_API_FUNCTIONS_5_5})
+- FOREACH (f ${CLIENT_API_FUNCTIONS_5_5} ${CLIENT_API_5_5_EXTRA})
- SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n")
- ENDFOREACH()
-
@@ -196,7 +219,7 @@ diff -up mariadb-5.5.36/libmysql/CMakeLists.txt.versioning mariadb-5.5.36/libmys
ENDIF()
-@@ -342,10 +332,8 @@ SET(LIBS clientlib dbug strings vio mysy
+@@ -380,10 +332,8 @@ SET(LIBS clientlib dbug strings vio mysy
MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
# Visual Studio users need debug static library for debug projects
@@ -207,16 +230,18 @@ diff -up mariadb-5.5.36/libmysql/CMakeLists.txt.versioning mariadb-5.5.36/libmys
ENDIF()
IF(UNIX)
-@@ -364,7 +352,7 @@ IF(UNIX)
+@@ -402,9 +352,7 @@ IF(UNIX)
ENDIF()
IF(NOT DISABLE_SHARED)
-- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} COMPONENT SharedLibraries)
+- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+- EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
+- COMPONENT SharedLibraries)
+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -381,8 +369,11 @@ IF(NOT DISABLE_SHARED)
+@@ -421,8 +369,11 @@ IF(NOT DISABLE_SHARED)
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
diff --git a/mariadb.spec b/mariadb.spec
index a4daa66..2332335 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -6,7 +6,7 @@
%bcond_with tokudb
Name: mariadb
-Version: 5.5.36
+Version: 5.5.37
Release: 1%{?dist}
Epoch: 1
@@ -781,6 +781,12 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Thu Apr 17 2014 Honza Horak <hhorak at redhat.com> - 1:5.5.37-1
+- Update to MariaDB 5.5.37, for various fixes described at
+ https://kb.askmonty.org/en/mariadb-5537-changelog/
+ Includes fixes for: CVE-2014-2440 CVE-2014-0384 CVE-2014-2432
+ CVE-2014-2431 CVE-2014-2430 CVE-2014-2436 CVE-2014-2438 CVE-2014-2419
+
* Thu Mar 06 2014 Honza Horak <hhorak at redhat.com> - 1:5.5.36-1
- Rebase to 5.5.36
https://kb.askmonty.org/en/mariadb-5536-changelog/
diff --git a/sources b/sources
index a285bad..4e348db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05f72957bedd8b1ea134c14173be9c25 mariadb-5.5.36.tar.gz
+15a2da0e3c5dd3ad5a353c2e3a38ff37 mariadb-5.5.37.tar.gz
More information about the scm-commits
mailing list