From 261f11bd72bba5884b1875fefe99a1a280a50fc1 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: May 01 2025 10:19:46 +0000 Subject: groups.d/251.native_packages_lib.d/libressl.package: bump to v4.1.0 Signed-off-by: Ørjan Malde --- diff --git a/groups.d/251.native_packages_lib.d/libressl.package b/groups.d/251.native_packages_lib.d/libressl.package index 92b42a2..6239cce 100644 --- a/groups.d/251.native_packages_lib.d/libressl.package +++ b/groups.d/251.native_packages_lib.d/libressl.package @@ -1,5 +1,5 @@ -: ${PKG_LIBRESSL_SHA256SUM:=4d841955f0acc3dfc71d0e3dd35f283af461222350e26843fea9731c0246a1e4}; -: ${PKG_LIBRESSL_VERSION:=4.0.0}; +: ${PKG_LIBRESSL_SHA256SUM:=0f71c16bd34bdaaccdcb96a5d94a4921bfb612ec6e0eba7a80d8854eefd8bb61}; +: ${PKG_LIBRESSL_VERSION:=4.1.0}; : ${PKG_LIBRESSL_URL:=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz}; : ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc}; diff --git a/patches/libressl-4.0.0.local.patch b/patches/libressl-4.0.0.local.patch deleted file mode 100644 index 11e45d1..0000000 --- a/patches/libressl-4.0.0.local.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru libressl-3.7.1.orig/crypto/compat/arc4random_linux.h libressl-3.7.1/crypto/compat/arc4random_linux.h ---- libressl-3.7.1.orig/crypto/compat/arc4random_linux.h 2023-05-14 00:44:53.716886970 +0200 -+++ libressl-3.7.1/crypto/compat/arc4random_linux.h 2023-05-14 00:44:32.052886839 +0200 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; - #define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -@@ -43,6 +44,7 @@ - static inline void - _getentropy_fail(void) - { -+ fprintf(stderr, "rebuild psxscl with devurandom patch\n"); - raise(SIGKILL); - } - diff --git a/patches/libressl-4.1.0.local.patch b/patches/libressl-4.1.0.local.patch new file mode 100644 index 0000000..11e45d1 --- /dev/null +++ b/patches/libressl-4.1.0.local.patch @@ -0,0 +1,19 @@ +diff -ru libressl-3.7.1.orig/crypto/compat/arc4random_linux.h libressl-3.7.1/crypto/compat/arc4random_linux.h +--- libressl-3.7.1.orig/crypto/compat/arc4random_linux.h 2023-05-14 00:44:53.716886970 +0200 ++++ libressl-3.7.1/crypto/compat/arc4random_linux.h 2023-05-14 00:44:32.052886839 +0200 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; + #define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) +@@ -43,6 +44,7 @@ + static inline void + _getentropy_fail(void) + { ++ fprintf(stderr, "rebuild psxscl with devurandom patch\n"); + raise(SIGKILL); + } + diff --git a/vars.dist/dist_minipix.vars b/vars.dist/dist_minipix.vars index 28927f0..c462c06 100644 --- a/vars.dist/dist_minipix.vars +++ b/vars.dist/dist_minipix.vars @@ -18,7 +18,7 @@ \ +%[_native]/lib/libassuan.so.0=%[_minipix]/bin/libassuan.so.0 \ +%[_native]/lib/libbz2.so.1=%[_minipix]/bin/libbz2.so.1 \ - +%[_native]/lib/libcrypto.so.55=%[_minipix]/bin/libcrypto.so.55 \ + +%[_native]/lib/libcrypto.so.56=%[_minipix]/bin/libcrypto.so.56 \ +%[_native]/lib/libc.so=%[_minipix]/bin/libc.so \ +%[_native]/lib/libcurl.so.4=%[_minipix]/bin/libcurl.so.4 \ +%[_native]/lib/libexpat.so.1=%[_minipix]/bin/libexpat.so.1 \ @@ -43,7 +43,7 @@ +%[_native]/lib/libpsxscl.so=%[_minipix]/bin/libpsxscl.so \ +%[_native]/lib/libpython2.7.so.1=%[_minipix]/bin/libpython2.7.so.1 \ +%[_native]/lib/libreadline.so.8=%[_minipix]/bin/libreadline.so.8 \ - +%[_native]/lib/libssl.so.58=%[_minipix]/bin/libssl.so.58 \ + +%[_native]/lib/libssl.so.59=%[_minipix]/bin/libssl.so.59 \ +%[_native]/lib/libtasn1.so.6=%[_minipix]/bin/libtasn1.so.6 \ +%[_native]/lib/libtinfo.so.6=%[_minipix]/bin/libtinfo.so.6 \ +%[_native]/lib/libtinfow.so.6=%[_minipix]/bin/libtinfow.so.6 \