[Midnightbsd-cvs] mports [15855] trunk/databases/mysql55-server: mysql 5.5.36

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Feb 18 07:41:41 EST 2014 

Revision: 15855
          http://svnweb.midnightbsd.org/mports/?rev=15855
Author:   laffer1
Date:     2014-02-18 07:41:40 -0500 (Tue, 18 Feb 2014)
Log Message:
-----------
mysql 5.5.36

Modified Paths:
--------------
    trunk/databases/mysql55-server/Makefile
    trunk/databases/mysql55-server/distinfo
    trunk/databases/mysql55-server/files/mysql-server.in
    trunk/databases/mysql55-server/files/patch-CMakeLists.txt
    trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
    trunk/databases/mysql55-server/files/patch-sql_CMakeLists.txt

Added Paths:
-----------
    trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
    trunk/databases/mysql55-server/files/patch-sql_sql_trigger.cc
    trunk/databases/mysql55-server/files/patch-sql_sql_view.cc

Modified: trunk/databases/mysql55-server/Makefile
===================================================================
--- trunk/databases/mysql55-server/Makefile	2014-02-18 12:39:25 UTC (rev 15854)
+++ trunk/databases/mysql55-server/Makefile	2014-02-18 12:41:40 UTC (rev 15855)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	mysql
-PORTVERSION=	5.5.30
+PORTVERSION=	5.5.36
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -15,7 +15,7 @@
 
 SLAVEDIRS=	databases/mysql55-client
 USE_CMAKE=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		cmake shebangfix
 
 OPTIONS=	OPENSSL "Enable SSL support" on \
 		FASTMTX "Replace mutexes with spinlocks" off

Modified: trunk/databases/mysql55-server/distinfo
===================================================================
--- trunk/databases/mysql55-server/distinfo	2014-02-18 12:39:25 UTC (rev 15854)
+++ trunk/databases/mysql55-server/distinfo	2014-02-18 12:41:40 UTC (rev 15855)
@@ -1,3 +1,2 @@
-SHA256 (mysql-5.5.30.tar.gz) = 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053
-RMD160 (mysql-5.5.30.tar.gz) = 6d93cf458a732e63e6d2b3939051233bcd0dea0a
-SIZE (mysql-5.5.30.tar.gz) = 24499036
+SHA256 (mysql-5.5.36.tar.gz) = 30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897
+SIZE (mysql-5.5.36.tar.gz) = 21723910

Modified: trunk/databases/mysql55-server/files/mysql-server.in
===================================================================
--- trunk/databases/mysql55-server/files/mysql-server.in	2014-02-18 12:39:25 UTC (rev 15854)
+++ trunk/databases/mysql55-server/files/mysql-server.in	2014-02-18 12:41:40 UTC (rev 15855)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $MidnightBSD$
+# $FreeBSD: head/databases/mysql55-server/files/mysql-server.in 340872 2014-01-24 00:14:07Z mat $
 #
 
 # PROVIDE: mysql
@@ -16,6 +16,8 @@
 #			just before mysql starts.
 # mysql_dbdir (str):	Default to "/var/db/mysql"
 #			Base database directory.
+# mysql_optfile (str):	Server-specific option file.
+#			Default to "${mysql_dbdir}/my.cnf".
 # mysql_pidfile (str):	Custum PID file path and name.
 #			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_args (str):	Custom additional arguments to be passed
@@ -32,17 +34,19 @@
 : ${mysql_enable="NO"}
 : ${mysql_limits="NO"}
 : ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
 
 mysql_create_auth_tables()
 {

Modified: trunk/databases/mysql55-server/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-server/files/patch-CMakeLists.txt	2014-02-18 12:39:25 UTC (rev 15854)
+++ trunk/databases/mysql55-server/files/patch-CMakeLists.txt	2014-02-18 12:41:40 UTC (rev 15855)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2010-12-03 18:58:24.000000000 +0100
-+++ CMakeLists.txt	2010-12-23 18:02:02.000000000 +0100
-@@ -293,7 +293,6 @@
+--- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
++++ CMakeLists.txt	2013-06-12 09:41:06.000000000 +0200
+@@ -306,7 +306,6 @@
  
  ADD_SUBDIRECTORY(extra)
  IF(NOT WITHOUT_SERVER)
@@ -8,7 +8,7 @@
    ADD_SUBDIRECTORY(client)
    ADD_SUBDIRECTORY(sql)
    ADD_SUBDIRECTORY(sql/share)
-@@ -301,14 +300,10 @@
+@@ -314,14 +313,10 @@
    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER) 
     ADD_SUBDIRECTORY(libmysqld)
@@ -23,7 +23,18 @@
    IF(UNIX)
      ADD_SUBDIRECTORY(man)
    ENDIF()
-@@ -343,6 +338,7 @@
+@@ -365,8 +360,10 @@
+ ELSE()
+   SET(CPACK_GENERATOR "TGZ")
+ ENDIF() 
++IF(FALSE)
+ ADD_SUBDIRECTORY(packaging/WiX)
+ ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF() 
+ 
+ # Create a single package with "make package"
+ # (see http://public.kitware.com/Bug/view.php?id=11452)
+@@ -379,6 +376,7 @@
  #
  # RPM installs documentation directly from the source tree
  #
@@ -31,7 +42,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -367,3 +363,4 @@
+@@ -404,3 +402,4 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

Added: trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp	                        (rev 0)
+++ trunk/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp	2014-02-18 12:41:40 UTC (rev 15855)
@@ -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/mysql55-server/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt	2014-02-18 12:39:25 UTC (rev 15854)
+++ trunk/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt	2014-02-18 12:41:40 UTC (rev 15855)
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ libmysql/CMakeLists.txt	2010-12-23 22:01:37.000000000 +0100
-@@ -153,13 +153,14 @@
+--- libmysql/CMakeLists.txt.orig	2013-11-05 07:19:26.000000000 +0000
++++ libmysql/CMakeLists.txt	2013-12-16 14:27:25.505227018 +0000
+@@ -165,7 +165,7 @@
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -8,8 +8,9 @@
 +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
  
  # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+ INSTALL_DEBUG_SYMBOLS(clientlib)
+@@ -174,6 +174,7 @@
+  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
  ENDIF()
  
 +IF(FALSE)
@@ -16,7 +17,7 @@
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -174,9 +175,11 @@
+@@ -188,9 +189,11 @@
    ENDMACRO()
    INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
  ENDIF()
@@ -29,7 +30,7 @@
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -223,3 +226,4 @@
+@@ -237,3 +240,4 @@
      ENDFOREACH()
    ENDIF()
  ENDIF()

Modified: trunk/databases/mysql55-server/files/patch-sql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-server/files/patch-sql_CMakeLists.txt	2014-02-18 12:39:25 UTC (rev 15854)
+++ trunk/databases/mysql55-server/files/patch-sql_CMakeLists.txt	2014-02-18 12:41:40 UTC (rev 15855)
@@ -1,14 +1,14 @@
---- sql/CMakeLists.txt.orig	2010-12-23 17:31:28.000000000 +0100
-+++ sql/CMakeLists.txt	2010-12-23 17:33:36.000000000 +0100
-@@ -245,6 +245,7 @@
+--- sql/CMakeLists.txt.orig	2013-03-25 14:14:58.000000000 +0100
++++ sql/CMakeLists.txt	2013-04-19 14:57:41.000000000 +0200
+@@ -261,6 +261,7 @@ ADD_CUSTOM_TARGET(distclean
  
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
 +IF(FALSE)
- # We need to create empty directories (data/test) the installation.  
- # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
- # Avoid completely empty directories and install dummy file instead.
-@@ -286,6 +287,7 @@
+ # Copy db.opt into data/test/
+ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
+ INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
+@@ -301,6 +302,7 @@ ELSE()
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
  ENDIF()
  ENDIF()

Added: trunk/databases/mysql55-server/files/patch-sql_sql_trigger.cc
===================================================================
--- trunk/databases/mysql55-server/files/patch-sql_sql_trigger.cc	                        (rev 0)
+++ trunk/databases/mysql55-server/files/patch-sql_sql_trigger.cc	2014-02-18 12:41:40 UTC (rev 15855)
@@ -0,0 +1,50 @@
+--- sql/sql_trigger.cc.orig	2012-08-02 00:01:13.000000000 +0200
++++ sql/sql_trigger.cc	2012-09-11 17:01:13.000000000 +0200
+@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
+ {
+   {
+     { C_STRING_WITH_LEN("triggers") },
+-    my_offsetof(class Table_triggers_list, definitions_list),
++    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("sql_modes") },
+-    my_offsetof(class Table_triggers_list, definition_modes_list),
++    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
+     FILE_OPTIONS_ULLLIST
+   },
+   {
+     { C_STRING_WITH_LEN("definers") },
+-    my_offsetof(class Table_triggers_list, definers_list),
++    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("client_cs_names") },
+-    my_offsetof(class Table_triggers_list, client_cs_names),
++    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("connection_cl_names") },
+-    my_offsetof(class Table_triggers_list, connection_cl_names),
++    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
+     FILE_OPTIONS_STRLIST
+   },
+   {
+     { C_STRING_WITH_LEN("db_cl_names") },
+-    my_offsetof(class Table_triggers_list, db_cl_names),
++    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
+     FILE_OPTIONS_STRLIST
+   },
+   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
+@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]=
+ File_option sql_modes_parameters=
+ {
+   { C_STRING_WITH_LEN("sql_modes") },
+-  my_offsetof(class Table_triggers_list, definition_modes_list),
++  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
+   FILE_OPTIONS_ULLLIST
+ };
+ 

Added: trunk/databases/mysql55-server/files/patch-sql_sql_view.cc
===================================================================
--- trunk/databases/mysql55-server/files/patch-sql_sql_view.cc	                        (rev 0)
+++ trunk/databases/mysql55-server/files/patch-sql_sql_view.cc	2014-02-18 12:41:40 UTC (rev 15855)
@@ -0,0 +1,63 @@
+--- sql/sql_view.cc.orig	2012-08-02 00:01:13.000000000 +0200
++++ sql/sql_view.cc	2012-09-11 17:01:13.000000000 +0200
+@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
+ */
+ static File_option view_parameters[]=
+ {{{ C_STRING_WITH_LEN("query")},
+-  my_offsetof(TABLE_LIST, select_stmt),
++  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
+   FILE_OPTIONS_ESTRING},
+  {{ C_STRING_WITH_LEN("md5")},
+-  my_offsetof(TABLE_LIST, md5),
++  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
+   FILE_OPTIONS_STRING},
+  {{ C_STRING_WITH_LEN("updatable")},
+-  my_offsetof(TABLE_LIST, updatable_view),
++  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("algorithm")},
+-  my_offsetof(TABLE_LIST, algorithm),
++  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("definer_user")},
+-  my_offsetof(TABLE_LIST, definer.user),
++  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
+   FILE_OPTIONS_STRING},
+  {{ C_STRING_WITH_LEN("definer_host")},
+-  my_offsetof(TABLE_LIST, definer.host),
++  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
+   FILE_OPTIONS_STRING},
+  {{ C_STRING_WITH_LEN("suid")},
+-  my_offsetof(TABLE_LIST, view_suid),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("with_check_option")},
+-  my_offsetof(TABLE_LIST, with_check),
++  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("timestamp")},
+-  my_offsetof(TABLE_LIST, timestamp),
++  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
+   FILE_OPTIONS_TIMESTAMP},
+  {{ C_STRING_WITH_LEN("create-version")},
+-  my_offsetof(TABLE_LIST, file_version),
++  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
+   FILE_OPTIONS_ULONGLONG},
+  {{ C_STRING_WITH_LEN("source")},
+-  my_offsetof(TABLE_LIST, source),
++  static_cast<int>(my_offsetof(TABLE_LIST, source)),
+   FILE_OPTIONS_ESTRING},
+  {{(char*) STRING_WITH_LEN("client_cs_name")},
+-  my_offsetof(TABLE_LIST, view_client_cs_name),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
+   FILE_OPTIONS_STRING},
+  {{(char*) STRING_WITH_LEN("connection_cl_name")},
+-  my_offsetof(TABLE_LIST, view_connection_cl_name),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
+   FILE_OPTIONS_STRING},
+  {{(char*) STRING_WITH_LEN("view_body_utf8")},
+-  my_offsetof(TABLE_LIST, view_body_utf8),
++  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
+   FILE_OPTIONS_ESTRING},
+  {{NullS, 0},			0,
+   FILE_OPTIONS_STRING}

More information about the Midnightbsd-cvs mailing list