From nobody Wed May 31 12:08:51 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 4QWSjH2Tnsz4YbML; Wed, 31 May 2023 12:08:51 +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 4QWSjH1zzbz3y5F; Wed, 31 May 2023 12:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534931; 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=Aoy2VO7h+xtfAbcEKxevUBEjRmaGGkZz+yUukq3zUX0=; b=B9YHSawOEAJZ5PYhMvQ/kwANapovGAVM+ra1Fj+fMN3mO4QPcyn8zhf7ymO7O3/F8Yvlqh muS4z705loEJeuEaJB0WUPEnf/zhGIvvHTz8BInrpqvTuyTAFEejmKhkyl9mXPc98oxqSc BokeeObYKSXC+stVgKBx3S3VRXzR25VslCgmAAvVA3YbpSkMG9k0lB9E0iImj0nUOrCGsX iLr3ipMMEj14FCQ1wcqo/WNYJ5NzlJIEt59doidSK96xo/vT4AIPnUEzhiMvao0bxkRryc IBTc8IvSeXued+3yAlG3RYxApwdGW5tib3GTjv5Ie75Jo02L7RtCgkqpRNYwQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534931; 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=Aoy2VO7h+xtfAbcEKxevUBEjRmaGGkZz+yUukq3zUX0=; b=TN5isXmwz8Ly81FybgG+E1yv6U/rUZ1gNUf4FGl6MOnW3SE5Nd3kiwoxDH4aDNZAhwTBVF Wmx8JRSa+GmWCI9fu7y/Ci6V8qwTxylXNR80Y6+apW33qWrBnuryMZkxB0nDz0mryuy8tg WCMo6uU8FAg8uwlQCZwLjhBiQEHJ/Mb4GMrWlaJSPqDoVbhh50JwwYTOcxki6B/GPQCKFD q6NgvSztRRk2V3ggw0E6ghsqKF4kseG4ws2KHBFAb8AAs2nyX8870gCEsfdWnSLZf9wdzw 2M3Tdjg1iNToDYmEpLljjY1xbhCjzfZMCh0xtk7I07CLx9zqLMYUvuGTwHv/cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685534931; a=rsa-sha256; cv=none; b=nfKzrBzmnwy25vbpBE/d5GiUsw+Gs9LtjpBHQeZAo+WDA78QVRhYvAebq2iEpvjGTc3mxj nWdvZ/yOdVmUASOtC8UzOWgHnOKP01/7/LhTXXguz1h3m8ydwMus80KBTrrtQXCXpvkZBS k1kWpxHdhfeDXH34QKtp2s21ddB/ldpbYDByzg9lmJ56il0Ps5TJdBPY7+rklt5QGTozM+ MGhihdOiiPxQQEsl79729rfg3c7LkOVT8Ah/dMidNCraOtz6vXWDQznHvMW1kohahy8akJ rdQ/3OUmZ2PBX92uoEXvJIamOWe0DwZy+SpfZWj8Pnd0ebHvdSsMr+NlCFP89A== 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 4QWSjH0yXZzYt7; Wed, 31 May 2023 12:08:51 +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 34VC8pYk095120; Wed, 31 May 2023 12:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VC8pr3095119; Wed, 31 May 2023 12:08:51 GMT (envelope-from git) Date: Wed, 31 May 2023 12:08:51 GMT Message-Id: <202305311208.34VC8pr3095119@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: e8c3493e925a - 2023Q2 - 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: e8c3493e925a7befee1c278235bac9f5dd9504bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8c3493e925a7befee1c278235bac9f5dd9504bf commit e8c3493e925a7befee1c278235bac9f5dd9504bf Author: Bernard Spil AuthorDate: 2023-05-28 18:58:45 +0000 Commit: Bernard Spil CommitDate: 2023-05-31 12:08:12 +0000 databases/mariadb104-server: Update to 10.4.29 Security: 5d1b1a0a-fd36-11ed-a0d1-84a93843eb75 MFH: 2023Q2 (cherry picked from commit 7f97f2d5e99c9509fd16d7e6f3f6416aeef03be7) --- 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