unixodbc: updated to 2.3.11

2.3.11

Add missing files


2.3.10

Add connection pooling via wide connection functions
Remove "#define VERSION" from unixodbc_conf.h
Call driver functions through prototypes
Add connection pool limit option
Add fseeko support in cursor lib
Try and prevent logging buffer overflow
Add 'echo' option to isql/iusql
Alter isql/iusql buffering
Alter unicode to ascii conversion in SQLGetDiagField
Fix pooling problem when user name and or password is not provided
Fix a couple of reported buffer overflow conditions
Fix iconv leak with timeout in pooled connection

4 files changed, 23 insertions, 37 deletions

diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index e516d5cda4f..ff727a8e62d 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2020/09/14 17:46:39 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/05/09 11:16:27 adam Exp $
 
-DISTNAME=	unixODBC-2.3.9
+DISTNAME=	unixODBC-2.3.11
 PKGNAME=	${DISTNAME:S/ODBC/odbc/}
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.unixodbc.org/pub/unixODBC/
@@ -18,7 +18,6 @@ GNU_CONFIGURE=		yes
 GNU_CONFIGURE_STRICT=	no # has sub-configures
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--disable-gui
-CONFIGURE_ARGS+=	--enable-driverc
 CONFIGURE_ARGS+=	--enable-drivers
 CONFIGURE_ARGS+=	--enable-threads
 PKGCONFIG_OVERRIDE+=	DriverManager/odbc.pc.in
diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST
index 70180540827..4ce612722fa 100644
--- a/databases/unixodbc/PLIST
+++ b/databases/unixodbc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2018/04/14 08:26:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2022/05/09 11:16:27 adam Exp $
 bin/dltest
 bin/isql
 bin/iusql
@@ -13,28 +13,17 @@ include/sqlext.h
 include/sqlspi.h
 include/sqltypes.h
 include/sqlucode.h
-include/unixodbc_conf.h
+include/unixODBC/config.h
+include/unixODBC/unixodbc_conf.h
+include/unixodbc.h
 include/uodbc_extras.h
 include/uodbc_stats.h
-lib/libodbc.la
-lib/libodbccr.la
-lib/libodbcinst.la
-${UNIXODBC_DRIVERS_DIR}/libesoobS.la
-${UNIXODBC_DRIVERS_DIR}/libmimerS.la
 ${UNIXODBC_DRIVERS_DIR}/libnn.la
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.la
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.la
-${UNIXODBC_DRIVERS_DIR}/libodbcminiS.la
-${UNIXODBC_DRIVERS_DIR}/libodbcmyS.la
-${UNIXODBC_DRIVERS_DIR}/libodbcnnS.la
 ${UNIXODBC_DRIVERS_DIR}/libodbcpsql.la
-${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.la
-${UNIXODBC_DRIVERS_DIR}/libodbctxtS.la
-${UNIXODBC_DRIVERS_DIR}/liboplodbcS.la
-${UNIXODBC_DRIVERS_DIR}/liboraodbcS.la
-${UNIXODBC_DRIVERS_DIR}/libsapdbS.la
-${UNIXODBC_DRIVERS_DIR}/libtdsS.la
 ${UNIXODBC_DRIVERS_DIR}/libtemplate.la
+lib/libodbc.la
+lib/libodbccr.la
+lib/libodbcinst.la
 lib/pkgconfig/odbc.pc
 lib/pkgconfig/odbccr.pc
 lib/pkgconfig/odbcinst.pc
diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo
index ff741b1edd8..4f496e68730 100644
--- a/databases/unixodbc/distinfo
+++ b/databases/unixodbc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:10:07 nia Exp $
+$NetBSD: distinfo,v 1.22 2022/05/09 11:16:27 adam Exp $
 
-BLAKE2s (unixODBC-2.3.9.tar.gz) = a26bd692227951581446fbfd08f0b548fb8f4b5fd69a1f4a8f6224007d419bcf
-SHA512 (unixODBC-2.3.9.tar.gz) = 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
-Size (unixODBC-2.3.9.tar.gz) = 1676145 bytes
-SHA1 (patch-Makefile.in) = bf15efe813f44ae8b56ef2d4f1baa0be034c2028
+BLAKE2s (unixODBC-2.3.11.tar.gz) = 4c160a5ab37682d38fbc960da239c952b552abc55fe5ff227f5673726c518e6d
+SHA512 (unixODBC-2.3.11.tar.gz) = dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
+Size (unixODBC-2.3.11.tar.gz) = 1752585 bytes
+SHA1 (patch-Makefile.in) = 807eb24caff7e01493bb6d60f3b253d9f34fa2fc
diff --git a/databases/unixodbc/patches/patch-Makefile.in b/databases/unixodbc/patches/patch-Makefile.in
index 048e3f27ac6..d006f293265 100644
--- a/databases/unixodbc/patches/patch-Makefile.in
+++ b/databases/unixodbc/patches/patch-Makefile.in
@@ -1,16 +1,14 @@
-$NetBSD: patch-Makefile.in,v 1.1 2018/08/14 13:04:24 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2022/05/09 11:16:27 adam Exp $
 
 Do not create empty files nor directories in /etc.
 
---- Makefile.in.orig	2018-08-14 12:57:27.000000000 +0000
+--- Makefile.in.orig	2022-05-04 17:02:55.000000000 +0000
 +++ Makefile.in
-@@ -961,9 +961,6 @@ uninstall-am: uninstall-pkgconfigDATA
+@@ -955,7 +955,6 @@ info-am:
+ install-data-am: install-includeHEADERS install-pkgconfigDATA \
+ 	install-pkgincludeHEADERS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive
  
- 
- install-data-am: install-pkgconfigDATA
--	-mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
--	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini
--	-touch $(DESTDIR)${sysconfdir}/odbc.ini
- 	cp unixodbc_conf.h $(DESTDIR)${includedir}/unixodbc_conf.h
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ install-dvi-am: