From 6619245ef979565bd2c49b577a5507e04da64932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Fri, 18 Oct 2024 08:48:10 +0200 Subject: groups.d/251.native_packages_lib.d/libressl.package: bump to v4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/251.native_packages_lib.d/libressl.package | 4 ++-- patches/libressl-3.9.2.local.patch | 19 ------------------- patches/libressl-4.0.0.local.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 patches/libressl-3.9.2.local.patch create mode 100644 patches/libressl-4.0.0.local.patch diff --git a/groups.d/251.native_packages_lib.d/libressl.package b/groups.d/251.native_packages_lib.d/libressl.package index fc3b9e87..92b42a23 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:=7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97}; -: ${PKG_LIBRESSL_VERSION:=3.9.2}; +: ${PKG_LIBRESSL_SHA256SUM:=4d841955f0acc3dfc71d0e3dd35f283af461222350e26843fea9731c0246a1e4}; +: ${PKG_LIBRESSL_VERSION:=4.0.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-3.9.2.local.patch b/patches/libressl-3.9.2.local.patch deleted file mode 100644 index 11e45d19..00000000 --- a/patches/libressl-3.9.2.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.0.0.local.patch b/patches/libressl-4.0.0.local.patch new file mode 100644 index 00000000..11e45d19 --- /dev/null +++ b/patches/libressl-4.0.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); + } + -- cgit v1.2.3