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,68 +1,65 @@ PORTNAME= urbackup-server -DISTVERSION= 2.5.33 -PORTREVISION= 2 +DISTVERSION= 2.5.34 CATEGORIES= archivers MASTER_SITES= https://hndl.urbackup.org/Server/${DISTVERSION}/ MAINTAINER= ek@purplehat.org COMMENT= Server component of the UrBackup backup system WWW= https://www.urbackup.org LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/server-license.txt LIB_DEPENDS= libcryptopp.so:security/cryptopp \ libcurl.so:ftp/curl \ liblmdb.so:databases/lmdb \ 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 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-packaging \ --with-mountvhd \ --without-embedded-lmdb \ --without-embedded-lua \ --without-embedded-sqlite3 .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 SUB_FILES= pkg-message urbackupsrv.conf.sample-daemon USERS= urbackup GROUPS= urbackup post-patch: (cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|/etc/urbackup|${PREFIX}/etc/urbackup|g' \ mount_helper/main.cpp \ urbackupserver/server.cpp \ urbackupserver/serverinterface/settings.cpp \ urbackupserver/dllmain.cpp \ 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: ${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 ${INSTALL_DATA} ${FILESDIR}/urbackupsrv.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupsrv.conf ${INSTALL_MAN} ${WRKSRC}/docs/urbackupsrv.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include 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::eof()) ++ if (result == std::vector::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 new_request_queue; + +- std::basic_string InputBuffer; ++ std::vector 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 @@ -1,140 +1,144 @@ bin/urbackupsrv @(,,6555) bin/urbackup_mount_helper @(,,6555) bin/urbackup_snapshot_helper @mode 0444 share/man/man1/urbackupsrv.1.gz @mode 0644 @sample etc/urbackup/urbackupsrv.conf.sample etc/newsyslog.conf.d/urbackupsrv.conf share/urbackup/server-license.txt share/urbackup/urbackup_ecdsa409k1.pub share/urbackup/www/css/bootstrap-flat-extras.chash-958e73e0ffd138319a4c6be29fa24392.min.css share/urbackup/www/css/bootstrap-flat-extras.css share/urbackup/www/css/bootstrap-flat.chash-afad0eb464edab83aeb369684734541e.min.css share/urbackup/www/css/bootstrap-flat.css share/urbackup/www/css/bootstrap-select.chash-d2d8b0cbdd75333eb01a025abd0ed954.min.css share/urbackup/www/css/bootstrap-select.css share/urbackup/www/css/bootstrap-theme.chash-46d96593303e4c8666f497bb7602c999.min.css share/urbackup/www/css/bootstrap-theme.css share/urbackup/www/css/bootstrap-toggle.chash-e12db6c1f34cdb5b0151e54141174bf3.css share/urbackup/www/css/bootstrap-toggle.min.css share/urbackup/www/css/bootstrap.chash-2f624089c65f12185e79925bc5a7fc42.min.css share/urbackup/www/css/bootstrap.css share/urbackup/www/css/buttons.bootstrap.css share/urbackup/www/css/buttons.chash-bd7652fc1398727918564c515096ee61.bootstrap.min.css share/urbackup/www/css/buttons.dataTables.min.css share/urbackup/www/css/dataTables.bootstrap.min.css share/urbackup/www/css/dataTables.chash-199ff38fd61a7e4516ee546eaa4c29c7.bootstrap.css share/urbackup/www/css/dataTables.foundation.css share/urbackup/www/css/dataTables.foundation.min.css share/urbackup/www/css/datatable.css share/urbackup/www/css/jquery.chash-342e0312e9d353b3f19dbd50c28cd084.jqplot.min.css share/urbackup/www/css/jquery.dataTables.css share/urbackup/www/css/jquery.dataTables.min.css share/urbackup/www/css/jquery.dataTables_themeroller.css share/urbackup/www/css/layout.css share/urbackup/www/css/nprogress.chash-9dc52b7dd289312c1437a3e66ca7662c.css share/urbackup/www/css/select.bootstrap.css share/urbackup/www/css/select.bootstrap.min.css share/urbackup/www/css/select.dataTables.css share/urbackup/www/css/select.dataTables.min.css share/urbackup/www/css/urbackup_extra.chash-3db0cfd0827ea1e31800d5d3479113e1.css share/urbackup/www/favicon.ico share/urbackup/www/fonts/glyphicons-halflings-regular.eot share/urbackup/www/fonts/glyphicons-halflings-regular.svg share/urbackup/www/fonts/glyphicons-halflings-regular.ttf share/urbackup/www/fonts/glyphicons-halflings-regular.woff share/urbackup/www/fonts/glyphicons-halflings-regular.woff2 share/urbackup/www/help.htm share/urbackup/www/images/agplv3-155x51.png share/urbackup/www/images/arr.png share/urbackup/www/images/back_disabled.png share/urbackup/www/images/back_enabled.png share/urbackup/www/images/back_enabled_hover.png share/urbackup/www/images/background.png share/urbackup/www/images/btn_donate_LG.gif share/urbackup/www/images/forward_disabled.png share/urbackup/www/images/forward_enabled.png share/urbackup/www/images/forward_enabled_hover.png share/urbackup/www/images/header.png share/urbackup/www/images/header_new.png share/urbackup/www/images/indicator.gif share/urbackup/www/images/progress.png share/urbackup/www/images/sort_asc.png share/urbackup/www/images/sort_asc_disabled.png share/urbackup/www/images/sort_both.png share/urbackup/www/images/sort_desc.png share/urbackup/www/images/sort_desc_disabled.png share/urbackup/www/images/stopwatch.png share/urbackup/www/images/urbackup.png share/urbackup/www/index.htm share/urbackup/www/js/bootstrap-select.chash-76ee99405563373864c57f9093c526eb.min.js share/urbackup/www/js/bootstrap-select.js share/urbackup/www/js/bootstrap-toggle.chash-4f3a8e499de27e992b7f0e0f92de3491.min.js share/urbackup/www/js/bootstrap-toggle.js share/urbackup/www/js/bootstrap.chash-c5b5b2fa19bd66ff23211d9f844e0131.min.js share/urbackup/www/js/bootstrap.js share/urbackup/www/js/buttons.bootstrap.js share/urbackup/www/js/buttons.chash-0da44ded2aaff1f0c13606600a4cd330.html5.min.js share/urbackup/www/js/buttons.chash-ac22ff642b7e893d1481c3746e3a727e.bootstrap.min.js share/urbackup/www/js/buttons.chash-cd927381496c412f4693bd9d9ee033f4.print.min.js share/urbackup/www/js/buttons.chash-ce3122eaca7ccb19e44dee7dda4d64a2.colVis.min.js share/urbackup/www/js/buttons.chash-fc6a8c2af5e96d74874f6a0d3cd423cb.flash.min.js share/urbackup/www/js/buttons.colVis.js share/urbackup/www/js/buttons.flash.js share/urbackup/www/js/buttons.html5.js share/urbackup/www/js/buttons.print.js share/urbackup/www/js/dataTables.bootstrap.js share/urbackup/www/js/dataTables.buttons.js share/urbackup/www/js/dataTables.chash-63b062ca2b0c3f964a6441b525195161.bootstrap.min.js share/urbackup/www/js/dataTables.chash-dfe1352a782465f67d37ecfcd42fab61.select.min.js share/urbackup/www/js/dataTables.chash-ee4a3855817393103a592c0a1c25d8f2.buttons.min.js share/urbackup/www/js/dataTables.foundation.js share/urbackup/www/js/dataTables.foundation.min.js share/urbackup/www/js/dataTables.select.js share/urbackup/www/js/default_user_rights.chash-1a8afe1e5f52805d53eeec839bdec544.js share/urbackup/www/js/dust-full.chash-54ec13e05caf3890b67b71bdddab23c1.js share/urbackup/www/js/dust-full.min.js share/urbackup/www/js/excanvas.min.js share/urbackup/www/js/jqplot.categoryAxisRenderer.min.js share/urbackup/www/js/jqplot.chash-1c19ea0ae42de58f92fe80d31965ea3e.highlighter.min.js share/urbackup/www/js/jqplot.chash-20dac64191d3b8450e8c18be524e1005.dateAxisRenderer.min.js share/urbackup/www/js/jqplot.chash-40f1b3ee3c1b1d475b7c556685f4176e.pieRenderer.min.js share/urbackup/www/js/jqplot.chash-a4e0feecabf098441472baf28dc5b76a.barRenderer.min.js share/urbackup/www/js/jquery.chash-0e0645f8b1c2b9e45470add2df1214b4.base64.min.js share/urbackup/www/js/jquery.chash-565d85c1c1f639919008b8e867faabeb.jqplot.min.js share/urbackup/www/js/jquery.chash-56be28a1645466dc675d2a204fca015c.sparkline.min.js share/urbackup/www/js/jquery.chash-68e14434ba097ba3db4f0a1b3041842e.dataTables.min.js share/urbackup/www/js/jquery.chash-9f7c65c84c8e8c3e317945e8fd89899b.js share/urbackup/www/js/jquery.dataTables.js share/urbackup/www/js/md5.chash-d2f5c8d867ed90851ef4e7b98616c364.js share/urbackup/www/js/npm.js share/urbackup/www/js/nprogress.chash-5fc208df77427b19a1558ee3c2e2d344.js 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 share/urbackup/www/js/vs/base/worker/workerMain.js share/urbackup/www/js/vs/basic-languages/src/lua.js share/urbackup/www/js/vs/editor/editor.main.css share/urbackup/www/js/vs/editor/editor.main.js share/urbackup/www/js/vs/editor/editor.main.nls.js share/urbackup/www/js/vs/loader.chash-7bbdd9ad3da370f14fe85315b79133b3.js share/urbackup/www/license.htm share/urbackup/www/swf/flashExport.swf /var/urbackup/dataplan_db.txt @mode 0755 @owner urbackup @group urbackup @dir /var/urbackup @mode 0555 @owner root @group wheel