CVS commit: pkgsrc/databases/unixodbc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug  5 13:20:09 UTC 2024

Modified Files:
        pkgsrc/databases/unixodbc: Makefile distinfo
Added Files:
        pkgsrc/databases/unixodbc/patches: patch-Drivers_Postgre7.1_info.c

Log Message:
unixodbc: fix potentially unsafe pointer usage. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/unixodbc/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/unixodbc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/unixodbc/patches/patch-Drivers_Postgre7.1_info.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/unixodbc/Makefile
diff -u pkgsrc/databases/unixodbc/Makefile:1.46 pkgsrc/databases/unixodbc/Makefile:1.47
--- pkgsrc/databases/unixodbc/Makefile:1.46     Thu Aug 10 07:44:52 2023
+++ pkgsrc/databases/unixodbc/Makefile  Mon Aug  5 13:20:08 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2023/08/10 07:44:52 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/08/05 13:20:08 tnn Exp $
 
 DISTNAME=      unixODBC-2.3.12
 PKGNAME=       ${DISTNAME:S/ODBC/odbc/}
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  ftp://ftp.unixodbc.org/pub/unixODBC/
 
@@ -34,6 +35,8 @@ CONFIGURE_ARGS+=      --with-pth=${PTHREADBAS
 CFLAGS.SunOS+=         -D_POSIX_PTHREAD_SEMANTICS
 LIBS.SunOS+=           -lsocket -lnsl
 
+#CFLAGS+=              -Wno-error=incompatible-pointer-types
+
 # Override the local definitions that point to the self-contained libtool
 # convenience library.  We want the one installed by pkgsrc.  Also override
 # the variable pointing to the (static) libfl.a, which won't link with a

Index: pkgsrc/databases/unixodbc/distinfo
diff -u pkgsrc/databases/unixodbc/distinfo:1.23 pkgsrc/databases/unixodbc/distinfo:1.24
--- pkgsrc/databases/unixodbc/distinfo:1.23     Thu Aug 10 07:44:52 2023
+++ pkgsrc/databases/unixodbc/distinfo  Mon Aug  5 13:20:08 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.23 2023/08/10 07:44:52 adam Exp $
+$NetBSD: distinfo,v 1.24 2024/08/05 13:20:08 tnn Exp $
 
 BLAKE2s (unixODBC-2.3.12.tar.gz) = aff316a61bfab36b9efc8fd6d8636bc157ecd41133fd006ac56ce5c82a1ad14d
 SHA512 (unixODBC-2.3.12.tar.gz) = ca9d8db943195679a44db1fc09391dc6662ab1721112c93d448f04011e98502462ffe14b8364eb03707d851db456eced20eb61a22370392ca88d917038d45b56
 Size (unixODBC-2.3.12.tar.gz) = 1753915 bytes
+SHA1 (patch-Drivers_Postgre7.1_info.c) = 64b10ae23ea3e933a522ec9356164765c179d89b
 SHA1 (patch-Makefile.in) = 807eb24caff7e01493bb6d60f3b253d9f34fa2fc

Added files:

Index: pkgsrc/databases/unixodbc/patches/patch-Drivers_Postgre7.1_info.c
diff -u /dev/null pkgsrc/databases/unixodbc/patches/patch-Drivers_Postgre7.1_info.c:1.1
--- /dev/null   Mon Aug  5 13:20:09 2024
+++ pkgsrc/databases/unixodbc/patches/patch-Drivers_Postgre7.1_info.c   Mon Aug  5 13:20:08 2024
@@ -0,0 +1,34 @@
+$NetBSD: patch-Drivers_Postgre7.1_info.c,v 1.1 2024/08/05 13:20:08 tnn Exp $
+
+info.c:1868:63: error: passing argument 6 of 'PG_SQLBindCol' from incompatible pointer type [-Wincompatible-pointer-types]
+info.c:1934:44: error: passing argument 6 of 'PG_SQLBindCol' from incompatible pointer type [-Wincompatible-pointer-types]
+info.c:2220:51: error: passing argument 6 of 'PG_SQLBindCol' from incompatible pointer type [-Wincompatible-pointer-types]
+
+--- Drivers/Postgre7.1/info.c.orig     2024-08-05 14:46:06.887870206 +0000
++++ Drivers/Postgre7.1/info.c
+@@ -1779,14 +1779,14 @@ char *table_name;
+ char index_name[MAX_INFO_STRING];
+ short fields_vector[8];
+ char isunique[10], isclustered[10];
+-SDWORD index_name_len, fields_vector_len;
++SQLLEN index_name_len, fields_vector_len;
+ TupleNode *row;
+ int i;
+ HSTMT hcol_stmt;
+ StatementClass *col_stmt, *indx_stmt;
+ char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
+ char **column_names = 0;
+-Int4 column_name_len;
++SQLLEN column_name_len;
+ int total_columns = 0;
+ char error = TRUE;
+ ConnInfo *ci;
+@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt;
+ StatementClass *tbl_stmt;
+ char tables_query[STD_STATEMENT_LEN];
+ char attname[MAX_INFO_STRING];
+-SDWORD attname_len;
++SQLLEN attname_len;
+ char pktab[MAX_TABLE_LEN + 1];
+ Int2 result_cols;
+