diff options
Diffstat (limited to 'databases/mariadb106-server')
10 files changed, 28 insertions, 159 deletions
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 5c1110bb747e..6f21b1628117 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,17 +1,17 @@ PORTNAME?= mariadb -PORTVERSION= 10.6.14 +PORTVERSION= 10.6.23 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ - https://mirror.one.com/${SITESDIR}/ \ +MASTER_SITES= \ https://ftp.nluug.nl/db/${SITESDIR}/ \ + https://mirror.nodesdirect.com/${SITESDIR}/ \ + https://mirror.one.com/${SITESDIR}/ \ https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \ https://mirror.truenetwork.ru/${SITESDIR}/ \ https://mirrors.aliyun.com/${SITESDIR}/ \ https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \ https://mirror.kku.ac.th/${SITESDIR}/ \ https://espejito.fder.edu.uy/${SITESDIR}/ \ - https://mirror1.cl.netactuate.com/${SITESDIR}/ \ https://ftp.osuosl.org/pub/${SITESDIR}/ \ https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ PKGNAMESUFFIX?= 106-server @@ -23,6 +23,9 @@ WWW= https://mariadb.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +DEPRECATED= End-of-Life approaching, please switch to 11.8 (or 11.4) +EXPIRATION_DATE= 2026-06-30 + LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 \ libzstd.so:archivers/zstd @@ -103,6 +106,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ -DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_PCRE=system \ + -DPCRE_LIBRARY_DIRS=${PREFIX}/lib \ -DWITH_SSL="${OPENSSLBASE}" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ @@ -123,7 +127,8 @@ CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mytop FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi @@ -164,7 +169,7 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE -COLUMNSTORE_BROKEN= error: __float128 is not supported on this target +#COLUMNSTORE_BROKEN= error: __float128 is not supported on this target CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome @@ -178,7 +183,7 @@ LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c -OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ +OQGRAPH_LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON @@ -192,7 +197,6 @@ WSREP_RUN_DEPENDS= bash:shells/bash \ #stunnel:security/stunnel WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 -ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO @@ -212,16 +216,14 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " GSSAPI_BASE_IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif +.if ${SSL_DEFAULT:Mlibressl*} +CFLAGS+= -Wno-incompatible-function-pointer-types +.endif + .if ${ARCH} != amd64 && ${ARCH} != aarch64 PLIST_SUB+= WSREP="@comment " .endif -#.if ${ARCH} == i386 -#USE_GCC= 9 -#CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE -#CXXFLAGS+= -fpermissive -#.endif - post-patch: .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index c942f5d02811..32597b91455e 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686482323 -SHA256 (mariadb-10.6.14.tar.gz) = 450437c74a8e44c76b3c0b343b9347eb903201545851565d78d9a624676ab202 -SIZE (mariadb-10.6.14.tar.gz) = 95286643 +TIMESTAMP = 1754733054 +SHA256 (mariadb-10.6.23.tar.gz) = baf4bf37a051e892e71724ee752891adb7cfc69cd28d08735c3607d30c693c23 +SIZE (mariadb-10.6.23.tar.gz) = 107141939 diff --git a/databases/mariadb106-server/files/patch-include_m__ctype.h b/databases/mariadb106-server/files/patch-include_m__ctype.h deleted file mode 100644 index 8e323646752e..000000000000 --- a/databases/mariadb106-server/files/patch-include_m__ctype.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/m_ctype.h.orig 2021-08-04 18:00:35 UTC -+++ include/m_ctype.h -@@ -43,6 +43,10 @@ extern "C" { - - #define CHARSET_DIR "charsets/" - -+#ifndef ulong -+typedef unsigned long ulong; -+#endif -+ - #define my_wc_t ulong - - #define MY_CS_REPLACEMENT_CHARACTER 0xFFFD diff --git a/databases/mariadb106-server/files/patch-include_my__cpu.h b/databases/mariadb106-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb106-server/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC -+++ include/my_cpu.h -@@ -23,7 +23,8 @@ - The defines are the same ones used by the linux kernel - */ - --#ifdef _ARCH_PWR8 -+#if defined(_ARCH_PWR8) -+#if defined(linux) - #include <sys/platform/ppc.h> - /* Very low priority */ - #define HMT_very_low() __ppc_set_ppr_very_low() -@@ -37,6 +38,22 @@ - #define HMT_medium_high() __ppc_set_ppr_med_high() - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/sysctl.h> -+/* Very low priority */ -+#define HMT_very_low() __asm__ volatile ("or 31,31,31") -+/* Low priority */ -+#define HMT_low() __asm__ volatile ("or 1,1,1") -+/* Medium low priority */ -+#define HMT_medium_low() __asm__ volatile ("or 6,6,6") -+/* Medium priority */ -+#define HMT_medium() __asm__ volatile ("or 2,2,2") -+/* Medium high priority */ -+#define HMT_medium_high() __asm__ volatile ("or 5,5,5") -+/* High priority */ -+#define HMT_high() asm volatile("or 3,3,3") -+#endif - #else - #define HMT_very_low() - #define HMT_low() -@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -+#if defined(linux) - __ppc_get_timebase(); -+#elif defined(__FreeBSD__) -+ uint64_t __tb; -+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -+#endif - #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) - /* Mainly, prevent the compiler from optimizing away delay loops */ - #ifdef _aarch64_ diff --git a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc deleted file mode 100644 index 445fd0e97865..000000000000 --- a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- mysys/crc32/crc32c.cc.orig 2021-08-04 18:00:35 UTC -+++ mysys/crc32/crc32c.cc -@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) { - - return arch_ppc_crc32; - } -+#elif __FreeBSD__ -+#include <machine/cpu.h> -+#include <sys/auxv.h> -+#include <sys/elf_common.h> -+static int arch_ppc_probe(void) { -+ unsigned long cpufeatures; -+ arch_ppc_crc32 = 0; -+ -+#if defined(__powerpc64__) -+ elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)); -+ if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1; -+#endif /* __powerpc64__ */ -+ -+ return arch_ppc_crc32; -+} - #endif // __linux__ - #endif - diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index f8321be63ecc..000000000000 --- a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- scripts/mysql_config.sh.orig 2021-07-07 20:25:20 UTC -+++ scripts/mysql_config.sh -@@ -88,6 +88,7 @@ fi - # Create options - libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" - embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -%%LOCALBASE%%/lib " - - include="-I$pkgincludedir" - if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb106-server/files/patch-sql_mysqld.cc b/databases/mariadb106-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e433bfc7d450..000000000000 --- a/databases/mariadb106-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC -+++ sql/mysqld.cc -@@ -205,7 +205,7 @@ typedef fp_except fp_except_t; - - inline void setup_fpu() - { --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) - /* We can't handle floating point exceptions with threads, so disable - this on freebsd - Don't fall for overflow, underflow,divide-by-zero or loss of precision. -@@ -218,7 +218,7 @@ inline void setup_fpu() - fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | - FP_X_IMP)); - #endif /* FP_X_DNML */ --#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ -+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */ - - #ifdef HAVE_FEDISABLEEXCEPT - fedisableexcept(FE_ALL_EXCEPT); diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp deleted file mode 100644 index 26ea3d16ecd7..000000000000 --- a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC -+++ storage/columnstore/columnstore/utils/common/threadnaming.cpp -@@ -22,13 +22,21 @@ namespace utils - { - void setThreadName(const char* threadName) - { -+#ifdef __FreeBSD__ -+ pthread_set_name_np(pthread_self(), threadName); -+#else - prctl(PR_SET_NAME, threadName, 0, 0, 0); -+#endif - } - - std::string getThreadName() - { - char buf[32]; -+#ifdef __FreeBSD__ -+ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); -+#else - prctl(PR_GET_NAME, buf, 0, 0, 0); -+#endif - return std::string(buf); - } - } // namespace utils diff --git a/databases/mariadb106-server/files/pkg-message.in b/databases/mariadb106-server/files/pkg-message.in index 19d0db2a69df..e90a7bfa014f 100644 --- a/databases/mariadb106-server/files/pkg-message.in +++ b/databases/mariadb106-server/files/pkg-message.in @@ -14,8 +14,8 @@ the MariaDB tarball but the most recent version can be found in the databases/mytop port %%WSREP%%Using wsrep clustering requires adding a configuration file. -%%WSREP%%Copy %%PREFIX%%/etc/mysql/conf.d/wsrep.conf.sample to -%%WSREP%%%%PREFIX%%/etc/mysql/conf.d/wsrep.conf and change what you need there. +%%WSREP%%Copy %%PREFIX%%/etc/mysql/conf.d/wsrep.cnf.sample to +%%WSREP%%%%PREFIX%%/etc/mysql/conf.d/wsrep.cnf and change what you need there. EOM } { type: upgrade @@ -25,4 +25,4 @@ the first time you start the MySQL server after an upgrade from an earlier version. EOM } - +] diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index d22fb2eed2f9..5b4ab627d1d4 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -84,6 +84,7 @@ include/mysql/server/my_alloc.h include/mysql/server/my_alloca.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h +include/mysql/server/my_cmp.h include/mysql/server/my_compiler.h include/mysql/server/my_config.h include/mysql/server/my_dbug.h @@ -133,14 +134,17 @@ 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_log_warnings.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_print_check_msg.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_sql.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 @@ -210,6 +214,7 @@ lib/mysql/plugin/test_sql_service.so lib/mysql/plugin/test_versioning.so lib/mysql/plugin/type_mysql_json.so lib/mysql/plugin/type_test.so +lib/mysql/plugin/type_mysql_timestamp.so %%WSREP%%lib/mysql/plugin/wsrep_info.so lib/mysql/plugin/zstd.so libexec/mariadbd @@ -306,6 +311,7 @@ libexec/mysqld @comment share/man/man1/replace.1.gz @comment share/man/man1/resolve_stack_dump.1.gz @comment share/man/man1/resolveip.1.gz +%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz @comment %%WSREP%%share/man/man1/wsrep_sst_common.1.gz @comment %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz @comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz |