databases/mariadb105-server: Security update to 10.5.6

* Partial rc.d fixes from [1]

PR:		217247 [1]
MFH:		2020Q4
Security:	a2565962-1156-11eb-9c9c-d4c9ef517024
This commit is contained in:
Bernard Spil 2020-10-24 11:30:11 +00:00
parent 03e255a176
commit 5c0779c39b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553184
4 changed files with 14 additions and 6 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mariadb
PORTVERSION= 10.5.5
PORTVERSION= 10.5.6
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@ -40,6 +40,7 @@ DOCSDIR= ${PREFIX}/share/doc/mysql
MARIADB_USER?= mysql
MARIADB_GROUP?= mysql
MARIADB_DBDIR?= /var/db/mysql
MARIADB_RUNDIR?= /var/run/mysql
MARIADB_SOCK?= mysql.sock
MARIADB_LOGDIR?= /var/log/mysql
@ -85,7 +86,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-DINSTALL_INFODIR="info" \
-DINSTALL_LIBDIR="lib/mysql" \
-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-DINSTALL_MYSQLTESTDIR= \
-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
@ -125,6 +126,7 @@ GSSAPI_MIT_USES= gssapi:mit
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
OPTIONS_SUB= yes
SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \
MARIADB_DBDIR="${MARIADB_DBDIR}" \
MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
MARIADB_SOCK="${MARIADB_SOCK}"
PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1597213394
SHA256 (mariadb-10.5.5.tar.gz) = cf6b2c061754c07bbb1d20b29ae111bf2d098297c9b8c321b810638a179088a4
SIZE (mariadb-10.5.5.tar.gz) = 86880268
TIMESTAMP = 1603027541
SHA256 (mariadb-10.5.6.tar.gz) = ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4
SIZE (mariadb-10.5.6.tar.gz) = 86884252

View file

@ -22,6 +22,7 @@
# Default to "%%MARIADB_USER%%" created by the port
# mysql_(instance_)?optfile (str): Server-specific option file.
# Default to "${mysql_dbdir}/my.cnf".
# mysql_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
# mysql_instances (str): Set to "" by default.
# If defined, list of instances to enable
@ -36,8 +37,9 @@ load_rc_config $name
%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
: ${mysql_user="%%MARIADB_USER%%"}
%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${mysql_dbdir="/var/db/mysql"}
: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
command="/usr/sbin/daemon"
procname="%%PREFIX%%/libexec/mariadbd"
@ -125,6 +127,9 @@ mysql_prestart()
%%LEGACY_LIMITS%% return 0
%%LEGACY_LIMITS%% fi
%%MODERN_LIMITS%% return 0
if [ ! -d "${mysql_rundir}" ]; then
install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
fi
}
mysql_poststart()

View file

@ -213,6 +213,7 @@ man/man1/aria_dump_log.1.gz
man/man1/aria_ftdump.1.gz
man/man1/aria_pack.1.gz
man/man1/aria_read_log.1.gz
%%S3%%man/man1/aria_s3_copy.1.gz
man/man1/galera_new_cluster.1.gz
man/man1/galera_recovery.1.gz
man/man1/innochecksum.1.gz