From nobody Sat Feb 08 09:25:18 2025 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 4Yqlmv1V2tz5mhMX; Sat, 08 Feb 2025 09:25:19 +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 4Yqlmt5P2Fz3hXC; Sat, 08 Feb 2025 09:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739006718; 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=jmmJI1ySGZqEfry3JiawZ8mKImpmB5vcYrCQ4Lo4UIg=; b=AsYmg+IEMCtpYlT3RX8Xjynmtbz2d92AYRAnPtP0jJMuGLt4lgiAGnbAJ+S4Awqj9ycgD2 UnrDqYJbC+5tLi93QzHWs8zmk39kDLwDUmwIo0CFHvWgQlIdfQDN+dA3Lmr58uNii/c64r dAW1cJtaWx8XPlxoUtGFZ68wCWAeoxp8olQcrfp4jgcEA/GDNlSDrIov7XEU76DHUh8a6E kCIkGLnjFkNjjj/HmMJeDMnjIOPCzC9nzu/rbHPam8h5zYaWxvaGbPGFcKn785UnUugF9W YKmgjJTY40sSyq3iNbKTxUopHDR6hiJ0SlFkVshFkzXjDdH8yMFkrnW/v6lZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739006718; 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=jmmJI1ySGZqEfry3JiawZ8mKImpmB5vcYrCQ4Lo4UIg=; b=ImaSGC+MANpYGLEOpgRFFSJuMrQK9zR4bsfZmCpSOrrJvOLeyYDJ7lfvZYFKgDKOwf0nSz eroVs1PrxkcpHV6BgeH5YaJgTQ8K2ktKylA95gL3/is3kWvMGteb+XboDolZv3rV3/pERt p8FybnebKFq8G37aR2+lZpnca1ZOHuiTOcLAlO07jaM+vFLoVdCp7mA4bbLGXlqEapsQTB IMbLloJ/9z3FRgNP/PX8p8MgHrOsNye0b++CJMLNA8lk+9OdHfg+RaeCHBGK5u3X0qhUI7 0RPOXaYq1H4F85bVYHWkbOMbp8fYbtji7FG2AFkSsrQRVnduUnPnvmiUbvwK0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739006718; a=rsa-sha256; cv=none; b=kTh0afds5t+sVJybZ4E+01XHCiKqEsgueKdTokNK4Rc8levHksKWFlBI3F/VtHKX+fdlKC AqjTIGTZvODmjgPTT3N75M9XmXtdbvk66VvSZynSqM4uzRPK3vcb/7Q2PEY2LUURn7XCaP zlPG2EdK0xNS6f8j/ZIXGQXT2nU0xIrSRI9kTiyA4nQCemUPqKKoaCqPcsUYBXFZlDzkUh oVx62ak+XiEpalM1RLAGlfwvxFNi7w6HWfT9jtDbRojwnHyAgwHlgXRaYyhv4btHeKbmn+ OWjZHV9uNA4ooQ5evb/SQvnxJp7uFD+Ue9Klsi1tceyG0tBuZ/zMdapc/3+iMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yqlmt4RPJz145J; Sat, 08 Feb 2025 09:25:18 +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 5189PIxS012838; Sat, 8 Feb 2025 09:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5189PICS012835; Sat, 8 Feb 2025 09:25:18 GMT (envelope-from git) Date: Sat, 8 Feb 2025 09:25:18 GMT Message-Id: <202502080925.5189PICS012835@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: 9807f92eaeb3 - main - databases/mariadb106-server: Security update to 10.6.21 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 9807f92eaeb3e09a5a812e178092d1e3f68afd78 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9807f92eaeb3e09a5a812e178092d1e3f68afd78 commit 9807f92eaeb3e09a5a812e178092d1e3f68afd78 Author: Bernard Spil AuthorDate: 2025-02-08 09:24:40 +0000 Commit: Bernard Spil CommitDate: 2025-02-08 09:24:40 +0000 databases/mariadb106-server: Security update to 10.6.21 Security: 7bcfca95-e563-11ef-873e-8447094a420f MFH: 2025Q1 --- databases/mariadb106-server/Makefile | 2 +- databases/mariadb106-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/mariadb106-server/pkg-plist | 2 ++ 6 files changed, 6 insertions(+), 67 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 3747af70ccb6..51cae9f1c2aa 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.6.20 +PORTVERSION= 10.6.21 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index 4de0b5f14dbd..5cfe0d4ff1cd 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731237766 -SHA256 (mariadb-10.6.20.tar.gz) = 47f05abc7dbebb3f26b31e75022b1b3969dbbc4752c4ae701f8920a604896d41 -SIZE (mariadb-10.6.20.tar.gz) = 102697156 +TIMESTAMP = 1738941493 +SHA256 (mariadb-10.6.21.tar.gz) = 8d7f97169b3ba2044858965b8cfc254364400df43e905042f92e24b8fa7b0d96 +SIZE (mariadb-10.6.21.tar.gz) = 103982296 diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c deleted file mode 100644 index 8a141435bd67..000000000000 --- a/databases/mariadb106-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/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index f8321be63ecc..000000000000 --- a/databases/mariadb106-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/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp deleted file mode 100644 index 26ea3d16ecd7..000000000000 --- a/databases/mariadb106-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/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index 51519ee68b20..5b4ab627d1d4 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -84,6 +84,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 @@ -133,6 +134,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