Import of pkgsrc-2013Q2

databases/unixodbc/patches/patch-aa

@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.6 2010/05/03 02:10:43 jnemeth Exp $
+
+--- Makefile.in.orig	2010-02-24 16:52:24.000000000 +0000
++++ Makefile.in
+@@ -796,9 +796,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
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.

databases/unixodbc/patches/patch-ac

@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.2 2010/05/03 02:10:43 jnemeth Exp $
+
+--- Drivers/Postgre7.1/md5.h.orig	2009-12-11 16:54:08.000000000 +0000
++++ Drivers/Postgre7.1/md5.h
+@@ -13,6 +13,9 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef __APPLE__
++#include <stdbool.h>
++#endif
+ 
+ #define MD5_PASSWD_LEN	35
+ 

databases/unixodbc/patches/patch-ad

@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2009/10/21 04:21:27 taca Exp $
+
+* Call function_return with IGNORE_THREAD to prevent calling
+  thread_release() since thread_protect() isn't called this "default:"
+  case .
+
+--- DriverManager/SQLAllocHandle.c.orig	2007-12-17 22:13:03.000000000 +0900
++++ DriverManager/SQLAllocHandle.c
+@@ -1244,7 +1244,7 @@ SQLRETURN __SQLAllocHandle( SQLSMALLINT 
+ 						ERROR_HY092, NULL,
+ 						environment -> requested_version );
+ 
+-			return function_return( SQL_HANDLE_ENV, environment, SQL_ERROR );
++			return function_return( IGNORE_THREAD, environment, SQL_ERROR );
+ 		}
+ 		else if ( __validate_dbc( (DMHDBC) input_handle ))
+ 		{
+@@ -1253,7 +1253,7 @@ SQLRETURN __SQLAllocHandle( SQLSMALLINT 
+ 					ERROR_HY092, NULL,
+ 					connection -> environment -> requested_version );
+ 	
+-			return function_return( SQL_HANDLE_DBC, connection, SQL_ERROR );
++			return function_return( IGNORE_THREAD, connection, SQL_ERROR );
+ 		}
+ 		else
+ 		{

databases/unixodbc/patches/patch-af

@@ -0,0 +1,42 @@
+$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
+             {

databases/unixodbc/patches/patch-ag

@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2009/10/21 04:21:27 taca Exp $
+
+* Call function_return() with IGNORE_THREAD since __SQLGetInfo() is already
+  called and __SQLGetInfo() calls function_return().
+
+--- DriverManager/SQLGetInfo.c.orig	2008-09-29 23:02:45.000000000 +0900
++++ DriverManager/SQLGetInfo.c
+@@ -611,5 +611,5 @@ SQLRETURN SQLGetInfo( SQLHDBC connection
+                 connection -> msg );
+     }
+ 
+-    return function_return( SQL_HANDLE_DBC, connection, ret );
++    return function_return( IGNORE_THREAD, connection, ret );
+ }

databases/unixodbc/patches/patch-ah

@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.2 2010/05/03 02:10:43 jnemeth 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
+@@ -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
+ 
+                             thread_release( SQL_HANDLE_ENV, environment );
+ 
+-                            return function_return( SQL_HANDLE_ENV, environment, SQL_ERROR );
++                            return function_return( IGNORE_THREAD, environment, SQL_ERROR );
+                         }
+                     }
+                     else if ( CHECK_SQLENDTRAN( connection ))

databases/unixodbc/patches/patch-ai

@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.1 2009/10/21 04:21:27 taca 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
+@@ -737,6 +737,8 @@ void __release_dbc( DMHDBC connection )
+ 
+ #ifdef HAVE_LIBPTH
+ #elif HAVE_LIBPTHREAD
++    if ( connection -> protection_level != TS_LEVEL3)
++  	mutex_exit( &connection -> mutex );
+     pthread_mutex_destroy( &connection -> mutex );
+ #elif HAVE_LIBTHREAD
+     mutex_destroy( &connection -> mutex );

databases/unixodbc/patches/patch-aj

@@ -0,0 +1,31 @@
+$NetBSD: patch-aj,v 1.1 2010/05/03 02:10:43 jnemeth Exp $
+
+--- libltdl/Makefile.in.orig	2010-04-26 01:42:12.000000000 +0000
++++ libltdl/Makefile.in
+@@ -408,7 +408,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 \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -644,7 +644,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 \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -661,7 +661,7 @@ uninstall-includeHEADERS:
+ 	done
+ 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 \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \

databases/unixodbc/patches/patch-ak

@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2010/05/03 02:10:43 jnemeth Exp $
+
+--- DriverManager/Makefile.in.orig	2010-04-26 02:28:44.000000000 +0000
++++ DriverManager/Makefile.in
+@@ -483,7 +483,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ 	list2=; for p in $$list; do \
+ 	  if test -f $$p; then \

databases/unixodbc/patches/patch-al

@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2010/05/03 02:10:43 jnemeth Exp $
+
+--- cur/Makefile.in.orig	2010-04-26 02:28:43.000000000 +0000
++++ cur/Makefile.in
+@@ -388,7 +388,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ 	list2=; for p in $$list; do \
+ 	  if test -f $$p; then \

databases/unixodbc/patches/patch-am

@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2010/05/03 02:10:43 jnemeth Exp $
+
+--- exe/Makefile.in.orig	2010-04-26 02:28:44.000000000 +0000
++++ exe/Makefile.in
+@@ -319,7 +319,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++	test -z "$(DESTDIR)$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ 	for p in $$list; do echo "$$p $$p"; done | \
+ 	sed 's/$(EXEEXT)$$//' | \

databases/unixodbc/patches/patch-an

@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2010/05/03 02:10:43 jnemeth Exp $
+
+--- include/Makefile.in.orig	2010-04-26 02:28:43.000000000 +0000
++++ include/Makefile.in
+@@ -301,7 +301,7 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++	test -z "$(DESTDIR)$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

databases/unixodbc/patches/patch-ao

@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2010/05/03 02:10:43 jnemeth Exp $
+
+--- odbcinst/Makefile.in.orig	2010-04-26 02:28:43.000000000 +0000
++++ odbcinst/Makefile.in
+@@ -440,7 +440,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ 	list2=; for p in $$list; do \
+ 	  if test -f $$p; then \
+@@ -557,7 +557,7 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++	test -z "$(DESTDIR)$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

databases/unixodbc/patches/patch-ap

@@ -0,0 +1,30 @@
+$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
+     {