From 2076b09f307ee557b0c8dbd27665625d3c91bf60 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 19:59:37 +0200 Subject: [PATCH 1/8] openssl1: Remove --- openssl1.be0 | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100755 openssl1.be0 diff --git a/openssl1.be0 b/openssl1.be0 deleted file mode 100755 index b0fcff5a1..000000000 --- a/openssl1.be0 +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION openssl1-1.1.1t-0 - -#SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/1cfee919e0eac6be62c88c5ae8bcd91e/openssl-1.1.1t.tar.gz" - -# PATCHURL+=() - -# build_in_sourcedir - -# sourcesubdir_append src - -#mee_extract() { -# bee_extract "${@}" -#} - -mee_patch() { - bee_patch "${@}" - # no html - sed -e '/^install_docs:/ s/install_html_docs//' -i Configurations/unix-Makefile.tmpl - # no func() docs - sed -e 's/podpath=man1:man3:man5:man7/podpath=man1:man5:man7/;s/\[ 1, 3, 5, 7 \]/[ 1, 5, 7 ]/;' -i util/process_docs.pl -} - -mee_configure() { - start_cmd ${S}/config \ - --prefix=${PREFIX} \ - --openssldir=${SYSCONFDIR}/ssl \ - --libdir=lib \ - shared \ - zlib-dynamic -} - -mee_build() { - start_cmd make depend - start_cmd make ${BEE_MAKEFLAGS} - start_cmd make -j1 test -} - -mee_install() { - start_cmd make DESTDIR=${D} MANDIR=${MANDIR} MANSUFFIX=ssl install -} From 6568a2862e71f3723ae9956d546c685eb04a90db Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 19:59:49 +0200 Subject: [PATCH 2/8] openssl_compat111: Add version 1.1.1t --- openssl_compat111.be0 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 openssl_compat111.be0 diff --git a/openssl_compat111.be0 b/openssl_compat111.be0 new file mode 100755 index 000000000..6cb9da6fd --- /dev/null +++ b/openssl_compat111.be0 @@ -0,0 +1,10 @@ +#!/usr/bin/env beesh + +# BEE_VERSION openssl_compat111-1.1.1t-0 + +mee_install() { + cd ${D} + start_cmd tar xpf /src/mariux/beeroot/packages/openssl1-1.1.1t-0.x86_64.bee.tar.bz2 /usr/lib/libssl.so.1.1 + start_cmd tar xpf /src/mariux/beeroot/packages/openssl1-1.1.1t-0.x86_64.bee.tar.bz2 /usr/lib/libcrypto.so.1.1 + start_cmd tar xpf /src/mariux/beeroot/packages/openssl1-1.1.1t-0.x86_64.bee.tar.bz2 /usr/lib/engines-1.1/ +} From 63a4e785e0976c29c8c36d43eb1c8b4d21eea357 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 14:07:11 +0200 Subject: [PATCH 3/8] openssl: Add version 3.1.1 Create bee file with cp openssl1.be0 openssl.be0 and fix version. --- openssl.be0 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 openssl.be0 diff --git a/openssl.be0 b/openssl.be0 new file mode 100755 index 000000000..4a99cccb5 --- /dev/null +++ b/openssl.be0 @@ -0,0 +1,43 @@ +#!/usr/bin/env beesh + +# BEE_VERSION openssl-3.1.1-0 + +SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" +#SRCURL[0]="https://beehive.molgen.mpg.de/1cfee919e0eac6be62c88c5ae8bcd91e/openssl-1.1.1t.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +mee_patch() { + bee_patch "${@}" + # no html + sed -e '/^install_docs:/ s/install_html_docs//' -i Configurations/unix-Makefile.tmpl + # no func() docs + sed -e 's/podpath=man1:man3:man5:man7/podpath=man1:man5:man7/;s/\[ 1, 3, 5, 7 \]/[ 1, 5, 7 ]/;' -i util/process_docs.pl +} + +mee_configure() { + start_cmd ${S}/config \ + --prefix=${PREFIX} \ + --openssldir=${SYSCONFDIR}/ssl \ + --libdir=lib \ + shared \ + zlib-dynamic +} + +mee_build() { + start_cmd make depend + start_cmd make ${BEE_MAKEFLAGS} + start_cmd make -j1 test +} + +mee_install() { + start_cmd make DESTDIR=${D} MANDIR=${MANDIR} MANSUFFIX=ssl install +} From 7f572c7a7f60c25f425b9036787d43b2cf3f8c28 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 18:09:22 +0200 Subject: [PATCH 4/8] openssl: use Configure Configure is recommended in INSTALL and config is just a wrapper for Configure. So use it directly. --- openssl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl.be0 b/openssl.be0 index 4a99cccb5..93fae4bf6 100755 --- a/openssl.be0 +++ b/openssl.be0 @@ -24,7 +24,7 @@ mee_patch() { } mee_configure() { - start_cmd ${S}/config \ + start_cmd ${S}/Configure \ --prefix=${PREFIX} \ --openssldir=${SYSCONFDIR}/ssl \ --libdir=lib \ From 8ef2ee90663530355ed80b4387cc2fde4ef16e30 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 19:23:25 +0200 Subject: [PATCH 5/8] openssl: Remove "make depend" An explicit "make depend" is not required, ro remove it. --- openssl.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/openssl.be0 b/openssl.be0 index 93fae4bf6..cf982d1a5 100755 --- a/openssl.be0 +++ b/openssl.be0 @@ -33,7 +33,6 @@ mee_configure() { } mee_build() { - start_cmd make depend start_cmd make ${BEE_MAKEFLAGS} start_cmd make -j1 test } From 1303b4ca56c45915f190972870c9f98fe1b149d4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 14:09:33 +0200 Subject: [PATCH 6/8] openssl: Replace patches with make options The patches no longer work: sed: can't read util/process_docs.pl: No such file or directory Remove and use make options to the same effect. --- openssl.be0 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/openssl.be0 b/openssl.be0 index cf982d1a5..daa066f8e 100755 --- a/openssl.be0 +++ b/openssl.be0 @@ -15,13 +15,11 @@ SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" # bee_extract "${@}" #} -mee_patch() { - bee_patch "${@}" - # no html - sed -e '/^install_docs:/ s/install_html_docs//' -i Configurations/unix-Makefile.tmpl - # no func() docs - sed -e 's/podpath=man1:man3:man5:man7/podpath=man1:man5:man7/;s/\[ 1, 3, 5, 7 \]/[ 1, 5, 7 ]/;' -i util/process_docs.pl -} +#mee_patch() { +# bee_patch "${@}" +#} + +export BEE_MAKEFLAGS="MANDOCS3= $BEE_MAKEFLAGS" mee_configure() { start_cmd ${S}/Configure \ @@ -34,9 +32,9 @@ mee_configure() { mee_build() { start_cmd make ${BEE_MAKEFLAGS} - start_cmd make -j1 test + start_cmd make ${BEE_MAKEFLAGS} test } mee_install() { - start_cmd make DESTDIR=${D} MANDIR=${MANDIR} MANSUFFIX=ssl install + start_cmd make ${BEE_MAKEFLAGS} DESTDIR=${D} MANSUFFIX=ssl install_sw install_ssldirs install_man_docs } From 50ef4f659d794da6cebf1f51899f1bd4935c80ae Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 19:28:25 +0200 Subject: [PATCH 7/8] openssl: Remove section 7 manpages --- openssl.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl.be0 b/openssl.be0 index daa066f8e..c5f6d0d6c 100755 --- a/openssl.be0 +++ b/openssl.be0 @@ -19,7 +19,7 @@ SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" # bee_patch "${@}" #} -export BEE_MAKEFLAGS="MANDOCS3= $BEE_MAKEFLAGS" +export BEE_MAKEFLAGS="MANDOCS3= MANDOCS7= $BEE_MAKEFLAGS" mee_configure() { start_cmd ${S}/Configure \ From 9bb75d3ddae483ea1777310ed95f1bfbd6990b77 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 21 Jul 2023 20:09:25 +0200 Subject: [PATCH 8/8] openssl: Fix srcurl --- openssl.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openssl.be0 b/openssl.be0 index c5f6d0d6c..d74440998 100755 --- a/openssl.be0 +++ b/openssl.be0 @@ -2,8 +2,8 @@ # BEE_VERSION openssl-3.1.1-0 -SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" -#SRCURL[0]="https://beehive.molgen.mpg.de/1cfee919e0eac6be62c88c5ae8bcd91e/openssl-1.1.1t.tar.gz" +#SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/1864b75e31fb4a6e0a07fd832529add3/openssl-3.1.1.tar.gz" # PATCHURL+=()