diff options
| -rw-r--r-- | databases/mysql97-client/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysql97-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysql97-server/files/patch-components_mysqlbackup_backup__page__tracker.cc | 10 | ||||
| -rw-r--r-- | databases/mysql97-server/files/patch-libs_mysql_gtid_tag__plain.h | 10 | ||||
| -rw-r--r-- | databases/mysql97-server/files/patch-router_src_harness_src_stdx_filesystem.cc | 10 | ||||
| -rw-r--r-- | databases/mysql97-server/files/patch-sql_server__component_mysql__file__imp.cc (renamed from databases/mysql97-server/files/patch-sql_server_component_mysql__file__imp.cc) | 0 | ||||
| -rw-r--r-- | databases/mysql97-server/files/pkg-message.in | 11 | ||||
| -rw-r--r-- | databases/mysql97-server/pkg-plist | 7 |
8 files changed, 45 insertions, 21 deletions
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 @@ -8,7 +8,7 @@ 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 @@ -16,10 +16,9 @@ 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 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,6 +1,6 @@ PORTNAME?= mysql PORTVERSION= 9.7.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-9.7 PKGNAMESUFFIX?= 97-server @@ -13,7 +13,7 @@ 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 @@ -36,7 +36,7 @@ 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 @@ -71,8 +71,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_ZSTD=bundled \ -DWITH_PROTOBUF=bundled \ -DWITH_SSL=system \ - -DWITH_ZLIB=system \ - -DWITH_LZ4=system + -DWITH_ZLIB=system SHEBANG_FILES= scripts/*.pl* scripts/*.sh 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 <algorithm> + #include <cerrno> ++#include <cstdlib> + #include <string> + + #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 <cstring> + #include <memory> + #include <string> ++#include <type_traits> + + #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 <array> + #include <climits> ++#include <cstdlib> + #include <system_error> + + #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 index d9a6b5a4cb61..d9a6b5a4cb61 100644 --- 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 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 @@ -4,18 +4,15 @@ There is no initial password for first time use of MySQL. Keep in mind to reset it to a secure password. -MySQL 8.4 has a default %%ETCDIR%%/my.cnf, +MySQL 9.7 has a default %%ETCDIR%%/my.cnf, remember to replace it with your own -or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf. +or set `mysql_optfile="$YOUR_CNF_FILE"` in rc.conf. EOM } { type: upgrade message: <<EOM -As of MySQL 8.0.16, the MySQL server performs the upgrade tasks previously -handled by mysql_upgrade. Consequently, mysql_upgrade is unneeded and is -deprecated as of that version, and will be removed in a future MySQL version. -Because mysql_upgrade no longer performs upgrade tasks, -it exits with status 0 unconditionally. +The MySQL server performs all upgrade tasks itself at startup. +The mysql_upgrade utility does not exist anymore in MySQL 9.x. EOM } ] diff --git a/databases/mysql97-server/pkg-plist b/databases/mysql97-server/pkg-plist index cf81d31b36ee..d2265c099fb9 100644 --- a/databases/mysql97-server/pkg-plist +++ b/databases/mysql97-server/pkg-plist @@ -53,8 +53,8 @@ lib/mysql/libmysqlrouter_http_auth_backend.so.1 lib/mysql/libmysqlrouter_http_auth_realm.so lib/mysql/libmysqlrouter_http_auth_realm.so.1 lib/mysql/libmysqlrouter_http_client.so -lib/mysql/libmysqlrouter_http_server.so lib/mysql/libmysqlrouter_http_client.so.1 +lib/mysql/libmysqlrouter_http_server.so lib/mysql/libmysqlrouter_http_server.so.1 lib/mysql/libmysqlrouter_io_component.so lib/mysql/libmysqlrouter_io_component.so.1 @@ -291,6 +291,5 @@ libexec/mysqld %%DATADIR%%router/docs/sample_mysqlrouter.conf @dir %%ETCDIR%%/keyring @dir lib/mysql/plugin/debug -@dir %%MY_SECDIR%% -@dir %%MY_TMPDIR%% - +@dir(mysql,mysql,0750) %%MY_SECDIR%% +@dir(mysql,mysql,0750) %%MY_TMPDIR%% |