Date: Tue, 13 Sep 2016 07:44:59 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r421984 - in branches/2016Q3/databases/percona56-server: . files Message-ID: <201609130744.u8D7ixQ8048423@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Tue Sep 13 07:44:59 2016 New Revision: 421984 URL: https://svnweb.freebsd.org/changeset/ports/421984 Log: MFH: r419995 r420978 - Update to 5.6.31-77.0 [1] - fix TOKUDB option PR: 209785 [1] Submitted by: Thomas Babut Update to 5.6.32-78.0 PR: 212169 Submitted by: Thomas Babut Approved by: ports-secteam (feld) (only r420978 but r419995 is a prerequisite) Modified: branches/2016Q3/databases/percona56-server/Makefile branches/2016Q3/databases/percona56-server/distinfo branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb branches/2016Q3/databases/percona56-server/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/percona56-server/Makefile ============================================================================== --- branches/2016Q3/databases/percona56-server/Makefile Tue Sep 13 07:38:27 2016 (r421983) +++ branches/2016Q3/databases/percona56-server/Makefile Tue Sep 13 07:44:59 2016 (r421984) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.29-76.2 +DISTVERSION= 5.6.32-78.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ @@ -19,17 +19,15 @@ USES= bison cmake perl5 shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED -OPTIONS_SUB= yes +OPTIONS_SUB= yes FASTMTX_DESC= Replace mutexes with spinlocks -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 -INNODBMEMCACHED_DESC= InnoDB Memcached plugin -INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1 -OPENSSL_CMAKE_ON= -DWITH_SSL=bundled +FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +INNODBMEMCACHED_DESC= InnoDB Memcached plugin +INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 +OPENSSL_CMAKE_ON= -DWITH_SSL=bundled TOKUDB_DESC= TokuDB Engine (experimental) -TOKUDB_CMAKE_ON=-DUSE_CTAGS=0 -TOKUDB_VARS= ONLY_FOR_ARCHS="amd64" \ - ONLY_FOR_ARCHS_REASON="TokuDB engine does not compile on ${ARCH}" +TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb DATADIR= ${PREFIX}/share/mysql @@ -59,11 +57,9 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.s .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif - # MySQL-Server part .if !defined(CLIENT_ONLY) -USE_MYSQL= yes -WANT_MYSQL_VER= 56p +USES+=mysql:56p CONFLICTS_INSTALL= mysql*-server-* \ mariadb*-server-* \ @@ -101,4 +97,16 @@ post-patch: BROKEN= Does not compile on arm .endif +.if ${PORT_OPTIONS:MTOKUDB} +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ + https://github.com/percona/PerconaFT/blob/master/README.md + +.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 +IGNORE= unsupported on FreeBSD 9 or older +.endif + +.endif + + .include <bsd.port.post.mk> Modified: branches/2016Q3/databases/percona56-server/distinfo ============================================================================== --- branches/2016Q3/databases/percona56-server/distinfo Tue Sep 13 07:38:27 2016 (r421983) +++ branches/2016Q3/databases/percona56-server/distinfo Tue Sep 13 07:44:59 2016 (r421984) @@ -1,2 +1,3 @@ -SHA256 (percona-server-5.6.29-76.2.tar.gz) = 23217feafc92222f313aeeb6e1806d110c35e50cf0b5f74510a9f8babe22e4b9 -SIZE (percona-server-5.6.29-76.2.tar.gz) = 55032788 +TIMESTAMP = 1472237462 +SHA256 (percona-server-5.6.32-78.0.tar.gz) = b3f9191dd8660ba4f825c5fa8fa470e66417335ad8455e31bbc2d5f2cac1a923 +SIZE (percona-server-5.6.32-78.0.tar.gz) = 55120585 Modified: branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb ============================================================================== --- branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb Tue Sep 13 07:38:27 2016 (r421983) +++ branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb Tue Sep 13 07:44:59 2016 (r421984) @@ -60,3 +60,33 @@ va_end(op); return real_open(file, oflag, mode); } else { +--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-06-30 13:35:08.000000000 +0200 ++++ storage/tokudb/PerconaFT/CMakeLists.txt 2016-07-29 23:07:37.871068000 +0200 +@@ -82,7 +82,7 @@ + + install( + FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS +- DESTINATION . ++ DESTINATION ${INSTALL_DOCDIR} + COMPONENT tokukv_misc + ) + +--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-07-29 23:30:26.557847000 +0200 ++++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-07-29 23:30:32.695950000 +0200 +@@ -1,6 +1,6 @@ + set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "") + +-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh + out=$1; shift + exec \"$@\" >$out") + +@@ -8,7 +8,7 @@ + set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h" +- COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb> ++ COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb> + DEPENDS make_tdb) + add_custom_target(install_tdb_h DEPENDS + "${CMAKE_CURRENT_BINARY_DIR}/db.h") Modified: branches/2016Q3/databases/percona56-server/pkg-plist ============================================================================== --- branches/2016Q3/databases/percona56-server/pkg-plist Tue Sep 13 07:38:27 2016 (r421983) +++ branches/2016Q3/databases/percona56-server/pkg-plist Tue Sep 13 07:44:59 2016 (r421984) @@ -25,6 +25,7 @@ bin/resolve_stack_dump bin/resolveip %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump +%%TOKUDB%%include/backup.h %%TOKUDB%%lib/mysql/libHotBackup.so lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so @@ -49,6 +50,7 @@ lib/mysql/plugin/query_response_time.so lib/mysql/plugin/scalability_metrics.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/test_udf_services.so %%TOKUDB%%lib/mysql/plugin/tokudb_backup.so lib/mysql/plugin/validate_password.so libexec/mysqld @@ -79,6 +81,10 @@ man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz +%%TOKUDB%%share/doc/mysql/COPYING.AGPLv3 +%%TOKUDB%%share/doc/mysql/COPYING.GPLv2 +%%TOKUDB%%share/doc/mysql/PATENTS +%%TOKUDB%%share/doc/mysql/README.md %%TOKUDB%%share/doc/mysql/README_tokudb_backup %%DATADIR%%/binary-configure %%DATADIR%%/bulgarian/errmsg.sys
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609130744.u8D7ixQ8048423>