From f5682b7aa1363e2975e9b128fce6f5a66d033d23 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Nov 2019 15:43:57 +0100 Subject: [PATCH 1/3] openssl1: Update version from 1.1.1c to 1.1.1d https://www.openssl.org/news/secadv/20190910.txt --- openssl1.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl1.be0 b/openssl1.be0 index a3c26dfd1..249cf440b 100755 --- a/openssl1.be0 +++ b/openssl1.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION openssl1-1.1.1c-0 +# BEE_VERSION openssl1-1.1.1d-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 15b54ec144c5911b43ec326a1684bcc18ddae56c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Nov 2019 16:09:55 +0100 Subject: [PATCH 2/3] openssl1: Delete commented out lines --- openssl1.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openssl1.be0 b/openssl1.be0 index 249cf440b..7c30aba15 100755 --- a/openssl1.be0 +++ b/openssl1.be0 @@ -15,8 +15,7 @@ SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/openssl-1.0.1f-fix_parallel_build-1.patch) -# PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/openssl-1.0.1f-fix_pod_syntax-1.patch) +# PATCHURL+=() ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 2263c68e855081a75a493eff70b8ee67ab8f6445 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Nov 2019 16:10:03 +0100 Subject: [PATCH 3/3] openssl1: Properly handle BIO_CTRL_PENDING and BIO_CTRL_WPENDING calls The test suite turns out to be useful, and [bugs][1] are found. Apply the patch fixing this issue. git format-patch -1 86ed78676c660b553696cc10c682962522dfeb6c [1]: https://github.com/openssl/openssl/issues/9866 --- openssl1.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl1.be0 b/openssl1.be0 index 7c30aba15..7e9429b9d 100755 --- a/openssl1.be0 +++ b/openssl1.be0 @@ -15,7 +15,7 @@ SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +PATCHURL+=(/src/mariux/patches/0001-BIO_f_zlib-Properly-handle-BIO_CTRL_PENDING-and-BIO_.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not