head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.4 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.2 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.3.0.4 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.2 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.2.0.2 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.1.0.4 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.2 pkgsrc-2024Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2025.10.27.20.53.45; author nia; state Exp; branches; next 1.3; commitid xUJSWsKQAxLKAfgG; 1.3 date 2025.06.06.20.15.49; author nia; state Exp; branches; next 1.2; commitid DVoaqShiRkfzYRXF; 1.2 date 2025.02.16.23.28.14; author nia; state Exp; branches; next 1.1; commitid mtctoY6lVPyNzKJF; 1.1 date 2024.08.21.21.08.34; author nia; state Exp; branches; next ; commitid lrFoRXflimyIyJmF; desc @@ 1.4 log @mariadb114: Update to 11.4.8 The usual bundle of reliability fixes. @ text @$NetBSD: patch-CMakeLists.txt,v 1.1 2024/08/21 21:08:34 nia Exp $ Allow building a server-only configuration. --- CMakeLists.txt.orig 2025-05-19 16:14:23.000000000 +0000 +++ CMakeLists.txt @@@@ -457,8 +457,6 @@@@ ENDIF() UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) -INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) - INCLUDE(cpack_tgz) INCLUDE(cpack_rpm) INCLUDE(cpack_deb) @@@@ -469,19 +467,16 @@@@ 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) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) @@@@ -500,10 +495,12 @@@@ 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() IF (NOT WITHOUT_ABI_CHECK) @@@@ -512,13 +509,14 @@@@ ENDIF() 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 uca-dump) + SET(EXPORTED comp_err factorial uca-dump) 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}) @@@@ -590,7 +588,7 @@@@ IF(WIN32 AND SIGNCODE) INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake) ENDIF() -FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES VAR MARIADB_FEATURE_SUMMARY) +FEATURE_SUMMARY(WHAT ALL VAR MARIADB_FEATURE_SUMMARY) OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON) IF (FEATURE_SUMMARY) @@@@ -602,41 +600,3 @@@@ IF(NON_DISTRIBUTABLE_WARNING) MESSAGE(WARNING " You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.") ENDIF() - -IF(NOT WITHOUT_SERVER) - # Define target for minimal mtr-testable build - ADD_CUSTOM_TARGET(minbuild) - ADD_DEPENDENCIES(minbuild - aria_chk - aria_pack - mariadb - mariadb-admin - mariadb-binlog - mariadb-check - mariadb-client-test - mariadb-conv - mariadb-dump - mariadb-import - mariadb-plugin - mariadb-show - mariadb-slap - mariadb-test - mariadb-tzinfo-to-sql - mariadb-upgrade - mariadbd - my_print_defaults - my_safe_process - myisam_ftdump - myisamchk - myisamlog - myisampack - perror - replace) - IF(WIN32) - ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill mariadb-upgrade-service) - ENDIF() - ADD_CUSTOM_TARGET(smoketest - COMMAND perl ./mysql-test-run.pl main.1st - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test) - ADD_DEPENDENCIES(smoketest minbuild) -ENDIF() @ 1.3 log @mariadb114: Update to 11.4.7 Fixes for the following security issues: - CVE-2025-30722 - CVE-2025-30693 - CVE-2023-52970 - CVE-2023-52969 - CVE-2023-52971 Fixes the build on OpenBSD, detected by drecklypkg ci. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.2 2025/02/16 23:28:14 nia Exp $ @ 1.2 log @mariadb: Update packages to latest minor version of LTS releases. While here, delint (mainly fixing whitespace issues in options.mk). Builds on: FreeBSD NetBSD OmniOS macOS @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2024/08/21 21:08:34 nia Exp $ d5 1 a5 1 --- CMakeLists.txt.orig 2025-01-30 17:54:53.000000000 +0000 d7 1 a7 1 @@@@ -458,8 +458,6 @@@@ ENDIF() d16 1 a16 1 @@@@ -470,19 +468,16 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d36 1 a36 1 @@@@ -501,10 +496,12 @@@@ IF(NOT WITHOUT_SERVER) d52 1 a52 1 @@@@ -513,13 +510,14 @@@@ ENDIF() d69 1 a69 1 @@@@ -591,7 +589,7 @@@@ IF(WIN32 AND SIGNCODE) d78 1 a78 1 @@@@ -603,41 +601,3 @@@@ IF(NON_DISTRIBUTABLE_WARNING) d113 1 a113 1 - ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill) @ 1.1 log @databases: Import MariaDB 11.4, the most recent LTS release. 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. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.2 2024/05/21 09:52:52 nia Exp $ d5 1 a5 1 --- CMakeLists.txt.orig 2024-05-10 21:02:16.000000000 +0000 d7 1 a7 1 @@@@ -441,8 +441,6 @@@@ ENDIF() d16 1 a16 1 @@@@ -453,19 +451,16 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d36 1 a36 1 @@@@ -484,23 +479,26 @@@@ IF(NOT WITHOUT_SERVER) d51 2 a52 1 INCLUDE(cmake/abi_check.cmake) d69 1 a69 1 @@@@ -572,7 +570,7 @@@@ IF(WIN32 AND SIGNCODE) d78 1 a78 1 @@@@ -584,41 +582,3 @@@@ IF(NON_DISTRIBUTABLE_WARNING) @