diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-05-06 14:39:59 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-05-06 14:39:59 +0000 |
| commit | f83159f188ed7d4e1b0ed7375af1898a91b93115 (patch) | |
| tree | 6202c20e1750ae483e43d855296c8ffeaa5ace65 /databases/mysql57-server/files/mysql-server.in | |
| parent | net/isboot-kmod: fix build on 11-current (diff) | |
Update to 5.7.12, fixing 31 partially critical vulnerabilities
List of vulnerabilities is documented on:
http://vuxml.freebsd.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html
CVE IDs see below.
PR: 206998
Submitted by: mokhi64@gmail.com (maintainer)
Reviewed by: rootservice@gmail.com
Approved by: mokhi64@gmail.com (maintainer)
MFH: 2016Q2
Security: CVE-2016-0705
CVE-2016-0639
CVE-2015-3194
CVE-2016-0640
CVE-2016-0641
CVE-2016-3461
CVE-2016-2047
CVE-2016-0642
CVE-2016-0643
CVE-2016-0644
CVE-2016-0646
CVE-2016-0647
CVE-2016-0648
CVE-2016-0649
CVE-2016-0650
CVE-2016-0652
CVE-2016-0653
CVE-2016-0654
CVE-2016-0655
CVE-2016-0656
CVE-2016-0657
CVE-2016-0658
CVE-2016-0651
CVE-2016-0659
CVE-2016-0661
CVE-2016-0662
CVE-2016-0663
CVE-2016-0665
CVE-2016-0666
CVE-2016-0667
CVE-2016-0668
Diffstat (limited to 'databases/mysql57-server/files/mysql-server.in')
| -rw-r--r-- | databases/mysql57-server/files/mysql-server.in | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in index ac539a219aa7..1f57e75325b7 100644 --- a/databases/mysql57-server/files/mysql-server.in +++ b/databases/mysql57-server/files/mysql-server.in @@ -14,10 +14,12 @@ # mysql_limits (bool): Set to "NO" by default. # Set it to yes to run `limits -e -U mysql` # just before mysql starts. -# mysql_dbdir (str): Default to "/var/db/mysql" +# mysql_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. +# mysql_confdir (str): Default to "%%ETCDIR%%" +# Base configuration directory. # mysql_optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". +# Default to "${mysql_confdir}/my.cnf". # mysql_pidfile (str): Custum PID file path and name. # Default to "${mysql_dbdir}/${hostname}.pid". # mysql_args (str): Custom additional arguments to be passed @@ -33,30 +35,43 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} +: ${mysql_dbdir="%%MY_DBDIR%%"} +: ${mysql_confdir="%%ETCDIR%%"} +if [ -f "${mysql_dbdir}/my.cnf" ]; then : ${mysql_optfile="${mysql_dbdir}/my.cnf"} +else +: ${mysql_optfile="${mysql_confdir}/my.cnf"} +fi mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} %%PERFSCHEMRC%%" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}" +mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}" mysql_create_auth_tables() { eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} } mysql_prestart() { - if [ ! -d "${mysql_dbdir}/mysql/." ]; then + 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 "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"." + echo "" + fi + + if [ ! -d "${mysql_dbdir}/mysql" ]; then mysql_create_auth_tables || return 1 fi if checkyesno mysql_limits; then |