Add ruby-2.7 to cross build and tests, Update freetds and OpenSSL

Author: larskanis

.travis.yml

@@ -11,6 +11,7 @@ rvm:
   - 2.4.5
   - 2.5.3
   - 2.6.1
+  - 2.7.0
 before_install:
   - docker info
   - sudo ./test/bin/install-openssl.sh

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 * Removed old/unused appveyor config
 * Remove old Rubies from CI & cross compile list
-* Add Ruby 2.6 to the cross compile list
+* Add Ruby 2.6 and 2.7 to the cross compile list
 
 ## 2.1.2
 

README.md

@@ -38,9 +38,9 @@ $ apt-get install wget
 $ apt-get install build-essential
 $ apt-get install libc6-dev
 
-$ wget http://www.freetds.org/files/stable/freetds-1.1.6.tar.gz
-$ tar -xzf freetds-1.1.6.tar.gz
-$ cd freetds-1.1.6
+$ wget http://www.freetds.org/files/stable/freetds-1.1.24.tar.gz
+$ tar -xzf freetds-1.1.24.tar.gz
+$ cd freetds-1.1.24
 $ ./configure --prefix=/usr/local --with-tdsver=7.3
 $ make
 $ make install
@@ -401,7 +401,7 @@ The default is true and since FreeTDS v1.0 would do this as well.
 
 ## Compiling Gems for Windows
 
-For the convenience of Windows users, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides a [Docker image](https://registry.hub.docker.com/u/larskanis/rake-compiler-dock/) with rvm, cross-compilers and a number of different target versions of Ruby.
+For the convenience of Windows users, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides several [Docker images](https://registry.hub.docker.com/u/larskanis/) with rvm, cross-compilers and a number of different target versions of Ruby.
 
 Run the following rake task to compile the gems for Windows. This will check the availability of [Docker](https://www.docker.com/) (and boot2docker on Windows or OS-X) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
 

ext/tiny_tds/extconsts.rb

@@ -2,10 +2,10 @@
 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.0j'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.1d'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.27"
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.1.24"
 FREETDS_VERSION_INFO = Hash.new { |h,k|
   h[k] = {files: "http://www.freetds.org/files/stable/freetds-#{k}.tar.bz2"}
 }

tasks/native_gem.rake

@@ -8,7 +8,7 @@ task 'gem:windows' => ['ports:cross'] do
   build = ['bundle']
 
   # and finally build the native gem
-  build << 'rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"'
+  build << 'rake cross native gem RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"'
 
   RakeCompilerDock.sh build.join(' && ')
 end

tasks/ports.rake

@@ -6,8 +6,6 @@ require_relative 'ports/openssl'
 require_relative 'ports/freetds'
 require_relative '../ext/tiny_tds/extconsts'
 
-OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if defined? OpenSSL
-
 namespace :ports do
   openssl = Ports::Openssl.new(OPENSSL_VERSION)
   libiconv = Ports::Libiconv.new(ICONV_VERSION)

tasks/ports/openssl.rb

@@ -27,27 +27,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/ && 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']}"
-          ENV['PERL'] = 'perl'
-        end
-      end
-
-      super
-      ENV['PATH'] = prev_path
-    end
-
     def configure_defaults
       opts = [
         'shared',
-        target_arch
+        target_arch,
+        "--openssldir=#{path}",
       ]
 
       if cross_build?

tiny_tds.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mini_portile2', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.3'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'connection_pool', '~> 2.2'
 end