CVS commit: pkgsrc/databases/freetds

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Feb  7 18:22:48 UTC 2026

Modified Files:
        pkgsrc/databases/freetds: Makefile PLIST distinfo
        pkgsrc/databases/freetds/patches: patch-include_freetds_thread.h
            patch-src_apps_Makefile.in
Added Files:
        pkgsrc/databases/freetds/patches: patch-src_tds_gssapi.c
Removed Files:
        pkgsrc/databases/freetds/patches: patch-Makefile.in patch-ac
            patch-configure patch-src_pool_Makefile.in

Log Message:
freetds: updated to 1.5.10

1.5

Fix some compatibility with OpenVMS
Fix dbreadtext crash on NULL values
Allows to pass NULL to dbsetifile


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/databases/freetds/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/freetds/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/freetds/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/freetds/patches/patch-Makefile.in \
    pkgsrc/databases/freetds/patches/patch-configure \
    pkgsrc/databases/freetds/patches/patch-src_pool_Makefile.in
cvs rdiff -u -r1.8 -r0 pkgsrc/databases/freetds/patches/patch-ac
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/freetds/patches/patch-include_freetds_thread.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/freetds/patches/patch-src_apps_Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/freetds/patches/patch-src_tds_gssapi.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/freetds/Makefile
diff -u pkgsrc/databases/freetds/Makefile:1.87 pkgsrc/databases/freetds/Makefile:1.88
--- pkgsrc/databases/freetds/Makefile:1.87      Fri Feb  6 10:04:22 2026
+++ pkgsrc/databases/freetds/Makefile   Sat Feb  7 18:22:48 2026
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2026/02/06 10:04:22 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2026/02/07 18:22:48 adam Exp $
 
-DISTNAME=      freetds-1.00.112
-PKGREVISION=   21
+DISTNAME=      freetds-1.5.10
 CATEGORIES=    databases
-MASTER_SITES=  ftp://ftp.freetds.org/pub/freetds/stable/
+MASTER_SITES=  https://www.freetds.org/files/stable/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,14 +10,17 @@ HOMEPAGE=   https://www.freetds.org/
 COMMENT=       Implementation of TDS protocol used by Sybase and MS-SQL servers
 LICENSE=       gnu-lgpl-v2
 
+TOOL_DEPENDS+= doxygen>=1.8.15:../../devel/doxygen
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=       --with-tdsver=7.0
+#CONFIGURE_ARGS+=      --with-tdsver=7.4
 # no thread-safe resolver functions on NetBSD
-CONFIGURE_ARGS+=       --disable-threadsafe
+#CONFIGURE_ARGS+=      --disable-threadsafe
 TEST_TARGET=           check
 
 # Fails to build the shared lib on SunOS with -O2 or greater
@@ -47,6 +49,6 @@ SUBST_SED.visibility+=                -e 's,!defined(_
 
 .include "../../converters/libiconv/buildlink3.mk"
 # rl_on_new_line, rl_reset_line_state
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/freetds/PLIST
diff -u pkgsrc/databases/freetds/PLIST:1.20 pkgsrc/databases/freetds/PLIST:1.21
--- pkgsrc/databases/freetds/PLIST:1.20 Sun Sep 17 14:57:59 2017
+++ pkgsrc/databases/freetds/PLIST      Sat Feb  7 18:22:48 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2017/09/17 14:57:59 taca Exp $
+@comment $NetBSD: PLIST,v 1.21 2026/02/07 18:22:48 adam Exp $
 bin/bsqldb
 ${PLIST.odbc}bin/bsqlodbc
 bin/datacopy
@@ -47,8 +47,8 @@ share/doc/freetds/images/note.gif
 share/doc/freetds/images/tip.gif
 share/doc/freetds/images/warning.gif
 share/doc/freetds/reference/index.html
-share/doc/freetds/userguide/index.htm
 share/doc/freetds/userguide/index.html
+share/doc/freetds/userguide/userguide.css
 share/examples/freetds/freetds.conf
 share/examples/freetds/locales.conf
 share/examples/freetds/pool.conf

Index: pkgsrc/databases/freetds/distinfo
diff -u pkgsrc/databases/freetds/distinfo:1.30 pkgsrc/databases/freetds/distinfo:1.31
--- pkgsrc/databases/freetds/distinfo:1.30      Tue Apr 25 13:41:16 2023
+++ pkgsrc/databases/freetds/distinfo   Sat Feb  7 18:22:48 2026
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.30 2023/04/25 13:41:16 wiz Exp $
+$NetBSD: distinfo,v 1.31 2026/02/07 18:22:48 adam Exp $
 
-BLAKE2s (freetds-1.00.112.tar.bz2) = 8d50f6354a5ee4dec34878b77b60263af30dc43624271844997f8409d1ba7c4a
-SHA512 (freetds-1.00.112.tar.bz2) = 162fd65552260a25af7399e8f69ec6b7f609d72b1822c6cec00a33b055958a267f0bb580f074a59d325a4e93d57244a9b515f7581b0186d35f402ab6b3b86f83
-Size (freetds-1.00.112.tar.bz2) = 2225521 bytes
-SHA1 (patch-Makefile.in) = 46a2663d03502cb913cff5b55bd4c95a4ff670bc
-SHA1 (patch-ac) = 7533cc71d37949038e2cad093fad0f371b49d729
-SHA1 (patch-configure) = 6857ee5efe4635abf5ec20b6ddbd883b50d8403f
-SHA1 (patch-include_freetds_thread.h) = 28c4cf6ad79f8662b5b3b51171791b9e4fd3ede5
-SHA1 (patch-src_apps_Makefile.in) = 27efd0c34be6c166e805b502bae12cf444227dbb
-SHA1 (patch-src_pool_Makefile.in) = 5a715b0321af739be1f5a8cb6a91743a80b9074b
+BLAKE2s (freetds-1.5.10.tar.bz2) = 37657453a3b39d70ef9302cad6f64ab6e1807ecec0e00f61266f913bc474c948
+SHA512 (freetds-1.5.10.tar.bz2) = 4004e13ddaaf9a5a26671f17b4acbca4455af7aa1553a63ae284f17f8f044d5738f5330ec741c7a0c71231b95d9827574f2c07fd2f1ae887cad4248e74b79791
+Size (freetds-1.5.10.tar.bz2) = 2443568 bytes
+SHA1 (patch-include_freetds_thread.h) = d6a418cf29feebc4655c228e7c653572d17143cd
+SHA1 (patch-src_apps_Makefile.in) = 7b7bc15949965256663d1e16028f526b4158258f
+SHA1 (patch-src_tds_gssapi.c) = 9adc4084c2e6e47a2dccb4bf2c0d4eae84b5f500
 SHA1 (patch-src_tds_tls.c) = 015c2637a84a44b11cc11ba5685d90f1c5a4739f

Index: pkgsrc/databases/freetds/patches/patch-include_freetds_thread.h
diff -u pkgsrc/databases/freetds/patches/patch-include_freetds_thread.h:1.1 pkgsrc/databases/freetds/patches/patch-include_freetds_thread.h:1.2
--- pkgsrc/databases/freetds/patches/patch-include_freetds_thread.h:1.1 Sun Sep 17 14:57:59 2017
+++ pkgsrc/databases/freetds/patches/patch-include_freetds_thread.h     Sat Feb  7 18:22:48 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-include_freetds_thread.h,v 1.1 2017/09/17 14:57:59 taca Exp $
+$NetBSD: patch-include_freetds_thread.h,v 1.2 2026/02/07 18:22:48 adam Exp $
 
-* Check _REENTRANT, too.
+Check _REENTRANT, too.
 
---- include/freetds/thread.h.orig      2016-05-18 20:02:15.000000000 +0000
+--- include/freetds/thread.h.orig      2025-03-06 20:38:39.000000000 +0000
 +++ include/freetds/thread.h
 @@ -24,7 +24,7 @@
  
@@ -11,5 +11,5 @@ $NetBSD: patch-include_freetds_thread.h,
 -#if defined(_THREAD_SAFE) && defined(TDS_HAVE_PTHREAD_MUTEX)
 +#if (defined(_REENTRANT) || defined(_THREAD_SAFE)) && defined(TDS_HAVE_PTHREAD_MUTEX)
  
- #include <pthread.h>
- 
+ #include <tds_sysdep_public.h>
+ #include <freetds/sysdep_private.h>

Index: pkgsrc/databases/freetds/patches/patch-src_apps_Makefile.in
diff -u pkgsrc/databases/freetds/patches/patch-src_apps_Makefile.in:1.2 pkgsrc/databases/freetds/patches/patch-src_apps_Makefile.in:1.3
--- pkgsrc/databases/freetds/patches/patch-src_apps_Makefile.in:1.2     Sun Sep 17 14:58:00 2017
+++ pkgsrc/databases/freetds/patches/patch-src_apps_Makefile.in Sat Feb  7 18:22:48 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_apps_Makefile.in,v 1.2 2017/09/17 14:58:00 taca Exp $
+$NetBSD: patch-src_apps_Makefile.in,v 1.3 2026/02/07 18:22:48 adam Exp $
 
 Also link libtds.
 
---- src/apps/Makefile.in.orig  2017-09-02 09:00:55.000000000 +0000
+--- src/apps/Makefile.in.orig  2025-12-02 09:01:20.000000000 +0000
 +++ src/apps/Makefile.in
-@@ -143,7 +143,7 @@ bsqlodbc_OBJECTS = bsqlodbc-bsqlodbc.$(O
- @ODBC_TRUE@   $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -144,7 +144,7 @@ bsqlodbc_LINK = $(LIBTOOL) $(AM_V_lt) --
+       $(bsqlodbc_LDFLAGS) $(LDFLAGS) -o $@
  am_datacopy_OBJECTS = datacopy.$(OBJEXT)
  datacopy_OBJECTS = $(am_datacopy_OBJECTS)
 -datacopy_DEPENDENCIES = ../dblib/libsybdb.la \
@@ -13,7 +13,7 @@ Also link libtds.
        ../replacements/libreplacements.la $(am__DEPENDENCIES_1)
  defncopy_SOURCES = defncopy.c
  defncopy_OBJECTS = defncopy.$(OBJEXT)
-@@ -151,7 +151,7 @@ defncopy_DEPENDENCIES = ../dblib/libsybd
+@@ -152,7 +152,7 @@ defncopy_DEPENDENCIES = ../dblib/libsybd
        ../replacements/libreplacements.la $(am__DEPENDENCIES_1)
  am_freebcp_OBJECTS = freebcp.$(OBJEXT)
  freebcp_OBJECTS = $(am_freebcp_OBJECTS)
@@ -22,8 +22,8 @@ Also link libtds.
        ../replacements/libreplacements.la $(am__DEPENDENCIES_1)
  tsql_SOURCES = tsql.c
  tsql_OBJECTS = tsql.$(OBJEXT)
-@@ -465,7 +465,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include 
- SUBDIRS = fisql
+@@ -474,7 +474,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
+ SUBDIRS = fisql . unittests
  DIST_SUBDIRS = $(SUBDIRS)
  dist_bin_SCRIPTS = osql
 -freebcp_LDADD = ../dblib/libsybdb.la ../replacements/libreplacements.la $(LTLIBICONV)

Added files:

Index: pkgsrc/databases/freetds/patches/patch-src_tds_gssapi.c
diff -u /dev/null pkgsrc/databases/freetds/patches/patch-src_tds_gssapi.c:1.1
--- /dev/null   Sat Feb  7 18:22:49 2026
+++ pkgsrc/databases/freetds/patches/patch-src_tds_gssapi.c     Sat Feb  7 18:22:48 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_tds_gssapi.c,v 1.1 2026/02/07 18:22:48 adam Exp $
+
+Allow build when AI_V4MAPPED is not defined (e.g. NetBSD).
+
+--- src/tds/gssapi.c.orig      2026-02-07 18:08:56.363628916 +0000
++++ src/tds/gssapi.c
+@@ -267,7 +267,11 @@ tds_gss_get_auth(TDSSOCKET * tds)
+               memset(&hints, 0, sizeof(hints));
+               hints.ai_family = AF_UNSPEC;
+               hints.ai_socktype = SOCK_STREAM;
++#ifdef AI_V4MAPPED
+               hints.ai_flags = AI_V4MAPPED|AI_ADDRCONFIG|AI_CANONNAME|AI_FQDN;
++#else
++              hints.ai_flags = AI_ADDRCONFIG|AI_CANONNAME|AI_FQDN;
++#endif
+               if (!getaddrinfo(server_name, NULL, &hints, &addrs) && addrs->ai_canonname
+                   && strchr(addrs->ai_canonname, '.') != NULL)
+                       server_name = addrs->ai_canonname;