ports/161832: [maintainer] update databases/mysql-connector-odbc to 5.1.9
Sergey Prikhodko
sergey at network-asp.biz
Thu Oct 20 13:10:10 UTC 2011
>Number: 161832
>Category: ports
>Synopsis: [maintainer] update databases/mysql-connector-odbc to 5.1.9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 20 13:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Sergey Prikhodko
>Release: 8.1-RELEASE-p1
>Organization:
Network-ASP
>Environment:
FreeBSD travel.office.network-asp.biz 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0 r213829: Thu Oct 14 13:36:49 EEST 2010 toor at db:/usr/obj/usr/src/sys/FABRICA64 amd64
>Description:
update Connector/ODBC to latest GA version 5.1.9
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN mysql-connector-odbc.orig/Makefile mysql-connector-odbc/Makefile
--- mysql-connector-odbc.orig/Makefile 2011-10-17 07:34:59.000000000 +0300
+++ mysql-connector-odbc/Makefile 2011-10-15 12:12:06.000000000 +0300
@@ -2,16 +2,14 @@
# Date created: 22 Mar 2004
# Whom: sergey at migsoft.com.ua
#
-# $FreeBSD: ports/databases/mysql-connector-odbc/Makefile,v 1.32 2011/10/17 04:34:59 dougb Exp $
+# $FreeBSD: ports/databases/mysql-connector-odbc/Makefile,v 1.31 2011/09/23 22:21:36 amdmi3 Exp $
#
PORTNAME= mysql-connector-odbc
-PORTVERSION= 3.51.26
-DISTVERSIONSUFFIX= r1127
-PORTREVISION= 3
+PORTVERSION= 5.1.9
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= Connector-ODBC/3.51
+MASTER_SITE_SUBDIR= Connector-ODBC/5.1
PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER}
MAINTAINER= sergey at network-asp.biz
@@ -19,20 +17,14 @@
USE_MYSQL= yes
DEFAULT_MYSQL_VER= 51
-IGNORE_WITH_MYSQL= 55
+IGNORE_WITH_MYSQL= 323
-USE_GMAKE= yes
-USE_AUTOTOOLS= libtool libltdl
-USE_LDCONFIG= yes
-CFLAGS+= -L${LOCALBASE}/lib
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-mysql-path=${LOCALBASE} --without-samples \
- --disable-gui --enable-test=no
+USE_CMAKE= yes
PLIST_SUB= VER=${PORTVERSION}
-PORTDOCS= ChangeLog INSTALL LICENSE.exceptions LICENSE.gpl \
- README README.debug
+PORTDOCS= ChangeLog INSTALL \
+ README README.debug COPYING Licenses_for_Third-Party_Components.txt
# MyODBC needs an ODBC driver manager to be installed, and it supports both
# iODBC and unixODBC.
@@ -48,44 +40,11 @@
.if defined(WITH_UNIXODBC)
LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+= --with-odbc-ini=${LOCALBASE}/etc/odbc.ini \
- --with-unixODBC=${LOCALBASE}
-CFLAGS+= ${PTHREAD_LIBS}
+CMAKE_ARGS += -DWITH_UNIXODBC=1
DRIVER_MANAGER= unixodbc
.elif defined(WITH_IODBC)
LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+= --with-iODBC=${LOCALBASE} \
- --with-iodbc-includes=${LOCALBASE}/include \
- --with-iodbc-libs=${LOCALBASE}/lib \
- --with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
-EXTRA_PATCHES= ${PATCHDIR}/myodbc-iodbc-patch
DRIVER_MANAGER= iodbc
.endif
-post-patch:
-# Allow a new value of ODBCVER to be set at build-time
-.if defined(ODBCVER)
- @${REINPLACE_CMD} -e "s|ODBCVER 0x0250|ODBCVER ${ODBCVER}|" ${WRKSRC}/myodbc.h
-.endif
- @${REINPLACE_CMD} -e "s|^\(readmedir =\).*|\1 ${DOCSDIR}|" ${WRKSRC}/Makefile.in
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e " \
- /^ /s|install-readmeDATA||; \
- /^install-data-am:/s|install-readmeDATA||; \
- " ${WRKSRC}/Makefile.in
-.endif
-
-# XXX untested
-.if defined(STATIC)
-CONFIGURE_ARGS+= --enable-shared=no --enable-static=yes
-.endif
-
-post-install:
-.if !exists(${PREFIX}/lib/libmyodbc3.so.0)
- @${LN} -s ${PREFIX}/lib/libmyodbc3-${PORTVERSION}.so ${PREFIX}/lib/libmyodbc3.so.0
-.endif
-.if !exists(${PREFIX}/lib/libmyodbc3_r.so.0)
- @${LN} -s ${PREFIX}/lib/libmyodbc3_r-${PORTVERSION}.so ${PREFIX}/lib/libmyodbc3_r.so.0
-.endif
-
.include <bsd.port.mk>
diff -ruN mysql-connector-odbc.orig/distinfo mysql-connector-odbc/distinfo
--- mysql-connector-odbc.orig/distinfo 2011-03-20 14:47:15.000000000 +0200
+++ mysql-connector-odbc/distinfo 2011-10-15 10:40:35.000000000 +0300
@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-odbc-3.51.26r1127.tar.gz) = 78d6311946e92e72a40da6c6dfc06b0c4e7cb20d9431358351b2850c5e4a924a
-SIZE (mysql-connector-odbc-3.51.26r1127.tar.gz) = 954125
+SHA256 (mysql-connector-odbc-5.1.9.tar.gz) = d14a0d5ca0f0bc4fc4bbd8609c4e7fde56c70d8b3ae56eb2c3687ce794990ee9
+SIZE (mysql-connector-odbc-5.1.9.tar.gz) = 542281
diff -ruN mysql-connector-odbc.orig/files/patch-CMakeLists.txt mysql-connector-odbc/files/patch-CMakeLists.txt
--- mysql-connector-odbc.orig/files/patch-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300
+++ mysql-connector-odbc/files/patch-CMakeLists.txt 2011-10-15 11:37:32.000000000 +0300
@@ -0,0 +1,37 @@
+--- CMakeLists.txt.orig 2011-10-04 23:19:00.000000000 +0300
++++ CMakeLists.txt 2011-10-15 11:36:44.000000000 +0300
+@@ -201,7 +201,7 @@
+ ADD_SUBDIRECTORY(dltest)
+ ADD_SUBDIRECTORY(installer)
+
+-ADD_SUBDIRECTORY(test)
++# ADD_SUBDIRECTORY(test)
+
+ ##############################################################################
+ #
+@@ -281,18 +281,18 @@
+
+ ELSE(WIN32)
+
+- INSTALL(FILES ChangeLog DESTINATION .)
+- INSTALL(FILES README DESTINATION .)
+- INSTALL(FILES README.debug DESTINATION .)
+- INSTALL(FILES INSTALL DESTINATION .)
++ INSTALL(FILES ChangeLog DESTINATION ./share/doc/mysql-connector-odbc/)
++ INSTALL(FILES README DESTINATION ./share/doc/mysql-connector-odbc/)
++ INSTALL(FILES README.debug DESTINATION ./share/doc/mysql-connector-odbc/)
++ INSTALL(FILES INSTALL DESTINATION ./share/doc/mysql-connector-odbc/)
+ IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+- INSTALL(FILES COPYING DESTINATION .)
++ INSTALL(FILES COPYING DESTINATION ./share/doc/mysql-connector-odbc/)
+ ELSE()
+- INSTALL(FILES LICENSE.mysql DESTINATION .)
++ INSTALL(FILES LICENSE.mysql DESTINATION ./share/doc/mysql-connector-odbc/)
+ ENDIF()
+
+ ENDIF(WIN32)
+
+-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
++INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ./share/doc/mysql-connector-odbc/)
+
+ INCLUDE(CPack)
diff -ruN mysql-connector-odbc.orig/files/patch-configure mysql-connector-odbc/files/patch-configure
--- mysql-connector-odbc.orig/files/patch-configure 2008-07-17 17:23:36.000000000 +0300
+++ mysql-connector-odbc/files/patch-configure 1970-01-01 03:00:00.000000000 +0300
@@ -1,23 +0,0 @@
---- configure.orig 2008-07-10 23:32:20.000000000 +0300
-+++ configure 2008-07-10 23:33:51.000000000 +0300
-@@ -1653,13 +1653,13 @@
-
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
-- test "$program_prefix$program_suffix$program_transform_name" = \
-- NONENONEs,x,x, &&
-- program_prefix=${target_alias}-
--
--# When changing, also change VersionInfo.h and driver/myodbc3.def
--am__api_version="1.9"
-+#test -n "$target_alias" &&
-+# test "$program_prefix$program_suffix$program_transform_name" = \
-+# NONENONEs,x,x, &&
-+# program_prefix=${target_alias}-
-+#
-+## When changing, also change VersionInfo.h and driver/myodbc3.def
-+#am__api_version="1.9"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
diff -ruN mysql-connector-odbc.orig/files/patch-driver::execute.c mysql-connector-odbc/files/patch-driver::execute.c
--- mysql-connector-odbc.orig/files/patch-driver::execute.c 1970-01-01 03:00:00.000000000 +0300
+++ mysql-connector-odbc/files/patch-driver::execute.c 2011-10-15 12:09:19.000000000 +0300
@@ -0,0 +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:
++#ifdef MARIADB_BASE_VERSION
++ length= longlong2str(*((longlong*) data),buff, -10, 1) - buff;
++#else
+ length= longlong2str(*((longlong*) data),buff, -10) - buff;
++#endif
+ data= buff;
+ break;
+ case SQL_C_UBIGINT:
++#ifdef MARIADB_BASE_VERSION
++ length= longlong2str(*((ulonglong*) data),buff, 10, 1) - buff;
++#else
+ length= longlong2str(*((ulonglong*) data),buff, 10) - buff;
++#endif
+ data= buff;
+ break;
+ case SQL_C_FLOAT:
diff -ruN mysql-connector-odbc.orig/files/patch-driver_myodbc3.h mysql-connector-odbc/files/patch-driver_myodbc3.h
--- mysql-connector-odbc.orig/files/patch-driver_myodbc3.h 2009-01-09 09:10:43.000000000 +0200
+++ mysql-connector-odbc/files/patch-driver_myodbc3.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,22 +0,0 @@
---- driver/myodbc3.h.orig 2008-07-02 06:43:38.000000000 -0800
-+++ driver/myodbc3.h 2009-01-08 11:59:38.000000000 -0900
-@@ -161,7 +161,7 @@
- #define FLAG_MIN_DATE_TO_ZERO (1 << 25) /* Convert ODBC min date to 0000-00-00 on query */
- #define FLAG_MULTI_STATEMENTS (1 << 26) /* Allow multiple statements in a query */
- #define FLAG_COLUMN_SIZE_S32 (1 << 27) /* Limit column size to a signed 32-bit value (automatically set for ADO) */
--#define FLAG_NO_BINARY_RESULT (1 << 28) /* Disables charset 63 for columns with empty org_table */
-+#define FLAG_NO_BINARY_RESULT (1 << 28) /* Disables charset 63 for columns with empty org_table */
-
- /* We don't make any assumption about what the default may be. */
- #ifndef DEFAULT_TXN_ISOLATION
-@@ -252,8 +252,8 @@
- SQLINTEGER ValueMax;
- SQLLEN * actual_len;
- SQLINTEGER value_length;
-- bool alloced,used;
-- bool real_param_done;
-+ my_bool alloced,used;
-+ my_bool real_param_done;
- } PARAM_BIND;
-
-
diff -ruN mysql-connector-odbc.orig/files/patch-driver_myutil.h mysql-connector-odbc/files/patch-driver_myutil.h
--- mysql-connector-odbc.orig/files/patch-driver_myutil.h 2009-01-27 07:13:09.000000000 +0200
+++ mysql-connector-odbc/files/patch-driver_myutil.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,12 +0,0 @@
---- driver/myutil.h.orig 2008-04-11 01:58:44.000000000 -0800
-+++ driver/myutil.h 2009-01-08 11:50:41.000000000 -0900
-@@ -174,7 +174,7 @@
- SQLLEN *pcbValue);
- SQLRETURN SQL_API my_SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType,
-- SQLROWOFFSET irow, SQLULEN *pcrow,
-- SQLUSMALLINT FAR *rgfRowStatus, bool upd_status);
-+ SQLLEN irow, SQLULEN *pcrow,
-+ SQLUSMALLINT FAR *rgfRowStatus, my_bool upd_status);
- SQLRETURN copy_stmt_error(STMT FAR *src, STMT FAR *dst);
- int unireg_to_c_datatype(MYSQL_FIELD *field);
- int default_c_type(int sql_data_type);
diff -ruN mysql-connector-odbc.orig/files/patch-driver_results.c mysql-connector-odbc/files/patch-driver_results.c
--- mysql-connector-odbc.orig/files/patch-driver_results.c 2009-01-27 07:13:09.000000000 +0200
+++ mysql-connector-odbc/files/patch-driver_results.c 1970-01-01 03:00:00.000000000 +0300
@@ -1,38 +0,0 @@
---- driver/results.c.orig 2008-04-11 16:58:44.000000000 +0700
-+++ driver/results.c 2009-01-27 00:01:01.000000000 +0600
-@@ -1245,10 +1245,10 @@
- */
- SQLRETURN SQL_API my_SQLExtendedFetch( SQLHSTMT hstmt,
- SQLUSMALLINT fFetchType,
-- SQLROWOFFSET irow,
-+ SQLLEN irow,
- SQLULEN *pcrow,
- SQLUSMALLINT FAR *rgfRowStatus,
-- bool upd_status )
-+ my_bool upd_status )
- {
- ulong rows_to_fetch;
- long cur_row, max_row;
-@@ -1511,19 +1511,16 @@
-
- SQLRETURN SQL_API SQLExtendedFetch( SQLHSTMT hstmt,
- SQLUSMALLINT fFetchType,
-- SQLROWOFFSET irow,
-- SQLROWSETSIZE *pcrow,
-+ SQLLEN irow,
-+ SQLULEN *pcrow,
- SQLUSMALLINT FAR *rgfRowStatus )
- {
- SQLRETURN rc;
-- SQLULEN rows;
- STMT_OPTIONS *options= &((STMT FAR *)hstmt)->stmt_options;
-
- options->rowStatusPtr_ex= rgfRowStatus;
-
-- rc= my_SQLExtendedFetch(hstmt, fFetchType, irow, &rows, rgfRowStatus, 1);
-- if (pcrow)
-- *pcrow= (SQLROWSETSIZE)rows;
-+ rc= my_SQLExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus, 1);
-
- return rc;
- }
diff -ruN mysql-connector-odbc.orig/files/patch-driver_utility.c mysql-connector-odbc/files/patch-driver_utility.c
--- mysql-connector-odbc.orig/files/patch-driver_utility.c 2009-01-27 07:13:09.000000000 +0200
+++ mysql-connector-odbc/files/patch-driver_utility.c 1970-01-01 03:00:00.000000000 +0300
@@ -1,38 +0,0 @@
---- driver/utility.c.orig 2009-01-27 00:14:43.000000000 +0600
-+++ driver/utility.c 2009-01-27 00:15:46.000000000 +0600
-@@ -504,11 +504,6 @@
-
- return field_is_binary ? SQL_BINARY : SQL_CHAR;
-
-- /*
-- MYSQL_TYPE_VARCHAR is never actually sent, this just silences
-- a compiler warning.
-- */
-- case MYSQL_TYPE_VARCHAR:
- case MYSQL_TYPE_VAR_STRING:
- if (buff)
- (void)strmov(buff, field_is_binary ? "varbinary" : "varchar");
-@@ -657,7 +652,6 @@
-
- case MYSQL_TYPE_ENUM:
- case MYSQL_TYPE_SET:
-- case MYSQL_TYPE_VARCHAR:
- case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_TINY_BLOB:
-@@ -783,7 +777,6 @@
-
- case MYSQL_TYPE_ENUM:
- case MYSQL_TYPE_SET:
-- case MYSQL_TYPE_VARCHAR:
- case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_TINY_BLOB:
-@@ -867,7 +860,6 @@
-
- case MYSQL_TYPE_ENUM:
- case MYSQL_TYPE_SET:
-- case MYSQL_TYPE_VARCHAR:
- case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_TINY_BLOB:
diff -ruN mysql-connector-odbc.orig/pkg-plist mysql-connector-odbc/pkg-plist
--- mysql-connector-odbc.orig/pkg-plist 2006-02-23 12:35:08.000000000 +0200
+++ mysql-connector-odbc/pkg-plist 2011-10-15 11:13:56.000000000 +0300
@@ -1,12 +1,2 @@
-bin/myodbc3m
-bin/myodbc3i
-lib/libmyodbc3-%%VER%%.so
-lib/libmyodbc3.a
-lib/libmyodbc3.la
-lib/libmyodbc3.so
-lib/libmyodbc3.so.0
-lib/libmyodbc3_r-%%VER%%.so
-lib/libmyodbc3_r.a
-lib/libmyodbc3_r.la
-lib/libmyodbc3_r.so
-lib/libmyodbc3_r.so.0
+bin/myodbc-installer
+lib/libmyodbc5.so
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list