CVS commit: pkgsrc/databases/freetds

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Mar 29 21:01:38 UTC 2023

Modified Files:
        pkgsrc/databases/freetds: distinfo
Added Files:
        pkgsrc/databases/freetds/patches: patch-configure patch-src_tds_tls.c

Log Message:
Fix build on Linux and with LibreSSL 3.7.0


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/freetds/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/freetds/patches/patch-configure \
    pkgsrc/databases/freetds/patches/patch-src_tds_tls.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/distinfo
diff -u pkgsrc/databases/freetds/distinfo:1.28 pkgsrc/databases/freetds/distinfo:1.29
--- pkgsrc/databases/freetds/distinfo:1.28      Tue Oct 26 10:09:17 2021
+++ pkgsrc/databases/freetds/distinfo   Wed Mar 29 21:01:37 2023
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.28 2021/10/26 10:09:17 nia Exp $
+$NetBSD: distinfo,v 1.29 2023/03/29 21:01:37 joerg 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
+SHA1 (patch-src_tds_tls.c) = 6ec72f6d5a8ac9d914ff029d87dfc2ebba9d7abe

Added files:

Index: pkgsrc/databases/freetds/patches/patch-configure
diff -u /dev/null pkgsrc/databases/freetds/patches/patch-configure:1.1
--- /dev/null   Wed Mar 29 21:01:38 2023
+++ pkgsrc/databases/freetds/patches/patch-configure    Wed Mar 29 21:01:38 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2023/03/29 21:01:38 joerg Exp $
+
+_THREAD_SAFE is necessary for internal headers on Linux.
+
+--- configure.orig     2022-06-14 01:04:46.688096332 +0000
++++ configure
+@@ -16664,7 +16664,7 @@ _ACEOF
+ $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
+         flag=no
+         case "${host_cpu}-${host_os}" in
+-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
++            *-aix* | *-freebsd* | *-darwin*|*-linux*) flag="-D_THREAD_SAFE";;
+             *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+         esac
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
Index: pkgsrc/databases/freetds/patches/patch-src_tds_tls.c
diff -u /dev/null pkgsrc/databases/freetds/patches/patch-src_tds_tls.c:1.1
--- /dev/null   Wed Mar 29 21:01:38 2023
+++ pkgsrc/databases/freetds/patches/patch-src_tds_tls.c        Wed Mar 29 21:01:38 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_tds_tls.c,v 1.1 2023/03/29 21:01:38 joerg Exp $
+
+Allow building with LibreSSL 3.7.0
+
+--- src/tds/tls.c.orig 2018-04-03 09:00:03.000000000 +0000
++++ src/tds/tls.c
+@@ -594,7 +594,7 @@ tds_ssl_free(BIO *a)
+       return 1;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010000FL || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER - 0 < 0x3070000fL))
+ static BIO_METHOD tds_method_login[1] = {
+ {
+       BIO_TYPE_MEM,
+@@ -949,6 +949,9 @@ tds_ssl_init(TDSSOCKET *tds)
+       /* Perform the TLS handshake */
+       tls_msg = "handshake";
+       SSL_set_connect_state(con);
++#ifndef TLS_STOK
++#define TLS_ST_OK SSL_ST_OK
++#endif
+       ret = SSL_connect(con) != 1 || SSL_get_state(con) != TLS_ST_OK;
+       if (ret != 0)
+               goto cleanup;