From f04b81bffb6829c8379e6b44bc178a0edd66b5e3 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sat, 18 Feb 2017 22:01:17 -0500 Subject: [PATCH 01/14] Use OpenSSL v1.1.0e & FreeTDS v1.00.27 --- ext/tiny_tds/extconsts.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/tiny_tds/extconsts.rb b/ext/tiny_tds/extconsts.rb index cc2f02a0..2b216cfd 100644 --- a/ext/tiny_tds/extconsts.rb +++ b/ext/tiny_tds/extconsts.rb @@ -2,10 +2,10 @@ ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.14" ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz" -OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.0.2j' +OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.0e' OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" -FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.21" +FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.27" FREETDS_VERSION_INFO = Hash.new { |h,k| h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"} } From c7045fdb1af207bac50544682e410e626ea6d181 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:20:10 -0500 Subject: [PATCH 02/14] Different OpenSSL install config for Travis/Circle. --- test/bin/install-openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bin/install-openssl.sh b/test/bin/install-openssl.sh index 8fd11282..2745f1be 100755 --- a/test/bin/install-openssl.sh +++ b/test/bin/install-openssl.sh @@ -10,7 +10,7 @@ fi wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz tar -xzf openssl-$OPENSSL_VERSION.tar.gz cd openssl-$OPENSSL_VERSION -./config --prefix=/opt/local +./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl make make install cd .. From 3a1e14454c06745caf35336728d354f732a0341d Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:40:13 -0500 Subject: [PATCH 03/14] Debug Perl on Appveyor. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 66100f3a..31ceda3f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,7 @@ matrix: fast_finish: true install: - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number" + - dir C:\Perl - perl --version - ruby --version - gem --version From 841bc1119ec13fc46430048e0f67050af18d821d Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:42:10 -0500 Subject: [PATCH 04/14] Use Appveyor's Perl 5.20 https://www.appveyor.com/docs/installed-software/#perl --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 31ceda3f..a8e47daf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,7 @@ init: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% + - SET PATH=C:\Perl\bin - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' clone_depth: 5 @@ -10,7 +11,6 @@ matrix: fast_finish: true install: - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number" - - dir C:\Perl - perl --version - ruby --version - gem --version From 2865165915b3ecefc6b1df351f5509b74a9fdd2b Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:44:01 -0500 Subject: [PATCH 05/14] Use Appveyor's Perl and existing path. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a8e47daf..7ea0fa2e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ init: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% - - SET PATH=C:\Perl\bin + - SET PATH=C:\Perl\bin;%PATH% - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' clone_depth: 5 From 0c4b5ab489f696f74603dd714d134d34ece1fb50 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:49:41 -0500 Subject: [PATCH 06/14] Disable C:MinGW path. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7ea0fa2e..9d65a0ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ init: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% + # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% - SET PATH=C:\Perl\bin;%PATH% - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' From a5f35ee7ac7b78c6b76a1e996337df8415d3f263 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:51:06 -0500 Subject: [PATCH 07/14] Debug Appveyor. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9d65a0ee..348db475 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ init: - - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% + # - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% + - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% - SET PATH=C:\Perl\bin;%PATH% - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' From 70561d52b1018a116f6106f16ebb8badcd1f668c Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 20:54:22 -0500 Subject: [PATCH 08/14] Appveyor --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 348db475..2489bedf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ init: # - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% - - SET PATH=C:\Perl\bin;%PATH% - - SET RAKEOPT=-rdevkit + # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% + # - SET PATH=C:\Perl\bin;%PATH% + # - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' clone_depth: 5 skip_tags: true From 4ebf557e28074ed8955616d26ec1e5c93c3b02be Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 21:10:29 -0500 Subject: [PATCH 09/14] Appveyor --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2489bedf..2bd16f6b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ init: - # - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% + - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% + # - SET PATH=C:\MinGW\msys\1 .0\bin;%PATH% # - SET PATH=C:\Perl\bin;%PATH% # - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' @@ -40,9 +40,9 @@ environment: TINYTDS_UNIT_AZURE_PASS: secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk= matrix: - - ruby_version: "23-x64" - - ruby_version: "23" - - ruby_version: "22-x64" - - ruby_version: "22" + - RUBY_VERSION: "23-x64" + - RUBY_VERSION: "23" + - RUBY_VERSION: "22-x64" + - RUBY_VERSION: "22" on_failure: - find -name compile.log | xargs cat From 3c3918fea319b79625e1a6dc6c0454c7ef03cee6 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 21:33:58 -0500 Subject: [PATCH 10/14] Appveyor --- appveyor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2bd16f6b..28bd6d04 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,7 @@ init: - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - # - SET PATH=C:\MinGW\msys\1 .0\bin;%PATH% + # - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin + # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% # - SET PATH=C:\Perl\bin;%PATH% # - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' @@ -11,6 +12,7 @@ matrix: fast_finish: true install: - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number" + - dir C:\mingw-w64 - perl --version - ruby --version - gem --version @@ -41,8 +43,8 @@ environment: secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk= matrix: - RUBY_VERSION: "23-x64" - - RUBY_VERSION: "23" - - RUBY_VERSION: "22-x64" - - RUBY_VERSION: "22" + # - RUBY_VERSION: "23" + # - RUBY_VERSION: "22-x64" + # - RUBY_VERSION: "22" on_failure: - find -name compile.log | xargs cat From c8008e524c2479a81cc2badf25a20a3ee30b4734 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 21:43:02 -0500 Subject: [PATCH 11/14] Appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 28bd6d04..c550faf6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ matrix: fast_finish: true install: - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number" - - dir C:\mingw-w64 + - dir C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0 - perl --version - ruby --version - gem --version From 3a3198356462ba6b93a2dad1911312efca94382c Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 21:48:18 -0500 Subject: [PATCH 12/14] Appveyor --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c550faf6..4d3394c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ init: - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - # - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin + - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% # - SET PATH=C:\Perl\bin;%PATH% # - SET RAKEOPT=-rdevkit @@ -12,7 +12,6 @@ matrix: fast_finish: true install: - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number" - - dir C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0 - perl --version - ruby --version - gem --version From a1be5ac34745bcaa537d8e63b20e2defc59d4339 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 21:52:07 -0500 Subject: [PATCH 13/14] Appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4d3394c4..f88b5b5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ init: - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin + - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH% # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% # - SET PATH=C:\Perl\bin;%PATH% # - SET RAKEOPT=-rdevkit From 78b968a6f952837faa675f79cb94c9e3980f9d00 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 19 Feb 2017 21:56:11 -0500 Subject: [PATCH 14/14] Appveyor --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f88b5b5e..8d27fe99 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ init: - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH% - # - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% + # - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH% + - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% # - SET PATH=C:\Perl\bin;%PATH% # - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v'