From nobody Sat Mar 16 12:50:44 2024 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 4Txgvm4rT1z5Dm7R; Sat, 16 Mar 2024 12:50:44 +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 4Txgvm4P1Lz58BP; Sat, 16 Mar 2024 12:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710593444; 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=Avwu/ndJ1mPsueyuPSqQ/KJ7CyVfPPwa8cf9D78QO+k=; b=R24/rtBJg8N3tLYpxXSnEAvgu3xwSs5RVqWDg5UA9GXyjTt/aiURH1EP5C7mrnE8gBgoyU SM2yCpo+7oOSebTaccyaWZITLppjVtjVlbTjRjSCkFOlyvnw9UP2QjEVjM3lpBffTQolGl o1PaNuAo8IiFMuGjZr+SBwktTEHerlLbJ5BE1qUqNpMM8HernBn3SewJc+I5VZJmem2OjV lRS5AWHeEG/YQ1KGE8P6eSreLF4urqdRfwfew6bzvdjmajEEzDkqVMhmfM/9hnUvoJVeGx m1lAyklW0mhUzEyr507B15m5VjI3TnkJetTKmAeqJjoo22iocOistjJWhO3H4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710593444; a=rsa-sha256; cv=none; b=RpU7Omt180h0Afy77Om8LyVFmXCcd98yvq00731xaXLQHS8ci+8CyU74B248tLzyZw7SAx qgQvD0qmLnKgOKJG0myxTEdWaePZZyOTBIF3latVOZhA2IH1Gq4qLA/czZneEPNCJjSs14 4mKP62Og4hIpgyHAq7BtOkohJPBaUS9VPKZV+3TEpFweFg3/cC/ZhISnOCNjJyQhppK+mQ kQGC3VYhFT59GsoGKpoV/9gFc2D0YmiH0yxWBVd4ajitbrw4nklS+je+8u1cI/PPwROcS1 qCIhPpvQhViWJjFkyJ8F3QUR5HqSjdzDDVQbQBWonpK1Xl1Wb+V1KhmbLNUKLw== 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=1710593444; 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=Avwu/ndJ1mPsueyuPSqQ/KJ7CyVfPPwa8cf9D78QO+k=; b=QcBqJ+rLzQ77oHjYh4tErFUav+t4xWM88rXkVgiRgCoFcK00o1/eP0PcVoiw9wOy0Sumnf wl1GI3AxV49BmNLlbuiviarBU2U9Taa9QRQ/fw9V8MdGP6tNH7OD89B46oVoopFtP66iN1 3Eh08N0s/7Z3Zwf4F+OAW6EWZjYs4oznm4+NjE3Jdx/gicGNh2GKHwAOM/KMzMJMsb8PxZ hnmaNHKAG4oVDKRohjD7OH/7Qp9yphFoeoemdlSrT1y378L0Nvt0wJVSVs96XXOEvHZeUf S9iWzou8W8JuxVwAKsEXIOz6Nz6QLmpdCfOROgtMY61MOhpXqVniCvhm6XcKGw== 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 4Txgvm40dFzwK7; Sat, 16 Mar 2024 12:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42GCoixf018804; Sat, 16 Mar 2024 12:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42GCoiKR018801; Sat, 16 Mar 2024 12:50:44 GMT (envelope-from git) Date: Sat, 16 Mar 2024 12:50:44 GMT Message-Id: <202403161250.42GCoiKR018801@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: 54e6064d4674 - main - databases/mariadb106-server: Update to 10.6.17 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 54e6064d4674e9adb362b0f9c08f50b69b0526da Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=54e6064d4674e9adb362b0f9c08f50b69b0526da commit 54e6064d4674e9adb362b0f9c08f50b69b0526da Author: Bernard Spil AuthorDate: 2024-03-16 12:50:42 +0000 Commit: Bernard Spil CommitDate: 2024-03-16 12:50:42 +0000 databases/mariadb106-server: Update to 10.6.17 --- databases/mariadb106-server/Makefile | 3 ++- databases/mariadb106-server/distinfo | 6 +++--- databases/mariadb106-server/files/patch-include_m__ctype.h | 13 ------------- .../mariadb106-server/files/patch-mysys__ssl_openssl.c | 14 ++++++++++++++ databases/mariadb106-server/pkg-plist | 1 + 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 553f33adf1aa..73fa26d42b38 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.6.16 +PORTVERSION= 10.6.17 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ @@ -105,6 +105,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ -DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_PCRE=system \ + -DPCRE_LIBRARY_DIRS=${PREFIX}/lib \ -DWITH_SSL="${OPENSSLBASE}" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index 687491d8a986..861a22bde861 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701019842 -SHA256 (mariadb-10.6.16.tar.gz) = 5ef83843e796dcda9aea47b24690ddf6d848f43f43e11f9d9a0cc21c78fbb9cf -SIZE (mariadb-10.6.16.tar.gz) = 98224346 +TIMESTAMP = 1710088429 +SHA256 (mariadb-10.6.17.tar.gz) = fb41b0702059c046832d60138733acb73e4c0e5a1a0681061709d25591e4b086 +SIZE (mariadb-10.6.17.tar.gz) = 99067793 diff --git a/databases/mariadb106-server/files/patch-include_m__ctype.h b/databases/mariadb106-server/files/patch-include_m__ctype.h deleted file mode 100644 index 8e323646752e..000000000000 --- a/databases/mariadb106-server/files/patch-include_m__ctype.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/m_ctype.h.orig 2021-08-04 18:00:35 UTC -+++ include/m_ctype.h -@@ -43,6 +43,10 @@ extern "C" { - - #define CHARSET_DIR "charsets/" - -+#ifndef ulong -+typedef unsigned long ulong; -+#endif -+ - #define my_wc_t ulong - - #define MY_CS_REPLACEMENT_CHARACTER 0xFFFD diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c new file mode 100644 index 000000000000..0ef6a3c29540 --- /dev/null +++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c @@ -0,0 +1,14 @@ +--- 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 1; ++} + #else + #include + diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index 352ff9781592..505d81bfc44c 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -141,6 +141,7 @@ include/mysql/server/mysql/service_my_snprintf.h include/mysql/server/mysql/service_progress_report.h include/mysql/server/mysql/service_sha1.h include/mysql/server/mysql/service_sha2.h +include/mysql/server/mysql/service_sql.h include/mysql/server/mysql/service_thd_alloc.h include/mysql/server/mysql/service_thd_autoinc.h include/mysql/server/mysql/service_thd_error_context.h