From nobody Sun Nov 10 12:18:41 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 4XmWtT5gpNz5cgGB; Sun, 10 Nov 2024 12:18:41 +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 4XmWtT555fz4m5r; Sun, 10 Nov 2024 12:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731241121; 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=Uz5BIiOgDrLcWwEqPFuBU0LR5o4TOM3ofPoNMi/jm5w=; b=KgsGbWuVFgICIb8tAgHWE349kMl2dGDAGt0+1oZ1DHHIwJ+2YCjUMiTkaFBGxlO6sL0f/z aZ1p0QbdyeQefv/XfmN0ddb6tpwJpvTFO3hmkNR5P78RKN2qSsqf/gfS90oCFjGvWQCVXr IHXIdbf2IiYeJq1GymYDmH3enrxa8UhaUiO69aQdDhBzOU6p7l1LhM0nCfaVKIh2Ibs1Vd iSB2VLOtp80pgpywcLCltvVTTlTStLHuL9rmn8LqwH368Rly+YlELfheGjNbItYsBUO0fS CkrrJfG+pYj0k/uAY05x5gyjA/B7pIYPNQohWlDD6whuJA8fD0f0ELrZ/hhsjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731241121; 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=Uz5BIiOgDrLcWwEqPFuBU0LR5o4TOM3ofPoNMi/jm5w=; b=XRDvAWxF7m994UR2b5OS6mKXQ1cIqaxjnDj8qs3ulrL9eUJGzaSL9Pk2rXzOM6wD02As7Y +AfmECeEpfJOVZnc7kWb0+vbqU/T2jh44yx8iu1hOx1tgYwlWPnElP1Pq2gvkJB/Pyx0iT KjuCWh6EE2yHI6aE8ZjizPBk/BAXnrfK+eYcNUfMz2Jo1vbHlthq3TKbifwcL1Q0kORlFa JU6v1iD+c7K6VwI47Mw0r5ok5z45Nfzkut7Ta5UCrOWxskxpWkuCOxMXucPQ9QBcQmdJMx nD5jo8XXi9T4ChwOCPbkaP3ZFmpZtvXqTX7munaGtdfzZdgi4hJMv+z/EghNaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731241121; a=rsa-sha256; cv=none; b=L3TT+oqmqjld6/RQ4ybHJSefuQVuODq7uPIKNHC6uDzD+fYqYlE32uHgesPWnm0n9B3r+w VW2VRyPG0GMOuQ1qY9Rm4dR5/I1NozckVRdSx041HFHypq1jNF/TF9tLpz/YBOcZQYF/Tk +VljY31LXmkEuBRuCsV+isbrdYG48g8Ly4kkl2SopLfItRlHmQv9klmPNC631iwkm+C7oW 1jYoYPtKcaMuTq1gbt/SUrTcBaaHDhavcZ+p521kiNvZ0sGK7s4uNUOB3h+qOzf39xEZj0 SK+XDj9Ea+uJTYhXSoiZnV7p4YLmNpkfmFCrEY8iDHtzg9ETJxfxO/pTi+pk9g== 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 4XmWtT4j7zzhTH; Sun, 10 Nov 2024 12:18:41 +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 4AACIfdr014022; Sun, 10 Nov 2024 12:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AACIfLW014019; Sun, 10 Nov 2024 12:18:41 GMT (envelope-from git) Date: Sun, 10 Nov 2024 12:18:41 GMT Message-Id: <202411101218.4AACIfLW014019@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: 6a9a3481601c - main - databases/mariadb106-server: Update to 10.6.20 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: 6a9a3481601c94c051f842e2e8a44a686e7559d1 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a9a3481601c94c051f842e2e8a44a686e7559d1 commit 6a9a3481601c94c051f842e2e8a44a686e7559d1 Author: Bernard Spil AuthorDate: 2024-11-10 12:18:38 +0000 Commit: Bernard Spil CommitDate: 2024-11-10 12:18:38 +0000 databases/mariadb106-server: Update to 10.6.20 --- databases/mariadb106-server/Makefile | 2 +- databases/mariadb106-server/distinfo | 6 +-- .../files/patch-include_my__cpu.h | 48 ---------------------- .../files/patch-mysys_crc32_crc32c.cc | 11 ----- .../mariadb106-server/files/patch-sql_mysqld.cc | 20 --------- 5 files changed, 4 insertions(+), 83 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 504fbdf51fd5..556add1ebd0a 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.6.19 +PORTVERSION= 10.6.20 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index d5fe50bd36d4..4de0b5f14dbd 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723490771 -SHA256 (mariadb-10.6.19.tar.gz) = bcecb0ff7b79a41344736fa994710787c15516d51eb7715f278c3f0fcb7e8703 -SIZE (mariadb-10.6.19.tar.gz) = 99979223 +TIMESTAMP = 1731237766 +SHA256 (mariadb-10.6.20.tar.gz) = 47f05abc7dbebb3f26b31e75022b1b3969dbbc4752c4ae701f8920a604896d41 +SIZE (mariadb-10.6.20.tar.gz) = 102697156 diff --git a/databases/mariadb106-server/files/patch-include_my__cpu.h b/databases/mariadb106-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb106-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/mariadb106-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc deleted file mode 100644 index ae1d0542c009..000000000000 --- a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- mysys/crc32/crc32c.cc.orig 2024-06-14 11:34:14 UTC -+++ mysys/crc32/crc32c.cc -@@ -455,7 +455,7 @@ static int arch_ppc_probe(void) { - - return arch_ppc_crc32; - } --# elif defined __FreeBSD_version && __FreeBSD_version >= 1200000 -+# elif defined __FreeBSD__ - # include - # include - # include diff --git a/databases/mariadb106-server/files/patch-sql_mysqld.cc b/databases/mariadb106-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e433bfc7d450..000000000000 --- a/databases/mariadb106-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);