diff options
| author | nia <nia@pkgsrc.org> | 2021-05-23 15:32:47 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-05-23 15:32:47 +0000 |
| commit | b0abab2181a490bfcc286dd63530881d00842157 (patch) | |
| tree | 0236bb8c43d442c2a41b633335f3a69d4abf4169 /databases/mariadb105-client | |
| parent | ebee6b304dc8cfe70c916cb5fe775e02da558bf7 (diff) | |
| download | pkgsrc-b0abab2181a490bfcc286dd63530881d00842157.tar.gz | |
mariadb105[-client,-server]: import mariadb 10.5
MariaDB Server is one of the most popular open source relational databases.
It's made by the original developers of MySQL.
MariaDB turns data into structured information in a wide array of applications,
ranging from banking to websites. It is an enhanced, drop-in replacement
for MySQL. MariaDB is used because it is fast, scalable and robust, with a
rich ecosystem of storage engines, plugins and many other tools make it very
versatile for a wide variety of use cases.
MariaDB is developed as open source software and as a relational database
it provides an SQL interface for accessing data. The latest versions of
MariaDB also include GIS and JSON features.
Diffstat (limited to 'databases/mariadb105-client')
32 files changed, 1120 insertions, 0 deletions
diff --git a/databases/mariadb105-client/DESCR b/databases/mariadb105-client/DESCR new file mode 100644 index 00000000000..8cdd16ab326 --- /dev/null +++ b/databases/mariadb105-client/DESCR @@ -0,0 +1,14 @@ +MariaDB Server is one of the most popular open source relational databases. +It's made by the original developers of MySQL. + +MariaDB turns data into structured information in a wide array of applications, +ranging from banking to websites. It is an enhanced, drop-in replacement +for MySQL. MariaDB is used because it is fast, scalable and robust, with a +rich ecosystem of storage engines, plugins and many other tools make it very +versatile for a wide variety of use cases. + +MariaDB is developed as open source software and as a relational database +it provides an SQL interface for accessing data. The latest versions of +MariaDB also include GIS and JSON features. + +This package contains the MariaDB client programs and libraries. diff --git a/databases/mariadb105-client/MESSAGE b/databases/mariadb105-client/MESSAGE new file mode 100644 index 00000000000..4b8d0613cba --- /dev/null +++ b/databases/mariadb105-client/MESSAGE @@ -0,0 +1,5 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2021/05/23 15:32:47 nia Exp $ + +This package is EXPERIMENTAL for now, recommend to only use for testing. +=========================================================================== diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile new file mode 100644 index 00000000000..d467cbdb224 --- /dev/null +++ b/databases/mariadb105-client/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1 2021/05/23 15:32:47 nia Exp $ + +PKGNAME= ${DISTNAME:S/-/-client-/} +COMMENT= MariaDB 10.5, a free SQL database (client) + +CONFLICTS= mysql-client-[0-9]* + +.include "Makefile.common" + +CMAKE_ARGS+= -DWITHOUT_SERVER=ON + +INSTALL_DIRS+= client include libmariadb man scripts + +.include "options.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/databases/mariadb105-client/Makefile.common b/databases/mariadb105-client/Makefile.common new file mode 100644 index 00000000000..e37c609221d --- /dev/null +++ b/databases/mariadb105-client/Makefile.common @@ -0,0 +1,133 @@ +# $NetBSD: Makefile.common,v 1.1 2021/05/23 15:32:47 nia Exp $ +# +# used by databases/mariadb105-client/Makefile +# used by databases/mariadb105-server/Makefile + +DISTNAME= mariadb-10.5.10 +CATEGORIES= databases +MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ +MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ + +MAINTAINER?= pkgsrc-users@NetBSD.org +HOMEPAGE= https://mariadb.org/ +LICENSE= gnu-gpl-v2 + +DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb105-client/distinfo +PATCHDIR?= ${.CURDIR}/../../databases/mariadb105-client/patches +MESSAGE_SRC+= ${.CURDIR}/../../databases/mariadb105-client/MESSAGE + +USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_TOOLS+= perl:run pkg-config bison + +PLIST_SRC= ${PLIST_SRC_DFLT} + +.include "../../mk/bsd.prefs.mk" + +# home directory (location of the databases) +.if !empty(MYSQL_DATADIR) +MARIADB_DATADIR?= ${MYSQL_DATADIR} +.else +MARIADB_DATADIR?= ${VARBASE}/db/mariadb +.endif + +# default character set +.if !empty(MYSQL_CHARSET) +MARIADB_CHARSET?= ${MYSQL_CHARSET} +.else +MARIADB_CHARSET?= utf8mb4 +.endif + +# additional character set to be compiled in +.if !empty(MYSQL_COLLATION) +MARIADB_COLLATION?= ${MYSQL_COLLATION} +.else +MARIADB_COLLATION?= utf8mb4_unicode_ci +.endif + +.if !empty(MYSQL_EXTRA_CHARSET) +MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET} +.else +MARIADB_EXTRA_CHARSET?= all +.endif + +BUILD_DEFS+= VARBASE + +CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc" + +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" + +CMAKE_ARGS+= -DINSTALL_BINDIR="bin" +CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" +CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql" +CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql" +CMAKE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}" +CMAKE_ARGS+= -DINSTALL_LIBDIR="lib" +CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" +CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" +CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" +CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" +CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" +CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" +CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" +CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" +CMAKE_ARGS+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}" +CMAKE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR} + +CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF +CMAKE_ARGS+= -DWITH_LIBWRAP=ON +CMAKE_ARGS+= -DWITH_PCRE="system" +CMAKE_ARGS+= -DWITH_ZLIB="system" +CMAKE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET} +CMAKE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q} +CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q} + +CMAKE_ARGS+= -DPLUGIN_EXAMPLE=NO +CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO + +# Requires Java +CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF + +# Options which affect generation of includes +CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON +CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON +CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON + +CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON + +CMAKE_ARGS+= -DENABLE_DTRACE=OFF + +CMAKE_ARGS+= -DTOKUDB_OK=OFF + +# Ensure the correct DTrace ABI is used. +.if !empty(ABI) +CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" +.endif + +CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE + +CPPFLAGS.SunOS+= -fPIC + +REPLACE_PERL+= scripts/mytop.sh +REPLACE_PERL+= sql-bench/*.sh + +SUBST_CLASSES+= perl +SUBST_STAGE.perl= pre-configure +SUBST_FILES.perl= scripts/CMakeLists.txt +SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" +SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" + +CHECK_INTERPRETER_SKIP+= share/mysql/test/* +CHECK_PORTABILITY_SKIP+= storage/columnstore/columnstore/oam/cloud/*.sh.in +CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov + +PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in +PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in + +.include "../../devel/pcre2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" +.include "../../mk/dlopen.buildlink3.mk" +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} +.include "../../mk/readline.buildlink3.mk" diff --git a/databases/mariadb105-client/PLIST b/databases/mariadb105-client/PLIST new file mode 100644 index 00000000000..f4960096cd3 --- /dev/null +++ b/databases/mariadb105-client/PLIST @@ -0,0 +1,344 @@ +@comment $NetBSD: PLIST,v 1.1 2021/05/23 15:32:47 nia Exp $ +bin/mariadb +bin/mariadb-access +bin/mariadb-admin +bin/mariadb-binlog +bin/mariadb-check +bin/mariadb-conv +bin/mariadb-dump +bin/mariadb-find-rows +bin/mariadb-import +bin/mariadb-plugin +bin/mariadb-show +bin/mariadb-slap +bin/mariadb-test +bin/mariadb-upgrade +bin/mariadb_config +bin/msql2mysql +bin/mysql +bin/mysql_config +bin/mysql_convert_table_format +bin/mysql_find_rows +bin/mysql_plugin +bin/mysql_secure_installation +bin/mysql_setpermission +bin/mysql_upgrade +bin/mysqlaccess +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlcheck +bin/mysqldump +bin/mysqlhotcopy +bin/mysqlimport +bin/mysqlshow +bin/mysqlslap +bin/mysqltest +bin/mytop +include/mysql/errmsg.h +include/mysql/ma_list.h +include/mysql/ma_pvio.h +include/mysql/ma_tls.h +include/mysql/mariadb/ma_io.h +include/mysql/mariadb_com.h +include/mysql/mariadb_ctype.h +include/mysql/mariadb_dyncol.h +include/mysql/mariadb_rpl.h +include/mysql/mariadb_stmt.h +include/mysql/mariadb_version.h +include/mysql/my_config.h +include/mysql/my_global.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql/client_plugin.h +include/mysql/mysql/plugin_auth.h +include/mysql/mysql/plugin_auth_common.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysqld_error.h +include/mysql/server/big_endian.h +include/mysql/server/byte_order_generic.h +include/mysql/server/byte_order_generic_x86.h +include/mysql/server/byte_order_generic_x86_64.h +include/mysql/server/decimal.h +include/mysql/server/errmsg.h +include/mysql/server/handler_ername.h +include/mysql/server/handler_state.h +include/mysql/server/json_lib.h +include/mysql/server/keycache.h +include/mysql/server/little_endian.h +include/mysql/server/m_ctype.h +include/mysql/server/m_string.h +include/mysql/server/ma_dyncol.h +include/mysql/server/my_alloc.h +include/mysql/server/my_attribute.h +include/mysql/server/my_byteorder.h +include/mysql/server/my_compiler.h +include/mysql/server/my_config.h +include/mysql/server/my_dbug.h +include/mysql/server/my_decimal_limits.h +include/mysql/server/my_dir.h +include/mysql/server/my_getopt.h +include/mysql/server/my_global.h +include/mysql/server/my_list.h +include/mysql/server/my_net.h +include/mysql/server/my_pthread.h +include/mysql/server/my_sys.h +include/mysql/server/my_valgrind.h +include/mysql/server/my_xml.h +include/mysql/server/mysql.h +include/mysql/server/mysql/auth_dialog_client.h +include/mysql/server/mysql/client_plugin.h +include/mysql/server/mysql/plugin.h +include/mysql/server/mysql/plugin_audit.h +include/mysql/server/mysql/plugin_auth.h +include/mysql/server/mysql/plugin_auth_common.h +include/mysql/server/mysql/plugin_data_type.h +include/mysql/server/mysql/plugin_encryption.h +include/mysql/server/mysql/plugin_ftparser.h +include/mysql/server/mysql/plugin_function.h +include/mysql/server/mysql/plugin_password_validation.h +include/mysql/server/mysql/psi/mysql_file.h +include/mysql/server/mysql/psi/mysql_idle.h +include/mysql/server/mysql/psi/mysql_mdl.h +include/mysql/server/mysql/psi/mysql_memory.h +include/mysql/server/mysql/psi/mysql_ps.h +include/mysql/server/mysql/psi/mysql_socket.h +include/mysql/server/mysql/psi/mysql_sp.h +include/mysql/server/mysql/psi/mysql_stage.h +include/mysql/server/mysql/psi/mysql_statement.h +include/mysql/server/mysql/psi/mysql_table.h +include/mysql/server/mysql/psi/mysql_thread.h +include/mysql/server/mysql/psi/mysql_transaction.h +include/mysql/server/mysql/psi/psi.h +include/mysql/server/mysql/psi/psi_abi_v0.h +include/mysql/server/mysql/psi/psi_abi_v1.h +include/mysql/server/mysql/psi/psi_abi_v2.h +include/mysql/server/mysql/psi/psi_base.h +include/mysql/server/mysql/psi/psi_memory.h +include/mysql/server/mysql/service_base64.h +include/mysql/server/mysql/service_debug_sync.h +include/mysql/server/mysql/service_encryption.h +include/mysql/server/mysql/service_encryption_scheme.h +include/mysql/server/mysql/service_json.h +include/mysql/server/mysql/service_kill_statement.h +include/mysql/server/mysql/service_logger.h +include/mysql/server/mysql/service_md5.h +include/mysql/server/mysql/service_my_crypt.h +include/mysql/server/mysql/service_my_print_error.h +include/mysql/server/mysql/service_my_snprintf.h +include/mysql/server/mysql/service_progress_report.h +include/mysql/server/mysql/service_sha1.h +include/mysql/server/mysql/service_sha2.h +include/mysql/server/mysql/service_thd_alloc.h +include/mysql/server/mysql/service_thd_autoinc.h +include/mysql/server/mysql/service_thd_error_context.h +include/mysql/server/mysql/service_thd_mdl.h +include/mysql/server/mysql/service_thd_rnd.h +include/mysql/server/mysql/service_thd_specifics.h +include/mysql/server/mysql/service_thd_timezone.h +include/mysql/server/mysql/service_thd_wait.h +include/mysql/server/mysql/service_wsrep.h +include/mysql/server/mysql/services.h +include/mysql/server/mysql_com.h +include/mysql/server/mysql_com_server.h +include/mysql/server/mysql_embed.h +include/mysql/server/mysql_time.h +include/mysql/server/mysql_version.h +include/mysql/server/mysqld_ername.h +include/mysql/server/mysqld_error.h +include/mysql/server/pack.h +include/mysql/server/private/aria_backup.h +include/mysql/server/private/assume_aligned.h +include/mysql/server/private/atomic/gcc_builtins.h +include/mysql/server/private/atomic/generic-msvc.h +include/mysql/server/private/atomic/solaris.h +include/mysql/server/private/config.h +include/mysql/server/private/dur_prop.h +include/mysql/server/private/ft_global.h +include/mysql/server/private/hash.h +include/mysql/server/private/heap.h +include/mysql/server/private/ilist.h +include/mysql/server/private/lf.h +include/mysql/server/private/maria.h +include/mysql/server/private/my_alarm.h +include/mysql/server/private/my_atomic.h +include/mysql/server/private/my_atomic_wrapper.h +include/mysql/server/private/my_base.h +include/mysql/server/private/my_bit.h +include/mysql/server/private/my_bitmap.h +include/mysql/server/private/my_check_opt.h +include/mysql/server/private/my_compare.h +include/mysql/server/private/my_context.h +include/mysql/server/private/my_counter.h +include/mysql/server/private/my_cpu.h +include/mysql/server/private/my_crypt.h +include/mysql/server/private/my_default.h +include/mysql/server/private/my_handler_errors.h +include/mysql/server/private/my_libwrap.h +include/mysql/server/private/my_md5.h +include/mysql/server/private/my_nosys.h +include/mysql/server/private/my_rdtsc.h +include/mysql/server/private/my_rnd.h +include/mysql/server/private/my_service_manager.h +include/mysql/server/private/my_stack_alloc.h +include/mysql/server/private/my_stacktrace.h +include/mysql/server/private/my_time.h +include/mysql/server/private/my_tree.h +include/mysql/server/private/my_uctype.h +include/mysql/server/private/my_user.h +include/mysql/server/private/myisam.h +include/mysql/server/private/myisamchk.h +include/mysql/server/private/myisammrg.h +include/mysql/server/private/myisampack.h +include/mysql/server/private/mysql_async.h +include/mysql/server/private/mysqld_default_groups.h +include/mysql/server/private/mysys_err.h +include/mysql/server/private/password.h +include/mysql/server/private/pfs_file_provider.h +include/mysql/server/private/pfs_idle_provider.h +include/mysql/server/private/pfs_memory_provider.h +include/mysql/server/private/pfs_metadata_provider.h +include/mysql/server/private/pfs_socket_provider.h +include/mysql/server/private/pfs_stage_provider.h +include/mysql/server/private/pfs_statement_provider.h +include/mysql/server/private/pfs_table_provider.h +include/mysql/server/private/pfs_thread_provider.h +include/mysql/server/private/pfs_transaction_provider.h +include/mysql/server/private/probes_mysql.h +include/mysql/server/private/probes_mysql_nodtrace.h +include/mysql/server/private/queues.h +include/mysql/server/private/rijndael.h +include/mysql/server/private/scope.h +include/mysql/server/private/service_versions.h +include/mysql/server/private/source_revision.h +include/mysql/server/private/span.h +include/mysql/server/private/ssl_compat.h +include/mysql/server/private/t_ctype.h +include/mysql/server/private/thr_alarm.h +include/mysql/server/private/thr_lock.h +include/mysql/server/private/thr_timer.h +include/mysql/server/private/thread_pool_priv.h +include/mysql/server/private/violite.h +include/mysql/server/private/waiting_threads.h +include/mysql/server/private/welcome_copyright_notice.h +include/mysql/server/private/wqueue.h +include/mysql/server/private/wsrep.h +include/mysql/server/sql_common.h +include/mysql/server/sql_state.h +include/mysql/server/sslopt-case.h +include/mysql/server/sslopt-longopts.h +include/mysql/server/sslopt-vars.h +include/mysql/server/typelib.h +lib/libmariadb.so +lib/libmariadb.so.3 +lib/libmariadbclient.a +lib/libmysqlclient.a +lib/libmysqlclient.so +lib/libmysqlclient_r.a +lib/libmysqlclient_r.so +lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/plugin/caching_sha2_password.so +lib/mysql/plugin/client_ed25519.so +lib/mysql/plugin/dialog.so +lib/mysql/plugin/mysql_clear_password.so +lib/mysql/plugin/sha256_password.so +lib/pkgconfig/libmariadb.pc +man/man1/aria_chk.1 +man/man1/aria_dump_log.1 +man/man1/aria_ftdump.1 +man/man1/aria_pack.1 +man/man1/aria_read_log.1 +man/man1/aria_s3_copy.1 +man/man1/galera_new_cluster.1 +man/man1/galera_recovery.1 +man/man1/innochecksum.1 +man/man1/mariabackup.1 +man/man1/mariadb-access.1 +man/man1/mariadb-admin.1 +man/man1/mariadb-backup.1 +man/man1/mariadb-binlog.1 +man/man1/mariadb-check.1 +man/man1/mariadb-client-test-embedded.1 +man/man1/mariadb-client-test.1 +man/man1/mariadb-conv.1 +man/man1/mariadb-convert-table-format.1 +man/man1/mariadb-dump.1 +man/man1/mariadb-dumpslow.1 +man/man1/mariadb-embedded.1 +man/man1/mariadb-find-rows.1 +man/man1/mariadb-fix-extensions.1 +man/man1/mariadb-hotcopy.1 +man/man1/mariadb-import.1 +man/man1/mariadb-install-db.1 +man/man1/mariadb-ldb.1 +man/man1/mariadb-plugin.1 +man/man1/mariadb-secure-installation.1 +man/man1/mariadb-service-convert.1 +man/man1/mariadb-setpermission.1 +man/man1/mariadb-show.1 +man/man1/mariadb-slap.1 +man/man1/mariadb-test-embedded.1 +man/man1/mariadb-test.1 +man/man1/mariadb-tzinfo-to-sql.1 +man/man1/mariadb-upgrade.1 +man/man1/mariadb-waitpid.1 +man/man1/mariadb.1 +man/man1/mariadb_config.1 +man/man1/mariadbd-multi.1 +man/man1/mariadbd-safe-helper.1 +man/man1/mariadbd-safe.1 +man/man1/mbstream.1 +man/man1/msql2mysql.1 +man/man1/my_print_defaults.1 +man/man1/my_safe_process.1 +man/man1/myisam_ftdump.1 +man/man1/myisamchk.1 +man/man1/myisamlog.1 +man/man1/myisampack.1 +man/man1/myrocks_hotbackup.1 +man/man1/mysql-stress-test.pl.1 +man/man1/mysql-test-run.pl.1 +man/man1/mysql.1 +man/man1/mysql.server.1 +man/man1/mysql_client_test.1 +man/man1/mysql_client_test_embedded.1 +man/man1/mysql_config.1 +man/man1/mysql_convert_table_format.1 +man/man1/mysql_embedded.1 +man/man1/mysql_find_rows.1 +man/man1/mysql_fix_extensions.1 +man/man1/mysql_install_db.1 +man/man1/mysql_ldb.1 +man/man1/mysql_plugin.1 +man/man1/mysql_secure_installation.1 +man/man1/mysql_setpermission.1 +man/man1/mysql_tzinfo_to_sql.1 +man/man1/mysql_upgrade.1 +man/man1/mysql_waitpid.1 +man/man1/mysqlaccess.1 +man/man1/mysqladmin.1 +man/man1/mysqlbinlog.1 +man/man1/mysqlcheck.1 +man/man1/mysqld_multi.1 +man/man1/mysqld_safe.1 +man/man1/mysqld_safe_helper.1 +man/man1/mysqldump.1 +man/man1/mysqldumpslow.1 +man/man1/mysqlhotcopy.1 +man/man1/mysqlimport.1 +man/man1/mysqlshow.1 +man/man1/mysqlslap.1 +man/man1/mysqltest.1 +man/man1/mysqltest_embedded.1 +man/man1/mytop.1 +man/man1/perror.1 +man/man1/replace.1 +man/man1/resolve_stack_dump.1 +man/man1/resolveip.1 +man/man1/wsrep_sst_common.1 +man/man1/wsrep_sst_mariabackup.1 +man/man1/wsrep_sst_mysqldump.1 +man/man1/wsrep_sst_rsync.1 +man/man1/wsrep_sst_rsync_wan.1 +man/man8/mariadbd.8 +man/man8/mysqld.8 diff --git a/databases/mariadb105-client/buildlink3.mk b/databases/mariadb105-client/buildlink3.mk new file mode 100644 index 00000000000..c8c1bf96085 --- /dev/null +++ b/databases/mariadb105-client/buildlink3.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink3.mk,v 1.1 2021/05/23 15:32:47 nia Exp $ + +# This buildlink file uses mysql-client and not mariadb-client, +# because some packages depending on it expect BUILDLINK_*.mysql-client +# to be set and will fail build if they get BUILDLINK_*.mariadb-client +# instead. +BUILDLINK_TREE+= mysql-client + +.if !defined(MYSQL_CLIENT_BUILDLINK3_MK) +MYSQL_CLIENT_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=10.5.0<10.6.0 +BUILDLINK_ABI_DEPENDS.mysql-client+= mariadb-client>=10.5.0<10.6.0 +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb105-client +BUILDLINK_INCDIRS.mysql-client+= include/mysql +BUILDLINK_LIBDIRS.mysql-client+= lib + +pkgbase := mysql-client +.include "../../mk/pkg-build-options.mk" + +.if ${PKG_BUILD_OPTIONS.mysql-client:Mssl} +. include "../../security/openssl/buildlink3.mk" +.endif +.include "../../devel/zlib/buildlink3.mk" +.endif # MYSQL_CLIENT_BUILDLINK3_MK + +BUILDLINK_TREE+= -mysql-client diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo new file mode 100644 index 00000000000..45912d6ae4f --- /dev/null +++ b/databases/mariadb105-client/distinfo @@ -0,0 +1,30 @@ +$NetBSD: distinfo,v 1.1 2021/05/23 15:32:47 nia Exp $ + +SHA1 (mariadb-10.5.10.tar.gz) = 7381ea990812be76b39688115f2cae40aa68b1d4 +RMD160 (mariadb-10.5.10.tar.gz) = 243fa6266f93d4a01c377b95704a3923b62eadce +SHA512 (mariadb-10.5.10.tar.gz) = 93dd1405f8b31989e130dee5b7d4a0b447aa0e017fb9ee02c792c52142d84d1103e8fd591101d72deda1ac65b10c48053582f6e61bd1757e6aa92e42d98c56cd +Size (mariadb-10.5.10.tar.gz) = 99019617 bytes +SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f +SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811 +SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 +SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad +SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 +SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66 +SHA1 (patch-mysys_my__largepage.c) = d04a7a60f9cc6d70f30e454130ea0b76d7d98b3e +SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317 +SHA1 (patch-scripts_CMakeLists.txt) = b11f36e845716fccd455832b648f20413cd9de1f +SHA1 (patch-scripts_mysql__install__db.sh) = adf20e80a9881db97f3d2dd8279e52bcedf0bead +SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f +SHA1 (patch-sql_threadpool__generic.cc) = 2f5cf0a1d5e23696218d69698455e9181cccc629 +SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3 +SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836 +SHA1 (patch-storage_perfschema_my__thread.h) = a3bf42289017789d0fb62586dced32e283bd7ff4 +SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083 +SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301 +SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12 +SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd +SHA1 (patch-storage_tokudb_PerconaFT_portability_file.cc) = 830b4c6b20713c811fcd847c1e1abfd8441d0d4a +SHA1 (patch-storage_tokudb_PerconaFT_portability_toku__htod.h) = 66635f0f79310bb3b2975c64ba6432e9a40ece70 +SHA1 (patch-storage_tokudb_PerconaFT_portability_toku__portability.h) = 75ede1251371eb467901a59672d39443d8c28031 +SHA1 (patch-storage_tokudb_PerconaFT_src_CMakeLists.txt) = 3a9fb10c8515d256a9d58f18605733840bba1039 +SHA1 (patch-support-files_mysql.server.sh) = a98d82cdda1dbd5ef8ebb7e457bb51661b5fd275 diff --git a/databases/mariadb105-client/options.mk b/databases/mariadb105-client/options.mk new file mode 100644 index 00000000000..07a43442713 --- /dev/null +++ b/databases/mariadb105-client/options.mk @@ -0,0 +1,16 @@ +# $NetBSD: options.mk,v 1.1 2021/05/23 15:32:47 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-client + +PKG_SUPPORTED_OPTIONS+= ssl +PKG_SUGGESTED_OPTIONS+= ssl + +.include "../../mk/bsd.options.mk" + +# Enable OpenSSL support +.if !empty(PKG_OPTIONS:Mssl) +.include "../../security/openssl/buildlink3.mk" +CMAKE_ARGS+= -DWITH_SSL=system +.else +CMAKE_ARGS+= -DWITH_SSL=no +.endif diff --git a/databases/mariadb105-client/patches/patch-BUILD_compile-pentium32-gcov b/databases/mariadb105-client/patches/patch-BUILD_compile-pentium32-gcov new file mode 100644 index 00000000000..c499f2a2892 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-BUILD_compile-pentium32-gcov @@ -0,0 +1,15 @@ +$NetBSD: patch-BUILD_compile-pentium32-gcov,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Shell portability. + +--- BUILD/compile-pentium32-gcov.orig 2020-01-26 20:43:49.000000000 +0000 ++++ BUILD/compile-pentium32-gcov +@@ -22,7 +22,7 @@ CCACHE_GCOV_VERSION_ENABLED=0 + if ccache -V > /dev/null 2>&1 + then + CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//` +- if test "$CCACHE_VER" == "2.4-gcov" ++ if test "$CCACHE_VER" = "2.4-gcov" + then + CCACHE_GCOV_VERSION_ENABLED=1 + else diff --git a/databases/mariadb105-client/patches/patch-CMakeLists.txt b/databases/mariadb105-client/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..e2adb5f5bb1 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-CMakeLists.txt @@ -0,0 +1,61 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Allow building a server-only configuration. + +--- CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000 ++++ CMakeLists.txt +@@ -421,8 +421,6 @@ ENDIF() + + UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) + +-INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) +- + INCLUDE(cpack_rpm) + INCLUDE(cpack_deb) + +@@ -432,13 +430,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) + # Add storage engines and plugins. + CONFIGURE_PLUGINS() + +-ADD_SUBDIRECTORY(include) + ADD_SUBDIRECTORY(dbug) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) + ADD_SUBDIRECTORY(mysys) + ADD_SUBDIRECTORY(mysys_ssl) +-ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(sql/share) +@@ -461,23 +457,26 @@ IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(win/upgrade_wizard) + ADD_SUBDIRECTORY(win/packaging) + ENDIF() +-ENDIF() +- +-IF(UNIX) ++ELSE() ++ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) ++ ADD_SUBDIRECTORY(client) ++ ADD_SUBDIRECTORY(include) + ADD_SUBDIRECTORY(man) ++ ADD_SUBDIRECTORY(support-files) + ENDIF() + + INCLUDE(cmake/abi_check.cmake) + INCLUDE(cmake/tags.cmake) + INCLUDE(for_clients) + ADD_SUBDIRECTORY(scripts) +-ADD_SUBDIRECTORY(support-files) + ADD_SUBDIRECTORY(extra/aws_sdk) + + IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) +- SET(EXPORTED comp_err comp_sql factorial) ++ SET(EXPORTED comp_err factorial) + IF(NOT WITHOUT_SERVER) + SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token) ++ ELSE() ++ SET(EXPORTED ${EXPORTED} comp_sql) + ENDIF() + # minimal target to build only binaries for export + ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) diff --git a/databases/mariadb105-client/patches/patch-client_CMakeLists.txt b/databases/mariadb105-client/patches/patch-client_CMakeLists.txt new file mode 100644 index 00000000000..2ad0cf2330a --- /dev/null +++ b/databases/mariadb105-client/patches/patch-client_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-client_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Allow building a server-only configuration. + +--- client/CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000 ++++ client/CMakeLists.txt +@@ -60,7 +60,7 @@ MYSQL_ADD_EXECUTABLE(mariadb-import mysq + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mariadb-import ${CLIENT_LIB}) + +-MYSQL_ADD_EXECUTABLE(mariadb-upgrade mysql_upgrade.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(mariadb-upgrade mysql_upgrade.c) + TARGET_LINK_LIBRARIES(mariadb-upgrade ${CLIENT_LIB}) + ADD_DEPENDENCIES(mariadb-upgrade GenFixPrivs) + diff --git a/databases/mariadb105-client/patches/patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh b/databases/mariadb105-client/patches/patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh new file mode 100644 index 00000000000..645af9742f6 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh @@ -0,0 +1,20 @@ +$NetBSD: patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Shell portability. + +--- extra/wolfssl/wolfssl/certs/intermediate/genintcerts.sh.orig 2020-01-26 20:43:50.000000000 +0000 ++++ extra/wolfssl/wolfssl/certs/intermediate/genintcerts.sh +@@ -175,11 +175,11 @@ create_cert() { + mv ./certs/intermediate/tmp.pem ./certs/intermediate/$4.pem + } + +-if [ "$1" == "clean" ]; then ++if [ "$1" = "clean" ]; then + echo "Cleaning temp files" + cleanup_files + fi +-if [ "$1" == "cleanall" ]; then ++if [ "$1" = "cleanall" ]; then + echo "Cleaning all files" + rm -f ./certs/intermediate/*.pem + rm -f ./certs/intermediate/*.der diff --git a/databases/mariadb105-client/patches/patch-include_my__global.h b/databases/mariadb105-client/patches/patch-include_my__global.h new file mode 100644 index 00000000000..90ef7c7d4a6 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-include_my__global.h @@ -0,0 +1,20 @@ +$NetBSD: patch-include_my__global.h,v 1.1 2021/05/23 15:32:47 nia Exp $ + +NetBSD guards C99 printf format macros, needs to be triggered +here for early includes. + +--- include/my_global.h.orig 2015-02-25 15:40:54.000000000 +0000 ++++ include/my_global.h +@@ -50,6 +50,12 @@ + #define _POSIX_THREAD_CPUTIME + #endif /* __CYGWIN__ */ + ++/* NetBSD guards C99 printf format macros, needs to be triggered ++ here for early includes */ ++#if defined(__NetBSD__) ++#define __STDC_FORMAT_MACROS ++#endif ++ + #if defined(__OpenBSD__) && (OpenBSD >= 200411) + #define HAVE_ERRNO_AS_DEFINE + #endif diff --git a/databases/mariadb105-client/patches/patch-mysys_my__context.c b/databases/mariadb105-client/patches/patch-mysys_my__context.c new file mode 100644 index 00000000000..631862e6e6e --- /dev/null +++ b/databases/mariadb105-client/patches/patch-mysys_my__context.c @@ -0,0 +1,24 @@ +$NetBSD: patch-mysys_my__context.c,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Don't insert DWARF directives on SunOS. + +--- mysys/my_context.c.orig 2020-03-25 10:28:39.248862779 +0000 ++++ mysys/my_context.c +@@ -207,7 +207,7 @@ my_context_spawn(struct my_context *c, v + "movq %%rsp, (%[save])\n\t" + "movq %[stack], %%rsp\n\t" + #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __clang__) && \ +- !defined(__INTEL_COMPILER) ++ !defined(__INTEL_COMPILER) && !defined(__sun) + /* + This emits a DWARF DW_CFA_undefined directive to make the return address + undefined. This indicates that this is the top of the stack frame, and +@@ -455,7 +455,7 @@ my_context_spawn(struct my_context *c, v + ( + "movl %%esp, (%[save])\n\t" + "movl %[stack], %%esp\n\t" +-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && !defined(__INTEL_COMPILER) ++#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && !defined(__INTEL_COMPILER) && !defined(__sun) + /* + This emits a DWARF DW_CFA_undefined directive to make the return address + undefined. This indicates that this is the top of the stack frame, and diff --git a/databases/mariadb105-client/patches/patch-mysys_my__largepage.c b/databases/mariadb105-client/patches/patch-mysys_my__largepage.c new file mode 100644 index 00000000000..df4bdbad4d5 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-mysys_my__largepage.c @@ -0,0 +1,19 @@ +$NetBSD: patch-mysys_my__largepage.c,v 1.1 2021/05/23 15:32:47 nia Exp $ + +NetBSD does not have MAP_ALIGNED_SUPER. + +--- mysys/my_largepage.c.orig 2021-05-05 21:00:19.000000000 +0000 ++++ mysys/my_largepage.c +@@ -336,8 +336,12 @@ uchar *my_large_malloc(size_t *size, myf + # warning "No explicit large page (HUGETLB pages) support in Linux < 3.8" + #endif + #elif defined(MAP_ALIGNED) ++#ifdef MAP_ALIGNED_SUPER + mapflag|= MAP_ALIGNED_SUPER | + MAP_ALIGNED(my_bit_log2_size_t(large_page_size)); ++#else ++ mapflag|= MAP_ALIGNED(my_bit_log2_size_t(large_page_size)); ++#endif + #endif + aligned_size= MY_ALIGN(*size, (size_t) large_page_size); + } diff --git a/databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt b/databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt new file mode 100644 index 00000000000..85c289d42b9 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-plugin_auth__pam_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Check for pam_ext.h (not available on NetBSD). + +--- plugin/auth_pam/CMakeLists.txt.orig 2021-02-18 23:22:29.000000000 +0000 ++++ plugin/auth_pam/CMakeLists.txt +@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H) + WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)" + COMPONENT Server) + ENDIF() +- IF(TARGET auth_pam OR TARGET auth_pam_v1) ++ IF(HAVE_PAM_EXT_H AND (TARGET auth_pam OR TARGET auth_pam_v1)) + ADD_SUBDIRECTORY(testing) + ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) + TARGET_LINK_LIBRARIES(pam_user_map pam) diff --git a/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt b/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt new file mode 100644 index 00000000000..16685798eb3 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt @@ -0,0 +1,50 @@ +$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Allow building a server-only configuration. + +--- scripts/CMakeLists.txt.orig 2021-05-05 21:00:19.000000000 +0000 ++++ scripts/CMakeLists.txt +@@ -208,7 +208,7 @@ SET(pkgdata_locations "$basedir/${INSTAL + # install mysql_install_db.sh at this point since it needs + # different values for the above variables that will change + # afterwards +-IF(UNIX) ++IF(UNIX AND NOT WITHOUT_SERVER) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh + ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db ESCAPE_QUOTES @ONLY) + EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db) +@@ -314,21 +314,21 @@ ELSE() + mariadbd-safe + mariadb-dumpslow + ) ++ ELSE() ++ SET(CLIENT_SCRIPTS ++ msql2mysql ++ mariadb-setpermission ++ mariadb-secure-installation ++ mariadb-access ++ mariadb-convert-table-format ++ mariadb-find-rows ++ mysql_config ++ mytop ++ mariadb-hotcopy ++ ) + ENDIF() +- # Configure this one, for testing, but do not install it. +- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in +- ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY) +- # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS +- msql2mysql +- mariadb-setpermission +- mariadb-secure-installation +- mariadb-access +- mariadb-convert-table-format +- mariadb-find-rows +- mysql_config +- mytop +- mariadb-hotcopy ++ ${CLIENT_SCRIPTS} + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb105-client/patches/patch-scripts_mysql__install__db.sh b/databases/mariadb105-client/patches/patch-scripts_mysql__install__db.sh new file mode 100644 index 00000000000..6a355cf8746 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-scripts_mysql__install__db.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-scripts_mysql__install__db.sh,v 1.1 2021/05/23 15:32:47 nia Exp $ + +NetBSD does not have SO_PEERCRED, so there is no auth_socket. + +--- scripts/mysql_install_db.sh.orig 2021-02-18 23:22:29.000000000 +0000 ++++ scripts/mysql_install_db.sh +@@ -37,7 +37,7 @@ force=0 + in_rpm=0 + ip_only=0 + cross_bootstrap=0 +-auth_root_authentication_method=socket ++auth_root_authentication_method=normal + auth_root_socket_user="" + skip_test_db=0 + diff --git a/databases/mariadb105-client/patches/patch-scripts_mysqld__safe.sh b/databases/mariadb105-client/patches/patch-scripts_mysqld__safe.sh new file mode 100644 index 00000000000..7f8a8cd10ce --- /dev/null +++ b/databases/mariadb105-client/patches/patch-scripts_mysqld__safe.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-scripts_mysqld__safe.sh,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Shell portability. + +--- scripts/mysqld_safe.sh.orig 2020-01-26 20:43:53.000000000 +0000 ++++ scripts/mysqld_safe.sh +@@ -210,7 +210,7 @@ wsrep_pick_url() { + nc -z "$host" $port >/dev/null && break + done + +- if [ "$url" == "0" ]; then ++ if [ "$url" = "0" ]; then + log_error "ERROR: none of the URLs in '$@' is reachable." + return 1 + fi diff --git a/databases/mariadb105-client/patches/patch-sql_threadpool__generic.cc b/databases/mariadb105-client/patches/patch-sql_threadpool__generic.cc new file mode 100644 index 00000000000..e2a750747c8 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-sql_threadpool__generic.cc @@ -0,0 +1,19 @@ +$NetBSD: patch-sql_threadpool__generic.cc,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Deal with kqueue changes in NetBSD 10. + +--- sql/threadpool_generic.cc.orig 2021-05-05 21:00:19.000000000 +0000 ++++ sql/threadpool_generic.cc +@@ -240,7 +240,12 @@ static void *native_event_get_userdata(n + */ + + #ifdef __NetBSD__ ++#include <sys/param.h> ++# if __NetBSD_Prereq__(9,99,17) ++#define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, g) ++# else + #define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, (intptr_t)g) ++# endif + #else + #define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, g) + #endif diff --git a/databases/mariadb105-client/patches/patch-storage_connect_ioapi.c b/databases/mariadb105-client/patches/patch-storage_connect_ioapi.c new file mode 100644 index 00000000000..3d6a202ec83 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_connect_ioapi.c @@ -0,0 +1,15 @@ +$NetBSD: patch-storage_connect_ioapi.c,v 1.1 2021/05/23 15:32:47 nia Exp $ + +NetBSD has no fopen64(). + +--- storage/connect/ioapi.c.orig 2021-02-18 23:22:29.000000000 +0000 ++++ storage/connect/ioapi.c +@@ -14,7 +14,7 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + +-#if defined(__APPLE__) || defined(IOAPI_NO_64) ++#if defined(__APPLE__) || defined(__NetBSD__) || defined(IOAPI_NO_64) + // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions + #define FOPEN_FUNC(filename, mode) fopen(filename, mode) + #define FTELLO_FUNC(stream) ftello(stream) diff --git a/databases/mariadb105-client/patches/patch-storage_connect_tabvct.cpp b/databases/mariadb105-client/patches/patch-storage_connect_tabvct.cpp new file mode 100644 index 00000000000..f14d64abf93 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_connect_tabvct.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-storage_connect_tabvct.cpp,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Don't redefine strerror. + +--- storage/connect/tabvct.cpp.orig 2015-02-25 15:40:55.000000000 +0000 ++++ storage/connect/tabvct.cpp +@@ -71,7 +71,7 @@ + #include "tabvct.h" + #include "valblk.h" + +-#if defined(UNIX) ++#if defined(UNIX) && !defined(__sun) + //add dummy strerror (NGC) + char *strerror(int num); + #endif // UNIX diff --git a/databases/mariadb105-client/patches/patch-storage_perfschema_my__thread.h b/databases/mariadb105-client/patches/patch-storage_perfschema_my__thread.h new file mode 100644 index 00000000000..73f65969f2d --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_perfschema_my__thread.h @@ -0,0 +1,24 @@ +$NetBSD: patch-storage_perfschema_my__thread.h,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Avoid type error on NetBSD. + +--- storage/perfschema/my_thread.h.orig 2021-05-05 21:00:19.000000000 +0000 ++++ storage/perfschema/my_thread.h +@@ -17,7 +17,7 @@ + typedef pthread_key_t thread_local_key_t; + typedef pthread_t my_thread_handle; + typedef pthread_attr_t my_thread_attr_t; +-typedef uint32 my_thread_os_id_t; ++typedef intptr_t my_thread_os_id_t; + + #define LOCK_plugin_delete LOCK_plugin + +@@ -73,7 +73,7 @@ static inline my_thread_os_id_t my_threa + #else + #ifdef HAVE_INTEGER_PTHREAD_SELF + /* Unknown platform, fallback. */ +- return pthread_self(); ++ return (intptr_t)pthread_self(); + #else + /* Feature not available. */ + return 0; diff --git a/databases/mariadb105-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc b/databases/mariadb105-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc new file mode 100644 index 00000000000..f58d7218226 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_rocksdb_rdb__io__watchdog.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-storage_rocksdb_rdb__io__watchdog.cc,v 1.1 2021/05/23 15:32:47 nia Exp $ + +If timer_t is an integer type, setting it to nullptr fails. + +XXX: Using NULL turns it into a warning. + +--- storage/rocksdb/rdb_io_watchdog.cc.orig 2020-01-26 20:43:56.000000000 +0000 ++++ storage/rocksdb/rdb_io_watchdog.cc +@@ -111,7 +111,7 @@ void Rdb_io_watchdog::io_check_callback( + sql_print_warning("Deleting the watchdog I/O timer failed with %d.", errno); + } + +- m_io_check_watchdog_timer = nullptr; ++ m_io_check_watchdog_timer = NULL; + + RDB_MUTEX_UNLOCK_CHECK(m_reset_mutex); + } diff --git a/databases/mariadb105-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h b/databases/mariadb105-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h new file mode 100644 index 00000000000..b97a4ea932a --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_rocksdb_rdb__io__watchdog.h @@ -0,0 +1,37 @@ +$NetBSD: patch-storage_rocksdb_rdb__io__watchdog.h,v 1.1 2021/05/23 15:32:47 nia Exp $ + +If timer_t is an integer type, setting it to nullptr fails. + +XXX: Using NULL turns it into a warning. + +--- storage/rocksdb/rdb_io_watchdog.h.orig 2020-01-26 20:43:56.000000000 +0000 ++++ storage/rocksdb/rdb_io_watchdog.h +@@ -60,7 +60,7 @@ class Rdb_io_watchdog { + ret = timer_delete(m_io_check_watchdog_timer); + + if (!ret) { +- m_io_check_watchdog_timer = nullptr; ++ m_io_check_watchdog_timer = NULL; + } + } + +@@ -68,7 +68,7 @@ class Rdb_io_watchdog { + ret = timer_delete(m_io_check_timer); + + if (!ret) { +- m_io_check_timer = nullptr; ++ m_io_check_timer = NULL; + } + } + +@@ -93,8 +93,8 @@ class Rdb_io_watchdog { + + public: + explicit Rdb_io_watchdog(std::vector<std::string> &&directories) +- : m_io_check_timer(nullptr), +- m_io_check_watchdog_timer(nullptr), ++ : m_io_check_timer(NULL), ++ m_io_check_watchdog_timer(NULL), + m_io_in_progress(false), + m_dirs_to_check(std::move(directories)), + m_buf(nullptr) { diff --git a/databases/mariadb105-client/patches/patch-storage_rocksdb_rocksdb_Makefile b/databases/mariadb105-client/patches/patch-storage_rocksdb_rocksdb_Makefile new file mode 100644 index 00000000000..a1c7d499db1 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_rocksdb_rocksdb_Makefile @@ -0,0 +1,24 @@ +$NetBSD: patch-storage_rocksdb_rocksdb_Makefile,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Shell portability. + +--- storage/rocksdb/rocksdb/Makefile.orig 2021-02-18 23:22:28.000000000 +0000 ++++ storage/rocksdb/rocksdb/Makefile +@@ -911,7 +911,7 @@ valgrind_check_0: + | grep -E '$(tests-regexp)' \ + | grep -E -v '$(valgrind-blacklist-regexp)' \ + | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \ +- '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \ ++ '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) ' \ + '>& t/valgrind_log-{/}' + + CLEAN_FILES += t LOG $(TMPD) +@@ -1952,7 +1952,7 @@ rocksdbjavastatic: $(java_static_all_lib + -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \ + $(java_static_all_libobjects) $(COVERAGEFLAGS) \ + $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS) +- cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \ ++ cd java/target;if [ "$(DEBUG_LEVEL)" = "0" ]; then \ + strip $(STRIPFLAGS) $(ROCKSDBJNILIB); \ + fi + cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md diff --git a/databases/mariadb105-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh b/databases/mariadb105-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh new file mode 100644 index 00000000000..ec8a499b5fa --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Shell portability. + +--- storage/rocksdb/rocksdb/build_tools/fb_compile_mongo.sh.orig 2021-02-18 23:22:28.000000000 +0000 ++++ storage/rocksdb/rocksdb/build_tools/fb_compile_mongo.sh +@@ -13,7 +13,7 @@ EXTRA_LDFLAGS="" + if test -z $ALLOC; then + # default + ALLOC=tcmalloc +-elif [[ $ALLOC == "jemalloc" ]]; then ++elif [ $ALLOC = "jemalloc" ]; then + ALLOC=system + EXTRA_LDFLAGS+=" -Wl,--whole-archive $JEMALLOC_LIB -Wl,--no-whole-archive" + fi diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_file.cc b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_file.cc new file mode 100644 index 00000000000..51792f345c7 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_file.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-storage_tokudb_PerconaFT_portability_file.cc,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Add directio support on SunOS. + +--- storage/tokudb/PerconaFT/portability/file.cc.orig 2015-02-25 15:40:56.000000000 +0000 ++++ storage/tokudb/PerconaFT/portability/file.cc +@@ -373,6 +373,9 @@ toku_os_open_direct(const char *path, in + perror("setting F_NOCACHE"); + } + } ++#elif defined(__sun) ++ rval = toku_os_open(path, oflag, mode); ++ directio(rval, DIRECTIO_ON); + #else + # error "No direct I/O implementation found." + #endif diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__htod.h b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__htod.h new file mode 100644 index 00000000000..6fd484258a0 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__htod.h @@ -0,0 +1,30 @@ +$NetBSD: patch-storage_tokudb_PerconaFT_portability_toku__htod.h,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Detect endianness on SunOS. + +--- storage/tokudb/PerconaFT/portability/toku_htod.h.orig 2020-01-26 20:43:56.000000000 +0000 ++++ storage/tokudb/PerconaFT/portability/toku_htod.h +@@ -59,11 +59,23 @@ Copyright (c) 2006, 2015, Percona and/or + + #if defined(HAVE_ENDIAN_H) + # include <endian.h> ++#define __BYTE_ORDER BYTE_ORDER ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#define __BIG_ENDIAN BIG_ENDIAN + #elif defined(HAVE_MACHINE_ENDIAN_H) + # include <machine/endian.h> + # define __BYTE_ORDER __DARWIN_BYTE_ORDER + # define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN + # define __BIG_ENDIAN __DARWIN_BIG_ENDIAN ++#elif defined(__sun) ++# include <sys/isa_defs.h> ++# define __BIG_ENDIAN 4321 ++# define __LITTLE_ENDIAN 1234 ++# if defined(_BIG_ENDIAN) ++# define __BYTE_ORDER __BIG_ENDIAN ++# else ++# define __BYTE_ORDER __LITTLE_ENDIAN ++# endif + #endif + #if !defined(__BYTE_ORDER) || \ + !defined(__LITTLE_ENDIAN) || \ diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__portability.h b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__portability.h new file mode 100644 index 00000000000..9e32e943536 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__portability.h @@ -0,0 +1,24 @@ +$NetBSD: patch-storage_tokudb_PerconaFT_portability_toku__portability.h,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Use proper attribute syntax on SunOS. + +--- storage/tokudb/PerconaFT/portability/toku_portability.h.orig 2015-02-25 15:40:56.000000000 +0000 ++++ storage/tokudb/PerconaFT/portability/toku_portability.h +@@ -200,7 +200,7 @@ int _dup2(int fd, int fd2) + #undef strdup + # if defined(__FreeBSD__) + char* strdup(const char *) __malloc_like __attribute__((__deprecated__)); +-# elif defined(__APPLE__) ++# elif defined(__APPLE__) || defined(__sun) + char* strdup(const char *) __attribute__((__deprecated__)); + # else + char* strdup(const char *) __THROW __attribute_malloc__ __nonnull ((1)) __attribute__((__deprecated__)); +@@ -216,7 +216,7 @@ ssize_t pwrite(int, const void *, size_ + extern void *malloc(size_t) __malloc_like __attribute__((__deprecated__)); + extern void free(void*) __attribute__((__deprecated__)); + extern void *realloc(void*, size_t) __malloc_like __attribute__((__deprecated__)); +-# elif defined(__APPLE__) ++# elif defined(__APPLE__) || defined(__sun) + extern void *malloc(size_t) __attribute__((__deprecated__)); + extern void free(void*) __attribute__((__deprecated__)); + extern void *realloc(void*, size_t) __attribute__((__deprecated__)); diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_src_CMakeLists.txt b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_src_CMakeLists.txt new file mode 100644 index 00000000000..4d29db9b85e --- /dev/null +++ b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_src_CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-storage_tokudb_PerconaFT_src_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Portability. + +--- storage/tokudb/PerconaFT/src/CMakeLists.txt.orig 2015-02-25 15:40:56.000000000 +0000 ++++ storage/tokudb/PerconaFT/src/CMakeLists.txt +@@ -36,7 +36,9 @@ set_property(TARGET ${LIBTOKUDB} tokudb_ + configure_file(export.map . COPYONLY) + if (NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) + add_space_separated_property(TARGET ${LIBTOKUDB} COMPILE_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden") ++ if (NOT CMAKE_SYSTEM_NAME STREQUAL SunOS) + add_space_separated_property(TARGET ${LIBTOKUDB} LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/export.map") ++ endif () + endif () + + # detect when we are being built as a subproject diff --git a/databases/mariadb105-client/patches/patch-support-files_mysql.server.sh b/databases/mariadb105-client/patches/patch-support-files_mysql.server.sh new file mode 100644 index 00000000000..3e96af9a5a3 --- /dev/null +++ b/databases/mariadb105-client/patches/patch-support-files_mysql.server.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-support-files_mysql.server.sh,v 1.1 2021/05/23 15:32:47 nia Exp $ + +Shell portability. + +--- support-files/mysql.server.sh.orig 2020-01-26 20:43:57.000000000 +0000 ++++ support-files/mysql.server.sh +@@ -436,7 +436,7 @@ case "$mode" in + exit $r + ;; + 'bootstrap') +- if test "$_use_systemctl" == 1 ; then ++ if test "$_use_systemctl" = 1 ; then + log_failure_msg "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster" + exit 1 + fi |