diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2014-03-31 12:29:12 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2014-03-31 12:29:12 +0000 |
| commit | b6efe925db6c4141e7497b48bf7b53d4ee36cec2 (patch) | |
| tree | ede0f650f2bba546875939397466e67ad31f8148 /databases | |
| parent | 204ad20ce0e74d24652b85ca2dd1431494111c27 (diff) | |
| download | ports-b6efe925db6c4141e7497b48bf7b53d4ee36cec2.tar.gz ports-b6efe925db6c4141e7497b48bf7b53d4ee36cec2.zip | |
Update to 5.6.17 release.
Notes
Notes:
svn path=/head/; revision=349741
Diffstat (limited to 'databases')
6 files changed, 3 insertions, 47 deletions
diff --git a/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp deleted file mode 100644 index ef8bb0670f75..000000000000 --- a/databases/mysql56-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/mysql56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mysql56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp deleted file mode 100644 index e94bf77c990d..000000000000 --- a/databases/mysql56-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/mysql56-server/Makefile b/databases/mysql56-server/Makefile index cccce37d3852..e788122079df 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.16 +PORTVERSION= 5.6.17 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo index 4eb476f30c3d..f75c3023ca39 100644 --- a/databases/mysql56-server/distinfo +++ b/databases/mysql56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.16.tar.gz) = 70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 -SIZE (mysql-5.6.16.tar.gz) = 32821451 +SHA256 (mysql-5.6.17.tar.gz) = f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b +SIZE (mysql-5.6.17.tar.gz) = 32862539 diff --git a/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp deleted file mode 100644 index ef8bb0670f75..000000000000 --- a/databases/mysql56-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/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp deleted file mode 100644 index e94bf77c990d..000000000000 --- a/databases/mysql56-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; |