wolfssl, bump version (#11566)

dev-libs/wolfssl/patches/wolfssl-5.6.3.patch

@@ -1,74 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 26e7a75..cdc005a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8726,7 +8726,7 @@ echo "" >> $OPTION_FILE
- # check for supported command to trim option with
- if colrm >/dev/null 2>&1 </dev/null; then
-     TRIM="colrm 3"
--elif cut >/dev/null 2>&1 </dev/null; then
-+elif cut --version >/dev/null 2>&1 </dev/null; then
-     TRIM="cut -c1-2"
- else
-     AC_MSG_ERROR([Could not find colrm or cut to make options file])
-diff --git a/src/ssl.c b/src/ssl.c
-index fb8ee5c..fa20aef 100644
---- a/src/ssl.c
-+++ b/src/ssl.c
-@@ -14404,7 +14404,7 @@ int wolfSSL_Cleanup(void)
-         SessionCache[i].lock_valid = 0;
-     }
-     #else
--    if ((session_lock_valid == 1) && (wc_UnLockRwLock(&session_lock) != 0)) {
-+    if ((session_lock_valid == 1) && (wc_FreeRwLock(&session_lock) != 0)) {
-         if (ret == WOLFSSL_SUCCESS)
-             ret = BAD_MUTEX_E;
-     }
-diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c
-index f80c9c6..9d2aa86 100644
---- a/wolfcrypt/src/misc.c
-+++ b/wolfcrypt/src/misc.c
-@@ -397,11 +397,13 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b,
-     #if defined(HAVE_FIPS) && !defined(min) /* so ifdef check passes */
-         #define min min
-     #endif
-+    #if defined(HAVE_FIPS) || !defined(min)
-     /* returns the smaller of a and b */
-     WC_MISC_STATIC WC_INLINE word32 min(word32 a, word32 b)
-     {
-         return a > b ? b : a;
-     }
-+    #endif
- #endif /* !WOLFSSL_HAVE_MIN */
- 
- #ifndef WOLFSSL_HAVE_MAX
-@@ -409,10 +411,12 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b,
-     #if defined(HAVE_FIPS) && !defined(max) /* so ifdef check passes */
-         #define max max
-     #endif
-+    #if defined(HAVE_FIPS) || !defined(max)
-     WC_MISC_STATIC WC_INLINE word32 max(word32 a, word32 b)
-     {
-         return a > b ? a : b;
-     }
-+    #endif
- #endif /* !WOLFSSL_HAVE_MAX */
- 
- #ifndef WOLFSSL_NO_INT_ENCODE
-diff --git a/wolfssl/test.h b/wolfssl/test.h
-index fff6363..8bdbafc 100644
---- a/wolfssl/test.h
-+++ b/wolfssl/test.h
-@@ -235,10 +235,12 @@
-     #ifdef NO_INLINE
-         #define min no_inline_min
-     #endif
-+    #if defined(NO_INLINE) || !defined(min)
-     static WC_INLINE word32 min(word32 a, word32 b)
-     {
-         return a > b ? b : a;
-     }
-+    #endif
- #endif /* WOLFSSL_HAVE_MIN */
- 
- /* Socket Handling */

dev-libs/wolfssl/patches/wolfssl-5.7.6.patchset

@@ -0,0 +1,36 @@
+From be964392b6d3e03e66e48daab7fc8bcca9e6d927 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Thu, 2 Jan 2025 12:11:27 +0100
+Subject: Fix install paths, link with libnetwork
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d090418..eb451f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2419,6 +2419,9 @@ elseif(APPLE)
+             ${CORE_FOUNDATION_FRAMEWORK}
+             ${SECURITY_FRAMEWORK})
+     endif()
++elseif(HAIKU)
++    # For Haiku link network
++    target_link_libraries(wolfssl PUBLIC network)
+ else()
+     if(WOLFSSL_DH AND NOT WOLFSSL_DH_CONST)
+         # DH requires math (m) library
+@@ -2710,9 +2713,9 @@ if(WOLFSSL_INSTALL)
+     # Install the library
+     install(TARGETS wolfssl
+             EXPORT wolfssl-targets
+-            LIBRARY DESTINATION lib
+-            ARCHIVE DESTINATION lib
+-            RUNTIME DESTINATION bin
++            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+             )
+     # Install the headers
+     install(DIRECTORY ${WOLFSSL_OUTPUT_BASE}/wolfssl/
+-- 
+2.45.2
+

dev-libs/wolfssl/wolfssl-5.7.6.recipe

@@ -4,12 +4,12 @@ lightweight SSL/TLS library written in ANSI C and targeted for embedded, \
 RTOS, and resource-constrained environments - primarily because of its \
 small size, speed, and feature set."
 HOMEPAGE="https://www.wolfssl.com/"
-COPYRIGHT="2006-2023 wolfSSL Inc."
+COPYRIGHT="2006-2024 wolfSSL Inc."
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/wolfSSL/wolfssl/archive/v$portVersion-stable.tar.gz"
-CHECKSUM_SHA256="2e74a397fa797c2902d7467d500de904907666afb4ff80f6464f6efd5afb114a"
-PATCHES="wolfssl-$portVersion.patch"
+CHECKSUM_SHA256="52b1e439e30d1ed8162a16308a8525a862183b67aa30373b11166ecbab000d63"
+PATCHES="wolfssl-$portVersion.patchset"
 SOURCE_FILENAME="wolfssl-$portVersion.tar.gz"
 SOURCE_DIR="wolfssl-$portVersion-stable"
 
@@ -23,12 +23,11 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
  	commandBinDir=$prefix/bin
 fi
 
-libVersion="35.5.1"
+libVersion="43.0.0"
 libVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
 	wolfssl$secondaryArchSuffix = $portVersion
-	cmd:wolfssl_config$commandSuffix
 	lib:libwolfssl$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -47,11 +46,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoreconf
-	cmd:dos2unix
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
@@ -60,28 +56,28 @@ defineDebugInfoPackage wolfssl$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf -vfi
-	#export CPPFLAGS="-DWOLFSSL_HAVE_MIN -DWOLFSSL_HAVE_MAX"
-	runConfigure --omit-dirs binDir ./configure \
-		--bindir="$commandBinDir" \
-		--enable-shared
-	make $jobArgs
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir
+
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
 
-	rm "$libDir"/*.la
-
-	prepareInstalledDevelLib libwolfssl
+	prepareInstalledDevelLib \
+		libwolfssl
 	fixPkgconfig
 
 	packageEntries devel \
-		"$developDir"
+		"$developDir" \
+		"$documentationDir" \
+		"$libDir"/cmake
 }
 
 TEST()
 {
-	make check
+	ctest --test-dir build --output-on-failure
 }