Attachment 170406 Details for Bug 209512 – fix my.cnf perms and restores my.cnf search paths

[patch] fix my.cnf perms and restores my.cnf search paths

bug209512.diff (text/plain), 4.26 KB, created by Markus Kohlmeyer on 2016-05-17 13:28:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-05-17 13:28:02 UTC

Size: 4.26 KB

patch

obsolete

>diff -Naur UPDATING UPDATING
>--- UPDATING	2016-05-17 14:02:17.527385000 +0200
>+++ UPDATING	2016-05-17 14:44:07.167788000 +0200
>@@ -5,6 +5,15 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20160517:
>+  AFFECTS: users of databases/mysql57-(server|client)
>+  AUTHOR: rootservice@gmail.com
>+
>+  Please keep in mind that the default location for my.cnf has been changed
>+  to "/usr/local/etc/mysql/my.cnf". If you do not want to move your existing
>+  my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf
>+  to the location of your my.cnf before (re)starting MySQL.
>+
> 20160511:
>   AFFECTS: Users of audio/clementine-player
>   AUTHOR: sbruno@FreeBSD.org
>diff -Naur databases/mysql57-server/Makefile databases/mysql57-server/Makefile
>--- databases/mysql57-server/Makefile	2016-05-17 14:03:26.590829000 +0200
>+++ databases/mysql57-server/Makefile	2016-05-17 14:06:23.765228000 +0200
>@@ -51,8 +51,6 @@
> 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
>-		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
>-		-DSYSCONFDIR="${ETCDIR}" \
> 		-DWITH_BOOST="${WRKSRC}/boost" \
> 		-DWITH_EDITLINE=system \
> 		-DWITH_LIBEVENT=system \
>diff -Naur databases/mysql57-server/files/mysql-server.in databases/mysql57-server/files/mysql-server.in
>--- databases/mysql57-server/files/mysql-server.in	2016-05-17 14:03:26.592663000 +0200
>+++ databases/mysql57-server/files/mysql-server.in	2016-05-17 14:21:04.067596000 +0200
>@@ -62,12 +62,20 @@
> 
> mysql_prestart()
> {
>+	if [ -f "/usr/local/etc/my.cnf" ]; then
>+		echo ""
>+		echo "Please keep in mind that the default location for my.cnf has been changed"
>+		echo "to \"/usr/local/etc/mysql/my.cnf\". If you do not want to move your existing"
>+		echo "my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf"
>+		echo "to the location of your my.cnf before (re)starting MySQL."
>+		echo ""
>+	fi
> 	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 "Please keep in mind that the default location for my.cnf has been changed"
>+		echo "to \"/usr/local/etc/mysql/my.cnf\". If you do not want to move your existing"
>+		echo "my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf"
>+		echo "to the location of your my.cnf before (re)starting MySQL."
> 		echo ""
> 	fi
> 
>diff -Naur databases/mysql57-server/pkg-message databases/mysql57-server/pkg-message
>--- databases/mysql57-server/pkg-message	2016-05-17 14:03:26.612923000 +0200
>+++ databases/mysql57-server/pkg-message	2016-05-17 14:18:33.179428000 +0200
>@@ -11,9 +11,9 @@
> 
> *****************************************************************************
> 
>-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".
>+Please keep in mind that the default location for my.cnf has been changed
>+to "/usr/local/etc/mysql/my.cnf". If you do not want to move your existing
>+my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf
>+to the location of your my.cnf before (re)starting MySQL.
> 
> *****************************************************************************
>diff -Naur databases/mysql57-server/pkg-plist databases/mysql57-server/pkg-plist
>--- databases/mysql57-server/pkg-plist	2016-05-17 14:03:26.613459000 +0200
>+++ databases/mysql57-server/pkg-plist	2016-05-17 14:40:14.070390000 +0200
>@@ -153,7 +153,7 @@
> %%DATADIR%%/swedish/errmsg.sys
> %%DATADIR%%/ukrainian/errmsg.sys
> %%DATADIR%%/uninstall_rewriter.sql
>-@sample(root,wheel,0640) %%ETCDIR%%/my.cnf.sample
>-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
>+@sample(root,wheel,0644) etc/mysql/my.cnf.sample
>+@dir(mysql,mysql,0750) etc/mysql/keyring
> @dir(mysql,mysql,0750) %%MY_SECDIR%%
> @dir(mysql,mysql,0750) %%MY_TMPDIR%%

Actions: View | Diff

Attachments on bug 209512: 170371 | 170406