Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mysql-connector-cpp for
openSUSE:Factory checked in at 2021-11-05 22:59:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Fri Nov 5 22:59:07 2021 rev:31 rq:929712 version:8.0.27
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2021-06-07 22:44:31.872589563 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.1890/mysql-connector-cpp.changes
2021-11-05 22:59:24.756312189 +0100
@@ -1,0 +2,16 @@
+Tue Nov 2 11:38:38 UTC 2021 - Mykola Krachkovsky <[email protected]>
+
+- Updated to version 8.0.27
+ * release notes:
+ https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-26.html
+ https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-27.html
+- Dependency on dl fixed upstream
+ * dropped mysql-connector-cpp-dlfcn.patch
+- Dynamic library fixed absent bind_param
+ * modified mysql-connector-cpp-libmysql_dynamic_proxy_typos.patch
+- Commented out new mysql features
+ * modified mysql-connector-cpp-mariadb.patch
+- Internal protobuf changed upstream
+ * modified mysql-connector-cpp-use-system-protobuf.patch
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-c++-8.0.25-src.tar.gz
mysql-connector-cpp-dlfcn.patch
New:
----
mysql-connector-c++-8.0.27-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.HOw5Y9/_old 2021-11-05 22:59:26.344313249 +0100
+++ /var/tmp/diff_new_pack.HOw5Y9/_new 2021-11-05 22:59:26.344313249 +0100
@@ -19,7 +19,7 @@
%define libname libmysqlcppconn9
%define x_libname libmysqlcppconn8-2
Name: mysql-connector-cpp
-Version: 8.0.25
+Version: 8.0.27
Release: 0
Summary: MySQL Connector/C++: Standardized database driver for C++
development
License: SUSE-GPL-2.0-with-FLOSS-exception
@@ -32,8 +32,6 @@
Patch3: mysql-connector-cpp-libmysql_dynamic_proxy_typos.patch
# PATCH-FIX-OPENSUSE fix library to work with MariaDB instead of MySQL
Patch4: mysql-connector-cpp-mariadb.patch
-# PATCH-FIX-OPENSUSE fix absence of -ldl
-Patch5: mysql-connector-cpp-dlfcn.patch
# PATCH-FIX-OPENSUSE use system protobuf (due to some build issues in OBS)
Patch6: mysql-connector-cpp-use-system-protobuf.patch
# PATCH-FIX-OPENSUSE test for optional flag (not present in mariadb or older
mysql)
@@ -143,6 +141,7 @@
-DMYSQLCPPCONN_GCOV_ENABLE=OFF \
-DMYSQLCPPCONN_ICU_ENABLE=OFF \
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+ -DMYSQLCLIENT_STATIC_LINKING=OFF \
-DMYSQLCLIENT_STATIC_BINDING=0 \
-DMYSQL_CXX_LINKAGE=0 \
-DWITH_JDBC=ON \
++++++ mysql-connector-c++-8.0.25-src.tar.gz ->
mysql-connector-c++-8.0.27-src.tar.gz ++++++
++++ 591884 lines of diff (skipped)
++++++ mysql-connector-cpp-libmysql_dynamic_proxy_typos.patch ++++++
--- /var/tmp/diff_new_pack.HOw5Y9/_old 2021-11-05 22:59:27.300313888 +0100
+++ /var/tmp/diff_new_pack.HOw5Y9/_new 2021-11-05 22:59:27.300313888 +0100
@@ -5,51 +5,8 @@
int
LibmysqlDynamicProxy::get_option(MYSQL * mysql, enum mysql_option option,
const void *arg)
{
-- ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_options>(GetProcAddr("mysql_get_option"));
-+ ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_get_option>(GetProcAddr("mysql_get_option"));
+- static ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_options>(GetProcAddr("mysql_get_option"));
++ static ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_get_option>(GetProcAddr("mysql_get_option"));
if (ptr2_get_option != NULL) {
if (((*ptr2_get_option)(mysql, option, arg))) {
throw sql::InvalidArgumentException("Unsupported option provided to
mysql_get_option()");
-@@ -512,6 +512,17 @@
- /* }}} */
-
-
-+/* {{{ LibmysqlDynamicProxy::bind_param() */
-+bool
-+LibmysqlDynamicProxy::bind_param(MYSQL *mysql, unsigned n_params,
-+ st_mysql_bind *binds, const char **names)
-+{
-+ ptr2mysql_bind_param ptr2_bind_param =
symbol_safe_cast<ptr2mysql_bind_param>(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 -uNr
mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
----
mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
2021-03-15 17:21:15.000000000 +0200
-+++
mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/libmysql_dynamic_proxy.h
2021-05-12 16:56:10.590130798 +0300
-@@ -142,6 +142,9 @@
- const char * db,
- unsigned long client_flag);
-
-+ bool bind_param(MYSQL *mysql, unsigned n_params,
-+ MYSQL_BIND *binds, const char **names) override;
-+
- unsigned long real_escape_string(MYSQL * mysql, char * to, const char *
from, unsigned long length);
-
- int real_query(MYSQL *, const char *, unsigned long);
-diff -uNr
mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/mysql_client_api.h
mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/mysql_client_api.h
---- mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/mysql_client_api.h
2021-03-15 17:21:15.000000000 +0200
-+++ mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/mysql_client_api.h
2021-05-12 17:44:06.645123816 +0300
-@@ -111,6 +111,8 @@
-
- typedef MYSQL * (STDCALL *ptr2mysql_real_connect_dns_srv)(MYSQL *, const char
*, const char *, const char * , const char *, unsigned long);
-
-+typedef bool (STDCALL *ptr2mysql_bind_param)(MYSQL *, unsigned, MYSQL_BIND *,
const char **);
-+
- typedef unsigned long (STDCALL *ptr2mysql_real_escape_string)(MYSQL * mysql,
char *, const char *, unsigned long);
-
- typedef int (STDCALL *ptr2mysql_real_query)(MYSQL *, const char *, unsigned
long);
++++++ mysql-connector-cpp-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.HOw5Y9/_old 2021-11-05 22:59:27.312313896 +0100
+++ /var/tmp/diff_new_pack.HOw5Y9/_new 2021-11-05 22:59:27.312313896 +0100
@@ -58,12 +58,30 @@
bool secure_auth= true;
#endif
+@@ -602,7 +602,7 @@
+ } else {
+ throw sql::InvalidArgumentException("No string value passed for
password");
+ }
+- } else if (!it->first.compare(OPT_PASSWORD1)) {
++ /*} else if (!it->first.compare(OPT_PASSWORD1)) {
+ try {
+ p_s = (it->second).get< sql::SQLString >();
+ } catch (sql::InvalidArgumentException&) {
+@@ -638,7 +638,7 @@
+ } else {
+ throw sql::InvalidArgumentException("No string value passed for
password3");
+ }
+- } else if (!it->first.compare(OPT_PORT)) {
++ */} else if (!it->first.compare(OPT_PORT)) {
+ try {
+ p_i = (it->second).get< int >();
+ } catch (sql::InvalidArgumentException&) {
@@ -902,7 +902,7 @@
} catch (sql::InvalidArgumentException&) {
throw sql::InvalidArgumentException("Wrong type passed for
useLegacyAuth expected sql::SQLString");
}
--#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000
-+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 ||
defined(MYCPPCONN_MARIADB_BUILD)
+- #if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000
++ #if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 ||
defined(MYCPPCONN_MARIADB_BUILD)
if (p_b) {
secure_auth= !*p_b;
} else {
@@ -71,11 +89,27 @@
} else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) {
proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);
--#if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000
-+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
+- #if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000
++ #if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000 &&
!defined(MYCPPCONN_MARIADB_BUILD)
//Deprecated
} else if (!it->first.compare("sslVerify")) {
+@@ -961,6 +961,7 @@
+ throw sql::InvalidArgumentException("Wrong type passed for
OPT_OCI_CONFIG_FILE. Expected sql::SQLString.");
+ }
+
++ /*
+ try {
+ proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+ "authentication_oci_client",
+@@ -972,6 +972,7 @@
+ OPT_OCI_CONFIG_FILE
+ );
+ }
++ */
+
+ }
+ else if (!it->first.compare(OPT_PLUGIN_DIR)) {
@@ -1000,7 +1000,7 @@
}
@@ -242,15 +276,3 @@
if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h")
message(FATAL_ERROR "Could not find \"mysql.h\" in
\"${MYSQL_INCLUDE_DIR}\" "
"found from running \"${MYSQL_CONFIG_EXECUTABLE}\"")
-diff -uNr mysql-connector-c++-8.0.15-org/jdbc.cmake
mysql-connector-c++-8.0.15-src/jdbc.cmake
---- mysql-connector-c++-8.0.15-org/jdbc.cmake 2019-01-28 09:12:59.000000000
+0200
-+++ mysql-connector-c++-8.0.15-src/jdbc.cmake 2019-02-16 12:26:42.480429868
+0200
-@@ -66,7 +66,7 @@
- list(APPEND jdbc_cmake_opts
-DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE})
- endif()
-
--list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
-+#list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
-
- if(CMAKE_BUILD_TYPE)
- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
++++++ mysql-connector-cpp-use-system-protobuf.patch ++++++
--- /var/tmp/diff_new_pack.HOw5Y9/_old 2021-11-05 22:59:27.320313902 +0100
+++ /var/tmp/diff_new_pack.HOw5Y9/_new 2021-11-05 22:59:27.324313903 +0100
@@ -1,11 +1,8 @@
diff -uNr mysql-connector-c++-8.0.20-org/cdk/CMakeLists.txt
mysql-connector-c++-8.0.20-src/cdk/CMakeLists.txt
--- mysql-connector-c++-8.0.20-org/cdk/CMakeLists.txt 2020-03-13
22:10:58.000000000 +0200
+++ mysql-connector-c++-8.0.20-src/cdk/CMakeLists.txt 2020-05-13
18:37:49.147107797 +0300
-@@ -94,9 +94,9 @@
- #
-
- find_dependency(SSL)
--find_dependency(Protobuf)
+@@ -97,6 +97,7 @@
+ #find_dependency(Protobuf)
find_dependency(RapidJSON)
find_dependency(Coverage)
+find_package(Protobuf REQUIRED)
@@ -19,7 +16,7 @@
target_link_libraries(cdk
PUBLIC cdk_mysqlx cdk_parser
-- PRIVATE Protobuf::pb-lite # required by codecc.cc
+- PRIVATE ext::pb-lite # required by codecc.cc
+ PRIVATE protobuf::libprotobuf-lite # required by codecc.cc
)
@@ -93,15 +90,15 @@
mysqlx_protobuf_generate_cpp(PB_SRCS PB_HDRS ${proto_mysqlx_defs})
-@@ -128,9 +187,9 @@
+@@ -130,9 +187,9 @@
)
if(use_full_protobuf)
-- target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-full)
+- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-full)
+ target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf::libprotobuf)
else()
-- target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-lite)
+- target_link_libraries(cdk_proto_mysqlx PRIVATE ext::pb-lite)
+ target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf::libprotobuf-lite)
endif()
- target_link_libraries(cdk_proto_mysqlx PRIVATE cdk_foundation zlib lz4 zstd)
+ target_link_libraries(cdk_proto_mysqlx
