From nobody Fri Feb 07 15:09:31 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 4YqHSW417kz5mK2B; Fri, 07 Feb 2025 15:09:31 +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 4YqHSW3PWwz3K0p; Fri, 07 Feb 2025 15:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738940971; 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=bEAWV+QJurWqdQEvHeDlm9ZiFC7GEcTWvHcGt8g845Y=; b=KMe2EnJVr1FqELM91xJNRlivyVTOTHiNtFtLGWwL0NOfxQ0JtZ9Mvp6VxKiw4IwCG6EOvm ZmjWPbYLGFrN8KtovBw2lBNj+UBx6cP0zgkaGRMXllsIlIhz53PYUhG/xif9DnFAevtk11 YSAntM+lqF/9YzUtUZb8yJccbwucmyqspUnKLFj5Vv7+7lQlxVOBmcsb+iOrfx5Scir/Rz m8WLAdv0ttb8jQuXLq8dsmYIX6NwcelnpdTm3JXIrNjVGRzwWhBQnAaT6NuabsRNyLc6Rs rpyiayZUhtXC23xvAu/KAKbfNomVirPbZmikUVO5LmYeiPIGzca3SN2824UnnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738940971; 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=bEAWV+QJurWqdQEvHeDlm9ZiFC7GEcTWvHcGt8g845Y=; b=I9M3wwi7Un3nkt8+tg5IrrWcxJxykdcHWoR+KSypBLEeMfsAQUjZLcGlxv6SrVmzyPOdXE UOGXGaMND8LLk2xXSfauqF5kpwUk/10LF9i0JHjDVex6LXGxWMM3x3p4w1XWXeJOcCZGCR ZUCE9Ca6DVy89v/gOK7nKd/FKV9WGn0vfKJtFIbPyzbMRBS+sRHICTga97/5D6sZNyvKS/ luAT6lNl6wtE0iekpFUg5TOGXksldLYBfNoutqBZ+52ycTpaxek5yS/Nq5g6+tWtIbQb60 5dWl5k3G5PBjYRyiBADiu79dKdIDsFHXcaBL66ZS8NwxI7u8sDRBnalhLm0btQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738940971; a=rsa-sha256; cv=none; b=wIO+YvidnN5WcdwK6xD/4KW5SbPEI90M+KEZ0fou54AnRWV+rDz2brobrHgqnlbLhREMKW oi3JkkyxHw8FV9CAjdLyRzwsFMeWT/mdectcyAwBQA0e9Ll3Y4q3LeIZfPAazRYyZu+VKO LMlqmH2/mG9yDmzE1oOZYFaBCJEk9d2kl2TDGnivnOdSjAsPKsGD1akDZOYkqCG08MOs5C EeJ4kPYsJXcw9HZbWStyz1AXjf/qfxnkuqEhJpP2cFDjk4pL5MeX8o3852uvz3YdQXAbaw JUiXa53SmKoz9TNrj4ikeKGu6O7i6UslLrpXLId9UJmiMJ69EOqY12dn1OXhfQ== 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 4YqHSW2mctzDQd; Fri, 07 Feb 2025 15:09:31 +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 517F9VA1041373; Fri, 7 Feb 2025 15:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 517F9V9O041370; Fri, 7 Feb 2025 15:09:31 GMT (envelope-from git) Date: Fri, 7 Feb 2025 15:09:31 GMT Message-Id: <202502071509.517F9V9O041370@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: bc5ec4375fa9 - main - databases/mariadb114-server: Security update to 11.4.5 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/main X-Git-Reftype: branch X-Git-Commit: bc5ec4375fa9f098632f45e7c11e5de534c11d4c Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc5ec4375fa9f098632f45e7c11e5de534c11d4c commit bc5ec4375fa9f098632f45e7c11e5de534c11d4c Author: Bernard Spil AuthorDate: 2025-02-07 15:08:47 +0000 Commit: Bernard Spil CommitDate: 2025-02-07 15:08:47 +0000 databases/mariadb114-server: Security update to 11.4.5 PCRE2 detection failed due to a call that's only used in already broken columnstore option. Security: 7bcfca95-e563-11ef-873e-8447094a420f --- databases/mariadb114-server/Makefile | 3 ++- databases/mariadb114-server/distinfo | 6 ++--- .../files/patch-mysys__ssl_openssl.c | 29 ---------------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile index ce2a8f0e1f7e..27cd000d153b 100644 --- a/databases/mariadb114-server/Makefile +++ b/databases/mariadb114-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 11.4.4 +PORTVERSION= 11.4.5 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -109,6 +109,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_PCRE=system \ -DPCRE_LIBRARY_DIRS=${PREFIX}/lib \ + -DPCRE_FOUND=true \ -DWITH_LIBFMT=system \ -DLIBFMT_INCLUDE_DIR=${PREFIX}/include \ -DHAVE_SYSTEM_LIBFMT=yes \ diff --git a/databases/mariadb114-server/distinfo b/databases/mariadb114-server/distinfo index 8efd0268c31e..3f2dcdebeade 100644 --- a/databases/mariadb114-server/distinfo +++ b/databases/mariadb114-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731170702 -SHA256 (mariadb-11.4.4.tar.gz) = 96fbd2e6e93fb7e8b373eea75d85b6fea57c0e111a02090cbbefed52599dc77b -SIZE (mariadb-11.4.4.tar.gz) = 111017581 +TIMESTAMP = 1738940618 +SHA256 (mariadb-11.4.5.tar.gz) = ff6595f8c482f9921e39b97fa1122377a69f0dcbd92553c6b9032cbf0e9b5354 +SIZE (mariadb-11.4.5.tar.gz) = 112382453 diff --git a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c deleted file mode 100644 index 8a141435bd67..000000000000 --- a/databases/mariadb114-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)) - {