head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.10 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.8 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.6 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.4 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.2 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.3.0.6 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.4 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.2 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.2.0.16 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.14 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.12 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.10 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.8 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.6 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.4 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.2 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.1.0.8 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.6 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.4 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.2 pkgsrc-2021Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2025.02.16.23.28.13; author nia; state Exp; branches; next 1.3; commitid mtctoY6lVPyNzKJF; 1.3 date 2024.05.20.15.53.42; author nia; state Exp; branches; next 1.2; commitid lJuqj4gKmpU5OKaF; 1.2 date 2022.05.21.10.38.25; author nia; state Exp; branches; next 1.1; commitid VxOEvZZL9oWKwUED; 1.1 date 2021.05.23.15.32.47; author nia; state Exp; branches 1.1.8.1; next ; commitid dVR0PqPR0el7PhUC; 1.1.8.1 date 2022.06.05.10.42.39; author spz; state Exp; branches; next ; commitid xcp6U86Qo2Pp4QGD; desc @@ 1.4 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 @$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-01-28 18:36:04.000000000 +0000 +++ CMakeLists.txt @@@@ -451,8 +451,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) @@@@ -463,20 +461,17 @@@@ 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) ADD_SUBDIRECTORY(tpool) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) @@@@ -495,10 +490,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) @@@@ -507,13 +504,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) + SET(EXPORTED comp_err factorial) 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}) @@@@ -585,7 +583,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) @@@@ -597,41 +595,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) - 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 @mariadb105: Update to 10.5.25 Fixes various reliability problems and CVE-2024-21096. Mess around with the patches, since apparently some quite invasive build system changes are being committed to these old LTS branches. @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/21 10:38:25 nia Exp $ d5 1 a5 1 --- CMakeLists.txt.orig 2024-05-08 18:05:51.000000000 +0000 d7 1 a7 1 @@@@ -438,8 +438,6 @@@@ ENDIF() d16 1 a16 1 @@@@ -450,20 +448,17 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d37 1 a37 1 @@@@ -482,23 +477,27 @@@@ IF(NOT WITHOUT_SERVER) a49 1 + ADD_SUBDIRECTORY(tests) d52 2 a53 1 INCLUDE(cmake/abi_check.cmake) d66 1 a66 1 + SET(EXPORTED ${EXPORTED} comp_sql) d70 10 a79 1 @@@@ -582,41 +581,3 @@@@ IF(NON_DISTRIBUTABLE_WARNING) @ 1.2 log @mariadb105: Update to 10.5.16 MariaDB 10.5.16 Release Notes Notable Items InnoDB * innodb_disallow_writes removed (MDEV-25975) * InnoDB gap locking fixes (MDEV-20605, MDEV-28422) * InnoDB performance improvements (MDEV-27557, MDEV-28185) Replication * Server initialization time gtid_slave_pos purge related reason of crashing in binlog background thread is removed (MDEV-26473) * Shutdown of the semisync master can't produce inconsistent state anymore (MDEV-11853) * Binlogs disappear after rsync IST (MDEV-28583) * autocommit=0 slave hang is eliminated (DBAAS-7828) * master crash is eliminated in compressed semisync replication protocol with packet counting amendment (MDEV-25580) * OPTIMIZE on a sequence does not cause counterfactual ER_BINLOG_UNSAFE_STATEMENT anymore (MDEV-24617) * Automatically generated Gtid_log_list_event is made to recognize within replication event group as a formal member (MDEV-28550) * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE using two or more unique key values at a time with MIXED format binlogging is corrected (MDEV-28310) * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE stops issuing unnessary "Unsafe statement" with MIXED binlog format (MDEV-21810) * Incomplete replication event groups are detected to error out by the slave IO thread (MDEV-27697) * mysqlbinlog --stop-never --raw now flushes the result file to disk after each processed event so the file can be listed with the actual bytes (MDEV-14608) Backup * Incorrect binlogs after Galera SST using rsync and mariabackup (MDEV-27524) * mariabackup does not detect multi-source replication slave (MDEV-21037) * Useless warning "InnoDB: Allocated tablespace ID for , old maximum was 0" during backup stage (MDEV-27343) * mariabackup prepare fails for incrementals if a new schema is created after full backup is taken (MDEV-28446) Optimizer * A SEGV in Item_field::used_tables/update_depend_map_for_order... (MDEV-26402) * ANALYZE FORMAT=JSON fields are incorrect for UNION ALL queries (MDEV-27699) * Subquery in an UPDATE query uses full scan instead of range (MDEV-22377) * Assertion `item1->type() == Item::FIELD_ITEM ... (MDEV-19398) * Server crashes in Expression_cache_tracker::fetch_current_stats (MDEV-28268) * MariaDB server crash at Item_subselect::init_expr_cache_tracker (MDEV-26164, MDEV-26047) * Crash with union of my_decimal type in ORDER BY clause (MDEV-25994) * SIGSEGV in st_join_table::cleanup (MDEV-24560) * Assertion `!eliminated' failed in Item_subselect::exec (MDEV-28437) General * Server error messages are now available in Chinese (MDEV-28227) * For RHEL/CentOS 7, non x86_64 architectures are no longer supported upstream and so our support will also be dropped with this release Security * Fixes for the following security vulnerabilities: * CVE-2022-27376 * CVE-2022-27377 * CVE-2022-27378 * CVE-2022-27379 * CVE-2022-27380 * CVE-2022-27381 * CVE-2022-27382 * CVE-2022-27383 * CVE-2022-27384 * CVE-2022-27386 * CVE-2022-27387 * CVE-2022-27444 * CVE-2022-27445 * CVE-2022-27446 * CVE-2022-27447 * CVE-2022-27448 * CVE-2022-27449 * CVE-2022-27451 * CVE-2022-27452 * CVE-2022-27455 * CVE-2022-27456 * CVE-2022-27457 * CVE-2022-27458 @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $ d5 1 a5 1 --- CMakeLists.txt.orig 2022-05-18 07:55:26.000000000 +0000 d7 1 a7 1 @@@@ -432,8 +432,6 @@@@ ENDIF() d16 1 a16 1 @@@@ -444,13 +442,11 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d30 8 a37 1 @@@@ -476,23 +472,26 @@@@ IF(NOT WITHOUT_SERVER) d50 1 d70 42 @ 1.1 log @mariadb105[-client,-server]: import mariadb 10.5 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$ d5 1 a5 1 --- CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000 d7 1 a7 1 @@@@ -421,8 +421,6 @@@@ ENDIF() d13 1 d16 1 a16 2 @@@@ -432,13 +430,11 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d30 1 a30 1 @@@@ -461,23 +457,26 @@@@ IF(NOT WITHOUT_SERVER) @ 1.1.8.1 log @Pullup ticket #6641 - requested by nia databases/mariadb105-client: security update databases/mariadb105-server: security update Revisions pulled up: - databases/mariadb105-client/Makefile.common 1.16 - databases/mariadb105-client/distinfo 1.13 - databases/mariadb105-client/patches/patch-CMakeLists.txt 1.2 - databases/mariadb105-server/Makefile 1.25 - databases/mariadb105-server/PLIST 1.10 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: nia Date: Sat May 21 10:38:26 UTC 2022 Modified Files: pkgsrc/databases/mariadb105-client: Makefile.common distinfo pkgsrc/databases/mariadb105-client/patches: patch-CMakeLists.txt pkgsrc/databases/mariadb105-server: Makefile PLIST Log Message: mariadb105: Update to 10.5.16 MariaDB 10.5.16 Release Notes Notable Items InnoDB * innodb_disallow_writes removed (MDEV-25975) * InnoDB gap locking fixes (MDEV-20605, MDEV-28422) * InnoDB performance improvements (MDEV-27557, MDEV-28185) Replication * Server initialization time gtid_slave_pos purge related reason of crashing in binlog background thread is removed (MDEV-26473) * Shutdown of the semisync master can't produce inconsistent state anymore (MDEV-11853) * Binlogs disappear after rsync IST (MDEV-28583) * autocommit=0 slave hang is eliminated (DBAAS-7828) * master crash is eliminated in compressed semisync replication protocol with packet counting amendment (MDEV-25580) * OPTIMIZE on a sequence does not cause counterfactual ER_BINLOG_UNSAFE_STATEMENT anymore (MDEV-24617) * Automatically generated Gtid_log_list_event is made to recognize within replication event group as a formal member (MDEV-28550) * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE using two or more unique key values at a time with MIXED format binlogging is corrected (MDEV-28310) * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE stops issuing unnessary "Unsafe statement" with MIXED binlog format (MDEV-21810) * Incomplete replication event groups are detected to error out by the slave IO thread (MDEV-27697) * mysqlbinlog --stop-never --raw now flushes the result file to disk after each processed event so the file can be listed with the actual bytes (MDEV-14608) Backup * Incorrect binlogs after Galera SST using rsync and mariabackup (MDEV-27524) * mariabackup does not detect multi-source replication slave (MDEV-21037) * Useless warning "InnoDB: Allocated tablespace ID for , old maximum was 0" during backup stage (MDEV-27343) * mariabackup prepare fails for incrementals if a new schema is created after full backup is taken (MDEV-28446) Optimizer * A SEGV in Item_field::used_tables/update_depend_map_for_order... (MDEV-26402) * ANALYZE FORMAT=JSON fields are incorrect for UNION ALL queries (MDEV-27699) * Subquery in an UPDATE query uses full scan instead of range (MDEV-22377) * Assertion `item1->type() = Item::FIELD_ITEM ... (MDEV-19398) * Server crashes in Expression_cache_tracker::fetch_current_stats (MDEV-28268) * MariaDB server crash at Item_subselect::init_expr_cache_tracker (MDEV-26164, MDEV-26047) * Crash with union of my_decimal type in ORDER BY clause (MDEV-25994) * SIGSEGV in st_join_table::cleanup (MDEV-24560) * Assertion `!eliminated' failed in Item_subselect::exec (MDEV-28437) General * Server error messages are now available in Chinese (MDEV-28227) * For RHEL/CentOS 7, non x86_64 architectures are no longer supported upstream and so our support will also be dropped with this release Security * Fixes for the following security vulnerabilities: * CVE-2022-27376 * CVE-2022-27377 * CVE-2022-27378 * CVE-2022-27379 * CVE-2022-27380 * CVE-2022-27381 * CVE-2022-27382 * CVE-2022-27383 * CVE-2022-27384 * CVE-2022-27386 * CVE-2022-27387 * CVE-2022-27444 * CVE-2022-27445 * CVE-2022-27446 * CVE-2022-27447 * CVE-2022-27448 * CVE-2022-27449 * CVE-2022-27451 * CVE-2022-27452 * CVE-2022-27455 * CVE-2022-27456 * CVE-2022-27457 * CVE-2022-27458 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mariadb105-client/Makefile.common cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mariadb105-client/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/mariadb105-server/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb105-server/PLIST @ text @d5 1 a5 1 --- CMakeLists.txt.orig 2022-05-18 07:55:26.000000000 +0000 d7 1 a7 1 @@@@ -432,8 +432,6 @@@@ ENDIF() a12 1 INCLUDE(cpack_tgz) d15 2 a16 1 @@@@ -444,13 +442,11 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) d30 1 a30 1 @@@@ -476,23 +472,26 @@@@ IF(NOT WITHOUT_SERVER) @