From nobody Tue Mar 12 13:46:13 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 4TvFKd502Tz5DsNw; Tue, 12 Mar 2024 13:46:13 +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 4TvFKd2qxHz4j0C; Tue, 12 Mar 2024 13:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710251173; 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=KmA53Q298+FhroYvRaIazxnm67KZHxu2MCP1qxFscfA=; b=y1dMvJ6NGOcyExkelCCfHEKL7trBN0iVAjKO7ybhmtaiUQmTF30L9AZau+yIZg5gnOUsBl O7a/guE95LIa4dCj9YMeEPFS1rm6Y95aZ596v2m7j4lBZjbAmAij2lVyvkC8UN0nb7Q7cc AnsggwkvCqhdL2WX1r6PGBksMW/Dc3ceM4pWLQctPh3gFLrOirdlttXrOyRPLeuNOs8rI1 sMpLC3ZiYzN4aCqE+78z0eoJuplGR2JruNInqdNhDPKoDeYY/LVpA7AcNREloVn4BNFsWk 3471H9nawtaT/yzhNbJ9jGfPwFwTU1M/QvQJIfPVJk9lRignZalBdEfIDc8btw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710251173; a=rsa-sha256; cv=none; b=mInD+sEUKfQgTamUjiX+Uxr3skDl2UJ1DOOFSQ4ogqrasIe18v0a0sOXgLf9x3sUK0ZBxA 3Wg7IaDrgzpjgXiE98+4wCSVbVkcbz52KFp6VN5dOM+IhMVgkH5dxOUvMx51UrnWBzHlV6 I9EKDyhTI0zWrtAW7/gdrKsPjGiSuE2Ub9PVgyUf9AVyiDlXxUwLiL1PIg8H9s171B++uL LAlvo6mt6Lx/ifb5q3EbaIFCV1AaoiFLz7qtMutu2yqS6zDFhGa/k47JtUCh4C50ffdssd V2KWiQJdUkjPsYnTquFWh8HiXJEqpAu9WRaf++1oYVjgj4Td7eerp12oWxmCDg== 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=1710251173; 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=KmA53Q298+FhroYvRaIazxnm67KZHxu2MCP1qxFscfA=; b=S/yI9BlKIXd3Wx/Yhu+ZFHh6Duu0NH+GCe8PRs9/u3/s4/dxOXTkzRuM6KxmFQjggg4+LQ /1TkP+rBBefE0YZ77wiFJk+ClZzMuuKYAG6uucTxiujBZhrNPOV/lBzp5FeOZciGm7+8am r5qckeaBqCXY3O7HpIJ7vD48b5Bclnl4XZ5uiqFAmmSr+NET0DWoYr3Ay8Q1rv/QDT11GG 2Axy2K1KC7vUDj2Wn4X8QCTr9Ex0TipOiI0EdwbI9HkbbPOy8Jk9dtgVxVMK6x/vvJ8Kl4 KTjh2xGcMSY7qKAwf9n3DeUwF8FU/A1O62l32EMKct7LMhRjix+1fvXT0HsQIQ== 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 4TvFKd2Rkfz1FvL; Tue, 12 Mar 2024 13:46:13 +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 42CDkDTi081852; Tue, 12 Mar 2024 13:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42CDkDCn081849; Tue, 12 Mar 2024 13:46:13 GMT (envelope-from git) Date: Tue, 12 Mar 2024 13:46:13 GMT Message-Id: <202403121346.42CDkDCn081849@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: 1c191a984b77 - main - databases/mariadb1011-server: Update to 10.11.7 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: 1c191a984b77a0305338cd6f3328f11013ef7a5b Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c191a984b77a0305338cd6f3328f11013ef7a5b commit 1c191a984b77a0305338cd6f3328f11013ef7a5b Author: Bernard Spil AuthorDate: 2024-03-12 13:46:08 +0000 Commit: Bernard Spil CommitDate: 2024-03-12 13:46:08 +0000 databases/mariadb1011-server: Update to 10.11.7 --- databases/mariadb1011-client/Makefile | 1 - databases/mariadb1011-server/Makefile | 13 ++++++------- databases/mariadb1011-server/distinfo | 6 +++--- .../mariadb1011-server/files/patch-include_m__ctype.h | 13 ------------- .../mariadb1011-server/files/patch-mysys__ssl_openssl.c | 14 ++++++++++++++ 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/databases/mariadb1011-client/Makefile b/databases/mariadb1011-client/Makefile index b154f584a3dc..e9499297d213 100644 --- a/databases/mariadb1011-client/Makefile +++ b/databases/mariadb1011-client/Makefile @@ -1,5 +1,4 @@ PORTNAME= mariadb -PORTREVISION= 1 PKGNAMESUFFIX= 1011-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile index 2849104bd942..e94c61902c69 100644 --- a/databases/mariadb1011-server/Makefile +++ b/databases/mariadb1011-server/Makefile @@ -1,6 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.11.6 -PORTREVISION?= 1 +PORTVERSION= 10.11.7 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -109,6 +108,10 @@ 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_LIBFMT=system \ + -DLIBFMT_INCLUDE_DIR=${PREFIX}/include \ + -DHAVE_SYSTEM_LIBFMT=yes \ -DWITH_SSL="${OPENSSLBASE}" \ -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ @@ -171,7 +174,7 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor AWS_KEY_MGMT_CMAKE_ON= -DPLUGIN_AWS_KEY_MANAGEMENT=ON INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE -COLUMNSTORE_BROKEN= ColumnStore engine build failure "fatal error: 'sys/prctl.h' file not found" +#COLUMNSTORE_BROKEN= ColumnStore engine build failure "fatal error: 'sys/prctl.h' file not found" CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome @@ -238,10 +241,6 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif -pre-configure: - ${REINPLACE_CMD} 's|\(CHECK_LIBRARY_EXISTS.*\) "" HAVE_|\1 ${LOCALBASE}/lib HAVE_|' \ - ${WRKSRC}/cmake/pcre.cmake - post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo index e8b15895b9c0..284ca03c1efb 100644 --- a/databases/mariadb1011-server/distinfo +++ b/databases/mariadb1011-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701004661 -SHA256 (mariadb-10.11.6.tar.gz) = 1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67 -SIZE (mariadb-10.11.6.tar.gz) = 99586625 +TIMESTAMP = 1709979504 +SHA256 (mariadb-10.11.7.tar.gz) = 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157 +SIZE (mariadb-10.11.7.tar.gz) = 100584592 diff --git a/databases/mariadb1011-server/files/patch-include_m__ctype.h b/databases/mariadb1011-server/files/patch-include_m__ctype.h deleted file mode 100644 index 8e323646752e..000000000000 --- a/databases/mariadb1011-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/mariadb1011-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c new file mode 100644 index 000000000000..0ef6a3c29540 --- /dev/null +++ b/databases/mariadb1011-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 +