[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Andreas Sturmlechner]

commit: 141405847bfbc603d306ef847722775186c13851
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 15 19:11:03 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 15:43:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14140584

dev-db/mysql-connector-c++: drop 8.0.27, 8.0.27-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|  1 -
 .../mysql-connector-c++-8.0.27-fix-build.patch | 92 --
 .../mysql-connector-c++-8.0.27-r1.ebuild   | 45 ---
 .../mysql-connector-c++-8.0.27.ebuild  | 44 ---
 4 files changed, 182 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 12e9020aa930..bf885879f346 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.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 aadf006d25e6..
--- 
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 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Sam James]

commit: 016648eda578932e93becd587cbc9bc4e376c9e3
Author: orbea  riseup  net>
AuthorDate: Fri Apr  7 19:55:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  9 05:27:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016648ed

dev-db/mysql-connector-c: Build fixes

* Adds -DWITH_BUILD_ID=OFF to workaround various build issues
* Patches the source to work with musl

Upstream-PR: https://github.com/mysql/mysql-server/pull/455
Closes: https://bugs.gentoo.org/886474
Closes: https://bugs.gentoo.org/903415
Closes: https://bugs.gentoo.org/885035
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30517
Signed-off-by: Sam James  gentoo.org>

 .../files/mysql-connector-c-8.0.32-musl.patch  | 25 ++
 .../mysql-connector-c-8.0.32-r1.ebuild |  2 ++
 2 files changed, 27 insertions(+)

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 ..252c5eeda32e
--- /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 
+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/mysql-connector-c-8.0.32-r1.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild
index 57568257e26e..59782a42d7ae 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
"${FILESDIR}"/${PN}-8.0.27-res_n.patch
+   "${FILESDIR}"/${PN}-8.0.32-musl.patch
 )
 
 src_prepare() {
@@ -103,6 +104,7 @@ multilib_src_configure() {
-DSHARED_LIB_PATCH_VERSION="0"
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DWITHOUT_SERVER=ON
+   -DWITH_BUILD_ID=OFF
)
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Andreas Sturmlechner]

commit: bd2cf6d0b58c6ea48f59fb7640898ccd9e2aa7f6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 17:44:41 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  8 20:17:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2cf6d0

dev-db/mysql-connector-c++: drop 1.1.12-r2

Bug: https://bugs.gentoo.org/834439
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|  1 -
 .../mysql-connector-c++-1.1.11-fix-mariadb.patch   | 43 -
 .../mysql-connector-c++-1.1.6-fix-cmake.patch  | 23 -
 dev-db/mysql-connector-c++/metadata.xml|  1 -
 .../mysql-connector-c++-1.1.12-r2.ebuild   | 54 --
 5 files changed, 122 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 1c28ab870e80..c823918eba96 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,4 +1,3 @@
-DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9
 SHA512 
d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 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++-1.1.11-fix-mariadb.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch
deleted file mode 100644
index 2868a3c024af..
--- 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch
+++ /dev/null
@@ -1,43 +0,0 @@
 a/driver/mysql_connection.cpp
-+++ b/driver/mysql_connection.cpp
-@@ -1067,6 +1067,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & 
optionName, void * opti
- proxy->get_character_set_info();
- *(static_cast(optionValue)) = cs.mbmaxlen;
-   /* mysql_get_option() was added in mysql 5.7.3 version */
-+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
-   } else if ( proxy->get_server_version() >= 50703 ) {
- try {
-   if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
-@@ -1080,6 +1081,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & 
optionName, void * opti
-   CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), 
proxy->sqlstate().c_str(), proxy->error().c_str());
-   throw e;
- }
-+#endif
-   }
- }
- /* }}} */
-@@ -1097,11 +1099,13 @@ MySQL_Connection::getClientOption(const sql::SQLString 
& optionName)
- MY_CHARSET_INFO cs;
- proxy->get_character_set_info();
- return cs.dir ? sql::SQLString(cs.dir) : "";
-+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
-   } else if ( proxy->get_server_version() >= 50703 ) {
- const char* optionValue= NULL;
- if (GET_CONN_OPTION(optionName, , stringOptions)) {
-   return optionValue ? sql::SQLString(optionValue) : "";
- }
-+#endif
-   }
-   return "";
- }
 a/driver/nativeapi/libmysql_static_proxy.cpp
-+++ b/driver/nativeapi/libmysql_static_proxy.cpp
-@@ -325,7 +325,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum 
mysql_option option, const void
- int
- LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, 
const void *arg)
- {
--#if MYSQL_VERSION_ID >= 50703
-+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined 
( MARIADB_VERSION_ID )
-   if (::mysql_get_option(mysql, option, arg)) {
- throw sql::InvalidArgumentException("Unsupported option provided to 
mysql_get_option()");
-   } else {

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch
deleted file mode 100644
index 18d4e9a80410..
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch
+++ /dev/null
@@ -1,23 +0,0 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 376330aef984a799b074646550733a9a25eefe9e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 16 01:42:43 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 16 01:43:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376330ae

dev-db/mysql-connector-c++: bump to v8.0.27

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|  1 +
 .../mysql-connector-c++-8.0.27-fix-build.patch | 92 ++
 .../mysql-connector-c++-8.0.27.ebuild  | 44 +++
 3 files changed, 137 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index c2e18c028f52..572807f8ebe2 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -2,3 +2,4 @@ DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507
 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B 
e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602
 SHA512 
5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1
 DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 
67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858
 SHA512 
44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525
 DIST mysql-connector-c++-8.0.26-src.tar.gz 3980027 BLAKE2B 
86ce0d94db588ed86ce7b21851f866da26268f7c9059b57697cbe1f5c5d031a3eada2f55042feb7b2888b538277c773215c0d19e8a1968ff70ce363e8f95bd77
 SHA512 
e3a08551a4245bf886cb7e3775a256fa379bb781b523a84d30e0d0c16cae73c808a3413b08b09998eba9c0ea3ede19e505b6392ed71712a8e9a2df31f07e4c79
+DIST mysql-connector-c++-8.0.27-src.tar.gz 4004836 BLAKE2B 
e581c679d8d9a31d2570b9cf1968b4e793cfccbd4cafdc5a9c9d17a465c16faa1492b2da7bdc1679d97474c27b6353274a390668f77d3cb47f72598eb3a967fa
 SHA512 
3da7109efd2d1af813931b923218de9a85afe20d23e2654eecfa5524431f5b11ebdb8421b14563300b66ab61714e284cc15407a3b28a87922c9a8c79b2804bf3

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
new file mode 100644
index ..aadf006d25e6
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-fix-build.patch
@@ -0,0 +1,92 @@
+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 @@ 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: a399535b6ea5a2411eb2d3a7511931d4b7f96dbb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  4 19:00:41 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  4 19:13:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a399535b

dev-db/mysql-connector-c++: bump to v8.0.26

Package-Manager: Portage-3.0.21, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   1 +
 .../mysql-connector-c++-8.0.26-fix-build.patch | 321 +
 .../mysql-connector-c++-8.0.26.ebuild  |  43 +++
 3 files changed, 365 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 856ac8e3699..c5cd1cfc434 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -6,3 +6,4 @@ DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B 
c5d6f0ebeb4649857f321
 DIST mysql-connector-c++-8.0.23-src.tar.gz 3798295 BLAKE2B 
923eebbd7f9cde0252c84de4c70863b40c0dd93ad98a93e2ec14c935b2f3f0b0f251828a8bbbd0f23a5ec03491db06020294e19455901d15181c84fec9fb3d7f
 SHA512 
f8eb8842e199d7373f4b55644720ac63b93eb33be19294c433f57aaf556ce1b5752223154194469fa28af52adebe930f0a7b4e8f62df92cc810b545aa7bab928
 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B 
e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602
 SHA512 
5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1
 DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 
67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858
 SHA512 
44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525
+DIST mysql-connector-c++-8.0.26-src.tar.gz 3980027 BLAKE2B 
86ce0d94db588ed86ce7b21851f866da26268f7c9059b57697cbe1f5c5d031a3eada2f55042feb7b2888b538277c773215c0d19e8a1968ff70ce363e8f95bd77
 SHA512 
e3a08551a4245bf886cb7e3775a256fa379bb781b523a84d30e0d0c16cae73c808a3413b08b09998eba9c0ea3ede19e505b6392ed71712a8e9a2df31f07e4c79

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.26-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.26-fix-build.patch
new file mode 100644
index 000..2c80085b639
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.26-fix-build.patch
@@ -0,0 +1,321 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -467,7 +467,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
+--- a/cdk/cmake/DepFindProtobuf.cmake
 b/cdk/cmake/DepFindProtobuf.cmake
+@@ -48,244 +48,7 @@ if(TARGET Protobuf::pb)
+   return()
+ endif()
+ 
+-message(STATUS "Setting up Protobuf.")
+-
+-set(PB_SOURCE_DIR "${PROJECT_SOURCE_DIR}/protobuf")
+-set(PB_BINARY_DIR "${PROJECT_BINARY_DIR}/protobuf")
+-set(config_stamp "${PB_BINARY_DIR}/config.stamp")
+-set(build_stamp "${PB_BINARY_DIR}/build.stamp")
+-
+-
+-#
+-# Pick build configuration for the protobuf build. Normally we build using the
+-# same build configuration that is used for building CDK (Release/Debug/etc.).
+-# But we also support building CDK under non-standard build configuration
+-# named 'Static' (this is a dirty trick we use to simplify building our MSIs).
+-# Since protobuf does not know 'Static' build configuration, we build protobuf
+-# under 'Release' configuration in that case.
+-#
+-# We need to handle two cases. For some build systems, like Makefiles,
+-# the build configuration is specified at cmake time using CMAKE_BUILD_TYPE
+-# variable. In that case we also set it during protobuf build configuration.
+-# Another case is a multi-configuration build system like MSVC. In this case
+-# we use generator expression to pick correct  configuration when the build
+-# command is invoked below.
+-#
+-
+-set(build_type)
+-if(CMAKE_BUILD_TYPE)
+-  if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+-set(set_build_type -DCMAKE_BUILD_TYPE=Release)
+-  else()
+-set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-  endif()
+-endif()
+-
+-set(CONFIG_EXPR
+-  $<$:Release>$<$>:$>
+-)
+-
+-set(set_arch)
+-if(CMAKE_GENERATOR_PLATFORM)
+-  set(set_arch -A ${CMAKE_GENERATOR_PLATFORM})
+-endif()
+-
+-set(set_toolset)
+-if(CMAKE_GENERATOR_TOOLSET)
+-  set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET})
+-endif()
+-
+-set(set_system_name)
+-if(CMAKE_SYSTEM_NAME)
+-  set(set_system_name 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 3ef9d241a4de69e68761eeaa26f12d3414defc44
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu May 13 22:28:02 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu May 13 22:28:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef9d241

dev-db/mysql-connector-c++: bump to v8.0.25

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   1 +
 ...c++-8.0.25-fix-mysqlclient-static-binding.patch | 274 +
 .../mysql-connector-c++-8.0.25.ebuild  |  45 
 3 files changed, 320 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 5fac3703623..856ac8e3699 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -5,3 +5,4 @@ DIST mysql-connector-c++-8.0.21-src.tar.gz 3788740 BLAKE2B 
1862b4f2c6e2a2bbe8e30
 DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B 
c5d6f0ebeb4649857f3217a35f3ae885d62be63af4da09815e7eb156538ece4f805578db24bfff3dd44a0e320c025a9936d7edacba69a2786d84dd932c5abb8a
 SHA512 
1975b43fa3f3806685a695f84783164c5b17da10ac14a6013d27c837cc9c63fff01b1ed4b31f22dae60afa68d34ec56ca9c45ca3dac23635e8f0fa845aa4
 DIST mysql-connector-c++-8.0.23-src.tar.gz 3798295 BLAKE2B 
923eebbd7f9cde0252c84de4c70863b40c0dd93ad98a93e2ec14c935b2f3f0b0f251828a8bbbd0f23a5ec03491db06020294e19455901d15181c84fec9fb3d7f
 SHA512 
f8eb8842e199d7373f4b55644720ac63b93eb33be19294c433f57aaf556ce1b5752223154194469fa28af52adebe930f0a7b4e8f62df92cc810b545aa7bab928
 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B 
e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602
 SHA512 
5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1
+DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 
67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858
 SHA512 
44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch
 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch
new file mode 100644
index 000..f211f113f04
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch
@@ -0,0 +1,274 @@
+From 774d7bd983a2e12e78a0231c7936a9481bb3df1d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Silva?= 
+Date: Thu, 13 May 2021 23:14:57 +0100
+Subject: [PATCH] Bug #32882344: FIX MYSQLCLIENT_STATIC_BINDING=0 BUILD
+
+---
+ driver/nativeapi/libmysql_dynamic_proxy.cpp |  13 ++
+ driver/nativeapi/libmysql_dynamic_proxy.h   | 132 ++--
+ driver/nativeapi/mysql_client_api.h |   2 +
+ 3 files changed, 83 insertions(+), 64 deletions(-)
+
+diff --git a/driver/nativeapi/libmysql_dynamic_proxy.cpp 
b/driver/nativeapi/libmysql_dynamic_proxy.cpp
+index 4c70074e..9bd4bd99 100644
+--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp
 b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp
+@@ -512,6 +512,19 @@ LibmysqlDynamicProxy::real_connect_dns_srv(MYSQL * mysql,
+ /* }}} */
+ 
+ 
++/* {{{ LibmysqlDynamicProxy::bind_param() */
++bool
++LibmysqlDynamicProxy::bind_param(MYSQL *mysql, unsigned n_params,
++ MYSQL_BIND *binds, const char **names)
++{
++  ptr2mysql_bind_param ptr2_bind_param=
++symbol_safe_cast(GetProcAddr("mysql_bind_param"));
++
++  return (*ptr2_bind_param)(mysql, n_params, binds, names);
++}
++/* }}} */
++
++
+ /* {{{ LibmysqlDynamicProxy::real_escape_string() */
+ unsigned long
+ LibmysqlDynamicProxy::real_escape_string(MYSQL * mysql, char * to, const char 
* from, unsigned long length)
+diff --git a/driver/nativeapi/libmysql_dynamic_proxy.h 
b/driver/nativeapi/libmysql_dynamic_proxy.h
+index 93dc9700..e0f00c95 100644
+--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
 b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
+@@ -65,67 +65,67 @@ public:
+ 
+   // MySQL C-API calls wrappers
+ 
+-  my_ulonglong affected_rows(MYSQL *);
++  my_ulonglong affected_rows(MYSQL *) override;
+ 
+-  my_bool autocommit(MYSQL * , my_bool);
++  my_bool autocommit(MYSQL * , my_bool) override;
+ 
+-  void close (MYSQL *mysql);
++  void close (MYSQL *mysql) override;
+ 
+-  my_bool commit(MYSQL *mysql);
++  my_bool commit(MYSQL *mysql) override;
+ 
+-  void data_seek(MYSQL_RES *, my_ulonglong);
++  void data_seek(MYSQL_RES *, my_ulonglong) override;
+ 
+-  void debug(const char *);
++  void debug(const char *) override;
+ 
+-  unsigned int mysql_errno(MYSQL *);
++  unsigned int mysql_errno(MYSQL *) 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit: 381aa46351b1d3d78dd3af10dd0bdc6c844ff70a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 19 10:35:35 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 19 10:37:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381aa463

dev-db/mysql-connector-c: survive malformed charset files

Bug: https://bugs.gentoo.org/737002
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...ctor-c-8.0.21-survive-malformed-charset-files.patch | 18 ++
 0.21.ebuild => mysql-connector-c-8.0.21-r1.ebuild} |  1 +
 2 files changed, 19 insertions(+)

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
new file mode 100644
index 000..72799f009c8
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
@@ -0,0 +1,18 @@
+Description: don't crash on malformed charset files
+Origin: 
https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1877504/comments/19
+Bug: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1884809
+Bug: https://bugs.gentoo.org/737002
+Forwarded: workaround, not needed
+
+--- a/mysys/charset.cc
 b/mysys/charset.cc
+@@ -922,7 +922,7 @@ size_t escape_quotes_for_mysql(CHARSET_I
+ 
+ void charset_uninit() {
+   for (CHARSET_INFO *cs : all_charsets) {
+-if (cs && cs->coll->uninit) {
++if (cs && cs->coll && cs->coll->uninit) {
+   cs->coll->uninit(cs);
+ }
+   }
+ 

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
similarity index 97%
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
index c6e4dad56ed..2cd9add1964 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch
"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
"${FILESDIR}"/${PN}-8.0.21-libressl.patch
+   "${FILESDIR}"/${PN}-8.0.21-survive-malformed-charset-files.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit: dace53dd7c5acd6588fe11e7a92a04b272bd0217
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug  9 20:59:25 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug  9 20:59:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dace53dd

dev-db/mysql-connector-c: drop old

Closes: https://github.com/gentoo/gentoo/pull/17061
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   3 -
 .../files/20028_all_mysql-5.6-gcc7.patch   |  13 -
 .../files/6.1.11-openssl-1.1.patch | 300 ---
 ...include-path-for-udf_registration_types-h.patch |  24 --
 .../files/mysql-connector-c-8.0.19-libressl.patch  | 297 --
 .../files/mysql-connector-c-8.0.20-libressl.patch  | 332 -
 dev-db/mysql-connector-c/files/mysql_com.patch |  31 --
 .../mysql-connector-c-6.1.11-r2.ebuild |  83 --
 .../mysql-connector-c-8.0.19.ebuild| 111 ---
 .../mysql-connector-c-8.0.20.ebuild| 111 ---
 10 files changed, 1305 deletions(-)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 73055a9d392..d9d45dcf80e 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,4 +1 @@
-DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 
61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4
 SHA512 
5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
-DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B 
2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f
 SHA512 
7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
 DIST mysql-boost-8.0.21.tar.gz 278292192 BLAKE2B 
9e5a14d1401f58f6f620c8691d2d4d3ada122a79a4e081380050961f0add93bf32b682c60ea2a6e58f50a4fcedbd323d8efe2d5f3e1f2bba5010e201a2df5d44
 SHA512 
18128edd7d9604ea69bd308f372d6663ef3629503969148e3a2117175c4ef625358b31b96e0e1b8d10a87037719e3cb61d5c71eee1e26ab0e0a1731977a2d7c1
-DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6

diff --git a/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch 
b/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch
deleted file mode 100644
index cf8caedb7f1..000
--- a/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sql-common/client_authentication.cc 
b/sql-common/client_authentication.cc
-index eaeb2d4..035ecd2 100644
 a/sql-common/client_authentication.cc
-+++ b/sql-common/client_authentication.cc
-@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
- 
-   if (mysql->options.extension != NULL &&
-   mysql->options.extension->server_public_key_path != NULL &&
--  mysql->options.extension->server_public_key_path != '\0')
-+  mysql->options.extension->server_public_key_path[0] != '\0')
-   {
- pub_key_file= fopen(mysql->options.extension->server_public_key_path,
- "r");

diff --git a/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch 
b/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch
deleted file mode 100644
index 3459206e4f7..000
--- a/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-From 7961393dd45e4ad1cdc7544b4bba2e98a5d2760c Mon Sep 17 00:00:00 2001
-From: eroen 
-Date: Fri, 20 Jan 2017 14:43:53 +0100
-Subject: [PATCH] Don't use deprecated API with openssl 1.1
-
-If openssl 1.1.0 is built with `--api=1.1 disable-deprecated`, using
-deprecated APIs causes build errors.
-
-X-Gentoo-Bug: 606600
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=606600

- mysys_ssl/my_aes_openssl.cc | 54 -
- sql-common/client.c | 16 --
- vio/viossl.c|  8 +++
- vio/viosslfactories.c   | 23 +++
- 4 files changed, 84 insertions(+), 17 deletions(-)
-
-diff --git a/mysys_ssl/my_aes_openssl.cc b/mysys_ssl/my_aes_openssl.cc
-index 261ba8a..59a95e3 100644
 a/mysys_ssl/my_aes_openssl.cc
-+++ b/mysys_ssl/my_aes_openssl.cc
-@@ -22,6 +22,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
02110-1301  USA */
- #include 
- #include 
- #include 
-+#include 
-+
-+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x2000L)
-+#undef OPENSSL_VERSION_NUMBER

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 2a0e2f90800f187b1d183c4a209e2669df171b87
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr 30 20:42:37 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr 30 20:44:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0e2f90

dev-db/mysql-connector-c++: bump to v8.0.20

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|  1 +
 ...connector-c++-8.0.20-fix-libressl-support.patch | 88 ++
 .../mysql-connector-c++-8.0.20.ebuild  | 44 +++
 3 files changed, 133 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 33a459b80f0..24ff072f74d 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,2 +1,3 @@
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9
 SHA512 
d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 
82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0
 SHA512 
5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1ede75da15d7bb0bd
+DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B 
a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251
 SHA512 
3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b

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
new file mode 100644
index 000..f2ae0d02ed7
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch
@@ -0,0 +1,88 @@
+--- 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
 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: b749efef7eb5228dd83c13c34c93ee12526a485b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jan 20 19:18:22 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jan 20 19:26:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749efef

dev-db/mysql-connector-c++: drop old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   4 -
 ...ysql-connector-c++-1.1.11-fix-cpp-linking.patch |  15 -
 .../mysql-connector-c++-1.1.8-fix-mariadb.patch|  45 ---
 .../mysql-connector-c++-8.0.15-fix-build.patch | 307 -
 .../mysql-connector-c++-8.0.18-fix-build.patch | 275 --
 .../mysql-connector-c++-1.1.11-r1.ebuild   |  63 -
 .../mysql-connector-c++-1.1.9-r1.ebuild|  62 -
 .../mysql-connector-c++-8.0.15.ebuild  |  41 ---
 .../mysql-connector-c++-8.0.18.ebuild  |  43 ---
 9 files changed, 855 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 99ad91c7d61..33a459b80f0 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,6 +1,2 @@
-DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 
16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa
 SHA512 
d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9
 SHA512 
d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
-DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B 
e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1
 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
-DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 
45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931
 SHA512 
9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
-DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B 
f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122
 SHA512 
f5b202677392bcf5c5bdd4c342e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d
 DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 
82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0
 SHA512 
5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1ede75da15d7bb0bd

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
deleted file mode 100644
index 4b8a4a98309..000
--- 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.mysql.com/bug.php?id=90727
-
 a/FindMySQL.cmake
-+++ b/FindMySQL.cmake
-@@ -700,8 +700,10 @@ endif()
- 
- # For dynamic linking use the built-in sys and strings
- if(NOT MYSQLCLIENT_STATIC_LINKING)
-+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-list(APPEND SYS_LIBRARIES "mysql_sys")
-list(APPEND SYS_LIBRARIES "mysql_strings")
-+endif()
-list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
-SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})
- 

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
deleted file mode 100644
index 35ed218e18d..000
--- 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
 a/driver/mysql_connection.cpp  2016-12-14 04:58:54.0 -0500
-+++ b/driver/mysql_connection.cpp  2017-01-26 16:33:58.086005627 -0500
-@@ -1023,6 +1023,7 @@
- proxy->get_character_set_info();
- *(static_cast(optionValue)) = cs.mbmaxlen;
-   /* mysql_get_option() was added in mysql 5.7.3 version */
-+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
-   } else if ( proxy->get_server_version() >= 50703 ) {
- try {
-   if (GET_CONN_OPTION(optionName, optionValue, 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit: 518c23ba49e0623d758c8420234b937bcde4276d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jan 20 18:10:47 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jan 20 19:26:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518c23ba

dev-db/mysql-connector-c: bump to v8.0.19

Closes: https://bugs.gentoo.org/697934
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   1 +
 ...onnector-c-8.0.19-do-not-install-comp_err.patch |  12 +
 .../files/mysql-connector-c-8.0.19-libressl.patch  | 297 +
 .../mysql-connector-c-8.0.19.ebuild| 111 
 4 files changed, 421 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index c716740b2d3..545daa75efd 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,3 +1,4 @@
 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B 
f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a
 SHA512 
a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
 DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B 
e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc
 SHA512 
180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5
+DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 
61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4
 SHA512 
5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6

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 000..94329eeeb3c
--- /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.19-libressl.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-libressl.patch
new file mode 100644
index 000..1fc949ae856
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-libressl.patch
@@ -0,0 +1,297 @@
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -229,13 +229,14 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+ )
+ ENDIF()
+-
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" 
VERSION_GREATER "1.1.0")
++CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
++IF(HAVE_TLS1_3_VERSION)
+ADD_DEFINITIONS(-DHAVE_TLSv13)
+ ENDIF()
+ IF(OPENSSL_INCLUDE_DIR AND
+OPENSSL_LIBRARY   AND
+CRYPTO_LIBRARY  AND
+-   OPENSSL_MAJOR_VERSION STREQUAL "1"
++   OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+   )
+   SET(OPENSSL_FOUND TRUE)
+   FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
+--- a/mysys/my_md5.cc
 b/mysys/my_md5.cc
+@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned 
const char *buf,
+ int compute_md5_hash(char *digest, const char *buf, int len) {
+   int retval = 0;
+   int fips_mode = 0;
++#ifndef LIBRESSL_VERSION_NUMBER
+   fips_mode = FIPS_mode();
++#endif
+   /* If fips mode is ON/STRICT restricted method calls will result into abort,
+* skipping call. */
+   if (fips_mode == 0) {
+--- 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+@@ -329,6 +329,7 @@ error:
+   return 1;
+ }
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define OPENSSL_ERROR_LENGTH 512
+ static int configure_ssl_fips_mode(const uint fips_mode) {
+   int rc = -1;
+@@ -352,6 +353,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
+ EXIT:
+   return rc;
+ }
++#endif
+ 
+ static int 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: bb8412d8423ff2a9e3626f5a15d6fb01e6979ec1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jan 20 19:15:36 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jan 20 19:26:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb8412d8

dev-db/mysql-connector-c++: bump to v8.0.19

Closes: https://bugs.gentoo.org/699464
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   1 +
 .../mysql-connector-c++-8.0.19-fix-build.patch | 307 +
 ...connector-c++-8.0.19-fix-libressl-support.patch |  89 ++
 .../mysql-connector-c++-8.0.19.ebuild  |  44 +++
 4 files changed, 441 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 8e7d1efe818..99ad91c7d61 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -3,3 +3,4 @@ DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B 
e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1
 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 
45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931
 SHA512 
9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
 DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B 
f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122
 SHA512 
f5b202677392bcf5c5bdd4c342e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d
+DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 
82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0
 SHA512 
5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1ede75da15d7bb0bd

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch
new file mode 100644
index 000..b8976199afc
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch
@@ -0,0 +1,307 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -475,7 +475,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
+--- a/cdk/cmake/DepFindProtobuf.cmake
 b/cdk/cmake/DepFindProtobuf.cmake
+@@ -48,229 +48,7 @@ if(TARGET Protobuf::pb)
+   return()
+ endif()
+ 
+-message(STATUS "Setting up Protobuf.")
+-
+-set(PB_SOURCE_DIR "${PROJECT_SOURCE_DIR}/protobuf")
+-set(PB_BINARY_DIR "${PROJECT_BINARY_DIR}/protobuf")
+-set(config_stamp "${PB_BINARY_DIR}/config.stamp")
+-set(build_stamp "${PB_BINARY_DIR}/build.stamp")
+-
+-
+-#
+-# Pick build configuration for the protobuf build. Normally we build using the
+-# same build configuration that is used for building CDK (Release/Debug/etc.).
+-# But we also support building CDK under non-standard build configuration
+-# named 'Static' (this is a dirty trick we use to simplify building our MSIs).
+-# Since protobuf does not know 'Static' build configuration, we build protobuf
+-# under 'Release' configuration in that case.
+-#
+-# We need to handle two cases. For some build systems, like Makefiles,
+-# the build configuration is specified at cmake time using CMAKE_BUILD_TYPE
+-# variable. In that case we also set it during protobuf build configuration.
+-# Another case is a multi-configuration build system like MSVC. In this case
+-# we use generator expression to pick correct  configuration when the build
+-# command is invoked below.
+-#
+-
+-set(build_type)
+-if(CMAKE_BUILD_TYPE)
+-  if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+-set(set_build_type -DCMAKE_BUILD_TYPE=Release)
+-  else()
+-set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-  endif()
+-endif()
+-
+-set(CONFIG_EXPR
+-  $<$:Release>$<$>:$>
+-)
+-
+-set(set_arch)
+-if(CMAKE_GENERATOR_PLATFORM)
+-  set(set_arch -A ${CMAKE_GENERATOR_PLATFORM})
+-endif()
+-
+-set(set_toolset)
+-if(CMAKE_GENERATOR_TOOLSET)
+-  set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET})
+-endif()
+-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 3bfb9c971b7db83befed045aed044fbead20cde0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov  6 14:19:42 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov  6 14:26:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfb9c97

dev-db/mysql-connector-c++: drop old

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   3 -
 .../mysql-connector-c++-8.0.13-fix-build.patch | 329 -
 .../mysql-connector-c++-8.0.11.ebuild  |  38 ---
 .../mysql-connector-c++-8.0.13.ebuild  |  40 ---
 .../mysql-connector-c++-8.0.17.ebuild  |  41 ---
 5 files changed, 451 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 0d436369fb6..8e7d1efe818 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,8 +1,5 @@
 DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 
16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa
 SHA512 
d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9
 SHA512 
d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B 
e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1
 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
-DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B 
a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f
 SHA512 
5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
-DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 
5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24
 SHA512 
0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 
45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931
 SHA512 
9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
-DIST mysql-connector-c++-8.0.17-src.tar.gz 344 BLAKE2B 
d828ea0a37344719ff57017c7602597e8d419456d17313bddeaa1b69c239405ba584be2961ce833f2961b6b87ff7b29560be30d3a7412955c5b7db2399802ae9
 SHA512 
63b3e6e4c8bae3fd9bf23342f3684cc290b98d9fcf8af1e4eb5936ad37afce1169ea0cac211be1eff6827a0517cf56f4d215fbe2165a47591d940c77e1ecfa87
 DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B 
f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122
 SHA512 
f5b202677392bcf5c5bdd4c342e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch
deleted file mode 100644
index 9bc45d274d7..000
--- 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ba914a..e1127f1 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -669,7 +669,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
-@@ -740,6 +740,12 @@ TARGET_LINK_LIBRARIES(try connector)
- SET_INTERFACE_OPTIONS(try devapi)
- #  ADD_GCOV(try)
- 
-+IF(WITH_SSL STREQUAL "system")
-+  find_package(OpenSSL REQUIRED)
-+  TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES})
-+ENDIF()
-+
-+
- if(WITH_JDBC)
- 
-   add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
-diff --git a/buildinfo.cmake b/buildinfo.cmake
-index cc57a2c..129afeb 100644
 a/buildinfo.cmake
-+++ b/buildinfo.cmake
-@@ -112,4 +112,4 @@ if(WITH_JDBC)
- endif()
- 
- 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 42b7c22b0e9c098503c47f62831a4afb885919e0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov  6 14:18:28 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov  6 14:26:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b7c22b

dev-db/mysql-connector-c++: bump to v8.0.18

Closes: https://bugs.gentoo.org/699408
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   1 +
 .../mysql-connector-c++-8.0.18-fix-build.patch | 275 +
 .../mysql-connector-c++-8.0.18.ebuild  |  43 
 3 files changed, 319 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 53c1ce4d540..0d436369fb6 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -5,3 +5,4 @@ DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B 
a1ea47c0440beae189214
 DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 
5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24
 SHA512 
0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 
45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931
 SHA512 
9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
 DIST mysql-connector-c++-8.0.17-src.tar.gz 344 BLAKE2B 
d828ea0a37344719ff57017c7602597e8d419456d17313bddeaa1b69c239405ba584be2961ce833f2961b6b87ff7b29560be30d3a7412955c5b7db2399802ae9
 SHA512 
63b3e6e4c8bae3fd9bf23342f3684cc290b98d9fcf8af1e4eb5936ad37afce1169ea0cac211be1eff6827a0517cf56f4d215fbe2165a47591d940c77e1ecfa87
+DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B 
f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122
 SHA512 
f5b202677392bcf5c5bdd4c342e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch
new file mode 100644
index 000..484220442ab
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch
@@ -0,0 +1,275 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -463,7 +463,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
+--- a/cdk/cmake/DepFindProtobuf.cmake
 b/cdk/cmake/DepFindProtobuf.cmake
+@@ -48,197 +48,7 @@ if(TARGET Protobuf::pb)
+   return()
+ endif()
+ 
+-message(STATUS "Setting up Protobuf.")
+-
+-set(PB_SOURCE_DIR "${PROJECT_SOURCE_DIR}/protobuf")
+-set(PB_BINARY_DIR "${PROJECT_BINARY_DIR}/protobuf")
+-set(config_stamp "${PB_BINARY_DIR}/config.stamp")
+-set(build_stamp "${PB_BINARY_DIR}/build.stamp")
+-
+-
+-#
+-# Pick build configuration for the protobuf build. Normally we build using the
+-# same build configuration that is used for building CDK (Release/Debug/etc.).
+-# But we also support building CDK under non-standard build configuration
+-# named 'Static' (this is a dirty trick we use to simplify building our MSIs).
+-# Since protobuf does not know 'Static' build configuration, we build protobuf
+-# under 'Release' configuration in that case.
+-#
+-# We need to handle two cases. For some build systems, like Makefiles,
+-# the build configuration is specified at cmake time using CMAKE_BUILD_TYPE
+-# variable. In that case we also set it during protobuf build configuration.
+-# Another case is a multi-configuration build system like MSVC. In this case
+-# we use generator expression to pick correct  configuration when the build
+-# command is invoked below.
+-#
+-
+-set(build_type)
+-if(CMAKE_BUILD_TYPE)
+-  if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+-set(set_build_type -DCMAKE_BUILD_TYPE=Release)
+-  else()
+-set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-  endif()
+-endif()
+-
+-set(CONFIG_EXPR
+-  $<$:Release>$<$>:$>
+-)
+-
+-
+-if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
+-
+-  message(" Configuring Protobuf build using cmake generator: 
${CMAKE_GENERATOR}")
+-
+-  file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt")
+-  file(MAKE_DIRECTORY "${PB_BINARY_DIR}")
+-
+-  # Dirty trick to speed up cmake set 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit: 7b872573074ef024d52cfa359f75fb46253748a5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 16 21:22:31 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 16 21:40:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b872573

dev-db/mysql-connector-c: bump to v8.0.18

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   1 +
 ...-8.0.18-always-build-decompress-utilities.patch |  34 +++
 .../mysql-connector-c-8.0.18.ebuild| 110 +
 3 files changed, 145 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 8ca24c1f198..c716740b2d3 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B 
f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a
 SHA512 
a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
+DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B 
e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc
 SHA512 
180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch
new file mode 100644
index 000..af0b31e89a3
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch
@@ -0,0 +1,34 @@
+--- a/utilities/CMakeLists.txt
 b/utilities/CMakeLists.txt
+@@ -110,21 +110,16 @@ 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()
+-
+-IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
+-  MYSQL_ADD_EXECUTABLE(zlib_decompress
+-zlib_decompress.cc
+-COMPONENT Server
+-LINK_LIBRARIES ${ZLIB_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
++  LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
++  )
+ 
+ # All targets below belong to COMPONENT Server and depend on InnoDB.
+ IF(WITHOUT_SERVER)

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild
new file mode 100644
index 000..6f10fa81b8b
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/;
+LICENSE="GPL-2"
+
+SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz;
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+
+SLOT="0/21"
+IUSE="ldap libressl static-libs"
+
+RDEPEND="
+   >=app-arch/lz4-0_p131:=
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   "
+DEPEND="${RDEPEND}"
+
+# Avoid file collisions, #692580
+RDEPEND+=" ! 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-utils_src_prepare
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_LAYOUT=RPM
+   -DINSTALL_LIBDIR=$(get_libdir)
+   -DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+   -DWITH_DEFAULT_FEATURE_SET=OFF
+   -DENABLED_LOCAL_INFILE=ON
+   

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit: 93dc56e0b40fe411ad82b3990f85bd5adf562dad
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Aug 22 19:38:53 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 22 19:45:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93dc56e0

dev-db/mysql-connector-c: rev bump

- Always install {lz4,zlib}_decompress

- Avoid file collisions

Closes: https://bugs.gentoo.org/692580
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...-8.0.17-always-build-decompress-utilities.patch | 22 ++
 ...1.ebuild => mysql-connector-c-8.0.17-r2.ebuild} | 15 +--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
new file mode 100644
index 000..927662705aa
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
@@ -0,0 +1,22 @@
+--- a/utilities/CMakeLists.txt
 b/utilities/CMakeLists.txt
+@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc)
+ ADD_DEPENDENCIES(perror GenError)
+ TARGET_LINK_LIBRARIES(perror mysys)
+ 
+-IF (BUILD_BUNDLED_LZ4)
+-  MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
+-  TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+ 
+-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
+-  MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
+-  TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+ 
+ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ 

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
similarity index 85%
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
index c99bb77dd8a..3eb18955b0b 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
@@ -19,6 +19,7 @@ SLOT="0/21"
 IUSE="ldap libressl static-libs"
 
 RDEPEND="
+   >=app-arch/lz4-0_p131:=
sys-libs/zlib:=[${MULTILIB_USEDEP}]
ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
@@ -26,11 +27,22 @@ RDEPEND="
"
 DEPEND="${RDEPEND}"
 
+# Avoid file collisions, #692580
+RDEPEND+=" !

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit: c6112871c2e83ad7d1bd64b277386eb2c5efa089
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug  2 14:22:45 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug  2 14:38:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6112871

dev-db/mysql-connector-c: bump to v8.0.17

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   1 +
 .../files/mysql-connector-c-8.0.17-libressl.patch  | 258 +
 .../mysql-connector-c-8.0.17.ebuild|  92 
 3 files changed, 351 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 91a4121bd4d..da74276fc3e 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mysql-boost-8.0.16.tar.gz 145939027 BLAKE2B 
f8e94c6aa686a3f3a2fd231676070760081c6bbf0d652ce09e9bfb6f9dc86fc96dba5739ac8721bfd55c947e44c7de4c37ff5f8bb56db5e08484cf586e143add
 SHA512 
4de08d74637d1fef4f570148e66c8ddf2b59d1c0a49d715ca632da7f572645b65ec5f7c115aaf0bd179b0a9f1ba2bc40357c371f170a674118159d99b2c49516
+DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B 
f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a
 SHA512 
a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch
new file mode 100644
index 000..340f894a895
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch
@@ -0,0 +1,258 @@
+From: Stefan Strogin 
+Date: Sat, 8 Jun 2019 15:52:26 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always
+  0x2000L.
+- FIPS support is removed from LibreSSL, do not use it.
+- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version.
+  Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled.
+
+
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -304,13 +304,14 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+ )
+ ENDIF()
+-
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" 
VERSION_GREATER "1.1.0")
++CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
++IF(HAVE_TLS1_3_VERSION)
+ADD_DEFINITIONS(-DHAVE_TLSv13)
+ ENDIF()
+ IF(OPENSSL_INCLUDE_DIR AND
+OPENSSL_LIBRARY   AND
+CRYPTO_LIBRARY  AND
+-   OPENSSL_MAJOR_VERSION STREQUAL "1"
++   OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+   )
+   SET(OPENSSL_FOUND TRUE)
+   FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
+--- a/extra/libevent/openssl-compat.h
 b/extra/libevent/openssl-compat.h
+@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
+ #define BIO_set_init(b, val) (b)->init = (val)
+ #define BIO_set_data(b, val) (b)->ptr = (val)
+ #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
+-#define BIO_get_init(b) (b)->init
+ #define BIO_get_data(b) (b)->ptr
+ #define BIO_get_shutdown(b) (b)->shutdown
+ 
+@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
+ 
+ #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#define BIO_get_init(b) (b)->init
++#endif
++
+ #endif /* OPENSSL_COMPAT_H */
+--- a/mysys/my_md5.cc
 b/mysys/my_md5.cc
+@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigned 
const char *buf,
+ int compute_md5_hash(char *digest, const char *buf, int len) {
+   int retval = 0;
+   int fips_mode = 0;
+-#if !defined(HAVE_WOLFSSL)
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+   fips_mode = FIPS_mode();
+ #endif /* HAVE_WOLFSSL */
+   /* If fips mode is ON/STRICT restricted method calls will result into abort,
+--- 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+@@ -297,7 +297,7 @@ error:
+   return 1;
+ }
+ 
+-#ifndef HAVE_WOLFSSL
++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+ #define OPENSSL_ERROR_LENGTH 512
+ static int configure_ssl_fips_mode(const uint fips_mode) {
+   int rc = -1;
+@@ -521,7 +521,7 @@ int 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Brian Evans]

commit: 0b50c01c2f9491ad6e63e8b93324ab90090005ab
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jun 11 19:00:32 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jun 11 19:00:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b50c01c

dev-db/mysql-connector-c: Version bump to 8.0.16

Closes: https://bugs.gentoo.org/687588
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   1 +
 .../mysql-connector-c/files/8.0.16-libressl.patch  | 279 +
 .../mysql-connector-c-8.0.16.ebuild|  92 +++
 3 files changed, 372 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index f276bb6a0be..91a4121bd4d 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1 +1,2 @@
+DIST mysql-boost-8.0.16.tar.gz 145939027 BLAKE2B 
f8e94c6aa686a3f3a2fd231676070760081c6bbf0d652ce09e9bfb6f9dc86fc96dba5739ac8721bfd55c947e44c7de4c37ff5f8bb56db5e08484cf586e143add
 SHA512 
4de08d74637d1fef4f570148e66c8ddf2b59d1c0a49d715ca632da7f572645b65ec5f7c115aaf0bd179b0a9f1ba2bc40357c371f170a674118159d99b2c49516
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6

diff --git a/dev-db/mysql-connector-c/files/8.0.16-libressl.patch 
b/dev-db/mysql-connector-c/files/8.0.16-libressl.patch
new file mode 100644
index 000..af21a1e6f2f
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/8.0.16-libressl.patch
@@ -0,0 +1,279 @@
+From ddaeb4c8ae76473263ebe1f711814eb977b0abbe Mon Sep 17 00:00:00 2001
+From: Stefan Strogin 
+Date: Sat, 8 Jun 2019 15:52:26 +0300
+Subject: [PATCH] Fix build with LibreSSL
+
+- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always
+  0x2000L.
+- FIPS support is removed from LibreSSL, do not use it.
+- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version.
+  Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled.
+---
+ cmake/ssl.cmake   | 5 +++--
+ extra/libevent/openssl-compat.h   | 5 -
+ mysys_ssl/my_md5.cc   | 2 +-
+ .../src/bindings/xcom/xcom/xcom_ssl_transport.c   | 4 ++--
+ plugin/x/client/xconnection_impl.cc   | 4 ++--
+ router/src/http/src/tls_client_context.cc | 2 +-
+ router/src/http/src/tls_context.cc| 6 +-
+ router/src/http/src/tls_server_context.cc | 3 ++-
+ sql-common/client.cc  | 3 ++-
+ sql/mysqld.cc | 4 ++--
+ sql/sys_vars.cc   | 8 
+ vio/viosslfactories.cc| 2 +-
+ 12 files changed, 29 insertions(+), 19 deletions(-)
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index be3411a8916..95ed535f08a 100644
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -313,13 +313,14 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+ )
+ ENDIF()
+-
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" 
VERSION_GREATER "1.1.0")
++CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
++IF(HAVE_TLS1_3_VERSION)
+ADD_DEFINITIONS(-DHAVE_TLSv13)
+ ENDIF()
+ IF(OPENSSL_INCLUDE_DIR AND
+OPENSSL_LIBRARY   AND
+CRYPTO_LIBRARY  AND
+-   OPENSSL_MAJOR_VERSION STREQUAL "1"
++   OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+   )
+   SET(OPENSSL_FOUND TRUE)
+   FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
+diff --git a/extra/libevent/openssl-compat.h b/extra/libevent/openssl-compat.h
+index 69afc716e25..deb21d6ad77 100644
+--- a/extra/libevent/openssl-compat.h
 b/extra/libevent/openssl-compat.h
+@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
+ #define BIO_set_init(b, val) (b)->init = (val)
+ #define BIO_set_data(b, val) (b)->ptr = (val)
+ #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
+-#define BIO_get_init(b) (b)->init
+ #define BIO_get_data(b) (b)->ptr
+ #define BIO_get_shutdown(b) (b)->shutdown
+ 
+@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char 
*name)
+ 
+ #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
++#define BIO_get_init(b) (b)->init
++#endif
++
+ #endif /* OPENSSL_COMPAT_H */
+diff --git a/mysys_ssl/my_md5.cc b/mysys_ssl/my_md5.cc
+index 095fcb4eafb..0bdc885a96d 100644
+--- a/mysys_ssl/my_md5.cc
 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 839e1efe35b0e6f15174461ccda96541def716de
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Feb 16 22:48:24 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Feb 16 22:48:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839e1efe

dev-db/mysql-connector-c++: bump to v8.0.15

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   1 +
 .../mysql-connector-c++-8.0.15-fix-build.patch | 307 +
 .../mysql-connector-c++-8.0.15.ebuild  |  40 +++
 3 files changed, 348 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 0dea64790f6..07fc03d7d4a 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -3,3 +3,4 @@ DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B 
e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1
 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B 
a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f
 SHA512 
5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
 DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 
5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24
 SHA512 
0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
+DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 
45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931
 SHA512 
9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch
new file mode 100644
index 000..4e399691410
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch
@@ -0,0 +1,307 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -666,7 +666,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
+@@ -737,6 +737,12 @@ TARGET_LINK_LIBRARIES(try connector)
+ SET_INTERFACE_OPTIONS(try devapi)
+ #  ADD_GCOV(try)
+ 
++IF(WITH_SSL STREQUAL "system")
++  find_package(OpenSSL REQUIRED)
++  TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES})
++ENDIF()
++
++
+ if(WITH_JDBC)
+ 
+   add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
+--- a/cdk/cmake/install_macros.cmake
 b/cdk/cmake/install_macros.cmake
+@@ -327,7 +327,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
+ DESTINATION ${ARG_DESTINATION}
+ ${RENAME_PARAM}
+ ${PERMISSIONS_${target_type}}
+-CONFIGURATIONS Release RelWithDebInfo
++CONFIGURATIONS Release RelWithDebInfo Gentoo
+ COMPONENT ${ARG_COMPONENT}
+ OPTIONAL)
+ 
+@@ -346,7 +346,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
+ INSTALL(FILES ${debug_pdb_target_location}
+   DESTINATION ${ARG_PDB_DESTINATION}
+   ${PDB_RENAME_PARAM}
+-  CONFIGURATIONS Release RelWithDebInfo
++  CONFIGURATIONS Release RelWithDebInfo Gentoo
+   COMPONENT ${ARG_COMPONENT}
+   OPTIONAL)
+   ENDIF()
+--- a/cdk/cmake/libutils.cmake
 b/cdk/cmake/libutils.cmake
+@@ -282,14 +282,7 @@ function(add_library_ex TARGET)
+   endforeach()
+ 
+   if(libs)
+-
+-if(${type} STREQUAL "STATIC")
+-merge_static_libraries(${TARGET} ${libs})
+-add_dependencies(${TARGET} ${libs})
+-else()
+   target_link_libraries(${TARGET} PRIVATE ${libs})
+-endif()
+-
+   endif()
+ 
+   #
+--- a/cdk/cmake/protobuf.cmake
 b/cdk/cmake/protobuf.cmake
+@@ -26,201 +26,8 @@
+ # along with this program; if not, write to the Free Software Foundation, 
Inc.,
+ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+-#
+-# Usage:
+-#
+-#  INCLUDE(protobuf)
+-#  [USE_FULL_PROTOBUF()]
+-#
+-#  MYSQLX_PROTOBUF_GENERATE_CPP(SRCS HDRS )
+-#  ADD_LIBRARY(target ... ${SRCS})
+-#
+-
+-if(DEFINED WITH_PROTOBUF)
+-
+-  #
+-  # If WITH_PROTOBUF is defined, it should 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Thomas Deutschmann]

commit: 98a62031a548747cb66a8f6a5b24dc065aa8d8ac
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jan  6 19:49:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jan  6 19:50:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a62031

dev-db/mysql-connector-c++: bump to v1.1.11 & v8.0.13

Bug: https://bugs.gentoo.org/674450
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   2 +
 ...ysql-connector-c++-1.1.11-fix-cpp-linking.patch |  15 +
 .../mysql-connector-c++-1.1.11-fix-mariadb.patch   |  43 +++
 .../mysql-connector-c++-8.0.13-fix-build.patch | 329 +
 .../mysql-connector-c++-1.1.11.ebuild  |  63 
 .../mysql-connector-c++-8.0.13.ebuild  |  40 +++
 6 files changed, 492 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index bcd51d9d1cf..9735622de44 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,2 +1,4 @@
+DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 
16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa
 SHA512 
d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B 
e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1
 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B 
a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f
 SHA512 
5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
+DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 
5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24
 SHA512 
0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
new file mode 100644
index 000..4b8a4a98309
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
@@ -0,0 +1,15 @@
+https://bugs.mysql.com/bug.php?id=90727
+
+--- a/FindMySQL.cmake
 b/FindMySQL.cmake
+@@ -700,8 +700,10 @@ endif()
+ 
+ # For dynamic linking use the built-in sys and strings
+ if(NOT MYSQLCLIENT_STATIC_LINKING)
++IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+list(APPEND SYS_LIBRARIES "mysql_sys")
+list(APPEND SYS_LIBRARIES "mysql_strings")
++endif()
+list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
+SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})
+ 

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch
new file mode 100644
index 000..2868a3c024a
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch
@@ -0,0 +1,43 @@
+--- a/driver/mysql_connection.cpp
 b/driver/mysql_connection.cpp
+@@ -1067,6 +1067,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & 
optionName, void * opti
+ proxy->get_character_set_info();
+ *(static_cast(optionValue)) = cs.mbmaxlen;
+   /* mysql_get_option() was added in mysql 5.7.3 version */
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   } else if ( proxy->get_server_version() >= 50703 ) {
+ try {
+   if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
+@@ -1080,6 +1081,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & 
optionName, void * opti
+   CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), 
proxy->sqlstate().c_str(), proxy->error().c_str());
+   throw e;
+ }
++#endif
+   }
+ }
+ /* }}} */
+@@ -1097,11 +1099,13 @@ MySQL_Connection::getClientOption(const sql::SQLString 
& optionName)
+ MY_CHARSET_INFO cs;
+ proxy->get_character_set_info();
+ return cs.dir ? sql::SQLString(cs.dir) : "";
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   } else if ( proxy->get_server_version() >= 50703 ) {
+ const char* optionValue= NULL;
+ if (GET_CONN_OPTION(optionName, , stringOptions)) {
+   return optionValue ? sql::SQLString(optionValue) : "";
+ }
++#endif
+   }
+   return "";
+ }
+--- 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Brian Evans]

commit: 26d9703aa552e96183fefa68e632709febfb
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Apr 20 19:50:07 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Apr 20 19:53:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d97038

dev-db/mysql-connector-c++: Version bump to 8.0.11

The DevX API needs MySQL or Percona Server 5.7+.

legacy USE is required for older programming and connecting to
MariaDB and previous versions of MySQL and Percona

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-db/mysql-connector-c++/Manifest|   1 +
 .../files/8.0.11-fix-build.patch   | 276 +
 dev-db/mysql-connector-c++/metadata.xml|   1 +
 .../mysql-connector-c++-8.0.11.ebuild  |  38 +++
 4 files changed, 316 insertions(+)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index fd28dfaf73d..ebac6c62892 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -2,3 +2,4 @@ DIST mysql-connector-c++-1.1.3.tar.gz 496226 BLAKE2B 
51537d8728d4afdd98474107a02
 DIST mysql-connector-c++-1.1.6.tar.gz 522236 BLAKE2B 
5f728b418fa7d395a83679fbda5c8757e1d06078e27865c7e02accb1a32c5c8cd77d481b0bc4d4354cea518bd2db2e06076db88ee285365583e27a5f0c23
 SHA512 
e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7
 DIST mysql-connector-c++-1.1.8.tar.gz 528954 BLAKE2B 
fc2a606364426834335142375b99546e2ff1251e97add8ee4ecc370feccd7b9dd09f0abc3e1e9084b824141bde2a44d55ff9baddc093f8ec17b2b91060057148
 SHA512 
c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B 
e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1
 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
+DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B 
a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f
 SHA512 
5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148

diff --git a/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch 
b/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch
new file mode 100644
index 000..7449b910a9b
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch
@@ -0,0 +1,276 @@
+diff -aurN a/buildinfo.cmake b/buildinfo.cmake
+--- a/buildinfo.cmake  2018-04-08 15:10:57.0 -0400
 b/buildinfo.cmake  2018-04-20 13:37:20.993266176 -0400
+@@ -112,4 +112,4 @@
+ endif()
+ 
+ 
+-install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
++#install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
+diff -aurN a/cdk/cmake/install_macros.cmake b/cdk/cmake/install_macros.cmake
+--- a/cdk/cmake/install_macros.cmake   2018-04-08 15:10:57.0 -0400
 b/cdk/cmake/install_macros.cmake   2018-04-20 14:12:17.255877167 -0400
+@@ -327,7 +327,7 @@
+ DESTINATION ${ARG_DESTINATION}
+ ${RENAME_PARAM}
+ ${PERMISSIONS_${target_type}}
+-CONFIGURATIONS Release RelWithDebInfo
++CONFIGURATIONS Release RelWithDebInfo Gentoo
+ COMPONENT ${ARG_COMPONENT}
+ OPTIONAL)
+ 
+@@ -346,7 +346,7 @@
+ INSTALL(FILES ${debug_pdb_target_location}
+   DESTINATION ${ARG_PDB_DESTINATION}
+   ${PDB_RENAME_PARAM}
+-  CONFIGURATIONS Release RelWithDebInfo
++  CONFIGURATIONS Release RelWithDebInfo Gentoo
+   COMPONENT ${ARG_COMPONENT}
+   OPTIONAL)
+   ENDIF()
+diff -aurN a/cdk/cmake/libutils.cmake b/cdk/cmake/libutils.cmake
+--- a/cdk/cmake/libutils.cmake 2018-04-08 15:10:57.0 -0400
 b/cdk/cmake/libutils.cmake 2018-04-20 14:27:49.021432318 -0400
+@@ -275,14 +275,7 @@
+   endforeach()
+
+   if(libs)
+-
+-if(${type} STREQUAL "STATIC")
+-merge_static_libraries(${TARGET} ${libs})
+-add_dependencies(${TARGET} ${libs})
+-else()
+   target_link_libraries(${TARGET} PRIVATE ${libs})
+-endif()
+-
+   endif()
+
+   #
+diff -aurN a/cdk/cmake/protobuf.cmake b/cdk/cmake/protobuf.cmake
+--- a/cdk/cmake/protobuf.cmake 2018-04-08 15:10:57.0 -0400
 b/cdk/cmake/protobuf.cmake 2018-04-20 13:43:04.950466261 -0400
+@@ -36,142 +36,8 @@
+ #  ADD_LIBRARY(target ... ${SRCS})
+ #
+ 
+-#
+-# Configure Protobuf project in protobuf subfolder of build location.
+-#
+-
+-message("Configuring Protobuf build using cmake generator: 
${CMAKE_GENERATOR}")
+-file(REMOVE ${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt)
+-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf)
+-
+-# If specified, use the same build type for Protobuf
+-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/

[Brian Evans]

commit: 7f006aed315a98c65ccebc820de11131039b0dee
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Aug 24 14:02:13 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Aug 24 14:41:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f006aed

dev-db/mysql-connector-c++: Version bump and fix patch wrt bug 628788

MariaDB 10.2 no longer includes MARIADB_BASE_VERSION but uses
MARIADB_VERSION_ID instead.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-db/mysql-connector-c++/Manifest|  1 +
 .../mysql-connector-c++-1.1.8-fix-mariadb.patch|  6 +--
 .../mysql-connector-c++-1.1.9.ebuild   | 62 ++
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 45050af13fb..b7da0dc71d9 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,3 +1,4 @@
 DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 
4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 
c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7
 WHIRLPOOL 
5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
 DIST mysql-connector-c++-1.1.6.tar.gz 522236 SHA256 
ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 SHA512 
e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7
 WHIRLPOOL 
b3027423cf2e250f1fd7340b58ff5ff55ce771c91cc435e37cddd156f681621206438b6329a49df760dce660ef983b3cf3e5060af527668de64ed06e69830d12
 DIST mysql-connector-c++-1.1.8.tar.gz 528954 SHA256 
85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963 SHA512 
c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d
 WHIRLPOOL 
6cb88c3b28a8b0bf072b97c55c8b24de016e8bc5f4d66dce7597cfee2f6c2e83fc88f5d1203df60b3425af5881834635ab3f2053bea6a4c16c7eb73be1f3950c
+DIST mysql-connector-c++-1.1.9.tar.gz 508255 SHA256 
3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4 SHA512 
ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
 WHIRLPOOL 
b8dbd1f12a6efac5e337c85ff9f32b53a0185af9ae4fd281d4c2e3f68749dabf0e361f775f3bbea44699b8d686a277ea123cb22b6b11ff6222d84b5e111bb74d

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
index a2a33e0c76d..35ed218e18d 100644
--- 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
@@ -5,7 +5,7 @@ diff -aurN a/driver/mysql_connection.cpp 
b/driver/mysql_connection.cpp
  proxy->get_character_set_info();
  *(static_cast(optionValue)) = cs.mbmaxlen;
/* mysql_get_option() was added in mysql 5.7.3 version */
-+#ifndef MARIADB_BASE_VERSION
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
} else if ( proxy->get_server_version() >= 50703 ) {
  try {
if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
@@ -21,7 +21,7 @@ diff -aurN a/driver/mysql_connection.cpp 
b/driver/mysql_connection.cpp
  MY_CHARSET_INFO cs;
  proxy->get_character_set_info();
  return cs.dir ? sql::SQLString(cs.dir) : "";
-+#ifndef MARIADB_BASE_VERSION
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
} else if ( proxy->get_server_version() >= 50703 ) {
  const char* optionValue= NULL;
  if (GET_CONN_OPTION(optionName, , stringOptions)) {
@@ -39,7 +39,7 @@ diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp 
b/driver/nativeapi/libmy
  LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, 
const void *arg)
  {
 -#if MYSQL_VERSION_ID >= 50703
-+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION )
++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined 
( MARIADB_VERSION_ID )
if (::mysql_get_option(mysql, option, arg)) {
throw sql::InvalidArgumentException("Unsupported option 
provided to mysql_get_option()");
} else {

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
new file mode 100644
index 000..1120d852cbe
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Brian Evans]

commit: d5582b7db025e9b136fa4a8f9f300cc08c0ef90b
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Aug 11 19:55:22 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Aug 11 19:55:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5582b7d

dev-db/mysql-connector-c Add API patch for CLIENT_SECURE_CONNECTION symbol

Restore CLIENT_SECURE_CONNECTION symbol which was changed to CLIENT_RESERVED2
Filed upstream bug https://bugs.mysql.com/bug.php?id=78028

Package-Manager: portage-2.2.20

 dev-db/mysql-connector-c/files/mysql_com.patch | 31 ++
 6.ebuild = mysql-connector-c-6.1.6-r1.ebuild} |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql-connector-c/files/mysql_com.patch 
b/dev-db/mysql-connector-c/files/mysql_com.patch
new file mode 100644
index 000..36a7d5a
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql_com.patch
@@ -0,0 +1,31 @@
+--- a/include/mysql_com.h  2014-06-10 23:10:43.0 -0400
 b/include/mysql_com.h  2015-08-11 15:20:54.487091000 -0400
+@@ -179,7 +171,7 @@
+ #define CLIENT_IGNORE_SIGPIPE   4096/* IGNORE sigpipes */
+ #define CLIENT_TRANSACTIONS   8192/* Client knows about transactions */
+ #define CLIENT_RESERVED 16384   /* Old flag for 4.1 protocol  */
+-#define CLIENT_RESERVED232768   /* Old flag for 4.1 authentication */
++#define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
+ #define CLIENT_MULTI_STATEMENTS (1UL  16) /* Enable/disable multi-stmt 
support */
+ #define CLIENT_MULTI_RESULTS(1UL  17) /* Enable/disable multi-results */
+ #define CLIENT_PS_MULTI_RESULTS (1UL  18) /* Multi-results in PS-protocol */
+@@ -226,7 +216,7 @@
+| CLIENT_IGNORE_SIGPIPE \
+| CLIENT_TRANSACTIONS \
+| CLIENT_RESERVED \
+-   | CLIENT_RESERVED2 \
++   | CLIENT_SECURE_CONNECTION \
+| CLIENT_MULTI_STATEMENTS \
+| CLIENT_MULTI_RESULTS \
+| CLIENT_PS_MULTI_RESULTS \
+--- a/libmysql/client_settings.h   2015-02-25 16:09:49.0 -0500
 b/libmysql/client_settings.h   2015-08-11 15:44:10.804091000 -0400
+@@ -31,7 +31,7 @@
+  CLIENT_LONG_FLAG | \
+  CLIENT_TRANSACTIONS |  \
+  CLIENT_PROTOCOL_41 | \
+- CLIENT_RESERVED2 | \
++ CLIENT_SECURE_CONNECTION | \
+  CLIENT_MULTI_RESULTS | \
+  CLIENT_PS_MULTI_RESULTS | \
+  CLIENT_PLUGIN_AUTH | \

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
similarity index 95%
rename from dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
index 9c8061a..969af88 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
@@ -43,7 +43,8 @@ DOCS=( README Docs/ChangeLog )
 
 src_prepare() {
epatch ${FILESDIR}/openssl-cmake-detection.patch \
-   ${FILESDIR}/conn-c-includes.patch
+   ${FILESDIR}/conn-c-includes.patch \
+   ${FILESDIR}/mysql_com.patch
epatch_user
 }