head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.10 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.8 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.6 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q2:1.1.1.1.0.2 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2009.09.12.18.54.50; author sno; state dead; branches; next 1.1; 1.1 date 2009.05.17.13.29.15; author sno; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.05.17.13.29.15; author sno; state Exp; branches; next ; desc @@ 1.2 log @Updating databases/p5-DBD-ODBC from 1.22 to 1.23 pkgsrc changes: - remove patch to detect iODBC correctly after is was applied upstream Upstream changes: Changes in DBD::ODBC 1.23 September 11, 2009 - Only a readme change and version bumped to 1.23. This is a full release of all the 1.22_x development releases. Changes in DBD::ODBC 1.22_3 August 19, 2009 - Fix skip count in rt_38977.t and typo in ok call. - Workaround a bug in unixODBC 2.2.11 which can write off the end of the string buffer passed to SQLColAttributes. - Fix skip count in rt_null_nvarchar.t test for non SQL Server drivers. - Fix test in 02simple.t which reported a fail if you have no ODBC datasources. - In 99_yaml.t pick up the yaml spec version from the meta file instead of specifying it. - Change calls to SQLPrepare which passed in the string lenth of the SQL to use SQL_NTS because a) they are null terminated and more importantly b) unixODBC contains a bug in versions up to 2.2.16 which can overwrite the stack by 1 byte if the string length is specified and not built with iconv support and converting the SQL from ASCII to Unicode. - Fixed bug in ping method reported by Lee Anne Lester where it dies if used after the connection is closed. - A great deal of changes to Makefile.PL to improve the automatic detection and configuration for ODBC driver managers - especially on 64bit platforms. See rt47650 from Marten Lehmann which started it all off. - Add changes from Chris Clark for detecting IngresCLI. - Fix for rt 48304. If you are using a Microsoft SQL Server database and nvarchar(max) you could not insert values between 4001 and 8000 (inclusive) in size. A test was added to the existing rt_38977.t test. Thanks to Michael Thomas for spotting this. - Added FAQ on UTF-8 encoding and IBM iSeries ODBC driver. - Add support for not passing usernames and passwords in call to connect. Previously DBD::ODBC would set an unspecified username/password to '' in ODBC.pm before calling one of the login_xxx functions. This allows the driver to pull the username/password from elsewhere e.g., like the odbc.ini file. Changes in DBD::ODBC 1.22_1 June 16, 2009 - Applied a slightly modified version of patch from Jens Rehsack to improve support for finding the iODBC driver manager. - A UNICODE enabled DBD::ODBC (the default on Windows) did not handle UNICODE usernames and passwords in the connect call properly. - Updated "Attribution" in ODBC.pm. - Unicode support is no longer experimental hence warning and prompt removed from the Makefile.PL. - old_ping method removed. - Fixed bug in 02simple.t test which is supposed to check you have at least one data source defined. Unfortunately, it was checking you had more than 1 data source defined. - rt_null_varchar had wrong skip count meaning non-sql-server drivers or sql server drivers too old skipped 2 tests more than were planned. @ text @$NetBSD: patch-aa,v 1.1 2009/05/17 13:29:15 sno Exp $ # Fix issues detecting iODBC --- Makefile.PL.orig 2009-05-16 08:36:54.000000000 +0000 +++ Makefile.PL 2009-05-16 08:49:56.000000000 +0000 @@@@ -154,7 +154,6 @@@@ EOT } - prompt("Press return to continue..."); } print "Overriding ODBC Directory with command line option: $opt_o\n" if $opt_o ; @@@@ -242,6 +241,7 @@@@ # exist until 2.2.11 and it was broken wrt --cflags in 2.2.11/2.2.12 # i.e. --cflags did not include -I/xxx/yyy my $odbc_config_v = `odbc_config --version 2>&1`; + my $iodbc_config_v = `iodbc-config --version 2>&1`; print "Looking for odbc_config\n"; if ($odbc_config_v && ($odbc_config_v =~ /^(\d\.)+/)) { print " Found odbc_config versions $odbc_config_v\n"; @@@@ -257,6 +257,20 @@@@ print " but cannot find header files in that path so ignoring\n"; $odbchome = ''; } + } elsif ($iodbc_config_v && ($iodbc_config_v =~ /^(\d\.)+/)) { + print " Found iodbc-config versions $iodbc_config_v\n"; + $odbchome = `iodbc-config --prefix 2>&1`; + print " iodbc-config reports --prefix=$odbchome\n"; + chomp $odbchome; + if ((-e $odbchome) && (-e "$odbchome/include") && + (-f "$odbchome/include/sql.h") && + (-f "$odbchome/include/sqlext.h") && + (-f "$odbchome/include/sqltypes.h")) { + print " Set ODBCHOME to $odbchome from iodbc-config\n"; + } else { + print " but cannot find header files in that path so ignoring\n"; + $odbchome = ''; + } } else { print " odbc_config not found - ok, there are other things I can do\n"; } @@@@ -272,6 +286,11 @@@@ -f '/usr/local/include/sqltypes.h') { print " Found sql header files in /use/local/include\n"; $odbchome = '/usr/local'; + } elsif (-f '/usr/pkg/include/sql.h' && + -f '/usr/pkg/include/sqlext.h' && + -f '/usr/pkg/include/sqltypes.h') { + print " Found sql header files in /use/pkg/include\n"; + $odbchome = '/usr/pkg'; } elsif (-d '/usr/local/easysoft/unixODBC') { print " Found sql header files in /use/local/easysoft/include\n"; $odbchome = '/usr/local/easysoft/unixODBC'; @@@@ -346,13 +365,13 @@@@ # fix to avoid foo..ext on many systems. $arext =~ s/^\.//; - $myodbc = 'unixodbc' - if !$myodbc && glob "$odbchome/lib/libodbc.*"; - $myodbc = 'iodbc' if !$myodbc && ((glob "$odbchome/*iodbc*") || (glob "$odbchome/lib/*iodbc*")); + $myodbc = 'unixodbc' + if !$myodbc && glob "$odbchome/lib/libodbc.*"; + $myodbc = 'empress' if !$myodbc && glob "$odbchome/lib/libempodbc.*"; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Importing package for p5 module DBD::ODBC 1.21. DBD::ODBC is an ODBC Driver for DBI. @ text @@