From nobody Sun Nov 10 13:21:31 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 4XmYH00TyVz5cksT; Sun, 10 Nov 2024 13:21:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XmYGz6ts7z4sWs; Sun, 10 Nov 2024 13:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731244892; 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=ZGnugyACjCZCjF6ahXBlEWXRsSSJhDEDySVlB6at0eM=; b=A8h2FF6c1NkobJxHGXufKYBDouOK+Ay93tg5YVXX+r4AdOvp4T0wqV22FYg5iMyq1oNOxD MqnhZ4iLWvGgc4OveSTOcxuqEnZKE3RAKhXfWoy9ELvoHyv2kAKQp7yElqzR/rCI2yRQaZ l/+J65MzlC6Tv75oijSxLQscvqrXJejT8wLVzJqtBdAc2lfNXWDxnkJBZgioU6XA5OYPv4 x0ljvZrOkWeHWSN9ED4K2bvKkshpGEuLUctdhE0xP0WRXrkHk9PV2AMyUqZV7Zcggmzy5i TJzg1QU2uhpmoxhOk6Ncd4+Ikx7dLYeQ7zBD/8WKPlm8gn5KM0gD+Mzuj10r3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731244892; 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=ZGnugyACjCZCjF6ahXBlEWXRsSSJhDEDySVlB6at0eM=; b=yRnLeMmdfIAgE7bg1s1ELsCUzAKfA/u9FCOYhRFDolPhF4lVLTovBxzdTOKmlAzWwS8ZnF IjEhXvj8FGkA9xH4pVmMOMqSg0DLrWLNH5S7bo2M2/rpTkDnCoaVJhzbLEPIR/b7pRJVmP Q+nEg+QCBYuBEyOwSfhNgovpJHvr0M0xlqDo/uNAqba9OBt+5b/f9WkwFp/813NoWtRAzp 947icdRgnis4IS67hYd/drbFA/FdGiEkuHpKrhyKwoFEn4P62lBhODS7w5cFZWRR+Uz/z1 l9PF7u8Y+XDzE+Ea6f39b/pJmK/lrbTUz3NT685wxhVKO3M/IfqY4yZ0tB3PHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731244892; a=rsa-sha256; cv=none; b=yK0M0k1jvHPEsEs1Wi3NXIqoxcE+FpiLOUOhwFSuL0Fl6/nYLa/fq4HVd97PAjE79xjmSM dWFq6HiuXZSbzqPwaKHjn1NSck0fAiKPeFVXcWpl8xdKgrx8H2UAduV3uRPek665OIz7LQ bTErIErhJ7sho/0JKEocCoNaep+mqr+YYyCwNwLWBR3UTCAveSrGhrCKt0ofYmt0E9enoF kxl6E9agVPU50zO/MVoui0KFgfYydpHOTWYCmHIwb6kGFahN4q0AHEtdMYfpHEZWf4BUul Hy3mz96qCC6erjXqWKf9NqMMxruTnZ/5QgGCJHb0G8jUNL3GfXfSA+5HrzM3ZQ== 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 4XmYGz6VWpzjhW; Sun, 10 Nov 2024 13:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AADLVqt038909; Sun, 10 Nov 2024 13:21:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AADLVpF038906; Sun, 10 Nov 2024 13:21:31 GMT (envelope-from git) Date: Sun, 10 Nov 2024 13:21:31 GMT Message-Id: <202411101321.4AADLVpF038906@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: f4cd04555771 - main - databases/mariadb105-server: Update to 10.5.27 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: f4cd045557714ec1a540d5e7b07dc4bb60be991b Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4cd045557714ec1a540d5e7b07dc4bb60be991b commit f4cd045557714ec1a540d5e7b07dc4bb60be991b Author: Bernard Spil AuthorDate: 2024-11-10 13:21:29 +0000 Commit: Bernard Spil CommitDate: 2024-11-10 13:21:29 +0000 databases/mariadb105-server: Update to 10.5.27 --- databases/mariadb105-server/Makefile | 7 ++-- databases/mariadb105-server/distinfo | 6 +-- .../files/patch-include_my__cpu.h | 48 ---------------------- .../mariadb105-server/files/patch-sql_mysqld.cc | 20 --------- 4 files changed, 7 insertions(+), 74 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index f53510db050b..51379d845f13 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.5.26 +PORTVERSION= 10.5.27 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= \ @@ -30,7 +30,7 @@ LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection LDFLAGS+= -L${LOCALBASE}/lib -USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl +USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses pkgconfig shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -125,7 +125,8 @@ CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ mysqlwsrep*-server \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \ + mytop FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index 313dd9b0868c..af6ba25d52cb 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723535792 -SHA256 (mariadb-10.5.26.tar.gz) = dd5f99a1d30ae47365fc18b1deeff6dc0ab38ac84e7d9fd9c8c04ff6b01961f1 -SIZE (mariadb-10.5.26.tar.gz) = 116566259 +TIMESTAMP = 1731238427 +SHA256 (mariadb-10.5.27.tar.gz) = efa64fa5f733b822ab1a6795e1ebc179c160c08690ecd71dba1eb0f61aeedd14 +SIZE (mariadb-10.5.27.tar.gz) = 116496630 diff --git a/databases/mariadb105-server/files/patch-include_my__cpu.h b/databases/mariadb105-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb105-server/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC -+++ include/my_cpu.h -@@ -23,7 +23,8 @@ - The defines are the same ones used by the linux kernel - */ - --#ifdef _ARCH_PWR8 -+#if defined(_ARCH_PWR8) -+#if defined(linux) - #include - /* Very low priority */ - #define HMT_very_low() __ppc_set_ppr_very_low() -@@ -37,6 +38,22 @@ - #define HMT_medium_high() __ppc_set_ppr_med_high() - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") -+#elif defined(__FreeBSD__) -+#include -+#include -+/* Very low priority */ -+#define HMT_very_low() __asm__ volatile ("or 31,31,31") -+/* Low priority */ -+#define HMT_low() __asm__ volatile ("or 1,1,1") -+/* Medium low priority */ -+#define HMT_medium_low() __asm__ volatile ("or 6,6,6") -+/* Medium priority */ -+#define HMT_medium() __asm__ volatile ("or 2,2,2") -+/* Medium high priority */ -+#define HMT_medium_high() __asm__ volatile ("or 5,5,5") -+/* High priority */ -+#define HMT_high() asm volatile("or 3,3,3") -+#endif - #else - #define HMT_very_low() - #define HMT_low() -@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -+#if defined(linux) - __ppc_get_timebase(); -+#elif defined(__FreeBSD__) -+ uint64_t __tb; -+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -+#endif - #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) - /* Mainly, prevent the compiler from optimizing away delay loops */ - #ifdef _aarch64_ diff --git a/databases/mariadb105-server/files/patch-sql_mysqld.cc b/databases/mariadb105-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e433bfc7d450..000000000000 --- a/databases/mariadb105-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC -+++ sql/mysqld.cc -@@ -205,7 +205,7 @@ typedef fp_except fp_except_t; - - inline void setup_fpu() - { --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) - /* We can't handle floating point exceptions with threads, so disable - this on freebsd - Don't fall for overflow, underflow,divide-by-zero or loss of precision. -@@ -218,7 +218,7 @@ inline void setup_fpu() - fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | - FP_X_IMP)); - #endif /* FP_X_DNML */ --#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ -+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */ - - #ifdef HAVE_FEDISABLEEXCEPT - fedisableexcept(FE_ALL_EXCEPT);