From 09a443ab7e7c5833b48b262e1293a985ba35cb4c Mon Sep 17 00:00:00 2001 From: Andy Pfister Date: Sat, 24 May 2025 16:32:43 +0200 Subject: [PATCH 1/3] Update OpenSSL to v3.5.0 --- CHANGELOG.md | 4 ++++ ext/tiny_tds/extconsts.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00c57352..1f13171e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## (unreleased) + +* Use OpenSSL v3.5.0 for Windows and Linux builds. + ## 3.2.1 * Ensure the native Gem loads on Windows. Fixes #581. diff --git a/ext/tiny_tds/extconsts.rb b/ext/tiny_tds/extconsts.rb index d0db448a..ae0be4d2 100644 --- a/ext/tiny_tds/extconsts.rb +++ b/ext/tiny_tds/extconsts.rb @@ -1,7 +1,7 @@ ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18" ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz" -OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.4.1" +OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.5.0" OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.4.26" From c733747228519ba2415af22a6de5c7bd074609bf Mon Sep 17 00:00:00 2001 From: Andy Pfister Date: Sat, 24 May 2025 16:34:38 +0200 Subject: [PATCH 2/3] Update freetds to v1.5.1 --- CHANGELOG.md | 2 +- ext/tiny_tds/extconsts.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f13171e..b51a1658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## (unreleased) -* Use OpenSSL v3.5.0 for Windows and Linux builds. +* Use freetds v1.5.1 and OpenSSL v3.5.0 for Windows and Linux builds. ## 3.2.1 diff --git a/ext/tiny_tds/extconsts.rb b/ext/tiny_tds/extconsts.rb index ae0be4d2..cb874285 100644 --- a/ext/tiny_tds/extconsts.rb +++ b/ext/tiny_tds/extconsts.rb @@ -4,5 +4,5 @@ OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.5.0" OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" -FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.4.26" +FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.1" FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2" From 9d2fa9cf01acbf54e92c13abdfa5dbeb74a029a0 Mon Sep 17 00:00:00 2001 From: Andy Pfister Date: Sun, 25 May 2025 11:16:42 +0200 Subject: [PATCH 3/3] Adjust expected error message --- test/thread_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/thread_test.rb b/test/thread_test.rb index 4fe1bad6..c66ced94 100644 --- a/test/thread_test.rb +++ b/test/thread_test.rb @@ -65,7 +65,7 @@ class ThreadTest < TinyTds::TestCase result = client.execute "waitfor delay '00:00:#{delay}'; select db_name()" result.each { |r| puts r } rescue TinyTds::Error => e - if e.message == "Adaptive Server connection timed out" + if e.message.include?("connection timed out") exception = true end end