From nobody Sat Feb 15 11:00:57 2025 X-Original-To: dev-commits-ports-all@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 4Yw5Z21y7vz5nPLM; Sat, 15 Feb 2025 11:00:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yw5Z21Qnbz3Z8J; Sat, 15 Feb 2025 11:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739617258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcgHBV3ilgPrxw8rx4Z5BRdTEJPaIWeGHi3cviBSCgw=; b=uex32La+/yNGhrWjSbDOHMZCbG0Q/rybbw4T0ih+lljrIrB8FXi69iDbqmzWyRDQ9TLk7q qrhrF0zDvUPVeVVvhNhynSQ86c71eNn4Q7XLAxaWPIWZmDRfTPcXI6gUo9eCig3JXjiFM+ Ja0iFOIyL1kafYbQ4OUeLkT5uN2FddsH2dl1+1JS1Nv+4zEJUnzwi0xzxbYhJhS76hjHp4 kPfhso9GX/8BMlgGjkUQih2lpCDKarnWsMJLSUOV4Nv8N5bg0LRSur1CpcpwTBjHNGwNIH BpMaXykj+CZSRyjtUu7uetMij8lcwFf+n7gRMV0Izx6ynBQyNJn+vAyxVqN4mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739617258; a=rsa-sha256; cv=none; b=MgntlTLjqY+3okez6Y5sa1HcfaFJYmdAukU38jD5+VN3LlH/P0fue1HIUzCSm0M1J6BsEs V+8vzu7EvjeTLVIP4Ie4dH6Jl76YrrOe69X7LDsxtVtrzUDbzbq8oUWOE+/s8sqyBuBALh z0HV/yppo0trpBrhXNpDDw/h795GNTY5VBrXH9Ak0wETRomFmzTlRaOIf3HMUBm+vsOwdF whfnLJh8FnBgWYH0RCus1S5smvgPTOxxBFIVmXj14dvVXMNbZ0TgJYrAwEy6wBHq6iO/8t RrqPxDilqDXHsYYPviaLFYNPzq5SrgXM2wokC8sicsGE8Xf/XltiXjDozBxCjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739617258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcgHBV3ilgPrxw8rx4Z5BRdTEJPaIWeGHi3cviBSCgw=; b=DRH/RwVt89p5KSB6XilCKcmEbnmPjC4ahentqbgG6JfmjbQbD/v/vPDKGHqoDxmOcdiDwb phOvXxatq230GIQoq7W3PsVJj5WeX02yKktTW/MZ2qRjHwu3co1dc8i2mE//fQaZ9Wks25 scD6X2pQx5IJP8zE4GtKpZZiTQGKJt7aFJcIzllMKpn8s8SDaJAVtjJ5riqh5iyIVXi0hR aKlOsRTiKRK0MUV/5x1qJqfLMAc64eS483XYHnpzWvGfhnV3BB9M8gBMk3o3ydOwtWhqtS lfDWGPf2roF5lRQOPz5tDNFd/nwTcHOmJsZABeEUnlc4AqNeqJ8/r8jBW08HrQ== 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 4Yw5Z20W7qz1CYk; Sat, 15 Feb 2025 11:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51FB0vk8004131; Sat, 15 Feb 2025 11:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51FB0vSE004128; Sat, 15 Feb 2025 11:00:57 GMT (envelope-from git) Date: Sat, 15 Feb 2025 11:00:57 GMT Message-Id: <202502151100.51FB0vSE004128@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: e0a7ceb24127 - 2025Q1 - databases/mariadb1011-server: Security update to 10.11.11 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2025Q1 X-Git-Reftype: branch X-Git-Commit: e0a7ceb24127f295ec6fc992cf0ca47fcb7a7fdc Auto-Submitted: auto-generated The branch 2025Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0a7ceb24127f295ec6fc992cf0ca47fcb7a7fdc commit e0a7ceb24127f295ec6fc992cf0ca47fcb7a7fdc Author: Bernard Spil AuthorDate: 2025-02-07 16:09:55 +0000 Commit: Bernard Spil CommitDate: 2025-02-15 11:00:00 +0000 databases/mariadb1011-server: Security update to 10.11.11 Security: 7bcfca95-e563-11ef-873e-8447094a420f MFH: 2025Q1 (cherry picked from commit ed65809ab48c3498c3872e92b7271efdad3a23cc) --- databases/mariadb1011-server/Makefile | 4 +-- databases/mariadb1011-server/distinfo | 6 ++--- .../files/patch-mysys__ssl_openssl.c | 29 ---------------------- .../files/patch-scripts_mysql__config.sh | 10 -------- ...store_columnstore_utils_common_threadnaming.cpp | 24 ------------------ databases/mariadb1011-server/pkg-plist | 2 ++ 6 files changed, 7 insertions(+), 68 deletions(-) diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile index 3f2c6f0c0f08..0d6892251896 100644 --- a/databases/mariadb1011-server/Makefile +++ b/databases/mariadb1011-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb -PORTVERSION= 10.11.10 -PORTREVISION?= 1 +PORTVERSION= 10.11.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo index e9508dda35f6..28c26f0e15af 100644 --- a/databases/mariadb1011-server/distinfo +++ b/databases/mariadb1011-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731237806 -SHA256 (mariadb-10.11.10.tar.gz) = b06a74650b83a16aa9ab098984482b028e75b000674b11ff288772c619a6f022 -SIZE (mariadb-10.11.10.tar.gz) = 104463642 +TIMESTAMP = 1738941371 +SHA256 (mariadb-10.11.11.tar.gz) = 6f29d4d7e40fc49af4a0fe608984509ef2d153df3cd8afe4359dce3ca0e27890 +SIZE (mariadb-10.11.11.tar.gz) = 105754084 diff --git a/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c deleted file mode 100644 index 8a141435bd67..000000000000 --- a/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c +++ /dev/null @@ -1,29 +0,0 @@ ---- mysys_ssl/openssl.c.orig 2024-02-01 17:44:37 UTC -+++ mysys_ssl/openssl.c -@@ -30,6 +30,11 @@ int check_openssl_compatibility() - { - return 0; - } -+#elif defined(LIBRESSL_VERSION_NUMBER) -+int check_openssl_compatibility() -+{ -+ return 0; -+} - #else - #include - -@@ -36,8 +36,12 @@ - static uint testing; - static size_t alloc_size, alloc_count; - --static void *coc_malloc(size_t size, const char *f __attribute__((unused)), -- int l __attribute__((unused))) -+static void *coc_malloc(size_t size -+#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) -+ , const char *f __attribute__((unused)), -+ int l __attribute__((unused)) -+#endif -+) - { - if (unlikely(testing)) - { diff --git a/databases/mariadb1011-server/files/patch-scripts_mysql__config.sh b/databases/mariadb1011-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index f8321be63ecc..000000000000 --- a/databases/mariadb1011-server/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- scripts/mysql_config.sh.orig 2021-07-07 20:25:20 UTC -+++ scripts/mysql_config.sh -@@ -88,6 +88,7 @@ fi - # Create options - libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" - embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -%%LOCALBASE%%/lib " - - include="-I$pkgincludedir" - if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb1011-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb1011-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp deleted file mode 100644 index 26ea3d16ecd7..000000000000 --- a/databases/mariadb1011-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC -+++ storage/columnstore/columnstore/utils/common/threadnaming.cpp -@@ -22,13 +22,21 @@ namespace utils - { - void setThreadName(const char* threadName) - { -+#ifdef __FreeBSD__ -+ pthread_set_name_np(pthread_self(), threadName); -+#else - prctl(PR_SET_NAME, threadName, 0, 0, 0); -+#endif - } - - std::string getThreadName() - { - char buf[32]; -+#ifdef __FreeBSD__ -+ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); -+#else - prctl(PR_GET_NAME, buf, 0, 0, 0); -+#endif - return std::string(buf); - } - } // namespace utils diff --git a/databases/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist index 901afe9bb8e3..a2d4c9c29f22 100644 --- a/databases/mariadb1011-server/pkg-plist +++ b/databases/mariadb1011-server/pkg-plist @@ -90,6 +90,7 @@ include/mysql/server/my_alloc.h include/mysql/server/my_alloca.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h +include/mysql/server/my_cmp.h include/mysql/server/my_compiler.h include/mysql/server/my_config.h include/mysql/server/my_dbug.h @@ -139,6 +140,7 @@ include/mysql/server/mysql/service_encryption.h include/mysql/server/mysql/service_encryption_scheme.h include/mysql/server/mysql/service_json.h include/mysql/server/mysql/service_kill_statement.h +include/mysql/server/mysql/service_log_warnings.h include/mysql/server/mysql/service_logger.h include/mysql/server/mysql/service_md5.h include/mysql/server/mysql/service_my_crypt.h