head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.4 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.2 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.4.0.4 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.2 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.3.0.2 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.2.0.6 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.4 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.2 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.1.0.6 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.4 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.2 pkgsrc-2023Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2025.10.27.20.48.59; author nia; state Exp; branches; next 1.4; commitid 9sSTr7B7xx8dzfgG; 1.4 date 2025.06.06.20.48.33; author nia; state Exp; branches; next 1.3; commitid 0nkipeDMNaIO9SXF; 1.3 date 2025.02.16.23.28.12; author nia; state Exp; branches 1.3.2.1; next 1.2; commitid mtctoY6lVPyNzKJF; 1.2 date 2024.05.21.09.52.52; author nia; state Exp; branches; next 1.1; commitid 6MqDB4MGwimfMQaF; 1.1 date 2023.07.10.22.55.49; author nia; state Exp; branches; next ; commitid zZly68CZaYmJgjwE; 1.3.2.1 date 2025.06.09.00.28.10; author maya; state Exp; branches; next ; commitid dIg4q4GVjcqqj9YF; desc @@ 1.5 log @mariadb1011-client: Update to 10.11.14 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.4 log @mariadb1011: Update to 10.11.13 Fixes for the following security issues: - CVE-2025-30722 - CVE-2025-30693 - CVE-2023-52970 - CVE-2023-52969 - CVE-2023-52971 @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.3 2025/02/16 23:28:12 nia Exp $ @ 1.3 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.3.2.1 log @Pullup ticket #6974 - requested by nia databases/mariadb1011-client: Security fix databases/mariadb1011-embedded: Security fix databases/mariadb1011-server: Security fix Revisions pulled up: - databases/mariadb1011-client/Makefile 1.19 - databases/mariadb1011-client/Makefile.common 1.18 - databases/mariadb1011-client/PLIST 1.4 - databases/mariadb1011-client/distinfo 1.15 - databases/mariadb1011-client/patches/patch-CMakeLists.txt 1.4 - databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake 1.4 - databases/mariadb1011-client/patches/patch-storage_rocksdb_rocksdb_Makefile 1.2 - databases/mariadb1011-embedded/Makefile 1.14 - databases/mariadb1011-server/Makefile 1.27 --- Module Name: pkgsrc Committed By: nia Date: Fri Jun 6 20:48:34 UTC 2025 Modified Files: pkgsrc/databases/mariadb1011-client: Makefile Makefile.common PLIST distinfo pkgsrc/databases/mariadb1011-client/patches: patch-CMakeLists.txt patch-cmake_libfmt.cmake patch-storage_rocksdb_rocksdb_Makefile pkgsrc/databases/mariadb1011-embedded: Makefile pkgsrc/databases/mariadb1011-server: Makefile Log Message: mariadb1011: Update to 10.11.13 Fixes for the following security issues: - CVE-2025-30722 - CVE-2025-30693 - CVE-2023-52970 - CVE-2023-52969 - CVE-2023-52971 @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- CMakeLists.txt.orig 2025-05-19 16:14:23.000000000 +0000 d7 1 a7 1 @@@@ -457,8 +457,6 @@@@ ENDIF() d16 1 a16 1 @@@@ -469,19 +467,16 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d36 1 a36 1 @@@@ -500,10 +495,12 @@@@ IF(NOT WITHOUT_SERVER) d52 1 a52 1 @@@@ -512,13 +509,14 @@@@ ENDIF() d69 1 a69 1 @@@@ -590,7 +588,7 @@@@ IF(WIN32 AND SIGNCODE) d78 1 a78 1 @@@@ -602,41 +600,3 @@@@ IF(NON_DISTRIBUTABLE_WARNING) d113 1 a113 1 - ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill mariadb-upgrade-service) @ 1.2 log @mariadb1011: Update to 10.11.8 Fixes various reliability issues, and CVE-2024-21096 @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2023/07/10 22:55:49 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) @ 1.1 log @Import mariadb-10.11, the most recent LTS branch. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.3 2022/05/21 09:36:02 nia Exp $ d5 1 a5 1 --- CMakeLists.txt.orig 2023-06-05 17:14:07.000000000 +0000 d7 1 a7 1 @@@@ -426,8 +426,6 @@@@ ENDIF() d16 1 a16 1 @@@@ -438,19 +436,16 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d36 1 a36 1 @@@@ -469,23 +464,26 @@@@ IF(NOT WITHOUT_SERVER) d68 10 a77 1 @@@@ -569,41 +567,3 @@@@ IF(NON_DISTRIBUTABLE_WARNING) @