Date: Sat, 12 Jul 2008 18:39:48 GMT From: Sergey Prikhodko <sergey@network-asp.biz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/125547: [maintainer-update]: databases/mysql-connector-odbc to 3.51.26 Message-ID: <200807121839.m6CIdmRo060118@www.freebsd.org> Resent-Message-ID: <200807121840.m6CIe3Xj032559@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125547
>Category: ports
>Synopsis: [maintainer-update]: databases/mysql-connector-odbc to 3.51.26
>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: Sat Jul 12 18:40:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Sergey Prikhodko
>Release: 7.0-RELEASE-p1
>Organization:
Network-ASP Ltd.
>Environment:
System: FreeBSD border.office.network-asp.biz 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Mon May 12 13:30:31 EEST 2008 toor@border.office.network-asp.biz:/usr/obj/usr/src/sys/FABRICA64 amd64
>Description:
Update mysql-connector-odbc to latest version in 3.51 branch.
>How-To-Repeat:
Install it.
>Fix:
see attached file
Patch attached with submission follows:
diff -ruN mysql-connector-odbc.orig/Makefile mysql-connector-odbc/Makefile
--- mysql-connector-odbc.orig/Makefile 2006-10-09 21:51:18.000000000 +0300
+++ mysql-connector-odbc/Makefile 2008-07-10 23:20:20.000000000 +0300
@@ -6,11 +6,12 @@
#
PORTNAME= mysql-connector-odbc
-PORTVERSION= 3.51.12
-PORTREVISION= 1
+PORTVERSION= 3.51.26
+PORTREVISION= 0
+DISTVERSIONSUFFIX= r1127
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MyODBC3
+MASTER_SITE_SUBDIR= Connector-ODBC/3.51
PKGNAMESUFFIX= -${DRIVER_MANAGER}-mysql${MYSQL_VER}
MAINTAINER= sergey@network-asp.biz
diff -ruN mysql-connector-odbc.orig/distinfo mysql-connector-odbc/distinfo
--- mysql-connector-odbc.orig/distinfo 2006-01-17 22:50:45.000000000 +0200
+++ mysql-connector-odbc/distinfo 2008-07-10 23:23:12.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (mysql-connector-odbc-3.51.12.tar.gz) = a484f590464fb823a8f821b2f1fd7fef
-SHA256 (mysql-connector-odbc-3.51.12.tar.gz) = 7a9c19bd4ee140e7afe77fdcaecee53b4ce4bbbeb35a158c9548aa7ab9482c74
-SIZE (mysql-connector-odbc-3.51.12.tar.gz) = 979942
+MD5 (mysql-connector-odbc-3.51.26r1127.tar.gz) = ad2ac7a7dbef36f0d25bb1cdecc90389
+SHA256 (mysql-connector-odbc-3.51.26r1127.tar.gz) = 78d6311946e92e72a40da6c6dfc06b0c4e7cb20d9431358351b2850c5e4a924a
+SIZE (mysql-connector-odbc-3.51.26r1127.tar.gz) = 954125
diff -ruN mysql-connector-odbc.orig/files/myodbc-iodbc-patch mysql-connector-odbc/files/myodbc-iodbc-patch
--- mysql-connector-odbc.orig/files/myodbc-iodbc-patch 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/myodbc-iodbc-patch 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- driver/results.c.orig Sun Oct 9 22:33:40 2005
-+++ driver/results.c Thu Oct 27 16:30:17 2005
-@@ -558,7 +558,7 @@
- SQLPOINTER CharacterAttributePtr,
- SQLSMALLINT BufferLength,
- SQLSMALLINT *StringLengthPtr,
-- SQLPOINTER NumericAttributePtr )
-+ SQLLEN *NumericAttributePtr )
- #endif
- {
- return get_col_attr( StatementHandle,
diff -ruN mysql-connector-odbc.orig/files/patch-configure mysql-connector-odbc/files/patch-configure
--- mysql-connector-odbc.orig/files/patch-configure 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/patch-configure 2008-07-10 23:34:32.000000000 +0300
@@ -1,6 +1,6 @@
---- configure.orig Sat Oct 29 20:43:26 2005
-+++ configure Sat Oct 29 21:00:14 2005
-@@ -1650,11 +1650,11 @@
+--- 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.
@@ -8,12 +8,16 @@
- 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}-
-+# 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__connect.c mysql-connector-odbc/files/patch-driver__connect.c
--- mysql-connector-odbc.orig/files/patch-driver__connect.c 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/patch-driver__connect.c 1970-01-01 03:00:00.000000000 +0300
@@ -1,14 +0,0 @@
---- driver/connect.c.orig Sun Oct 9 22:33:40 2005
-+++ driver/connect.c Thu Oct 27 16:44:37 2005
-@@ -141,8 +141,10 @@
- client_flag |= CLIENT_COMPRESS;
- if (option_flag & FLAG_IGNORE_SPACE)
- client_flag |= CLIENT_IGNORE_SPACE;
--
-+
-+#ifdef CLIENT_MULTI_RESULTS
- client_flag |= CLIENT_MULTI_RESULTS;
-+#endif
- #ifdef __WIN__
- if (option_flag & FLAG_NAMED_PIPE)
- mysql_options(mysql,MYSQL_OPT_NAMED_PIPE,NullS);
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 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/patch-driver__myodbc3.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,15 +0,0 @@
---- driver/myodbc3.h.orig Sun Oct 9 22:33:40 2005
-+++ driver/myodbc3.h Thu Oct 27 16:16:05 2005
-@@ -101,7 +101,12 @@
- #include <ltdl.h>
- #include <sql.h>
- #include <sqlext.h>
-+
-+# if defined(HAVE_IODBCINST_H)
-+#include <iodbcinst.h>
-+#elif defined(HAVE_ODBCINST_H)
- #include <odbcinst.h>
-+# endif
-
- #ifndef SYSTEM_ODBC_INI
- #define BOTH_ODBC_INI ODBC_BOTH_DSN
diff -ruN mysql-connector-odbc.orig/files/patch-myodbcinst__myodbcinst.c mysql-connector-odbc/files/patch-myodbcinst__myodbcinst.c
--- mysql-connector-odbc.orig/files/patch-myodbcinst__myodbcinst.c 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/patch-myodbcinst__myodbcinst.c 1970-01-01 03:00:00.000000000 +0300
@@ -1,14 +0,0 @@
---- myodbcinst/myodbcinst.c.orig Mon Oct 10 05:49:47 2005
-+++ myodbcinst/myodbcinst.c Thu Oct 27 16:33:29 2005
-@@ -56,7 +56,11 @@
- #include <ltdl.h>
- #endif
-
-+# if defined(HAVE_IODBCINST_H)
-+#include <iodbcinst.h>
-+#elif defined(HAVE_ODBCINST_H)
- #include <odbcinst.h>
-+# endif
-
- #include "../util/MYODBCUtil.h"
-
diff -ruN mysql-connector-odbc.orig/files/patch-strndup mysql-connector-odbc/files/patch-strndup
--- mysql-connector-odbc.orig/files/patch-strndup 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/patch-strndup 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- util/MYODBCUtilReadDataSourceStr.c.orig Sun Oct 9 22:33:40 2005
-+++ util/MYODBCUtilReadDataSourceStr.c Thu Oct 27 16:35:43 2005
-@@ -20,7 +20,7 @@
-
- #include "MYODBCUtil.h"
-
--#if defined(__APPLE__) || defined(WIN32) || defined(__sparc)
-+#if defined(__APPLE__) || defined(WIN32) || defined(__sparc) || defined(__FreeBSD__)
- char *strndup( const char *s, size_t n )
- {
- size_t nAvail;
diff -ruN mysql-connector-odbc.orig/files/patch-util__MYODBCUtil.h mysql-connector-odbc/files/patch-util__MYODBCUtil.h
--- mysql-connector-odbc.orig/files/patch-util__MYODBCUtil.h 2006-01-17 22:50:46.000000000 +0200
+++ mysql-connector-odbc/files/patch-util__MYODBCUtil.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,14 +0,0 @@
---- util/MYODBCUtil.h.orig Sun Oct 9 22:33:40 2005
-+++ util/MYODBCUtil.h Thu Oct 27 16:13:47 2005
-@@ -40,7 +40,11 @@
- #include <sqlext.h>
- #endif
-
-+# if defined(HAVE_IODBCINST_H)
-+#include <iodbcinst.h>
-+#elif defined(HAVE_ODBCINST_H)
- #include <odbcinst.h>
-+# endif
-
- /*
- Handle case on OSX where we want to use GetPrivateProfileString (because it
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807121839.m6CIdmRo060118>