From 1c83a06d1c475d8223c99e6261d82a00a0b7a834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Mon, 11 Mar 2024 10:02:58 +0100 Subject: groups.d/251.native_packages_lib.group: libressl: bump to v3.9.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.group | 4 ++-- patches/libressl-3.7.2.local.patch | 19 ------------------- patches/libressl-3.9.0.local.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 patches/libressl-3.7.2.local.patch create mode 100644 patches/libressl-3.9.0.local.patch diff --git a/groups.d/251.native_packages_lib.group b/groups.d/251.native_packages_lib.group index f50eff57..582dbf43 100644 --- a/groups.d/251.native_packages_lib.group +++ b/groups.d/251.native_packages_lib.group @@ -229,8 +229,8 @@ ac_cv_path_GPGRT_CONFIG=${PREFIX_NATIVE}/bin/gpgrt-config"}; : ${PKG_LIBREDWG_VERSION:=0.13}; : ${PKG_LIBREDWG_URL:=https://ftp.gnu.org/gnu/libredwg/libredwg-${PKG_LIBREDWG_VERSION}.tar.xz}; : ${PKG_LIBREDWG_CONFIGURE_ARGS_EXTRA:="--disable-python --disable-bindings --disable-werror --enable-compile-warnings=yes"}; -: ${PKG_LIBRESSL_SHA256SUM:=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954}; -: ${PKG_LIBRESSL_VERSION:=3.8.2}; +: ${PKG_LIBRESSL_SHA256SUM:=1cc232418498de305e6d5cb80c94a16415c01dcb3cd98f2e8c3a2202091a3420}; +: ${PKG_LIBRESSL_VERSION:=3.9.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}; : ${PKG_LIBSASL2_DEPENDS:="libressl"}; diff --git a/patches/libressl-3.7.2.local.patch b/patches/libressl-3.7.2.local.patch deleted file mode 100644 index 8235cc0c..00000000 --- a/patches/libressl-3.7.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, "Couldn't obtain randomness from getentropy\n"); - raise(SIGKILL); - } - diff --git a/patches/libressl-3.9.0.local.patch b/patches/libressl-3.9.0.local.patch new file mode 100644 index 00000000..8235cc0c --- /dev/null +++ b/patches/libressl-3.9.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, "Couldn't obtain randomness from getentropy\n"); + raise(SIGKILL); + } + -- cgit v1.2.3