Attachment #172100 for bug #209579




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.


20160704:
  AFFECTS: users of databases/mysql57-*
  AUTHOR: riggs@FreeBSD.org

  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.

20160701:
  AFFECTS: users of www/node5
  AUTHOR: bradleythughes@fastmail.fm

Lines 2-8 Link Here

(-)databases/mysql57-client/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	PKGNAMESUFFIX= 57-client	6	PKGNAMESUFFIX= 57-client
7		7
8	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)

Lines 9-26 Link Here

(-)databases/mysql57-client/files/patch-mysys__ssl_my__default.cc (-7 / +37 lines)
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -1409,7 +1409,10 @@ static const char **init_default_directo	12	@@ -909,6 +909,14 @@
		13	return 1; /* Ignore wrong files */
		14	}
13		15
14	#if defined(DEFAULT_SYSCONFDIR)	16	+ if (strstr(name, "/etc") == name)
15	if (DEFAULT_SYSCONFDIR[0])
16	+ {	17	+ {
17	errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	18	+ fprintf(stderr,
18	+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);	19	+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
		20	+ name,name);
		21	+ goto err;
19	+ }	22	+ }
20	#endif /* DEFAULT_SYSCONFDIR */	23	+
		24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
		25	{
		26	line++;
		27	@@ -1245,7 +1253,8 @@
		28	end[(strlen(end)-1)] = ' ';
		29	else
		30	strxmov(end, conf_file, *ext , " ", NullS);
		31	- fputs(name, stdout);
		32	+ if (strstr(name, "/etc") != name)
		33	+ fputs(name, stdout);
		34	}
		35	}
		36	}
		37	@@ -1404,13 +1413,8 @@
21		38
		39	#else
		40
		41	- errors += add_directory(alloc, "/etc/", dirs);
		42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
		43	-
		44	-#if defined(DEFAULT_SYSCONFDIR)
		45	- if (DEFAULT_SYSCONFDIR[0])
		46	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
		47	-#endif /* DEFAULT_SYSCONFDIR */
		48	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
		49	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
		50
22	#endif	51	#endif
23	@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f	52
		53	@@ -1480,7 +1484,7 @@
24	MY_STAT stat_info;	54	MY_STAT stat_info;
25		55
26	if (!my_stat(file_name,&stat_info,MYF(0)))	56	if (!my_stat(file_name,&stat_info,MYF(0)))

Lines 3-9 Link Here

(-)databases/mysql57-server/Makefile (-2 / +1 lines)
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 5.7.13	5	PORTVERSION= 5.7.13
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7	8	MASTER_SITES= MYSQL/MySQL-5.7
9	PKGNAMESUFFIX?= 57-server	9	PKGNAMESUFFIX?= 57-server
Lines 51-57 Link Here
51	-DINSTALL_SHAREDIR="share" \	51	-DINSTALL_SHAREDIR="share" \
52	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	52	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
53	-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \	53	-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
54	-DSYSCONFDIR="${ETCDIR}" \
55	-DWITH_BOOST="${WRKSRC}/boost" \	54	-DWITH_BOOST="${WRKSRC}/boost" \
56	-DWITH_EDITLINE=system \	55	-DWITH_EDITLINE=system \
57	-DWITH_LIBEVENT=system \	56	-DWITH_LIBEVENT=system \

Lines 64-72 Link Here

(-)databases/mysql57-server/files/mysql-server.in (-3 / +5 lines)
64	{	64	{
65	if [ -f "${mysql_dbdir}/my.cnf" ]; then	65	if [ -f "${mysql_dbdir}/my.cnf" ]; then
66	echo ""	66	echo ""
67	echo "Please keep in mind that the default location for my.cnf will be changed"	67	echo "Please keep in mind that the default location for my.cnf has changed"
68	echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near"	68	echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\". "
69	echo "future. If you do not want to move your my.cnf to the new location then"	69	echo "Please merge your existing my.cnf with the new default and move"
		70	echo "it to \"%%ETCDIR%%/my.cnf\"."
		71	echo "If you do not want to move your my.cnf to the new location then"
70	echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."	72	echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
71	echo ""	73	echo ""
72	fi	74	fi

Lines 9-26 Link Here

(-)databases/mysql57-server/files/patch-mysys__ssl_my__default.cc (-7 / +37 lines)
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -1409,7 +1409,10 @@ static const char **init_default_directo	12	@@ -909,6 +909,14 @@
		13	return 1; /* Ignore wrong files */
		14	}
13		15
14	#if defined(DEFAULT_SYSCONFDIR)	16	+ if (strstr(name, "/etc") == name)
15	if (DEFAULT_SYSCONFDIR[0])
16	+ {	17	+ {
17	errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);	18	+ fprintf(stderr,
18	+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);	19	+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
		20	+ name,name);
		21	+ goto err;
19	+ }	22	+ }
20	#endif /* DEFAULT_SYSCONFDIR */	23	+
		24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
		25	{
		26	line++;
		27	@@ -1245,7 +1253,8 @@
		28	end[(strlen(end)-1)] = ' ';
		29	else
		30	strxmov(end, conf_file, *ext , " ", NullS);
		31	- fputs(name, stdout);
		32	+ if (strstr(name, "/etc") != name)
		33	+ fputs(name, stdout);
		34	}
		35	}
		36	}
		37	@@ -1404,13 +1413,8 @@
21		38
		39	#else
		40
		41	- errors += add_directory(alloc, "/etc/", dirs);
		42	- errors += add_directory(alloc, "/etc/mysql/", dirs);
		43	-
		44	-#if defined(DEFAULT_SYSCONFDIR)
		45	- if (DEFAULT_SYSCONFDIR[0])
		46	- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
		47	-#endif /* DEFAULT_SYSCONFDIR */
		48	+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
		49	+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
		50
22	#endif	51	#endif
23	@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f	52
		53	@@ -1480,7 +1484,7 @@
24	MY_STAT stat_info;	54	MY_STAT stat_info;
25		55
26	if (!my_stat(file_name,&stat_info,MYF(0)))	56	if (!my_stat(file_name,&stat_info,MYF(0)))

Lines 11-19 Link Here

(-)databases/mysql57-server/pkg-message (-4 / +5 lines)
11		11
12	*****************************************************************************	12	*****************************************************************************
13		13
14	Please keep in mind that the default location for my.cnf will be changed	14	The default location for my.cnf has changed from "/var/db/mysql/my.cnf" to
15	from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near	15	"/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged manually
16	future. If you do not want to move your my.cnf to the new location then	16	with the new default and moved to the new location. To continue using the
17	you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".	17	my.cnf file at the old location, set "mysql_optfile" in /etc/rc.conf to
		18	point to the location of the existing my.cnf file.
18		19
19	*****************************************************************************	20	*****************************************************************************

Lines 62-67 Link Here

(-)databases/mysql57-server/pkg-plist (+2 lines)
62	lib/mysql/plugin/semisync_master.so	62	lib/mysql/plugin/semisync_master.so
63	lib/mysql/plugin/semisync_slave.so	63	lib/mysql/plugin/semisync_slave.so
64	lib/mysql/plugin/test_security_context.so	64	lib/mysql/plugin/test_security_context.so
		65	lib/mysql/plugin/keyring_udf.so
		66	lib/mysql/plugin/test_udf_services.so
65	lib/mysql/plugin/validate_password.so	67	lib/mysql/plugin/validate_password.so
66	lib/mysql/plugin/version_token.so	68	lib/mysql/plugin/version_token.so
67	libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc	69	libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc

Return to bug 209579

Lines 5-10 Link Here

(-)UPDATING (+11 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8
		9	20160704:
		10	AFFECTS: users of databases/mysql57-*
		11	AUTHOR: riggs@FreeBSD.org
		12
		13	The default location for my.cnf has changed from "/var/db/mysql/my.cnf"
		14	to "/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged
		15	manually with the new default and moved to the new location. To
		16	continue using the my.cnf file at the old location, set "mysql_optfile"
		17	in /etc/rc.conf to point to the location of the existing my.cnf file.
		18
8	20160701:	19	20160701:
9	AFFECTS: users of www/node5	20	AFFECTS: users of www/node5
10	AUTHOR: bradleythughes@fastmail.fm	21	AUTHOR: bradleythughes@fastmail.fm