Attachment 152580 Details for Bug 197348 – patch

[patch] patch

mysql-connector-odbc-5.3.4.patch.new (text/plain), 3.24 KB, created by Pavel Timofeev on 2015-02-05 12:13:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-02-05 12:13:09 UTC

Size: 3.24 KB

patch

obsolete

>--- Makefile.orig	2015-02-05 14:07:03.000000000 +0300
>+++ Makefile	2015-02-05 14:16:16.000000000 +0300
>@@ -2,25 +2,29 @@
> # $FreeBSD: head/databases/mysql-connector-odbc/Makefile 353029 2014-05-05 16:24:00Z bapt $
> 
> PORTNAME=	mysql-connector-odbc
>-PORTVERSION=	5.1.9
>+PORTVERSION=	5.3.4
> CATEGORIES=	databases
> MASTER_SITES=	${MASTER_SITE_MYSQL}
>-MASTER_SITE_SUBDIR=	Connector-ODBC/5.1
>+MASTER_SITE_SUBDIR=	Connector-ODBC/5.3
> PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
>+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
>+DISTFILES=	${DISTNAME}.tar.gz
> 
> MAINTAINER=	sergey@network-asp.biz
> COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
> 
> USE_LDCONFIG=	yes
> USE_MYSQL=	yes
>-DEFAULT_MYSQL_VER=	51
> USES=		cmake
> 
>+IGNORE_WITH_MYSQL=       55 51
>+
> PLIST_SUB=	VER=${PORTVERSION}
> 
> PORTDOCS=	ChangeLog INSTALL \
> 		README README.debug COPYING Licenses_for_Third-Party_Components.txt
> 
>+LDFLAGS+=		-L${LOCALBASE}/lib
> LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
> BUILD_DEPENDS=		unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
> CMAKE_ARGS              += -DWITH_UNIXODBC=1
>--- distinfo.orig	2014-09-03 20:15:17.000000000 +0400
>+++ distinfo	2015-02-05 14:07:19.000000000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (mysql-connector-odbc-5.1.9.tar.gz) = d14a0d5ca0f0bc4fc4bbd8609c4e7fde56c70d8b3ae56eb2c3687ce794990ee9
>-SIZE (mysql-connector-odbc-5.1.9.tar.gz) = 542281
>+SHA256 (mysql-connector-odbc-5.3.4-src.tar.gz) = a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d
>+SIZE (mysql-connector-odbc-5.3.4-src.tar.gz) = 667340
>--- pkg-plist.orig	2014-09-03 20:15:17.000000000 +0400
>+++ pkg-plist	2015-02-05 14:07:19.000000000 +0300
>@@ -1,2 +1,3 @@
> bin/myodbc-installer
>-lib/libmyodbc5.so
>+lib/libmyodbc5a.so
>+lib/libmyodbc5w.so
>--- files/patch-driver__execute.c.orig	2014-09-03 20:15:17.000000000 +0400
>+++ files/patch-driver__execute.c	2015-02-05 14:07:19.000000000 +0300
>@@ -1,22 +1,22 @@
>---- driver/execute.c.orig	2011-10-04 23:19:00.000000000 +0300
>-+++ driver/execute.c	2011-10-15 12:07:45.000000000 +0300
>-@@ -424,11 +424,19 @@
>-             data= buff;
>-             break;
>-         case SQL_C_SBIGINT:
>+--- driver/execute.c.orig	2014-11-05 14:41:16.000000000 +0300
>++++ driver/execute.c	2014-11-05 14:44:10.000000000 +0300
>+@@ -563,11 +563,19 @@
>+         *res= buff;
>+         break;
>+     case SQL_C_SBIGINT:
> +#ifdef MARIADB_BASE_VERSION
>-+            length= longlong2str(*((longlong*) data),buff, -10, 1) - buff;
>++        *length= longlong2str(*((longlong*) *res), buff, -10, 1) - buff;
> +#else
>-             length= longlong2str(*((longlong*) data),buff, -10) - buff;
>+         *length= longlong2str(*((longlong*) *res), buff, -10) - buff;
> +#endif
>-             data= buff;
>-             break;
>-         case SQL_C_UBIGINT:
>+         *res= buff;
>+         break;
>+     case SQL_C_UBIGINT:
> +#ifdef MARIADB_BASE_VERSION
>-+            length= longlong2str(*((ulonglong*) data),buff, 10, 1) - buff;
>++        *length= longlong2str(*((ulonglong*) *res), buff, 10, 1) - buff;
> +#else
>-             length= longlong2str(*((ulonglong*) data),buff, 10) - buff;
>+         *length= longlong2str(*((ulonglong*) *res), buff, 10) - buff;
> +#endif
>-             data= buff;
>-             break;
>-         case SQL_C_FLOAT:
>+         *res= buff;
>+         break;
>+     case SQL_C_FLOAT:

Actions: View | Diff

Attachments on bug 197348: 152580 | 152581