From nobody Wed Nov 10 20:22:30 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 648F4184CA19; Wed, 10 Nov 2021 20:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HqGVZ2RLhz3nCy; Wed, 10 Nov 2021 20:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3371F1F0BE; Wed, 10 Nov 2021 20:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AAKMUK1008857; Wed, 10 Nov 2021 20:22:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAKMUf8008846; Wed, 10 Nov 2021 20:22:30 GMT (envelope-from git) Date: Wed, 10 Nov 2021 20:22:30 GMT Message-Id: <202111102022.1AAKMUf8008846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: c0485a60f8c1 - main - databases/mariadb105-server: Security update to 10.5.13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0485a60f8c19bc3e87fede1d40bd8e711e9593a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0485a60f8c19bc3e87fede1d40bd8e711e9593a commit c0485a60f8c19bc3e87fede1d40bd8e711e9593a Author: Bernard Spil AuthorDate: 2021-11-10 08:14:19 +0000 Commit: Bernard Spil CommitDate: 2021-11-10 20:19:59 +0000 databases/mariadb105-server: Security update to 10.5.13 MFH: 2021Q4 Security: c9387e4d-2f5f-11ec-8be6-d4c9ef517024 --- databases/mariadb105-server/Makefile | 4 +- databases/mariadb105-server/distinfo | 6 +- databases/mariadb105-server/files/patch-MDEV-26537 | 109 --------------------- .../files/patch-extra_CMakeLists.txt | 11 --- 4 files changed, 5 insertions(+), 125 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 2d4f7c8c7baf..ed353ab07d3f 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,8 +1,8 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.12 -PORTREVISION?= 1 +PORTVERSION= 10.5.13 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index 148012cb3dbe..c5d7eddf1096 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628155943 -SHA256 (mariadb-10.5.12.tar.gz) = ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd -SIZE (mariadb-10.5.12.tar.gz) = 101914615 +TIMESTAMP = 1636446066 +SHA256 (mariadb-10.5.13.tar.gz) = 16f008c66831130e9263b2601265d566ffc4e890d37bacecd4dcecebfd0d1c58 +SIZE (mariadb-10.5.13.tar.gz) = 102047279 diff --git a/databases/mariadb105-server/files/patch-MDEV-26537 b/databases/mariadb105-server/files/patch-MDEV-26537 deleted file mode 100644 index 0fb9ecc7f529..000000000000 --- a/databases/mariadb105-server/files/patch-MDEV-26537 +++ /dev/null @@ -1,109 +0,0 @@ -From 716f04a40f225af11fa88e793441da96dd0ddf21 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= -Date: Fri, 10 Sep 2021 11:20:12 +0300 -Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize - calculation - -The st_blksize returned by fstat(2) is not documented to be -a power of 2, like we assumed in -commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040). -While on Linux, the st_blksize appears to report the file system -block size, on FreeBSD it seems to be something similar to st_size. - -Also IBM AIX was affected by the bug. A simple test case that would -lead to a crash when using the minimum innodb_buffer_pool_size=5m: - -seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& -seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \ -1 100|mysql test& - -We will fix this by not trusting st_blksize at all, and assuming that -the file system block size is 4096 bytes. We hope that no storage systems -with larger block size exist. Anything larger than 4096 bytes should be -unlikely, given that it is the minimum virtual memory page size of many -contemporary processors. - -While the block size 512 bytes of the venerable Seagate ST-225 is still -in widespread use, the minimum innodb_page_size is 4096 bytes, and -innodb_log_file_size can be set in integer multiples of 65536 bytes. - -The only occasion where InnoDB uses smaller block sizes than 4096 bytes -is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1 -or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables, -we will from now on preallocate space in integer multiples of 4096 bytes -and let regular writes extend the file by 1024, 2048, or 3072 bytes. - -The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE -should report the raw st_blksize. - -For page_compressed tables, the function fil_space_get_block_size() -will map to 512 any st_blksize value that is larger than 4096. - -os_file_set_size(): Assume that the file system block size is 4096 bytes, -and only support extending files to integer multiples of 4096 bytes. - -fil_space_extend_must_retry(): Round down the preallocation size to -an integer multiple of 4096 bytes. ---- - mysql-test/suite/innodb/r/check_ibd_filesize,4k.rdiff | 2 +- - storage/innobase/fil/fil0fil.cc | 11 ++++++++--- - storage/innobase/os/os0file.cc | 7 ++++--- - 3 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc -index 6af8b729d78c5..b9421df3ffbad 100644 ---- storage/innobase/fil/fil0fil.cc -+++ storage/innobase/fil/fil0fil.cc -@@ -578,10 +578,15 @@ fil_space_extend_must_retry( - - const unsigned page_size = space->physical_size(); - -- /* Datafile::read_first_page() expects srv_page_size bytes. -- fil_node_t::read_page0() expects at least 4 * srv_page_size bytes.*/ -+ /* Datafile::read_first_page() expects innodb_page_size bytes. -+ fil_node_t::read_page0() expects at least 4 * innodb_page_size bytes. -+ os_file_set_size() expects multiples of 4096 bytes. -+ For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte -+ pages, we will preallocate up to an integer multiple of 4096 bytes, -+ and let normal writes append 1024, 2048, or 3072 bytes to the file. */ - os_offset_t new_size = std::max( -- os_offset_t(size - file_start_page_no) * page_size, -+ (os_offset_t(size - file_start_page_no) * page_size) -+ & ~os_offset_t(4095), - os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift)); - - *success = os_file_set_size(node->name, node->handle, new_size, -diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc -index dde1975ea08b5..9e1eeff202d4b 100644 ---- storage/innobase/os/os0file.cc -+++ storage/innobase/os/os0file.cc -@@ -3303,6 +3303,8 @@ os_file_set_size( - os_offset_t size, - bool is_sparse) - { -+ ut_ad(!(size & 4095)); -+ - #ifdef _WIN32 - /* On Windows, changing file size works well and as expected for both - sparse and normal files. -@@ -3344,7 +3346,7 @@ os_file_set_size( - if (current_size >= size) { - return true; - } -- current_size &= ~os_offset_t(statbuf.st_blksize - 1); -+ current_size &= ~4095ULL; - err = posix_fallocate(file, current_size, - size - current_size); - } -@@ -3384,8 +3386,7 @@ os_file_set_size( - if (fstat(file, &statbuf)) { - return false; - } -- os_offset_t current_size = statbuf.st_size -- & ~os_offset_t(statbuf.st_blksize - 1); -+ os_offset_t current_size = statbuf.st_size & ~4095ULL; - #endif - if (current_size >= size) { - return true; - diff --git a/databases/mariadb105-server/files/patch-extra_CMakeLists.txt b/databases/mariadb105-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 6f662cf00bac..000000000000 --- a/databases/mariadb105-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/CMakeLists.txt.orig 2020-06-23 15:10:16 UTC -+++ extra/CMakeLists.txt -@@ -46,7 +46,7 @@ ADD_CUSTOM_TARGET(GenError - DEPENDS - ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) - --MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -+MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c COMPONENT Client) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - - MYSQL_ADD_EXECUTABLE(perror perror.c)