Update to 5.5.37 release.

5 files changed, 16 insertions, 36 deletions

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index ceebe7215290..02fdc8a915a2 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.36
+PORTVERSION=	5.5.37
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 47c63536bbd4..27e733e6facb 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.36.tar.gz) = 30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897
-SIZE (mysql-5.5.36.tar.gz) = 21723910
+SHA256 (mysql-5.5.37.tar.gz) = da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8
+SIZE (mysql-5.5.37.tar.gz) = 21718944
diff --git a/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
deleted file mode 100644
index ef8bb0670f75..000000000000
--- a/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/yassl/taocrypt/include/misc.hpp.orig
-+++ extra/yassl/taocrypt/include/misc.hpp
-@@ -124,7 +124,7 @@
- 
- 
- // no gas on these systems ?, disable for now
--#if defined(__sun__) || defined (__APPLE__)
-+#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
-     #define TAOCRYPT_DISABLE_X86ASM
- #endif
- 
diff --git a/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
deleted file mode 100644
index e94bf77c990d..000000000000
--- a/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
-                                            size_type n, const void *)
- {
--    if (n > max_size())
-+    if (n > AlignedAllocator<T>::max_size())
-         return 0;
-     if (n == 0)
-         return 0;
diff --git a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
index 5d364e19ee0e..9d7dfc81fbaa 100644
--- a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
@@ -1,5 +1,5 @@
---- libmysql/CMakeLists.txt.orig	2013-11-05 07:19:26.000000000 +0000
-+++ libmysql/CMakeLists.txt	2013-12-16 14:27:25.505227018 +0000
+--- libmysql/CMakeLists.txt.orig	2014-03-14 18:58:32.000000000 +0000
++++ libmysql/CMakeLists.txt	2014-03-31 12:19:56.265410574 +0000
 @@ -165,7 +165,7 @@
  
  # Merge several convenience libraries into one big mysqlclient
@@ -9,28 +9,30 @@
  
  # Visual Studio users need debug  static library for debug projects
  INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -174,6 +174,7 @@
-  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
- ENDIF()
+@@ -180,6 +180,7 @@
+   SET(${out_name} ${name})
+ ENDMACRO()
  
 +IF(FALSE)
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -188,9 +189,11 @@
-   ENDMACRO()
-   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+@@ -200,11 +201,13 @@
+     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
+     ${INSTALL_LIBDIR} Development)
  ENDIF()
 +ENDIF()
  
  IF(NOT DISABLE_SHARED)
--  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
-+  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+     EXPORTS ${CLIENT_API_FUNCTIONS}
+-    COMPONENT SharedLibraries)
++    COMPONENT SharedLibraries NOINSTALL)
 +IF(FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -237,3 +240,4 @@
+@@ -261,3 +264,4 @@
      ENDFOREACH()
    ENDIF()
  ENDIF()