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-linux | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

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

diff --git a/upstream-build/configdata.pm/x86_64-linux b/upstream-build/configdata.pm/x86_64-linux
index 7eb3ac4..4301f68 100644
--- a/upstream-build/configdata.pm/x86_64-linux
+++ b/upstream-build/configdata.pm/x86_64-linux
@@ -63,8 +63,8 @@ our %config = (
   options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib no-zlib-dynamic",
   perl_archname => "x86_64-linux-thread-multi",
   perl_cmd => "/usr/bin/perl",
-  perl_version => "5.26.3",
-  perlargv => [ "linux-x86_64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm" ],
+  perl_version => "5.28.2",
+  perlargv => [ "linux-x86_64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => "..",
   target => "linux-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1c",
-  version_num => "0x1010103fL",
+  version => "1.1.1d",
+  version_num => "0x1010104fL",
 );
 
 our %target = (
@@ -325,7 +325,7 @@ our %disabled = (
   "buildtest-c++" => "default",
   "crypto-mdebug" => "default",
   "crypto-mdebug-backtrace" => "default",
-  "devcryptoeng" => "default",
+  "devcryptoeng" => "option",
   "ec_nistp_64_gcc_128" => "default",
   "egd" => "default",
   "external-tests" => "default",
@@ -3198,8 +3198,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3229,6 +3227,8 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -3294,6 +3294,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",
@@ -12488,6 +12489,11 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/testutil/random.o" =>
+                [
+                    "include",
+                    "../include",
+                ],
             "test/testutil/stanza.o" =>
                 [
                     "include",
@@ -17799,6 +17805,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",
@@ -18152,6 +18159,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