From b56236b58b3f5b798cacebecca57cd6d34658587 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 14 Dec 2020 17:35:27 +0300
Subject: Release version 1.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
---
 upstream-build/buildinf.h/i686-linux           | 4 ++--
 upstream-build/buildinf.h/i686-win32-mingw32   | 9 +++++----
 upstream-build/buildinf.h/i686-win32-msvc      | 2 +-
 upstream-build/buildinf.h/x86_64-freebsd       | 6 +++---
 upstream-build/buildinf.h/x86_64-linux         | 2 +-
 upstream-build/buildinf.h/x86_64-macos         | 4 ++--
 upstream-build/buildinf.h/x86_64-win32-mingw32 | 5 +++--
 upstream-build/buildinf.h/x86_64-win32-msvc    | 2 +-
 8 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'upstream-build/buildinf.h')

diff --git a/upstream-build/buildinf.h/i686-linux b/upstream-build/buildinf.h/i686-linux
index d04e244..53455e4 100644
--- a/upstream-build/buildinf.h/i686-linux
+++ b/upstream-build/buildinf.h/i686-linux
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86"
-#define DATE "built on: Thu Apr 30 18:24:51 2020 UTC"
+#define DATE "built on: Sat Dec 12 16:12:53 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -26,5 +26,5 @@ static const char compiler_flags[] = {
     ' ','-','D','O','P','E','N','S','S','L','_','U','S','E','_','N',
     'O','D','E','L','E','T','E',' ','-','D','L','_','E','N','D','I',
     'A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',
-    ' ','-','D','N','D','E','B','U','G','\0'
+    ' ','-','D','Z','L','I','B',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/upstream-build/buildinf.h/i686-win32-mingw32 b/upstream-build/buildinf.h/i686-win32-mingw32
index 93cfe7c..9f812d3 100644
--- a/upstream-build/buildinf.h/i686-win32-mingw32
+++ b/upstream-build/buildinf.h/i686-win32-mingw32
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: mingw"
-#define DATE "built on: Sat May  2 10:16:46 2020 UTC"
+#define DATE "built on: Sat Dec 12 16:11:55 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -26,7 +26,8 @@ static const char compiler_flags[] = {
     'P','E','N','S','S','L','_','P','I','C',' ','-','D','U','N','I',
     'C','O','D','E',' ','-','D','_','U','N','I','C','O','D','E',' ',
     '-','D','W','I','N','3','2','_','L','E','A','N','_','A','N','D',
-    '_','M','E','A','N',' ','-','D','_','M','T',' ','-','D','O','P',
-    'E','N','S','S','L','_','U','S','E','_','A','P','P','L','I','N',
-    'K',' ','-','D','N','D','E','B','U','G','\0'
+    '_','M','E','A','N',' ','-','D','_','M','T',' ','-','D','Z','L',
+    'I','B',' ','-','D','O','P','E','N','S','S','L','_','U','S','E',
+    '_','A','P','P','L','I','N','K',' ','-','D','N','D','E','B','U',
+    'G','\0'
 };
diff --git a/upstream-build/buildinf.h/i686-win32-msvc b/upstream-build/buildinf.h/i686-win32-msvc
index e91c85e..cf6a2b8 100644
--- a/upstream-build/buildinf.h/i686-win32-msvc
+++ b/upstream-build/buildinf.h/i686-win32-msvc
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: VC-WIN32"
-#define DATE "built on: Sat May  2 09:40:34 2020 UTC"
+#define DATE "built on: Thu Dec 10 19:47:42 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/upstream-build/buildinf.h/x86_64-freebsd b/upstream-build/buildinf.h/x86_64-freebsd
index 8485db6..c65a4d3 100644
--- a/upstream-build/buildinf.h/x86_64-freebsd
+++ b/upstream-build/buildinf.h/x86_64-freebsd
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86_64"
-#define DATE "built on: Thu Apr 30 18:45:01 2020 UTC"
+#define DATE "built on: Sat Dec 12 16:34:10 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -24,6 +24,6 @@ static const char compiler_flags[] = {
     'l',' ','-','O','3',' ','-','D','L','_','E','N','D','I','A','N',
     ' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-',
     'D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-','D',
-    '_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D','E',
-    'B','U','G','\0'
+    '_','R','E','E','N','T','R','A','N','T',' ','-','D','Z','L','I',
+    'B',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/upstream-build/buildinf.h/x86_64-linux b/upstream-build/buildinf.h/x86_64-linux
index f9be209..46977a6 100644
--- a/upstream-build/buildinf.h/x86_64-linux
+++ b/upstream-build/buildinf.h/x86_64-linux
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86_64"
-#define DATE "built on: Thu Apr 30 15:53:35 2020 UTC"
+#define DATE "built on: Thu Dec 10 16:43:03 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/upstream-build/buildinf.h/x86_64-macos b/upstream-build/buildinf.h/x86_64-macos
index 7941d14..ed3ea84 100644
--- a/upstream-build/buildinf.h/x86_64-macos
+++ b/upstream-build/buildinf.h/x86_64-macos
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Thu Apr 30 18:57:11 2020 UTC"
+#define DATE "built on: Sat Dec 12 16:24:02 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -24,5 +24,5 @@ static const char compiler_flags[] = {
     '-','O','3',' ','-','W','a','l','l',' ','-','D','L','_','E','N',
     'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P',
     'I','C',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ',
-    '-','D','N','D','E','B','U','G','\0'
+    '-','D','Z','L','I','B',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/upstream-build/buildinf.h/x86_64-win32-mingw32 b/upstream-build/buildinf.h/x86_64-win32-mingw32
index b1f9541..de55eb0 100644
--- a/upstream-build/buildinf.h/x86_64-win32-mingw32
+++ b/upstream-build/buildinf.h/x86_64-win32-mingw32
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: mingw64"
-#define DATE "built on: Sat May  2 09:56:52 2020 UTC"
+#define DATE "built on: Fri Dec 11 20:05:57 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -25,5 +25,6 @@ static const char compiler_flags[] = {
     'L','_','P','I','C',' ','-','D','U','N','I','C','O','D','E',' ',
     '-','D','_','U','N','I','C','O','D','E',' ','-','D','W','I','N',
     '3','2','_','L','E','A','N','_','A','N','D','_','M','E','A','N',
-    ' ','-','D','_','M','T',' ','-','D','N','D','E','B','U','G','\0'
+    ' ','-','D','_','M','T',' ','-','D','Z','L','I','B',' ','-','D',
+    'N','D','E','B','U','G','\0'
 };
diff --git a/upstream-build/buildinf.h/x86_64-win32-msvc b/upstream-build/buildinf.h/x86_64-win32-msvc
index 87fc2f1..bed6521 100644
--- a/upstream-build/buildinf.h/x86_64-win32-msvc
+++ b/upstream-build/buildinf.h/x86_64-win32-msvc
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: VC-WIN64A"
-#define DATE "built on: Fri May  1 19:07:04 2020 UTC"
+#define DATE "built on: Fri Dec 11 03:26:11 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
-- 
cgit v1.1