From 47c51f194993332b7022e9a8705546f0f3c0b669 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Wed, 3 Nov 2021 17:32:09 +0100 Subject: [PATCH] openssl: fix SRCURL and docs - cleanup - fixed SRCURL - prevent installing of html and man3: -= 7.824 files - sporadic test fail issue: github.com/opensssl/openssl/issues/4688 --- openssl1.be0 | 68 ++++++++-------------------------------------------- 1 file changed, 10 insertions(+), 58 deletions(-) diff --git a/openssl1.be0 b/openssl1.be0 index a6e3ca7e2..f59062893 100755 --- a/openssl1.be0 +++ b/openssl1.be0 @@ -1,57 +1,27 @@ #!/usr/bin/env beesh -# BEE_VERSION openssl1-1.1.1k-0 +# BEE_VERSION openssl1-1.1.1k-1 -## 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.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - -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. +# SRCURL[0]="https://www.openssl.org/source/openssl-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/c4e7d95f782b08116afa27b30393dd27/openssl-1.1.1k.tar.gz" # PATCHURL+=() -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - # build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +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 \ @@ -71,21 +41,3 @@ mee_build() { mee_install() { start_cmd make DESTDIR=${D} MANDIR=${MANDIR} MANSUFFIX=ssl install } - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0]="" is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -##