From nobody Sun May 28 18:59:56 2023 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 4QTnz064FJz4XlXn; Sun, 28 May 2023 18:59:56 +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 4QTnz05MJPz3x2K; Sun, 28 May 2023 18:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300396; 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=jWlgObM1zDClLIkKXXRYOujM37w6VKcJY9DYQ0SOehM=; b=BNLfxG8fV5GDWNRhGpI0eNjLTU/R8s5epMBe+cLWpDZ4PuaZQoUjM/Hy/cEmNa5qxBX1Q7 mfrUpY6vRP6PJhVKgCy5gObvJG5gn+OgtOkDy0x0Mz6irFcaZmEYglpT/4hTlh5daejW6K Oga08HxW0VuOr1BGE+FbBOwvHXC1OX0sVpD9onHf4cgc/WTjXULxFgICspLyEFV6D1VS29 uHKdY45WC/Seo4KaS56Ftu+BzUS+AA4VAdpRiYmXQSe4EdonbNOs9npeDXWbBOKY3Scr3h LOMyvXwgycYP4Ed00wnKHfsGeliIr1t64rQuAen5w02lLLmun9IMK+jHtiWGRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300396; 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=jWlgObM1zDClLIkKXXRYOujM37w6VKcJY9DYQ0SOehM=; b=tyeqi9iggO1YMpqqmmntREAtrijG2ZOp1z27WEl2xcJp++LZ0jkypHtN1c7qYeMXaK6vCY cSHOUJAxX9JC88wD3yZ6wdEcbOl3aJhQlUShz9k/lCe68MM4mkb110KT7JMX2pPS0IjO8c kB6MF4PptmY67rHa9M29Y99NSJCIkxdzp7zgrTHLLqB4atRFhhrHZePV858/0XBpgyTHmV KPkh1297BaSjpCUknjs8pOQLs/++OuvQqiCY09DwYPStcOAQSwPZ/gyCO2PgfvTGswBq2N +fvI+iv3Ah4wu9Equ74pr4S47py/uP0X1pr66vLPD9kilN2okFBpltxn5rt4XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685300396; a=rsa-sha256; cv=none; b=wAg+/NbsG7DCjysvwMuk17gAZCtpDebQnwXhVoowDk3qi2u+0JM/hLLGZBgUULOtTTKzIt I2rDZ75zk9x8eNfQz2nVnxX310APCi86J/pjpBTh2MR8KVDhhSg5UoSYlyc6Ukmbn3BA9s eECz79I8I7E0CXjiqnR2bdJ2hIhZ4vgSSqXh6P3/kaDLaUhq50X3PUY9kcnAhbSG8kjhul wqid+AAxFMZaGgZ4ItG3TVY20CR1jTNXU8I1SAOYpHrw1JSus6jCUp2zQnfxGMYFJmMVRh WlZZ+Sn01WHWq+/58W/jL79iVxxLjOj8cB1d/GnlSIvaXsQ0w0n1yKqpvEllgw== 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 4QTnz048K3zgxT; Sun, 28 May 2023 18:59:56 +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 34SIxuQM048114; Sun, 28 May 2023 18:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SIxuja048113; Sun, 28 May 2023 18:59:56 GMT (envelope-from git) Date: Sun, 28 May 2023 18:59:56 GMT Message-Id: <202305281859.34SIxuja048113@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: 7f97f2d5e99c - main - databases/mariadb104-server: Update to 10.4.29 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 7f97f2d5e99c9509fd16d7e6f3f6416aeef03be7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f97f2d5e99c9509fd16d7e6f3f6416aeef03be7 commit 7f97f2d5e99c9509fd16d7e6f3f6416aeef03be7 Author: Bernard Spil AuthorDate: 2023-05-28 18:58:45 +0000 Commit: Bernard Spil CommitDate: 2023-05-28 18:59:49 +0000 databases/mariadb104-server: Update to 10.4.29 Security: 5d1b1a0a-fd36-11ed-a0d1-84a93843eb75 MFH: 2023Q2 --- databases/mariadb104-server/Makefile | 2 +- databases/mariadb104-server/distinfo | 6 +++--- databases/mariadb104-server/files/patch-include_ssl__compat.h | 11 ----------- databases/mariadb104-server/pkg-plist | 1 + 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 6422603a4d7d..7e068d699f13 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.4.28 +PORTVERSION= 10.4.29 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index 5c84b608d86d..abec60118cce 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678023207 -SHA256 (mariadb-10.4.28.tar.gz) = 003fd23f3c6ee516176e1b62b0b43cdb6cdd3dcd4e30f855c1c5ab2baaf5a86c -SIZE (mariadb-10.4.28.tar.gz) = 94731133 +TIMESTAMP = 1685281835 +SHA256 (mariadb-10.4.29.tar.gz) = 5b2d338792e79e68d6a545e2b15603bbbf7618c739e5f820f57b1d6b22092130 +SIZE (mariadb-10.4.29.tar.gz) = 94859830 diff --git a/databases/mariadb104-server/files/patch-include_ssl__compat.h b/databases/mariadb104-server/files/patch-include_ssl__compat.h deleted file mode 100644 index 30d695673280..000000000000 --- a/databases/mariadb104-server/files/patch-include_ssl__compat.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ssl_compat.h.orig 2022-11-02 12:18:48 UTC -+++ include/ssl_compat.h -@@ -19,7 +19,7 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist index 04d4feb152e6..707618dc2062 100644 --- a/databases/mariadb104-server/pkg-plist +++ b/databases/mariadb104-server/pkg-plist @@ -74,6 +74,7 @@ include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/mariadb_capi_rename.h 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_compiler.h