diff --git a/databases/mysql97-client/Makefile b/databases/mysql97-client/Makefile index ea983678f39e..91508989d3b4 100644 --- a/databases/mysql97-client/Makefile +++ b/databases/mysql97-client/Makefile @@ -1,53 +1,52 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= 97-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 # MySQL8.2+ supports only 64-bit platforms # Review list after 13.x EoL -NOT_FOR_ARCHS= armv6 armv7 i386 powerpc +NOT_FOR_ARCHS= armv6 armv7 i386 powerpc MASTERDIR= ${.CURDIR}/../mysql97-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${MASTERDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql[8-9][1-9]-client \ - mysql[0-79][0-9]-client \ - mariadb[0-9][0-9]-client \ - percona[0-9][0-9]-client +CONFLICTS_INSTALL= mysql*-client \ + mariadb*-client \ + percona*-client CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 CPE_PRODUCT= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \ mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 CLIENT_ONLY= yes OPTIONS_GROUP+= PLUGINS PLUGINS_DESC= Default Client Plugins OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLCLIENT_USES= ldap OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes post-install: @${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so @${LN} -s libmysqlclient.so.24 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.24 .include "${MASTERDIR}/Makefile" diff --git a/databases/mysql97-server/Makefile b/databases/mysql97-server/Makefile index 0c2530bc497e..2bfbd0affdd0 100644 --- a/databases/mysql97-server/Makefile +++ b/databases/mysql97-server/Makefile @@ -1,171 +1,170 @@ PORTNAME?= mysql PORTVERSION= 9.7.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-9.7 PKGNAMESUFFIX?= 97-server MAINTAINER= joneum@FreeBSD.org COMMENT?= Multithreaded SQL database (server) WWW= https://www.mysql.com/ LICENSE= GPLv2 # MySQL8.2+ supports only 64-bit platforms # Review list after 13.x EoL -NOT_FOR_ARCHS= armv6 armv7 i386 powerpc +NOT_FOR_ARCHS= armv6 armv7 i386 powerpc USES= bison:build cmake:noninja cpe groff:run libedit localbase \ ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql97-client CPE_PRODUCT?= mysql_server CPE_VENDOR= oracle USE_CXXSTD= c++20 USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libcurl.so:ftp/curl \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ libhidapi.so:comms/hidapi \ - libfido2.so:security/libfido2 \ + libfido2.so:security/libfido2 CMAKE_BUILD_TYPE= Release CFLAGS+= -fPIC CFLAGS_aarch64?= -march=armv8-a+crc+crypto CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_PRIV_LIBDIR="lib/mysql/private" \ -DINSTALL_MANDIR="share/man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_SYSTEM_LIBS=1 \ -DWITH_EDITLINE=system \ -DWITH_LZ4=system \ -DWITH_ICU=system \ -DWITH_CURL=system \ -DWITH_ZSTD=bundled \ -DWITH_PROTOBUF=bundled \ -DWITH_SSL=system \ - -DWITH_ZLIB=system \ - -DWITH_LZ4=system + -DWITH_ZLIB=system SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL IGNORE= you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:97 CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ percona*-server USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample pkg-message USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \ mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1 MMAN8= mysqld.8 CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON" # Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules CMAKE_ARGS+= -DWITH_UNIT_TESTS="OFF" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" # todo, likely broken, see # https://dev.mysql.com/doc/refman/8.4/en/source-configuration-options.html PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include CXXFLAGS+= -malign-double .include post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .include diff --git a/databases/mysql97-server/files/patch-components_mysqlbackup_backup__page__tracker.cc b/databases/mysql97-server/files/patch-components_mysqlbackup_backup__page__tracker.cc new file mode 100644 index 000000000000..e1c0c831c982 --- /dev/null +++ b/databases/mysql97-server/files/patch-components_mysqlbackup_backup__page__tracker.cc @@ -0,0 +1,10 @@ +--- components/mysqlbackup/backup_page_tracker.cc.orig 2026-06-03 12:21:17 UTC ++++ components/mysqlbackup/backup_page_tracker.cc +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + + #if defined _MSC_VER diff --git a/databases/mysql97-server/files/patch-libs_mysql_gtid_tag__plain.h b/databases/mysql97-server/files/patch-libs_mysql_gtid_tag__plain.h new file mode 100644 index 000000000000..6e8483be9de6 --- /dev/null +++ b/databases/mysql97-server/files/patch-libs_mysql_gtid_tag__plain.h @@ -0,0 +1,10 @@ +--- libs/mysql/gtid/tag_plain.h.orig 2026-06-03 12:21:17 UTC ++++ libs/mysql/gtid/tag_plain.h +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "mysql/gtid/gtid_constants.h" // tag_max_length + diff --git a/databases/mysql97-server/files/patch-router_src_harness_src_stdx_filesystem.cc b/databases/mysql97-server/files/patch-router_src_harness_src_stdx_filesystem.cc new file mode 100644 index 000000000000..5736bfdfe328 --- /dev/null +++ b/databases/mysql97-server/files/patch-router_src_harness_src_stdx_filesystem.cc @@ -0,0 +1,10 @@ +--- router/src/harness/src/stdx/filesystem.cc.orig 2026-06-03 12:21:17 UTC ++++ router/src/harness/src/stdx/filesystem.cc +@@ -35,6 +35,7 @@ + + #include + #include ++#include + #include + + #include "mysql/harness/stdx/expected.h" diff --git a/databases/mysql97-server/files/patch-sql_server_component_mysql__file__imp.cc b/databases/mysql97-server/files/patch-sql_server__component_mysql__file__imp.cc similarity index 100% rename from databases/mysql97-server/files/patch-sql_server_component_mysql__file__imp.cc rename to databases/mysql97-server/files/patch-sql_server__component_mysql__file__imp.cc diff --git a/databases/mysql97-server/files/pkg-message.in b/databases/mysql97-server/files/pkg-message.in index 605517879bee..c93754e17ea4 100644 --- a/databases/mysql97-server/files/pkg-message.in +++ b/databases/mysql97-server/files/pkg-message.in @@ -1,21 +1,18 @@ [ { type: install message: <