Tue Apr 25 13:41:16 2023 UTC ()
freetds: remove broken libressl workaround that broke openssl build


(wiz)
diff -r1.29 -r1.30 pkgsrc/databases/freetds/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/freetds/patches/patch-src_tds_tls.c
cvs diff -r1.29 -r1.30 pkgsrc/databases/freetds/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/freetds/distinfo 2023/03/29 21:01:37 1.29
+++ pkgsrc/databases/freetds/distinfo 2023/04/25 13:41:16 1.30
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.29 2023/03/29 21:01:37 joerg Exp $ 1$NetBSD: distinfo,v 1.30 2023/04/25 13:41:16 wiz Exp $
2 2
3BLAKE2s (freetds-1.00.112.tar.bz2) = 8d50f6354a5ee4dec34878b77b60263af30dc43624271844997f8409d1ba7c4a 3BLAKE2s (freetds-1.00.112.tar.bz2) = 8d50f6354a5ee4dec34878b77b60263af30dc43624271844997f8409d1ba7c4a
4SHA512 (freetds-1.00.112.tar.bz2) = 162fd65552260a25af7399e8f69ec6b7f609d72b1822c6cec00a33b055958a267f0bb580f074a59d325a4e93d57244a9b515f7581b0186d35f402ab6b3b86f83 4SHA512 (freetds-1.00.112.tar.bz2) = 162fd65552260a25af7399e8f69ec6b7f609d72b1822c6cec00a33b055958a267f0bb580f074a59d325a4e93d57244a9b515f7581b0186d35f402ab6b3b86f83
5Size (freetds-1.00.112.tar.bz2) = 2225521 bytes 5Size (freetds-1.00.112.tar.bz2) = 2225521 bytes
6SHA1 (patch-Makefile.in) = 46a2663d03502cb913cff5b55bd4c95a4ff670bc 6SHA1 (patch-Makefile.in) = 46a2663d03502cb913cff5b55bd4c95a4ff670bc
7SHA1 (patch-ac) = 7533cc71d37949038e2cad093fad0f371b49d729 7SHA1 (patch-ac) = 7533cc71d37949038e2cad093fad0f371b49d729
8SHA1 (patch-configure) = 6857ee5efe4635abf5ec20b6ddbd883b50d8403f 8SHA1 (patch-configure) = 6857ee5efe4635abf5ec20b6ddbd883b50d8403f
9SHA1 (patch-include_freetds_thread.h) = 28c4cf6ad79f8662b5b3b51171791b9e4fd3ede5 9SHA1 (patch-include_freetds_thread.h) = 28c4cf6ad79f8662b5b3b51171791b9e4fd3ede5
10SHA1 (patch-src_apps_Makefile.in) = 27efd0c34be6c166e805b502bae12cf444227dbb 10SHA1 (patch-src_apps_Makefile.in) = 27efd0c34be6c166e805b502bae12cf444227dbb
11SHA1 (patch-src_pool_Makefile.in) = 5a715b0321af739be1f5a8cb6a91743a80b9074b 11SHA1 (patch-src_pool_Makefile.in) = 5a715b0321af739be1f5a8cb6a91743a80b9074b
12SHA1 (patch-src_tds_tls.c) = 6ec72f6d5a8ac9d914ff029d87dfc2ebba9d7abe 12SHA1 (patch-src_tds_tls.c) = 015c2637a84a44b11cc11ba5685d90f1c5a4739f
cvs diff -r1.1 -r1.2 pkgsrc/databases/freetds/patches/patch-src_tds_tls.c (expand / switch to unified diff)

--- pkgsrc/databases/freetds/patches/patch-src_tds_tls.c 2023/03/29 21:01:38 1.1
+++ pkgsrc/databases/freetds/patches/patch-src_tds_tls.c 2023/04/25 13:41:16 1.2
@@ -1,25 +1,15 @@ @@ -1,25 +1,15 @@
1$NetBSD: patch-src_tds_tls.c,v 1.1 2023/03/29 21:01:38 joerg Exp $ 1$NetBSD: patch-src_tds_tls.c,v 1.2 2023/04/25 13:41:16 wiz Exp $
2 2
3Allow building with LibreSSL 3.7.0 3Allow building with LibreSSL 3.7.0
4 4
5--- src/tds/tls.c.orig 2018-04-03 09:00:03.000000000 +0000 5--- src/tds/tls.c.orig 2018-04-03 09:00:03.000000000 +0000
6+++ src/tds/tls.c 6+++ src/tds/tls.c
7@@ -594,7 +594,7 @@ tds_ssl_free(BIO *a) 7@@ -594,7 +594,7 @@ tds_ssl_free(BIO *a)
8 return 1; 8 return 1;
9 } 9 }
10  10
11-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) 11-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
12+#if OPENSSL_VERSION_NUMBER < 0x1010000FL || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER - 0 < 0x3070000fL)) 12+#if OPENSSL_VERSION_NUMBER < 0x1010000FL || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER - 0 < 0x3070000fL))
13 static BIO_METHOD tds_method_login[1] = { 13 static BIO_METHOD tds_method_login[1] = {
14 { 14 {
15 BIO_TYPE_MEM, 15 BIO_TYPE_MEM,
16@@ -949,6 +949,9 @@ tds_ssl_init(TDSSOCKET *tds) 
17 /* Perform the TLS handshake */ 
18 tls_msg = "handshake"; 
19 SSL_set_connect_state(con); 
20+#ifndef TLS_STOK 
21+#define TLS_ST_OK SSL_ST_OK 
22+#endif 
23 ret = SSL_connect(con) != 1 || SSL_get_state(con) != TLS_ST_OK; 
24 if (ret != 0) 
25 goto cleanup;