Date: Fri, 30 Jun 2023 05:48:33 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6ff0ba329651 - main - databases/mariadb104-*: Sunset Message-ID: <202306300548.35U5mXeD012398@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ff0ba32965106c0517165f09af9baf93616efa7 commit 6ff0ba32965106c0517165f09af9baf93616efa7 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-06-30 05:35:00 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-06-30 05:48:19 +0000 databases/mariadb104-*: Sunset 2023-06-30 databases/mariadb104-*: Use databases/mariadb106-* - Sync mariadb versions in Mk/bsd.default-versions.mk Approved by: portmgr (blanket) --- MOVED | 2 + Mk/Uses/mysql.mk | 4 +- Mk/bsd.default-versions.mk | 2 +- databases/Makefile | 2 - databases/mariadb104-client/Makefile | 12 - databases/mariadb104-client/pkg-plist | 173 -------- databases/mariadb104-server/Makefile | 270 ------------- databases/mariadb104-server/distinfo | 3 - .../mariadb104-server/files/client.cnf.sample.in | 52 --- databases/mariadb104-server/files/my.cnf.sample.in | 13 - databases/mariadb104-server/files/mysql-server.in | 135 ------- .../mariadb104-server/files/patch-CMakeLists.txt | 12 - databases/mariadb104-server/files/patch-MDEV-11790 | 46 --- databases/mariadb104-server/files/patch-MDEV-20248 | 13 - .../files/patch-cmake_install__layout.cmake | 13 - .../files/patch-include_my__cpu.h | 48 --- .../files/patch-libmariadb_include_CMakeLists.txt | 15 - .../patch-libmariadb_libmariadb_CMakeLists.txt | 19 - .../patch-libmariadb_plugins_auth_CMakeLists.txt | 31 -- .../files/patch-libservices_CMakeLists.txt | 11 - .../files/patch-mysys_my__default.c | 52 --- .../files/patch-oqgraph-MDEV-15291 | 40 -- .../files/patch-pcre_CMakeLists.txt | 11 - .../patch-plugin_auth__pam_testing_CMakeLists.txt | 10 - .../files/patch-scripts_mysql__config.sh | 12 - .../files/patch-scripts_mysqld__safe.sh | 16 - .../files/patch-scripts_wsrep__sst__mariabackup.sh | 11 - .../mariadb104-server/files/patch-sql_mysqld.cc | 31 -- .../files/patch-storage_innobase_lz4.cmake | 44 -- .../files/patch-storage_innobase_lzo.cmake | 24 -- .../files/patch-storage_innobase_snappy.cmake | 25 -- ...h-storage_mroonga_vendor_groonga_CMakeLists.txt | 15 - .../files/patch-storage_tokudb_CMakeLists.txt | 9 - .../patch-storage_tokudb_PerconaFT_CMakeLists.txt | 11 - ...b_PerconaFT_cmake__modules_TokuThirdParty.cmake | 38 -- ...-storage_tokudb_PerconaFT_portability_memory.cc | 16 - .../files/patch-support-files_CMakeLists.txt | 14 - databases/mariadb104-server/files/pkg-message.in | 26 -- .../mariadb104-server/files/server.cnf.sample.in | 60 --- databases/mariadb104-server/pkg-descr | 12 - databases/mariadb104-server/pkg-plist | 449 --------------------- 41 files changed, 5 insertions(+), 1797 deletions(-) diff --git a/MOVED b/MOVED index 68dfc2180d9a..2e885d27a4e6 100644 --- a/MOVED +++ b/MOVED @@ -7698,3 +7698,5 @@ sysutils/mcollective-puppet-common||2023-06-30|Has expired: Depends on broken sy sysutils/mcollective-nettest-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective sysutils/mnrpes||2023-06-30|Has expired: Depends on broken sysutils/mcollective sysutils/mcollective||2023-06-30|Has expired: Broken with all supported Ruby versions +databases/mariadb104-server||2023-06-30|Has expired: Use databases/mariadb106-server +databases/mariadb104-client||2023-06-30|Has expired: Use databases/mariadb106-client diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 7605397f8003..6805867a0076 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -67,7 +67,7 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 -. for v in 4 5 6 11 +. for v in 5 6 11 MYSQL10${v}m_LIBVER= 3 . endfor @@ -129,7 +129,7 @@ _MYSQL_SHLIB= libmysqlclient . if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_SERVER_FLAVOUR= mariadb _MYSQL_CLIENT_FLAVOUR= mariadb -. if ${MYSQL_VER:C/m//} >= 104 +. if ${MYSQL_VER:C/m//} >= 105 _MYSQL_SHLIB= libmariadb . endif . elif (${MYSQL_VER:C/[0-9]*//} == "p") diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 4da7724fbdf1..314b517bf991 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -93,7 +93,7 @@ LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.10 -# Possible values: 5.7, 8.0, 10.4m, 10.5m, 5.7p, 5.7w +# Possible values: 5.7, 8.0, 10.5m, 10.6m, 10.11m, 5.7p, 5.7w MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja diff --git a/databases/Makefile b/databases/Makefile index defb1d96a698..4ab81b1d315e 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -177,8 +177,6 @@ SUBDIR += mariadb-connector-odbc SUBDIR += mariadb1011-client SUBDIR += mariadb1011-server - SUBDIR += mariadb104-client - SUBDIR += mariadb104-server SUBDIR += mariadb105-client SUBDIR += mariadb105-server SUBDIR += mariadb106-client diff --git a/databases/mariadb104-client/Makefile b/databases/mariadb104-client/Makefile deleted file mode 100644 index 4a422a77eb43..000000000000 --- a/databases/mariadb104-client/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -PORTNAME= mariadb -PKGNAMESUFFIX= 104-client - -COMMENT= Multithreaded SQL database (client) - -MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} - -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= databases/mytop - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb104-client/pkg-plist b/databases/mariadb104-client/pkg-plist deleted file mode 100644 index c93bdbc1dcb0..000000000000 --- a/databases/mariadb104-client/pkg-plist +++ /dev/null @@ -1,173 +0,0 @@ -bin/mariadb -bin/mariadb-access -bin/mariadb-admin -bin/mariadb-binlog -bin/mariadb-check -bin/mariadb-convert-table-format -bin/mariadb-dump -bin/mariadb-find-rows -bin/mariadb-hotcopy -bin/mariadb-import -bin/mariadb-plugin -bin/mariadb-setpermission -bin/mariadb-show -bin/mariadb-slap -@comment bin/mariadb-test -@comment bin/mariadb-waitpid -bin/mariadb_config -bin/msql2mysql -bin/mysql -bin/mysql_config -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_setpermission -@comment bin/mysql_plugin -@comment bin/mysql_waitpid -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqlhotcopy -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -@comment bin/mysqltest -bin/mytop -bin/replace -@comment bin/wsrep_sst_rsync_wan -@sample %%ETCDIR%%/my.cnf.sample -@sample %%ETCDIR%%/conf.d/client.cnf.sample -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_com.h -include/mysql/mysql_version.h -include/mysql/mysql/client_plugin.h -include/mysql/mysql/plugin_auth.h -include/mysql/mysql/plugin_auth_common.h -include/mysql/mysqld_error.h -%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so -lib/mysql/libmariadb.a -lib/mysql/libmariadb.so -lib/mysql/libmariadb.so.3 -lib/mysql/libmariadbclient.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -@comment lib/mysql/plugin/caching_sha2_password.so -lib/mysql/plugin/client_ed25519.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/dialog.so -lib/mysql/plugin/mysql_clear_password.so -lib/mysql/plugin/sha256_password.so -libdata/pkgconfig/libmariadb.pc -@comment share/man/man1/aria_chk.1.gz -@comment share/man/man1/aria_dump_log.1.gz -@comment share/man/man1/aria_ftdump.1.gz -@comment share/man/man1/aria_pack.1.gz -@comment share/man/man1/aria_read_log.1.gz -@comment share/man/man1/galera_new_cluster.1.gz -@comment share/man/man1/galera_recovery.1.gz -@comment share/man/man1/innochecksum.1.gz -@comment share/man/man1/mariabackup.1.gz -share/man/man1/mariadb.1.gz -share/man/man1/mariadb-access.1.gz -share/man/man1/mariadb-admin.1.gz -@comment share/man/man1/mariadb-backup.1.gz -share/man/man1/mariadb-binlog.1.gz -share/man/man1/mariadb-check.1.gz -@comment share/man/man1/mariadb-client-test-embedded.1.gz -@comment share/man/man1/mariadb-client-test.1.gz -share/man/man1/mariadb-convert-table-format.1.gz -share/man/man1/mariadb-dump.1.gz -@comment share/man/man1/mariadb-dumpslow.1.gz -@comment share/man/man1/mariadb-embedded.1.gz -share/man/man1/mariadb-find-rows.1.gz -@comment share/man/man1/mariadb-fix-extensions.1.gz -share/man/man1/mariadb-hotcopy.1.gz -share/man/man1/mariadb-import.1.gz -@comment share/man/man1/mariadb-install-db.1.gz -@comment share/man/man1/mariadb-ldb.1.gz -share/man/man1/mariadb-plugin.1.gz -@comment share/man/man1/mariadb-secure-installation.1.gz -@comment share/man/man1/mariadb-service-convert.1.gz -share/man/man1/mariadb-setpermission.1.gz -share/man/man1/mariadb-show.1.gz -share/man/man1/mariadb-slap.1.gz -@comment share/man/man1/mariadb-test-embedded.1.gz -@comment share/man/man1/mariadb-test.1.gz -@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz -@comment share/man/man1/mariadb-upgrade.1.gz -@comment share/man/man1/mariadb-waitpid.1.gz -@comment share/man/man1/mariadbd-multi.1.gz -@comment share/man/man1/mariadbd-safe-helper.1.gz -@comment share/man/man1/mariadbd-safe.1.gz -@comment share/man/man8/mariadbd.8.gz -share/man/man1/msql2mysql.1.gz -@comment share/man/man1/mbstream.1.gz -@comment share/man/man1/my_print_defaults.1.gz -share/man/man1/my_safe_process.1.gz -@comment share/man/man1/myisam_ftdump.1.gz -@comment share/man/man1/myisamchk.1.gz -@comment share/man/man1/myisamlog.1.gz -@comment share/man/man1/myisampack.1.gz -share/man/man1/mysql-stress-test.pl.1.gz -share/man/man1/mysql-test-run.pl.1.gz -share/man/man1/mysql.1.gz -@comment share/man/man1/mysql.server.1.gz -@comment share/man/man1/mysql_client_test.1.gz -@comment share/man/man1/mysql_client_test_embedded.1.gz -share/man/man1/mysql_config.1.gz -share/man/man1/mysql_convert_table_format.1.gz -@comment share/man/man1/mysql_embedded.1.gz -share/man/man1/mysql_find_rows.1.gz -@comment share/man/man1/mysql_fix_extensions.1.gz -@comment share/man/man1/mysql_install_db.1.gz -@comment share/man/man1/mysql_ldb.1.gz -share/man/man1/mysql_plugin.1.gz -@comment share/man/man1/mysql_secure_installation.1.gz -share/man/man1/mysql_setpermission.1.gz -@comment share/man/man1/mysql_tzinfo_to_sql.1.gz -@comment share/man/man1/mysql_upgrade.1.gz -share/man/man1/mysql_waitpid.1.gz -share/man/man1/mysqlaccess.1.gz -share/man/man1/mysqladmin.1.gz -share/man/man1/mysqlbinlog.1.gz -share/man/man1/mysqlcheck.1.gz -@comment share/man/man1/mysqld_multi.1.gz -@comment share/man/man1/mysqld_safe.1.gz -@comment share/man/man1/mysqld_safe_helper.1.gz -share/man/man1/mysqldump.1.gz -@comment share/man/man1/mysqldumpslow.1.gz -share/man/man1/mysqlhotcopy.1.gz -share/man/man1/mysqlimport.1.gz -share/man/man1/mysqlshow.1.gz -share/man/man1/mysqlslap.1.gz -@comment share/man/man1/mysqltest.1.gz -@comment share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/perror.1.gz -share/man/man1/replace.1.gz -@comment share/man/man1/resolve_stack_dump.1.gz -@comment share/man/man1/resolveip.1.gz -@comment share/man/man1/wsrep_sst_common.1.gz -@comment share/man/man1/wsrep_sst_mariabackup.1.gz -@comment share/man/man1/wsrep_sst_mysqldump.1.gz -@comment share/man/man1/wsrep_sst_rsync.1.gz -@comment share/man/man1/wsrep_sst_rsync_wan.1.gz -@comment share/man/man8/mysqld.8.gz -libdata/pkgconfig/mariadb.pc -@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%% diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile deleted file mode 100644 index 7e068d699f13..000000000000 --- a/databases/mariadb104-server/Makefile +++ /dev/null @@ -1,270 +0,0 @@ -PORTNAME?= mariadb -PORTVERSION= 10.4.29 -PORTREVISION?= 0 -CATEGORIES= databases -MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ - https://mirror.one.com/${SITESDIR}/ \ - https://ftp.nluug.nl/db/${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?= 104-server - -MAINTAINER= brnrd@FreeBSD.org -COMMENT?= Multithreaded SQL database (server) -WWW= https://mariadb.org/ - -DEPRECATED= Use databases/mariadb106-server -EXPIRATION_DATE= 2023-06-30 - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl -IGNORE_SSL= openssl30 openssl31 -IGNORE_SSL_REASON= Upstream only supports OpenSSL 1.0.1 upto 1.1.X - -SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -USE_LDCONFIG= ${PREFIX}/lib/mysql -SHEBANG_FILES= scripts/*.sh -SITESDIR= mariadb/mariadb-${PORTVERSION}/source - -DOCSDIR= ${PREFIX}/share/doc/mysql -ETCDIR= ${PREFIX}/etc/mysql - -MARIADB_USER?= mysql -MARIADB_GROUP?= mysql - -MARIADB_RUNDIR?= /var/run/mysql -MARIADB_SOCK?= mysql.sock -MARIADB_LOGDIR?= /var/log/mysql - -OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_DEFAULT= GSSAPI_BASE - -.if ${PKGNAMESUFFIX:M*-server} -# MySQL-Server options -OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP -OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= CONNECT_EXTRA DOCS -OPTIONS_DEFINE_amd64= WSREP -OPTIONS_DEFINE_powerpc64le= WSREP -OPTIONS_DEFINE_powerpc64= WSREP -OPTIONS_DEFINE_riscv64= WSREP -OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD -OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB -OPTIONS_GROUP_GROONGA= ZMQ MSGPACK -OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB - -CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine -COMPRESSION_DESC= Optional page compression -ENGINES_DESC= Optional MariaDB storage engines -GROONGA_DESC= Optional Mroonga features -INNOBASE_DESC= InnoDB default engine -MROONGA_DESC= Mroonga Full Text Search engine -MSGPACK_DESC= MsgPack support -OQGRAPH_DESC= Open Query Graph Computation engine -ROCKSDB_DESC= RocksDB LSM engine (Alpha) -SPHINX_DESC= SphinxSE engine -SPIDER_DESC= Partitioning and XA-transactions engine -TOKUDB_DESC= Fractal tree index tree data structure engine -WSREP_DESC= Build wsrep clustering -ZMQ_DESC= ZeroMQ support -ZSTD_DESC+= Zstandard compression support (RocksDB only) -.endif - -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ - -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ - -DINSTALL_INCLUDEDIR="include/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_MANDIR="share/man" \ - -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR= \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SQLBENCHDIR= \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ - -DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \ - -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ - -DWITH_SSL="${OPENSSLBASE}" \ - -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ - -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ - -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ - -DKRB5_CONFIG="${KRB5CONFIG}" \ - -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ - -DCOMPILATION_COMMENT="FreeBSD Ports" \ - -DCMAKE_PREFIX_PATH=${PREFIX} -CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS -CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS -DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ - EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE - -DATADIR= ${PREFIX}/share/mysql -ETCDIR= ${PREFIX}/etc/mysql - -CONFLICTS_INSTALL= mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ - mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \ - mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ - mysqlwsrep*-server \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} - -FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF -OPTIONS_SUB= yes -SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \ - MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ - MARIADB_SOCK="${MARIADB_SOCK}" -PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \ - MARIADB_GROUP="${MARIADB_GROUP}" - -.if ${PKGNAMESUFFIX:M*-client} -# MySQL-Client part -CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER -CMAKE_OFF+= WITH_WSREP -USES+= readline -USE_LDCONFIG= ${PREFIX}/lib/mysql -SUB_FILES+= my.cnf.sample client.cnf.sample -PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" -.else # ! ${PKGNAMESUFFIX:M*-client} -# MySQL-Server part -USES+= mysql:104m -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -USE_RC_SUBR= mysql-server -USERS= ${MARIADB_USER} -GROUPS= ${MARIADB_GROUP} -CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER -CMAKE_OFF+= WITH_CLIENT -SUB_FILES+= server.cnf.sample -SUB_LIST+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" -PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" - -.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} -${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO -${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC -.endfor -INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE - -CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC -CONNECT_EXTRA_USE= gnome=libxml2 -CONNECT_EXTRA_USES= gnome -CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC -GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI -LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON -LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF -LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON -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 \ - libJudy.so:devel/judy -ROCKSDB_USES= python -ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} -SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON -SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF -SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -TOKUDB_IMPLIES= SNAPPY -TOKUDB_PORTDOCS= README.md -WSREP_CMAKE_BOOL= WITH_WSREP -WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 -WSREP_RUN_DEPENDS= bash:shells/bash \ - rsync:net/rsync \ - #stunnel:security/stunnel -WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync -ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 -ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON -ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF -ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd - -.for PLUGIN in ${DISABLED_PLUGINS} -CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO -.endfor - -.endif # ${PKGNAMESUFFIX:M*-client} - -.include <bsd.port.options.mk> - -.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} -GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} != amd64 -PLIST_SUB+= WSREP="@comment " -.endif - -.if ${ARCH} == i386 -USE_GCC= yes -CFLAGS+= -latomic -fasynchronous-unwind-tables -.endif - -.if ${OPSYS} == DragonFly -CMAKE_OFF+= WITH_TOKUDB -.endif - -post-patch: - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake - ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c -.if ${OPSYS} == DragonFly - ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ - ${WRKSRC}/cmake/os/DragonFly.cmake -.endif - -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 - -pre-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d - -.if ${PKGNAMESUFFIX:M*-client} -post-install: - ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample - ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \ - ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample - ${RM} -r ${STAGEDIR}${DATADIR} \ - ${STAGEDIR}${PREFIX}/include/mysql/server - ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc - ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig - ${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR} - -post-install-GSSAPI_NONE-off: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so - -.else # ! ${PKGNAMESUFFIX:M*-client} -post-install: - ${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \ - ${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server/private \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig - ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ - ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample - ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ - ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample || true - ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR} -.endif # ${PKGNAMESUFFIX:M*-client} - -.include <bsd.port.post.mk> diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo deleted file mode 100644 index abec60118cce..000000000000 --- a/databases/mariadb104-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1685281835 -SHA256 (mariadb-10.4.29.tar.gz) = 5b2d338792e79e68d6a545e2b15603bbbf7618c739e5f820f57b1d6b22092130 -SIZE (mariadb-10.4.29.tar.gz) = 94859830 diff --git a/databases/mariadb104-server/files/client.cnf.sample.in b/databases/mariadb104-server/files/client.cnf.sample.in deleted file mode 100644 index d468cb8705b8..000000000000 --- a/databases/mariadb104-server/files/client.cnf.sample.in +++ /dev/null @@ -1,52 +0,0 @@ -# Options specific to client applications, see -# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups - -# Options specific to all client programs -[client] -# port = 3306 # inherited from %%ETCDIR%%/my.cnf -# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf - -# Options specific to MariaDB client programs -[client-mariadb] - -# -## Options for specific client Tools -# - -# Options read by `mysql` -# Renamed from [mysql] starting with MariaDB 10.4.6. -[mariadb-client] Options read by mysql. Available starting with MariaDB 10.4.6. -prompt = \u@\h [\d]>\_ -no_auto_rehash - -# Options read by `mysqldump` -# Renamed from [mysqldump] starting with MariaDB 10.4.6. -[mariadb-dump] -max_allowed_packet = 256M -quote_names -quick - -# Options read by `mysqladmin` -# Renamed from [mysqladmin] starting with MariaDB 10.4.6. -[mariadb-admin] - -# Options read by `mysqlbinlog` -# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. -[mariadb-binlog] - -# Options read by `mysqlcheck` -# Renamed from [mysqlcheck] starting with MariaDB 10.4.6. -[mariadb-check] - -# Options read by `mysqlimport` -# Renamed from [mysqlimport] starting with MariaDB 10.4.6. -[mariadb-import] - -# Options read by `mysqlshow` -# Renamed from [mysqlshow] starting with MariaDB 10.4.6. -[mariadb-show] - -# Options read by `mysqlslap` -# Renamed from [mysqlslap] starting with MariaDB 10.4.6. -[mariadb-slap] - diff --git a/databases/mariadb104-server/files/my.cnf.sample.in b/databases/mariadb104-server/files/my.cnf.sample.in deleted file mode 100644 index 15dbc7e64da8..000000000000 --- a/databases/mariadb104-server/files/my.cnf.sample.in +++ /dev/null @@ -1,13 +0,0 @@ -# -# This group is read both by the client and the server -# use it for options that affect everything, see -# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups -# -[client-server] -port = 3306 -socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% - -# -# include *.cnf from the config directory -# -!includedir %%ETCDIR%%/conf.d/ diff --git a/databases/mariadb104-server/files/mysql-server.in b/databases/mariadb104-server/files/mysql-server.in deleted file mode 100644 index 945438a6fde8..000000000000 --- a/databases/mariadb104-server/files/mysql-server.in +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# 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_)?dbdir (str): Base database directory. -# Default to "/var/db/mysql" -# mysql_(instance_)?args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# mysql_(instance_)?pidfile (str): Custom PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_(instance_)?user (str): User to run mysqld as. -# Default to "%%MARIADB_USER%%" created by the port -# mysql_(instance_)?socket (str): Name of the socket file. -# Default to "" and used from %%ETCDIR%%/my.cnf, -# where default is "%%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%". -# mysql_(instance_)?optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. -# If defined, list of instances to enable - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_user="%%MARIADB_USER%%"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -command="/usr/sbin/daemon" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" - -if [ -n "$2" ]; then - instance="$2" - load_rc_config ${name}_${instance} - case "$mysql_instances" in - "$2 "*|*" $2 "*|*" $2"|"$2") - eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_socket="\${mysql_${instance}_socket:-\"${mysql_socket}\"}" - eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" - eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" - ;; - *) - err 1 "$2 not found in mysql_instances" ;; - esac -else - if [ -n "${mysql_instances}" -a -n "$1" ]; then - for instance in ${mysql_instances}; do - eval _enable="\${mysql_${instance}_enable}" - case "${_enable:-${mysql_enable}}" in - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - continue - ;; - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - ;; - *) - if [ -z "$_enable" ]; then - _var=mysql_enable - else - _var=mysql_${instance}_enable - fi - warn "Bad value" \ - "'${_enable:-${mysql_enable}}'" \ - "for ${_var}. " \ - "Instance ${instance} skipped." - continue - ;; - esac - echo "===> mysql instance: ${instance}" - if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then - success="${instance} ${success}" - else - failed="${instance} (${retcode}) ${failed}" - fi - done - exit 0 - else - mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} - fi -fi - -pidfile=$mysql_pidfile -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args - [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} -} - -mysql_prestart() -{ - local dir - for dir in /etc /etc/mysql; do - if [ -f "${dir}/my.cnf" ]; then - echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" - return 1 - fi - done - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`" - if [ ! -d "${mysql_rundir}" ]; then - install -d -o ${mysql_user} -g $(id -gn $mysql_user) "${mysql_rundir}" - - fi - return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb104-server/files/patch-CMakeLists.txt b/databases/mariadb104-server/files/patch-CMakeLists.txt deleted file mode 100644 index 567e4df8a720..000000000000 --- a/databases/mariadb104-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- CMakeLists.txt.orig 2019-11-07 05:52:21 UTC -+++ CMakeLists.txt -@@ -504,7 +504,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) -+ENDIF() - - # MDEV-6526 these files are not installed anymore - #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC diff --git a/databases/mariadb104-server/files/patch-MDEV-11790 b/databases/mariadb104-server/files/patch-MDEV-11790 deleted file mode 100644 index 1794bcf44da7..000000000000 --- a/databases/mariadb104-server/files/patch-MDEV-11790 +++ /dev/null @@ -1,46 +0,0 @@ -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} diff --git a/databases/mariadb104-server/files/patch-MDEV-20248 b/databases/mariadb104-server/files/patch-MDEV-20248 deleted file mode 100644 index ef0d97b17225..000000000000 --- a/databases/mariadb104-server/files/patch-MDEV-20248 +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC -+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h -@@ -12,6 +12,10 @@ - #include <jemalloc/jemalloc.h> - #endif - -+#ifdef __FreeBSD__ -+#define JEMALLOC_USABLE_SIZE_CONST const -+#endif -+ - #ifndef JEMALLOC_CXX_THROW - #define JEMALLOC_CXX_THROW - #endif diff --git a/databases/mariadb104-server/files/patch-cmake_install__layout.cmake b/databases/mariadb104-server/files/patch-cmake_install__layout.cmake deleted file mode 100644 index 2f6b38ffa45d..000000000000 --- a/databases/mariadb104-server/files/patch-cmake_install__layout.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC -+++ cmake/install_layout.cmake -@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files - SET(INSTALL_MYSQLDATADIR_STANDALONE "data") - - SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock") --SET(INSTALL_PAMDIR_STANDALONE "share") --SET(INSTALL_PAMDATADIR_STANDALONE "share") -+SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin") -+SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql") - # - # RPM layout - # diff --git a/databases/mariadb104-server/files/patch-include_my__cpu.h b/databases/mariadb104-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb104-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/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt deleted file mode 100644 index 70e8fad20f85..000000000000 --- a/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ *** 1146 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306300548.35U5mXeD012398>