svn commit: r483238 - in branches/2018Q4/databases: mariadb103-client mariadb103-client/files mariadb103-server mariadb103-server/files
Bernard Spil
brnrd at FreeBSD.org
Sun Oct 28 08:26:47 UTC 2018
Author: brnrd
Date: Sun Oct 28 08:26:44 2018
New Revision: 483238
URL: https://svnweb.freebsd.org/changeset/ports/483238
Log:
MFH: r482974 r483143
databases/mariadb103-server: Update to 10.3.10
- Fix build on aarch64 [1]
- Not broken in i386 [2]
- WSREP only on amd64
PR: 230682 [1], 230027 [2]
Submitted by: Naram Qashat <cyberbotx cyberbotx com> [1]
Reported by: <dewayne heuristicsystems com.au> [2]
Security: 909be51b-9b3b-11e8-add2-b499baebfeaf
databases/mariadb103-server: Fix plist issues
- Resurect mysql_upgrade [1]
- Move some files between -client and -server
PR: 232735 [1]
Reported by: Naram Qashat <cyberbotx cyberbotx com> [1]
Approved by: ports-secteam (miwi)
Added:
branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-11790
- copied unchanged from r483143, head/databases/mariadb103-client/files/patch-MDEV-11790
branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-15961
- copied unchanged from r482974, head/databases/mariadb103-client/files/patch-MDEV-15961
branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-11790
- copied unchanged from r483143, head/databases/mariadb103-server/files/patch-MDEV-11790
branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-15961
- copied unchanged from r482974, head/databases/mariadb103-server/files/patch-MDEV-15961
Deleted:
branches/2018Q4/databases/mariadb103-server/files/patch-sql_CMakeLists.txt
branches/2018Q4/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc
branches/2018Q4/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt
branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
Modified:
branches/2018Q4/databases/mariadb103-client/Makefile
branches/2018Q4/databases/mariadb103-client/pkg-plist
branches/2018Q4/databases/mariadb103-server/Makefile
branches/2018Q4/databases/mariadb103-server/distinfo
branches/2018Q4/databases/mariadb103-server/files/mysql-server.in
branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
branches/2018Q4/databases/mariadb103-server/pkg-plist
Directory Properties:
branches/2018Q4/ (props changed)
Modified: branches/2018Q4/databases/mariadb103-client/Makefile
==============================================================================
--- branches/2018Q4/databases/mariadb103-client/Makefile Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-client/Makefile Sun Oct 28 08:26:44 2018 (r483238)
@@ -2,13 +2,10 @@
# $FreeBSD$
PORTNAME= mariadb
-PORTREVISION= 0
PKGNAMESUFFIX= 103-client
COMMENT= Multithreaded SQL database (client)
-BROKEN_aarch64= fails to link: missing sbrk
-
MASTERDIR= ${.CURDIR}/../mariadb103-server
FILESDIR= ${.CURDIR}/files
@@ -24,14 +21,16 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql
CLIENT_ONLY= yes
+CONFLICTS_INSTALL= databases/mytop
+
post-configure:
${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
-e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \
${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
post-install:
- ${RM} -r ${STAGEDIR}${DATADIR}/policy \
- ${STAGEDIR}${PREFIX}/include/mysql/server
+ ${RM} -r ${STAGEDIR}${DATADIR}
+ ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
post-install-GSSAPI_NONE:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
Copied: branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-11790 (from r483143, head/databases/mariadb103-client/files/patch-MDEV-11790)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-11790 Sun Oct 28 08:26:44 2018 (r483238, copy of r483143, head/databases/mariadb103-client/files/patch-MDEV-11790)
@@ -0,0 +1,46 @@
+WITHOUT_SERVER installs server-only files
+
+https://jira.mariadb.org/browse/MDEV-11790
+--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC
++++ extra/CMakeLists.txt
+@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ ADD_DEPENDENCIES(innochecksum GenError)
+ ENDIF()
+
+-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
+ TARGET_LINK_LIBRARIES(replace mysys)
+
+ IF(UNIX)
+--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC
++++ scripts/CMakeLists.txt
+@@ -241,7 +241,10 @@ ENDIF()
+ SET(mysql_config_COMPONENT COMPONENT Development)
+ SET(msql2mysql_COMPONENT COMPONENT Client)
+ SET(mysqlaccess_COMPONENT COMPONENT Client)
++SET(mysqlhotcopy_COMPONENT COMPONENT Client)
++SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
+ SET(mysql_find_rows_COMPONENT COMPONENT Client)
++SET(mysql_setpermission_COMPONENT COMPONENT Client)
+ SET(mytop_COMPONENT Mytop)
+
+ IF(WIN32)
+@@ -298,14 +301,14 @@ ELSE()
+ # On Unix, most of the files end up in the bin directory
+ SET(BIN_SCRIPTS
+ msql2mysql
+- mysql_config
+- mysql_setpermission
+- mysql_secure_installation
+ mysqlaccess
++ mysqlhotcopy
++ mysql_config
+ mysql_convert_table_format
+ mysql_find_rows
++ mysql_secure_installation
++ mysql_setpermission
+ mytop
+- mysqlhotcopy
+ ${SERVER_SCRIPTS}
+ ${WSREP_SCRIPTS}
+ ${SYSTEMD_SCRIPTS}
Copied: branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-15961 (from r482974, head/databases/mariadb103-client/files/patch-MDEV-15961)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q4/databases/mariadb103-client/files/patch-MDEV-15961 Sun Oct 28 08:26:44 2018 (r483238, copy of r482974, head/databases/mariadb103-client/files/patch-MDEV-15961)
@@ -0,0 +1,50 @@
+MDEV-15961: Fix stacktraces under FreeBSD
+
+https://jira.mariadb.org/browse/MDEV-15961
+--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC
++++ mysys/stacktrace.c
+@@ -34,19 +34,19 @@
+ #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 */
+
+ void my_init_stacktrace()
+ {
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
++#ifdef __linux__
+ heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+ }
+
+ #ifdef __linux__
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+
+ 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))
+ {
Modified: branches/2018Q4/databases/mariadb103-client/pkg-plist
==============================================================================
--- branches/2018Q4/databases/mariadb103-client/pkg-plist Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-client/pkg-plist Sun Oct 28 08:26:44 2018 (r483238)
@@ -4,13 +4,9 @@ bin/mysql
bin/mysql_config
bin/mysql_convert_table_format
bin/mysql_find_rows
- at comment bin/mysql_install_db
- at comment bin/mysql_plugin
- at comment bin/mysql_secure_installation
bin/mysql_setpermission
-bin/mysql_upgrade
+ at comment bin/mysql_plugin
bin/mysql_waitpid
- at comment bin/mysqld_safe_helper
bin/mysqlaccess
bin/mysqladmin
bin/mysqlbinlog
@@ -21,12 +17,9 @@ bin/mysqlimport
bin/mysqlshow
bin/mysqlslap
bin/mysqltest
-bin/my_print_defaults
- at comment bin/mytop
- at comment bin/perror
+bin/mytop
bin/replace
- at comment bin/resolve_stack_dump
- at comment bin/resolveip
+ at comment bin/wsrep_sst_rsync_wan
include/mysql/errmsg.h
include/mysql/ma_list.h
include/mysql/ma_pvio.h
@@ -70,8 +63,10 @@ lib/mysql/plugin/sha256_password.so
@comment man/man1/galera_recovery.1.gz
@comment man/man1/innochecksum.1.gz
@comment man/man1/mariadb-service-convert.1.gz
+ at comment man/man1/mariabackup.1.gz
man/man1/msql2mysql.1.gz
-man/man1/my_print_defaults.1.gz
+ at comment man/man1/mbstream.1.gz
+ at comment man/man1/my_print_defaults.1.gz
man/man1/my_safe_process.1.gz
@comment man/man1/myisam_ftdump.1.gz
@comment man/man1/myisamchk.1.gz
@@ -85,14 +80,16 @@ man/man1/mysql_client_test.1.gz
man/man1/mysql_client_test_embedded.1.gz
man/man1/mysql_config.1.gz
man/man1/mysql_convert_table_format.1.gz
+ at comment man/man1/mysql_embedded.1.gz
man/man1/mysql_find_rows.1.gz
@comment man/man1/mysql_fix_extensions.1.gz
@comment man/man1/mysql_install_db.1.gz
+ at comment man/man1/mysql_ldb.1.gz
man/man1/mysql_plugin.1.gz
@comment man/man1/mysql_secure_installation.1.gz
man/man1/mysql_setpermission.1.gz
man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
+ at comment man/man1/mysql_upgrade.1.gz
man/man1/mysql_waitpid.1.gz
man/man1/mysqlaccess.1.gz
man/man1/mysqladmin.1.gz
@@ -113,80 +110,15 @@ man/man1/mysqltest_embedded.1.gz
man/man1/replace.1.gz
@comment man/man1/resolve_stack_dump.1.gz
@comment man/man1/resolveip.1.gz
- at comment man/man1/tokuft_logdump.1.gz
+man/man1/tokuft_logprint.1.gz
@comment man/man1/tokuftdump.1.gz
@comment man/man1/wsrep_sst_common.1.gz
+ at comment man/man1/wsrep_sst_mariabackup.1.gz
@comment man/man1/wsrep_sst_mysqldump.1.gz
@comment man/man1/wsrep_sst_rsync.1.gz
+ at comment man/man1/wsrep_sst_rsync_wan.1.gz
@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz
@comment man/man1/wsrep_sst_xtrabackup.1.gz
@comment man/man8/mysqld.8.gz
@comment share/aclocal/mysql.m4
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hindi/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
- at comment %%DATADIR%%/binary-configure
- at comment %%DATADIR%%/fill_help_tables.sql
- at comment %%DATADIR%%/magic
- at comment %%DATADIR%%/maria_add_gis_sp.sql
- at comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
- at comment %%DATADIR%%/mysql-log-rotate
- at comment %%DATADIR%%/mysql.server
- at comment %%DATADIR%%/mysql_performance_tables.sql
- at comment %%DATADIR%%/mysql_system_tables.sql
- at comment %%DATADIR%%/mysql_system_tables_data.sql
- at comment %%DATADIR%%/mysql_test_data_timezone.sql
- at comment %%DATADIR%%/mysql_test_db.sql
- at comment %%DATADIR%%/mysql_to_mariadb.sql
- at comment %%DATADIR%%/mysqld_multi.server
- at comment %%DATADIR%%/wsrep.cnf
- at comment %%DATADIR%%/wsrep_notify
share/pkgconfig/mariadb.pc
Modified: branches/2018Q4/databases/mariadb103-server/Makefile
==============================================================================
--- branches/2018Q4/databases/mariadb103-server/Makefile Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-server/Makefile Sun Oct 28 08:26:44 2018 (r483238)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.3.8
-PORTREVISION?= 2
+PORTVERSION= 10.3.10
+PORTREVISION?= 1
CATEGORIES= databases ipv6
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -41,7 +41,8 @@ OPTIONS_DEFAULT= GSSAPI_BASE
# MySQL-Server options
OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE= CONNECT_EXTRA WSREP DOCS
+OPTIONS_DEFINE= CONNECT_EXTRA DOCS
+OPTIONS_DEFINE_amd64= WSREP
OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD
OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB
OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
@@ -120,9 +121,6 @@ USES+= readline
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
.else
# MySQL-Server part
-NOT_FOR_ARCHS= i386
-NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \
- https://jira.mariadb.org/browse/MDEV-9627
USES+= mysql:103m
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
USE_RC_SUBR= mysql-server
@@ -135,8 +133,7 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
-DWITHOUT_CLIENT=1
.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
-${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \
- -DWITHOUT_${ENGINE}=1
+${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
.endfor
INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
@@ -162,14 +159,22 @@ TOKUDB_IMPLIES= SNAPPY
TOKUDB_PORTDOCS= README.md
TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
WSREP_CMAKE_OFF= -DWITH_WSREP=OFF
+WSREP_LIB_DEPENDS= libgalera.so:databases/galera
ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.endif
+
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private
- ${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -type d -mindepth 1`
.endif # defined(CLIENT_ONLY)
.if defined(WITH_OPENSSL_PORT)
@@ -177,6 +182,10 @@ GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with
.endif
.include <bsd.port.pre.mk>
+
+.if ${ARCH} != amd64
+PLIST_SUB+= WSREP="@comment "
+.endif
.if ${OPSYS} == DragonFly
CMAKE_ARGS+= -DWITHOUT_TOKUDB
Modified: branches/2018Q4/databases/mariadb103-server/distinfo
==============================================================================
--- branches/2018Q4/databases/mariadb103-server/distinfo Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-server/distinfo Sun Oct 28 08:26:44 2018 (r483238)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531382110
-SHA256 (mariadb-10.3.8.tar.gz) = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8
-SIZE (mariadb-10.3.8.tar.gz) = 72152953
+TIMESTAMP = 1538732181
+SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda
+SIZE (mariadb-10.3.10.tar.gz) = 70493771
Modified: branches/2018Q4/databases/mariadb103-server/files/mysql-server.in
==============================================================================
--- branches/2018Q4/databases/mariadb103-server/files/mysql-server.in Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-server/files/mysql-server.in Sun Oct 28 08:26:44 2018 (r483238)
@@ -9,9 +9,9 @@
# Add the following line to /etc/rc.conf to enable mysql:
# mysql_(instance_)?enable (bool): Set to "NO" by default.
# Set it to "YES" to enable MySQL.
-# mysql_(instance_)?limits (bool): Set to "NO" by default.
-# Set it to yes to run `limits -e -U mysql`
-# just before mysql starts.
+%%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
@@ -33,9 +33,9 @@ rcvar=mysql_enable
load_rc_config $name
: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
: ${mysql_user="mysql"}
-: ${mysql_limits_args="-e -U $mysql_user"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${mysql_dbdir="/var/db/mysql"}
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
@@ -51,9 +51,9 @@ if [ -n "$2" ]; then
"$2 "*|*" $2 "*|*" $2"|"$2")
eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
- eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
+ %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
- eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $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\"}"
;;
@@ -119,11 +119,12 @@ mysql_prestart()
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
mysql_create_auth_tables || return 1
fi
- if checkyesno mysql_limits; then
- eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
- else
- return 0
- fi
+%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
}
mysql_poststart()
Copied: branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-11790 (from r483143, head/databases/mariadb103-server/files/patch-MDEV-11790)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-11790 Sun Oct 28 08:26:44 2018 (r483238, copy of r483143, head/databases/mariadb103-server/files/patch-MDEV-11790)
@@ -0,0 +1,46 @@
+WITHOUT_SERVER installs server-only files
+
+https://jira.mariadb.org/browse/MDEV-11790
+--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC
++++ extra/CMakeLists.txt
+@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ ADD_DEPENDENCIES(innochecksum GenError)
+ ENDIF()
+
+-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
+ TARGET_LINK_LIBRARIES(replace mysys)
+
+ IF(UNIX)
+--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC
++++ scripts/CMakeLists.txt
+@@ -241,7 +241,10 @@ ENDIF()
+ SET(mysql_config_COMPONENT COMPONENT Development)
+ SET(msql2mysql_COMPONENT COMPONENT Client)
+ SET(mysqlaccess_COMPONENT COMPONENT Client)
++SET(mysqlhotcopy_COMPONENT COMPONENT Client)
++SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
+ SET(mysql_find_rows_COMPONENT COMPONENT Client)
++SET(mysql_setpermission_COMPONENT COMPONENT Client)
+ SET(mytop_COMPONENT Mytop)
+
+ IF(WIN32)
+@@ -298,14 +301,14 @@ ELSE()
+ # On Unix, most of the files end up in the bin directory
+ SET(BIN_SCRIPTS
+ msql2mysql
+- mysql_config
+- mysql_setpermission
+- mysql_secure_installation
+ mysqlaccess
++ mysqlhotcopy
++ mysql_config
+ mysql_convert_table_format
+ mysql_find_rows
++ mysql_secure_installation
++ mysql_setpermission
+ mytop
+- mysqlhotcopy
+ ${SERVER_SCRIPTS}
+ ${WSREP_SCRIPTS}
+ ${SYSTEMD_SCRIPTS}
Copied: branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-15961 (from r482974, head/databases/mariadb103-server/files/patch-MDEV-15961)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q4/databases/mariadb103-server/files/patch-MDEV-15961 Sun Oct 28 08:26:44 2018 (r483238, copy of r482974, head/databases/mariadb103-server/files/patch-MDEV-15961)
@@ -0,0 +1,50 @@
+MDEV-15961: Fix stacktraces under FreeBSD
+
+https://jira.mariadb.org/browse/MDEV-15961
+--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC
++++ mysys/stacktrace.c
+@@ -34,19 +34,19 @@
+ #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 */
+
+ void my_init_stacktrace()
+ {
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
++#ifdef __linux__
+ heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+ }
+
+ #ifdef __linux__
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+
+ 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))
+ {
Modified: branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
==============================================================================
--- branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake Sun Oct 28 08:26:44 2018 (r483238)
@@ -1,6 +1,6 @@
---- storage/rocksdb/build_rocksdb.cmake.orig 2018-06-25 11:13:28 UTC
+--- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC
+++ storage/rocksdb/build_rocksdb.cmake
-@@ -69,15 +69,9 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD
+@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD
SET(CMAKE_REQUIRED_LIBRARIES zstd)
CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)
UNSET(CMAKE_REQUIRED_LIBRARIES)
@@ -8,11 +8,6 @@
- MESSAGE(FATAL_ERROR
- "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3")
- endif()
-- if (ZSTD_VALID)
+ if (ZSTD_VALID)
add_definitions(-DZSTD)
include_directories(${ZSTD_INCLUDE_DIR})
- list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY})
-- endif()
- endif()
-
- add_definitions(-DZLIB)
Modified: branches/2018Q4/databases/mariadb103-server/pkg-plist
==============================================================================
--- branches/2018Q4/databases/mariadb103-server/pkg-plist Sun Oct 28 08:14:44 2018 (r483237)
+++ branches/2018Q4/databases/mariadb103-server/pkg-plist Sun Oct 28 08:26:44 2018 (r483238)
@@ -7,7 +7,7 @@ bin/innochecksum
bin/mariabackup
bin/mbstream
@comment bin/msql2mysql
- at comment bin/my_print_defaults
+bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
@@ -25,8 +25,8 @@ bin/mysql_install_db
bin/mysql_plugin
bin/mysql_secure_installation
@comment bin/mysql_setpermission
- at comment bin/mysql_tzinfo_to_sql
- at comment bin/mysql_upgrade
+bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
@comment bin/mysqlaccess
bin/mysqld_multi
bin/mysqld_safe
@@ -36,7 +36,7 @@ bin/mysqldumpslow
@comment bin/mysqltest
@comment bin/mysqltest_embedded
@comment bin/mytop
- at comment bin/perror
+bin/perror
@comment bin/replace
bin/resolve_stack_dump
bin/resolveip
@@ -51,6 +51,7 @@ bin/resolveip
%%WSREP%%bin/wsrep_sst_rsync_wan
%%WSREP%%bin/wsrep_sst_xtrabackup
%%WSREP%%bin/wsrep_sst_xtrabackup-v2
+ at comment data/test/db.opt
@comment include/mysql/my_config.h
@comment include/mysql/my_global.h
@comment include/mysql/my_sys.h
@@ -206,7 +207,9 @@ man/man1/galera_new_cluster.1.gz
man/man1/galera_recovery.1.gz
man/man1/innochecksum.1.gz
@comment man/man1/mariadb-service-convert.1.gz
- at comment man/man1/my_print_defaults.1.gz
+man/man1/mariabackup.1.gz
+man/man1/mbstream.1.gz
+man/man1/my_print_defaults.1.gz
man/man1/myisam_ftdump.1.gz
man/man1/myisamchk.1.gz
man/man1/myisamlog.1.gz
@@ -214,26 +217,29 @@ man/man1/myisampack.1.gz
man/man1/mysql.server.1.gz
@comment man/man1/mysql_convert_table_format.1.gz
man/man1/mysql_fix_extensions.1.gz
+%%ROCKSDB%%man/man1/mysql_ldb.1.gz
man/man1/mysql_install_db.1.gz
man/man1/mysql_secure_installation.1.gz
@comment man/man1/mysql_setpermission.1.gz
@comment man/man1/mysql_tzinfo_to_sql.1.gz
- at comment man/man1/mysql_upgrade.1.gz
+man/man1/mysql_upgrade.1.gz
man/man1/mysqld_multi.1.gz
man/man1/mysqld_safe.1.gz
man/man1/mysqld_safe_helper.1.gz
man/man1/mysqldumpslow.1.gz
@comment man/man1/mysqlhotcopy.1.gz
@comment man/man1/mysqltest.1.gz
- at comment man/man1/perror.1.gz
+man/man1/perror.1.gz
@comment man/man1/replace.1.gz
man/man1/resolve_stack_dump.1.gz
man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logdump.1.gz
+%%TOKUDB%%man/man1/tokuft_logprint.1.gz
%%TOKUDB%%man/man1/tokuftdump.1.gz
%%WSREP%%man/man1/wsrep_sst_common.1.gz
+%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz
%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
%%WSREP%%man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
%%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz
%%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz
man/man8/mysqld.8.gz
@@ -243,6 +249,9 @@ man/man8/mysqld.8.gz
%%SPIDER%%%%DATADIR%%/install_spider.sql
%%DATADIR%%/maria_add_gis_sp.sql
%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
%%DATADIR%%/mysql-log-rotate
%%DATADIR%%/mysql.server
%%DATADIR%%/mysql_performance_tables.sql
@@ -252,6 +261,57 @@ man/man8/mysqld.8.gz
%%DATADIR%%/mysql_test_db.sql
%%DATADIR%%/mysql_to_mariadb.sql
%%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/charsets/Index.xml
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/armscii8.xml
+%%DATADIR%%/charsets/ascii.xml
+%%DATADIR%%/charsets/cp1250.xml
+%%DATADIR%%/charsets/cp1251.xml
+%%DATADIR%%/charsets/cp1256.xml
+%%DATADIR%%/charsets/cp1257.xml
+%%DATADIR%%/charsets/cp850.xml
+%%DATADIR%%/charsets/cp852.xml
+%%DATADIR%%/charsets/cp866.xml
+%%DATADIR%%/charsets/dec8.xml
+%%DATADIR%%/charsets/geostd8.xml
+%%DATADIR%%/charsets/greek.xml
+%%DATADIR%%/charsets/hebrew.xml
+%%DATADIR%%/charsets/hp8.xml
+%%DATADIR%%/charsets/keybcs2.xml
+%%DATADIR%%/charsets/koi8r.xml
+%%DATADIR%%/charsets/koi8u.xml
+%%DATADIR%%/charsets/latin1.xml
+%%DATADIR%%/charsets/latin2.xml
+%%DATADIR%%/charsets/latin5.xml
+%%DATADIR%%/charsets/latin7.xml
+%%DATADIR%%/charsets/macce.xml
+%%DATADIR%%/charsets/macroman.xml
+%%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
%%WSREP%%%%DATADIR%%/wsrep.cnf
%%WSREP%%%%DATADIR%%/wsrep_notify
@comment %%DOCSDIR%%/COPYING
More information about the svn-ports-all
mailing list