Date: Mon, 4 Jul 2016 14:59:15 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418033 - in head/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201607041459.u64ExF37039855@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Mon Jul 4 14:59:15 2016 New Revision: 418033 URL: https://svnweb.freebsd.org/changeset/ports/418033 Log: Make my.cnf path correct according to hier(7), bump PORTREVISION PR: 209579 Submitted by: mokhi64@gmail.com Reviewed by: rootservice@gmail.com Modified: head/databases/mysql57-client/Makefile head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc head/databases/mysql57-server/Makefile head/databases/mysql57-server/files/mysql-server.in head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc head/databases/mysql57-server/pkg-message head/databases/mysql57-server/pkg-plist Modified: head/databases/mysql57-client/Makefile ============================================================================== --- head/databases/mysql57-client/Makefile Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-client/Makefile Mon Jul 4 14:59:15 2016 (r418033) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 0 +PORTREVISION?= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc ============================================================================== --- head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Mon Jul 4 14:59:15 2016 (r418033) @@ -9,18 +9,48 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -1409,7 +1409,10 @@ static const char **init_default_directo +@@ -909,6 +909,14 @@ + return 1; /* Ignore wrong files */ + } - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) ++ if (strstr(name, "/etc") == name) + { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; + } - #endif /* DEFAULT_SYSCONFDIR */ ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1245,7 +1253,8 @@ + end[(strlen(end)-1)] = ' '; + else + strxmov(end, conf_file, *ext , " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1404,13 +1413,8 @@ + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); +- +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); #endif -@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f + +@@ -1480,7 +1484,7 @@ MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-server/Makefile Mon Jul 4 14:59:15 2016 (r418033) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.13 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server @@ -51,7 +51,6 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ - -DSYSCONFDIR="${ETCDIR}" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ Modified: head/databases/mysql57-server/files/mysql-server.in ============================================================================== --- head/databases/mysql57-server/files/mysql-server.in Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-server/files/mysql-server.in Mon Jul 4 14:59:15 2016 (r418033) @@ -64,9 +64,11 @@ mysql_prestart() { if [ -f "${mysql_dbdir}/my.cnf" ]; then echo "" - echo "Please keep in mind that the default location for my.cnf will be changed" - echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near" - echo "future. If you do not want to move your my.cnf to the new location then" + echo "Please keep in mind that the default location for my.cnf has changed" + echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\". " + echo "Please merge your existing my.cnf with the new default and move" + echo "it to \"%%ETCDIR%%/my.cnf\"." + echo "If you do not want to move your my.cnf to the new location then" echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"." echo "" fi Modified: head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc ============================================================================== --- head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Mon Jul 4 14:59:15 2016 (r418033) @@ -9,18 +9,48 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -1409,7 +1409,10 @@ static const char **init_default_directo +@@ -909,6 +909,14 @@ + return 1; /* Ignore wrong files */ + } - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) ++ if (strstr(name, "/etc") == name) + { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; + } - #endif /* DEFAULT_SYSCONFDIR */ ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1245,7 +1253,8 @@ + end[(strlen(end)-1)] = ' '; + else + strxmov(end, conf_file, *ext , " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1404,13 +1413,8 @@ + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); +- +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); #endif -@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f + +@@ -1480,7 +1484,7 @@ MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) Modified: head/databases/mysql57-server/pkg-message ============================================================================== --- head/databases/mysql57-server/pkg-message Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-server/pkg-message Mon Jul 4 14:59:15 2016 (r418033) @@ -11,9 +11,10 @@ in /root/.mysql_secret ***************************************************************************** -Please keep in mind that the default location for my.cnf will be changed -from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near -future. If you do not want to move your my.cnf to the new location then -you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf". +The default location for my.cnf has changed from "/var/db/mysql/my.cnf" to +"/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged manually +with the new default and moved to the new location. To continue using the +my.cnf file at the old location, set "mysql_optfile" in /etc/rc.conf to +point to the location of the existing my.cnf file. ***************************************************************************** Modified: head/databases/mysql57-server/pkg-plist ============================================================================== --- head/databases/mysql57-server/pkg-plist Mon Jul 4 14:42:07 2016 (r418032) +++ head/databases/mysql57-server/pkg-plist Mon Jul 4 14:59:15 2016 (r418033) @@ -62,6 +62,8 @@ lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so +lib/mysql/plugin/keyring_udf.so +lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607041459.u64ExF37039855>