From 84d7a4b26e733925e287185bb2f03feb6fb0811d Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 25 Nov 2019 18:44:47 +0300
Subject: Release version 1.1.1+6

Upgrade to 1.1.1d
---
 upstream-build/configdata.pm/x86_64-win32-msvc | 30 ++++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'upstream-build/configdata.pm/x86_64-win32-msvc')

diff --git a/upstream-build/configdata.pm/x86_64-win32-msvc b/upstream-build/configdata.pm/x86_64-win32-msvc
index 607bee7..1eacfb7 100644
--- a/upstream-build/configdata.pm/x86_64-win32-msvc
+++ b/upstream-build/configdata.pm/x86_64-win32-msvc
@@ -29,6 +29,7 @@ our %config = (
   MT => "mt",
   MTFLAGS => [ "-nologo" ],
   PERL => "C:\\Perl64\\bin\\perl.exe",
+  RANLIB => "ranlib",
   RC => "rc",
   RCFLAGS => [  ],
   afalgeng => "",
@@ -67,7 +68,7 @@ our %config = (
   perl_archname => "MSWin32-x64-multi-thread",
   perl_cmd => "C:\\Perl64\\bin\\perl.exe",
   perl_version => "5.26.3",
-  perlargv => [ "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "VC-WIN64A" ],
+  perlargv => [ "VC-WIN64A", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -115,8 +116,8 @@ our %config = (
   sourcedir => "..",
   target => "VC-WIN64A",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1c",
-  version_num => "0x1010103fL",
+  version => "1.1.1d",
+  version_num => "0x1010104fL",
 );
 
 our %target = (
@@ -132,7 +133,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x65d528)",
+  RANLIB => "CODE(0x653500)",
   RC => "rc",
   _conf_fname_int => [ "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c",
@@ -3213,9 +3214,9 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
+                            "ms\\uplink.o",
                             "ms\\applink.o",
                             "ms\\applink.o",
-                            "ms\\uplink.o",
                         ],
                     "products" =>
                         {
@@ -3234,8 +3235,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl\\packet.o",
-                            "ssl\\tls13_enc.o",
                             "ssl\\bio_ssl.o",
                             "ssl\\d1_lib.o",
                             "ssl\\d1_msg.o",
@@ -3265,6 +3264,8 @@ our %unified_info = (
                             "ssl\\t1_trce.o",
                             "ssl\\tls13_enc.o",
                             "ssl\\tls_srp.o",
+                            "ssl\\packet.o",
+                            "ssl\\tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -3330,6 +3331,7 @@ our %unified_info = (
                             "test\\testutil\\init.o",
                             "test\\testutil\\main.o",
                             "test\\testutil\\output_helpers.o",
+                            "test\\testutil\\random.o",
                             "test\\testutil\\stanza.o",
                             "test\\testutil\\tap_bio.o",
                             "test\\testutil\\test_cleanup.o",
@@ -11303,12 +11305,12 @@ our %unified_info = (
                 ],
             "ms\\applink.o" =>
                 [
-                    "apps",
                     ".",
                     "include",
-                    "..\\apps",
+                    "apps",
                     "..",
                     "..\\include",
+                    "..\\apps",
                 ],
             "ms\\uplink.o" =>
                 [
@@ -12576,6 +12578,11 @@ our %unified_info = (
                     "include",
                     "..\\include",
                 ],
+            "test\\testutil\\random.o" =>
+                [
+                    "include",
+                    "..\\include",
+                ],
             "test\\testutil\\stanza.o" =>
                 [
                     "include",
@@ -17886,6 +17893,7 @@ our %unified_info = (
                     "test\\testutil\\init.o",
                     "test\\testutil\\main.o",
                     "test\\testutil\\output_helpers.o",
+                    "test\\testutil\\random.o",
                     "test\\testutil\\stanza.o",
                     "test\\testutil\\tap_bio.o",
                     "test\\testutil\\test_cleanup.o",
@@ -18239,6 +18247,10 @@ our %unified_info = (
                 [
                     "..\\test\\testutil\\output_helpers.c",
                 ],
+            "test\\testutil\\random.o" =>
+                [
+                    "..\\test\\testutil\\random.c",
+                ],
             "test\\testutil\\stanza.o" =>
                 [
                     "..\\test\\testutil\\stanza.c",
-- 
cgit v1.1