diff options
author | orbea <orbea@riseup.net> | 2024-01-16 13:26:36 -0800 |
---|---|---|
committer | orbea <orbea@riseup.net> | 2024-01-16 13:26:36 -0800 |
commit | 528f42bff4b8e3ddaba3ff4bbc8da36f169e8f79 (patch) | |
tree | 89dd1823926b5c8c6457ddf86c63da65477705f0 /dev-db | |
parent | dev-db/mysql-connector-c++: add 8.0.33, 8.0.33-r1 (diff) | |
download | libressl-528f42bff4b8e3ddaba3ff4bbc8da36f169e8f79.tar.gz libressl-528f42bff4b8e3ddaba3ff4bbc8da36f169e8f79.tar.bz2 libressl-528f42bff4b8e3ddaba3ff4bbc8da36f169e8f79.zip |
dev-db/mysql-connector-c++: drop 8.0.27, 8.0.27-r1
Signed-off-by: orbea <orbea@riseup.net>
Diffstat (limited to 'dev-db')
5 files changed, 0 insertions, 272 deletions
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index 12e9020..bf88587 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -1,4 +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 DIST mysql-connector-c++-8.0.33-src.tar.gz 4531693 BLAKE2B b8f426742fa343ebc1f1da5ba1fbf7dfc0db39493bafd0f5d16e355d43277d78ff27b183edad31792a7591ac59bbfb4033f3498dc646883988cba189535a8ddf SHA512 a625a28f63161c97d727d90e7b1211273fe931ae1325c2fbeca16e770761e3159abdcaba1fb6eb1a557674fd817bf266875a089c8c2ea4d2dd1553e6fa887ef1 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch deleted file mode 100644 index f2ae0d0..0000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- a/cdk/cmake/DepFindSSL.cmake -+++ b/cdk/cmake/DepFindSSL.cmake -@@ -88,7 +88,7 @@ function(main) - - set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") - -- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) -+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) - message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") - else() - message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") -@@ -184,41 +184,35 @@ function(find_openssl) - - - # Verify version number. Version information looks like: -- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" -+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL -+ # Encoded as MNNFFPPS: major minor fix patch status - - FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" - OPENSSL_VERSION_NUMBER -- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" -+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" - ) - -- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") -- # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1d-freebsd 10 Sep 2019" - STRING(REGEX REPLACE -- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]|)[\t \\-].*$" -- "\\1;\\2;\\3;\\4" -- version_list "${OPENSSL_VERSION_NUMBER}" -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" -+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" - ) -- #message("-- OPENSSL_VERSION: ${version_list}") -- -- list(GET version_list 0 OPENSSL_VERSION_MAJOR) -- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) -- -- list(GET version_list 1 OPENSSL_VERSION_MINOR) -- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) -- -- list(GET version_list 2 OPENSSL_VERSION_FIX) -- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) -- -- list(GET version_list 3 OPENSSL_VERSION_PATCH) -- - - - set(OPENSSL_VERSION -- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" -+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" - PARENT_SCOPE - ) - set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) - -+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) - - find_library(OPENSSL_LIBRARY - NAMES ssl ssleay32 ssleay32MD libssl ---- a/cdk/foundation/connection_openssl.cc -+++ b/cdk/foundation/connection_openssl.cc -@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) - case SSL_ERROR_WANT_CONNECT: - case SSL_ERROR_WANT_ACCEPT: - case SSL_ERROR_WANT_X509_LOOKUP: --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - case SSL_ERROR_WANT_ASYNC: - case SSL_ERROR_WANT_ASYNC_JOB: - # endif -@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) - - SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); - --#if OPENSSL_VERSION_NUMBER>=0x1010100fL -+#if HAVE_TLS1_3_VERSION - - /* - Note: If TLSv1.3 is not enabled, there is no need to restrict diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch deleted file mode 100644 index aadf006..0000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e734714..b79ff3a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -474,7 +474,7 @@ set_target_properties(connector PROPERTIES - - - install(TARGETS connector -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev - RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll -diff --git a/cdk/cmake/DepFindProtobuf.cmake b/cdk/cmake/DepFindProtobuf.cmake -index 414716c..165af4b 100644 ---- a/cdk/cmake/DepFindProtobuf.cmake -+++ b/cdk/cmake/DepFindProtobuf.cmake -@@ -52,21 +52,7 @@ if(TARGET ext::protobuf) - return() - endif() - --message(STATUS "Setting up Protobuf.") -- --# Setup extrnal project that builds protobuf from bundled sources -- --add_ext(protobuf) -- --# import targets from the external project --# Note: The pb_ targets are created by protobuf/exports.cmake -- --add_ext_targets(protobuf -- pb-lite pb_libprotobuf-lite -- pb-full pb_libprotobuf -- protoc pb_protoc --) -- -+find_package(Protobuf REQUIRED) - - # Standard PROTOBUF_GENERATE_CPP modified to our usage - -@@ -95,7 +81,7 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) - "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h" - COMMAND ${CMAKE_COMMAND} - -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf" -- COMMAND ext::protoc -+ COMMAND ${Protobuf_PROTOC_EXECUTABLE} - ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf" - -I ${ABS_PATH} ${ABS_FIL} - #--proto_path=${PROTOBUF_INCLUDE_DIR} -diff --git a/cdk/core/CMakeLists.txt b/cdk/core/CMakeLists.txt -index 10cae33..3907c9b 100644 ---- a/cdk/core/CMakeLists.txt -+++ b/cdk/core/CMakeLists.txt -@@ -45,7 +45,7 @@ add_library(cdk STATIC ${cdk_sources} ${HEADERS}) - - target_link_libraries(cdk - PUBLIC cdk_mysqlx cdk_parser -- PRIVATE ext::pb-lite # required by codecc.cc -+ PRIVATE protobuf # required by codecc.cc - ) - - add_coverage(cdk) -diff --git a/cdk/protocol/mysqlx/CMakeLists.txt b/cdk/protocol/mysqlx/CMakeLists.txt -index a399401..b04ffa3 100644 ---- a/cdk/protocol/mysqlx/CMakeLists.txt -+++ b/cdk/protocol/mysqlx/CMakeLists.txt -@@ -129,11 +129,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE - ${CMAKE_CURRENT_BINARY_DIR} - ) - --if(use_full_protobuf) -- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-full) --else() -- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-lite) --endif() -+target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf) - - target_link_libraries(cdk_proto_mysqlx - PRIVATE cdk_foundation ext::zlib ext::lz4 ext::zstd -diff --git a/jdbc/CMakeLists.txt b/jdbc/CMakeLists.txt -index f4355ed..f24510b 100644 ---- a/jdbc/CMakeLists.txt -+++ b/jdbc/CMakeLists.txt -@@ -299,7 +299,7 @@ endif() - - - install(TARGETS connector-jdbc -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT JDBCDev - RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll 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 deleted file mode 100644 index c0009da..0000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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.27.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild deleted file mode 100644 index fef8144..0000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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.20-fix-libressl-support.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 -} |