CVS commit: pkgsrc/databases/unixodbc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 17 13:15:29 UTC 2025

Modified Files:
        pkgsrc/databases/unixodbc: distinfo
Added Files:
        pkgsrc/databases/unixodbc/patches: patch-odbcinst_SQLSetConfigMode.c

Log Message:
unixodbc: Avoid conflict with system mutex functions.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/unixodbc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/unixodbc/patches/patch-odbcinst_SQLSetConfigMode.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/distinfo
diff -u pkgsrc/databases/unixodbc/distinfo:1.26 pkgsrc/databases/unixodbc/distinfo:1.27
--- pkgsrc/databases/unixodbc/distinfo:1.26     Wed Oct  8 15:18:58 2025
+++ pkgsrc/databases/unixodbc/distinfo  Fri Oct 17 13:15:29 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2025/10/08 15:18:58 adam Exp $
+$NetBSD: distinfo,v 1.27 2025/10/17 13:15:29 jperkin Exp $
 
 BLAKE2s (unixODBC-2.3.14.tar.gz) = 3688dc42942b5bc55684dd1910f89e4ecad902ddbb945fc0648784ad63d90327
 SHA512 (unixODBC-2.3.14.tar.gz) = 922caa7ed2ad97a194a2b66c9fb69bdebe62d1b74a729d726c79835b9fc13be60c7650c86031062a25b07021ff2c7a936ef9c366d4a148d290932bab453c864c
 Size (unixODBC-2.3.14.tar.gz) = 1758907 bytes
 SHA1 (patch-Makefile.in) = 807eb24caff7e01493bb6d60f3b253d9f34fa2fc
+SHA1 (patch-odbcinst_SQLSetConfigMode.c) = 358c3950718d334e030870ba35b4396c8326e167

Added files:

Index: pkgsrc/databases/unixodbc/patches/patch-odbcinst_SQLSetConfigMode.c
diff -u /dev/null pkgsrc/databases/unixodbc/patches/patch-odbcinst_SQLSetConfigMode.c:1.1
--- /dev/null   Fri Oct 17 13:15:29 2025
+++ pkgsrc/databases/unixodbc/patches/patch-odbcinst_SQLSetConfigMode.c Fri Oct 17 13:15:29 2025
@@ -0,0 +1,77 @@
+$NetBSD: patch-odbcinst_SQLSetConfigMode.c,v 1.1 2025/10/17 13:15:29 jperkin Exp $
+
+Avoid conflict with system mutex_entry() / mutex_exit().
+
+--- odbcinst/SQLSetConfigMode.c.orig   2025-10-17 13:11:08.381130630 +0000
++++ odbcinst/SQLSetConfigMode.c
+@@ -30,7 +30,7 @@ static int __config_mode = ODBC_BOTH_DSN
+ static pth_mutex_t mutex_config = PTH_MUTEX_INIT;
+ static int pth_init_called = 0;
+ 
+-static int mutex_entry( pth_mutex_t *mutex )
++static int sql_mutex_entry( pth_mutex_t *mutex )
+ {
+     if ( !pth_init_called )
+     {
+@@ -40,7 +40,7 @@ static int mutex_entry( pth_mutex_t *mut
+     return pth_mutex_acquire( mutex, 0, NULL );
+ }
+ 
+-static int mutex_exit( pth_mutex_t *mutex )
++static int sql_mutex_exit( pth_mutex_t *mutex )
+ {
+     return pth_mutex_release( mutex );
+ }
+@@ -51,12 +51,12 @@ static int mutex_exit( pth_mutex_t *mute
+                 
+ static pthread_mutex_t mutex_config = PTHREAD_MUTEX_INITIALIZER;
+ 
+-static int mutex_entry( pthread_mutex_t *mutex )
++static int sql_mutex_entry( pthread_mutex_t *mutex )
+ {
+     return pthread_mutex_lock( mutex );
+ }
+ 
+-static int mutex_exit( pthread_mutex_t *mutex )
++static int sql_mutex_exit( pthread_mutex_t *mutex )
+ {
+     return pthread_mutex_unlock( mutex );
+ }
+@@ -67,31 +67,31 @@ static int mutex_exit( pthread_mutex_t *
+ 
+ static mutex_t mutex_config;
+ 
+-static int mutex_entry( mutex_t *mutex )
++static int sql_mutex_entry( mutex_t *mutex )
+ {
+     return mutex_lock( mutex );
+ }
+ 
+-static int mutex_exit( mutex_t *mutex )
++static int sql_mutex_exit( mutex_t *mutex )
+ {
+     return mutex_unlock( mutex );
+ }
+ 
+ #else
+ 
+-#define mutex_entry(x)
+-#define mutex_exit(x)
++#define sql_mutex_entry(x)
++#define sql_mutex_exit(x)
+ 
+ #endif
+ 
+ void __lock_config_mode( void )
+ {
+-    mutex_entry( &mutex_config );
++    sql_mutex_entry( &mutex_config );
+ }
+ 
+ void __unlock_config_mode( void )
+ {
+-    mutex_exit( &mutex_config );
++    sql_mutex_exit( &mutex_config );
+ }
+ 
+ void __set_config_mode( int mode )