FreeBSD Bugzilla – Attachment 217247 Details for
Bug 248677
databases/mariadb105-{server,client}: update to 10.5.5 + optimization
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update to 10.5.5 + optimization
mariadb105.diff (text/plain), 12.88 KB, created by
Vladimir Druzenko
on 2020-08-15 22:28:55 UTC
(
hide
)
Description:
update to 10.5.5 + optimization
Filename:
MIME Type:
Creator:
Vladimir Druzenko
Created:
2020-08-15 22:28:55 UTC
Size:
12.88 KB
patch
obsolete
>diff -urN databases/mariadb105-server.orig/Makefile databases/mariadb105-server/Makefile >--- databases/mariadb105-server.orig/Makefile >+++ databases/mariadb105-server/Makefile >@@ -2,8 +2,8 @@ > # $FreeBSD: head/databases/mariadb105-server/Makefile 543994 2020-08-02 19:42:19Z brnrd $ > > PORTNAME?= mariadb >-PORTVERSION= 10.5.4 >-PORTREVISION?= 2 >+PORTVERSION= 10.5.5 >+PORTREVISION?= 0 > CATEGORIES= databases > MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ > http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ >@@ -40,13 +40,11 @@ > > 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 > >-USERS= ${MARIADB_USER} >-GROUPS= ${MARIADB_GROUP} >- > OPTIONS_SINGLE= GSSAPI > OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE > OPTIONS_DEFAULT= GSSAPI_BASE >@@ -85,7 +83,7 @@ > -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" \ >@@ -124,11 +122,8 @@ > 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}" \ >+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 >@@ -137,7 +132,6 @@ > 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 >@@ -149,10 +143,16 @@ > 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}" >+SUB_LIST+= MARIADB_DBDIR="${MARIADB_DBDIR}" \ >+ MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ >+ MARIADB_USER="${MARIADB_USER}" >+PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ >+ MARIADB_USER="${MARIADB_USER}" \ >+ MARIADB_GROUP="${MARIADB_GROUP}" > >+USERS= ${MARIADB_USER} >+GROUPS= ${MARIADB_GROUP} >+ > .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} > ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO > ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC >@@ -246,7 +246,6 @@ > ${STAGEDIR}${PREFIX}/include/mysql/server \ > ${STAGEDIR}${ETCDIR}/init.d \ > ${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 >diff -urN databases/mariadb105-server.orig/distinfo databases/mariadb105-server/distinfo >--- databases/mariadb105-server.orig/distinfo >+++ databases/mariadb105-server/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1593020847 >-SHA256 (mariadb-10.5.4.tar.gz) = 26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72 >-SIZE (mariadb-10.5.4.tar.gz) = 86793964 >+TIMESTAMP = 1597499585 >+SHA256 (mariadb-10.5.5.tar.gz) = cf6b2c061754c07bbb1d20b29ae111bf2d098297c9b8c321b810638a179088a4 >+SIZE (mariadb-10.5.5.tar.gz) = 86880268 >diff -urN databases/mariadb105-server.orig/files/mysql-server.in databases/mariadb105-server/files/mysql-server.in >--- databases/mariadb105-server.orig/files/mysql-server.in >+++ databases/mariadb105-server/files/mysql-server.in >@@ -1,6 +1,6 @@ > #!/bin/sh > >-# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ >+# $FreeBSD: head/databases/mariadb105-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ > # > # PROVIDE: mysql > # REQUIRE: LOGIN >@@ -12,18 +12,22 @@ > %%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. > %%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` > %%LEGACY_LIMITS%%# just before mysql starts. >-# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" >-# Base database directory. >-# mysql_(instance_)?args (str): Custom additional arguments to be passed >-# to mysqld_safe (default empty). >-# mysql_(instance_)?pidfile (str): Custum PID file path and name. >-# Default to "${mysql_dbdir}/${hostname}.pid". >-# mysql_(instance_)?user (str): User to run mysqld as >-# Default to "%%MARIADB_USER%%" created by the port >-# mysql_(instance_)?optfile (str): Server-specific option file. >-# Default to "${mysql_dbdir}/my.cnf". >-# mysql_instances (str): Set to "" by default. >-# If defined, list of instances to enable >+# mysql_(instance_)?dbdir (str): Base database directory. >+# Default to "%%MARIADB_DBDIR%%(_instance)" >+# mysql_(instance_)?args (str): Custom additional arguments to be passed >+# to mariadbd. Default is empty. >+# mysql_(instance_)?pidfile (str): Custum PID file path and name. >+# Default to "%%MARIADB_RUNDIR%%(_instance)/mysqld.pid". >+# mysql_(instance_)?user (str): User to run mariadbd as. >+# Default to "%%MARIADB_USER%%" created by the port. >+# mysql_(instance_)?socket (str): Name of the socket file. >+# Default to "" and used from %%ETCDIR%%(_instance)/my.cnf, >+# where default is "%%MARIADB_RUNDIR%%(_instance)/%%MARIADB_SOCK%%". >+# For multinstance you have to modify %%ETCDIR%%(_instance)/my.cnf. >+# mysql_(instance_)?optfile (str): Server-specific option file. >+# Default to "%%ETCDIR%%(_instance)/my.cnf". >+# mysql_instances (str): Set to "" by default. >+# If defined, list of instances to enable. > > . /etc/rc.subr > >@@ -36,7 +40,7 @@ > %%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"} > > command="/usr/sbin/daemon" >@@ -50,12 +54,13 @@ > case "$mysql_instances" in > "$2 "*|*" $2 "*|*" $2"|"$2") > eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" >- eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" >+ eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}" > %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" > eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" > %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" >- eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" >- eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" >+ eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}" >+ eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}" >+ eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}" > ;; > *) > err 1 "$2 not found in mysql_instances" ;; >@@ -99,7 +104,7 @@ > pidfile=$mysql_pidfile > mysql_install_db="%%PREFIX%%/bin/mariadb-install-db" > mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" >-command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" >+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}" > > mysql_create_auth_tables() > { >@@ -118,6 +123,11 @@ > done > if [ ! -d "${mysql_dbdir}/mysql/." ]; then > mysql_create_auth_tables || return 1 >+ fi >+ mysql_group="`/usr/bin/id -gn ${mysql_user}`" >+ [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`" >+ if [ ! -d "${mysql_rundir}" ]; then >+ install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}" > fi > %%LEGACY_LIMITS%% if checkyesno mysql_limits; then > %%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null >diff -urN databases/mariadb105-server.orig/files/patch-MDEV-15961 databases/mariadb105-server/files/patch-MDEV-15961 >--- databases/mariadb105-server.orig/files/patch-MDEV-15961 >+++ databases/mariadb105-server/files/patch-MDEV-15961 >@@ -1,54 +0,0 @@ >-MDEV-15961: Fix stacktraces under FreeBSD >- >-https://jira.mariadb.org/browse/MDEV-15961 >---- mysys/stacktrace.c.orig 2020-06-23 15:10:17 UTC >-+++ mysys/stacktrace.c >-@@ -33,13 +33,13 @@ >- #include <execinfo.h> >- #endif >- >-+#ifdef __linux__ >- #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) >-- >- static char *heap_start; >-- >--#if(defined HAVE_BSS_START) && !(defined __linux__) >- extern char *__bss_start; >--#endif >-+#else >-+#define PTR_SANE(p) (p) >-+#endif /* __linux */ >- >- /** >- Default handler for printing stacktrace >-@@ -67,9 +67,9 @@ static sig_handler default_handle_fatal_signal(int sig >- >- void my_init_stacktrace(int setup_handlers) >- { >--#if(defined HAVE_BSS_START) && !(defined __linux__) >-+#ifdef __linux__ >- heap_start = (char*) &__bss_start; >--#endif >-+#endif /* __linux__ */ >- if (setup_handlers) >- { >- struct sigaction sa; >-@@ -186,15 +186,16 @@ static int safe_print_str(const char *addr, size_t max >- >- int my_safe_print_str(const char* val, size_t max_len) >- { >-+#ifdef __linux__ >-+/* Only needed by the linux version of PTR_SANE */ >- char *heap_end; >- >--#ifdef __linux__ >- // Try and make use of /proc filesystem to safely print memory contents. >- if (!safe_print_str(val, max_len)) >- return 0; >--#endif >- >- heap_end= (char*) sbrk(0); >-+#endif >- >- if (!PTR_SANE(val)) >- { >diff -urN databases/mariadb105-server.orig/files/patch-storage_perfschema_my__thread.h databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h >--- databases/mariadb105-server.orig/files/patch-storage_perfschema_my__thread.h >+++ databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h >@@ -1,13 +0,0 @@ >---- storage/perfschema/my_thread.h.orig 2020-06-23 15:10:17 UTC >-+++ storage/perfschema/my_thread.h >-@@ -10,6 +10,10 @@ >- #include <sys/syscall.h> >- #endif >- >-+#ifdef HAVE_PTHREAD_GETTHREADID_NP >-+#include <pthread_np.h> >-+#endif >-+ >- typedef pthread_key_t thread_local_key_t; >- typedef pthread_t my_thread_handle; >- typedef pthread_attr_t my_thread_attr_t; >diff -urN databases/mariadb105-server.orig/files/server.cnf.sample.in databases/mariadb105-server/files/server.cnf.sample.in >--- databases/mariadb105-server.orig/files/server.cnf.sample.in >+++ databases/mariadb105-server/files/server.cnf.sample.in >@@ -14,10 +14,10 @@ > [mysqld] > user = %%MARIADB_USER%% > # port = 3306 # inherited from %%ETCDIR%%/my.cnf >-# socket = %%MARIADB_RUNDIR%%/mysql.sock # 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 >+datadir = %%MARIADB_DBDIR%% > net_retry_count = 16384 > log_error = %%MARIADB_LOGDIR%%/mysqld.err > # [mysqld] configuration for ZFS >@@ -26,13 +26,13 @@ > # zroot/mysql compression=on recordsize=128k atime=off > # zroot/mysql/data recordsize=16k > # zroot/mysql/logs >-# datadir = /var/db/mysql/data >-# innodb_log_group_home_dir = /var/db/mysql/log >-# audit_log_file = /var/db/mysql/log/audit.log >-# general_log_file = /var/db/mysql/log/general.log >-# log_bin = /var/db/mysql/log/mysql-bin >-# relay_log = /var/db/mysql/log/relay-log >-# slow_query_log_file = /var/db/mysql/log/slow.log >+# datadir = %%MARIADB_DBDIR%%/data >+# innodb_log_group_home_dir = %%MARIADB_DBDIR%%/log >+# audit_log_file = %%MARIADB_DBDIR%%/log/audit.log >+# general_log_file = %%MARIADB_DBDIR%%/log/general.log >+# log_bin = %%MARIADB_DBDIR%%/log/mysql-bin >+# relay_log = %%MARIADB_DBDIR%%/log/relay-log >+# slow_query_log_file = %%MARIADB_DBDIR%%/log/slow.log > # innodb_doublewrite = 0 > # innodb_flush_method = O_DSYNC > >diff -urN databases/mariadb105-server.orig/pkg-plist databases/mariadb105-server/pkg-plist >--- databases/mariadb105-server.orig/pkg-plist >+++ databases/mariadb105-server/pkg-plist >@@ -213,6 +213,7 @@ > man/man1/aria_ftdump.1.gz > man/man1/aria_pack.1.gz > man/man1/aria_read_log.1.gz >+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 >diff -urN databases/mariadb105-client.orig/pkg-plist databases/mariadb105-client/pkg-plist >--- databases/mariadb105-client.orig/pkg-plist >+++ databases/mariadb105-client/pkg-plist >@@ -88,6 +88,7 @@ > @comment man/man1/aria_ftdump.1.gz > @comment man/man1/aria_pack.1.gz > @comment man/man1/aria_read_log.1.gz >+@comment man/man1/aria_s3_copy.1.gz > @comment man/man1/galera_new_cluster.1.gz > @comment man/man1/galera_recovery.1.gz > @comment man/man1/innochecksum.1.gz >@@ -182,4 +183,3 @@ > @comment man/man8/mariadbd.8.gz > @comment man/man8/mysqld.8.gz > share/aclocal/mysql.m4 >-@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
vvd
:
maintainer-approval?
(
brnrd
)
Actions:
View
|
Diff
Attachments on
bug 248677
: 217247