From owner-svn-ports-head@freebsd.org Sat Oct 27 15:06:57 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F405310884A3; Sat, 27 Oct 2018 15:06:56 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A57686DAD6; Sat, 27 Oct 2018 15:06:56 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78B7D11EC6; Sat, 27 Oct 2018 15:06:56 +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 w9RF6u4c056572; Sat, 27 Oct 2018 15:06:56 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9RF6tWn056566; Sat, 27 Oct 2018 15:06:55 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810271506.w9RF6tWn056566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 27 Oct 2018 15:06:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483143 - in head/databases: mariadb103-client mariadb103-client/files mariadb103-server mariadb103-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases: mariadb103-client mariadb103-client/files mariadb103-server mariadb103-server/files X-SVN-Commit-Revision: 483143 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2018 15:06:57 -0000 Author: brnrd Date: Sat Oct 27 15:06:54 2018 New Revision: 483143 URL: https://svnweb.freebsd.org/changeset/ports/483143 Log: databases/mariadb103-server: Fix plist issues - Resurect mysql_upgrade [1] - Move some files between -client and -server PR: 232735 [1] Reported by: Naram Qashat [1] MFH: 2018Q4 Added: head/databases/mariadb103-client/files/patch-MDEV-11790 (contents, props changed) head/databases/mariadb103-server/files/patch-MDEV-11790 (contents, props changed) Modified: head/databases/mariadb103-client/Makefile head/databases/mariadb103-client/pkg-plist head/databases/mariadb103-server/Makefile head/databases/mariadb103-server/pkg-plist Modified: head/databases/mariadb103-client/Makefile ============================================================================== --- head/databases/mariadb103-client/Makefile Sat Oct 27 14:49:17 2018 (r483142) +++ head/databases/mariadb103-client/Makefile Sat Oct 27 15:06:54 2018 (r483143) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mariadb -PORTREVISION= 0 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) @@ -22,14 +21,16 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes +CONFLICTS_INSTALL= databases/mytop + post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: - ${RM} -r ${STAGEDIR}${DATADIR}/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server + ${RM} -r ${STAGEDIR}${DATADIR} + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so Added: head/databases/mariadb103-client/files/patch-MDEV-11790 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb103-client/files/patch-MDEV-11790 Sat Oct 27 15:06:54 2018 (r483143) @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} Modified: head/databases/mariadb103-client/pkg-plist ============================================================================== --- head/databases/mariadb103-client/pkg-plist Sat Oct 27 14:49:17 2018 (r483142) +++ head/databases/mariadb103-client/pkg-plist Sat Oct 27 15:06:54 2018 (r483143) @@ -2,25 +2,23 @@ bin/mariadb_config bin/msql2mysql bin/mysql bin/mysql_config +bin/mysql_convert_table_format bin/mysql_find_rows -@comment bin/mysql_install_db +bin/mysql_setpermission @comment bin/mysql_plugin -@comment bin/mysql_secure_installation bin/mysql_waitpid -@comment bin/mysqld_safe_helper bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump +bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -@comment bin/mytop -@comment bin/perror -@comment bin/resolve_stack_dump -@comment bin/resolveip +bin/mytop +bin/replace @comment bin/wsrep_sst_rsync_wan include/mysql/errmsg.h include/mysql/ma_list.h @@ -91,7 +89,7 @@ man/man1/mysql_plugin.1.gz @comment 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 +@comment man/man1/mysql_upgrade.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqlaccess.1.gz man/man1/mysqladmin.1.gz @@ -112,7 +110,6 @@ man/man1/mysqltest_embedded.1.gz man/man1/replace.1.gz @comment man/man1/resolve_stack_dump.1.gz @comment man/man1/resolveip.1.gz -@comment man/man1/tokuft_logdump.1.gz man/man1/tokuft_logprint.1.gz @comment man/man1/tokuftdump.1.gz @comment man/man1/wsrep_sst_common.1.gz @@ -124,46 +121,4 @@ man/man1/tokuft_logprint.1.gz @comment man/man1/wsrep_sst_xtrabackup.1.gz @comment man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 -%%DATADIR%%/charsets/Index.xml -%%DATADIR%%/charsets/README -%%DATADIR%%/charsets/armscii8.xml -%%DATADIR%%/charsets/ascii.xml -%%DATADIR%%/charsets/cp1250.xml -%%DATADIR%%/charsets/cp1251.xml -%%DATADIR%%/charsets/cp1256.xml -%%DATADIR%%/charsets/cp1257.xml -%%DATADIR%%/charsets/cp850.xml -%%DATADIR%%/charsets/cp852.xml -%%DATADIR%%/charsets/cp866.xml -%%DATADIR%%/charsets/dec8.xml -%%DATADIR%%/charsets/geostd8.xml -%%DATADIR%%/charsets/greek.xml -%%DATADIR%%/charsets/hebrew.xml -%%DATADIR%%/charsets/hp8.xml -%%DATADIR%%/charsets/keybcs2.xml -%%DATADIR%%/charsets/koi8r.xml -%%DATADIR%%/charsets/koi8u.xml -%%DATADIR%%/charsets/latin1.xml -%%DATADIR%%/charsets/latin2.xml -%%DATADIR%%/charsets/latin5.xml -%%DATADIR%%/charsets/latin7.xml -%%DATADIR%%/charsets/macce.xml -%%DATADIR%%/charsets/macroman.xml -%%DATADIR%%/charsets/swe7.xml -@comment %%DATADIR%%/binary-configure -@comment %%DATADIR%%/fill_help_tables.sql -@comment %%DATADIR%%/magic -@comment %%DATADIR%%/maria_add_gis_sp.sql -@comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql -@comment %%DATADIR%%/mysql-log-rotate -@comment %%DATADIR%%/mysql.server -@comment %%DATADIR%%/mysql_performance_tables.sql -@comment %%DATADIR%%/mysql_system_tables.sql -@comment %%DATADIR%%/mysql_system_tables_data.sql -@comment %%DATADIR%%/mysql_test_data_timezone.sql -@comment %%DATADIR%%/mysql_test_db.sql -@comment %%DATADIR%%/mysql_to_mariadb.sql -@comment %%DATADIR%%/mysqld_multi.server -@comment %%DATADIR%%/wsrep.cnf -@comment %%DATADIR%%/wsrep_notify share/pkgconfig/mariadb.pc Modified: head/databases/mariadb103-server/Makefile ============================================================================== --- head/databases/mariadb103-server/Makefile Sat Oct 27 14:49:17 2018 (r483142) +++ head/databases/mariadb103-server/Makefile Sat Oct 27 15:06:54 2018 (r483143) @@ -3,7 +3,7 @@ PORTNAME?= mariadb PORTVERSION= 10.3.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -175,7 +175,6 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private - ${RM} -r ${STAGEDIR}${DATADIR}/charsets .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) Added: head/databases/mariadb103-server/files/patch-MDEV-11790 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb103-server/files/patch-MDEV-11790 Sat Oct 27 15:06:54 2018 (r483143) @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} Modified: head/databases/mariadb103-server/pkg-plist ============================================================================== --- head/databases/mariadb103-server/pkg-plist Sat Oct 27 14:49:17 2018 (r483142) +++ head/databases/mariadb103-server/pkg-plist Sat Oct 27 15:06:54 2018 (r483143) @@ -25,8 +25,8 @@ bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation @comment bin/mysql_setpermission -@comment bin/mysql_tzinfo_to_sql -@comment bin/mysql_upgrade +bin/mysql_tzinfo_to_sql +bin/mysql_upgrade @comment bin/mysqlaccess bin/mysqld_multi bin/mysqld_safe @@ -36,7 +36,7 @@ bin/mysqldumpslow @comment bin/mysqltest @comment bin/mysqltest_embedded @comment bin/mytop -@comment bin/perror +bin/perror @comment bin/replace bin/resolve_stack_dump bin/resolveip @@ -222,14 +222,14 @@ man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_tzinfo_to_sql.1.gz -@comment man/man1/mysql_upgrade.1.gz +man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqltest.1.gz -@comment man/man1/perror.1.gz +man/man1/perror.1.gz @comment man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz @@ -261,6 +261,32 @@ man/man8/mysqld.8.gz %%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys