From owner-svn-ports-all@freebsd.org Thu Sep 15 19:47:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD112BDBC38; Thu, 15 Sep 2016 19:47:39 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EFA2D40; Thu, 15 Sep 2016 19:47:39 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8FJlctT035087; Thu, 15 Sep 2016 19:47:38 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8FJlc6T035084; Thu, 15 Sep 2016 19:47:38 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201609151947.u8FJlc6T035084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 15 Sep 2016 19:47:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422222 - in branches/2016Q3/databases/mariadb101-client: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Sep 2016 19:47:39 -0000 Author: brnrd Date: Thu Sep 15 19:47:38 2016 New Revision: 422222 URL: https://svnweb.freebsd.org/changeset/ports/422222 Log: MFH: r418997 databases/mariadb101-client: Update to 10.1.16 - -client was missig from the -server commit - post-install target to post-stage - Delete private headers - Add service_encryption.h patch - Fix scipts/CMakeLists.txt patch PR: 211328 Approved by: ports-secteam (feld) Added: branches/2016Q3/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h - copied unchanged from r418997, head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h Modified: branches/2016Q3/databases/mariadb101-client/Makefile branches/2016Q3/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/mariadb101-client/Makefile ============================================================================== --- branches/2016Q3/databases/mariadb101-client/Makefile Thu Sep 15 18:12:44 2016 (r422221) +++ branches/2016Q3/databases/mariadb101-client/Makefile Thu Sep 15 19:47:38 2016 (r422222) @@ -18,9 +18,10 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes -post-install: +post-stage: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private . for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \ mysqlimport mysqlshow mysqlslap ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b} @@ -32,7 +33,7 @@ post-install: # Fix https://mariadb.atlassian.net/browse/MDEV-9388 @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config -post-install-GSSAPI_NONE: +post-stage-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .include "${MASTERDIR}/Makefile" Copied: branches/2016Q3/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h (from r418997, head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h Thu Sep 15 19:47:38 2016 (r422222, copy of r418997, head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h) @@ -0,0 +1,14 @@ +--- include/mysql/service_encryption.h.orig 2015-12-23 15:33:29 UTC ++++ include/mysql/service_encryption.h +@@ -37,9 +37,11 @@ extern "C" { + #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #include + #else ++#ifndef __FreeBSD__ + #include + #endif + #endif ++#endif + + /* returned from encryption_key_get_latest_version() */ + #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0) Modified: branches/2016Q3/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- branches/2016Q3/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Thu Sep 15 18:12:44 2016 (r422221) +++ branches/2016Q3/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Thu Sep 15 19:47:38 2016 (r422222) @@ -1,4 +1,4 @@ ---- scripts/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC +--- scripts/CMakeLists.txt.orig 2016-07-14 01:10:23 UTC +++ scripts/CMakeLists.txt @@ -73,6 +73,7 @@ IF(UNIX) ) @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -82,6 +83,7 @@ INSTALL(FILES +@@ -83,6 +84,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -134,6 +136,7 @@ ENDIF() +@@ -135,6 +137,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI +@@ -169,6 +172,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -193,6 +197,7 @@ ELSE() +@@ -194,6 +198,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -206,6 +211,7 @@ INSTALL_SCRIPT( +@@ -207,6 +212,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,22 +48,17 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") IF(INSTALL_SYSCONFDIR) -@@ -284,18 +290,8 @@ ELSE() +@@ -294,13 +300,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config -- mysql_fix_extensions - mysql_setpermission - mysql_secure_installation -- mysql_zap mysqlaccess - mysql_convert_table_format mysql_find_rows - mytop - mysqlhotcopy -- mysqldumpslow -- mysqld_multi -- mysqld_safe + ${SERVER_SCRIPTS} ${WSREP_BINARIES} ${SYSTEMD_SCRIPTS} - )