tiny_tds 2.1.7-x64-mingw-ucrt → 3.0.0-x64-mingw-ucrt

data/ports/x64-mingw-ucrt/freetds/{1.1.24 → 1.4.23}/lib/libct.la

@@ -1,5 +1,5 @@
 # libct.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib -L/root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib -L/root/project/ports/x64-mingw-ucrt/openssl/1.1.1s/lib -lws2_32 -lssl -lcrypto /root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib/libiconv.la'
+dependency_libs=' -L/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/libiconv/1.17/lib -lws2_32 -lcrypt32 -L/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/openssl/3.4.0/lib64 -lssl -lcrypto /__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/libiconv/1.17/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/root/project/ports/x64-mingw-ucrt/freetds/1.1.24/lib'
+libdir='/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/freetds/1.4.23/lib'

data/ports/x64-mingw-ucrt/freetds/{1.1.24 → 1.4.23}/lib/libsybdb.la

@@ -1,5 +1,5 @@
 # libsybdb.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib -L/root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib -L/root/project/ports/x64-mingw-ucrt/openssl/1.1.1s/lib -lws2_32 -lssl -lcrypto /root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib/libiconv.la'
+dependency_libs=' -L/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/libiconv/1.17/lib -lws2_32 -lcrypt32 -L/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/openssl/3.4.0/lib64 -lssl -lcrypto /__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/libiconv/1.17/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/root/project/ports/x64-mingw-ucrt/freetds/1.1.24/lib'
+libdir='/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/freetds/1.4.23/lib'

data/ports/x64-mingw-ucrt/libiconv/{1.15 → 1.17}/lib/libcharset.la

@@ -1,5 +1,5 @@
 # libcharset.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/root/project/ports/x64-mingw-ucrt/openssl/1.1.1s/lib'
+dependency_libs=''
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib'
+libdir='/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/libiconv/1.17/lib'

data/ports/x64-mingw-ucrt/libiconv/{1.15 → 1.17}/lib/libiconv.la

@@ -1,5 +1,5 @@
 # libiconv.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6
+# Generated by libtool (GNU libtool) 2.4.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/root/project/ports/x64-mingw-ucrt/openssl/1.1.1s/lib'
+dependency_libs=''
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libiconv.
 current=8
 age=6
-revision=0
+revision=1
 
 # Is this an already installed library?
 installed=yes
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/root/project/ports/x64-mingw-ucrt/libiconv/1.15/lib'
+libdir='/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/libiconv/1.17/lib'

data/ports/x64-mingw-ucrt/openssl/{1.1.1s → 3.4.0}/bin/c_rehash

@@ -4,7 +4,7 @@
 # Generated by Makefile from tools/c_rehash.in
 # Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -12,8 +12,8 @@
 # Perl c_rehash script, scan all files in a directory
 # and add symbolic links to their hash values.
 
-my $dir = "/root/project/ports/x64-mingw-ucrt/openssl/1.1.1s";
-my $prefix = "/root/project/ports/x64-mingw-ucrt/openssl/1.1.1s";
+my $dir = "/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/openssl/3.4.0";
+my $prefix = "/__w/tiny_tds/tiny_tds/ports/x64-mingw-ucrt/openssl/3.4.0";
 
 my $errorcount = 0;
 my $openssl = $ENV{OPENSSL} || "openssl";
@@ -29,35 +29,35 @@ while ( $ARGV[0] =~ /^-/ ) {
     my $flag = shift @ARGV;
     last if ( $flag eq '--');
     if ( $flag eq '-old') {
-	    $x509hash = "-subject_hash_old";
-	    $crlhash = "-hash_old";
+        $x509hash = "-subject_hash_old";
+        $crlhash = "-hash_old";
     } elsif ( $flag eq '-h' || $flag eq '-help' ) {
-	    help();
+        help();
     } elsif ( $flag eq '-n' ) {
-	    $removelinks = 0;
+        $removelinks = 0;
     } elsif ( $flag eq '-v' ) {
-	    $verbose++;
+        $verbose++;
     }
     else {
-	    print STDERR "Usage error; try -h.\n";
-	    exit 1;
+        print STDERR "Usage error; try -h.\n";
+        exit 1;
     }
 }
 
 sub help {
-	print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
-	print "   -old use old-style digest\n";
-	print "   -h or -help print this help text\n";
-	print "   -v print files removed and linked\n";
-	exit 0;
+    print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
+    print "   -old use old-style digest\n";
+    print "   -h or -help print this help text\n";
+    print "   -v print files removed and linked\n";
+    exit 0;
 }
 
 eval "require Cwd";
 if (defined(&Cwd::getcwd)) {
-	$pwd=Cwd::getcwd();
+    $pwd=Cwd::getcwd();
 } else {
-	$pwd=`pwd`;
-	chomp($pwd);
+    $pwd=`pwd`;
+    chomp($pwd);
 }
 
 # DOS/Win32 or Unix delimiter?  Prefix our installdir, then search.
@@ -65,43 +65,43 @@ my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':';
 $ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
 
 if (! -x $openssl) {
-	my $found = 0;
-	foreach (split /$path_delim/, $ENV{PATH}) {
-		if (-x "$_/$openssl") {
-			$found = 1;
-			$openssl = "$_/$openssl";
-			last;
-		}	
-	}
-	if ($found == 0) {
-		print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
-		exit 0;
-	}
+    my $found = 0;
+    foreach (split /$path_delim/, $ENV{PATH}) {
+        if (-x "$_/$openssl") {
+            $found = 1;
+            $openssl = "$_/$openssl";
+            last;
+        }
+    }
+    if ($found == 0) {
+        print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
+        exit 0;
+    }
 }
 
 if (@ARGV) {
-	@dirlist = @ARGV;
+    @dirlist = @ARGV;
 } elsif ($ENV{SSL_CERT_DIR}) {
-	@dirlist = split /$path_delim/, $ENV{SSL_CERT_DIR};
+    @dirlist = split /$path_delim/, $ENV{SSL_CERT_DIR};
 } else {
-	$dirlist[0] = "$dir/certs";
+    $dirlist[0] = "$dir/certs";
 }
 
 if (-d $dirlist[0]) {
-	chdir $dirlist[0];
-	$openssl="$pwd/$openssl" if (!-x $openssl);
-	chdir $pwd;
+    chdir $dirlist[0];
+    $openssl="$pwd/$openssl" if (!-x $openssl);
+    chdir $pwd;
 }
 
 foreach (@dirlist) {
-	if (-d $_ ) {
-            if ( -w $_) {
-		hash_dir($_);
-            } else {
-                print "Skipping $_, can't write\n";
-                $errorcount++;
-            }
-	}
+    if (-d $_ ) {
+        if ( -w $_) {
+            hash_dir($_);
+        } else {
+            print "Skipping $_, can't write\n";
+            $errorcount++;
+        }
+    }
 }
 exit($errorcount);
 
@@ -144,7 +144,7 @@ sub hash_dir {
             }
         }
     }
-    FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
+    FILE: foreach $fname (grep {/\.(pem|crt|cer|crl)$/} @flist) {
         # Check to see if certificates and/or CRLs present.
         my ($cert, $crl) = check_file($fname);
         if (!$cert && !$crl) {
@@ -223,6 +223,7 @@ sub link_hash {
                                        "-fingerprint", "-noout",
                                        "-in", $fname);
     chomp $hash;
+    $hash =~ s/^.*=// if !$is_cert;
     chomp $fprint;
     return if !$hash;
     $fprint =~ s/^.*=//;

data/tasks/ports/freetds.rb

@@ -15,12 +15,7 @@ module Ports
 
       opts << '--with-pic'
       opts << '--disable-odbc'
-
-      if version =~ /0\.91/
-        opts << '--with-tdsver=7.1'
-      else
-        opts << '--with-tdsver=7.3'
-      end
+      opts << '--with-tdsver=7.3'
 
       if windows?
         opts << '--sysconfdir=C:/Sites'

data/tasks/ports.rake

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

data/test/bin/install-mssql.ps1

@@ -1,15 +1,27 @@
+param ([int] $Version)
+
 $ProgressPreference = 'SilentlyContinue'
 
-if (-not(Test-path "C:\Downloads"))
-{
+$DownloadLinkTable = @{
+    2017 = "https://go.microsoft.com/fwlink/?linkid=829176";
+    2019 = "https://download.microsoft.com/download/7/c/1/7c14e92e-bdcb-4f89-b7cf-93543e7112d1/SQLEXPR_x64_ENU.exe";
+    2022 = "https://download.microsoft.com/download/3/8/d/38de7036-2433-4207-8eae-06e247e17b25/SQLEXPR_x64_ENU.exe";
+}
+
+$MajorVersionTable = @{
+    2017 = 14;
+    2019 = 15;
+    2022 = 16;
+}
+
+if (-not(Test-path "C:\Downloads")) {
     mkdir "C:\Downloads"
 }
 
 $sqlInstallationFile = "C:\Downloads\sqlexpress.exe"
-if (-not(Test-path $sqlInstallationFile -PathType leaf))
-{
+if (-not(Test-path $sqlInstallationFile -PathType leaf)) {
     Write-Host "Downloading SQL Express ..."
-    Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=829176" -OutFile "C:\Downloads\sqlexpress.exe"
+    Invoke-WebRequest -Uri $DownloadLinkTable[$Version] -OutFile "C:\Downloads\sqlexpress.exe"
 }
 
 Write-Host "Installing SQL Express ..."
@@ -18,14 +30,13 @@ C:\Downloads\setup\setup.exe /q /ACTION=Install /INSTANCENAME=SQLEXPRESS /FEATUR
 
 Write-Host "Configuring SQL Express ..."
 stop-service MSSQL`$SQLEXPRESS
-set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpdynamicports -value ''
-set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpport -value 1433
-set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\' -name LoginMode -value 2
+set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall" -name tcpdynamicports -value ''
+set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall" -name tcpport -value 1433
+set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\" -name LoginMode -value 2
 
 Write-Host "Starting SQL Express ..."
 start-service MSSQL`$SQLEXPRESS
 
 Write-Host "Configuring MSSQL for TinyTDS ..."
-& sqlcmd -Q "CREATE DATABASE [tinytdstest];"
-& sqlcmd -Q "CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];"
-& sqlcmd -Q "USE [tinytdstest]; CREATE USER [tinytds] FOR LOGIN [tinytds]; EXEC sp_addrolemember N'db_owner', N'tinytds';"
+& sqlcmd -i './test/sql/db-create.sql'
+& sqlcmd -i './test/sql/db-login.sql'

data/test/client_test.rb

@@ -24,10 +24,7 @@ class ClientTest < TinyTds::TestCase
     end
 
     it 'has getters for the tds version information (brittle since conf takes precedence)' do
-      if sybase_ase?
-        assert_equal 7, @client.tds_version
-        assert_equal 'DBTDS_5_0 - 5.0 SQL Server', @client.tds_version_info
-      elsif @client.tds_73?
+      if @client.tds_73?
         assert_equal 11, @client.tds_version
         assert_equal 'DBTDS_7_3 - Microsoft SQL Server 2008', @client.tds_version_info
       else
@@ -199,7 +196,7 @@ class ClientTest < TinyTds::TestCase
       options = connection_options :username => 'willnotwork'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
-        assert_equal sybase_ase? ? 4002 : 18456, e.db_error_number
+        assert_equal 18456, e.db_error_number
         assert_equal 14, e.severity
         assert_match %r{login failed}i, e.message, 'ignore if non-english test run'
       end

data/test/gem_test.rb

@@ -158,7 +158,6 @@ class GemTest < MiniTest::Spec
       {
         'x64-mingw-ucrt' => 'x64-mingw-ucrt',
         'x64-mingw32' => 'x64-mingw32',
-        'x86-mingw32' => 'x86-mingw32',
         'x86_64-linux' => 'x86_64-linux',
       }.each do |host,expected|
         describe "on a #{host} architecture" do