Mercurial > vanilla
changeset 1246:d39c70366654
crypto/libressl: upgrade to 3.4.1
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Mon, 01 Nov 2021 11:20:11 +0100 |
| parents | 13a4a71c6309 |
| children | 5662d5db841c |
| files | crypto/libressl/libressl.sh crypto/libressl/libressl.sha1 crypto/libressl/patch-musl.patch |
| diffstat | 3 files changed, 8 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/crypto/libressl/libressl.sh Mon Nov 01 10:34:45 2021 +0100 +++ b/crypto/libressl/libressl.sh Mon Nov 01 11:20:11 2021 +0100 @@ -16,12 +16,13 @@ # PKGNAME=libressl -PKGVERSION=2.9.2 +PKGVERSION=3.4.1 PKGREVISION=1 PKGLICENSE="CUSTOM" PKGSUMMARY="OpenSSL fork from OpenBSD" -PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz" +PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$PKGNAME-$PKGVERSION.tar.gz" PKGDEPENDS="cmake:build" +PKGPRESERVE="lib/libcrypto.so.47.0.0 lib/libssl.so.50.0.0 lib/libtls.so.22" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -29,20 +30,17 @@ build() { rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.gz + tar -xvf $PKGNAME-$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION - patch -p0 < ../patch-musl.patch - mkdir build && cd build - cmake .. \ + cmake -S . -B build \ -DBUILD_SHARED_LIBS=On \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_INSTALL_PREFIX= - make - make install DESTDIR=$DESTDIR - cd .. + cmake --build build + DESTDIR=$DESTDIR cmake --build build --target install cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/crypto/libressl/libressl.sha1 Mon Nov 01 10:34:45 2021 +0100 +++ b/crypto/libressl/libressl.sha1 Mon Nov 01 11:20:11 2021 +0100 @@ -1,1 +1,1 @@ -8a2dbb11247de9d167c58633197fd4940fff697f libressl-2.9.2.tar.gz +8f7226a420103e59b28fbaf0a4cb868d83f60201 libressl-3.4.1.tar.gz
--- a/crypto/libressl/patch-musl.patch Mon Nov 01 10:34:45 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -From a747aacc23607c993cc481378782b2c7dd5bc53b Mon Sep 17 00:00:00 2001 -From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com> -Date: Tue, 21 May 2019 22:41:05 +0900 -Subject: [PATCH 1/4] avoid glibc - -cause problems on musl systems ---- - crypto/compat/getprogname_linux.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c -index 2c89743..4e7e31f 100644 ---- crypto/compat/getprogname_linux.c -+++ crypto/compat/getprogname_linux.c -@@ -26,9 +26,7 @@ getprogname(void) - #if defined(__ANDROID_API__) && __ANDROID_API__ < 21 - extern const char *__progname; - return __progname; --#elif defined(__GLIBC__) -- return program_invocation_short_name; - #else --#error "Cannot emulate getprogname" -+ return program_invocation_short_name; - #endif - } --- -2.21.0 -