git: 584922c91461 - main - devel/poco: Update 1.12.4 → 1.13.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 21 Oct 2024 23:42:03 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=584922c9146158a08a4896fe4d2c8e7c134a808d

commit 584922c9146158a08a4896fe4d2c8e7c134a808d
Author:     Henry Hu <henry.hu.sh@gmail.com>
AuthorDate: 2024-10-21 22:40:52 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-10-21 23:40:45 +0000

    devel/poco: Update 1.12.4 → 1.13.3
    
    Changelogs:
    https://github.com/pocoproject/poco/releases/tag/poco-1.12.5-release
    https://github.com/pocoproject/poco/releases/tag/poco-1.12.5p1-release
    https://github.com/pocoproject/poco/releases/tag/poco-1.12.5p2-release
    https://github.com/pocoproject/poco/releases/tag/poco-1.13.0-release
    https://github.com/pocoproject/poco/releases/tag/poco-1.13.1-release
    https://github.com/pocoproject/poco/releases/tag/poco-1.13.2-release
    https://github.com/pocoproject/poco/releases/tag/poco-1.13.3-release
    
    PR:     282219
---
 devel/poco/Makefile                                |  8 +---
 devel/poco/distinfo                                |  6 +--
 .../files/patch-Crypto_src_OpenSSLInitializer.cpp  | 10 -----
 .../patch-Data_ODBC_testsuite_src_SQLExecutor.h    | 42 +++++++++++++++++++
 .../files/patch-Foundation_src_Thread__POSIX.cpp   | 49 ----------------------
 devel/poco/pkg-plist                               | 17 ++++----
 6 files changed, 56 insertions(+), 76 deletions(-)

diff --git a/devel/poco/Makefile b/devel/poco/Makefile
index e5c9e874ce3f..d06c209f2c22 100644
--- a/devel/poco/Makefile
+++ b/devel/poco/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	poco
-DISTVERSION=	1.12.4
+DISTVERSION=	1.13.3
 DISTVERSIONSUFFIX=	-all
 CATEGORIES=	devel net
 MASTER_SITES=	https://pocoproject.org/releases/${PORTNAME}-${PORTVERSION}/
@@ -19,7 +19,7 @@ CPE_VENDOR=	pocoproject
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	POCO_UNBUNDLED
-SHLIB_MAJOR=	94
+SHLIB_MAJOR=	103
 PLIST_SUB=	SHLIB_MAJOR=${SHLIB_MAJOR}
 
 OPTIONS_DEFINE=		ACTIVERECORD ENCODINGS JSON JWT MONGODB PAGECOMPILER \
@@ -83,10 +83,6 @@ post-patch:
 		's|CMAKE_DEBUG_POSTFIX "d"|CMAKE_DEBUG_POSTFIX ""|' \
 		 ${WRKSRC}/cmake/DefinePlatformSpecifc.cmake
 
-# Avoid conflict with archivers/arc
-post-install-ACTIVERECORD-on:
-	@${MV} ${STAGEDIR}${PREFIX}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc-poco
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MACTIVERECORD} || ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MSQLITE} || ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
diff --git a/devel/poco/distinfo b/devel/poco/distinfo
index 0dab3faf4856..fce066003da7 100644
--- a/devel/poco/distinfo
+++ b/devel/poco/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688499287
-SHA256 (poco-1.12.4-all.tar.bz2) = 4e6ccc0df904596478414ef56a992cf885eb4b0ee695b23d307eb2ff91c36626
-SIZE (poco-1.12.4-all.tar.bz2) = 5990710
+TIMESTAMP = 1729391658
+SHA256 (poco-1.13.3-all.tar.bz2) = 2dcbf21773ccac34fba2e1844a6555e75c1ff1a32d05b13c2da82b1bd1cdac73
+SIZE (poco-1.13.3-all.tar.bz2) = 6115029
diff --git a/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp b/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp
deleted file mode 100644
index 3f132d50e507..000000000000
--- a/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-Data_ODBC_testsuite_src_SQLExecutor.h b/devel/poco/files/patch-Data_ODBC_testsuite_src_SQLExecutor.h
new file mode 100644
index 000000000000..c0d0d5b98b6f
--- /dev/null
+++ b/devel/poco/files/patch-Data_ODBC_testsuite_src_SQLExecutor.h
@@ -0,0 +1,42 @@
+--- Data/ODBC/testsuite/src/SQLExecutor.h.orig	2024-10-20 02:54:30 UTC
++++ Data/ODBC/testsuite/src/SQLExecutor.h
+@@ -236,8 +236,8 @@ class SQLExecutor: public CppUnit::TestCase (public)
+ 		assert (size - 1 == ints.back());
+ 		assert (std::string("xyz0") == strings.front());
+ 		assert (std::string("xyz") + number == strings.back());
+-		assert (CLOB("abc0") == blobs.front());
+-		CLOB blob("abc");
++		assert (CLOB(std::string("abc0")) == blobs.front());
++		CLOB blob(std::string("abc"));
+ 		blob.appendRaw(number.c_str(), number.size());
+ 		assert (blob == blobs.back());
+ 		assert (.5 == floats.front());
+@@ -289,7 +289,7 @@ class SQLExecutor: public CppUnit::TestCase (public)
+ 		assert (size - 1 == ints.back());
+ 		assert (std::string("xyz0") == strings.front());
+ 		assert (std::string("xyz") + number == strings.back());
+-		assert (CLOB("abc0") == blobs.front());
++		assert (CLOB(std::string("abc0")) == blobs.front());
+ 		blob.assignRaw("abc", 3);
+ 		blob.appendRaw(number.c_str(), number.size());
+ 		assert (blob == blobs.back());
+@@ -371,8 +371,8 @@ class SQLExecutor: public CppUnit::TestCase (public)
+ 		assert (size - 1 == ints.back());
+ 		assert (std::string("xyz0") == strings.front());
+ 		assert (std::string("xyz") + number == strings.back());
+-		assert (CLOB("abc0") == blobs.front());
+-		CLOB blob("abc");
++		assert (CLOB(std::string("abc0")) == blobs.front());
++		CLOB blob(std::string("abc"));
+ 		blob.appendRaw(number.c_str(), number.size());
+ 		assert (blob == blobs.back());
+ 		assert (.5 == floats.front());
+@@ -417,7 +417,7 @@ class SQLExecutor: public CppUnit::TestCase (public)
+ 		assert (size - 1 == ints.back());
+ 		assert (std::string("xyz0") == strings.front());
+ 		assert (std::string("xyz") + number == strings.back());
+-		assert (CLOB("abc0") == blobs.front());
++		assert (CLOB(std::string("abc0")) == blobs.front());
+ 		blob.assignRaw("abc", 3);
+ 		blob.appendRaw(number.c_str(), number.size());
+ 		assert (blob == blobs.back());
diff --git a/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp b/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp
deleted file mode 100644
index 90dac0edb172..000000000000
--- a/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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 <signal.h>
-+
-+#if POCO_OS == POCO_OS_FREE_BSD
-+#    include <sys/thr.h>
-+#    include <pthread_np.h>
-+#    include <osreldate.h>
-+#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
- }
- 
diff --git a/devel/poco/pkg-plist b/devel/poco/pkg-plist
index 74b857f77060..933a7536ccd9 100644
--- a/devel/poco/pkg-plist
+++ b/devel/poco/pkg-plist
@@ -1,6 +1,6 @@
-%%ACTIVERECORD%%bin/arc-poco
 %%PAGECOMPILER%%bin/cpspc
 %%PAGECOMPILER%%bin/f2cpsp
+%%ACTIVERECORD%%bin/poco-arc
 include/Poco/ASCIIEncoding.h
 include/Poco/AbstractCache.h
 include/Poco/AbstractDelegate.h
@@ -23,6 +23,7 @@ include/Poco/ActiveMethod.h
 include/Poco/ActiveResult.h
 include/Poco/ActiveRunnable.h
 include/Poco/ActiveStarter.h
+include/Poco/ActiveThreadPool.h
 include/Poco/Activity.h
 include/Poco/Alignment.h
 include/Poco/Any.h
@@ -249,6 +250,7 @@ include/Poco/Dynamic/Struct.h
 include/Poco/Dynamic/Var.h
 include/Poco/Dynamic/VarHolder.h
 include/Poco/Dynamic/VarIterator.h
+include/Poco/Dynamic/VarVisitor.h
 include/Poco/DynamicAny.h
 include/Poco/DynamicAnyHolder.h
 include/Poco/DynamicFactory.h
@@ -258,7 +260,6 @@ include/Poco/Environment.h
 include/Poco/Environment_UNIX.h
 include/Poco/Environment_VX.h
 include/Poco/Environment_WIN32U.h
-include/Poco/Environment_WINCE.h
 include/Poco/Error.h
 include/Poco/ErrorHandler.h
 include/Poco/Event.h
@@ -294,7 +295,6 @@ include/Poco/FileStream_WIN32.h
 include/Poco/File_UNIX.h
 include/Poco/File_VX.h
 include/Poco/File_WIN32U.h
-include/Poco/File_WINCE.h
 include/Poco/Format.h
 include/Poco/Formatter.h
 include/Poco/FormattingChannel.h
@@ -394,6 +394,8 @@ include/Poco/MetaProgramming.h
 %%MONGODB%%include/Poco/MongoDB/MessageHeader.h
 %%MONGODB%%include/Poco/MongoDB/MongoDB.h
 %%MONGODB%%include/Poco/MongoDB/ObjectId.h
+%%MONGODB%%include/Poco/MongoDB/OpMsgCursor.h
+%%MONGODB%%include/Poco/MongoDB/OpMsgMessage.h
 %%MONGODB%%include/Poco/MongoDB/PoolableConnectionFactory.h
 %%MONGODB%%include/Poco/MongoDB/QueryRequest.h
 %%MONGODB%%include/Poco/MongoDB/RegularExpression.h
@@ -403,9 +405,9 @@ include/Poco/MetaProgramming.h
 %%MONGODB%%include/Poco/MongoDB/UpdateRequest.h
 include/Poco/Mutex.h
 include/Poco/Mutex_POSIX.h
+include/Poco/Mutex_STD.h
 include/Poco/Mutex_VX.h
 include/Poco/Mutex_WIN32.h
-include/Poco/Mutex_WINCE.h
 include/Poco/NObserver.h
 include/Poco/NamedEvent.h
 include/Poco/NamedEvent_Android.h
@@ -581,10 +583,10 @@ include/Poco/Optional.h
 include/Poco/OrderedMap.h
 include/Poco/OrderedSet.h
 include/Poco/PBKDF2Engine.h
+include/Poco/PIDFile.h
 include/Poco/Path.h
 include/Poco/Path_UNIX.h
 include/Poco/Path_WIN32U.h
-include/Poco/Path_WINCE.h
 include/Poco/PatternFormatter.h
 include/Poco/Pipe.h
 include/Poco/PipeImpl.h
@@ -606,7 +608,8 @@ include/Poco/Process.h
 include/Poco/Process_UNIX.h
 include/Poco/Process_VX.h
 include/Poco/Process_WIN32U.h
-include/Poco/Process_WINCE.h
+include/Poco/ProcessOptions.h
+include/Poco/ProcessRunner.h
 %%PROMETHEUS%%include/Poco/Prometheus/AtomicFloat.h
 %%PROMETHEUS%%include/Poco/Prometheus/CallbackMetric.h
 %%PROMETHEUS%%include/Poco/Prometheus/Collector.h
@@ -632,7 +635,6 @@ include/Poco/RWLock_Android.h
 include/Poco/RWLock_POSIX.h
 include/Poco/RWLock_VX.h
 include/Poco/RWLock_WIN32.h
-include/Poco/RWLock_WINCE.h
 include/Poco/Random.h
 include/Poco/RandomStream.h
 include/Poco/RecursiveDirectoryIterator.h
@@ -724,7 +726,6 @@ include/Poco/ThreadTarget.h
 include/Poco/Thread_POSIX.h
 include/Poco/Thread_VX.h
 include/Poco/Thread_WIN32.h
-include/Poco/Thread_WINCE.h
 include/Poco/TimedNotificationQueue.h
 include/Poco/Timer.h
 include/Poco/Timespan.h