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 --- libcrypto/build/bootstrap.build | 1 - libcrypto/build/export.build | 1 - libcrypto/build/root.build | 1 - libcrypto/buildfile | 1 - libcrypto/libcrypto/buildfile | 10 ++++++---- libcrypto/libcrypto/buildinf-body.h.in | 1 - libcrypto/libcrypto/downstream/internal/bn_conf.h | 1 - libcrypto/libcrypto/downstream/internal/buildinf.h | 1 - libcrypto/libcrypto/downstream/internal/dso_conf.h | 1 - libcrypto/libcrypto/downstream/internal/platform.h | 1 - libcrypto/libcrypto/downstream/openssl/opensslconf.h | 1 - libcrypto/manifest | 2 +- libcrypto/tests/basic/buildfile | 1 - libcrypto/tests/basic/driver.c | 1 - libcrypto/tests/basic/testscript | 1 - libcrypto/tests/build/bootstrap.build | 1 - libcrypto/tests/build/root.build | 1 - libcrypto/tests/buildfile | 1 - 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 - openssl/build/bootstrap.build | 1 - openssl/build/export.build | 1 - openssl/build/root.build | 1 - openssl/buildfile | 1 - openssl/manifest | 2 +- openssl/openssl/buildfile | 5 ++--- openssl/tests/build/bootstrap.build | 1 - openssl/tests/build/root.build | 1 - openssl/tests/buildfile | 1 - openssl/tests/encryption.testscript | 1 - openssl/tests/rsa.testscript | 1 - openssl/tests/version.testscript | 1 - 42 files changed, 19 insertions(+), 50 deletions(-) diff --git a/libcrypto/build/bootstrap.build b/libcrypto/build/bootstrap.build index 573b72d..7e94071 100644 --- a/libcrypto/build/bootstrap.build +++ b/libcrypto/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 = libcrypto diff --git a/libcrypto/build/export.build b/libcrypto/build/export.build index 2f9226f..bce1762 100644 --- a/libcrypto/build/export.build +++ b/libcrypto/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/libcrypto/build/root.build b/libcrypto/build/root.build index 0b6d720..00df026 100644 --- a/libcrypto/build/root.build +++ b/libcrypto/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 in diff --git a/libcrypto/buildfile b/libcrypto/buildfile index 4c31f89..bd8c0ea 100644 --- a/libcrypto/buildfile +++ b/libcrypto/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/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile index 0b794ac..b5be1e2 100644 --- a/libcrypto/libcrypto/buildfile +++ b/libcrypto/libcrypto/buildfile @@ -1,5 +1,4 @@ # file : libcrypto/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file import imp_libs = libz%lib{z} @@ -22,7 +21,6 @@ lib{crypto}: {h }{** -buildinf-body} \ -poly1305/poly1305_base2_44} \ { def}{libcrypto} \ crypto/{file}{LPdir_*.c des/ncbc_enc.c} \ - {file}{libcrypto.map} \ $imp_libs # Symlinked where appropriate. @@ -34,8 +32,12 @@ tsys = $c.target.system i686 = ($c.target.cpu == 'i686') +linux = ($tclass == 'linux') +bsd = ($tclass == 'bsd') windows = ($tclass == 'windows') +lib{crypto}: file{libcrypto.map}: include = ($linux || $bsd ? adhoc : false) + # Build options. # # Drop -DOPENSSL_PIC and -D{L|B}_ENDIAN preprocessor options and define @@ -49,8 +51,8 @@ windows = ($tclass == 'windows') # c.poptions += -DLIBCRYPTO_BUILD -DZLIB -# 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/libcrypto/libcrypto/buildinf-body.h.in b/libcrypto/libcrypto/buildinf-body.h.in index b6c8e96..6b37cf3 100644 --- a/libcrypto/libcrypto/buildinf-body.h.in +++ b/libcrypto/libcrypto/buildinf-body.h.in @@ -1,5 +1,4 @@ /* file : libcrypto/buildinf-body.h.in -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf.h b/libcrypto/libcrypto/downstream/internal/bn_conf.h index 4c676d6..bdbf8bc 100644 --- a/libcrypto/libcrypto/downstream/internal/bn_conf.h +++ b/libcrypto/libcrypto/downstream/internal/bn_conf.h @@ -1,5 +1,4 @@ /* file : libcrypto/downstream/internal/bn_conf.h -*- C -*- - * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libcrypto/libcrypto/downstream/internal/buildinf.h b/libcrypto/libcrypto/downstream/internal/buildinf.h index 626305b..cfb656f 100644 --- a/libcrypto/libcrypto/downstream/internal/buildinf.h +++ b/libcrypto/libcrypto/downstream/internal/buildinf.h @@ -1,5 +1,4 @@ /* file : libcrypto/downstream/internal/buildinf.h -*- C -*- - * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf.h b/libcrypto/libcrypto/downstream/internal/dso_conf.h index 1fe74a9..57990e7 100644 --- a/libcrypto/libcrypto/downstream/internal/dso_conf.h +++ b/libcrypto/libcrypto/downstream/internal/dso_conf.h @@ -1,5 +1,4 @@ /* file : libcrypto/downstream/internal/dso_conf.h -*- C -*- - * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libcrypto/libcrypto/downstream/internal/platform.h b/libcrypto/libcrypto/downstream/internal/platform.h index 251c223..e3badb6 100644 --- a/libcrypto/libcrypto/downstream/internal/platform.h +++ b/libcrypto/libcrypto/downstream/internal/platform.h @@ -1,5 +1,4 @@ /* file : libcrypto/downstream/internal/platform.h -*- C -*- - * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf.h b/libcrypto/libcrypto/downstream/openssl/opensslconf.h index 810306b..e9eb1cb 100644 --- a/libcrypto/libcrypto/downstream/openssl/opensslconf.h +++ b/libcrypto/libcrypto/downstream/openssl/opensslconf.h @@ -1,5 +1,4 @@ /* file : libcrypto/downstream/openssl/opensslconf.h -*- C -*- - * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd * license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file */ diff --git a/libcrypto/manifest b/libcrypto/manifest index 29a223d..5025852 100644 --- a/libcrypto/manifest +++ b/libcrypto/manifest @@ -3,7 +3,7 @@ name: libcrypto # 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/libcrypto/tests/basic/buildfile b/libcrypto/tests/basic/buildfile index 2f19c4a..460b709 100644 --- a/libcrypto/tests/basic/buildfile +++ b/libcrypto/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 = libcrypto%lib{crypto} diff --git a/libcrypto/tests/basic/driver.c b/libcrypto/tests/basic/driver.c index 2206c22..7b1d394 100644 --- a/libcrypto/tests/basic/driver.c +++ b/libcrypto/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/libcrypto/tests/basic/testscript b/libcrypto/tests/basic/testscript index aa7d09d..7157abf 100644 --- a/libcrypto/tests/basic/testscript +++ b/libcrypto/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 $* >>~"%EOO%" diff --git a/libcrypto/tests/build/bootstrap.build b/libcrypto/tests/build/bootstrap.build index dd525c0..cd952b5 100644 --- a/libcrypto/tests/build/bootstrap.build +++ b/libcrypto/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/libcrypto/tests/build/root.build b/libcrypto/tests/build/root.build index b14a261..3cf01d9 100644 --- a/libcrypto/tests/build/root.build +++ b/libcrypto/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/libcrypto/tests/buildfile b/libcrypto/tests/buildfile index 70330ab..4857518 100644 --- a/libcrypto/tests/buildfile +++ b/libcrypto/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/} 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/} diff --git a/openssl/build/bootstrap.build b/openssl/build/bootstrap.build index 51c3465..b01f823 100644 --- a/openssl/build/bootstrap.build +++ b/openssl/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 = openssl diff --git a/openssl/build/export.build b/openssl/build/export.build index 34b7d3b..8c4d4dd 100644 --- a/openssl/build/export.build +++ b/openssl/build/export.build @@ -1,5 +1,4 @@ # file : build/export.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file $out_root/ diff --git a/openssl/build/root.build b/openssl/build/root.build index e5ca350..fa1cfb3 100644 --- a/openssl/build/root.build +++ b/openssl/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/openssl/buildfile b/openssl/buildfile index 4c31f89..bd8c0ea 100644 --- a/openssl/buildfile +++ b/openssl/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/openssl/manifest b/openssl/manifest index a90ba1e..6dc46d0 100644 --- a/openssl/manifest +++ b/openssl/manifest @@ -3,7 +3,7 @@ name: openssl # Note: remember to update doc-url below! # -version: 1.1.1+9 +version: 1.1.1+10 upstream-version: 1.1.1d priority: security diff --git a/openssl/openssl/buildfile b/openssl/openssl/buildfile index 8cc2107..680c5a9 100644 --- a/openssl/openssl/buildfile +++ b/openssl/openssl/buildfile @@ -1,5 +1,4 @@ # file : openssl/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file import libs = libssl%lib{ssl} @@ -25,8 +24,8 @@ exe{openssl}: apps/c{win32_init}: include = $windows # c.poptions += -DZLIB -# 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/openssl/tests/build/bootstrap.build b/openssl/tests/build/bootstrap.build index dd525c0..cd952b5 100644 --- a/openssl/tests/build/bootstrap.build +++ b/openssl/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/openssl/tests/build/root.build b/openssl/tests/build/root.build index d593d3d..9e85d16 100644 --- a/openssl/tests/build/root.build +++ b/openssl/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 # We need to configure C module to obtain the target information (see below). diff --git a/openssl/tests/buildfile b/openssl/tests/buildfile index 63882e6..c0bd398 100644 --- a/openssl/tests/buildfile +++ b/openssl/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 ./: testscript{*} $openssl diff --git a/openssl/tests/encryption.testscript b/openssl/tests/encryption.testscript index 6326858..5b6d00a 100644 --- a/openssl/tests/encryption.testscript +++ b/openssl/tests/encryption.testscript @@ -1,5 +1,4 @@ # file : tests/encryption.testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file enc = $* aes-256-cbc -e -salt -base64 -md sha256 -pass pass:123 -pbkdf2 diff --git a/openssl/tests/rsa.testscript b/openssl/tests/rsa.testscript index 47f17cb..479d64f 100644 --- a/openssl/tests/rsa.testscript +++ b/openssl/tests/rsa.testscript @@ -1,5 +1,4 @@ # file : tests/rsa.testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file +cat <=openssl.cnf diff --git a/openssl/tests/version.testscript b/openssl/tests/version.testscript index 325ba9b..1267246 100644 --- a/openssl/tests/version.testscript +++ b/openssl/tests/version.testscript @@ -1,5 +1,4 @@ # file : tests/version.testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : OpenSSL and SSLeay Licenses; see accompanying LICENSE file $* version -a >>~"%EOO%" -- cgit v1.1