diff options
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/build/bootstrap.build | 1 | ||||
| -rw-r--r-- | openssl/build/export.build | 1 | ||||
| -rw-r--r-- | openssl/build/root.build | 1 | ||||
| -rw-r--r-- | openssl/buildfile | 1 | ||||
| -rw-r--r-- | openssl/manifest | 2 | ||||
| -rw-r--r-- | openssl/openssl/buildfile | 5 | ||||
| -rw-r--r-- | openssl/tests/build/bootstrap.build | 1 | ||||
| -rw-r--r-- | openssl/tests/build/root.build | 1 | ||||
| -rw-r--r-- | openssl/tests/buildfile | 1 | ||||
| -rw-r--r-- | openssl/tests/encryption.testscript | 1 | ||||
| -rw-r--r-- | openssl/tests/rsa.testscript | 1 | ||||
| -rw-r--r-- | openssl/tests/version.testscript | 1 |
12 files changed, 3 insertions, 14 deletions
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 <<EOI >=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%" |