Date: Tue, 12 Mar 2024 13:46:13 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1c191a984b77 - main - databases/mariadb1011-server: Update to 10.11.7 Message-ID: <202403121346.42CDkDCn081849@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c191a984b77a0305338cd6f3328f11013ef7a5b commit 1c191a984b77a0305338cd6f3328f11013ef7a5b Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2024-03-12 13:46:08 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> 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 <openssl/evp.h> +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403121346.42CDkDCn081849>