commit: d2011a75e212193f77de8aafd1868ec0af3238b6 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Mon Nov 11 21:13:40 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Mon Nov 11 21:13:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d2011a75
dev-db/mysql-connector-c: new package, add 8.0.36 Closes: https://github.com/gentoo/libressl/issues/566 Signed-off-by: orbea <orbea <AT> riseup.net> dev-db/mysql-connector-c/Manifest | 1 + ...onnector-c-8.0.19-do-not-install-comp_err.patch | 12 ++ ...-8.0.22-always-build-decompress-utilities.patch | 22 ++++ .../files/mysql-connector-c-8.0.27-res_n.patch | 49 ++++++++ .../files/mysql-connector-c-8.0.32-musl.patch | 25 +++++ ...-8.0.36-always-build-decompress-utilities.patch | 23 ++++ .../files/mysql-connector-c-8.0.36-libressl.patch | 60 ++++++++++ dev-db/mysql-connector-c/metadata.xml | 8 ++ .../mysql-connector-c-8.0.36.ebuild | 124 +++++++++++++++++++++ 9 files changed, 324 insertions(+) diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest new file mode 100644 index 0000000..4df88f2 --- /dev/null +++ b/dev-db/mysql-connector-c/Manifest @@ -0,0 +1 @@ +DIST mysql-boost-8.0.36.tar.gz 438154682 BLAKE2B 066c9dd7f2804ad29808c3bfcf5eae53466f7c40cf1386a9c1f26a0b45dcc3eda8d9618de36e8008e5e4d58b726d6c8ca85aec8d1eda8981f5a49e495b32f046 SHA512 a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-do-not-install-comp_err.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-do-not-install-comp_err.patch new file mode 100644 index 0000000..94329ee --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-do-not-install-comp_err.patch @@ -0,0 +1,12 @@ +diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt +index c855f8ab..0ebef451 100644 +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -27,6 +27,7 @@ IF(NOT CMAKE_CROSSCOMPILING) + comp_err.cc + COMPONENT Server + LINK_LIBRARIES mysys ++ SKIP_INSTALL + ) + ENDIF() + diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch new file mode 100644 index 0000000..b0046fd --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch @@ -0,0 +1,22 @@ +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -123,14 +123,11 @@ MYSQL_ADD_EXECUTABLE(perror + DEPENDENCIES GenError + LINK_LIBRARIES mysys + ) +-IF(BUILD_BUNDLED_LZ4) +- MYSQL_ADD_EXECUTABLE(lz4_decompress +- lz4_decompress.cc +- COMPONENT Server +- LINK_LIBRARIES ${LZ4_LIBRARY} mysys +- ) +-ENDIF() +- ++MYSQL_ADD_EXECUTABLE(lz4_decompress ++ lz4_decompress.cc ++ COMPONENT Server ++ LINK_LIBRARIES ${LZ4_LIBRARY} mysys ++ ) + MYSQL_ADD_EXECUTABLE(zlib_decompress + zlib_decompress.cc + COMPONENT Server diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch new file mode 100644 index 0000000..34961b8 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch @@ -0,0 +1,49 @@ +# Musl doesn't have res_n* functions so we are falling back to the not +# thread safe ones. Patch made with help from developer Fabian Groffen +# <[email protected]>. +# +# Closes: https://bugs.gentoo.org/761352 +# See also: https://github.com/mysql/mysql-server/pull/385 +# See also: https://bugs.mysql.com/bug.php?id=106034 +--- a/libmysql/CMakeLists.txt ++++ b/libmysql/CMakeLists.txt +@@ -423,6 +423,19 @@ IF(HAS_WARN_FLAG) + ) + ENDIF() + ++check_symbol_exists(res_ninit "resolv.h" HAVE_RES_NINIT_FUNCTION) ++check_symbol_exists(res_nsearch "resolv.h" HAVE_RES_NSEARCH_FUNCTION) ++check_symbol_exists(res_nclose "resolv.h" HAVE_RES_NCLOSE_FUNCTION) ++IF (HAVE_RES_NINIT_FUNCTION) ++ add_compile_definitions(HAVE_RES_NINIT) ++ENDIF(HAVE_RES_NINIT_FUNCTION) ++IF (HAVE_RES_NSEARCH_FUNCTION) ++ add_compile_definitions(HAVE_RES_NSEARCH) ++ENDIF(HAVE_RES_NSEARCH_FUNCTION) ++IF (HAVE_RES_NCLOSE_FUNCTION) ++ add_compile_definitions(HAVE_RES_NCLOSE) ++ENDIF(HAVE_RES_NCLOSE_FUNCTION) ++ + # Verify that libmysql_api_test runs OK + ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD + COMMAND libmysql_api_test +--- a/libmysql/dns_srv.cc ++++ b/libmysql/dns_srv.cc +@@ -37,6 +37,17 @@ + #include <netdb.h> + #include <resolv.h> + ++/* we don't have anything else but the non-thread-safe variants */ ++#if !defined(HAVE_RES_NINIT) ++#define res_ninit(X) (void)X ++#endif ++#if !defined(HAVE_RES_NSEARCH) ++#define res_nsearch(X,D,I,S,B,L) res_search(D,I,S,B,L) ++#endif ++#if !defined(HAVE_RES_NCLOSE) ++#define res_nclose(X) (void)X ++#endif ++ + // POSIX version + + static bool get_dns_srv(Dns_srv_data &data, const char *dnsname, int &error) { diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch new file mode 100644 index 0000000..252c5ee --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch @@ -0,0 +1,25 @@ +https://github.com/mysql/mysql-server/pull/454 + +From c875f049cb3571da1b9b5bcae50caccc5ee47cfb Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Fri, 7 Apr 2023 12:47:51 -0700 +Subject: [PATCH] sql/memory: Fix the musl build + +_SC_LEVEL1_DCACHE_LINESIZE is not specific to linux, but to glibc. +--- + sql/memory/aligned_atomic.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sql/memory/aligned_atomic.h b/sql/memory/aligned_atomic.h +index d13d45b9deea..bd19c0cf4d6f 100644 +--- a/sql/memory/aligned_atomic.h ++++ b/sql/memory/aligned_atomic.h +@@ -76,7 +76,7 @@ static inline size_t _cache_line_size() { + return line_size; + } + +-#elif defined(__linux__) ++#elif defined(__GLIBC__) + static inline size_t _cache_line_size() { + long size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); + if (size == -1) return 64; diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch new file mode 100644 index 0000000..9c8e654 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch @@ -0,0 +1,23 @@ +diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt +index da34524..96c7299 100644 +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -124,13 +124,11 @@ MYSQL_ADD_EXECUTABLE(perror + DEPENDENCIES GenError + LINK_LIBRARIES mysys + ) +-IF(WITH_LZ4 STREQUAL "bundled") +- MYSQL_ADD_EXECUTABLE(lz4_decompress +- lz4_decompress.cc +- COMPONENT Server +- LINK_LIBRARIES ext::lz4 mysys +- ) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(lz4_decompress ++ lz4_decompress.cc ++ COMPONENT Server ++ LINK_LIBRARIES ext::lz4 mysys ++ ) + + MYSQL_ADD_EXECUTABLE(zlib_decompress + zlib_decompress.cc diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-libressl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-libressl.patch new file mode 100644 index 0000000..0f685e1 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-libressl.patch @@ -0,0 +1,60 @@ +https://github.com/gentoo/libressl/issues/566 + +--- a/include/dh_ecdh_config.h ++++ b/include/dh_ecdh_config.h +@@ -38,7 +38,7 @@ + #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */ + + namespace { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* Following primes are from https://www.rfc-editor.org/rfc/rfc7919#appendix-A + */ + +@@ -256,7 +256,7 @@ bool set_dh(SSL_CTX *ctx) { + #else /* OPENSSL_VERSION_NUMBER >= 0x30000000L */ + + DH *dh = nullptr; +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + switch (security_level) { + case 1: + [[fallthrough]]; +@@ -276,6 +276,7 @@ bool set_dh(SSL_CTX *ctx) { + break; + }; + #else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ ++ BIGNUM *p, *g; + dh = DH_new(); + if (!dh) return true; + +@@ -283,15 +284,15 @@ bool set_dh(SSL_CTX *ctx) { + case 1: + [[fallthrough]]; + case 2: +- dh->p = ++ p = + BN_bin2bn(rfc7919_ffdhe2048_p, sizeof(rfc7919_ffdhe2048_p), nullptr); + break; + case 3: +- dh->p = ++ p = + BN_bin2bn(rfc7919_ffdhe3072_p, sizeof(rfc7919_ffdhe3072_p), nullptr); + break; + case 4: +- dh->p = ++ p = + BN_bin2bn(rfc7919_ffdhe8192_p, sizeof(rfc7919_ffdhe8192_p), nullptr); + break; + case 5: +@@ -302,8 +303,8 @@ bool set_dh(SSL_CTX *ctx) { + return true; + }; + +- dh->g = BN_bin2bn(rfc7919_g, sizeof(rfc7919_g), nullptr); +- if (!dh->p || !dh->g) { ++ g = BN_bin2bn(rfc7919_g, sizeof(rfc7919_g), nullptr); ++ if (!p || !g) { + DH_free(dh); + return true; + } diff --git a/dev-db/mysql-connector-c/metadata.xml b/dev-db/mysql-connector-c/metadata.xml new file mode 100644 index 0000000..8973b55 --- /dev/null +++ b/dev-db/mysql-connector-c/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<maintainer type="project"> + <email>[email protected]</email> + <name>MySQL</name> +</maintainer> +</pkgmetadata> diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild new file mode 100644 index 0000000..54c8398 --- /dev/null +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="https://dev.mysql.com/downloads/"; + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"; + + inherit git-r3 +else + SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + + S="${WORKDIR}/mysql-${PV}" +fi + +LICENSE="GPL-2" +SLOT="0/21" +IUSE="ldap static-libs" + +RDEPEND=" + >=app-arch/lz4-1.9.4:=[${MULTILIB_USEDEP}] + app-arch/zstd:=[${MULTILIB_USEDEP}] + dev-libs/openssl:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.13:=[${MULTILIB_USEDEP}] + ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# Avoid file collisions, #692580 +RDEPEND+=" + !<dev-db/mysql-5.6.45-r1 + !=dev-db/mysql-5.7.23* + !=dev-db/mysql-5.7.24* + !=dev-db/mysql-5.7.25* + !=dev-db/mysql-5.7.26-r0 + !=dev-db/mysql-5.7.27-r0 + !<dev-db/percona-server-5.7.26.29-r1 +" + +DOCS=( README ) + +# Wrap the config script +MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.36-libressl.patch + "${FILESDIR}"/${PN}-8.0.36-always-build-decompress-utilities.patch + "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch + "${FILESDIR}"/${PN}-8.0.27-res_n.patch +) + +src_prepare() { + sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die + + # All these are for the server only. + # Disable rpm call which would trigger sandbox, #692368 + sed -i \ + -e '/MYSQL_CHECK_LIBEVENT/d' \ + -e '/MYSQL_CHECK_RAPIDJSON/d' \ + -e '/MYSQL_CHECK_ICU/d' \ + -e '/MYSQL_CHECK_EDITLINE/d' \ + -e '/MYSQL_CHECK_CURL/d' \ + -e '/ADD_SUBDIRECTORY(man)/d' \ + -e '/ADD_SUBDIRECTORY(share)/d' \ + -e '/INCLUDE(cmake\/boost/d' \ + -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ + CMakeLists.txt || die + + # Skip building clients + echo > client/CMakeLists.txt || die + + # Forcefully disable auth plugin + if ! use ldap ; then + sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die + echo > libmysql/authentication_ldap/CMakeLists.txt || die + fi + + cmake_src_prepare +} + +multilib_src_configure() { + # Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08 + append-cxxflags -std=c++17 + + local mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DINSTALL_LAYOUT=RPM + -DINSTALL_LIBDIR=$(get_libdir) + -DWITH_DEFAULT_COMPILER_OPTIONS=OFF + -DENABLED_LOCAL_INFILE=ON + -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" + # Automagically uses LLD with not using LTO (bug #710272, #775845) + -DUSE_LD_LLD=OFF + -DWITH_LZ4=system + -DWITH_NUMA=OFF + -DWITH_SSL=system + -DWITH_ZLIB=system + -DWITH_ZSTD=system + -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient + -DSHARED_LIB_PATCH_VERSION="0" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITHOUT_SERVER=ON + -DWITH_BUILD_ID=OFF + ) + + cmake_src_configure +} + +multilib_src_install_all() { + doman \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 + + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +}
