Add compat with RubyInstaller-2.4.1

It adds gem metadata for automatic installation of the freetds package
which is part of the official MSYS2/MINGW repository now. This makes
installation of the tiny_tds source gem as easy as installation of the
binary windows gem, but works for RubyInstaller-2.4+ only.
The freetds MINGW package is maintained here:
https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-freetds

The Appveyor tests still work with our ports build and doesn't test
against the new freetds package, so far.

This disables the perl hack for OpenSSL, when the perl version is
recent enough. Otherwise mixing git's shell commands into the path breaks
MSYS2 builds, as used by RubyInstaller-2.4.

This also removes lib directories from DLL search path, because they
don't contain any DLLs.

The update of libiconv is required for compat with MSYS2.

The patch file is derived from
https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-freetds

Author: larskanis

Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake-compiler-dock', github: 'rake-compiler/rake-compiler-dock'
 end
 
 group :test do

Rakefile

@@ -29,6 +29,9 @@ Rake::ExtensionTask.new('tiny_tds', SPEC) do |ext|
 
   # Add dependent DLLs to the cross gems
   ext.cross_compiling do |spec|
+    # The fat binary gem doesn't depend on the freetds package, since it bundles the library.
+    spec.metadata.delete('msys2_mingw_dependencies')
+
     platform_host_map = GEM_PLATFORM_HOSTS
     gemplat = spec.platform.to_s
     host = platform_host_map[gemplat]

appveyor.yml

@@ -3,6 +3,7 @@ init:
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
   - SET TESTOPTS='-v'
+  - SET MAKE=make V=1
 clone_depth: 5
 skip_tags: true
 skip_branch_with_pr: true
@@ -42,8 +43,8 @@ environment:
   TINYTDS_UNIT_AZURE_PASS:
     secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk=
   matrix:
-    - ruby_version: "23-x64"
-    - ruby_version: "23"
+    - ruby_version: "24-x64"
+    - ruby_version: "24"
     - ruby_version: "22-x64"
     - ruby_version: "22"
 on_failure:

ext/tiny_tds/extconsts.rb

@@ -1,5 +1,5 @@
 
-ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.14"
+ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.15"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
 OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.0e'

lib/tiny_tds.rb

@@ -12,20 +12,39 @@
 # Support multiple ruby versions, fat binaries under Windows.
 if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
   ver = Regexp.last_match(1)
-  # Set the PATH environment variable, so that the DLLs can be found.
-  old_path = ENV['PATH']
-  begin
-    ENV['PATH'] = [
-      TinyTds::Gem.ports_bin_paths,
-      TinyTds::Gem.ports_lib_paths,
-      old_path
-    ].flatten.join File::PATH_SEPARATOR
 
-    require "tiny_tds/#{ver}/tiny_tds"
-  rescue LoadError
-    require 'tiny_tds/tiny_tds'
-  ensure
-    ENV['PATH'] = old_path
+  add_dll_path = proc do |path, &block|
+    begin
+      require 'ruby_installer/runtime'
+      RubyInstaller::Runtime.add_dll_directory(path, &block)
+    rescue LoadError
+      old_path = ENV['PATH']
+      ENV['PATH'] = "#{path};#{old_path}"
+      begin
+        block.call
+      ensure
+        ENV['PATH'] = old_path
+      end
+    end
+  end
+
+  add_dll_paths = proc do |paths, &block|
+    if path=paths.shift
+      add_dll_path.call(path) do
+        add_dll_paths.call(paths, &block)
+      end
+    else
+      block.call
+    end
+  end
+
+  # Temporary add bin directories for DLL search, so that freetds DLLs can be found.
+  add_dll_paths.call( TinyTds::Gem.ports_bin_paths ) do
+    begin
+      require "tiny_tds/#{ver}/tiny_tds"
+    rescue LoadError
+      require 'tiny_tds/tiny_tds'
+    end
   end
 else
   # Load dependent shared libraries into the process, so that they are already present,

patches/freetds/1.00.27/0002-Don-t-use-MSYS2-file-libws2_32.diff

@@ -0,0 +1,28 @@
+From 56e8972f66c3e948e2ad6885595c58fd23dcdb37 Mon Sep 17 00:00:00 2001
+From: Lars Kanis <kanis@comcard.de>
+Date: Thu, 6 Jul 2017 17:09:40 +0200
+Subject: [PATCH] Don't use MSYS2 file libws2_32.a for MINGW build
+
+This file is intended for MSYS2/cygwin builds and blocks OpenSSL
+detection of freetds on i686.
+---
+ configure    | 2 --
+ configure.ac | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9495a49..31eb01d 100644
+--- a/configure
++++ b/configure
+@@ -15915,8 +15915,6 @@ case $host in
+ 	tds_mingw=yes
+ 	if test "$host_cpu" = "x86_64"; then
+ 		LIBS="-lws2_32"
+-	elif test -r /usr/lib/w32api/libws2_32.a; then
+-		LIBS="-L/usr/lib/w32api -lws2_32"
+ 	else
+ 		LIBS="-lws2_32"
+ 	fi
+-- 
+2.6.2.windows.1
+

tasks/ports.rake

@@ -43,6 +43,9 @@ namespace :ports do
       # freetds doesn't have an option that will provide an rpath
       # so we do it manually
       ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{openssl.path}/lib"
+      # Add the pkgconfig file with MSYS2'ish path, to prefer our ports build
+      # over MSYS2 system OpenSSL.
+      ENV['PKG_CONFIG_PATH'] = "#{openssl.path.gsub(/^(\w):/i){"/"+$1.downcase}}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
       freetds.configure_options << "--with-openssl=#{openssl.path}"
     end
 

tasks/ports/freetds.rb

@@ -23,7 +23,7 @@ def configure_defaults
       end
 
       if windows?
-        opts << '--sysconfdir=C:\Sites'
+        opts << '--sysconfdir=C:/Sites'
         opts << '--enable-sspi'
       end
 

tasks/ports/openssl.rb

@@ -28,8 +28,11 @@ def install
     private
 
     def execute(action, command, options={})
+      # OpenSSL Requires Perl >= 5.10, while the Ruby devkit uses MSYS1 with Perl 5.8.8.
+      # To overcome this, prepend Git's usr/bin to the PATH.
+      # It has MSYS2 with a recent version of perl.
       prev_path = ENV['PATH']
-      if host =~ /mingw/
+      if host =~ /mingw/ && IO.popen(["perl", "-e", "print($])"], &:read).to_f < 5.010
         git_perl = 'C:/Program Files/Git/usr/bin'
         if File.directory?(git_perl)
           ENV['PATH'] = "#{git_perl}#{File::PATH_SEPARATOR}#{ENV['PATH']}"

tiny_tds.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/tiny_tds/extconf.rb']
   s.license       = 'MIT'
   s.required_ruby_version = '>= 2.0.0'
-  s.add_runtime_dependency     'mini_portile2', '~> 2.0'
+  s.metadata['msys2_mingw_dependencies'] = 'freetds'
+  s.add_development_dependency 'mini_portile2', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.4'
-  s.add_development_dependency 'rake-compiler', '0.9.5'
+  s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rake-compiler-dock', '~> 0.6.0'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'connection_pool', '~> 2.2'