From bcfeb2406519c3330a57ffb88adfa8b358ca1b45 Mon Sep 17 00:00:00 2001 From: Henry Hu Date: Tue, 4 Jul 2023 22:40:17 +0000 Subject: devel/poco: Update to 1.12.4 Full Changelog: https://github.com/pocoproject/poco/blob/poco-1.12.4/CHANGELOG PR: 272371 --- .../files/patch-Crypto_src_OpenSSLInitializer.cpp | 10 +++++ .../files/patch-Foundation_src_Thread__POSIX.cpp | 49 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp create mode 100644 devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp (limited to 'devel/poco/files') diff --git a/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp b/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp new file mode 100644 index 000000000000..3f132d50e507 --- /dev/null +++ b/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp @@ -0,0 +1,10 @@ +--- Crypto/src/OpenSSLInitializer.cpp.orig 2023-07-04 22:23:04 UTC ++++ Crypto/src/OpenSSLInitializer.cpp +@@ -137,7 +137,6 @@ void OpenSSLInitializer::initialize() + if (!_legacyProvider) + { + _legacyProvider = OSSL_PROVIDER_load(NULL, "legacy"); +- if (!_legacyProvider) throw CryptoException("Failed to load OpenSSL legacy provider"); + } + #endif + } diff --git a/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp b/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp new file mode 100644 index 000000000000..90dac0edb172 --- /dev/null +++ b/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp @@ -0,0 +1,49 @@ +--- Foundation/src/Thread_POSIX.cpp.orig 2022-10-31 17:44:32 UTC ++++ Foundation/src/Thread_POSIX.cpp +@@ -19,6 +19,13 @@ + #include "Poco/Timespan.h" + #include "Poco/Timestamp.h" + #include ++ ++#if POCO_OS == POCO_OS_FREE_BSD ++# include ++# include ++# include ++#endif ++ + #if defined(__sun) && defined(__SVR4) + # if !defined(__EXTENSIONS__) + # define __EXTENSIONS__ +@@ -65,7 +72,10 @@ void setThreadName(pthread_t thread, const std::string + namespace { + void setThreadName(pthread_t thread, const std::string& threadName) + { +-#if (POCO_OS == POCO_OS_MAC_OS_X) ++#if POCO_OS == POCO_OS_FREE_BSD && __FreeBSD_version < 1300000 ++ pthread_set_name_np(pthread_self(), threadName.c_str()); ++ return; ++#elif (POCO_OS == POCO_OS_MAC_OS_X) + pthread_setname_np(threadName.c_str()); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2) + #else + if (pthread_setname_np(thread, threadName.c_str()) == ERANGE && threadName.size() > 15) +@@ -273,11 +283,17 @@ long ThreadImpl::currentOsTidImpl() + long ThreadImpl::currentOsTidImpl() + { + #if POCO_OS == POCO_OS_LINUX +- return ::syscall(SYS_gettid); ++ return ::syscall(SYS_gettid); + #elif POCO_OS == POCO_OS_MAC_OS_X +- return ::pthread_mach_thread_np(::pthread_self()); ++ return ::pthread_mach_thread_np(::pthread_self()); ++#elif POCO_OS == POCO_OS_FREE_BSD ++ long id; ++ if(thr_self(&id) < 0) { ++ return 0; ++ } ++ return id; + #else +- return ::pthread_self(); ++ return ::pthread_self(); + #endif + } + -- cgit v1.2.3