summaryrefslogtreecommitdiff
path: root/libssl
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-12-14 17:35:27 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-12-14 17:35:27 +0300
commitb56236b58b3f5b798cacebecca57cd6d34658587 (patch)
tree016bdd78e360df5803aefec652b41ecf8f913115 /libssl
parentf77f1f8554862fe4d0f7f4c032dfa23744de9063 (diff)
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
Diffstat (limited to 'libssl')
-rw-r--r--libssl/libssl/.gitattributes2
-rw-r--r--libssl/libssl/buildfile5
-rw-r--r--libssl/manifest6
3 files changed, 8 insertions, 5 deletions
diff --git a/libssl/libssl/.gitattributes b/libssl/libssl/.gitattributes
new file mode 100644
index 0000000..a9ba0de
--- /dev/null
+++ b/libssl/libssl/.gitattributes
@@ -0,0 +1,2 @@
+internal symlink=dir
+ssl symlink=dir
diff --git a/libssl/libssl/buildfile b/libssl/libssl/buildfile
index c114ccf..66b275f 100644
--- a/libssl/libssl/buildfile
+++ b/libssl/libssl/buildfile
@@ -3,7 +3,7 @@
import int_libs = libcrypto%lib{crypto}
-lib{ssl}: {h c}{**} def{libssl} $int_libs
+lib{ssl}: {h c}{**} $int_libs
tclass = $c.target.class
tsys = $c.target.system
@@ -11,7 +11,8 @@ tsys = $c.target.system
linux = ($tclass == 'linux')
bsd = ($tclass == 'bsd')
-lib{ssl}: file{libssl.map}: include = ($linux || $bsd ? adhoc : false)
+libs{ssl}: file{libssl.map}: include = ($linux || $bsd ? adhoc : false)
+libs{ssl}: def{libssl}: include = $windows
# Build options.
#
diff --git a/libssl/manifest b/libssl/manifest
index 08ac7ec..5127b19 100644
--- a/libssl/manifest
+++ b/libssl/manifest
@@ -3,13 +3,13 @@ name: libssl
# Note: remember to update doc-url below!
#
-version: 1.1.1+11
-upstream-version: 1.1.1g
+version: 1.1.1+12
+upstream-version: 1.1.1i
project: openssl
priority: security
summary: C library providing SSLv3 and TLS implementations
-license: OpenSSL License, SSLeay License; Copyleft free dual software license.
+license: OpenSSL ; OpenSSL and Original SSLeay Licenses.
topics: C, TLS, SSL, cryptography
description-file: README
url: https://www.openssl.org/