[Midnightbsd-cvs] mports [17363] trunk/databases/mysql55-server: mysql 5.5.39
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 17 08:21:07 EDT 2014
Revision: 17363
http://svnweb.midnightbsd.org/mports/?rev=17363
Author: laffer1
Date: 2014-09-17 08:21:07 -0400 (Wed, 17 Sep 2014)
Log Message:
-----------
mysql 5.5.39
Modified Paths:
--------------
trunk/databases/mysql55-server/Makefile
trunk/databases/mysql55-server/distinfo
trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
trunk/databases/mysql55-server/pkg-plist
Removed Paths:
-------------
trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
Modified: trunk/databases/mysql55-server/Makefile
===================================================================
--- trunk/databases/mysql55-server/Makefile 2014-09-17 12:19:17 UTC (rev 17362)
+++ trunk/databases/mysql55-server/Makefile 2014-09-17 12:21:07 UTC (rev 17363)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.5.36
+PORTVERSION= 5.5.39
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -14,7 +14,7 @@
LICENSE= gpl2
SLAVEDIRS= databases/mysql55-client
-USES= cmake shebangfix
+USES= cmake readline shebangfix
NO_OPTIONS_SORT=yes
OPTIONS_DEFINE= SSL FASTMTX
Modified: trunk/databases/mysql55-server/distinfo
===================================================================
--- trunk/databases/mysql55-server/distinfo 2014-09-17 12:19:17 UTC (rev 17362)
+++ trunk/databases/mysql55-server/distinfo 2014-09-17 12:21:07 UTC (rev 17363)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.36.tar.gz) = 30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897
-SIZE (mysql-5.5.36.tar.gz) = 21723910
+SHA256 (mysql-5.5.39.tar.gz) = 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862
+SIZE (mysql-5.5.39.tar.gz) = 21713567
Deleted: trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-09-17 12:19:17 UTC (rev 17362)
+++ trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-09-17 12:21:07 UTC (rev 17363)
@@ -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
-
Deleted: trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
===================================================================
--- trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp 2014-09-17 12:19:17 UTC (rev 17362)
+++ trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp 2014-09-17 12:21:07 UTC (rev 17363)
@@ -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;
Modified: trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt 2014-09-17 12:19:17 UTC (rev 17362)
+++ trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt 2014-09-17 12:21:07 UTC (rev 17363)
@@ -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()
Modified: trunk/databases/mysql55-server/pkg-plist
===================================================================
--- trunk/databases/mysql55-server/pkg-plist 2014-09-17 12:19:17 UTC (rev 17362)
+++ trunk/databases/mysql55-server/pkg-plist 2014-09-17 12:21:07 UTC (rev 17363)
@@ -24,6 +24,7 @@
bin/replace
bin/resolve_stack_dump
bin/resolveip
+lib/mysql/libmysqld.a
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth.so
lib/mysql/plugin/auth_test_plugin.so
@@ -39,8 +40,34 @@
lib/mysql/plugin/qa_auth_server.so
lib/mysql/plugin/semisync_master.so
lib/mysql/plugin/semisync_slave.so
-lib/libmysqld.a
libexec/mysqld
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_convert_table_format.1.gz
+man/man1/mysql_fix_extensions.1.gz
+man/man1/mysql_install_db.1.gz
+man/man1/mysql_plugin.1.gz
+man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_setpermission.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_upgrade.1.gz
+man/man1/mysql_zap.1.gz
+man/man1/mysqlbug.1.gz
+man/man1/mysqld_multi.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqldumpslow.1.gz
+man/man1/mysqlhotcopy.1.gz
+man/man1/mysqlman.1.gz
+man/man1/mysqltest.1.gz
+man/man1/perror.1.gz
+man/man1/replace.1.gz
+man/man1/resolve_stack_dump.1.gz
+man/man1/resolveip.1.gz
+man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
@@ -109,7 +136,7 @@
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
- at dirrmtry lib/mysql/plugin
+ at dirrm lib/mysql/plugin
@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
More information about the Midnightbsd-cvs
mailing list