commit: 612ba8a73429f64299777be8edaf0c0c810b51eb Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Apr 8 14:33:57 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Apr 12 01:53:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=612ba8a7
dev-db/mysql-connector-c++: Add 8.0.27-r1, 8.0.31, 8.0.32 New better patch. Upstream-PR: https://github.com/mysql/mysql-connector-cpp/pull/33 Closes: https://github.com/gentoo/libressl/pull/511 Signed-off-by: orbea <orbea <AT> riseup.net> dev-db/mysql-connector-c++/Manifest | 2 + .../mysql-connector-c++-8.0.27-mysqlclient_r.patch | 24 +++++++++ .../mysql-connector-c++-8.0.32-libressl.patch | 49 ++++++++++++++++++ dev-db/mysql-connector-c++/metadata.xml | 18 ++++--- .../mysql-connector-c++-8.0.27-r1.ebuild | 46 +++++++++++++++++ .../mysql-connector-c++-8.0.31.ebuild | 59 ++++++++++++++++++++++ .../mysql-connector-c++-8.0.32.ebuild | 59 ++++++++++++++++++++++ 7 files changed, 249 insertions(+), 8 deletions(-) diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index a17ed75..c823918 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -1 +1,3 @@ DIST mysql-connector-c++-8.0.27-src.tar.gz 4004836 BLAKE2B e581c679d8d9a31d2570b9cf1968b4e793cfccbd4cafdc5a9c9d17a465c16faa1492b2da7bdc1679d97474c27b6353274a390668f77d3cb47f72598eb3a967fa SHA512 3da7109efd2d1af813931b923218de9a85afe20d23e2654eecfa5524431f5b11ebdb8421b14563300b66ab61714e284cc15407a3b28a87922c9a8c79b2804bf3 +DIST mysql-connector-c++-8.0.31-src.tar.gz 4201904 BLAKE2B 48385db732572ccf2ba91edca0fbdecf94b3ac5ca6c095e1e2e525e5f9b17749b9cb1ed9732253f9239296d364a69a91d56f60958eb4cf399f16db38f6bd76a8 SHA512 a088936e207926031b6bafe45925bf0c9d2acede9477b605adb09dc875c87965e58e3ecd0332168021122c9def831f0dfdb837ad2c4ea2f140b07b43c9f8bb3c +DIST mysql-connector-c++-8.0.32-src.tar.gz 4202413 BLAKE2B fe15be7b6ec0c4699ded6e392f3f2e1c12fa9fe033172f6219916fb6ce4ae78d3e8cc882eaf66da606dc1445a59a5cf573f92ee6f1d18178d6c11762dcffb0c0 SHA512 cdfddaf84efe0d49d07c5ef07b5c50bde2f64cbf58d48016573a20ca372b0ba5dab640305d16d8b34032a63f2ceb2954eac108f838fb2f3849a7f3838329df48 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch new file mode 100644 index 0000000..d929601 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch @@ -0,0 +1,24 @@ +--- a/jdbc/FindMySQL.cmake 2021-09-10 18:31:29.000000000 +0200 ++++ b/jdbc/FindMySQL.cmake 2022-01-21 07:40:03.224705056 +0100 +@@ -282,8 +282,8 @@ + # there, pick "libmysqlclient" that in 5.5 and up is multithreaded + # anyway (soft link "libmysqlclient_r" is not installed MySQL Server + # 5.6 and Debian/Ubuntu and might go in 5.7 for all installs) +- set(_dynamic_libs "mysqlclient_r" "mysqlclient") +- set(_static_libs "libmysqlclient_r.a" "libmysqlclient.a") ++ set(_dynamic_libs "mysqlclient") ++ set(_static_libs "libmysqlclient.a") + set(_static_lib_ext ".a") + endif() + +--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp 2022-01-21 07:52:41.224586087 +0100 ++++ b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp 2022-01-21 07:52:50.168631719 +0100 +@@ -49,7 +49,7 @@ + #elif defined(__hpux) && defined(__hppa) + static const char * const baseName = "libmysqlclient_r.sl"; + #else +-static const char * const baseName = "libmysqlclient_r.so"; ++static const char * const baseName = "libmysqlclient.so"; + #endif + + template<typename FunctionType> diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.32-libressl.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.32-libressl.patch new file mode 100644 index 0000000..525fa3a --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.32-libressl.patch @@ -0,0 +1,49 @@ +https://github.com/mysql/mysql-connector-cpp/pull/33 + +From d4db68edf0c475d26758a2eaf68b1858444c8e2d Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Sun, 9 Apr 2023 04:07:59 +0100 +Subject: [PATCH] cdk: Use cmake's FindOpenSSL, not custom FindSSL module + +This avoids issues with detecting the version number with LibreSSL and also +futureproofs mysql for future versions of OpenSSL. + +diff --git a/cdk/CMakeLists.txt b/cdk/CMakeLists.txt +index 4fa43201d..59c96a3cd 100644 +--- a/cdk/CMakeLists.txt ++++ b/cdk/CMakeLists.txt +@@ -93,7 +93,7 @@ add_config(CDK_BIG_ENDIAN ${BIG_ENDIAN}) + # Dependencies + # + +-find_dependency(SSL) ++find_package(OpenSSL) + #find_dependency(Protobuf) + find_dependency(RapidJSON) + find_dependency(Coverage) +diff --git a/cdk/foundation/CMakeLists.txt b/cdk/foundation/CMakeLists.txt +index 0982d1c82..e0e3ed5f2 100644 +--- a/cdk/foundation/CMakeLists.txt ++++ b/cdk/foundation/CMakeLists.txt +@@ -90,7 +90,7 @@ target_include_directories(cdk_foundation PUBLIC + + target_link_libraries(cdk_foundation + PUBLIC RapidJSON::rapidjson +- PRIVATE SSL::ssl ++ PRIVATE OpenSSL::SSL + ) + + IF(WIN32) +diff --git a/cdk/mysqlx/CMakeLists.txt b/cdk/mysqlx/CMakeLists.txt +index 246874ffb..89fb26844 100644 +--- a/cdk/mysqlx/CMakeLists.txt ++++ b/cdk/mysqlx/CMakeLists.txt +@@ -51,7 +51,7 @@ ADD_LIBRARY(cdk_mysqlx STATIC + target_link_libraries(cdk_mysqlx PUBLIC cdk_proto_mysqlx cdk_foundation) + + # this is used by auth_hash.cc +-target_link_libraries(cdk_mysqlx PRIVATE SSL::ssl) ++target_link_libraries(cdk_mysqlx PRIVATE OpenSSL::SSL) + + ADD_COVERAGE(cdk_mysqlx) + diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml index 3eae39f..bf1ec7c 100644 --- a/dev-db/mysql-connector-c++/metadata.xml +++ b/dev-db/mysql-connector-c++/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<use> - <flag name="gcov">Build coverage support</flag> - <flag name="legacy">Build the legacy 1.x API as well as the DevX API</flag> -</use> -<maintainer type="project"> - <email>[email protected]</email> - <name>MySQL</name> -</maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>MySQL</name> + </maintainer> + <use> + <flag name="legacy">Build the legacy 1.x API as well as the DevX API</flag> + </use> + <upstream> + <remote-id type="github">mysql/mysql-connector-cpp</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild new file mode 100644 index 0000000..c0009da --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake + +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"; +URI_DIR="Connector-C++" +SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"; + +LICENSE="Artistic GPL-2" +SLOT="0" +# -ppc, -sparc for bug #711940 +KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86" +IUSE="+legacy" + +RDEPEND=" + dev-libs/protobuf:= + legacy? ( + dev-libs/boost:= + >=dev-db/mysql-connector-c-8.0.27:= + ) + dev-libs/openssl:0= + " +DEPEND="${RDEPEND}" +S="${WORKDIR}/${P}-src" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.27-fix-build.patch + "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch + "${FILESDIR}"/${PN}-8.0.32-libressl.patch +) + +src_configure() { + local mycmakeargs=( + -DWITH_SSL=system + -DWITH_JDBC=$(usex legacy ON OFF) + $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '') + $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '') + ) + + cmake_src_configure +} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild new file mode 100644 index 0000000..79a9a10 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake + +URI_DIR="Connector-C++" +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"; +SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"; +S="${WORKDIR}/${P}-src" + +LICENSE="Artistic GPL-2" +SLOT="0" +# -ppc, -sparc for bug #711940 +KEYWORDS="amd64 arm ~arm64 -ppc ppc64 -sparc x86" +IUSE="+legacy" + +RDEPEND=" + app-arch/lz4:= + app-arch/zstd:= + dev-libs/openssl:= + dev-libs/protobuf:= + sys-libs/zlib + legacy? ( + dev-libs/boost:= + >=dev-db/mysql-connector-c-8.0.27:= + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch + "${FILESDIR}"/${PN}-8.0.32-libressl.patch +) + +src_configure() { + local mycmakeargs=( + -DBUNDLE_DEPENDENCIES=OFF + -DWITH_PROTOBUF=system + -DWITH_LZ4=system + -DWITH_SSL=system + -DWITH_ZLIB=system + -DWITH_ZSTD=system + -DWITH_JDBC=$(usex legacy) + ) + + if use legacy ; then + mycmakeargs+=( + -DWITH_BOOST="${ESYSROOT}"/usr + -DMYSQLCLIENT_STATIC_BINDING=0 + -DMYSQLCLIENT_STATIC_LINKING=0 + ) + fi + + cmake_src_configure +} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.32.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.32.ebuild new file mode 100644 index 0000000..ffc5f34 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.32.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +inherit cmake + +URI_DIR="Connector-C++" +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"; +SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"; +S="${WORKDIR}/${P}-src" + +LICENSE="Artistic GPL-2" +SLOT="0" +# -ppc, -sparc for bug #711940 +KEYWORDS="amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86" +IUSE="+legacy" + +RDEPEND=" + app-arch/lz4:= + app-arch/zstd:= + dev-libs/openssl:= + >=dev-libs/protobuf-3.19.6:= + sys-libs/zlib + legacy? ( + dev-libs/boost:= + >=dev-db/mysql-connector-c-8.0.27:= + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch + "${FILESDIR}"/${PN}-8.0.32-libressl.patch +) + +src_configure() { + local mycmakeargs=( + -DBUNDLE_DEPENDENCIES=OFF + -DWITH_PROTOBUF=system + -DWITH_LZ4=system + -DWITH_SSL=system + -DWITH_ZLIB=system + -DWITH_ZSTD=system + -DWITH_JDBC=$(usex legacy) + ) + + if use legacy ; then + mycmakeargs+=( + -DWITH_BOOST="${ESYSROOT}"/usr + -DMYSQLCLIENT_STATIC_BINDING=0 + -DMYSQLCLIENT_STATIC_LINKING=0 + ) + fi + + cmake_src_configure +}
