6 files changed, 42 insertions, 19 deletions
diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile
index 0999935140de..6a8f7d0288a0 100644
--- a/archivers/urbackup-client/Makefile
+++ b/archivers/urbackup-client/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	urbackup-client
-DISTVERSION=	2.5.25.0
-PORTREVISION=	1
+DISTVERSION=	2.5.26.0
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION:R}/
 
@@ -11,7 +10,8 @@ WWW=		https://www.urbackup.org
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcryptopp.so:security/cryptopp
+LIB_DEPENDS=	libcryptopp.so:security/cryptopp \
+		libzstd.so:archivers/zstd
 
 USES=		autoreconf dos2unix libtool localbase pkgconfig sqlite:3 ssl
 USE_CXXSTD=	c++14
@@ -22,6 +22,8 @@ CONFIGURE_ARGS=	--disable-clientupdate \
 		--enable-headless \
 		--without-embedded-sqlite3
 
+EXTRA_PATCHES=	${.CURDIR}/../urbackup-server/files/patch-fileservplugin_FileMetadataPipe.cpp \
+		${.CURDIR}/../urbackup-server/files/patch-fsimageplugin_CompressedFile.cpp
 SUB_FILES=	pkg-message urbackupclient.conf.sample-daemon
 
 USERS=		urbackup
@@ -41,10 +43,8 @@ CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 post-patch:
 	${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		${WRKSRC}/urbackupclient/backup_scripts/postgresqldump
-	${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} \
-		-e 's|std::char_traits|std::vector|g' \
-		-e 's|std::basic_string|std::vector|g' \
-		-e 's|auto_ptr|unique_ptr|g' {} +
+	${FIND} ${WRKSRC} -type f \( -name '*.cpp' -o -name '*.h' \) \
+		-exec ${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|g' {} +
 
 post-stage:
 	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
diff --git a/archivers/urbackup-client/distinfo b/archivers/urbackup-client/distinfo
index 122eaae719ee..4ea50ef7f491 100644
--- a/archivers/urbackup-client/distinfo
+++ b/archivers/urbackup-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717232101
-SHA256 (urbackup-client-2.5.25.0.tar.gz) = 100e10e1d952757f2f542695fcd77c05f849a32f0dfa5335cbfbeb8b70938c38
-SIZE (urbackup-client-2.5.25.0.tar.gz) = 5272523
+TIMESTAMP = 1756925555
+SHA256 (urbackup-client-2.5.26.0.tar.gz) = 2fc2dd40ed28b032d4b2ed8d156ec5b99bd15ee9881ce2e857d9437a43e9432a
+SIZE (urbackup-client-2.5.26.0.tar.gz) = 5279034
diff --git a/archivers/urbackup-client/files/patch-Makefile.am b/archivers/urbackup-client/files/patch-Makefile.am
index 3f26c5dfff5c..8f24643dfa1d 100644
--- a/archivers/urbackup-client/files/patch-Makefile.am
+++ b/archivers/urbackup-client/files/patch-Makefile.am
@@ -2,9 +2,9 @@ Makefile.am uses ${INSTALL_PROGAM} to install scripts and configuation files,
 leading to an error from strip(1). This patch instead uses ${INSTALL} (for scripts)
 and ${INSTALL_DATA} (for configuration files).
 
---- Makefile.am.orig	2022-08-29 17:51:29 UTC
+--- Makefile.am.orig	2025-09-03 18:53:44 UTC
 +++ Makefile.am
-@@ -198,24 +198,24 @@ endif
+@@ -209,24 +209,24 @@ endif
  	$(MKDIR_P) "$(DESTDIR)$(datadir)/urbackup/scripts"
  	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/urbackup"
  	
diff --git a/archivers/urbackup-client/files/patch-cryptoplugin_src_files.cpp b/archivers/urbackup-client/files/patch-cryptoplugin_src_files.cpp
new file mode 100644
index 000000000000..e93de31593b2
--- /dev/null
+++ b/archivers/urbackup-client/files/patch-cryptoplugin_src_files.cpp
@@ -0,0 +1,11 @@
+--- cryptoplugin/src/files.cpp.orig	2025-09-03 18:55:57 UTC
++++ cryptoplugin/src/files.cpp
+@@ -118,7 +118,7 @@ size_t FileStore::CopyRangeTo2(BufferedTransformation 
+ 	if (begin == 0 && end == 1)
+ 	{
+ 		int result = m_stream->peek();
+-		if (result == std::char_traits<char>::eof())
++		if (result == std::vector<char>::eof())
+ 			return 0;
+ 		else
+ 		{
diff --git a/archivers/urbackup-client/files/patch-libfastcgi_fastcgi.hpp b/archivers/urbackup-client/files/patch-libfastcgi_fastcgi.hpp
new file mode 100644
index 000000000000..da0afb985d33
--- /dev/null
+++ b/archivers/urbackup-client/files/patch-libfastcgi_fastcgi.hpp
@@ -0,0 +1,11 @@
+--- libfastcgi/fastcgi.hpp.orig	2025-09-03 18:54:33 UTC
++++ libfastcgi/fastcgi.hpp
+@@ -155,7 +155,7 @@ class FCGIProtocolDriver (private)
+   reqmap_t reqmap;
+   std::queue<u_int16_t> new_request_queue;
+ 
+-  std::basic_string<u_int8_t> InputBuffer;
++  std::vector<u_int8_t> InputBuffer;
+   u_int8_t tmp_buf[64];
+ };
+ 
diff --git a/archivers/urbackup-client/pkg-plist b/archivers/urbackup-client/pkg-plist
index 1428ba544615..741873cb6271 100644
--- a/archivers/urbackup-client/pkg-plist
+++ b/archivers/urbackup-client/pkg-plist
@@ -1,13 +1,16 @@
 bin/blockalign
 bin/urbackupclientctl
-sbin/urbackupclientbackend
-share/man/man1/urbackupclientbackend.1.gz
-@mode 0600
+etc/newsyslog.conf.d/urbackupclient.conf
+@mode 0640
 @sample etc/urbackup/mariadbdump.conf.sample
 @sample etc/urbackup/mariadbxtrabackup.conf.sample
 @sample etc/urbackup/postgresbase.conf.sample
 @sample etc/urbackup/postgresqldump.conf.sample
-@mode 0700
+@sample etc/urbackup/urbackupclient.conf.sample
+@mode
+sbin/urbackupclientbackend
+share/man/man1/urbackupclientbackend.1.gz
+@mode 0750
 share/urbackup/scripts/list
 share/urbackup/scripts/list_incr
 share/urbackup/scripts/mariadbdump
@@ -22,9 +25,7 @@ share/urbackup/scripts/postgresqlprebackup
 share/urbackup/scripts/restore-mariadbbackup
 share/urbackup/scripts/setup-mariadbbackup
 share/urbackup/scripts/setup-postgresbackup
-@mode 0644
-@sample etc/urbackup/urbackupclient.conf.sample
-etc/newsyslog.conf.d/urbackupclient.conf
+@mode 0640
 share/urbackup/updates_h.dat
 @dir(,,0700) /var/urbackup/data
 @dir(urbackup,urbackup,0755) /var/urbackup