git: ca9312dc96c8 - main - www/wt: Update to 4.11.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 22 Oct 2024 17:59:36 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ca9312dc96c81093926046227427d0c1ccd9676f
commit ca9312dc96c81093926046227427d0c1ccd9676f
Author: Mamadou Babaei <info@babaei.net>
AuthorDate: 2024-10-22 17:55:40 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-10-22 17:57:53 +0000
www/wt: Update to 4.11.0
Add TEST_DEPENDS
Pet portfmt.
Changelog: https://webtoolkit.eu/wt/doc/reference/html/Releasenotes.html
PR: 281959
Approved by: submitter is maintainer
---
www/wt/Makefile | 83 +++++++++++-----------
www/wt/distinfo | 6 +-
www/wt/files/patch-src_web_FileUtils.C | 10 ---
www/wt/files/patch-test_auth_PasswordServiceTest.C | 31 ++++++++
www/wt/pkg-plist | 7 ++
5 files changed, 83 insertions(+), 54 deletions(-)
diff --git a/www/wt/Makefile b/www/wt/Makefile
index f67b83307a4e..ba9644617e0e 100644
--- a/www/wt/Makefile
+++ b/www/wt/Makefile
@@ -1,6 +1,5 @@
PORTNAME= wt
-DISTVERSION= 4.10.4
-PORTREVISION= 1
+DISTVERSION= 4.11.0
CATEGORIES= www
MAINTAINER= info@babaei.net
@@ -10,9 +9,10 @@ WWW= https://www.webtoolkit.eu/wt
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libpng.so:graphics/png \
- libboost_thread.so:devel/boost-libs \
- libGraphicsMagick.so:graphics/GraphicsMagick
+LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
+ libGraphicsMagick.so:graphics/GraphicsMagick \
+ libpng.so:graphics/png
+TEST_DEPENDS= roboto-fonts-ttf>=0:x11-fonts/roboto-fonts-ttf
USES= cmake:testing compiler:c++14-lang cpe pkgconfig ssl
CPE_VENDOR= emweb
@@ -29,8 +29,8 @@ CMAKE_ARGS= -DCONFIGDIR:STRING=${ETCDIR} \
-DWEBGROUP:STRING=${WWWGRP} \
-DWEBUSER:STRING=${WWWOWN} \
-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick
-CMAKE_OFF= BUILD_EXAMPLES BUILD_TESTS ENABLE_MYSQLSERVER \
- ENABLE_QT4 ENABLE_QT5 ENABLE_QT6
+CMAKE_OFF= BUILD_EXAMPLES ENABLE_MYSQLSERVER ENABLE_QT4 ENABLE_QT5 \
+ ENABLE_QT6
CMAKE_TESTING_ON= BUILD_TESTS
EXTRACT_AFTER_ARGS= --exclude .gitignore \
@@ -42,40 +42,41 @@ EXTRACT_AFTER_ARGS= --exclude .gitignore \
--exclude ${PORTNAME}-${DISTVERSION}/target \
--no-same-owner --no-same-permissions
-PLIST_SUB= VERSION=${DISTVERSION}
-PORTEXAMPLES= *
+PLIST_SUB= VERSION=${DISTVERSION}
+PORTEXAMPLES= *
-OPTIONS_DEFINE= DEBUG EXAMPLES HARU LIBWTTEST OPENGL PANGO \
- RESOURCES SAML THEMES UNWIND
-OPTIONS_DEFAULT= EXAMPLES FASTCGI FIREBIRD HARU LIBWTTEST MYSQL OPENGL \
- PANGO PGSQL RESOURCES SAML SQLITE3 THEMES WTHTTP
-OPTIONS_GROUP= CONNECTOR DBO WSTRING
+OPTIONS_DEFINE= DEBUG EXAMPLES HARU LIBWTTEST OPENGL PANGO \
+ RESOURCES SAML THEMES UNWIND
+OPTIONS_DEFAULT= EXAMPLES FASTCGI FIREBIRD HARU LIBWTTEST MYSQL \
+ OPENGL PANGO PGSQL RESOURCES SAML SQLITE3 \
+ THEMES WTHTTP
+OPTIONS_GROUP= CONNECTOR DBO WSTRING
OPTIONS_GROUP_CONNECTOR= FASTCGI WTHTTP
-OPTIONS_GROUP_DBO= FIREBIRD MYSQL PGSQL SQLITE3
+OPTIONS_GROUP_DBO= FIREBIRD MYSQL PGSQL SQLITE3
NO_OPTIONS_SORT= yes
-OPTIONS_SUB= yes
-
-CONNECTOR_DESC= Connector
-DBO_DESC= Wt::DBO
-EXAMPLES_DESC= Install examples (implies SQLITE3 and WTHTTP)
-FASTCGI_DESC= Build FastCGI connector
-FIREBIRD_DESC= Build Wt with FirebirdSQL support
-HARU_DESC= Enable Haru Free PDF Library
-LIBWTTEST_DESC= Build Wt::Test for automated (integration/unit) tests
-MYSQL_DESC= Build Wt with MariaDB or MySQL support
-PGSQL_DESC= Build Wt with PostgreSQL support
-RESOURCES_DESC= Install resources directory
-SAML_DESC= Build built-in SAML service provider for Wt::Auth
-SQLITE3_DESC= Build Wt with SQLite 3 support
-THEMES_DESC= Install the source files for Wt's themes
-UNWIND_DESC= Build Wt with stacktrace support using libunwind
-WTHTTP_DESC= Build Wt stand-alone httpd connector
+OPTIONS_SUB= yes
+
+CONNECTOR_DESC= Connector
+DBO_DESC= Wt::DBO
+EXAMPLES_DESC= Install examples (implies SQLITE3 and WTHTTP)
+FASTCGI_DESC= Build FastCGI connector
+FIREBIRD_DESC= Build Wt with FirebirdSQL support
+HARU_DESC= Enable Haru Free PDF Library
+LIBWTTEST_DESC= Build Wt::Test for automated (integration/unit) tests
+MYSQL_DESC= Build Wt with MariaDB or MySQL support
+PGSQL_DESC= Build Wt with PostgreSQL support
+RESOURCES_DESC= Install resources directory
+SAML_DESC= Build built-in SAML service provider for Wt::Auth
+SQLITE3_DESC= Build Wt with SQLite 3 support
+THEMES_DESC= Install the source files for Wt's themes
+UNWIND_DESC= Build Wt with stacktrace support using libunwind
+WTHTTP_DESC= Build Wt stand-alone httpd connector
EXAMPLES_IMPLIES= SQLITE3 WTHTTP
EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES INSTALL_EXAMPLES
-FASTCGI_LIB_DEPENDS= libfcgi.so:www/fcgi \
- libfcgi++.so:www/fcgi
+FASTCGI_LIB_DEPENDS= libfcgi++.so:www/fcgi \
+ libfcgi.so:www/fcgi
FASTCGI_CMAKE_BOOL= CONNECTOR_FCGI
FASTCGI_CMAKE_ON= -DFCGI_PREFIX:STRING=${LOCALBASE}
@@ -90,11 +91,11 @@ LIBWTTEST_CMAKE_BOOL= ENABLE_LIBWTTEST
MYSQL_USES= mysql
MYSQL_CMAKE_BOOL= ENABLE_MYSQL
-MYSQL_CMAKE_ON= -DMYSQL_PREFIX:STRING=${LOCALBASE} \
- -DENABLE_LIBWTDBO:BOOL=ON
+MYSQL_CMAKE_ON= -DENABLE_LIBWTDBO:BOOL=ON \
+ -DMYSQL_PREFIX:STRING=${LOCALBASE}
OPENGL_USES= gl xorg
-OPENGL_USE= GL=opengl,glew xorg=x11
+OPENGL_USE= GL=opengl,glew XORG=x11
OPENGL_CMAKE_BOOL= ENABLE_OPENGL
PANGO_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
@@ -104,13 +105,13 @@ PANGO_CMAKE_BOOL= ENABLE_PANGO
PGSQL_USES= pgsql
PGSQL_CMAKE_BOOL= ENABLE_POSTGRES
-PGSQL_CMAKE_ON= -DPOSTGRES_PREFIX:STRING=${LOCALBASE} \
- -DENABLE_LIBWTDBO:BOOL=ON
+PGSQL_CMAKE_ON= -DENABLE_LIBWTDBO:BOOL=ON \
+ -DPOSTGRES_PREFIX:STRING=${LOCALBASE}
RESOURCES_CMAKE_BOOL= INSTALL_RESOURCES
-SAML_LIB_DEPENDS= libsaml.so:security/opensaml \
- liblog4shib.so:devel/log4shib \
+SAML_LIB_DEPENDS= liblog4shib.so:devel/log4shib \
+ libsaml.so:security/opensaml \
libxerces-c-3.2.so:textproc/xerces-c3 \
libxml-security-c.so:security/apache-xml-security-c \
libxmltooling.so:devel/xmltooling
diff --git a/www/wt/distinfo b/www/wt/distinfo
index 5c35046e9fcc..39b7d3911970 100644
--- a/www/wt/distinfo
+++ b/www/wt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724754925
-SHA256 (emweb-wt-4.10.4_GH0.tar.gz) = dd6092abe599d9254242225e801da38085847b3147c1748e1212f274398a2e9a
-SIZE (emweb-wt-4.10.4_GH0.tar.gz) = 10449928
+TIMESTAMP = 1728480049
+SHA256 (emweb-wt-4.11.0_GH0.tar.gz) = b5f4a85559adaa0d89a78cec8a8ab7aa3f80c6d3a5ccd8ebe1134adf9aba3065
+SIZE (emweb-wt-4.11.0_GH0.tar.gz) = 10563042
diff --git a/www/wt/files/patch-src_web_FileUtils.C b/www/wt/files/patch-src_web_FileUtils.C
deleted file mode 100644
index ca964aab5236..000000000000
--- a/www/wt/files/patch-src_web_FileUtils.C
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/web/FileUtils.C.orig 2024-03-06 10:25:31 UTC
-+++ src/web/FileUtils.C
-@@ -6,6 +6,7 @@
-
- #include "web/FileUtils.h"
-
-+#include <boost/filesystem/directory.hpp>
- #include <boost/filesystem/operations.hpp>
-
- #include "web/WebUtils.h"
diff --git a/www/wt/files/patch-test_auth_PasswordServiceTest.C b/www/wt/files/patch-test_auth_PasswordServiceTest.C
new file mode 100644
index 000000000000..ad718bed6ab1
--- /dev/null
+++ b/www/wt/files/patch-test_auth_PasswordServiceTest.C
@@ -0,0 +1,31 @@
+--- test/auth/PasswordServiceTest.C.orig 2024-10-21 15:06:23 UTC
++++ test/auth/PasswordServiceTest.C
+@@ -116,28 +116,3 @@ BOOST_AUTO_TEST_CASE( throttle_enabled_failure_test )
+ BOOST_REQUIRE(f.myPasswordService_->delayForNextAttempt(user) == attemptResults[failures]);
+ }
+ }
+-
+-BOOST_AUTO_TEST_CASE( throttle_enabled_failure_with_last_attempt_offset_test )
+-{
+- PasswordDboFixture f;
+- f.myPasswordService_->setPasswordThrottle(std::make_unique<Auth::AuthThrottle>());
+-
+- Wt::Dbo::Transaction transaction(*f.session_);
+- Auth::User user = f.users_->registerNew();
+- transaction.commit();
+-
+- std::vector<int> attemptResults { 0, 3, 7, 21, 20 };
+-
+- // Test for 5 failure attempts
+- for (std::size_t failures = 0; failures < 5; ++failures) {
+- // Have one additional login failure
+- user.setAuthenticated(false);
+- transaction.commit();
+-
+- // Sleep for x number of seconds, to test current datetime offset.
+- std::this_thread::sleep_for(std::chrono::seconds(failures + 1));
+-
+- BOOST_REQUIRE(f.myPasswordService_->delayForNextAttempt(user) == attemptResults[failures]);
+- }
+-}
+-
diff --git a/www/wt/pkg-plist b/www/wt/pkg-plist
index 6b28f68dd92f..94c08d1b2df7 100644
--- a/www/wt/pkg-plist
+++ b/www/wt/pkg-plist
@@ -11,6 +11,7 @@ include/Wt/Auth/AbstractPasswordService.h
include/Wt/Auth/AbstractUserDatabase.h
include/Wt/Auth/AuthModel.h
include/Wt/Auth/AuthService.h
+include/Wt/Auth/AuthThrottle.h
include/Wt/Auth/AuthUtils.h
include/Wt/Auth/AuthWidget.h
%%DBO%%include/Wt/Auth/Dbo/AuthInfo.h
@@ -23,6 +24,10 @@ include/Wt/Auth/Identity.h
include/Wt/Auth/IssuedToken.h
include/Wt/Auth/Login.h
include/Wt/Auth/LostPasswordWidget.h
+include/Wt/Auth/Mfa/AbstractMfaProcess.h
+include/Wt/Auth/Mfa/Totp.h
+include/Wt/Auth/Mfa/TotpProcess.h
+include/Wt/Auth/Mfa/TotpQrCode.h
include/Wt/Auth/OAuthAuthorizationEndpointProcess.h
include/Wt/Auth/OAuthClient.h
include/Wt/Auth/OAuthService.h
@@ -377,6 +382,8 @@ include/Wt/WVideo.h
include/Wt/WViewWidget.h
include/Wt/WVirtualImage.h
include/Wt/WVmlImage.h
+include/Wt/WWebSocketConnection.h
+include/Wt/WWebSocketResource.h
include/Wt/WWebWidget.h
include/Wt/WWidget.h
include/Wt/WWidgetItem.h