svn commit: r542103 - in head: Mk/Uses databases/mariadb105-server databases/mariadb105-server/files
Bernard Spil
brnrd at FreeBSD.org
Sun Jul 12 20:16:53 UTC 2020
Author: brnrd
Date: Sun Jul 12 20:16:51 2020
New Revision: 542103
URL: https://svnweb.freebsd.org/changeset/ports/542103
Log:
databases/mariadb105-server: Unbreak runtime
* Align with mariadb104-server
* PID must be in mysql owned dir
PR: 247535
Reported by: VVD <vvd unislabs com>
Modified:
head/Mk/Uses/mysql.mk
head/databases/mariadb105-server/Makefile
head/databases/mariadb105-server/files/client.cnf.sample.in
head/databases/mariadb105-server/files/my.cnf.sample.in
head/databases/mariadb105-server/files/mysql-server.in
head/databases/mariadb105-server/files/server.cnf.sample.in
Modified: head/Mk/Uses/mysql.mk
==============================================================================
--- head/Mk/Uses/mysql.mk Sun Jul 12 20:16:35 2020 (r542102)
+++ head/Mk/Uses/mysql.mk Sun Jul 12 20:16:51 2020 (r542103)
@@ -75,6 +75,7 @@ MYSQL80_LIBVER= 21
MYSQL102m_LIBVER= 3
MYSQL103m_LIBVER= 3
MYSQL104m_LIBVER= 3
+MYSQL105m_LIBVER= 3
# Setting/finding MySQL version we want.
.if exists(${LOCALBASE}/bin/mysql)
Modified: head/databases/mariadb105-server/Makefile
==============================================================================
--- head/databases/mariadb105-server/Makefile Sun Jul 12 20:16:35 2020 (r542102)
+++ head/databases/mariadb105-server/Makefile Sun Jul 12 20:16:51 2020 (r542103)
@@ -3,7 +3,7 @@
PORTNAME?= mariadb
PORTVERSION= 10.5.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -41,6 +41,15 @@ SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql
+MARIADB_USER?= mysql
+MARIADB_GROUP?= mysql
+MARIADB_RUNDIR?= /var/run/mysql
+MARIADB_SOCK?= mysql.sock
+MARIADB_LOGDIR?= /var/log/mysql
+
+USERS= ${MARIADB_USER}
+GROUPS= ${MARIADB_GROUP}
+
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE
@@ -89,7 +98,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-DINSTALL_SYSCONFDIR="${ETCDIR}" \
-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
- -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}" \
+ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
-DWITH_PCRE=system \
-DWITH_SSL="${OPENSSLBASE}" \
-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
@@ -107,12 +116,7 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIA
DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql
-MARIADB_RUNDIR?= /var/run/mysql
-MARIADB_LOGDIR?= /var/log/mysql
-MARIADB_USER?= mysql
-MARIADB_GROUP?= mysql
-
-CONFLICTS_INSTALL= mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
@@ -123,12 +127,12 @@ GSSAPI_HEIMDAL_USES= gssapi:heimdal
GSSAPI_MIT_USES= gssapi:mit
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
OPTIONS_SUB= yes
+SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \
+ MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
+ MARIADB_SOCK="${MARIADB_SOCK}"
+PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \
+ MARIADB_GROUP="${MARIADB_GROUP}"
-PLIST_SUB+= MARIADB_USER="${MARIADB_USER}"
-PLIST_SUB+= MARIADB_GROUP="${MARIADB_GROUP}"
-PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}"
-PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"
-
.if ${PKGNAMESUFFIX:M*-client}
# MySQL-Client part
CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
@@ -136,6 +140,7 @@ CMAKE_OFF+= WITH_WSREP
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
@@ -147,6 +152,9 @@ USE_RC_SUBR= mysql-server
CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
CMAKE_OFF+= WITH_CLIENT
SUB_FILES+= server.cnf.sample
+SUB_LIST+= MARIADB_GROUP="${MARIADB_GROUP}" \
+ MARIADB_LOGDIR="${MARIADB_LOGDIR}"
+PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"
.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
Modified: head/databases/mariadb105-server/files/client.cnf.sample.in
==============================================================================
--- head/databases/mariadb105-server/files/client.cnf.sample.in Sun Jul 12 20:16:35 2020 (r542102)
+++ head/databases/mariadb105-server/files/client.cnf.sample.in Sun Jul 12 20:16:51 2020 (r542103)
@@ -3,8 +3,8 @@
# Options specific to all client programs
[client]
-# port = 3306 # set in %%ETCDIR%%/my.cnf
-# socket = /var/run/mysql/mysql.sock # set in %%ETCDIR%%/my.cnf
+# port = 3306 # inherited from %%ETCDIR%%/my.cnf
+# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
# Options specific to MariaDB client programs
[client-mariadb]
Modified: head/databases/mariadb105-server/files/my.cnf.sample.in
==============================================================================
--- head/databases/mariadb105-server/files/my.cnf.sample.in Sun Jul 12 20:16:35 2020 (r542102)
+++ head/databases/mariadb105-server/files/my.cnf.sample.in Sun Jul 12 20:16:51 2020 (r542103)
@@ -5,7 +5,7 @@
#
[client-server]
port = 3306
-socket = %%MARIADB_RUNDIR%%/mysql.sock
+socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%
#
# include *.cnf from the config directory
Modified: head/databases/mariadb105-server/files/mysql-server.in
==============================================================================
--- head/databases/mariadb105-server/files/mysql-server.in Sun Jul 12 20:16:35 2020 (r542102)
+++ head/databases/mariadb105-server/files/mysql-server.in Sun Jul 12 20:16:51 2020 (r542103)
@@ -34,13 +34,13 @@ load_rc_config $name
: ${mysql_enable="NO"}
%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="%%MARIADB_USER"}
+: ${mysql_user="%%MARIADB_USER%%"}
%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${mysql_dbdir="/var/db/mysql"}
: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
+procname="%%PREFIX%%/libexec/mariadbd"
start_precmd="${name}_prestart"
start_postcmd="${name}_poststart"
@@ -92,7 +92,7 @@ else
done
exit 0
else
- mysql_pidfile=${mysql_pidfile:-"/var/run/mysqld.pid"}
+ mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
fi
fi
Modified: head/databases/mariadb105-server/files/server.cnf.sample.in
==============================================================================
--- head/databases/mariadb105-server/files/server.cnf.sample.in Sun Jul 12 20:16:35 2020 (r542102)
+++ head/databases/mariadb105-server/files/server.cnf.sample.in Sun Jul 12 20:16:51 2020 (r542103)
@@ -19,7 +19,7 @@ bind-address = 127.0.0.1
basedir = %%PREFIX%%
datadir = /var/db/mysql
net_retry_count = 16384
-log_error = %%MARIADB_LOGDIR%%/${hostname}.err
+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
More information about the svn-ports-all
mailing list