[mysql-connector-odbc] Update to 2.5.6 Resolves: #1047895
Jakub QB Dorňák
jdornak at fedoraproject.org
Fri Jan 24 15:19:50 UTC 2014
commit 3bde5792b025a8044709e335c6260c94b4696ee5
Author: Jakub Dorňák <jdornak at redhat.com>
Date: Fri Jan 24 16:18:17 2014 +0100
Update to 2.5.6
Resolves: #1047895
.gitignore | 1 +
myodbc-64bit.patch | 34 ++++++++++++++--------------
myodbc-add-mysys.patch | 6 ++--
myodbc-libdir.patch | 8 +++---
myodbc-libname.patch | 24 -------------------
myodbc-maria.patch | 12 +++++-----
myodbc-movecmpfunc.patch | 22 +++++++++---------
myodbc-shutdown.patch | 11 ++++-----
mysql-connector-odbc-5.2.5-aarch64.patch | 7 +++--
mysql-connector-odbc-buffsize.patch | 6 ++--
mysql-connector-odbc-cleartext.patch | 8 +++---
mysql-connector-odbc-cond.patch | 26 ---------------------
mysql-connector-odbc-format-security.patch | 12 +++++-----
mysql-connector-odbc.spec | 32 ++++++++++++--------------
sources | 3 +-
15 files changed, 80 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6270589..c315d8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/mysql-mysys.tar.gz
/mysql-connector-odbc-5.2.4-src.tar.gz
/mysql-connector-odbc-5.2.5-src.tar.gz
+/mysql-connector-odbc-5.2.6-src.tar.gz
diff --git a/myodbc-64bit.patch b/myodbc-64bit.patch
index 3e8e1eb..1f9e76d 100644
--- a/myodbc-64bit.patch
+++ b/myodbc-64bit.patch
@@ -1,8 +1,8 @@
Fix some 64-bitness issues arising from unixODBC 2.2.14 changes.
-diff -up mysql-connector-odbc-5.2.4-src/driver/utility.c.p3 mysql-connector-odbc-5.2.4-src/driver/utility.c
---- mysql-connector-odbc-5.2.4-src/driver/utility.c.p3 2013-01-24 18:43:33.000000000 +0100
-+++ mysql-connector-odbc-5.2.4-src/driver/utility.c 2013-02-22 13:22:14.142767103 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/driver/utility.c mysql-connector-odbc-5.2.6-src/driver/utility.c
+--- mysql-connector-odbc-5.2.6-src.orig/driver/utility.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/driver/utility.c 2014-01-24 10:30:25.223785969 +0100
@@ -1219,7 +1219,7 @@ SQLLEN fill_display_size_buff(char *buff
{
/* See comment for fill_transfer_oct_len_buff()*/
@@ -31,21 +31,21 @@ diff -up mysql-connector-odbc-5.2.4-src/driver/utility.c.p3 mysql-connector-odbc
return size;
}
-diff -up mysql-connector-odbc-5.2.4-src/test/my_catalog1.c.p3 mysql-connector-odbc-5.2.4-src/test/my_catalog1.c
---- mysql-connector-odbc-5.2.4-src/test/my_catalog1.c.p3 2013-02-22 13:23:30.260761898 +0100
-+++ mysql-connector-odbc-5.2.4-src/test/my_catalog1.c 2013-02-22 13:25:08.554755176 +0100
-@@ -623,7 +623,7 @@ DECLARE_TEST(t_tables_bug)
- fprintf(stdout, "# Column Name : %s\n", szColName);
- fprintf(stdout, "# NameLengh : %d\n", pcbColName);
- fprintf(stdout, "# DataType : %d\n", pfSqlType);
-- fprintf(stdout, "# ColumnSize : %d\n", pcbColDef);
-+ fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef);
- fprintf(stdout, "# DecimalDigits : %d\n", pibScale);
- fprintf(stdout, "# Nullable : %d\n", pfNullable);
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/test/my_catalog1.c mysql-connector-odbc-5.2.6-src/test/my_catalog1.c
+--- mysql-connector-odbc-5.2.6-src.orig/test/my_catalog1.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/test/my_catalog1.c 2014-01-24 10:30:25.224785969 +0100
+@@ -627,7 +627,7 @@ DECLARE_TEST(t_tables_bug)
+ printMessage(" Column Name : %s", szColName);
+ printMessage(" NameLengh : %d", pcbColName);
+ printMessage(" DataType : %d", pfSqlType);
+- printMessage(" ColumnSize : %d", pcbColDef);
++ printMessage(" ColumnSize : %ld", pcbColDef);
+ printMessage(" DecimalDigits : %d", pibScale);
+ printMessage(" Nullable : %d", pfNullable);
-diff -up mysql-connector-odbc-5.2.4-src/test/my_cursor.c.p3 mysql-connector-odbc-5.2.4-src/test/my_cursor.c
---- mysql-connector-odbc-5.2.4-src/test/my_cursor.c.p3 2013-01-24 18:43:33.000000000 +0100
-+++ mysql-connector-odbc-5.2.4-src/test/my_cursor.c 2013-02-22 13:22:16.812766920 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/test/my_cursor.c mysql-connector-odbc-5.2.6-src/test/my_cursor.c
+--- mysql-connector-odbc-5.2.6-src.orig/test/my_cursor.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/test/my_cursor.c 2014-01-24 10:30:25.224785969 +0100
@@ -711,7 +711,7 @@ DECLARE_TEST(t_pos_datetime_delete1)
rc = SQLRowCount(hstmt1,&row_count);
diff --git a/myodbc-add-mysys.patch b/myodbc-add-mysys.patch
index 7f1efa5..1c57304 100644
--- a/myodbc-add-mysys.patch
+++ b/myodbc-add-mysys.patch
@@ -1,8 +1,8 @@
Add files extracted from mysql into the driver build script.
-diff -up mysql-connector-odbc-5.2.4-src/util/CMakeLists.txt.mysys mysql-connector-odbc-5.2.4-src/util/CMakeLists.txt
---- mysql-connector-odbc-5.2.4-src/util/CMakeLists.txt.mysys 2013-01-24 18:43:33.000000000 +0100
-+++ mysql-connector-odbc-5.2.4-src/util/CMakeLists.txt 2013-03-25 19:17:17.320764909 +0100
+diff -up mysql-connector-odbc-5.2.6-src.orig/util/CMakeLists.txt mysql-connector-odbc-5.2.6-src/util/CMakeLists.txt
+--- mysql-connector-odbc-5.2.6-src.orig/util/CMakeLists.txt 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/util/CMakeLists.txt 2013-03-25 19:17:17.320764909 +0100
@@ -26,7 +26,24 @@ SET(myodbc3u_SRCS stringutil.c
stringutil.h
unicode_transcode.c
diff --git a/myodbc-libdir.patch b/myodbc-libdir.patch
index 5ecf2bb..b534970 100644
--- a/myodbc-libdir.patch
+++ b/myodbc-libdir.patch
@@ -1,7 +1,7 @@
-diff -up mysql-connector-odbc-5.2.4-src/CMakeLists.txt.libdir mysql-connector-odbc-5.2.4-src/CMakeLists.txt
---- mysql-connector-odbc-5.2.4-src/CMakeLists.txt.libdir 2013-04-03 02:18:49.002164793 -0400
-+++ mysql-connector-odbc-5.2.4-src/CMakeLists.txt 2013-04-03 03:05:55.840694007 -0400
-@@ -228,7 +228,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINA
+diff -up mysql-connector-odbc-5.2.6-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.6-src/CMakeLists.txt
+--- mysql-connector-odbc-5.2.6-src.orig/CMakeLists.txt 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/CMakeLists.txt 2014-01-24 13:16:37.569724051 +0100
+@@ -242,7 +242,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINA
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
SET(LIB_SUBDIR "lib")
diff --git a/myodbc-maria.patch b/myodbc-maria.patch
index 91c2824..86ad77c 100644
--- a/myodbc-maria.patch
+++ b/myodbc-maria.patch
@@ -1,9 +1,9 @@
MariaDB has slightly changed data types of some variables, so we need to reflect
that in own local copy of mysys files.
-diff -up mysql-connector-odbc-5.1.11-src/util/array.c.maria mysql-connector-odbc-5.1.11-src/util/array.c
---- mysql-connector-odbc-5.1.11-src/util/array.c.maria 2013-02-22 11:51:24.627139740 +0100
-+++ mysql-connector-odbc-5.1.11-src/util/array.c 2013-02-22 11:53:27.766131320 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/array.c mysql-connector-odbc-5.2.6-src/util/array.c
+--- mysql-connector-odbc-5.2.6-src.orig/util/array.c 2010-12-03 18:58:26.000000000 +0100
++++ mysql-connector-odbc-5.2.6-src/util/array.c 2014-01-24 10:33:41.315801726 +0100
@@ -92,7 +92,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY
FALSE Ok
*/
@@ -13,9 +13,9 @@ diff -up mysql-connector-odbc-5.1.11-src/util/array.c.maria mysql-connector-odbc
{
uchar* buffer;
if (array->elements == array->max_element)
-diff -up mysql-connector-odbc-5.1.11-src/util/int2str.c.maria mysql-connector-odbc-5.1.11-src/util/int2str.c
---- mysql-connector-odbc-5.1.11-src/util/int2str.c.maria 2013-02-22 12:00:37.188101956 +0100
-+++ mysql-connector-odbc-5.1.11-src/util/int2str.c 2013-02-22 12:00:44.097101484 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/int2str.c mysql-connector-odbc-5.2.6-src/util/int2str.c
+--- mysql-connector-odbc-5.2.6-src.orig/util/int2str.c 2010-12-03 18:58:26.000000000 +0100
++++ mysql-connector-odbc-5.2.6-src/util/int2str.c 2014-01-24 10:33:41.315801726 +0100
@@ -19,9 +19,9 @@
/*
_dig_vec arrays are public because they are used in several outer places.
diff --git a/myodbc-movecmpfunc.patch b/myodbc-movecmpfunc.patch
index ddca78c..a158a1e 100644
--- a/myodbc-movecmpfunc.patch
+++ b/myodbc-movecmpfunc.patch
@@ -8,10 +8,10 @@ However, the only function doing that is defined at driver/utility.c so it
would be better to move it to util/stringutil.c and have it available as
a general purpose function. That's basically what this patch does.
-diff -up mysql-connector-odbc-5.2.4-src/driver/utility.c.p5 mysql-connector-odbc-5.2.4-src/driver/utility.c
---- mysql-connector-odbc-5.2.4-src/driver/utility.c.p5 2013-02-25 14:37:53.459350162 +0100
-+++ mysql-connector-odbc-5.2.4-src/driver/utility.c 2013-02-25 14:37:53.494350161 +0100
-@@ -2239,33 +2239,6 @@ my_bool reget_current_catalog(DBC FAR *d
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/driver/utility.c mysql-connector-odbc-5.2.6-src/driver/utility.c
+--- mysql-connector-odbc-5.2.6-src.orig/driver/utility.c 2014-01-24 10:36:10.476862138 +0100
++++ mysql-connector-odbc-5.2.6-src/driver/utility.c 2014-01-24 10:36:20.521867126 +0100
+@@ -2277,33 +2277,6 @@ my_bool reget_current_catalog(DBC *dbc)
/*
@@ -45,10 +45,10 @@ diff -up mysql-connector-odbc-5.2.4-src/driver/utility.c.p5 mysql-connector-odbc
@type : myodbc3 internal
@purpose : logs the queries sent to server
*/
-diff -up mysql-connector-odbc-5.2.4-src/util/stringutil.c.p5 mysql-connector-odbc-5.2.4-src/util/stringutil.c
---- mysql-connector-odbc-5.2.4-src/util/stringutil.c.p5 2013-01-24 18:43:33.000000000 +0100
-+++ mysql-connector-odbc-5.2.4-src/util/stringutil.c 2013-02-25 14:38:37.263348956 +0100
-@@ -905,13 +906,40 @@ static const MY_CSET_OS_NAME charsets[]=
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/stringutil.c mysql-connector-odbc-5.2.6-src/util/stringutil.c
+--- mysql-connector-odbc-5.2.6-src.orig/util/stringutil.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/util/stringutil.c 2014-01-24 10:36:20.522867127 +0100
+@@ -918,13 +918,40 @@ static const MY_CSET_OS_NAME charsets[]=
};
@@ -90,9 +90,9 @@ diff -up mysql-connector-odbc-5.2.4-src/util/stringutil.c.p5 mysql-connector-odb
{
switch (csp->param)
{
-diff -up mysql-connector-odbc-5.2.4-src/util/stringutil.h.p5 mysql-connector-odbc-5.2.4-src/util/stringutil.h
---- mysql-connector-odbc-5.2.4-src/util/stringutil.h.p5 2013-01-24 18:43:33.000000000 +0100
-+++ mysql-connector-odbc-5.2.4-src/util/stringutil.h 2013-02-25 14:37:53.498350161 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/stringutil.h mysql-connector-odbc-5.2.6-src/util/stringutil.h
+--- mysql-connector-odbc-5.2.6-src.orig/util/stringutil.h 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/util/stringutil.h 2014-01-24 10:36:20.522867127 +0100
@@ -117,6 +117,8 @@ size_t sqlwcharncat2(SQLWCHAR *dest, con
SQLWCHAR *sqlwcharncpy(SQLWCHAR *dest, const SQLWCHAR *src, size_t n);
diff --git a/myodbc-shutdown.patch b/myodbc-shutdown.patch
index 424774d..f6dbf3f 100644
--- a/myodbc-shutdown.patch
+++ b/myodbc-shutdown.patch
@@ -5,11 +5,10 @@ accounts for our bug #185343 and several bugs filed at mysql.com.
Furthermore, my_end() isn't exported from libmysqlclient anymore.
Hence, best fix is to turn the function into a no-op.
-
-diff -Naur mysql-connector-odbc-5.1.9.orig/driver/dll.c mysql-connector-odbc-5.1.9/driver/dll.c
---- mysql-connector-odbc-5.1.9.orig/driver/dll.c 2011-10-04 16:19:00.000000000 -0400
-+++ mysql-connector-odbc-5.1.9/driver/dll.c 2012-01-10 15:56:41.988087855 -0500
-@@ -94,6 +94,7 @@
+diff -up mysql-connector-odbc-5.2.6-src.orig/driver/dll.c mysql-connector-odbc-5.2.6-src/driver/dll.c
+--- mysql-connector-odbc-5.2.6-src.orig/driver/dll.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/driver/dll.c 2014-01-24 10:16:45.729228067 +0100
+@@ -96,6 +96,7 @@ void myodbc_init(void)
*/
void myodbc_end()
{
@@ -17,7 +16,7 @@ diff -Naur mysql-connector-odbc-5.1.9.orig/driver/dll.c mysql-connector-odbc-5.1
if (!--myodbc_inited)
{
x_free(decimal_point);
-@@ -121,6 +122,7 @@
+@@ -123,6 +124,7 @@ void myodbc_end()
my_end(0);
#endif
}
diff --git a/mysql-connector-odbc-5.2.5-aarch64.patch b/mysql-connector-odbc-5.2.5-aarch64.patch
index 79cb997..09ca63e 100644
--- a/mysql-connector-odbc-5.2.5-aarch64.patch
+++ b/mysql-connector-odbc-5.2.5-aarch64.patch
@@ -1,6 +1,7 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -228,7 +228,7 @@
+diff -up mysql-connector-odbc-5.2.6-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.6-src/CMakeLists.txt
+--- mysql-connector-odbc-5.2.6-src.orig/CMakeLists.txt 2014-01-24 13:29:59.032143181 +0100
++++ mysql-connector-odbc-5.2.6-src/CMakeLists.txt 2014-01-24 13:30:09.024135998 +0100
+@@ -242,7 +242,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINA
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
SET(LIB_SUBDIR "lib")
diff --git a/mysql-connector-odbc-buffsize.patch b/mysql-connector-odbc-buffsize.patch
index 9219d58..d92066e 100644
--- a/mysql-connector-odbc-buffsize.patch
+++ b/mysql-connector-odbc-buffsize.patch
@@ -1,9 +1,9 @@
It seems the buffer size is not sufficient in some situations, so we enlarge it as sanity fix.
RHBZ#948619
-diff -up mysql-connector-odbc-5.2.5-src/driver/catalog.c.buffsize mysql-connector-odbc-5.2.5-src/driver/catalog.c
---- mysql-connector-odbc-5.2.5-src/driver/catalog.c.buffsize 2013-05-24 14:13:00.148674573 +0200
-+++ mysql-connector-odbc-5.2.5-src/driver/catalog.c 2013-05-24 14:13:14.338674325 +0200
+diff -up mysql-connector-odbc-5.2.6-src.orig/driver/catalog.c mysql-connector-odbc-5.2.6-src/driver/catalog.c
+--- mysql-connector-odbc-5.2.6-src.orig/driver/catalog.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/driver/catalog.c 2014-01-24 13:19:27.841600436 +0100
@@ -153,7 +153,7 @@ static MYSQL_RES *mysql_table_status_i_s
{
MYSQL *mysql= &stmt->dbc->mysql;
diff --git a/mysql-connector-odbc-cleartext.patch b/mysql-connector-odbc-cleartext.patch
index 83e7d2e..915986b 100644
--- a/mysql-connector-odbc-cleartext.patch
+++ b/mysql-connector-odbc-cleartext.patch
@@ -2,11 +2,11 @@ MySQL added a new connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN and believes
that it is there in every version > 5.5.27. However, it is not in mariadb-5.5.31,
so we cannot use it.
-MariaDB upstream report: https://mariadb.atlassian.net/browse/MDEV-4573
+MariaDB upstream report: https://mariadb.atlassian.net/browse/MDEV-4573
-diff -up mysql-connector-odbc-5.2.5-src/driver/connect.c.cleartext mysql-connector-odbc-5.2.5-src/driver/connect.c
---- mysql-connector-odbc-5.2.5-src/driver/connect.c.cleartext 2013-05-24 15:57:18.954565190 +0200
-+++ mysql-connector-odbc-5.2.5-src/driver/connect.c 2013-05-24 15:58:03.194564417 +0200
+diff -up mysql-connector-odbc-5.2.6-src.orig/driver/connect.c mysql-connector-odbc-5.2.6-src/driver/connect.c
+--- mysql-connector-odbc-5.2.6-src.orig/driver/connect.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/driver/connect.c 2014-01-24 13:22:10.149482711 +0100
@@ -257,7 +257,7 @@ SQLRETURN myodbc_do_connect(DBC *dbc, Da
}
#endif
diff --git a/mysql-connector-odbc-format-security.patch b/mysql-connector-odbc-format-security.patch
index 247ef1d..ea48d48 100644
--- a/mysql-connector-odbc-format-security.patch
+++ b/mysql-connector-odbc-format-security.patch
@@ -1,6 +1,6 @@
-diff --recursive -up mysql-connector-odbc-5.2.5-src.orig/dltest/dltest.c mysql-connector-odbc-5.2.5-src/dltest/dltest.c
---- mysql-connector-odbc-5.2.5-src.orig/dltest/dltest.c 2013-04-04 15:53:56.000000000 +0200
-+++ mysql-connector-odbc-5.2.5-src/dltest/dltest.c 2013-12-12 13:26:29.809956222 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/dltest/dltest.c mysql-connector-odbc-5.2.6-src/dltest/dltest.c
+--- mysql-connector-odbc-5.2.6-src.orig/dltest/dltest.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/dltest/dltest.c 2014-01-24 13:27:51.934235138 +0100
@@ -84,7 +84,7 @@ int main( int argc, char *argv[] )
if ( argc < 2 )
@@ -10,9 +10,9 @@ diff --recursive -up mysql-connector-odbc-5.2.5-src.orig/dltest/dltest.c mysql-c
exit( 1 );
}
-diff --recursive -up mysql-connector-odbc-5.2.5-src.orig/installer/myodbc3i.c mysql-connector-odbc-5.2.5-src/installer/myodbc3i.c
---- mysql-connector-odbc-5.2.5-src.orig/installer/myodbc3i.c 2013-04-04 15:53:56.000000000 +0200
-+++ mysql-connector-odbc-5.2.5-src/installer/myodbc3i.c 2013-12-12 13:53:13.351374480 +0100
+diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/installer/myodbc3i.c mysql-connector-odbc-5.2.6-src/installer/myodbc3i.c
+--- mysql-connector-odbc-5.2.6-src.orig/installer/myodbc3i.c 2013-09-25 18:59:00.000000000 +0200
++++ mysql-connector-odbc-5.2.6-src/installer/myodbc3i.c 2014-01-24 13:27:51.935235137 +0100
@@ -148,7 +148,7 @@ void action_usage()
void main_usage()
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 7796603..0715120 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,17 +1,14 @@
Summary: ODBC driver for MySQL
Name: mysql-connector-odbc
-Version: 5.2.5
-Release: 5%{?dist}
+Version: 5.2.6
+Release: 1%{?dist}
Group: System Environment/Libraries
URL: http://dev.mysql.com/downloads/connector/odbc/
# exceptions allow library to be linked with most open source SW,
# not only GPL code.
License: GPLv2 with exceptions
-# Upstream has a mirror redirector for downloads, so the URL is hard to
-# represent statically. You can get the tarball by following a link from
-# http://dev.mysql.com/downloads/connector/odbc/
-Source0: %{name}-%{version}-src.tar.gz
+Source0: http://dev.mysql.com/get/Downloads/Connector-ODBC/5.2/%{name}-%{version}-src.tar.gz
# mysql-connector-odbc expects to be able to get at a bunch of utility
# functions inside libmysqlclient. Now that we are restricting what symbols
@@ -27,13 +24,11 @@ Patch2: myodbc-shutdown.patch
Patch3: myodbc-64bit.patch
Patch4: myodbc-maria.patch
Patch5: myodbc-movecmpfunc.patch
-Patch6: myodbc-libname.patch
-Patch7: myodbc-libdir.patch
-Patch8: mysql-connector-odbc-buffsize.patch
-Patch9: mysql-connector-odbc-cleartext.patch
-Patch10: mysql-connector-odbc-cond.patch
-Patch11: mysql-connector-odbc-format-security.patch
-Patch12: mysql-connector-odbc-5.2.5-aarch64.patch
+Patch6: myodbc-libdir.patch
+Patch7: mysql-connector-odbc-buffsize.patch
+Patch8: mysql-connector-odbc-cleartext.patch
+Patch9: mysql-connector-odbc-format-security.patch
+Patch10: mysql-connector-odbc-5.2.5-aarch64.patch
BuildRequires: mysql-devel unixODBC-devel
BuildRequires: cmake
@@ -57,20 +52,19 @@ tar xfz %{SOURCE1}
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
%build
# mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
# started #define'ing MY_PTHREAD_FASTMUTEX, and neither of those changes
# sit well with mysql-connector-odbc 5.1.10. Revisit need for these hacks
# when updating to newer release.
-export CFLAGS="%{optflags} -fno-strict-aliasing -DTHREAD=1 -UMY_PTHREAD_FASTMUTEX -DDBUG_OFF"
+export CFLAGS="%{optflags} -lpthread -fno-strict-aliasing -DTHREAD=1 -UMY_PTHREAD_FASTMUTEX -DDBUG_OFF"
cmake . -G "Unix Makefiles" \
-DWITH_UNIXODBC=1 \
-DRPM_BUILD=1 \
- -DCMAKE_INSTALL_PREFIX="%{_prefix}"
+ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+ -DMYSQLCLIENT_LIB_NAME=mysqlclient
make %{?_smp_mflags} VERBOSE=1
@@ -105,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT/usr/test
%{_libdir}/lib*so
%changelog
+* Fri Jan 24 2014 Jakub Dorňák <jdornak at redhat.com> - 5.2.6-1
+- Update to 2.5.6
+ Resolves: #1047895
+
* Wed Jan 8 2014 Marcin Juszkiewicz <mjuszkiewicz redhat com> - 5.2.5-5
- Build failed because whether to use lib64 or not is done by checking
list of known 64-bit architectures. So added AArch64 to that list.
diff --git a/sources b/sources
index adbf594..bca9dfe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-909e0c3c9c341fe777d0a620c4084442 mysql-connector-odbc-5.2.5-src.tar.gz
-58125c640c9c73c5288966bb85e6bb98 mysql-mysys.tar.gz
+066bfed7dc472ef4b68bafc95ca45027 mysql-connector-odbc-5.2.6-src.tar.gz
More information about the scm-commits
mailing list