Index: head/databases/percona56-server/Makefile =================================================================== --- head/databases/percona56-server/Makefile (revision 320207) +++ head/databases/percona56-server/Makefile (revision 320208) @@ -1,98 +1,100 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.10-alpha60.2 +DISTVERSION= 5.6.11-rc60.3 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/ PKGNAMESUFFIX?= -server -DISTNAME= Percona-Server-5.6.10-alpha60.2 +DISTNAME= Percona-Server-5.6.11-rc60.3 MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona56-client USES= bison cmake MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= OPENSSL FASTMTX OPTIONS_DEFAULT= OPENSSL FASTMTX_DESC= Replace mutexes with spinlocks DATADIR= ${PREFIX}/share/mysql USE_LDCONFIG= ${PREFIX}/lib/mysql CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DHAVE_PAM=0 .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .include .if ${PORT_OPTIONS:MOPENSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 56p LATEST_LINK= percona56-server CONFLICTS_INSTALL= mysql-server-[345].* percona-server-5.[0-57-9].* mariadb-server-[0-9].* USE_RC_SUBR= mysql-server 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 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 + +MAN8= mysqld.8 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: .if !defined(PACKAGE_BUILDING) @${CAT} ${PKGMESSAGE} .endif .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .include Index: head/databases/percona56-server/distinfo =================================================================== --- head/databases/percona56-server/distinfo (revision 320207) +++ head/databases/percona56-server/distinfo (revision 320208) @@ -1,2 +1,2 @@ -SHA256 (Percona-Server-5.6.10-alpha60.2.tar.gz) = 25d0e4d309dd9dd6ac6b35363b5c02aa44a5263e46f7b28e4b05a846dbc24eff -SIZE (Percona-Server-5.6.10-alpha60.2.tar.gz) = 32654985 +SHA256 (Percona-Server-5.6.11-rc60.3.tar.gz) = 8f8626811087eb177561c16870d290a41a0950edd9ac02f9bbab73ff01786921 +SIZE (Percona-Server-5.6.11-rc60.3.tar.gz) = 33327340 Index: head/databases/percona56-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/percona56-server/files/patch-client_CMakeLists.txt (revision 320207) +++ head/databases/percona56-server/files/patch-client_CMakeLists.txt (revision 320208) @@ -1,65 +1,65 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 14:47:51.000000000 +0100 +--- client/CMakeLists.txt.orig 2013-06-03 00:02:34.000000000 +0200 ++++ client/CMakeLists.txt 2013-06-06 00:49:27.110952603 +0200 @@ -33,17 +33,20 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) @@ -52,17 +55,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) @@ -75,6 +82,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) @@ -84,11 +92,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade - mysqlcheck - mysqldump - mysqlimport - mysqlshow - mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Property changes on: head/databases/percona56-server/files/patch-client_CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt (revision 320207) +++ head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt (revision 320208) @@ -1,36 +1,40 @@ ---- 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-06-03 00:02:34.000000000 +0200 ++++ libmysql/CMakeLists.txt 2013-06-06 00:54:32.603753815 +0200 +@@ -173,13 +173,14 @@ + ENDIF() # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) +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) ENDIF() +IF(FALSE) IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -194,13 +195,15 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${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 several convenience libraries into one big mysqlclient + # and link them together into shared library. + 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) -@@ -223,3 +226,4 @@ +@@ -252,3 +255,4 @@ ENDFOREACH() ENDIF() ENDIF() +ENDIF() Property changes on: head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/percona56-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/percona56-server/files/patch-sql_CMakeLists.txt (revision 320207) +++ head/databases/percona56-server/files/patch-sql_CMakeLists.txt (revision 320208) @@ -1,18 +1,18 @@ ---- 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-06-03 00:02:34.000000000 +0200 ++++ sql/CMakeLists.txt 2013-06-06 00:56:54.121744790 +0200 +@@ -430,6 +430,7 @@ 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) +@@ -474,6 +475,7 @@ INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF() ENDIF() +ENDIF() ADD_CUSTOM_TARGET(show-dist-name COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" Property changes on: head/databases/percona56-server/files/patch-sql_CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/percona56-server/files/patch-sql_mysqld.cc =================================================================== --- head/databases/percona56-server/files/patch-sql_mysqld.cc (revision 320207) +++ head/databases/percona56-server/files/patch-sql_mysqld.cc (revision 320208) @@ -1,20 +1,11 @@ ---- sql/mysqld.cc.orig 2013-03-05 00:04:54.000000000 +0100 -+++ sql/mysqld.cc 2013-03-18 09:55:35.499120018 +0100 -@@ -6291,7 +6291,7 @@ +--- sql/mysqld.cc.orig 2013-06-03 00:02:34.000000000 +0200 ++++ sql/mysqld.cc 2013-06-06 00:57:21.510741832 +0200 +@@ -6422,7 +6422,7 @@ #ifdef HAVE_LIBWRAP { - if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock)) + if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock)) { struct request_info req; signal(SIGCHLD, SIG_DFL); -@@ -6323,7 +6323,7 @@ - The connection was refused by TCP wrappers. - There are no details (by client IP) available to update the host_cache. - */ -- statistic_increment(connection_tcpwrap_errors, &LOCK_status); -+ statistic_increment(connection_errors_tcpwrap, &LOCK_status); - continue; - } - }