From 30287d97a159d74965c87e2f1ffb82c3b99ffdf2 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 15 Feb 2020 00:44:27 +0300 Subject: Release version 1.1.1+10 Drop copyright notice from source code Use adhoc value for {libcrypto,libssl}.map prerequisite-specific variable include --- libssl/build/bootstrap.build | 1 - libssl/build/export.build | 1 - libssl/build/root.build | 1 - libssl/buildfile | 1 - libssl/libssl/buildfile | 12 ++++++++---- libssl/manifest | 2 +- libssl/tests/basic/buildfile | 1 - libssl/tests/basic/driver.c | 1 - libssl/tests/basic/testscript | 1 - libssl/tests/build/bootstrap.build | 1 - libssl/tests/build/root.build | 1 - libssl/tests/buildfile | 1 - 12 files changed, 9 insertions(+), 15 deletions(-) (limited to 'libssl') diff --git a/libssl/build/bootstrap.build b/libssl/build/bootstrap.build index 4f383bf..4c95e4c 100644 --- a/libssl/build/bootstrap.build +++ b/libssl/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file project = libssl diff --git a/libssl/build/export.build b/libssl/build/export.build index f1e1ae5..f1a0397 100644 --- a/libssl/build/export.build +++ b/libssl/build/export.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file $out_root/ diff --git a/libssl/build/root.build b/libssl/build/root.build index e5ca350..fa1cfb3 100644 --- a/libssl/build/root.build +++ b/libssl/build/root.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file using c diff --git a/libssl/buildfile b/libssl/buildfile index 4c31f89..bd8c0ea 100644 --- a/libssl/buildfile +++ b/libssl/buildfile @@ -1,5 +1,4 @@ # file : buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file ./: {*/ -build/} doc{LICENSE INSTALL README} manifest diff --git a/libssl/libssl/buildfile b/libssl/libssl/buildfile index 7be45fe..c114ccf 100644 --- a/libssl/libssl/buildfile +++ b/libssl/libssl/buildfile @@ -1,14 +1,18 @@ # file : libssl/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file import int_libs = libcrypto%lib{crypto} -lib{ssl}: {h c}{**} def{libssl} file{libssl.map} $int_libs +lib{ssl}: {h c}{**} def{libssl} $int_libs tclass = $c.target.class tsys = $c.target.system +linux = ($tclass == 'linux') +bsd = ($tclass == 'bsd') + +lib{ssl}: file{libssl.map}: include = ($linux || $bsd ? adhoc : false) + # Build options. # # Note that libssl doesn't use zlib directly. However, it may use @@ -23,8 +27,8 @@ c.poptions += -DZLIB # Drop -DOPENSSL_PIC, -D{L|B}_ENDIAN, -DOPENSSLDIR and -DENGINESDIR as they # are not used in the libssl source code nor in the libcrypto public headers. # -# Note that the upstream package uses -pthread compiler/linker option on -# Linux and FreeBSD. The option is currently unsupported by build2, so we use +# Note that the upstream package uses the -pthread compiler/linker option on +# Linux and FreeBSD. The option is unsupported by build2 so we pass # -D_REENTRANT and -lpthread preprocessor/linker options instead. # # Also note that on FreeBSD and Mac OS the upstream package also passes diff --git a/libssl/manifest b/libssl/manifest index f685ac7..5bf4ab7 100644 --- a/libssl/manifest +++ b/libssl/manifest @@ -3,7 +3,7 @@ name: libssl # Note: remember to update doc-url below! # -version: 1.1.1+9 +version: 1.1.1+10 upstream-version: 1.1.1d project: openssl diff --git a/libssl/tests/basic/buildfile b/libssl/tests/basic/buildfile index b010198..0b9f5bd 100644 --- a/libssl/tests/basic/buildfile +++ b/libssl/tests/basic/buildfile @@ -1,5 +1,4 @@ # file : tests/basic/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file import libs = libssl%lib{ssl} diff --git a/libssl/tests/basic/driver.c b/libssl/tests/basic/driver.c index 8f526e6..825ceb0 100644 --- a/libssl/tests/basic/driver.c +++ b/libssl/tests/basic/driver.c @@ -1,5 +1,4 @@ /* file : tests/basic/driver.c - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libssl/tests/basic/testscript b/libssl/tests/basic/testscript index f5c8595..87b3938 100644 --- a/libssl/tests/basic/testscript +++ b/libssl/tests/basic/testscript @@ -1,5 +1,4 @@ # file : tests/basic/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file $* diff --git a/libssl/tests/build/bootstrap.build b/libssl/tests/build/bootstrap.build index dd525c0..cd952b5 100644 --- a/libssl/tests/build/bootstrap.build +++ b/libssl/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file project = # Unnamed tests subproject. diff --git a/libssl/tests/build/root.build b/libssl/tests/build/root.build index b14a261..3cf01d9 100644 --- a/libssl/tests/build/root.build +++ b/libssl/tests/build/root.build @@ -1,5 +1,4 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file using c diff --git a/libssl/tests/buildfile b/libssl/tests/buildfile index 70330ab..4857518 100644 --- a/libssl/tests/buildfile +++ b/libssl/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file ./: {*/ -build/} -- cgit v1.1