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 2023-06-13 16:10:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Tue Jun 13 16:10:34 2023 rev:34 rq:1092778 version:8.0.33
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2023-02-10 14:34:24.861595711 +0100
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new.15902/mysql-connector-cpp.changes
2023-06-13 16:10:36.331273168 +0200
@@ -1,0 +2,11 @@
+Sun Jun 11 16:34:14 UTC 2023 - marec <[email protected]>
+
+- Updated to version 8.0.33
+ * release notes:
+ https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-33.html
+- Rebased mysql-connector-cpp-mariadb.patch
+- Removed cdk/include/mysql/cdk/foundation/CMakeLists.txt patch from
mysql-connector-cpp-test-feature.patch
+- Added mysql-connector-cpp-library.patch
+- Removed unrecognized cmake flags from spec file
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-c++-8.0.32-src.tar.gz
New:
----
mysql-connector-c++-8.0.33-src.tar.gz
mysql-connector-cpp-library.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.aSxSK0/_old 2023-06-13 16:10:37.463279846 +0200
+++ /var/tmp/diff_new_pack.aSxSK0/_new 2023-06-13 16:10:37.471279893 +0200
@@ -19,7 +19,7 @@
%define libname libmysqlcppconn9
%define x_libname libmysqlcppconn8-2
Name: mysql-connector-cpp
-Version: 8.0.32
+Version: 8.0.33
Release: 0
Summary: MySQL Connector/C++: Standardized database driver for C++
development
License: SUSE-GPL-2.0-with-FLOSS-exception
@@ -36,6 +36,8 @@
Patch6: mysql-connector-cpp-use-system-protobuf.patch
# PATCH-FIX-OPENSUSE test for optional flag (not present in mariadb or older
mysql)
Patch7: mysql-connector-cpp-test-feature.patch
+# PATCH-FIX-UPSTREAM
+Patch8: mysql-connector-cpp-library.patch
BuildRequires: cmake >= 2.6.2
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -138,13 +140,11 @@
%build
%cmake \
- -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 \
+ -DWITH_ZLIB=ON \
+ -DBUILD_STATIC=OFF \
+ -DMYSQLCLIENT_STATIC_LINKING=OFF \
+ -DMYSQLCLIENT_STATIC_BINDING=OFF \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}
%cmake_build
++++++ mysql-connector-c++-8.0.32-src.tar.gz ->
mysql-connector-c++-8.0.33-src.tar.gz ++++++
++++ 78489 lines of diff (skipped)
++++++ mysql-connector-cpp-library.patch ++++++
--- a/jdbc/driver/nativeapi/library_loader.h 2023-03-23 17:32:48.000000000
+0100
+++ b/jdbc/driver/nativeapi/library_loader.h 2023-06-12 20:36:21.568650185
+0200
@@ -34,6 +34,7 @@
#define _MYSQL_LIB_LOADER_H_
#include "binding_config.h"
+#include "../mysql_util.h"
#ifdef _WIN32
#include <windows.h>
++++++ mysql-connector-cpp-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.aSxSK0/_old 2023-06-13 16:10:38.331284967 +0200
+++ /var/tmp/diff_new_pack.aSxSK0/_new 2023-06-13 16:10:38.339285014 +0200
@@ -13,7 +13,7 @@
===================================================================
--- a/jdbc/driver/mysql_connection.cpp
+++ b/jdbc/driver/mysql_connection.cpp
-@@ -268,7 +268,7 @@ static const String2IntMap booleanOption
+@@ -268,7 +268,7 @@
{OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true},
{OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_RESET, true},
{OPT_RECONNECT, MYSQL_OPT_RECONNECT, true},
@@ -22,7 +22,7 @@
{"sslVerify", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false},
// Deprecated
{"sslEnforce", MYSQL_OPT_SSL_ENFORCE, false} //
Deprecated
#else
-@@ -290,9 +290,9 @@ static const String2IntMap intOptions[]=
+@@ -290,9 +290,9 @@
{OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_MAX_ALLOWED_PACKET, false},
{OPT_NET_BUFFER_LENGTH, MYSQL_OPT_NET_BUFFER_LENGTH, false},
#endif
@@ -35,7 +35,7 @@
{OPT_RETRY_COUNT, MYSQL_OPT_RETRY_COUNT, false},
#endif
};
-@@ -321,7 +321,7 @@ static const String2IntMap stringOptions
+@@ -321,7 +321,7 @@
{OPT_TLS_VERSION, MYSQL_OPT_TLS_VERSION, true},
{"OPT_TLS_VERSION", MYSQL_OPT_TLS_VERSION, true},
#endif
@@ -44,7 +44,7 @@
};
-@@ -330,7 +330,7 @@ static const String2IntMap stringOptions
+@@ -330,7 +330,7 @@
inline
::sql::mysql::MySQL_Connection_Options option_conversion(unsigned long
client_version, int option)
{
@@ -53,7 +53,7 @@
if(client_version <80011)
{
switch (option) {
-@@ -520,7 +520,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -520,7 +520,7 @@
int client_exp_pwd = false;
bool opt_dns_srv = false;
bool opt_multi_host = false;
@@ -62,7 +62,7 @@
bool secure_auth= true;
#endif
-@@ -636,7 +636,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -648,7 +648,7 @@
} else {
throw sql::InvalidArgumentException("No string value passed for
password");
}
@@ -71,7 +71,7 @@
try {
p_s = (it->second).get< sql::SQLString >();
} catch (sql::InvalidArgumentException&) {
-@@ -672,7 +672,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -684,7 +684,7 @@
} else {
throw sql::InvalidArgumentException("No string value passed for
password3");
}
@@ -80,7 +80,7 @@
try {
p_i = (it->second).get< int >();
} catch (sql::InvalidArgumentException&) {
-@@ -936,7 +936,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -948,7 +948,7 @@
} catch (sql::InvalidArgumentException&) {
throw sql::InvalidArgumentException("Wrong type passed for
useLegacyAuth expected sql::SQLString");
}
@@ -89,7 +89,7 @@
if (p_b) {
secure_auth= !*p_b;
} else {
-@@ -978,7 +978,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -997,7 +997,7 @@
} else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) {
proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0);
@@ -98,7 +98,7 @@
//Deprecated
} else if (!it->first.compare("sslVerify")) {
-@@ -993,7 +993,6 @@ void MySQL_Connection::init(ConnectOptio
+@@ -1012,7 +1012,6 @@
:
SSL_MODE_PREFERRED;
proxy->options(MYSQL_OPT_SSL_MODE, &ssl_mode_val);
@@ -106,7 +106,7 @@
} else if (!it->first.compare(OPT_OCI_CONFIG_FILE)) {
try {
p_s= (it->second).get<sql::SQLString>();
-@@ -1035,6 +1034,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -1074,6 +1073,7 @@
OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE);
}
#endif // defined(_WIN32)
@@ -114,7 +114,23 @@
} else if (!it->first.compare(OPT_PLUGIN_DIR)) {
// Nothing to do here: this option was handeld before the loop
-@@ -1080,7 +1080,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -1100,6 +1100,7 @@
+
+ } /* End of cycle on connection options map */
+
++ #if !defined(MYCPPCONN_MARIADB_BUILD)
+ if (oci_plugin_is_loaded) {
+ if (properties.find(OPT_OCI_CONFIG_FILE) == properties.end()) {
+ // If OCI plugin is loaded, but oci-config-file is not explicitly set
+@@ -1128,6 +1129,7 @@
+ }
+
+ }
++ #endif
+
+ #undef PROCESS_CONNSTR_OPTION
+
+@@ -1147,7 +1149,7 @@
}
@@ -123,7 +139,7 @@
try {
proxy->options(MYSQL_SECURE_AUTH, &secure_auth);
} catch (sql::InvalidArgumentException& e) {
-@@ -1215,6 +1215,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -1282,6 +1284,7 @@
}
@@ -131,7 +147,7 @@
/*
* Helper class to simplify setting and resetting of the plugin callback.
*/
-@@ -1272,6 +1273,7 @@ void MySQL_Connection::init(ConnectOptio
+@@ -1339,6 +1342,7 @@
Fido_Callback_Setter setter(
static_cast<MySQL_Driver*>(driver)->fido_callback,
proxy.get());
@@ -139,7 +155,7 @@
//Connect loop
{
-@@ -1846,7 +1848,7 @@ MySQL_Connection::setClientOption(const
+@@ -1914,7 +1918,7 @@
#endif
} else if (!optionName.compare(OPT_LOAD_DATA_LOCAL_DIR))
{
@@ -220,9 +236,9 @@
===================================================================
--- a/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
+++ b/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h
-@@ -60,7 +60,7 @@ class MySQL_NativeConnectionWrapper : pu
- boost::shared_ptr< IMySQLCAPI > api;
-
+@@ -59,7 +59,7 @@
+ /* api should be declared before mysql here */
+ std::shared_ptr<IMySQLCAPI> api;
-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
+#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
@@ -273,8 +289,8 @@
--- a/jdbc/driver/nativeapi/native_resultset_wrapper.h
+++ b/jdbc/driver/nativeapi/native_resultset_wrapper.h
@@ -41,7 +41,7 @@
-
#include "../cppconn/version_info.h"
+ #include "../mysql_util.h"
-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
+#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
@@ -283,11 +299,11 @@
struct st_mysql_field;
Index: b/jdbc/driver/nativeapi/native_statement_wrapper.h
===================================================================
---- a/jdbc/driver/nativeapi/native_statement_wrapper.h
-+++ b/jdbc/driver/nativeapi/native_statement_wrapper.h
+--- a/jdbc/driver/nativeapi/native_statement_wrapper.h 2023-03-23
17:32:48.000000000 +0100
++++ b/jdbc/driver/nativeapi/native_statement_wrapper.h 2023-06-11
18:31:20.354495130 +0200
@@ -42,7 +42,7 @@
+ #include "../mysql_util.h"
#include "../mysql_statement_options.h"
- #include <cppconn/version_info.h>
-#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
+#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 &&
!defined(MYCPPCONN_MARIADB_BUILD))
++++++ mysql-connector-cpp-test-feature.patch ++++++
--- /var/tmp/diff_new_pack.aSxSK0/_old 2023-06-13 16:10:38.351285084 +0200
+++ /var/tmp/diff_new_pack.aSxSK0/_new 2023-06-13 16:10:38.355285109 +0200
@@ -14,18 +14,4 @@
}
/* }}} */
-Index: b/cdk/include/mysql/cdk/foundation/CMakeLists.txt
-===================================================================
---- a/cdk/include/mysql/cdk/foundation/CMakeLists.txt
-+++ b/cdk/include/mysql/cdk/foundation/CMakeLists.txt
-@@ -48,7 +48,8 @@ CHECK_CXX_SOURCE_COMPILES(
- ADD_CONFIG(HAVE_STATIC_ASSERT)
-
- CHECK_CXX_SOURCE_COMPILES(
-- "void main() { return is_same<bool,char>::value; }"
-+ "#include <type_traits>
-+ int main() { return std::is_same<bool,char>::value; }"
- HAVE_IS_SAME)
- ADD_CONFIG(HAVE_IS_SAME)
-
