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

2024-04-27 Thread Petr Vaněk 
commit: 65e810c9b1123f6c07d92328dfdf1e60498bc392
Author: Tomáš Mózes  gmail  com>
AuthorDate: Mon Apr  8 14:37:50 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Sat Apr 27 12:53:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e810c9

dev-db/mysql-connector-c: add 8.0.36

Changes:
- musl patch upstreamed, see [1-3]
- mysql.info not present any more, see [4]
- lz4 patch updated

[1] 
https://github.com/mysql/mysql-server/commit/dc6b9e2556bf247cda80670b824cb24b271946f2
[2] https://bugs.mysql.com/bug.php?id=110808
[3] https://github.com/mysql/mysql-server/pull/455
[4] 
https://github.com/mysql/mysql-server/commit/18b2dd3ddfbe06bef9a378f1a87e63d494514b0b

Closes: https://bugs.gentoo.org/893912
Closes: https://bugs.gentoo.org/900667
Closes: https://bugs.gentoo.org/759058
Closes: https://bugs.gentoo.org/882743
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36160
Signed-off-by: Petr Vaněk  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   1 +
 ...-8.0.36-always-build-decompress-utilities.patch |  23 
 .../mysql-connector-c-8.0.36.ebuild| 123 +
 3 files changed, 147 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index bba4363fe6e8..b1933a7ac25c 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1 +1,2 @@
 DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 
8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539
 SHA512 
937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44
+DIST mysql-boost-8.0.36.tar.gz 438154682 BLAKE2B 
066c9dd7f2804ad29808c3bfcf5eae53466f7c40cf1386a9c1f26a0b45dcc3eda8d9618de36e8008e5e4d58b726d6c8ca85aec8d1eda8981f5a49e495b32f046
 SHA512 
a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch
new file mode 100644
index ..9c8e654ba280
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.36-always-build-decompress-utilities.patch
@@ -0,0 +1,23 @@
+diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
+index da34524..96c7299 100644
+--- a/utilities/CMakeLists.txt
 b/utilities/CMakeLists.txt
+@@ -124,13 +124,11 @@ MYSQL_ADD_EXECUTABLE(perror
+   DEPENDENCIES GenError
+   LINK_LIBRARIES mysys
+   )
+-IF(WITH_LZ4 STREQUAL "bundled")
+-  MYSQL_ADD_EXECUTABLE(lz4_decompress
+-lz4_decompress.cc
+-COMPONENT Server
+-LINK_LIBRARIES ext::lz4 mysys
+-)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(lz4_decompress
++  lz4_decompress.cc
++  COMPONENT Server
++  LINK_LIBRARIES ext::lz4 mysys
++  )
+ 
+ MYSQL_ADD_EXECUTABLE(zlib_decompress
+   zlib_decompress.cc

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild
new file mode 100644
index ..724061855292
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.36.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/;
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/mysql/mysql-server.git;
+
+   inherit git-r3
+else
+   SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 
1-2)/mysql-boost-${PV}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+   S="${WORKDIR}/mysql-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/21"
+IUSE="ldap static-libs"
+
+RDEPEND="
+   >=app-arch/lz4-1.9.4:=[${MULTILIB_USEDEP}]
+   app-arch/zstd:=[${MULTILIB_USEDEP}]
+   dev-libs/openssl:=[${MULTILIB_USEDEP}]
+   >=sys-libs/zlib-1.2.13:=[${MULTILIB_USEDEP}]
+   ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# Avoid file collisions, #692580
+RDEPEND+="
+   ! client/CMakeLists.txt || die
+
+   # Forcefully disable auth plugin
+   if ! use ldap ; then
+   sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
+   echo > libmysql/authentication_ldap/CMakeLists.txt || die
+   fi
+
+   cmake_src_prepare
+}
+
+multilib_src_configure() {
+   # Code is now requiring C++17 due to 
https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
+   append-cxxflags -std=c++17
+
+   local mycmakeargs=(
+

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

2023-11-14 Thread Andreas Sturmlechner 
commit: 93143505f3e280d93534596890d4447ee37b4328
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 13 19:26:16 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 14 17:30:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93143505

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

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

 dev-db/mysql-connector-c/Manifest  |   2 -
 ...nector-c-8.0.27-add-OpenSSL-3.0.0-support.patch | 313 -
 .../mysql-connector-c-8.0.27-r1.ebuild | 122 
 .../mysql-connector-c-8.0.31.ebuild| 121 
 4 files changed, 558 deletions(-)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 57d2230323e4..bba4363fe6e8 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,3 +1 @@
-DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 
177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e
 SHA512 
6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 
0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102
 SHA512 
87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
 DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 
8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539
 SHA512 
937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
deleted file mode 100644
index da1907db4633..
--- 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From d5bedd07c111676695270cdf35d23f9026a78113 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann 
-Date: Tue, 22 Jun 2021 23:56:54 +0200
-Subject: [PATCH 6/6] Add OpenSSL 3.0.0 support
-
-Signed-off-by: Thomas Deutschmann 

- cmake/ssl.cmake   | 59 +--
- mysys/my_md5.cc   |  2 +
- .../xcom_network_provider_ssl_native_lib.cc   |  4 ++
- plugin/x/client/xconnection_impl.cc   |  4 ++
- sql-common/client.cc  |  2 +
- sql/mysqld.cc |  2 +
- sql/sys_vars.cc   | 18 +-
- vio/viosslfactories.cc|  6 ++
- 8 files changed, 78 insertions(+), 19 deletions(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 293281cf1..4732d8bf4 100644
 a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -205,34 +205,59 @@ MACRO (MYSQL_CHECK_SSL)
-  NAMES crypto libcrypto libeay32
-  HINTS ${OPENSSL_ROOT_DIR}/lib)
- 
--IF(OPENSSL_INCLUDE_DIR)
-+IF(OPENSSL_INCLUDE_DIR AND EXISTS 
"${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-   # Verify version number. Version information looks like:
-   #   #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_NUMBER[\t ]+0x[0-9].*"
--)
--  STRING(REGEX REPLACE
--"^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
--OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
--)
--  STRING(REGEX REPLACE
--"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
--OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
--)
--  STRING(REGEX REPLACE
--"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" 
"\\1"
--OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-+REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
- )
-+
-+  IF(OPENSSL_VERSION_NUMBER)
-+STRING(REGEX REPLACE
-+  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-+  OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+  )
-+STRING(REGEX REPLACE
-+  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
-+  OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+  )
-+STRING(REGEX REPLACE
-+  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" 
"\\1"
-+  OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-+  )
-+  ELSE()
-+FILE(STRINGS

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

2023-10-17 Thread Hans de Graaff 
commit: 7634bb460cba925a090f004e74a2c5b60ce9e14c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Oct 17 14:57:40 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Oct 17 15:00:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7634bb46

dev-db/mysql-connector-c++: reinstate legacy USE flag

This is still required for mysql-workbench.

Signed-off-by: Hans de Graaff  gentoo.org>

 .../files/mysql-connector-c++-8.0.33-jdbc.patch| 11 +
 .../mysql-connector-c++-8.0.33-r1.ebuild   | 57 ++
 2 files changed, 68 insertions(+)

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.33-jdbc.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.33-jdbc.patch
new file mode 100644
index ..9fe986bef0bc
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.33-jdbc.patch
@@ -0,0 +1,11 @@
+--- a/jdbc/driver/nativeapi/library_loader.h   2023-03-23 17:32:48.0 
+0100
 b/jdbc/driver/nativeapi/library_loader.h   2023-10-17 16:54:37.270710451 
+0200
+@@ -45,6 +45,8 @@
+ 
+ #include 
+ 
++#include "../mysql_util.h"
++
+ namespace sql
+ {
+ namespace mysql

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.33-r1.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.33-r1.ebuild
new file mode 100644
index ..a6558abd86f4
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.33-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
+
+URI_DIR="Connector-C++"
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/;
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz;
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+# -ppc, -sparc for bug #711940
+KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86"
+IUSE="+legacy"
+
+RDEPEND="
+   app-arch/lz4:=
+   app-arch/zstd:=
+   dev-libs/openssl:=
+   sys-libs/zlib
+   legacy? (
+   >=dev-db/mysql-connector-c-8.0.27:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch
+   "${FILESDIR}"/${P}-jdbc.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUNDLE_DEPENDENCIES=OFF
+   # Cannot handle protobuf >23, bug #912797
+   #-DWITH_PROTOBUF=system
+   -DWITH_LZ4=system
+   -DWITH_SSL=system
+   -DWITH_ZLIB=system
+   -DWITH_ZSTD=system
+   -DWITH_JDBC=$(usex legacy)
+   )
+
+   if use legacy ; then
+   mycmakeargs+=(
+   -DMYSQLCLIENT_STATIC_BINDING=0
+   -DMYSQLCLIENT_STATIC_LINKING=0
+   )
+   fi
+
+   cmake_src_configure
+}

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

2022-10-16 Thread Hans de Graaff 
commit: 75c4fa458ee594581dc4ecff5f1423db75ed2716
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Oct 17 05:30:01 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Oct 17 05:32:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c4fa45

dev-db/mysql-connector-c++: fix loading libmysqlclient.so

mysql-workbench would fail with mysql-connector-c++ 8.x because it
would try to load the obsolete libmysqlclient_r library. This version
no longer exists in newer versions of mysql-connector-c. It turns out
that mysql-connector-c++ has hard-coded references to this library
but since we don't install compatibility symlinks this hardcoded
reference will fail.

Closes: https://bugs.gentoo.org/831664
Signed-off-by: Hans de Graaff  gentoo.org>

 .../mysql-connector-c++-8.0.27-mysqlclient_r.patch | 24 
 .../mysql-connector-c++-8.0.27-r1.ebuild   | 45 ++
 2 files changed, 69 insertions(+)

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch
 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch
new file mode 100644
index ..d929601f037f
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.27-mysqlclient_r.patch
@@ -0,0 +1,24 @@
+--- a/jdbc/FindMySQL.cmake 2021-09-10 18:31:29.0 +0200
 b/jdbc/FindMySQL.cmake 2022-01-21 07:40:03.224705056 +0100
+@@ -282,8 +282,8 @@
+   # there, pick "libmysqlclient" that in 5.5 and up is multithreaded
+   # anyway (soft link "libmysqlclient_r" is not installed MySQL Server
+   # 5.6 and Debian/Ubuntu and might go in 5.7 for all installs)
+-  set(_dynamic_libs   "mysqlclient_r"  "mysqlclient")
+-  set(_static_libs"libmysqlclient_r.a" "libmysqlclient.a")
++  set(_dynamic_libs   "mysqlclient")
++  set(_static_libs"libmysqlclient.a")
+   set(_static_lib_ext ".a")
+ endif()
+ 
+--- a/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp 2022-01-21 
07:52:41.224586087 +0100
 b/jdbc/driver/nativeapi/libmysql_dynamic_proxy.cpp 2022-01-21 
07:52:50.168631719 +0100
+@@ -49,7 +49,7 @@
+ #elif defined(__hpux) && defined(__hppa)
+ static const char * const baseName = "libmysqlclient_r.sl";
+ #else
+-static const char * const baseName = "libmysqlclient_r.so";
++static const char * const baseName = "libmysqlclient.so";
+ #endif
+ 
+ template

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild
new file mode 100644
index ..9ca9944b1c86
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/;
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz;
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+# -ppc, -sparc for bug #711940
+KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86"
+IUSE="+legacy"
+
+RDEPEND="
+   dev-libs/protobuf:=
+   legacy? (
+   dev-libs/boost:=
+   >=dev-db/mysql-connector-c-8.0.27:=
+   )
+   dev-libs/openssl:0=
+   "
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.0.27-fix-build.patch
+   "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_SSL=system
+   -DWITH_JDBC=$(usex legacy ON OFF)
+   $(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
+   $(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
+   )
+
+   cmake_src_configure
+}

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

2022-07-15 Thread Sam James 
commit: 0f7808b289d1eb16cef25c2de6411cc580b97c5c
Author: brahmajit das  gmail  com>
AuthorDate: Fri Jul 15 05:52:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 15 07:10:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7808b2

dev-db/mysql-connector-c: Use res_n* functions only on GLIBC

The issue occurs because the package tries to use the res_n* functions
(specifically res_ninit, res_nsearch and res_nclose) from resolv.h which
do not exist when using musl. So we are falling back to non-thread-safe
functions from resolv.h

Closes: https://bugs.gentoo.org/761352
Signed-off-by: brahmajit das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26353
Signed-off-by: Sam James  gentoo.org>

 .../files/mysql-connector-c-8.0.27-res_n.patch |  49 
 .../mysql-connector-c-8.0.27-r1.ebuild | 123 +
 2 files changed, 172 insertions(+)

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch
new file mode 100644
index ..34961b8ad9e2
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-res_n.patch
@@ -0,0 +1,49 @@
+# Musl doesn't have res_n* functions so we are falling back to the not
+# thread safe ones. Patch made with help from developer Fabian Groffen
+# .
+#
+# Closes: https://bugs.gentoo.org/761352
+# See also: https://github.com/mysql/mysql-server/pull/385
+# See also: https://bugs.mysql.com/bug.php?id=106034
+--- a/libmysql/CMakeLists.txt
 b/libmysql/CMakeLists.txt
+@@ -423,6 +423,19 @@ IF(HAS_WARN_FLAG)
+ )
+ ENDIF()
+
++check_symbol_exists(res_ninit "resolv.h" HAVE_RES_NINIT_FUNCTION)
++check_symbol_exists(res_nsearch "resolv.h" HAVE_RES_NSEARCH_FUNCTION)
++check_symbol_exists(res_nclose "resolv.h" HAVE_RES_NCLOSE_FUNCTION)
++IF (HAVE_RES_NINIT_FUNCTION)
++  add_compile_definitions(HAVE_RES_NINIT)
++ENDIF(HAVE_RES_NINIT_FUNCTION)
++IF (HAVE_RES_NSEARCH_FUNCTION)
++  add_compile_definitions(HAVE_RES_NSEARCH)
++ENDIF(HAVE_RES_NSEARCH_FUNCTION)
++IF (HAVE_RES_NCLOSE_FUNCTION)
++  add_compile_definitions(HAVE_RES_NCLOSE)
++ENDIF(HAVE_RES_NCLOSE_FUNCTION)
++
+ # Verify that libmysql_api_test runs OK
+ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD
+   COMMAND libmysql_api_test
+--- a/libmysql/dns_srv.cc
 b/libmysql/dns_srv.cc
+@@ -37,6 +37,17 @@
+ #include 
+ #include 
+
++/* we don't have anything else but the non-thread-safe variants */
++#if !defined(HAVE_RES_NINIT)
++#define res_ninit(X)  (void)X
++#endif
++#if !defined(HAVE_RES_NSEARCH)
++#define res_nsearch(X,D,I,S,B,L)  res_search(D,I,S,B,L)
++#endif
++#if !defined(HAVE_RES_NCLOSE)
++#define res_nclose(X) (void)X
++#endif
++
+ // POSIX version
+
+ static bool get_dns_srv(Dns_srv_data , const char *dnsname, int ) {

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
new file mode 100644
index ..7058ba6c50ed
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/;
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/mysql/mysql-server.git;
+
+   inherit git-r3
+else
+   SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 
1-2)/mysql-boost-${PV}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+   S="${WORKDIR}/mysql-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/21"
+IUSE="ldap static-libs"
+
+RDEPEND="
+   >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
+   app-arch/zstd:=[${MULTILIB_USEDEP}]
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
+   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_src_prepare
+}
+
+multilib_src_configure() {
+   CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+   # Code is now requiring C++17 due to 
https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
+   append-cxxflags -std=c++17
+
+   local mycmakeargs=(
+   -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+

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

2022-03-03 Thread David Seifert 
commit: 4f138b37973aec82a2433f8d76dfb76d35968a51
Author: David Seifert  gentoo  org>
AuthorDate: Thu Mar  3 21:21:50 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar  3 21:21:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f138b37

dev-db/mysql-connector-c++: drop 8.0.24, 8.0.25, 8.0.26

Bug: https://bugs.gentoo.org/822258
Signed-off-by: David Seifert  gentoo.org>

 dev-db/mysql-connector-c++/Manifest|   3 -
 .../mysql-connector-c++-8.0.22-fix-build.patch | 322 -
 ...connector-c++-8.0.24-gcc11-numeric_limits.patch |  13 -
 ...c++-8.0.25-fix-mysqlclient-static-binding.patch | 274 --
 .../mysql-connector-c++-8.0.26-fix-build.patch | 321 
 .../mysql-connector-c++-8.0.24.ebuild  |  45 ---
 .../mysql-connector-c++-8.0.25.ebuild  |  46 ---
 .../mysql-connector-c++-8.0.26.ebuild  |  44 ---
 8 files changed, 1068 deletions(-)

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index 572807f8ebe2..9060af922044 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,5 +1,2 @@
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 
386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9
 SHA512 
d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
-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.22-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch
deleted file mode 100644
index ca1b829c1fbc..
--- 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch
+++ /dev/null
@@ -1,322 +0,0 @@
 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)
--

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

2022-03-03 Thread David Seifert 
commit: f30c3ae397bd27e0df5777819887979e889c7d8d
Author: David Seifert  gentoo  org>
AuthorDate: Thu Mar  3 21:21:49 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar  3 21:21:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30c3ae3

dev-db/mysql-connector-c: drop 8.0.22, 8.0.23-r1, 8.0.25, 8.0.25-r1, 8.0.26

Bug: https://bugs.gentoo.org/822258
Signed-off-by: David Seifert  gentoo.org>

 dev-db/mysql-connector-c/Manifest  |   4 -
 ...nector-c-8.0.25-add-OpenSSL-3.0.0-support.patch | 294 -
 .../mysql-connector-c-8.0.22.ebuild| 110 
 .../mysql-connector-c-8.0.23-r1.ebuild | 118 -
 .../mysql-connector-c-8.0.25-r1.ebuild | 122 -
 .../mysql-connector-c-8.0.25.ebuild| 121 -
 .../mysql-connector-c-8.0.26.ebuild| 122 -
 7 files changed, 891 deletions(-)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index c3a4a68bf2a4..c567c6cfb162 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,5 +1 @@
-DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 
1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6
 SHA512 
792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
-DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 
3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58
 SHA512 
b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8
-DIST mysql-boost-8.0.25.tar.gz 290265324 BLAKE2B 
5393a2a2525a886d9ece19777deae01e6c0b24b9ff5a0a5ffb9075740ed912d0df59a165b6ec9ceb60c7c28f3062cda5cceb4da3a8280f42549984c846f1ce5c
 SHA512 
af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081
-DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 
6198ca8982a8c9df7e6ee4df5e2c1e0d64d2eb4d83cb7265317b58d55f6787c3240c8e40d196f2326ff3d66926ad7dab0705edd92e5a82881ce6ddb7f0c510b9
 SHA512 
63d47cb52407a816dc9f4330b99924624dfee46e57e7fdce19eff32909dd9e23251e2439d1807b002a1661b547173222c77465a3ca4dbb312414a84927809cfc
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 
177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e
 SHA512 
6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch
deleted file mode 100644
index f566e0fba5b6..
--- 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-From 3bf91fabf641f3f5114bf3893de40a31aae36e13 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann 
-Date: Tue, 22 Jun 2021 23:56:54 +0200
-Subject: [PATCH 5/5] Add OpenSSL 3.0.0 support
-
-Signed-off-by: Thomas Deutschmann 

- cmake/ssl.cmake   | 59 +--
- mysys/my_md5.cc   |  2 +
- .../bindings/xcom/xcom/xcom_ssl_transport.cc  |  4 ++
- plugin/x/client/xconnection_impl.cc   |  4 ++
- sql-common/client.cc  |  2 +
- sql/mysqld.cc |  2 +
- sql/sys_vars.cc   | 18 +-
- vio/viosslfactories.cc|  2 +
- 8 files changed, 74 insertions(+), 19 deletions(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 18c95dfac..dd2f7e657 100644
 a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -201,34 +201,59 @@ MACRO (MYSQL_CHECK_SSL)
-  NAMES crypto libcrypto libeay32
-  HINTS ${OPENSSL_ROOT_DIR}/lib)
- 
--IF(OPENSSL_INCLUDE_DIR)
-+IF(OPENSSL_INCLUDE_DIR AND EXISTS 
"${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-   # Verify version number. Version information looks like:
-   #   #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_NUMBER[\t ]+0x[0-9].*"
--)
--  STRING(REGEX REPLACE
--"^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
--OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
--)
--  STRING(REGEX REPLACE
--"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
--OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
--)

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

2021-11-13 Thread Thomas Deutschmann 
commit: 9486cc4679e8dde3d02a577f43b03570c0609e5e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Nov 13 20:50:09 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 14 03:49:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9486cc46

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 +
 ...nector-c-8.0.27-add-OpenSSL-3.0.0-support.patch | 296 +
 .../mysql-connector-c-8.0.27.ebuild| 122 +
 3 files changed, 419 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 0f9c928a3587..c3a4a68bf2a4 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -2,3 +2,4 @@ DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 
1ba0c9bb9a0cb74af4842d3b746f8b6
 DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 
3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58
 SHA512 
b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8
 DIST mysql-boost-8.0.25.tar.gz 290265324 BLAKE2B 
5393a2a2525a886d9ece19777deae01e6c0b24b9ff5a0a5ffb9075740ed912d0df59a165b6ec9ceb60c7c28f3062cda5cceb4da3a8280f42549984c846f1ce5c
 SHA512 
af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081
 DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 
6198ca8982a8c9df7e6ee4df5e2c1e0d64d2eb4d83cb7265317b58d55f6787c3240c8e40d196f2326ff3d66926ad7dab0705edd92e5a82881ce6ddb7f0c510b9
 SHA512 
63d47cb52407a816dc9f4330b99924624dfee46e57e7fdce19eff32909dd9e23251e2439d1807b002a1661b547173222c77465a3ca4dbb312414a84927809cfc
+DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 
177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e
 SHA512 
6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
new file mode 100644
index ..fe702159410a
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
@@ -0,0 +1,296 @@
+From 9936c93ee95a4d62a238aa4515be07ef14267932 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Tue, 22 Jun 2021 23:56:54 +0200
+Subject: [PATCH 6/6] Add OpenSSL 3.0.0 support
+
+Signed-off-by: Thomas Deutschmann 
+---
+ cmake/ssl.cmake   | 59 +--
+ mysys/my_md5.cc   |  2 +
+ .../xcom_network_provider_ssl_native_lib.cc   |  4 ++
+ plugin/x/client/xconnection_impl.cc   |  4 ++
+ sql-common/client.cc  |  2 +
+ sql/mysqld.cc |  2 +
+ sql/sys_vars.cc   | 18 +-
+ vio/viosslfactories.cc|  2 +
+ 8 files changed, 74 insertions(+), 19 deletions(-)
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 293281cf1..4732d8bf4 100644
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -205,34 +205,59 @@ MACRO (MYSQL_CHECK_SSL)
+  NAMES crypto libcrypto libeay32
+  HINTS ${OPENSSL_ROOT_DIR}/lib)
+ 
+-IF(OPENSSL_INCLUDE_DIR)
++IF(OPENSSL_INCLUDE_DIR AND EXISTS 
"${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+   # Verify version number. Version information looks like:
+   #   #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_NUMBER[\t ]+0x[0-9].*"
+-)
+-  STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+-OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+-)
+-  STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
+-OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+-)
+-  STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" 
"\\1"
+-OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
++REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+ )
++
++  IF(OPENSSL_VERSION_NUMBER)
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
++  OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
++  )
++STRING(REGEX REPLACE
++

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

2021-06-22 Thread Thomas Deutschmann 
commit: c13941a25b42ec73772e396915b96294a51fd778
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun 22 23:44:33 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun 22 23:44:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13941a2

dev-db/mysql-connector-c: add OpenSSL 3.0.0 support

Closes: https://bugs.gentoo.org/797331
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...nector-c-8.0.25-add-OpenSSL-3.0.0-support.patch | 294 +
 .../mysql-connector-c-8.0.25-r1.ebuild | 122 +
 2 files changed, 416 insertions(+)

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch
new file mode 100644
index 000..f566e0fba5b
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch
@@ -0,0 +1,294 @@
+From 3bf91fabf641f3f5114bf3893de40a31aae36e13 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Tue, 22 Jun 2021 23:56:54 +0200
+Subject: [PATCH 5/5] Add OpenSSL 3.0.0 support
+
+Signed-off-by: Thomas Deutschmann 
+---
+ cmake/ssl.cmake   | 59 +--
+ mysys/my_md5.cc   |  2 +
+ .../bindings/xcom/xcom/xcom_ssl_transport.cc  |  4 ++
+ plugin/x/client/xconnection_impl.cc   |  4 ++
+ sql-common/client.cc  |  2 +
+ sql/mysqld.cc |  2 +
+ sql/sys_vars.cc   | 18 +-
+ vio/viosslfactories.cc|  2 +
+ 8 files changed, 74 insertions(+), 19 deletions(-)
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 18c95dfac..dd2f7e657 100644
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -201,34 +201,59 @@ MACRO (MYSQL_CHECK_SSL)
+  NAMES crypto libcrypto libeay32
+  HINTS ${OPENSSL_ROOT_DIR}/lib)
+ 
+-IF(OPENSSL_INCLUDE_DIR)
++IF(OPENSSL_INCLUDE_DIR AND EXISTS 
"${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+   # Verify version number. Version information looks like:
+   #   #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_NUMBER[\t ]+0x[0-9].*"
+-)
+-  STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+-OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+-)
+-  STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
+-OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+-)
+-  STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" 
"\\1"
+-OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
++REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+ )
++
++  IF(OPENSSL_VERSION_NUMBER)
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
++  OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
++  )
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
++  OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
++  )
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" 
"\\1"
++  OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
++  )
++  ELSE()
++FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
++  OPENSSL_VERSION_STR
++  REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t 
]+\"([0-9])+\\.([0-9])+\\.([0-9])+\".*"
++  )
++
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+)\\.[0-9]+\\.[0-9]+\".*$" 
"\\1"
++  OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_STR}"
++  )
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.([0-9]+)\\.[0-9]+\".*$" 
"\\1"
++  OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_STR}"
++  )
++STRING(REGEX REPLACE
++  "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.[0-9]+\\.([0-9]+)\".*$" 
"\\1"
++  OPENSSL_FIX_VERSION "${OPENSSL_VERSION_STR}"
++  )
++  ENDIF()
+ ENDIF()
+-
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" 
VERSION_GREATER "1.1.0")
++
++INCLUDE(CheckSymbolExists)
++
++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

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

2021-04-28 Thread Thomas Deutschmann 
commit: da366dafb626555b2d3229b7fdcf306a58904d8b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr 28 13:18:33 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr 28 13:19:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da366daf

dev-db/mysql-connector-c++: fix building against gcc-11

Closes: https://bugs.gentoo.org/786252
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch   | 13 +
 .../mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild   |  1 +
 2 files changed, 14 insertions(+)

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch
 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch
new file mode 100644
index 000..f09d85449b9
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/786252
+
+--- a/include/mysqlx/common/util.h
 b/include/mysqlx/common/util.h
+@@ -112,6 +112,7 @@ PUSH_SYS_WARNINGS
+ #include 
+ #include 
+ #include 
++#include // std::numeric_limits
+ #include   // for memcpy
+ #include// std::move etc
+ #include 
+ 

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
index e5379e0f499..8edd7e9d054 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
@@ -30,6 +30,7 @@ S="${WORKDIR}/${P}-src"
 PATCHES=(
"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
"${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
+   "${FILESDIR}"/${PN}-8.0.24-gcc11-numeric_limits.patch
 )
 
 src_configure() {

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

2021-01-21 Thread Thomas Deutschmann 
commit: 7da0ebc2efa34b11aa8c18da51db0a3a1415bd62
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 21 21:45:52 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 21 22:32:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da0ebc2

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

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

 dev-db/mysql-connector-c/Manifest  |   1 +
 .../files/mysql-connector-c-8.0.23-libressl.patch  | 356 +
 .../mysql-connector-c-8.0.23.ebuild| 112 +++
 3 files changed, 469 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 02cd082be04..36b6afb16c8 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1 +1,2 @@
 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 
1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6
 SHA512 
792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
+DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 
3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58
 SHA512 
b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.23-libressl.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.23-libressl.patch
new file mode 100644
index 000..06681d940dd
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.23-libressl.patch
@@ -0,0 +1,356 @@
+From 262f0b8bdc86a755041c19c11b6067afce28dae1 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Thu, 30 Apr 2020 20:01:48 +0200
+Subject: [PATCH 5/6] Add LibreSSL support
+
+Signed-off-by: Thomas Deutschmann 
+---
+ cmake/ssl.cmake   |  5 +++--
+ mysys/my_md5.cc   |  2 ++
+ .../bindings/xcom/xcom/xcom_ssl_transport.cc  |  6 +-
+ plugin/x/client/xconnection_impl.cc   |  4 
+ router/src/harness/src/tls_client_context.cc  |  2 +-
+ router/src/harness/src/tls_context.cc |  9 ++--
+ router/src/harness/src/tls_server_context.cc  |  3 ++-
+ sql-common/client.cc  |  2 ++
+ sql/mysqld.cc |  4 +++-
+ sql/sys_vars.cc   | 21 +--
+ vio/viossl.cc |  8 +++
+ vio/viosslfactories.cc|  2 ++
+ 12 files changed, 54 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 52feadeaa..3b8332695 100644
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -222,13 +222,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/mysys/my_md5.cc b/mysys/my_md5.cc
+index dea997b25..531696329 100644
+--- 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) {
+diff --git 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
+index 8bf63ce14..02f91b44e 100644
+--- 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
+@@ -325,6 +325,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;
+@@ -348,6 +349,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
+ EXIT:
+   return rc;
+ }
++#endif
+ 
+ static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
+

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

2020-10-20 Thread Thomas Deutschmann 
commit: eca1b01e34c8bec66f213f10397bf7c94abc0f81
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Oct 20 18:30:42 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Oct 20 18:55:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca1b01e

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

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

 dev-db/mysql-connector-c/Manifest  |   1 +
 ...-8.0.22-always-build-decompress-utilities.patch |  22 
 .../mysql-connector-c-8.0.22.ebuild| 112 +
 3 files changed, 135 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index d9d45dcf80e..65a983707e5 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1 +1,2 @@
 DIST mysql-boost-8.0.21.tar.gz 278292192 BLAKE2B 
9e5a14d1401f58f6f620c8691d2d4d3ada122a79a4e081380050961f0add93bf32b682c60ea2a6e58f50a4fcedbd323d8efe2d5f3e1f2bba5010e201a2df5d44
 SHA512 
18128edd7d9604ea69bd308f372d6663ef3629503969148e3a2117175c4ef625358b31b96e0e1b8d10a87037719e3cb61d5c71eee1e26ab0e0a1731977a2d7c1
+DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 
1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6
 SHA512 
792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
new file mode 100644
index 000..b0046fd8b22
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
@@ -0,0 +1,22 @@
+--- a/utilities/CMakeLists.txt
 b/utilities/CMakeLists.txt
+@@ -123,14 +123,11 @@ MYSQL_ADD_EXECUTABLE(perror
+   DEPENDENCIES GenError
+   LINK_LIBRARIES mysys
+   )
+-IF(BUILD_BUNDLED_LZ4)
+-  MYSQL_ADD_EXECUTABLE(lz4_decompress
+-lz4_decompress.cc
+-COMPONENT Server
+-LINK_LIBRARIES ${LZ4_LIBRARY} mysys
+-)
+-ENDIF()
+-
++MYSQL_ADD_EXECUTABLE(lz4_decompress
++  lz4_decompress.cc
++  COMPONENT Server
++  LINK_LIBRARIES ${LZ4_LIBRARY} mysys
++  )
+ MYSQL_ADD_EXECUTABLE(zlib_decompress
+   zlib_decompress.cc
+   COMPONENT Server

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
new file mode 100644
index 000..7502dbf5252
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 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 ~sparc 
~x86"
+
+SLOT="0/21"
+IUSE="ldap libressl static-libs"
+
+RDEPEND="
+   >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
+   app-arch/zstd:=[${MULTILIB_USEDEP}]
+   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
+   -DENABLED_LOCAL_INFILE=ON
+   -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
+   -DWITH_LZ4=system
+   -DWITH_NUMA=OFF
+   -DWITH_SSL=system
+   -DWITH_ZLIB=system
+   -DWITH_ZSTD=system
+   -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
+   -DSHARED_LIB_PATCH_VERSION="0"
+   -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+   -DWITHOUT_SERVER=ON
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   doman \
+   man/my_print_defaults.1 \
+   man/perror.1 \
+   man/zlib_decompress.1
+
+   if ! use static-libs ;

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

2020-10-20 Thread Thomas Deutschmann 
commit: b46380cc06550dd891ea12f958f01c20bb4f9ba3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Oct 20 18:40:54 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Oct 20 18:55:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46380cc

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

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

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

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index e28f1d2e478..abb402a6169 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.19-src.tar.gz 3137484 BLAKE2B 
82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0
 SHA512 
5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1ede75da15d7bb0bd
 DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B 
a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251
 SHA512 
3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b
 DIST mysql-connector-c++-8.0.21-src.tar.gz 3788740 BLAKE2B 
1862b4f2c6e2a2bbe8e3044eea2c1d3c8fdb0a319e3758ca44686b79e917a65617e2cfd0e4b698d858ed9ef12c892b4f658eb287f2a8505a5daeeb79d9544c25
 SHA512 
8a64dff2efd16d2891f613fd416ec42ecba2490b428b1778e99822a3051d9c5af3b94006577e9f38a6ebd146d2f3be522cb876f1e42fbf0ac82001b0a62ffa62
+DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B 
c5d6f0ebeb4649857f3217a35f3ae885d62be63af4da09815e7eb156538ece4f805578db24bfff3dd44a0e320c025a9936d7edacba69a2786d84dd932c5abb8a
 SHA512 
1975b43fa3f3806685a695f84783164c5b17da10ac14a6013d27c837cc9c63fff01b1ed4b31f22dae60afa68d34ec56ca9c45ca3dac23635e8f0fa845aa4

diff --git 
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch
new file mode 100644
index 000..ca1b829c1fb
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.22-fix-build.patch
@@ -0,0 +1,322 @@
+--- 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/files/, dev-db/mysql-connector-c/

2020-07-25 Thread Thomas Deutschmann 
commit: 1d894c8334d1705f5f748c1306b319ecbd55b7de
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 26 01:29:15 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 26 01:46:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d894c83

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

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

 .../files/mysql-connector-c-8.0.21-libressl.patch  | 356 +
 .../mysql-connector-c-8.0.21.ebuild|   3 +-
 2 files changed, 357 insertions(+), 2 deletions(-)

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-libressl.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-libressl.patch
new file mode 100644
index 000..78f3e78fd6d
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-libressl.patch
@@ -0,0 +1,356 @@
+From 4aadff7b08f6a69160a44c1742d5a12fb5abc059 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Thu, 30 Apr 2020 20:01:48 +0200
+Subject: [PATCH 5/5] Add LibreSSL support
+
+Signed-off-by: Thomas Deutschmann 
+---
+ cmake/ssl.cmake   |  5 +++--
+ mysys/my_md5.cc   |  2 ++
+ .../bindings/xcom/xcom/xcom_ssl_transport.cc  |  6 +-
+ plugin/x/client/xconnection_impl.cc   |  4 
+ router/src/http/src/tls_client_context.cc |  2 +-
+ router/src/http/src/tls_context.cc|  9 ++--
+ router/src/http/src/tls_server_context.cc |  3 ++-
+ sql-common/client.cc  |  2 ++
+ sql/mysqld.cc |  4 +++-
+ sql/sys_vars.cc   | 21 +--
+ vio/viossl.cc |  8 +++
+ vio/viosslfactories.cc|  2 ++
+ 12 files changed, 54 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 52feadeaa..3b8332695 100644
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -222,13 +222,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/mysys/my_md5.cc b/mysys/my_md5.cc
+index dea997b25..531696329 100644
+--- 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) {
+diff --git 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
+index 8bf63ce14..02f91b44e 100644
+--- 
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
 
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
+@@ -325,6 +325,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;
+@@ -348,6 +349,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
+ EXIT:
+   return rc;
+ }
++#endif
+ 
+ static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
+ const char *ca_path) {
+@@ -544,10 +546,12 @@ int xcom_init_ssl(const char *server_key_file, const 
char *server_cert_file,
+   int verify_server = SSL_VERIFY_NONE;
+   int verify_client = SSL_VERIFY_NONE;
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
+ G_ERROR("Error setting the ssl fips mode");
+ goto error;
+   }
++#endif
+ 
+   SSL_library_init();
+   SSL_load_error_strings();
+@@ -611,7 +615,7 @@ error:
+ void xcom_cleanup_ssl() {
+   if (!xcom_use_ssl()) return;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
+   ERR_remove_thread_state(0);
+ #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
+ }
+diff --git a/plugin/x/client/xconnection_impl.cc 
b/plugin/x/client/xconnection_impl.cc
+index 13bc6794e..5223169db 100644
+---

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

2020-04-30 Thread Thomas Deutschmann 
commit: 78c20fc6a719fdcc951c503a3b998b1e7c9c5046
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr 30 19:48:00 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr 30 20:44:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c20fc6

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 +
 .../files/mysql-connector-c-8.0.20-libressl.patch  | 332 +
 .../mysql-connector-c-8.0.20.ebuild| 111 +++
 3 files changed, 444 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 810277618eb..f72027980de 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,2 +1,3 @@
 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-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.20-libressl.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.20-libressl.patch
new file mode 100644
index 000..88f32419239
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.20-libressl.patch
@@ -0,0 +1,332 @@
+From 2108922a8292d74874ede834158c208d81c3cf76 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Thu, 30 Apr 2020 20:01:48 +0200
+Subject: [PATCH 5/5] Add LibreSSL support
+
+Signed-off-by: Thomas Deutschmann 
+---
+ cmake/ssl.cmake   |  5 +++--
+ mysys/my_md5.cc   |  2 ++
+ .../bindings/xcom/xcom/xcom_ssl_transport.c   |  6 +-
+ plugin/x/client/xconnection_impl.cc   |  4 
+ router/src/http/src/tls_client_context.cc |  2 +-
+ router/src/http/src/tls_context.cc|  9 ++--
+ router/src/http/src/tls_server_context.cc |  3 ++-
+ sql-common/client.cc  |  2 ++
+ sql/mysqld.cc |  4 +++-
+ sql/sys_vars.cc   | 21 +--
+ vio/viossl.cc |  8 +++
+ vio/viosslfactories.cc|  2 ++
+ 12 files changed, 54 insertions(+), 14 deletions(-)
+
+--- a/cmake/ssl.cmake
 b/cmake/ssl.cmake
+@@ -222,13 +222,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 configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
+ const char *ca_path) {
+@@ -555,10

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

2020-01-20 Thread Thomas Deutschmann 
commit: 06f3a18c17436585c25146f35577d88529d20533
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jan 20 18:12:28 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jan 20 19:26:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f3a18c

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  |   2 -
 ...-8.0.17-always-build-decompress-utilities.patch |  22 --
 .../files/mysql-connector-c-8.0.17-libressl.patch  | 258 -
 .../mysql-connector-c-8.0.17-r3.ebuild | 111 -
 .../mysql-connector-c-8.0.18.ebuild| 110 -
 5 files changed, 503 deletions(-)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 545daa75efd..810277618eb 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,4 +1,2 @@
-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.17-always-build-decompress-utilities.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
deleted file mode 100644
index 927662705aa..000
--- 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 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/files/mysql-connector-c-8.0.17-libressl.patch 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch
deleted file mode 100644
index 340f894a895..000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-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

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

2019-08-22 Thread Thomas Deutschmann 
commit: 5dfeaff018ab1d02b0c8cb80ed0ec1eda7af1f29
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 23 00:16:24 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 23 00:24:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfeaff0

dev-db/mysql-connector-c: Use relative include path for udf_registration_types.h

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

 ...include-path-for-udf_registration_types-h.patch | 24 ++
 ...2.ebuild => mysql-connector-c-8.0.17-r3.ebuild} |  1 +
 2 files changed, 25 insertions(+)

diff --git 
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
new file mode 100644
index 000..8fabd9952cc
--- /dev/null
+++ 
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/692644
+
+--- a/include/mysql.h.pp
 b/include/mysql.h.pp
+@@ -175,7 +175,7 @@ struct rand_struct {
+   unsigned long seed1, seed2, max_value;
+   double max_value_dbl;
+ };
+-#include 
++#include "mysql/udf_registration_types.h"
+ enum Item_result {
+   INVALID_RESULT = -1,
+   STRING_RESULT = 0,
+--- a/include/mysql_com.h
 b/include/mysql_com.h
+@@ -1002,7 +1002,7 @@ struct rand_struct {
+ };
+ 
+ /* Include the types here so existing UDFs can keep compiling */
+-#include 
++#include "mysql/udf_registration_types.h"
+ 
+ /**
+   @addtogroup group_cs_compresson_constants Constants when using compression

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild
similarity index 96%
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild
index 3eb18955b0b..f705146ace5 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild
@@ -41,6 +41,7 @@ S="${WORKDIR}/mysql-${PV}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch
+   
"${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
"${FILESDIR}"/${PN}-8.0.17-libressl.patch
 )

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

2018-05-02 Thread Brian Evans 
commit: 5d874ef4f478adbf245793017b1e6fc02f1e40a8
Author: Brian Evans  gentoo  org>
AuthorDate: Wed May  2 14:34:28 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed May  2 14:34:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d874ef4

dev-db/mysql-connector-c: Add openssl-1.1 compatibility patch

Closes: https://bugs.gentoo.org/606600
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../files/6.1.11-openssl-1.1.patch | 287 +
 .../mysql-connector-c-6.1.11-r1.ebuild |   3 +-
 2 files changed, 289 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..cbca14de60b
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch
@@ -0,0 +1,287 @@
+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
++#define OPENSSL_VERSION_NUMBER 0x1000107fL
++#endif
+ 
+ /*
+   xplugin needs BIO_new_bio_pair, but the server does not.
+@@ -122,7 +128,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 
source_length,
+enum my_aes_opmode mode, const unsigned char *iv,
+bool padding)
+ {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   const EVP_CIPHER *cipher= aes_evp_type(mode);
+   int u_len, f_len;
+   /* The real key to be used for encryption */
+@@ -132,23 +138,31 @@ int my_aes_encrypt(const unsigned char *source, uint32 
source_length,
+   if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+ return MY_AES_BAD_DATA;
+ 
+-  if (!EVP_EncryptInit(, cipher, rkey, iv))
++  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
+ goto aes_error; /* Error */
+-  if (!EVP_CIPHER_CTX_set_padding(, padding))
++  if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
+ goto aes_error; /* Error */
+-  if (!EVP_EncryptUpdate(, dest, _len, source, source_length))
++  if (!EVP_EncryptUpdate(ctx, dest, _len, source, source_length))
+ goto aes_error; /* Error */
+ 
+-  if (!EVP_EncryptFinal(, dest + u_len, _len))
++  if (!EVP_EncryptFinal(ctx, dest + u_len, _len))
+ goto aes_error; /* Error */
+ 
+-  EVP_CIPHER_CTX_cleanup();
++#if OPENSSL_VERSION_NUMBER < 0x1010L
++  EVP_CIPHER_CTX_cleanup(ctx);
++#else
++  EVP_CIPHER_CTX_free(ctx);
++#endif
+   return u_len + f_len;
+ 
+ aes_error:
+   /* need to explicitly clean up the error if we want to ignore it */
+   ERR_clear_error();
+-  EVP_CIPHER_CTX_cleanup();
++#if OPENSSL_VERSION_NUMBER < 0x1010L
++  EVP_CIPHER_CTX_cleanup(ctx);
++#else
++  EVP_CIPHER_CTX_free(ctx);
++#endif
+   return MY_AES_BAD_DATA;
+ }
+ 
+@@ -159,7 +173,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 
source_length,
+bool padding)
+ {
+ 
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   const EVP_CIPHER *cipher= aes_evp_type(mode);
+   int u_len, f_len;
+ 
+@@ -170,24 +184,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 
source_length,
+   if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+ return MY_AES_BAD_DATA;
+ 
+-  EVP_CIPHER_CTX_init();
++#if OPENSSL_VERSION_NUMBER < 0x1010L
++  EVP_CIPHER_CTX_init(ctx);
++#endif
+ 
+-  if (!EVP_DecryptInit(, aes_evp_type(mode), rkey, iv))
++  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
+ goto aes_error; /* Error */
+-  if (!EVP_CIPHER_CTX_set_padding(, padding))
++  if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
+ goto aes_error; /* Error */
+-  if (!EVP_DecryptUpdate(, dest, _len, source, source_length))
++  if (!EVP_DecryptUpdate(ctx, dest, _len, source, source_length))
+ goto aes_error; /* Error */
+-  if

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

2017-11-21 Thread Brian Evans 
commit: e8c5b876c36e2dd221aa26edd577c296fbef39f8
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 21 18:48:25 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Nov 21 19:34:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c5b876

dev-db/mysql-connector-c: Version bump and fix gcc 7 build

Closes: https://bugs.gentoo.org/638360
Package-Manager: Portage-2.3.15, Repoman-2.3.6

 dev-db/mysql-connector-c/Manifest  |  1 +
 .../files/20028_all_mysql-5.6-gcc7.patch   | 13 
 .../mysql-connector-c-6.1.11.ebuild| 82 ++
 3 files changed, 96 insertions(+)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 08b0e7b13d5..6a895e6d895 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,3 +1,4 @@
+DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
 DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 
278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 
be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56
 WHIRLPOOL 
bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61
 DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 
433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 
2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760
 WHIRLPOOL 
6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33
 DIST mysql-connector-c-6.1.9-src.tar.gz 3494748 SHA256 
4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b SHA512 
3127d08428e820044e25ab5ebb741a128325be6ca0fca0300cab33891693e11e57d4ded5a25918a67d23cceb8a2c6ee99879ffb50c31bc4c2e225a9dba9674dc
 WHIRLPOOL 
7f0cb1fa7bb0f77447f4884b567e7881d8d9c1dda2e27250838fe8a51ac4ddcb8f7aa683fe11a3f7f9545f90918b15fe9e033da138c86e5bd4f360164ebaeb2e

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
new file mode 100644
index 000..cf8caedb7f1
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch
@@ -0,0 +1,13 @@
+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/mysql-connector-c-6.1.11.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11.ebuild
new file mode 100644
index 000..c4494ba6484
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+MULTILIB_WRAPPED_HEADERS+=(
+   /usr/include/mysql/my_config.h
+)
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/c/;
+LICENSE="GPL-2"
+
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz;
+S="${WORKDIR}/${P}-src"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
+
+SUBSLOT="18"
+SLOT="0/${SUBSLOT}"
+IUSE="+ssl static-libs"
+
+CDEPEND="
+   sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   "
+RDEPEND="${CDEPEND}
+   !dev-db/mysql[client-libs(+)]
+   !dev-db/mysql-cluster[client-libs(+)]
+   !dev-db/mariadb[client-libs(+)]
+   !dev-db/mariadb-connector-c[mysqlcompat]
+   !dev-db/mariadb-galera[client-libs(+)]
+   !dev-db/percona-server[client-libs(+)]
+   "
+DEPEND="${CDEPEND}"
+
+DOCS=( README )
+PATCHES=(
+   "${FILESDIR}/mysql_com.patch"
+   "${FILESDIR}/20028_all_mysql-5.6-gcc7.patch"
+)
+
+src_prepare() {
+   sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' 
"${S}/scripts/CMakeLists.txt" || die
+   cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+

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

2017-11-21 Thread Brian Evans 
commit: 326b50e8bb31240f7e21801b6fce6b6e83b4a316
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 21 18:50:48 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Nov 21 19:34:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326b50e8

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

Package-Manager: Portage-2.3.15, Repoman-2.3.6

 dev-db/mysql-connector-c/Manifest  |  3 -
 .../mysql-connector-c/files/conn-c-includes.patch  | 15 
 .../files/openssl-cmake-detection.patch| 12 
 .../mysql-connector-c-6.1.5.ebuild | 59 
 .../mysql-connector-c-6.1.6-r1.ebuild  | 67 --
 .../mysql-connector-c-6.1.6-r2.ebuild  | 76 
 .../mysql-connector-c-6.1.9-r1.ebuild  | 80 --
 .../mysql-connector-c-6.1.9.ebuild | 73 
 8 files changed, 385 deletions(-)

diff --git a/dev-db/mysql-connector-c/Manifest 
b/dev-db/mysql-connector-c/Manifest
index 6a895e6d895..f276bb6a0be 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,4 +1 @@
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
 SHA512 
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
-DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 
278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 
be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56
 WHIRLPOOL 
bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61
-DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 
433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 
2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760
 WHIRLPOOL 
6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33
-DIST mysql-connector-c-6.1.9-src.tar.gz 3494748 SHA256 
4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b SHA512 
3127d08428e820044e25ab5ebb741a128325be6ca0fca0300cab33891693e11e57d4ded5a25918a67d23cceb8a2c6ee99879ffb50c31bc4c2e225a9dba9674dc
 WHIRLPOOL 
7f0cb1fa7bb0f77447f4884b567e7881d8d9c1dda2e27250838fe8a51ac4ddcb8f7aa683fe11a3f7f9545f90918b15fe9e033da138c86e5bd4f360164ebaeb2e

diff --git a/dev-db/mysql-connector-c/files/conn-c-includes.patch 
b/dev-db/mysql-connector-c/files/conn-c-includes.patch
deleted file mode 100644
index fcde71f3f4e..000
--- a/dev-db/mysql-connector-c/files/conn-c-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt
 a/include/CMakeLists.txt   2015-07-14 13:06:04.424091000 -0400
-+++ b/include/CMakeLists.txt   2015-07-14 13:24:43.434091000 -0400
-@@ -55,6 +55,11 @@
-   byte_order_generic_x86.h
-   little_endian.h
-   big_endian.h
-+  my_thread_local.h
-+  thr_cond.h
-+  thr_lock.h
-+  thr_mutex.h
-+  thr_rwlock.h
-   ${HEADERS_GEN_CONFIGURE}
- )
- 

diff --git a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch 
b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
deleted file mode 100644
index 3a5f53e7ba3..000
--- a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake
 a/cmake/ssl.cmake  2014-11-21 00:39:51.0 -0500
-+++ b/cmake/ssl.cmake  2015-01-27 08:45:36.771744344 -0500
-@@ -166,7 +166,7 @@
- # Encoded as MNNFFPPS: major minor fix patch status
- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-   OPENSSL_VERSION_NUMBER
--  REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-+  REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
- )
- STRING(REGEX REPLACE
-   "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild 
b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
deleted file mode 100644
index 1813980a093..000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-MULTILIB_WRAPPED_HEADERS+=(
-   /usr/include/mysql/my_config.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/;
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz;
-S="${WORKDIR}/${P}-src"

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

2017-01-27 Thread Brian Evans 
commit: 9b3d0ae79e7ec81d1a9232ee9df06520aca333bf
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jan 27 13:49:22 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Jan 27 13:49:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3d0ae7

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

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/dev-db/mysql-connector-c++/Manifest 
b/dev-db/mysql-connector-c++/Manifest
index c19c10b..45050af 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.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

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
new file mode 100644
index ..a2a33e0
--- /dev/null
+++ 
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
@@ -0,0 +1,45 @@
+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 */
++#ifndef MARIADB_BASE_VERSION
+   } else if ( proxy->get_server_version() >= 50703 ) {
+ try {
+   if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
+@@ -1036,6 +1037,7 @@
+   CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), 
proxy->sqlstate().c_str(), proxy->error().c_str());
+   throw e;
+ }
++#endif
+   }
+ }
+ /* }}} */
+@@ -1053,11 +1055,13 @@
+ MY_CHARSET_INFO cs;
+ proxy->get_character_set_info();
+ return cs.dir ? sql::SQLString(cs.dir) : "";
++#ifndef MARIADB_BASE_VERSION
+   } else if ( proxy->get_server_version() >= 50703 ) {
+ const char* optionValue= NULL;
+ if (GET_CONN_OPTION(optionName, , stringOptions)) {
+   return optionValue ? sql::SQLString(optionValue) : "";
+ }
++#endif
+   }
+   return "";
+ }
+diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp 
b/driver/nativeapi/libmysql_static_proxy.cpp
+--- a/driver/nativeapi/libmysql_static_proxy.cpp   2017-01-26 
16:35:46.256038741 -0500
 b/driver/nativeapi/libmysql_static_proxy.cpp   2017-01-26 
16:28:34.114915809 -0500
+@@ -319,7 +319,7 @@
+ 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 )
+   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.8.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild
new file mode 100644
index ..c3a6e0f
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/;
+URI_DIR="Connector-C++"
+SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"