[Midnightbsd-cvs] mports [15844] trunk/databases: mysql 5.6.16
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Feb 4 22:16:08 EST 2014
Revision: 15844
http://svnweb.midnightbsd.org/mports/?rev=15844
Author: laffer1
Date: 2014-02-04 22:16:06 -0500 (Tue, 04 Feb 2014)
Log Message:
-----------
mysql 5.6.16
Modified Paths:
--------------
trunk/databases/mysql56-client/files/patch-CMakeLists.txt
trunk/databases/mysql56-server/Makefile
trunk/databases/mysql56-server/distinfo
Added Paths:
-----------
trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
trunk/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc
Modified: trunk/databases/mysql56-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-CMakeLists.txt 2014-02-04 23:53:32 UTC (rev 15843)
+++ trunk/databases/mysql56-client/files/patch-CMakeLists.txt 2014-02-05 03:16:06 UTC (rev 15844)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100
-@@ -378,31 +378,11 @@
+--- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000
++++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000
+@@ -458,33 +458,11 @@
ENDIF()
ADD_SUBDIRECTORY(extra)
@@ -28,6 +28,8 @@
- ADD_SUBDIRECTORY(internal)
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-uln)
+- ADD_SUBDIRECTORY(packaging/rpm-oel)
+- ADD_SUBDIRECTORY(packaging/rpm-fedora)
-ENDIF()
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices)
@@ -37,7 +39,7 @@
INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
-@@ -439,7 +419,6 @@
+@@ -521,18 +499,17 @@
SET(CPACK_GENERATOR "TGZ")
ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
@@ -45,9 +47,8 @@
# Create a single package with "make package"
# (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -447,11 +426,11 @@
+ SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- INCLUDE(CPack)
IF(UNIX)
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
ENDIF()
@@ -58,8 +59,10 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -477,3 +456,4 @@
+@@ -558,5 +535,6 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
+
+ INCLUDE(CPack)
Added: trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp (rev 0)
+++ trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-02-05 03:16:06 UTC (rev 15844)
@@ -0,0 +1,11 @@
+--- 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
+
Modified: trunk/databases/mysql56-server/Makefile
===================================================================
--- trunk/databases/mysql56-server/Makefile 2014-02-04 23:53:32 UTC (rev 15843)
+++ trunk/databases/mysql56-server/Makefile 2014-02-05 03:16:06 UTC (rev 15844)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.14
+PORTVERSION= 5.6.15
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -53,8 +53,6 @@
USERS= mysql
GROUPS= mysql
-INFO= mysql
-
MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
Modified: trunk/databases/mysql56-server/distinfo
===================================================================
--- trunk/databases/mysql56-server/distinfo 2014-02-04 23:53:32 UTC (rev 15843)
+++ trunk/databases/mysql56-server/distinfo 2014-02-05 03:16:06 UTC (rev 15844)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.14.tar.gz) = 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7
-SIZE (mysql-5.6.14.tar.gz) = 36005278
+SHA256 (mysql-5.6.15.tar.gz) = f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7
+SIZE (mysql-5.6.15.tar.gz) = 32794954
Added: trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp (rev 0)
+++ trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-02-05 03:16:06 UTC (rev 15844)
@@ -0,0 +1,11 @@
+--- 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
+
Added: trunk/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc
===================================================================
--- trunk/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc (rev 0)
+++ trunk/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc 2014-02-05 03:16:06 UTC (rev 15844)
@@ -0,0 +1,11 @@
+--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000
++++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000
+@@ -16,6 +16,8 @@
+ #include <my_sys.h>
+ #include <string>
+ #include <mysql/plugin_validate_password.h>
++/* solve clash between libc++ bitset::test() and test macro from my_global.h */
++#undef test
+ #include <set>
+ #include <iostream>
+ #include <fstream>
More information about the Midnightbsd-cvs
mailing list