git: 6179bcf1cc81 - main - databases/mysql80-{client, server}: Update to latest release 8.0.35

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Sun, 19 Nov 2023 16:00:50 UTC
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6179bcf1cc811e58beeadf360f861beb20dec044

commit 6179bcf1cc811e58beeadf360f861beb20dec044
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2023-11-19 15:57:05 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2023-11-19 16:00:25 +0000

    databases/mysql80-{client, server}: Update to latest release 8.0.35
    
    Changelogs:
    8.0.34: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-34.html
    8.0.35: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-35.html
    
    Sponsored by:   Netzkommune GmbH
---
 databases/mysql80-client/Makefile                  |  2 +-
 databases/mysql80-server/Makefile                  |  4 ++--
 databases/mysql80-server/distinfo                  |  6 +++---
 ...-router_src_harness_src_tls__server__context.cc | 15 +++++++-------
 .../files/patch-storage_innobase_ut_crc32.cc       | 24 +++++++---------------
 .../files/patch-vio_viosslfactories.cc             | 24 +++++++++++-----------
 6 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 5c61a5f64139..57ea54fb66e6 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mysql
-PORTREVISION=	4
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index b9ac590666bf..999ce104ac0a 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=		mysql
-PORTVERSION=		8.0.33
-PORTREVISION?=		1
+PORTVERSION=		8.0.35
+PORTREVISION?=		0
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index 05b98badd3de..bc0a2dd68ade 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686677589
-SHA256 (mysql-boost-8.0.33.tar.gz) = ae31e6368617776b43c82436c3736900067fada1289032f3ac3392f7380bcb58
-SIZE (mysql-boost-8.0.33.tar.gz) = 438065679
+TIMESTAMP = 1700321902
+SHA256 (mysql-boost-8.0.35.tar.gz) = 41253c3a99cefcf6d806040c6687692eb0c37b4c7aae5882417dfb9c5d3ce4ce
+SIZE (mysql-boost-8.0.35.tar.gz) = 438111810
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
index 72866c631fd2..5a63eba14103 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
@@ -1,13 +1,12 @@
---- router/src/harness/src/tls_server_context.cc.orig	2023-06-29 15:05:27.686865000 +0200
-+++ router/src/harness/src/tls_server_context.cc	2023-06-29 15:31:25.869049000 +0200
-@@ -275,7 +275,9 @@ stdx::expected<void, std::error_code> set_auto_dh_para
- #if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(3, 0, 0)
-   SSL_CTX_set_dh_auto(ssl_ctx, 1);
- #else
+--- router/src/harness/src/tls_server_context.cc.orig	2023-11-18 19:39:18.923205000 +0100
++++ router/src/harness/src/tls_server_context.cc	2023-11-18 19:42:53.690094000 +0100
+@@ -474,7 +474,8 @@ int TlsServerContext::security_level() const {
+ }
+ 
+ int TlsServerContext::security_level() const {
 -#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
 +#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) \
 +  && !defined(LIBRESSL_VERSION_NUMBER)
-+
-   int sec_level = SSL_CTX_get_security_level(ssl_ctx);
+   int sec_level = SSL_CTX_get_security_level(ssl_ctx_.get());
  
    assert(sec_level <= kMaxSecurityLevel);
diff --git a/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
index 0e42c96a1843..fabd5664cf94 100644
--- a/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
+++ b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
@@ -1,16 +1,6 @@
---- storage/innobase/ut/crc32.cc.orig	2021-12-17 17:07:27 UTC
-+++ storage/innobase/ut/crc32.cc
-@@ -111,7 +111,9 @@ external tools. */
- #endif /* CRC32_ARM64 */
- 
- #ifdef CRC32_ARM64_DEFAULT
-+#ifndef __FreeBSD__
- #include <asm/hwcap.h>
-+#endif
- #include <sys/auxv.h>
- #endif /* CRC32_ARM64_DEFAULT */
- 
-@@ -360,8 +362,25 @@ bool can_use_poly_mul() { return true; }
+--- storage/innobase/ut/crc32.cc.orig	2023-11-18 19:47:31.364606000 +0100
++++ storage/innobase/ut/crc32.cc	2023-11-18 20:51:42.956171000 +0100
+@@ -332,8 +332,25 @@ bool can_use_poly_mul() { return true; }
  #endif /* CRC32_ARM64_APPLE */
  
  #ifdef CRC32_ARM64_DEFAULT
@@ -36,7 +26,7 @@
  #endif /* CRC32_ARM64_DEFAULT */
  
  /** A helper template to statically unroll a loop with a fixed number of
-@@ -470,25 +489,39 @@ uint64_t crc32_impl::update(uint64_t crc, uint64_t dat
+@@ -442,25 +459,39 @@ uint64_t crc32_impl::update(uint64_t crc, uint64_t dat
  
  #ifdef CRC32_ARM64
  #ifdef CRC32_ARM64_DEFAULT
@@ -76,7 +66,7 @@
  #endif /* CRC32_ARM64_DEFAULT */
  uint64_t crc32_impl::update(uint64_t crc, uint64_t data) {
    return (uint64_t)__crc32cd((uint32_t)crc, data);
-@@ -534,7 +567,11 @@ static inline uint64_t less_significant_half_of_poly12
+@@ -506,7 +537,11 @@ template <uint32_t w>
  }
  template <uint32_t w>
  #ifdef CRC32_ARM64_DEFAULT
@@ -88,7 +78,7 @@
  #endif /* CRC32_ARM64_DEFAULT */
  uint64_t use_pclmul::polynomial_mul_rev(uint32_t rev_u) {
    constexpr uint64_t flipped_w = flip_at_32(w);
-@@ -777,7 +814,11 @@ MY_ATTRIBUTE((target("sse4.2,pclmul"), flatten))
+@@ -749,7 +784,11 @@ MY_ATTRIBUTE((flatten))
  MY_ATTRIBUTE((flatten))
  #endif /* CRC32_ARM64_APPLE */
  #ifdef CRC32_ARM64_DEFAULT
@@ -100,7 +90,7 @@
  #endif /* CRC32_ARM64_DEFAULT */
  uint32_t crc32_using_pclmul(const byte *data, size_t len) {
    return crc32<use_pclmul>(0, data, len);
-@@ -797,7 +838,11 @@ MY_ATTRIBUTE((target("sse4.2"), flatten))
+@@ -769,7 +808,11 @@ MY_ATTRIBUTE((flatten))
  MY_ATTRIBUTE((flatten))
  #endif /* CRC32_ARM64_APPLE */
  #ifdef CRC32_ARM64_DEFAULT
diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc
index 2882353d79f0..4951cc995df3 100644
--- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc
+++ b/databases/mysql80-server/files/patch-vio_viosslfactories.cc
@@ -1,14 +1,14 @@
---- vio/viosslfactories.cc.orig	2022-07-06 21:36:34 UTC
-+++ vio/viosslfactories.cc
-@@ -40,6 +40,7 @@
- #include "vio/vio_priv.h"
+--- vio/viosslfactories.cc.orig	2023-11-18 20:56:37.098235000 +0100
++++ vio/viosslfactories.cc	2023-11-19 09:20:02.284708000 +0100
+@@ -43,6 +43,7 @@
+ #include <dh_ecdh_config.h>
  
- #include <openssl/dh.h>
-+#include <openssl/crypto.h>
+ #include "my_openssl_fips.h"
++#include "openssl/crypto.h"
+ #define TLS_VERSION_OPTION_SIZE 256
  
- #if OPENSSL_VERSION_NUMBER < 0x10002000L
- #include <openssl/ec.h>
-@@ -484,7 +485,7 @@ long process_tls_version(const char *tls_version) {
+ /*
+@@ -417,7 +418,7 @@ long process_tls_version(const char *tls_version) {
    const char *separator = ",";
    char *token, *lasts = nullptr;
  
@@ -17,7 +17,7 @@
    const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"};
    const char ctx_flag_default[] = "TLSv1.2,TLSv1.3";
    const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
-@@ -559,7 +560,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+@@ -489,7 +490,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
    ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
                      (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
                       SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2
@@ -26,7 +26,7 @@
                       | SSL_OP_NO_TLSv1_3
  #endif /* HAVE_TLSv13 */
                       | SSL_OP_NO_TICKET);
-@@ -568,7 +569,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+@@ -498,7 +499,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
      return nullptr;
  
    if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
@@ -35,7 +35,7 @@
                                                      TLS_client_method()
                                                      : TLS_server_method()
  #else  /* HAVE_TLSv13 */
-@@ -583,7 +584,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+@@ -513,7 +514,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
      return nullptr;
    }