Attachment #216204 for bug #247747

Lines 169-172 Link Here

(-)databases/mariadb104-client/pkg-plist (-1 lines)
169	@comment man/man1/wsrep_sst_rsync_wan.1.gz	169	@comment man/man1/wsrep_sst_rsync_wan.1.gz
170	@comment man/man8/mysqld.8.gz	170	@comment man/man8/mysqld.8.gz
171	libdata/pkgconfig/mariadb.pc	171	libdata/pkgconfig/mariadb.pc
172	@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%%





PORTNAME?=	mariadb
PORTVERSION=	10.4.13
PORTREVISION?=	4
CATEGORIES=	databases
MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \

MARIADB_GROUP?=	mysql

MARIADB_RUNDIR?=	/var/run/mysql
MARIADB_SOCK?=		mysql.sock
MARIADB_LOGDIR?=	/var/log/mysql

OPTIONS_SINGLE=		GSSAPI

		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
		-DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \
		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
		-DWITH_SSL="${OPENSSLBASE}" \
		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \

GSSAPI_MIT_USES=	gssapi:mit
GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
OPTIONS_SUB=		yes
SUB_LIST+=		MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
			MARIADB_SOCK="${MARIADB_SOCK}"
PLIST_SUB+=		MARIADB_USER="${MARIADB_USER}" \
			MARIADB_GROUP="${MARIADB_GROUP}"

.if ${PKGNAMESUFFIX:M*-client}
# MySQL-Client part

USES+=		readline
USE_LDCONFIG=	${PREFIX}/lib/mysql
SUB_FILES+=	my.cnf.sample client.cnf.sample
PLIST_SUB+=	MARIADB_RUNDIR="${MARIADB_RUNDIR}"
.else # ! ${PKGNAMESUFFIX:M*-client}
# MySQL-Server part
USES+=		mysql:104m

CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
CMAKE_OFF+=	WITH_CLIENT
SUB_FILES+=	server.cnf.sample
SUB_LIST+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
		MARIADB_USER="${MARIADB_USER}" \
		MARIADB_GROUP="${MARIADB_GROUP}"
PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
		MARIADB_USER="${MARIADB_USER}" \
		MARIADB_GROUP="${MARIADB_GROUP}"

.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO

	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
	${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
	${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR}

post-install-GSSAPI_NONE-off:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so

Lines 4-10 Link Here

(-)databases/mariadb104-server/files/client.cnf.sample.in (-1 / +1 lines)
4	# Options specific to all client programs	4	# Options specific to all client programs
5	[client]	5	[client]
6	# port = 3306 # inherited from %%ETCDIR%%/my.cnf	6	# port = 3306 # inherited from %%ETCDIR%%/my.cnf
7	# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf	7	# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
8		8
9	# Options specific to MariaDB client programs	9	# Options specific to MariaDB client programs
10	[client-mariadb]	10	[client-mariadb]

Lines 5-11 Link Here

(-)databases/mariadb104-server/files/my.cnf.sample.in (-1 / +1 lines)
5	#	5	#
6	[client-server]	6	[client-server]
7	port = 3306	7	port = 3306
8	socket = %%MARIADB_RUNDIR%%/mysql.sock	8	socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%
9		9
10	#	10	#
11	# include *.cnf from the config directory	11	# include *.cnf from the config directory

Lines 12-25 Link Here

(-)databases/mariadb104-server/files/mysql-server.in (-6 / +14 lines)
12	%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.	12	%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
13	%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`	13	%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
14	%%LEGACY_LIMITS%%# just before mysql starts.	14	%%LEGACY_LIMITS%%# just before mysql starts.
15	# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql"	15	# mysql_(instance_)?dbdir (str): Base database directory.
16	# Base database directory.	16	# Default to "/var/db/mysql".
17	# mysql_(instance_)?args (str): Custom additional arguments to be passed	17	# mysql_(instance_)?args (str): Custom additional arguments to be passed
18	# to mysqld_safe (default empty).	18	# to mysqld_safe (default empty).
19	# mysql_(instance_)?pidfile (str): Custum PID file path and name.	19	# mysql_(instance_)?pidfile (str): Custum PID file path and name.
20	# Default to "${mysql_dbdir}/${hostname}.pid".	20	# Default to "${mysql_dbdir}/${hostname}.pid".
21	# mysql_(instance_)?user (str): User to run mysqld as	21	# mysql_(instance_)?user (str): User to run mysqld as.
22	# Default to "mysql" created by the port	22	# Default to "%%MARIADB_USER%%" created by the port.
		23	# mysql_(instance_)?socket (str): Name of the socket file.
		24	# Default to "" and used from %%ETCDIR%%/my.cnf,
		25	# where default is "%%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%".
23	# mysql_(instance_)?optfile (str): Server-specific option file.	26	# mysql_(instance_)?optfile (str): Server-specific option file.
24	# Default to "${mysql_dbdir}/my.cnf".	27	# Default to "${mysql_dbdir}/my.cnf".
25	# mysql_instances (str): Set to "" by default.	28	# mysql_instances (str): Set to "" by default.
Lines 34-40 Link Here
34		37
35	: ${mysql_enable="NO"}	38	: ${mysql_enable="NO"}
36	%%LEGACY_LIMITS%%: ${mysql_limits="NO"}	39	%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
37	: ${mysql_user="mysql"}	40	: ${mysql_user="%%MARIADB_USER%%"}
38	%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"	41	%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
39	: ${mysql_dbdir="/var/db/mysql"}	42	: ${mysql_dbdir="/var/db/mysql"}
40	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}	43	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
Lines 54-59 Link Here
54	%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"	57	%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
55	eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"	58	eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
56	%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"	59	%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
		60	eval mysql_socket="\${mysql_${instance}_socket:-\"${mysql_socket}\"}"
57	eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"	61	eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
58	eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"	62	eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
59	;;	63	;;
Lines 99-105 Link Here
99	pidfile=$mysql_pidfile	103	pidfile=$mysql_pidfile
100	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"	104	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
101	mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"	105	mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
102	command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"	106	command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
103		107
104	mysql_create_auth_tables()	108	mysql_create_auth_tables()
105	{	109	{
Lines 118-123 Link Here
118	done	122	done
119	if [ ! -d "${mysql_dbdir}/mysql/." ]; then	123	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
120	mysql_create_auth_tables \|\| return 1	124	mysql_create_auth_tables \|\| return 1
		125	fi
		126	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" \|\| mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
		127	if [ ! -d "${mysql_rundir}" ]; then
		128	install -d -o ${mysql_user} -g %%MARIADB_GROUP%% "${mysql_rundir}"
121	fi	129	fi
122	%%LEGACY_LIMITS%% if checkyesno mysql_limits; then	130	%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
123	%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null	131	%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null




[mysqld]
user				= %%MARIADB_USER%%
# port				= 3306 # inherited from %%ETCDIR%%/my.cnf
# socket			= %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
bind-address			= 127.0.0.1
basedir				= %%PREFIX%%
datadir				= /var/db/mysql
net_retry_count			= 16384
log_error			= %%MARIADB_LOGDIR%%/mysqld.err
# [mysqld] configuration for ZFS
# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
# Create separate datasets for data and logs, eg

Return to bug 247747

Lines 3-9 Link Here

(-)databases/mariadb104-server/Makefile (-10 / +11 lines)
3		3
4	PORTNAME?= mariadb	4	PORTNAME?= mariadb
5	PORTVERSION= 10.4.13	5	PORTVERSION= 10.4.13
6	PORTREVISION?= 3	6	PORTREVISION?= 4
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
9	http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \	9	http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
Lines 42-47 Link Here
42	MARIADB_GROUP?= mysql	42	MARIADB_GROUP?= mysql
43		43
44	MARIADB_RUNDIR?= /var/run/mysql	44	MARIADB_RUNDIR?= /var/run/mysql
		45	MARIADB_SOCK?= mysql.sock
45	MARIADB_LOGDIR?= /var/log/mysql	46	MARIADB_LOGDIR?= /var/log/mysql
46		47
47	OPTIONS_SINGLE= GSSAPI	48	OPTIONS_SINGLE= GSSAPI
Lines 93-99 Link Here
93	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	94	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
94	-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \	95	-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
95	-DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \	96	-DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \
96	-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}" \	97	-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
97	-DWITH_SSL="${OPENSSLBASE}" \	98	-DWITH_SSL="${OPENSSLBASE}" \
98	-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \	99	-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
99	-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \	100	-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
Lines 121-130 Link Here
121	GSSAPI_MIT_USES= gssapi:mit	122	GSSAPI_MIT_USES= gssapi:mit
122	GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF	123	GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
123	OPTIONS_SUB= yes	124	OPTIONS_SUB= yes
124	SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \	125	SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
125	MARIADB_RUNDIR="${MARIADB_RUNDIR}"	126	MARIADB_SOCK="${MARIADB_SOCK}"
126	PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \
127	MARIADB_GROUP="${MARIADB_GROUP}"
128		127
129	.if ${PKGNAMESUFFIX:M*-client}	128	.if ${PKGNAMESUFFIX:M*-client}
130	# MySQL-Client part	129	# MySQL-Client part
Lines 133-139 Link Here
133	USES+= readline	132	USES+= readline
134	USE_LDCONFIG= ${PREFIX}/lib/mysql	133	USE_LDCONFIG= ${PREFIX}/lib/mysql
135	SUB_FILES+= my.cnf.sample client.cnf.sample	134	SUB_FILES+= my.cnf.sample client.cnf.sample
136	PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}"
137	.else # ! ${PKGNAMESUFFIX:M*-client}	135	.else # ! ${PKGNAMESUFFIX:M*-client}
138	# MySQL-Server part	136	# MySQL-Server part
139	USES+= mysql:104m	137	USES+= mysql:104m
Lines 142-149 Link Here
142	CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER	140	CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
143	CMAKE_OFF+= WITH_CLIENT	141	CMAKE_OFF+= WITH_CLIENT
144	SUB_FILES+= server.cnf.sample	142	SUB_FILES+= server.cnf.sample
145	SUB_LIST+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"	143	SUB_LIST+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
146	PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"	144	MARIADB_USER="${MARIADB_USER}" \
		145	MARIADB_GROUP="${MARIADB_GROUP}"
		146	PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
		147	MARIADB_USER="${MARIADB_USER}" \
		148	MARIADB_GROUP="${MARIADB_GROUP}"
147		149
148	.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}	150	.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
149	${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO	151	${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
Lines 241-247 Link Here
241	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \	243	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
242	${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc	244	${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
243	${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig	245	${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
244	${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR}
245		246
246	post-install-GSSAPI_NONE-off:	247	post-install-GSSAPI_NONE-off:
247	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so	248	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so

Lines 14-25 Link Here

(-)databases/mariadb104-server/files/server.cnf.sample.in (-2 / +2 lines)
14	[mysqld]	14	[mysqld]
15	user = %%MARIADB_USER%%	15	user = %%MARIADB_USER%%
16	# port = 3306 # inherited from %%ETCDIR%%/my.cnf	16	# port = 3306 # inherited from %%ETCDIR%%/my.cnf
17	# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf	17	# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
18	bind-address = 127.0.0.1	18	bind-address = 127.0.0.1
19	basedir = %%PREFIX%%	19	basedir = %%PREFIX%%
20	datadir = /var/db/mysql	20	datadir = /var/db/mysql
21	net_retry_count = 16384	21	net_retry_count = 16384
22	log_error = %%MARIADB_LOGDIR%%/${hostname}.err	22	log_error = %%MARIADB_LOGDIR%%/mysqld.err
23	# [mysqld] configuration for ZFS	23	# [mysqld] configuration for ZFS
24	# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar	24	# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
25	# Create separate datasets for data and logs, eg	25	# Create separate datasets for data and logs, eg