Update to 5.5.38-35.2

8 files changed, 22 insertions, 59 deletions

diff --git a/databases/percona55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/percona55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
deleted file mode 100644
index ef8bb0670f75..000000000000
--- a/databases/percona55-client/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/percona55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/percona55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
deleted file mode 100644
index e94bf77c990d..000000000000
--- a/databases/percona55-client/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/percona55-server/Makefile b/databases/percona55-server/Makefile
index 0adfe52ef35a..8468518d8f8a 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.5.36-34.1
+DISTVERSION=	5.5.38-35.2
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/
 PKGNAMESUFFIX?=	55-server
-DISTNAME=	percona-server-5.5.36-34.1
+DISTNAME=	percona-server-${DISTVERSION}
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index bd1c8fbd9d0b..843a76e55cdd 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (percona-server-5.5.36-34.1.tar.gz) = 623821c379df5d5bb70223a4bbecac149531edca6e5a91aff939f87b466d422e
-SIZE (percona-server-5.5.36-34.1.tar.gz) = 24207160
+SHA256 (percona-server-5.5.38-35.2.tar.gz) = 2726d8443a4e87e1a1f11c56dfcd1aa79a5a2ff8cbff9f229c8589cdedbf031d
+SIZE (percona-server-5.5.38-35.2.tar.gz) = 22946764
diff --git a/databases/percona55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/percona55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
deleted file mode 100644
index ef8bb0670f75..000000000000
--- a/databases/percona55-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/percona55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/percona55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
deleted file mode 100644
index e94bf77c990d..000000000000
--- a/databases/percona55-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/percona55-server/files/patch-libmysql_CMakeLists.txt b/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
index a60338ddc992..1876e330acb6 100644
--- a/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
@@ -1,5 +1,5 @@
---- libmysql/CMakeLists.txt.orig	2014-03-15 18:08:16.000000000 +0100
-+++ libmysql/CMakeLists.txt	2014-03-22 19:37:32.145100925 +0100
+--- libmysql/CMakeLists.txt.orig	2014-06-30 17:54:26.000000000 +0200
++++ libmysql/CMakeLists.txt	2014-07-06 12:30:10.041356892 +0200
 @@ -165,7 +165,7 @@
  
  # Merge several convenience libraries into one big perconaserverclient
@@ -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}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
+@@ -200,11 +201,13 @@
+     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_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)
-@@ -240,3 +243,4 @@
+@@ -264,3 +267,4 @@
      ENDFOREACH()
    ENDIF()
  ENDIF()
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 0093b0be41f0..fd2f254e6977 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -26,6 +26,7 @@ bin/resolve_stack_dump
 bin/resolveip
 lib/mysql/libmysqld.a
 lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/audit_log.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
@@ -34,10 +35,14 @@ lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_federated.so
 lib/mysql/plugin/libdaemon_example.so
+lib/mysql/plugin/libfnv1a_udf.so
+lib/mysql/plugin/libfnv_udf.so
+lib/mysql/plugin/libmurmur_udf.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/scalability_metrics.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 libexec/mysqld