Skip to content

Commit 61cd1f0

Browse files
author
adam
committed
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
1 parent 878bf87 commit 61cd1f0

10 files changed

Lines changed: 48 additions & 104 deletions

databases/freetds/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
# $NetBSD: Makefile,v 1.87 2026/02/06 10:04:22 wiz Exp $
1+
# $NetBSD: Makefile,v 1.88 2026/02/07 18:22:48 adam Exp $
22

3-
DISTNAME= freetds-1.00.112
4-
PKGREVISION= 21
3+
DISTNAME= freetds-1.5.10
54
CATEGORIES= databases
6-
MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/
5+
MASTER_SITES= https://www.freetds.org/files/stable/
76
EXTRACT_SUFX= .tar.bz2
87

98
MAINTAINER= pkgsrc-users@NetBSD.org
109
HOMEPAGE= https://www.freetds.org/
1110
COMMENT= Implementation of TDS protocol used by Sybase and MS-SQL servers
1211
LICENSE= gnu-lgpl-v2
1312

13+
TOOL_DEPENDS+= doxygen>=1.8.15:../../devel/doxygen
14+
TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
15+
1416
USE_LIBTOOL= yes
1517
GNU_CONFIGURE= yes
1618
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
1719
CONFIGURE_ARGS+= --datadir=${PREFIX}/share
1820
CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
19-
CONFIGURE_ARGS+= --with-tdsver=7.0
21+
#CONFIGURE_ARGS+= --with-tdsver=7.4
2022
# no thread-safe resolver functions on NetBSD
21-
CONFIGURE_ARGS+= --disable-threadsafe
23+
#CONFIGURE_ARGS+= --disable-threadsafe
2224
TEST_TARGET= check
2325

2426
# Fails to build the shared lib on SunOS with -O2 or greater
@@ -47,6 +49,6 @@ SUBST_SED.visibility+= -e 's,!defined(__MINGW32__),!defined(__MINGW32__) \&\& !
4749

4850
.include "../../converters/libiconv/buildlink3.mk"
4951
# rl_on_new_line, rl_reset_line_state
50-
.include "../../devel/readline/buildlink3.mk"
5152
.include "../../devel/libltdl/buildlink3.mk"
53+
.include "../../devel/readline/buildlink3.mk"
5254
.include "../../mk/bsd.pkg.mk"

databases/freetds/PLIST

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.20 2017/09/17 14:57:59 taca Exp $
1+
@comment $NetBSD: PLIST,v 1.21 2026/02/07 18:22:48 adam Exp $
22
bin/bsqldb
33
${PLIST.odbc}bin/bsqlodbc
44
bin/datacopy
@@ -47,8 +47,8 @@ share/doc/freetds/images/note.gif
4747
share/doc/freetds/images/tip.gif
4848
share/doc/freetds/images/warning.gif
4949
share/doc/freetds/reference/index.html
50-
share/doc/freetds/userguide/index.htm
5150
share/doc/freetds/userguide/index.html
51+
share/doc/freetds/userguide/userguide.css
5252
share/examples/freetds/freetds.conf
5353
share/examples/freetds/locales.conf
5454
share/examples/freetds/pool.conf

databases/freetds/distinfo

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
$NetBSD: distinfo,v 1.30 2023/04/25 13:41:16 wiz Exp $
1+
$NetBSD: distinfo,v 1.31 2026/02/07 18:22:48 adam Exp $
22

3-
BLAKE2s (freetds-1.00.112.tar.bz2) = 8d50f6354a5ee4dec34878b77b60263af30dc43624271844997f8409d1ba7c4a
4-
SHA512 (freetds-1.00.112.tar.bz2) = 162fd65552260a25af7399e8f69ec6b7f609d72b1822c6cec00a33b055958a267f0bb580f074a59d325a4e93d57244a9b515f7581b0186d35f402ab6b3b86f83
5-
Size (freetds-1.00.112.tar.bz2) = 2225521 bytes
6-
SHA1 (patch-Makefile.in) = 46a2663d03502cb913cff5b55bd4c95a4ff670bc
7-
SHA1 (patch-ac) = 7533cc71d37949038e2cad093fad0f371b49d729
8-
SHA1 (patch-configure) = 6857ee5efe4635abf5ec20b6ddbd883b50d8403f
9-
SHA1 (patch-include_freetds_thread.h) = 28c4cf6ad79f8662b5b3b51171791b9e4fd3ede5
10-
SHA1 (patch-src_apps_Makefile.in) = 27efd0c34be6c166e805b502bae12cf444227dbb
11-
SHA1 (patch-src_pool_Makefile.in) = 5a715b0321af739be1f5a8cb6a91743a80b9074b
3+
BLAKE2s (freetds-1.5.10.tar.bz2) = 37657453a3b39d70ef9302cad6f64ab6e1807ecec0e00f61266f913bc474c948
4+
SHA512 (freetds-1.5.10.tar.bz2) = 4004e13ddaaf9a5a26671f17b4acbca4455af7aa1553a63ae284f17f8f044d5738f5330ec741c7a0c71231b95d9827574f2c07fd2f1ae887cad4248e74b79791
5+
Size (freetds-1.5.10.tar.bz2) = 2443568 bytes
6+
SHA1 (patch-include_freetds_thread.h) = d6a418cf29feebc4655c228e7c653572d17143cd
7+
SHA1 (patch-src_apps_Makefile.in) = 7b7bc15949965256663d1e16028f526b4158258f
8+
SHA1 (patch-src_tds_gssapi.c) = 9adc4084c2e6e47a2dccb4bf2c0d4eae84b5f500
129
SHA1 (patch-src_tds_tls.c) = 015c2637a84a44b11cc11ba5685d90f1c5a4739f

databases/freetds/patches/patch-Makefile.in

Lines changed: 0 additions & 19 deletions
This file was deleted.

databases/freetds/patches/patch-ac

Lines changed: 0 additions & 24 deletions
This file was deleted.

databases/freetds/patches/patch-configure

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$NetBSD: patch-include_freetds_thread.h,v 1.1 2017/09/17 14:57:59 taca Exp $
1+
$NetBSD: patch-include_freetds_thread.h,v 1.2 2026/02/07 18:22:48 adam Exp $
22

3-
* Check _REENTRANT, too.
3+
Check _REENTRANT, too.
44

5-
--- include/freetds/thread.h.orig 2016-05-18 20:02:15.000000000 +0000
5+
--- include/freetds/thread.h.orig 2025-03-06 20:38:39.000000000 +0000
66
+++ include/freetds/thread.h
77
@@ -24,7 +24,7 @@
88

@@ -11,5 +11,5 @@
1111
-#if defined(_THREAD_SAFE) && defined(TDS_HAVE_PTHREAD_MUTEX)
1212
+#if (defined(_REENTRANT) || defined(_THREAD_SAFE)) && defined(TDS_HAVE_PTHREAD_MUTEX)
1313

14-
#include <pthread.h>
15-
14+
#include <tds_sysdep_public.h>
15+
#include <freetds/sysdep_private.h>

databases/freetds/patches/patch-src_apps_Makefile.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
$NetBSD: patch-src_apps_Makefile.in,v 1.2 2017/09/17 14:58:00 taca Exp $
1+
$NetBSD: patch-src_apps_Makefile.in,v 1.3 2026/02/07 18:22:48 adam Exp $
22

33
Also link libtds.
44

5-
--- src/apps/Makefile.in.orig 2017-09-02 09:00:55.000000000 +0000
5+
--- src/apps/Makefile.in.orig 2025-12-02 09:01:20.000000000 +0000
66
+++ src/apps/Makefile.in
7-
@@ -143,7 +143,7 @@ bsqlodbc_OBJECTS = bsqlodbc-bsqlodbc.$(O
8-
@ODBC_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
7+
@@ -144,7 +144,7 @@ bsqlodbc_LINK = $(LIBTOOL) $(AM_V_lt) --
8+
$(bsqlodbc_LDFLAGS) $(LDFLAGS) -o $@
99
am_datacopy_OBJECTS = datacopy.$(OBJEXT)
1010
datacopy_OBJECTS = $(am_datacopy_OBJECTS)
1111
-datacopy_DEPENDENCIES = ../dblib/libsybdb.la \
1212
+datacopy_DEPENDENCIES = ../dblib/libsybdb.la ../tds/libtds.la \
1313
../replacements/libreplacements.la $(am__DEPENDENCIES_1)
1414
defncopy_SOURCES = defncopy.c
1515
defncopy_OBJECTS = defncopy.$(OBJEXT)
16-
@@ -151,7 +151,7 @@ defncopy_DEPENDENCIES = ../dblib/libsybd
16+
@@ -152,7 +152,7 @@ defncopy_DEPENDENCIES = ../dblib/libsybd
1717
../replacements/libreplacements.la $(am__DEPENDENCIES_1)
1818
am_freebcp_OBJECTS = freebcp.$(OBJEXT)
1919
freebcp_OBJECTS = $(am_freebcp_OBJECTS)
@@ -22,8 +22,8 @@ Also link libtds.
2222
../replacements/libreplacements.la $(am__DEPENDENCIES_1)
2323
tsql_SOURCES = tsql.c
2424
tsql_OBJECTS = tsql.$(OBJEXT)
25-
@@ -465,7 +465,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
26-
SUBDIRS = fisql
25+
@@ -474,7 +474,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
26+
SUBDIRS = fisql . unittests
2727
DIST_SUBDIRS = $(SUBDIRS)
2828
dist_bin_SCRIPTS = osql
2929
-freebcp_LDADD = ../dblib/libsybdb.la ../replacements/libreplacements.la $(LTLIBICONV)

databases/freetds/patches/patch-src_pool_Makefile.in

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
$NetBSD: patch-src_tds_gssapi.c,v 1.1 2026/02/07 18:22:48 adam Exp $
2+
3+
Allow build when AI_V4MAPPED is not defined (e.g. NetBSD).
4+
5+
--- src/tds/gssapi.c.orig 2026-02-07 18:08:56.363628916 +0000
6+
+++ src/tds/gssapi.c
7+
@@ -267,7 +267,11 @@ tds_gss_get_auth(TDSSOCKET * tds)
8+
memset(&hints, 0, sizeof(hints));
9+
hints.ai_family = AF_UNSPEC;
10+
hints.ai_socktype = SOCK_STREAM;
11+
+#ifdef AI_V4MAPPED
12+
hints.ai_flags = AI_V4MAPPED|AI_ADDRCONFIG|AI_CANONNAME|AI_FQDN;
13+
+#else
14+
+ hints.ai_flags = AI_ADDRCONFIG|AI_CANONNAME|AI_FQDN;
15+
+#endif
16+
if (!getaddrinfo(server_name, NULL, &hints, &addrs) && addrs->ai_canonname
17+
&& strchr(addrs->ai_canonname, '.') != NULL)
18+
server_name = addrs->ai_canonname;

0 commit comments

Comments
 (0)