From 1aac483ef4ed5c4c99c8cf53e33b6b86484e1f2b Mon Sep 17 00:00:00 2001 From: nia Date: Mon, 20 May 2024 15:53:41 +0000 Subject: [PATCH] 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. --- databases/mariadb105-client/Makefile.common | 7 ++- databases/mariadb105-client/PLIST | 3 +- databases/mariadb105-client/distinfo | 14 ++--- .../patches/patch-CMakeLists.txt | 60 +++++++++++++++++-- .../patch-plugin_auth__socket_CMakeLists.txt | 10 ++-- .../patch-storage_columnstore_CMakeLists.txt | 12 ++-- databases/mariadb105-server/PLIST | 4 +- 7 files changed, 82 insertions(+), 28 deletions(-) diff --git a/databases/mariadb105-client/Makefile.common b/databases/mariadb105-client/Makefile.common index 1e9299d3d847..663b8fd363c2 100644 --- a/databases/mariadb105-client/Makefile.common +++ b/databases/mariadb105-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.30 2024/05/15 19:21:43 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.31 2024/05/20 15:53:41 nia Exp $ # # used by databases/mariadb105-client/Makefile # used by databases/mariadb105-server/Makefile -DISTNAME= mariadb-10.5.24 +DISTNAME= mariadb-10.5.25 CATEGORIES= databases MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ @@ -36,6 +36,7 @@ MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET:Uall} BUILD_DEFS+= VARBASE CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc" +CMAKE_ARGS+= -DMANUFACTURER="pkgsrc" CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" @@ -72,6 +73,8 @@ CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO # Requires Java CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF +CMAKE_ARGS+= -DCONNECT_WITH_LIBXML2=OFF + # Options which affect generation of includes CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON diff --git a/databases/mariadb105-client/PLIST b/databases/mariadb105-client/PLIST index 78e2c6f34890..0e39ec9d4a6d 100644 --- a/databases/mariadb105-client/PLIST +++ b/databases/mariadb105-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2024/04/10 19:21:45 nia Exp $ +@comment $NetBSD: PLIST,v 1.9 2024/05/20 15:53:41 nia Exp $ bin/mariadb bin/mariadb-access bin/mariadb-admin @@ -132,6 +132,7 @@ include/mysql/server/mysql/service_md5.h include/mysql/server/mysql/service_my_crypt.h include/mysql/server/mysql/service_my_print_error.h include/mysql/server/mysql/service_my_snprintf.h +include/mysql/server/mysql/service_print_check_msg.h include/mysql/server/mysql/service_progress_report.h include/mysql/server/mysql/service_sha1.h include/mysql/server/mysql/service_sha2.h diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo index 23151092c7a0..f68984a4c7f9 100644 --- a/databases/mariadb105-client/distinfo +++ b/databases/mariadb105-client/distinfo @@ -1,21 +1,21 @@ -$NetBSD: distinfo,v 1.21 2024/04/10 19:21:45 nia Exp $ +$NetBSD: distinfo,v 1.22 2024/05/20 15:53:41 nia Exp $ -BLAKE2s (mariadb-10.5.24.tar.gz) = 3aa31986e277690650783b39d0ebafb6c4e10333e1ee84d4b3d467081a85abac -SHA512 (mariadb-10.5.24.tar.gz) = 04886d7889c7f52763b8a4ae595627cfa200f28772108ecf9a65355bee496cadfc4138291ae043ba6a9c27801e4765df53738211c237c9994f1bfc6783d7e568 -Size (mariadb-10.5.24.tar.gz) = 115706805 bytes +BLAKE2s (mariadb-10.5.25.tar.gz) = 4302be25824e86c52059348a346aa09b5982c079369ac0fdb2940a1b5283383f +SHA512 (mariadb-10.5.25.tar.gz) = 82bc2b8d098a35a6ae2c950e51e710534dac9394defe78f19ebd9c39e0bf5a4fe1af03a585324b8a51764f1b3c33e57576b2ff2d77a357861b5dcf2752851cc2 +Size (mariadb-10.5.25.tar.gz) = 115951936 bytes SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f -SHA1 (patch-CMakeLists.txt) = 574131db46854715758c60ba5f026498f5b29564 +SHA1 (patch-CMakeLists.txt) = 96e43de080e7596cc02edfce7e621fe64a13bcb0 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 SHA1 (patch-client_mysql.cc) = 89fe80fb66b8791131a8c6d1b209e57082804a01 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66 SHA1 (patch-mysys_my__gethwaddr.c) = f4fd827617697ff386099defc839fe8d082e6c3e -SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = 11f52f5335ac56888d8a367caa03c68059eb61c9 +SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = f6aba24287009124ab964d2c10e25e6ece5cd7dc SHA1 (patch-plugin_auth__socket_auth__socket.c) = 850e94faff382a7e962f6d4d6ff960ddddc624c4 SHA1 (patch-scripts_CMakeLists.txt) = 54591a4d255a8133e06ab5d52bad262acffcddda SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea -SHA1 (patch-storage_columnstore_CMakeLists.txt) = cd5ceb1802831910c6cfa5950c52f5af8eb7dcaa +SHA1 (patch-storage_columnstore_CMakeLists.txt) = 9b79ccf35992d2a76c4e2a45d8c749835dd0118a SHA1 (patch-storage_rocksdb_CMakeLists.txt) = 2ab237df750cc18facf92c6ad997469f5e43c63f SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301 diff --git a/databases/mariadb105-client/patches/patch-CMakeLists.txt b/databases/mariadb105-client/patches/patch-CMakeLists.txt index 21fef3831c91..055d370df829 100644 --- a/databases/mariadb105-client/patches/patch-CMakeLists.txt +++ b/databases/mariadb105-client/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/21 10:38:25 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2024/05/20 15:53:42 nia Exp $ Allow building a server-only configuration. ---- CMakeLists.txt.orig 2022-05-18 07:55:26.000000000 +0000 +--- CMakeLists.txt.orig 2024-05-08 18:05:51.000000000 +0000 +++ CMakeLists.txt -@@ -432,8 +432,6 @@ ENDIF() +@@ -438,8 +438,6 @@ ENDIF() UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) @@ -13,7 +13,7 @@ Allow building a server-only configuration. INCLUDE(cpack_tgz) INCLUDE(cpack_rpm) INCLUDE(cpack_deb) -@@ -444,13 +442,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) +@@ -450,20 +448,17 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) # Add storage engines and plugins. CONFIGURE_PLUGINS() @@ -27,7 +27,14 @@ Allow building a server-only configuration. ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(sql/share) -@@ -476,23 +472,26 @@ IF(NOT WITHOUT_SERVER) + 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) +@@ -482,23 +477,27 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -40,6 +47,7 @@ Allow building a server-only configuration. + ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(man) + ADD_SUBDIRECTORY(support-files) ++ ADD_SUBDIRECTORY(tests) ENDIF() INCLUDE(cmake/abi_check.cmake) @@ -59,3 +67,45 @@ Allow building a server-only configuration. ENDIF() # minimal target to build only binaries for export ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) +@@ -582,41 +581,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() diff --git a/databases/mariadb105-client/patches/patch-plugin_auth__socket_CMakeLists.txt b/databases/mariadb105-client/patches/patch-plugin_auth__socket_CMakeLists.txt index 5d953b0f0ac0..992dd82fd205 100644 --- a/databases/mariadb105-client/patches/patch-plugin_auth__socket_CMakeLists.txt +++ b/databases/mariadb105-client/patches/patch-plugin_auth__socket_CMakeLists.txt @@ -1,9 +1,9 @@ -$NetBSD: patch-plugin_auth__socket_CMakeLists.txt,v 1.2 2023/03/07 10:28:02 jperkin Exp $ +$NetBSD: patch-plugin_auth__socket_CMakeLists.txt,v 1.3 2024/05/20 15:53:42 nia Exp $ Add SO_PEERCRED definitions for NetBSD. https://github.com/MariaDB/server/pull/1884 ---- plugin/auth_socket/CMakeLists.txt.orig 2022-11-02 12:37:20.000000000 +0000 +--- plugin/auth_socket/CMakeLists.txt.orig 2024-05-08 18:05:54.000000000 +0000 +++ plugin/auth_socket/CMakeLists.txt @@ -57,6 +57,21 @@ IF (HAVE_XUCRED) SET(ok 1) @@ -27,11 +27,11 @@ https://github.com/MariaDB/server/pull/1884 # illumos, is that you? CHECK_CXX_SOURCE_COMPILES( "#include -@@ -102,6 +117,7 @@ ELSE() +@@ -104,6 +119,7 @@ ENDIF() ENDIF() ENDIF() ENDIF() +ENDIF() - ENDIF() - ENDIF() + IF(ok) + MYSQL_ADD_PLUGIN(auth_socket auth_socket.c DEFAULT) diff --git a/databases/mariadb105-client/patches/patch-storage_columnstore_CMakeLists.txt b/databases/mariadb105-client/patches/patch-storage_columnstore_CMakeLists.txt index 039e65936289..fce57364ee12 100644 --- a/databases/mariadb105-client/patches/patch-storage_columnstore_CMakeLists.txt +++ b/databases/mariadb105-client/patches/patch-storage_columnstore_CMakeLists.txt @@ -1,14 +1,16 @@ -$NetBSD: patch-storage_columnstore_CMakeLists.txt,v 1.1 2023/03/07 10:28:02 jperkin Exp $ +$NetBSD: patch-storage_columnstore_CMakeLists.txt,v 1.2 2024/05/20 15:53:42 nia Exp $ Support SunOS. ---- storage/columnstore/CMakeLists.txt.orig 2022-11-02 12:37:21.000000000 +0000 +--- storage/columnstore/CMakeLists.txt.orig 2024-05-08 18:05:55.000000000 +0000 +++ storage/columnstore/CMakeLists.txt -@@ -12,6 +12,7 @@ macro(APPEND_FOR_CPACK V) +@@ -12,7 +12,8 @@ macro(APPEND_FOR_CPACK V) endmacro() IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR +-CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") + CMAKE_SYSTEM_NAME STREQUAL "SunOS" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") - add_subdirectory(columnstore) ++ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") + # https://jira.mariadb.org/browse/MCOL-5611 + FIND_PACKAGE(Boost 1.53 COMPONENTS system filesystem thread regex date_time chrono atomic) diff --git a/databases/mariadb105-server/PLIST b/databases/mariadb105-server/PLIST index 7006e91fbfc8..2ac39269d573 100644 --- a/databases/mariadb105-server/PLIST +++ b/databases/mariadb105-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2024/04/10 19:21:45 nia Exp $ +@comment $NetBSD: PLIST,v 1.14 2024/05/20 15:53:42 nia Exp $ bin/aria_chk bin/aria_dump_log bin/aria_ftdump @@ -8,7 +8,6 @@ bin/aria_s3_copy bin/innochecksum bin/mariabackup bin/mariadb-backup -bin/mariadb-client-test ${PLIST.embedded}bin/mariadb-client-test-embedded bin/mariadb-dumpslow ${PLIST.embedded}bin/mariadb-embedded @@ -28,7 +27,6 @@ bin/myisamchk bin/myisamlog bin/myisampack ${PLIST.rocksdb}bin/myrocks_hotbackup -bin/mysql_client_test ${PLIST.embedded}bin/mysql_client_test_embedded ${PLIST.embedded}bin/mysql_embedded bin/mysql_fix_extensions