- Update to 5.5.37

PR:		189887
Submitted by:	maintainer

4 files changed, 27 insertions, 25 deletions

diff --git a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
index e94bf77c990d..214edfd8834a 100644
--- a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
@@ -1,10 +1,10 @@
---- extra/yassl/taocrypt/src/integer.cpp.orig	2012-04-02 09:37:09.000000000 +0200
-+++ extra/yassl/taocrypt/src/integer.cpp	2012-04-02 09:37:41.000000000 +0200
-@@ -73,7 +73,7 @@
+--- extra/yassl/taocrypt/src/integer.cpp.orig	2014-04-15 14:02:39.000000000 +0300
++++ extra/yassl/taocrypt/src/integer.cpp	2014-05-16 17:00:15.000000000 +0300
+@@ -75,7 +75,7 @@
  CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
                                             size_type n, const void *)
  {
--    if (n > max_size())
+-    if (n > this->max_size())
 +    if (n > AlignedAllocator<T>::max_size())
          return 0;
      if (n == 0)
diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
index f4d2544deeb5..18be6bfa471a 100644
--- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig	2014-02-11 20:20:18.571491184 -0600
-+++ libmysql/CMakeLists.txt	2014-02-11 20:23:27.474449535 -0600
-@@ -329,7 +329,7 @@
+--- libmysql/CMakeLists.txt.orig	2014-04-15 14:02:39.000000000 +0300
++++ libmysql/CMakeLists.txt	2014-05-16 19:33:07.000000000 +0300
+@@ -377,7 +377,7 @@
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -9,7 +9,7 @@
  
  # Visual Studio users need debug  static library for debug projects
  INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -338,6 +338,7 @@
+@@ -386,6 +386,7 @@
   INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
  ENDIF()
  
@@ -17,20 +17,22 @@
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -352,9 +353,11 @@
+@@ -400,11 +401,13 @@
    ENDMACRO()
    INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
  ENDIF()
 +ENDIF()
  
  IF(NOT DISABLE_SHARED)
--  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
-+  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL)
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
+-    COMPONENT SharedLibraries)
++	COMPONENT SharedLibraries NOINSTALL)
 +IF(FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -401,3 +404,4 @@
+@@ -448,3 +451,4 @@
      ENDFOREACH()
    ENDIF()
  ENDIF()
diff --git a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
index d816e1412844..8e8938618637 100644
--- a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
@@ -1,16 +1,16 @@
---- scripts/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
-+++ scripts/CMakeLists.txt	2012-12-23 02:54:04.000000000 +0200
-@@ -260,6 +260,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
+--- scripts/CMakeLists.txt.orig	2014-04-15 14:02:28.000000000 +0300
++++ scripts/CMakeLists.txt	2014-05-16 19:36:34.000000000 +0300
+@@ -276,6 +276,8 @@
+             STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+             SET(${var} "${${var}}-l${lib} " ) 
+           ENDIF()
 +        ELSEIF(lib STREQUAL "-pthread")
 +          SET(${var} "${${var}}-pthread " )
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -313,16 +315,11 @@
- ELSE()
+@@ -332,16 +334,11 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
    # On Unix, most of the files end up in the bin directory
    SET(BIN_SCRIPTS
 -    msql2mysql
diff --git a/databases/mariadb55-server/files/patch-scripts_mysql_config.sh b/databases/mariadb55-server/files/patch-scripts_mysql_config.sh
index a17b750e634d..5271d5256b8f 100644
--- a/databases/mariadb55-server/files/patch-scripts_mysql_config.sh
+++ b/databases/mariadb55-server/files/patch-scripts_mysql_config.sh
@@ -1,13 +1,13 @@
---- scripts/mysql_config.sh.orig	2013-09-20 01:34:23.000000000 +0300
-+++ scripts/mysql_config.sh	2013-10-15 21:23:34.000000000 +0300
+--- scripts/mysql_config.sh.orig	2014-04-15 14:02:39.000000000 +0300
++++ scripts/mysql_config.sh	2014-05-16 19:08:41.000000000 +0300
 @@ -108,8 +108,11 @@
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
- libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+ libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 +libs="$libs -L%%LOCALBASE%%/lib "
- libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+ libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
 +libs_r="$libs_r -L%%LOCALBASE%%/lib "
- embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+ embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
  
  if [ -r "$pkglibdir/libmygcc.a" ]; then