Release version 1.1.1+12v1.1.1+12

Upgrade to 1.1.1i

Add symlink attribute for symbolic links that refer to upstream subdirectories

Make the .map and .def files prerequisites of the libs type target

Canonicalize the license in the package manifests

Load the c.config module rather than c in openssl/tests/build/root.build

1 files changed, 29 insertions, 8 deletions

diff --git a/upstream-build/configdata.pm/x86_64-macos b/upstream-build/configdata.pm/x86_64-macos
index d1c84d5..6b5cf94 100644
--- a/upstream-build/configdata.pm/x86_64-macos
+++ b/upstream-build/configdata.pm/x86_64-macos
@@ -59,11 +59,11 @@ our %config = (
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
-  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers no-afalgeng 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",
+  options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-afalgeng 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-dynamic",
   perl_archname => "darwin-thread-multi-2level",
   perl_cmd => "/usr/bin/perl",
   perl_version => "5.18.4",
-  perlargv => [ "darwin64-x86_64-cc", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ],
+  perlargv => [ "darwin64-x86_64-cc", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ],
   perlenv => {
       "AR" => undef,
       "ARFLAGS" => undef,
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => "..",
   target => "darwin64-x86_64-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1g",
-  version_num => "0x1010107fL",
+  version => "1.1.1i",
+  version_num => "0x1010109fL",
 );
 
 our %target = (
@@ -146,7 +146,7 @@ our %target = (
   cppflags => "-D_REENTRANT",
   cpuid_asm_src => "mem_clr.c",
   cpuid_obj => "mem_clr.o",
-  defines => [  ],
+  defines => [ "ZLIB" ],
   des_asm_src => "des_enc.c fcrypt_b.c",
   des_obj => "des_enc.o fcrypt_b.o",
   disable => [  ],
@@ -155,6 +155,7 @@ our %target = (
   ec_asm_src => "",
   ec_obj => "",
   enable => [  ],
+  ex_libs => "-lz",
   exe_extension => "",
   includes => [  ],
   keccak1600_asm_src => "keccak1600.c",
@@ -334,7 +335,6 @@ our %disabled = (
   "ssl-trace" => "default",
   "ubsan" => "default",
   "unit-test" => "default",
-  "zlib" => "default",
   "zlib-dynamic" => "default",
 );
 
@@ -1196,6 +1196,11 @@ our %unified_info = (
                     "libssl",
                     "test/libtestutil.a",
                 ],
+            "test/cmactest" =>
+                [
+                    "libcrypto.a",
+                    "test/libtestutil.a",
+                ],
             "test/cmsapitest" =>
                 [
                     "libcrypto",
@@ -3187,8 +3192,6 @@ our %unified_info = (
                 {
                     "deps" =>
                         [
-                            "ssl/packet.o",
-                            "ssl/tls13_enc.o",
                             "ssl/bio_ssl.o",
                             "ssl/d1_lib.o",
                             "ssl/d1_msg.o",
@@ -3218,6 +3221,8 @@ our %unified_info = (
                             "ssl/t1_trce.o",
                             "ssl/tls13_enc.o",
                             "ssl/tls_srp.o",
+                            "ssl/packet.o",
+                            "ssl/tls13_enc.o",
                         ],
                     "products" =>
                         {
@@ -10698,6 +10703,13 @@ our %unified_info = (
                     "include",
                     "../include",
                 ],
+            "test/cmactest.o" =>
+                [
+                    "include",
+                    "apps/include",
+                    "../include",
+                    "../apps/include",
+                ],
             "test/cmsapitest.o" =>
                 [
                     "include",
@@ -11422,6 +11434,7 @@ our %unified_info = (
             "test/cipherlist_test",
             "test/ciphername_test",
             "test/clienthellotest",
+            "test/cmactest",
             "test/cmsapitest",
             "test/conf_include_test",
             "test/constant_time_test",
@@ -16161,6 +16174,14 @@ our %unified_info = (
                 [
                     "../test/clienthellotest.c",
                 ],
+            "test/cmactest" =>
+                [
+                    "test/cmactest.o",
+                ],
+            "test/cmactest.o" =>
+                [
+                    "../test/cmactest.c",
+                ],
             "test/cmsapitest" =>
                 [
                     "test/cmsapitest.o",