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 - 18 files changed, 7 insertions(+), 21 deletions(-) (limited to 'libcrypto') 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/} -- cgit v1.1