CVS commit: pkgsrc/databases/freetds

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 25 13:41:16 UTC 2023

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

Log Message:
freetds: remove broken libressl workaround that broke openssl build


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/freetds/distinfo
cvs rdiff -u -r1.1 -r1.2 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.29 pkgsrc/databases/freetds/distinfo:1.30
--- pkgsrc/databases/freetds/distinfo:1.29      Wed Mar 29 21:01:37 2023
+++ pkgsrc/databases/freetds/distinfo   Tue Apr 25 13:41:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2023/03/29 21:01:37 joerg Exp $
+$NetBSD: distinfo,v 1.30 2023/04/25 13:41:16 wiz Exp $
 
 BLAKE2s (freetds-1.00.112.tar.bz2) = 8d50f6354a5ee4dec34878b77b60263af30dc43624271844997f8409d1ba7c4a
 SHA512 (freetds-1.00.112.tar.bz2) = 162fd65552260a25af7399e8f69ec6b7f609d72b1822c6cec00a33b055958a267f0bb580f074a59d325a4e93d57244a9b515f7581b0186d35f402ab6b3b86f83
@@ -9,4 +9,4 @@ SHA1 (patch-configure) = 6857ee5efe4635a
 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
+SHA1 (patch-src_tds_tls.c) = 015c2637a84a44b11cc11ba5685d90f1c5a4739f

Index: pkgsrc/databases/freetds/patches/patch-src_tds_tls.c
diff -u pkgsrc/databases/freetds/patches/patch-src_tds_tls.c:1.1 pkgsrc/databases/freetds/patches/patch-src_tds_tls.c:1.2
--- pkgsrc/databases/freetds/patches/patch-src_tds_tls.c:1.1    Wed Mar 29 21:01:38 2023
+++ pkgsrc/databases/freetds/patches/patch-src_tds_tls.c        Tue Apr 25 13:41:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tds_tls.c,v 1.1 2023/03/29 21:01:38 joerg Exp $
+$NetBSD: patch-src_tds_tls.c,v 1.2 2023/04/25 13:41:16 wiz Exp $
 
 Allow building with LibreSSL 3.7.0
 
@@ -13,13 +13,3 @@ Allow building with LibreSSL 3.7.0
  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;