diff options
6 files changed, 77 insertions, 9 deletions
diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile index b26b55a4fec2..46a24306e923 100644 --- a/archivers/urbackup-server/Makefile +++ b/archivers/urbackup-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= urbackup-server DISTVERSION= 2.5.33 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Server/${DISTVERSION}/ @@ -13,17 +13,21 @@ LICENSE_FILE= ${WRKSRC}/server-license.txt LIB_DEPENDS= libcryptopp.so:security/cryptopp \ libcurl.so:ftp/curl \ - liblmdb.so:databases/lmdb + liblmdb.so:databases/lmdb \ + libzstd.so:archivers/zstd -USES= autoreconf compiler:c++11-lang dos2unix fakeroot fuse \ - libtool lua:53 pkgconfig sqlite:3 -DOS2UNIX_GLOB= *.c *.cpp *.h *.am +USES= autoreconf compiler:c++11-lang dos2unix fakeroot fuse libtool \ + lua:53 localbase pkgconfig sqlite:3 +DOS2UNIX_GLOB= *.am *.c *.cpp *.h USE_CXXSTD= c++14 USE_RC_SUBR= urbackup_server GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-packaging --with-mountvhd --without-embedded-sqlite3 --without-embedded-lmdb --without-embedded-lua -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --enable-packaging \ + --with-mountvhd \ + --without-embedded-lmdb \ + --without-embedded-lua \ + --without-embedded-sqlite3 .include <bsd.port.options.mk> @@ -52,10 +56,10 @@ post-patch: -e 's|auto_ptr|unique_ptr|g' {} + post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup \ + ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} ${WRKDIR}/urbackupsrv.conf.sample-daemon \ ${STAGEDIR}${PREFIX}/etc/urbackup/urbackupsrv.conf.sample - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} ${FILESDIR}/urbackupsrv.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupsrv.conf diff --git a/archivers/urbackup-server/files/patch-fileservplugin_FileMetadataPipe.cpp b/archivers/urbackup-server/files/patch-fileservplugin_FileMetadataPipe.cpp new file mode 100644 index 000000000000..6a156530ef8a --- /dev/null +++ b/archivers/urbackup-server/files/patch-fileservplugin_FileMetadataPipe.cpp @@ -0,0 +1,11 @@ +--- fileservplugin/FileMetadataPipe.cpp.orig 2025-08-10 22:44:37 UTC ++++ fileservplugin/FileMetadataPipe.cpp +@@ -71,7 +71,7 @@ FileMetadataPipe::FileMetadataPipe( IPipe* pipe, const + #endif + metadata_state(MetadataState_Wait), + errpipe(Server->createMemoryPipe()), +- metadata_file(NULL) ++ metadata_file() + { + metadata_buffer.resize(4096); + init(); diff --git a/archivers/urbackup-server/files/patch-fsimageplugin_CompressedFile.cpp b/archivers/urbackup-server/files/patch-fsimageplugin_CompressedFile.cpp new file mode 100644 index 000000000000..d29fd97ae55d --- /dev/null +++ b/archivers/urbackup-server/files/patch-fsimageplugin_CompressedFile.cpp @@ -0,0 +1,20 @@ +--- fsimageplugin/CompressedFile.cpp.orig 2025-08-10 22:29:50 UTC ++++ fsimageplugin/CompressedFile.cpp +@@ -43,7 +43,7 @@ CompressedFile::CompressedFile( std::string pFilename, + + + CompressedFile::CompressedFile( std::string pFilename, int pMode, size_t n_threads) +- : hotCache(NULL), error(false), currentPosition(0), ++ : hotCache(), error(false), currentPosition(0), + finished(false), filesize(0), noMagic(false), + mutex(Server->createMutex()), n_threads(n_threads), numBlockOffsets(0) + { +@@ -80,7 +80,7 @@ CompressedFile::CompressedFile(IFile* file, bool openE + } + + CompressedFile::CompressedFile(IFile* file, bool openExisting, bool readOnly, size_t n_threads) +- : hotCache(NULL), error(false), currentPosition(0), ++ : hotCache(), error(false), currentPosition(0), + finished(false), uncompressedFile(file), filesize(0), readOnly(readOnly), + noMagic(false), mutex(Server->createMutex()), n_threads(n_threads), numBlockOffsets(0) + { diff --git a/archivers/urbackup-server/files/patch-urbackupserver_ClientMain.cpp b/archivers/urbackup-server/files/patch-urbackupserver_ClientMain.cpp new file mode 100644 index 000000000000..ff4f369af505 --- /dev/null +++ b/archivers/urbackup-server/files/patch-urbackupserver_ClientMain.cpp @@ -0,0 +1,11 @@ +--- urbackupserver/ClientMain.cpp.orig 2025-08-10 22:37:26 UTC ++++ urbackupserver/ClientMain.cpp +@@ -107,7 +107,7 @@ ClientMain::ClientMain(IPipe *pPipe, FileClient::SAddr + ClientMain::ClientMain(IPipe *pPipe, FileClient::SAddrHint pAddr, const std::string &pName, + const std::string& pSubName, const std::string& pMainName, int filebackup_group_offset, bool internet_connection, + bool use_file_snapshots, bool use_image_snapshots, bool use_reflink) +- : internet_connection(internet_connection), server_settings(NULL), client_throttler(NULL), ++ : internet_connection(internet_connection), server_settings(), client_throttler(NULL), + use_file_snapshots(use_file_snapshots), use_image_snapshots(use_image_snapshots), use_reflink(use_reflink), + backup_dao(NULL), client_updated_time(0), continuous_backup(NULL), + clientsubname(pSubName), filebackup_group_offset(filebackup_group_offset), needs_authentification(false), diff --git a/archivers/urbackup-server/files/patch-urbackupserver_FileMetadataDownloadThread.cpp b/archivers/urbackup-server/files/patch-urbackupserver_FileMetadataDownloadThread.cpp new file mode 100644 index 000000000000..2c141aa3a09f --- /dev/null +++ b/archivers/urbackup-server/files/patch-urbackupserver_FileMetadataDownloadThread.cpp @@ -0,0 +1,11 @@ +--- urbackupserver/FileMetadataDownloadThread.cpp.orig 2025-08-10 22:43:07 UTC ++++ urbackupserver/FileMetadataDownloadThread.cpp +@@ -47,7 +47,7 @@ FileMetadataDownloadThread::FileMetadataDownloadThread + + FileMetadataDownloadThread::FileMetadataDownloadThread(const std::string& server_token, std::string metadata_tmp_fn, + int backupid, int clientid, bool use_tmpfiles, std::string tmpfile_path) +- : fc(NULL), server_token(server_token), has_error(false), metadata_tmp_fn(metadata_tmp_fn), ++ : fc(), server_token(server_token), has_error(false), metadata_tmp_fn(metadata_tmp_fn), + dry_run(true), backupid(backupid), max_metadata_id(0), clientid(clientid), has_fatal_error(false), has_timeout_error(false), + use_tmpfiles(use_tmpfiles), tmpfile_path(tmpfile_path), is_complete(false), is_finished(true), force_start(false) + { diff --git a/archivers/urbackup-server/files/patch-urbackupserver_server__cleanup.cpp b/archivers/urbackup-server/files/patch-urbackupserver_server__cleanup.cpp new file mode 100644 index 000000000000..b65644ccc093 --- /dev/null +++ b/archivers/urbackup-server/files/patch-urbackupserver_server__cleanup.cpp @@ -0,0 +1,11 @@ +--- urbackupserver/server_cleanup.cpp.orig 2025-08-11 16:00:31 UTC ++++ urbackupserver/server_cleanup.cpp +@@ -78,7 +78,7 @@ ServerCleanupThread::ServerCleanupThread(CleanupAction + } + + ServerCleanupThread::ServerCleanupThread(CleanupAction cleanup_action) +- : cleanup_action(cleanup_action), cleanupdao(NULL), backupdao(NULL) ++ : cleanup_action(cleanup_action), cleanupdao(), backupdao() + { + logid = ServerLogger::getLogId(LOG_CATEGORY_CLEANUP); + } |