diff options
author | ryoon <ryoon> | 2015-04-26 11:37:07 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2015-04-26 11:37:07 +0000 |
commit | d3590481949023d0fca15311f0c5be9d5a103f5e (patch) | |
tree | 151c3a0d1519ffa8a886bf384a963604d22cf3f1 /databases | |
parent | e52d3874c39c02dc64645135fec9def892d407cf (diff) | |
download | pkgsrc-d3590481949023d0fca15311f0c5be9d5a103f5e.tar.gz |
Update to 2.3.2
* Bump BUILDLINK_API_DEPENDS.
Changelog:
8th-October-2013
2.3.2
* The logging of WStrings was using the incorrect length in some cases
* Pass SQLDescribeCol call to driver when in state 2 (not a cursor spec).
* Pass SQLMoreResults call to driver when in state 2 (not a cursor spec).
Both the last two changes are not as per the original book state table
but allign with the current MS driver manager
* The -e option to isql got lost somewhere. Back in now
* Update install-sh
* SQLCancel assumed that the DM was being built with thread support
* Try and speed up SQLTransact and SQLEndTran operation
* Add missing \ in Postgres7.1 Makefile
* Correct some potential buffer overflows
* Handle SQL_NEED_DATA from a SQLMoreResults
* Get the local charset via nl_langinfo(CODESET) when asking the DM to do ASCII-UNICODE conversions
* Handle (and remove) leading spaces from ini entries
* Fixed unicode conversion problems in SQLGetDiagField(W)
* missing terminating null in iusql
* add to the list of errno states that does not cause a create of the ini file
* SQLSetConnactAttr() -> SQLSetConnectAttrW() was passing incorrect string length
* Fix double free in SQLGetDiagFieldW
* Fix Unicode/Ansi conversion problem in SQLGetDiagFieldW.c
* Add support for Driver64 in SQLDriverConnectW
* Add missing unicode setting when returning a connection to the pool
* Tidy up leaking iconv handles if connect_part_one fails
* Fix (and avoid) some out of memory problems
* Wrap lt_dlinit and dlerror in the lib mutex
* Add slencheck executable to try and find the sizeof(SQLLEN) from a installed driver
* SQL_NO_DATA after SQL_STILL_EXECUTING in SQLExtendedFetch was not setting the state correctly
* A little more 3.80 stuff being added
* Added fixes found by coverity
* Added man pages
* Patches to update VMS build
* Change mutex protection around release_env
* Altered strlen to be count of bytes in SQLGetDiagFieldW
* Add check for W function support in do_attr
* Allow SQLDrivers to return attribute length with no supplied buffer
26th-November-2011
2.3.1
* Change type definition of a integer in SQLConnect.c, just to avoid
confusion
* Allow setting the DM overrive values in the connection string to SQLDriverConnect
for example
"DRIVER={Easysoft ODBC-SQL Server};Server=myserver;UID=user;PWD=pass;DMStmtAttr=SQL_QUERY_TIMEOUT=10;"
* Error and info message order was being inverted by the driver manager
* Fix memory leak in SQLDriverConnect.c (Thanks JM)
* The keyword matching for DRIVER=, DSN= etc was case sensitive. Make it insensitive now
* Avoid sprintf NULL pointer problem in SQLGetDiagRec
* Fix typo affecting the pooling of connections, (thanks Chris)
* Fix SunCC _mcount problem
* Attempt to stamp version info on the libs generated. There are aps in use linked against other
driver managers that expect VERS_3.52
* Fix potential buffer overrun when using SAFEFILE
* Fix mutex problem in the exit from __SQLGetInfo (thanks Richard)
* Allow getting SQL_DM_VER via SQLGetInfo before connecting to a driver
* Generate unixodbc_conf.h using macros to allow cross compiling
* Fix some libltdl problems
* Fix some naming problems with the cursor lib
* Fix odbcinst problems on systems without pwd.h
* Change lib version to 2 to reflect SQLLEN changes in v2.3
* Fix threading problem (thanks Petr Vandrovec)
* Allow use of lib name in a DRIVER= connection string
* Change default threading protection to 0, most drivers should be thread
safe by now. If the driver is at all thread safe, allow SQLCancel to bipass the
interlock.
* Performance change to handle large numbers of connection and statement handles better.
Thanks for the change from the folks at Acision.
* Add -k option to isql to treat the DSN as a connection string and use SQLDriverConnect
isql -k "DSN=server;UID=test;PWD=test"
* Couple of the SQLSetConnactAttr values are now SQLULEN instead of SQLUINTEGER
* SQLSetConnectAttr was passing a char length instead of a byte length into the
Driver SQLSetConnectAttr when converting from Ansi->Unicode
* Driver version was not being held when a second connection was made to the driver
Diffstat (limited to 'databases')
-rw-r--r-- | databases/unixodbc/Makefile | 5 | ||||
-rw-r--r-- | databases/unixodbc/PLIST | 8 | ||||
-rw-r--r-- | databases/unixodbc/buildlink3.mk | 6 | ||||
-rw-r--r-- | databases/unixodbc/distinfo | 18 | ||||
-rw-r--r-- | databases/unixodbc/patches/patch-aa | 8 | ||||
-rw-r--r-- | databases/unixodbc/patches/patch-af | 42 | ||||
-rw-r--r-- | databases/unixodbc/patches/patch-ah | 15 | ||||
-rw-r--r-- | databases/unixodbc/patches/patch-ai | 8 | ||||
-rw-r--r-- | databases/unixodbc/patches/patch-aj | 24 | ||||
-rw-r--r-- | databases/unixodbc/patches/patch-ap | 30 |
10 files changed, 43 insertions, 121 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index f13a0cc2de5..c5f4e38381a 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2012/10/02 21:25:55 asau Exp $ +# $NetBSD: Makefile,v 1.35 2015/04/26 11:37:07 ryoon Exp $ -DISTNAME= unixODBC-2.3.0 -PKGREVISION= 2 +DISTNAME= unixODBC-2.3.2 PKGNAME= ${DISTNAME:S/ODBC/odbc/} CATEGORIES= databases MASTER_SITES= http://www.unixodbc.org/ diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST index 35bf58b92d6..3f544a3dd81 100644 --- a/databases/unixodbc/PLIST +++ b/databases/unixodbc/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.10 2010/05/03 02:10:43 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.11 2015/04/26 11:37:07 ryoon Exp $ bin/dltest bin/isql bin/iusql bin/odbc_config bin/odbcinst +bin/slencheck +include/autotest.h include/odbcinst.h include/odbcinstext.h include/sql.h @@ -32,4 +34,8 @@ ${UNIXODBC_DRIVERS_DIR}/liboraodbcS.la ${UNIXODBC_DRIVERS_DIR}/libsapdbS.la ${UNIXODBC_DRIVERS_DIR}/libtdsS.la ${UNIXODBC_DRIVERS_DIR}/libtemplate.la +man/man1/isql.1 +man/man1/odbcinst.1 +man/man5/odbc.ini.5 +man/man5/odbcinst.ini.5 share/examples/unixodbc/odbc.ini diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk index b2b475b30d9..a90c15c5957 100644 --- a/databases/unixodbc/buildlink3.mk +++ b/databases/unixodbc/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:08 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/04/26 11:37:07 ryoon Exp $ BUILDLINK_TREE+= unixodbc .if !defined(UNIXODBC_BUILDLINK3_MK) UNIXODBC_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.unixodbc+= unixodbc>=2.0.11nb1 -BUILDLINK_ABI_DEPENDS.unixodbc+= unixodbc>=2.0.11nb3 +BUILDLINK_API_DEPENDS.unixodbc+= unixodbc>=2.3.2 +BUILDLINK_ABI_DEPENDS.unixodbc+= unixodbc>=2.3.2 BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc .endif # UNIXODBC_BUILDLINK3_MK diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo index 1cb3ccb6caa..da42ecbe445 100644 --- a/databases/unixodbc/distinfo +++ b/databases/unixodbc/distinfo @@ -1,19 +1,17 @@ -$NetBSD: distinfo,v 1.11 2011/03/11 15:18:43 drochner Exp $ +$NetBSD: distinfo,v 1.12 2015/04/26 11:37:07 ryoon Exp $ -SHA1 (unixODBC-2.3.0.tar.gz) = b2839b5210906e3ee286a4b621f177db9c7be7a8 -RMD160 (unixODBC-2.3.0.tar.gz) = 166a96c31fe013ced6b6ef93da5871f672cfe456 -Size (unixODBC-2.3.0.tar.gz) = 1804749 bytes -SHA1 (patch-aa) = afca440d5765170a33abcb3356f9a21f0f8eec0a +SHA1 (unixODBC-2.3.2.tar.gz) = f84520fd58143625b614fde551435178a558ee2e +RMD160 (unixODBC-2.3.2.tar.gz) = 023122427bd8bdabdbfddf727d16210bb32c60f3 +Size (unixODBC-2.3.2.tar.gz) = 1849173 bytes +SHA1 (patch-aa) = b0c9295a16207176eb01fa7fbbed8790d9f9dbb8 SHA1 (patch-ac) = 8925e66b81fa8896badcafda6af5dae9edbda753 SHA1 (patch-ad) = b2e695d8c8c682c99af80e362369b0295070c1ab -SHA1 (patch-af) = e011c95867a10ae52a9362d0ebdf2fcdc2a92f8a SHA1 (patch-ag) = 1be22add8724176cf97c2e7c78fc069638c3c386 -SHA1 (patch-ah) = 1e34c499331dfda64b47b1eda27c6485d0d43fb9 -SHA1 (patch-ai) = 9b147d7a751b10795b5685249c7d8430dcf15936 -SHA1 (patch-aj) = 538c4335791e913a91e7541f2d2780b162a53848 +SHA1 (patch-ah) = c41fa43603565129ada33fca55929c5ce6c14835 +SHA1 (patch-ai) = 0d7486a67cfab18ae78127e2b9ec8b5de9196ad8 +SHA1 (patch-aj) = fbb9a619ce1cb648abc3441ac0b214d0cd256474 SHA1 (patch-ak) = c5b3b0d7c8888f18b7534dfd787d9c90fecbf943 SHA1 (patch-al) = 350c2562cad9b72e41a5f3cb38df39e4f5624199 SHA1 (patch-am) = 095ed0aa4e5882160fbf50d53c09ea23eafe1589 SHA1 (patch-an) = e3ce589f9dd7e97fa1dac43b9fbe981a352e8f0b SHA1 (patch-ao) = db7d39c31e478162afa48e3effde2d60f0f6cc46 -SHA1 (patch-ap) = 7947cb0491235190961a04257add4b29e45a5e0e diff --git a/databases/unixodbc/patches/patch-aa b/databases/unixodbc/patches/patch-aa index 6a7650623f7..19dbe546bf7 100644 --- a/databases/unixodbc/patches/patch-aa +++ b/databases/unixodbc/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.6 2010/05/03 02:10:43 jnemeth Exp $ +$NetBSD: patch-aa,v 1.7 2015/04/26 11:37:08 ryoon Exp $ ---- Makefile.in.orig 2010-02-24 16:52:24.000000000 +0000 +--- Makefile.in.orig 2013-10-08 08:56:01.000000000 +0000 +++ Makefile.in -@@ -796,9 +796,6 @@ uninstall-am: +@@ -827,9 +827,6 @@ uninstall-am: install-data-am: - -touch $(DESTDIR)${sysconfdir}/odbcinst.ini - -touch $(DESTDIR)${sysconfdir}/odbc.ini - -mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources - $(DESTDIR)${bindir}/odbc_config --header > $(DESTDIR)${includedir}/unixodbc_conf.h + cp unixodbc_conf.h $(DESTDIR)${includedir}/unixodbc_conf.h # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/databases/unixodbc/patches/patch-af b/databases/unixodbc/patches/patch-af deleted file mode 100644 index 265d0da884f..00000000000 --- a/databases/unixodbc/patches/patch-af +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-af,v 1.1 2009/10/21 04:21:27 taca Exp $ - -* Call function_return() with IGNORE_THREAD after calling thread_release(). - ---- DriverManager/SQLFreeHandle.c.orig 2007-12-17 22:13:03.000000000 +0900 -+++ DriverManager/SQLFreeHandle.c -@@ -234,7 +234,7 @@ SQLRETURN __SQLFreeHandle( SQLSMALLINT h - - thread_release( SQL_HANDLE_ENV, environment ); - -- return function_return( SQL_HANDLE_ENV, environment, SQL_ERROR ); -+ return function_return( IGNORE_THREAD, environment, SQL_ERROR ); - } - - thread_release( SQL_HANDLE_ENV, environment ); -@@ -301,7 +301,7 @@ SQLRETURN __SQLFreeHandle( SQLSMALLINT h - - thread_release( SQL_HANDLE_ENV, environment ); - -- return function_return( SQL_HANDLE_ENV, environment, SQL_ERROR ); -+ return function_return( IGNORE_THREAD, environment, SQL_ERROR ); - } - - environment -> connection_count --; -@@ -404,7 +404,7 @@ SQLRETURN __SQLFreeHandle( SQLSMALLINT h - - thread_release( SQL_HANDLE_STMT, statement ); - -- return function_return( SQL_HANDLE_STMT, statement, SQL_ERROR ); -+ return function_return( IGNORE_THREAD, statement, SQL_ERROR ); - } - - if ( !CHECK_SQLFREEHANDLE( statement -> connection )) -@@ -551,7 +551,7 @@ SQLRETURN __SQLFreeHandle( SQLSMALLINT h - - thread_release( SQL_HANDLE_DESC, descriptor ); - -- return function_return( SQL_HANDLE_DESC, descriptor, SQL_ERROR ); -+ return function_return( IGNORE_THREAD, descriptor, SQL_ERROR ); - } - else - { diff --git a/databases/unixodbc/patches/patch-ah b/databases/unixodbc/patches/patch-ah index 0cd2c1b6ad1..50035631724 100644 --- a/databases/unixodbc/patches/patch-ah +++ b/databases/unixodbc/patches/patch-ah @@ -1,19 +1,10 @@ -$NetBSD: patch-ah,v 1.2 2010/05/03 02:10:43 jnemeth Exp $ +$NetBSD: patch-ah,v 1.3 2015/04/26 11:37:08 ryoon Exp $ * Call function_return() with IGNORE_THREAD after calling thread_release(). ---- DriverManager/SQLTransact.c.orig 2010-04-13 16:56:08.000000000 +0000 +--- DriverManager/SQLTransact.c.orig 2013-04-15 15:41:25.000000000 +0000 +++ DriverManager/SQLTransact.c -@@ -465,7 +465,7 @@ SQLRETURN SQLTransact( SQLHENV environme - - thread_release( SQL_HANDLE_ENV, environment ); - -- return function_return( SQL_HANDLE_ENV, environment, SQL_ERROR ); -+ return function_return( IGNORE_THREAD, environment, SQL_ERROR ); - } - - if ( environment -> state == STATE_E2 ) -@@ -536,7 +536,7 @@ SQLRETURN SQLTransact( SQLHENV environme +@@ -472,7 +472,7 @@ SQLRETURN SQLTransact( SQLHENV environme thread_release( SQL_HANDLE_ENV, environment ); diff --git a/databases/unixodbc/patches/patch-ai b/databases/unixodbc/patches/patch-ai index ff18ea03b39..d0d202e9e8a 100644 --- a/databases/unixodbc/patches/patch-ai +++ b/databases/unixodbc/patches/patch-ai @@ -1,18 +1,18 @@ -$NetBSD: patch-ai,v 1.1 2009/10/21 04:21:27 taca Exp $ +$NetBSD: patch-ai,v 1.2 2015/04/26 11:37:08 ryoon Exp $ * Release connection->mutex before destroy it when connection->protection_level isn't TS_LEVEL3 since it causes destroying locked mutex when explicitly specifies "Threading" parameter in odbcinst.ini. I don't know the case using LIBTHREAD. ---- DriverManager/__handles.c.orig 2009-10-20 16:47:04.000000000 +0900 +--- DriverManager/__handles.c.orig 2013-06-06 14:34:38.000000000 +0000 +++ DriverManager/__handles.c -@@ -737,6 +737,8 @@ void __release_dbc( DMHDBC connection ) +@@ -742,6 +742,8 @@ void __release_dbc( DMHDBC connection ) #ifdef HAVE_LIBPTH #elif HAVE_LIBPTHREAD + if ( connection -> protection_level != TS_LEVEL3) -+ mutex_exit( &connection -> mutex ); ++ mutex_exit( &connection -> mutex ); pthread_mutex_destroy( &connection -> mutex ); #elif HAVE_LIBTHREAD mutex_destroy( &connection -> mutex ); diff --git a/databases/unixodbc/patches/patch-aj b/databases/unixodbc/patches/patch-aj index 1d9e1dfdf98..5ea580b6993 100644 --- a/databases/unixodbc/patches/patch-aj +++ b/databases/unixodbc/patches/patch-aj @@ -1,31 +1,31 @@ -$NetBSD: patch-aj,v 1.1 2010/05/03 02:10:43 jnemeth Exp $ +$NetBSD: patch-aj,v 1.2 2015/04/26 11:37:08 ryoon Exp $ ---- libltdl/Makefile.in.orig 2010-04-26 01:42:12.000000000 +0000 +--- libltdl/Makefile.in.orig 2013-04-15 15:42:37.000000000 +0000 +++ libltdl/Makefile.in -@@ -408,7 +408,7 @@ distclean-hdr: +@@ -427,7 +427,7 @@ distclean-hdr: -rm -f config.h stamp-h1 install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ if test -f $$p; then \ - f=$(am__strip_dir) \ -@@ -644,7 +644,7 @@ distclean-libtool: +@@ -667,7 +667,7 @@ distclean-libtool: -rm -f libtool config.lt install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + test -z "$(DESTDIR)$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -@@ -661,7 +661,7 @@ uninstall-includeHEADERS: - done +@@ -687,7 +687,7 @@ uninstall-includeHEADERS: + cd "$(DESTDIR)$(includedir)" && rm -f $$files install-ltdlincludeHEADERS: $(ltdlinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" + test -z "$(DESTDIR)$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" - @list='$(ltdlinclude_HEADERS)'; for p in $$list; do \ + @list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ diff --git a/databases/unixodbc/patches/patch-ap b/databases/unixodbc/patches/patch-ap deleted file mode 100644 index 89b6c0b76d5..00000000000 --- a/databases/unixodbc/patches/patch-ap +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2011/03/11 15:18:43 drochner Exp $ - -CVE-2011-1145 - ---- DriverManager/SQLDriverConnect.c.orig 2010-04-13 16:38:26.000000000 +0000 -+++ DriverManager/SQLDriverConnect.c -@@ -639,7 +639,7 @@ SQLRETURN SQLDriverConnect( - { - DMHDBC connection = (DMHDBC)hdbc; - struct con_struct con_struct; -- char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ 128 ]; -+ char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ INI_MAX_PROPERTY_VALUE + 1 ]; - char lib_name[ INI_MAX_PROPERTY_VALUE + 1 ]; - char driver_name[ INI_MAX_PROPERTY_VALUE + 1 ]; - SQLRETURN ret_from_connect; -@@ -944,7 +944,13 @@ SQLRETURN SQLDriverConnect( - tsavefile = __get_attribute_value( &con_struct, "SAVEFILE" ); - if ( tsavefile ) - { -- strcpy( savefile, tsavefile ); -+ if ( strlen( tsavefile ) > INI_MAX_PROPERTY_VALUE ) { -+ memcpy( savefile, tsavefile, INI_MAX_PROPERTY_VALUE ); -+ savefile[ INI_MAX_PROPERTY_VALUE ] = '\0'; -+ } -+ else { -+ strcpy( savefile, tsavefile ); -+ } - } - else - { |