Skip to content

Commit 9aea4b4

Browse files
committed
Update dependencies
1 parent 03b0e1f commit 9aea4b4

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Renamed `tds_version` and `tds_version_info` to `server_version` and `server_version_info`
1212
* Separate `#new` and `#connect`
1313
* Instead, before running `#do`, `#execute` or `#insert`, `tiny_tds` will check if the connection is active and re-connect if needed.
14+
* Use freetds v1.5.15, OpenSSL v3.6.1 and libiconv v1.19 for Windows and Linux builds.
1415

1516
## 3.4.0
1617

ext/tiny_tds/extconf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def initialize(name, version, files)
2525
self.files = files
2626
rootdir = File.expand_path("../../..", __FILE__)
2727
self.target = File.join(rootdir, "ports")
28-
self.patch_files = Dir[File.join("patches", self.name, self.version, "*.patch")].sort
28+
self.patch_files = Dir[File.join(rootdir, "patches", self.name, self.version, "*.patch")].sort
2929
end
3030

3131
# this will yield all ports into the same directory, making our path configuration for the linker easier

ext/tiny_tds/extconsts.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18"
1+
ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.19"
22
ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
33

4-
OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.6.0"
4+
OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.6.1"
55
OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
66

7-
FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.10"
7+
FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.15"
88
FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- a/ssl/quic/quic_reactor.c
2+
+++ b/ssl/quic/quic_reactor.c
3+
@@ -76,6 +76,12 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor)
4+
}
5+
6+
#if defined(OPENSSL_SYS_WINDOWS)
7+
+
8+
+/* Work around for MinGW builds. */
9+
+#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
10+
+#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
11+
+#endif
12+
+
13+
/*
14+
* On Windows recvfrom() may return WSAECONNRESET when destination port
15+
* used in preceding call to sendto() is no longer reachable. The reset

0 commit comments

Comments
 (0)