diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile index 5e4d986930b7..6a8f7d0288a0 100644 --- a/archivers/urbackup-client/Makefile +++ b/archivers/urbackup-client/Makefile @@ -1,69 +1,66 @@ 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}/ MAINTAINER= ek@purplehat.org COMMENT= Client component of the UrBackup backup system WWW= https://www.urbackup.org LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp \ libzstd.so:archivers/zstd USES= autoreconf dos2unix libtool localbase pkgconfig sqlite:3 ssl USE_CXXSTD= c++14 USE_RC_SUBR= urbackup_client GNU_CONFIGURE= yes 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 GROUPS= urbackup CONFFILES= mariadbdump.conf mariadbxtrabackup.conf postgresbase.conf \ postgresqldump.conf .include # Fix segmentation fault, PR 266531 # see also 5a19c08: security/cryptopp: Update to 8.7.0 .if ${ARCH} == i386 || ${ARCH} == amd64 CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif 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 \ ${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample ${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf ${INSTALL_MAN} ${WRKSRC}/docs/urbackupclientbackend.1 \ ${STAGEDIR}${PREFIX}/share/man/man1 .for f in ${CONFFILES} ${MV} ${STAGEDIR}${PREFIX}/etc/urbackup/${f} ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample .endfor ${RM} ${STAGEDIR}/var/urbackup/version.txt ${RM} ${STAGEDIR}${PREFIX}/share/urbackup/urbackup_ecdsa409k1.pub .include 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 @@ -1,49 +1,49 @@ 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" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/list_incr" - test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump" - test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump" - test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup" - test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup_incr" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup" - $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/list_incr" + test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump" + test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump" + test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup" + test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup_incr" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup" + $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup" for script in "$(DESTDIR)$(datadir)/urbackup/scripts/"*; do sed "s|SYSCONFDIR|$(sysconfdir)/urbackup|g" "$$script" > "$$script.r"; mv "$$script.r" "$$script"; done chmod 700 "$(DESTDIR)$(datadir)/urbackup/scripts/"* 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::eof()) ++ if (result == std::vector::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 new_request_queue; + +- std::basic_string InputBuffer; ++ std::vector InputBuffer; + u_int8_t tmp_buf[64]; + }; + diff --git a/archivers/urbackup-client/files/patch-urbackupclient_lin__tokens.cpp b/archivers/urbackup-client/files/patch-urbackupclient_lin__tokens.cpp deleted file mode 100644 index a1a624def5b4..000000000000 --- a/archivers/urbackup-client/files/patch-urbackupclient_lin__tokens.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- urbackupclient/lin_tokens.cpp.orig 2025-08-11 17:13:03 UTC -+++ urbackupclient/lin_tokens.cpp -@@ -34,7 +34,7 @@ TokenCache::TokenCache() - }; - - TokenCache::TokenCache() --: token_cache(NULL) -+: token_cache() - { - } - 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,31 +1,32 @@ 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 share/urbackup/scripts/mariadbpostbackup share/urbackup/scripts/mariadbprebackup share/urbackup/scripts/mariadbxtrabackup share/urbackup/scripts/mariadbxtrabackup_incr share/urbackup/scripts/postgresbase share/urbackup/scripts/postgresqldump share/urbackup/scripts/postgresqlpostbackup 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 @mode 555