Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 13 Nov 2025 23:18:30 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ec3decb2578f - main - archivers/urbackup-server: Update 2.5.33 => 2.5.34
Message-ID:  <202511132318.5ADNIUgw024388@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by vvd:

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

commit ec3decb2578faf48ead4850ea55270abfce37a83
Author:     ek <ek@purplehat.org>
AuthorDate: 2025-11-13 23:16:13 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-13 23:18:18 +0000

    archivers/urbackup-server: Update 2.5.33 => 2.5.34
    
    Changelog:
    https://www.urbackup.org/server_changelog.html
    
    PR:     290919
---
 archivers/urbackup-server/Makefile                            |  7 ++-----
 archivers/urbackup-server/distinfo                            |  6 +++---
 .../urbackup-server/files/patch-cryptoplugin_src_files.cpp    | 11 +++++++++++
 archivers/urbackup-server/files/patch-libfastcgi_fastcgi.hpp  | 11 +++++++++++
 archivers/urbackup-server/pkg-plist                           |  4 ++++
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile
index 46a24306e923..708e0e14cf11 100644
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	urbackup-server
-DISTVERSION=	2.5.33
-PORTREVISION=	2
+DISTVERSION=	2.5.34
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Server/${DISTVERSION}/
 
@@ -17,7 +16,7 @@ LIB_DEPENDS=	libcryptopp.so:security/cryptopp \
 		libzstd.so:archivers/zstd
 
 USES=		autoreconf compiler:c++11-lang dos2unix fakeroot fuse libtool \
-		lua:53 localbase pkgconfig sqlite:3
+		localbase lua:53 pkgconfig sqlite:3
 DOS2UNIX_GLOB=	*.am *.c *.cpp *.h
 USE_CXXSTD=	c++14
 USE_RC_SUBR=	urbackup_server
@@ -51,8 +50,6 @@ post-patch:
 		snapshot_helper/main.cpp \
 	)
 	${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' {} +
 
 post-install:
diff --git a/archivers/urbackup-server/distinfo b/archivers/urbackup-server/distinfo
index e6a3554e8084..aacf75eadead 100644
--- a/archivers/urbackup-server/distinfo
+++ b/archivers/urbackup-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715372630
-SHA256 (urbackup-server-2.5.33.tar.gz) = 65d7dab4d5178849c1ecc45b592143df066c641fd782d5a6448aa606561d7cff
-SIZE (urbackup-server-2.5.33.tar.gz) = 8364522
+TIMESTAMP = 1762714783
+SHA256 (urbackup-server-2.5.34.tar.gz) = 1085ed8a659c7318f9b3080a8e6dec284abd4add2a5b8c0cde37b3e7dec41f0c
+SIZE (urbackup-server-2.5.34.tar.gz) = 9068792
diff --git a/archivers/urbackup-server/files/patch-cryptoplugin_src_files.cpp b/archivers/urbackup-server/files/patch-cryptoplugin_src_files.cpp
new file mode 100644
index 000000000000..03aae23296bf
--- /dev/null
+++ b/archivers/urbackup-server/files/patch-cryptoplugin_src_files.cpp
@@ -0,0 +1,11 @@
+--- cryptoplugin/src/files.cpp.orig	2025-11-09 19:09:32 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-server/files/patch-libfastcgi_fastcgi.hpp b/archivers/urbackup-server/files/patch-libfastcgi_fastcgi.hpp
new file mode 100644
index 000000000000..f6afc3ce29fe
--- /dev/null
+++ b/archivers/urbackup-server/files/patch-libfastcgi_fastcgi.hpp
@@ -0,0 +1,11 @@
+--- libfastcgi/fastcgi.hpp.orig	2025-11-09 19:03:24 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-server/pkg-plist b/archivers/urbackup-server/pkg-plist
index b83795b4791f..0a53a822410b 100644
--- a/archivers/urbackup-server/pkg-plist
+++ b/archivers/urbackup-server/pkg-plist
@@ -114,11 +114,15 @@ share/urbackup/www/js/sjcl.chash-c34b81d9a619f2cd9f09bf75eb160625.js
 share/urbackup/www/js/templates.chash-95585306a999a15b803c96f646ceae67.js
 share/urbackup/www/js/templates.chash-f1be253b56f072b60921630ff50ac909.js
 share/urbackup/www/js/translation.chash-10e0e20a34cbffda033b31d6ea65a823.js
+share/urbackup/www/js/translation.chash-1a20a2f1e15c7aca532b226ec70f6e94.js
 share/urbackup/www/js/translation.chash-55c63d942b127686fcc28b2f2df7b8b3.js
+share/urbackup/www/js/translation.chash-a16b68d66d73129d92cccd8060d5724c.js
 share/urbackup/www/js/translation.chash-e18e5cd27e42a29af566e6ec28e866e8.js
 share/urbackup/www/js/urbackup.chash-35b1e786f5e59ab22e175812b489b772.js
 share/urbackup/www/js/urbackup.chash-49b09e804d0e94741b226ec5bfe09b99.js
+share/urbackup/www/js/urbackup.chash-7a9c5531d8f16009f283728953c8446c.js
 share/urbackup/www/js/urbackup.chash-a14ef54c45978201f5ff10de8074e333.js
+share/urbackup/www/js/urbackup.chash-ba3a06ffb76ab7dfde9e93ce53c12b47.js
 share/urbackup/www/js/urbackup.chash-ee49d44bb0d3e885e48fe85d4a08d34b.js
 share/urbackup/www/js/urbackup.chash-fff37c2eba8a7809d38430dde8fb463b.js
 share/urbackup/www/js/urbackup_functions.chash-98c3f5649cb6de638d6c1ea5df75ce5c.js
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511132318.5ADNIUgw024388>