From 7de61ef289dc2347431ea12a5b2cee078786db20 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 22 Jun 2019 16:40:13 +0300 Subject: Release version 1.1.1+3 Bump toolchain version dependency to 0.11.0 in manifest. Switch to topics from tags in manifest. Add upstream-version value to manifest. Disable 'object file does not define any public symbols' lib.exe warning. --- libcrypto/build/bootstrap.build | 3 +-- libcrypto/libcrypto/buildfile | 10 ++++++---- libcrypto/manifest | 13 +++++++------ libssl/manifest | 13 +++++++------ openssl/manifest | 13 +++++++------ 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/libcrypto/build/bootstrap.build b/libcrypto/build/bootstrap.build index 12b55b2..573b72d 100644 --- a/libcrypto/build/bootstrap.build +++ b/libcrypto/build/bootstrap.build @@ -24,8 +24,7 @@ using dist # version. Not to mess with such a version, it seems reasonable for us to # start with 1.1.1-a.0.z, release as 1.1.1 and, if required, followup with # revisions, even for further letter-based upstream patches (that contain -# nothing more than just fixes). We also mention the "lettered" release in -# the package summary for information. +# nothing more than just fixes). # # There is no way to deduce the ABI version from the release version, so we # obtain it from the SHLIB_VERSION_NUMBER macro definition in diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile index 62045a7..0af8b7c 100644 --- a/libcrypto/libcrypto/buildfile +++ b/libcrypto/libcrypto/buildfile @@ -216,12 +216,14 @@ else '(.+)', \ $msvc ? '\1.lib' : '-l\1') - # @@ To suppress the 'object file does not define any public symbols' - # warning we also need to pass /ignore:4221 option to lib.exe. Currently - # there is no way to do this. - # if $msvc + { + # Suppress the 'object file does not define any public symbols' warning. + # + c.aoptions += /ignore:4221 + c.libs += advapi32.lib + } } # Export options. diff --git a/libcrypto/manifest b/libcrypto/manifest index 18ef7a4..86a2037 100644 --- a/libcrypto/manifest +++ b/libcrypto/manifest @@ -1,14 +1,15 @@ : 1 name: libcrypto -# Note: remember to update summary and doc-url below! +# Note: remember to update doc-url below! # -version: 1.1.1+2 +version: 1.1.1+3 +upstream-version: 1.1.1a project: openssl -summary: C library providing general cryptography and X.509 support, version 1.1.1a +summary: C library providing general cryptography and X.509 support license: OpenSSL License, SSLeay License; Copyleft free dual software license. -tags: x.509, cryptography, library, c, api, interface +topics: C, x.509, cryptography description-file: README url: https://www.openssl.org/ doc-url: https://www.openssl.org/docs/man1.1.1/man3/ @@ -18,5 +19,5 @@ email: openssl-users@openssl.org ; Mailing list. package-email: packaging@build2.org ; Mailing list. build-error-email: builds@build2.org builds: all -depends: * build2 >= 0.10.0- -depends: * bpkg >= 0.10.0- +depends: * build2 >= 0.11.0 +depends: * bpkg >= 0.11.0 diff --git a/libssl/manifest b/libssl/manifest index 0a7c9c7..9429501 100644 --- a/libssl/manifest +++ b/libssl/manifest @@ -1,14 +1,15 @@ : 1 name: libssl -# Note: remember to update summary and doc-url below! +# Note: remember to update doc-url below! # -version: 1.1.1+2 +version: 1.1.1+3 +upstream-version: 1.1.1a project: openssl -summary: C library providing SSLv3 and TLS implementations, version 1.1.1a +summary: C library providing SSLv3 and TLS implementations license: OpenSSL License, SSLeay License; Copyleft free dual software license. -tags: SSLv3, TLS, cryptography, library, c, api, interface +topics: C, TLS, SSL, cryptography description-file: README url: https://www.openssl.org/ doc-url: https://www.openssl.org/docs/man1.1.1/man3/ @@ -18,6 +19,6 @@ email: openssl-users@openssl.org ; Mailing list. package-email: packaging@build2.org ; Mailing list. build-error-email: builds@build2.org builds: all -depends: * build2 >= 0.10.0- -depends: * bpkg >= 0.10.0- +depends: * build2 >= 0.11.0 +depends: * bpkg >= 0.11.0 depends: libcrypto == $ diff --git a/openssl/manifest b/openssl/manifest index ffb7296..5c8b6ba 100644 --- a/openssl/manifest +++ b/openssl/manifest @@ -1,13 +1,14 @@ : 1 name: openssl -# Note: remember to update summary and doc-url below! +# Note: remember to update doc-url below! # -version: 1.1.1+2 +version: 1.1.1+3 +upstream-version: 1.1.1a -summary: Command line tool providing various cryptography functions, version 1.1.1a +summary: Command line tool providing various cryptography functions license: OpenSSL License, SSLeay License; Copyleft free dual software license. -tags: SSLv3, SSL, TLS, x.509, cryptography, command, line, tool +topics: x.509, TLS, SSL, cryptography description-file: README url: https://www.openssl.org/ doc-url: https://www.openssl.org/docs/man1.1.1/man3/ @@ -17,7 +18,7 @@ email: openssl-users@openssl.org ; Mailing list. package-email: packaging@build2.org ; Mailing list. build-error-email: builds@build2.org builds: all -depends: * build2 >= 0.10.0- -depends: * bpkg >= 0.10.0- +depends: * build2 >= 0.11.0 +depends: * bpkg >= 0.11.0 depends: libcrypto == $ depends: libssl == $ -- cgit v1.1