From nobody Tue Sep 27 20:00:19 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4McVpq4YfWz4cnll; Tue, 27 Sep 2022 20:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4McVpq43GWz49qL; Tue, 27 Sep 2022 20:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664308819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZFn9/0VKtFP0lA5iVNhb1t9GszQWua2jjIdRGYbzZY=; b=rzGWTvg/IjXW5316j9kcOISb0BlWj8UnUraj/TNuQxVvjPIvMd3En27zkrvQ5Ybjm74tJk BIx65l7g9K/ArCJiV57K/6mGW/cv7c2MIqOuVMCPnbhCAI4Fzn3/LR6B7lSRGh6tMhlkiZ /U64gTgadOqQxaZGFIIPYFfvtDxOOfuWCWtL+vqpM6paWH15TjdUa3vJFt1M9ioUewkqt7 RW+3twtsjbiIbP0bFk5EuwL/MLnB+B0nU6HKDZFw+J+mI6udGyQf4rw5wL2FcfA0JXXT5D y1kvVgE+ICBYnlhOaGl2M6WrMf30RbZlXHhivdmuz953HF57sqXix91c0F4Seg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4McVpq2q8nzF5g; Tue, 27 Sep 2022 20:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28RK0JEY070183; Tue, 27 Sep 2022 20:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28RK0Jsh070176; Tue, 27 Sep 2022 20:00:19 GMT (envelope-from git) Date: Tue, 27 Sep 2022 20:00:19 GMT Message-Id: <202209272000.28RK0Jsh070176@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 4f64852f780b - main - sysutils/dar: Update version 2.5.14=>2.7.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f64852f780b438de7c7cf0a36e3f55c27212fae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664308819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZFn9/0VKtFP0lA5iVNhb1t9GszQWua2jjIdRGYbzZY=; b=XKQEkevpax3+UMwtga0dAlwLnRhkp40wZJZ0FtfEmpQ0kEcH0yu+QaPX/0ABxc67N6kcFz sh3KipFm6kpMbxaa3scvWbiEPnZqJYYTpgxAnN5zr2b+nbnfhaTftAAKhUGFB3lkd6qTvt 6VKMAPIJK/jMoXnhdpS/lsP/bnBSKHpNvxZXph7A03iLX59LboyuzgFRU9kjJNA2ICV+Rh aRLaADXGxU9E3DmImIOQG/pDjbCltpAur6Hpakx3vteG/FrOesqPlroKT2yc/JmSMI9zv6 srvISTuzKkwUTck8/WstMPLO7p5Idr6GH7tRtdsKauvvzKLA6c1x/kxaMFifOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664308819; a=rsa-sha256; cv=none; b=lOCRWqFadloXj2QVGYm+/K9SmO2R1xhAsVfR66EjSPsOE5rf1LwSpbU3qlF+k5PweHn5Fo 66JwRNgqkrZ9c71rz6LyKtRIIuaQt3YZ63TiN8Xwv0hN94plld3vbtebW5JatUa5U+jBW2 lK3vaBZrpEvWL52rcjpvkrvUML5VMEjebzlx87Mp61Vt0T2foWtMgyB7g4gtZOB/u9Janr RUWgBgeYEpG3Wb1LqFUnF4X4XjCd8RIl4zXL1DnbA0OvghScz1W+cEXdrjeUOijCQ6hgT5 xPzQgsQgzJNNlKkeRiOSDMm0p5JGmCpPn8Rfxr0+3h+GB+kW2AmiJm5/1WjS4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f64852f780b438de7c7cf0a36e3f55c27212fae commit 4f64852f780b438de7c7cf0a36e3f55c27212fae Author: Muhammad Moinur Rahman AuthorDate: 2022-09-27 19:56:51 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-09-27 20:00:11 +0000 sysutils/dar: Update version 2.5.14=>2.7.7 - Uses new multithreading library - Add USES=pathfix - Housekeeping with portclippy and portfmt PR: 266040 Reported by: igorz@yandex.ru Relnotes: https://sourceforge.net/projects/dar/files/dar/2.7.7/ --- sysutils/dar/Makefile | 67 +++++++++------ sysutils/dar/distinfo | 6 +- .../patch-src_libdar_parallel__tronconneuse.cpp | 28 +++++++ sysutils/dar/pkg-plist | 98 ++++++++++++---------- 4 files changed, 128 insertions(+), 71 deletions(-) diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index d7d12985bac6..404fc88218f7 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -1,7 +1,6 @@ PORTNAME= dar -PORTVERSION= 2.5.14 -PORTREVISION= 3 -DISTVERSIONSUFFIX= -bis +PORTVERSION= 2.7.7 + CATEGORIES= sysutils archivers MASTER_SITES= SF @@ -11,38 +10,58 @@ WWW= http://dar.linux.free.fr/ LICENSE= GPLv2+ -USES= compiler:c++11-lang libtool shebangfix -SHEBANG_FILES= doc/samples/dar_backup doc/samples/*.bash doc/samples/*.sh -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \ - --disable-upx \ - --disable-ea-support --disable-nodump-flag \ - --disable-gnugetopt --disable-dar-static \ - --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig -INSTALL_TARGET= install-strip +USES= compiler:c++14-lang libtool pathfix shebangfix USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +SHEBANG_FILES= doc/samples/*.bash doc/samples/*.sh doc/samples/dar_backup \ + doc/samples/date_past_N_days + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --datadir=${DATADIR} \ + --disable-build-html \ + --disable-dar-static \ + --disable-ea-support \ + --disable-gnugetopt \ + --disable-libcurl-linking \ + --disable-nodump-flag \ + --disable-upx + +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= GCRYPT GPGME LZO ZLIB BZIP2 LZMA DOCS NLS -OPTIONS_DEFAULT= BZIP2 LZMA LZO ZLIB +OPTIONS_DEFINE= ARGON2 BZIP2 DELTA DOCS GCRYPT GPGME LZ4 LZMA LZO \ + MULTITHR NLS ZLIB ZSTD +OPTIONS_DEFAULT= ARGON2 BZIP2 DELTA GCRYPT LZ4 LZMA LZO MULTITHR ZLIB \ + ZSTD OPTIONS_SUB= yes -ZLIB_CONFIGURE_OFF= --disable-libz-linking +ARGON2_DESC= argon2 hashing algorithm via libargon2 +DELTA_DESC= Binary delta support via librsync +GPGME_DESC= gpgme for asymetric crypto algorithms +MULTITHR_DESC= Multithreading support via libthreadar + +ARGON2_IMPLIES= GCRYPT +ARGON2_LIB_DEPENDS= libargon2.so:security/libargon2 +ARGON2_CONFIGURE_OFF= --disable-libargon2-linking BZIP2_CONFIGURE_OFF= --disable-libbz2-linking -LZMA_CONFIGURE_OFF= --disable-libxz-linking -GPGME_DESC= gpgme for asymetric crypto algorithms -GPGME_CONFIGURE_OFF= --disable-gpgme-linking -GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme -GPGME_IMPLIES= GCRYPT -GCRYPT_CONFIGURE_OFF= --disable-libgcrypt-linking +DELTA_LIB_DEPENDS= librsync.so:net/librsync +DELTA_CONFIGURE_OFF= --disable-librsync-linking GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -LZO_DESC= Support lzo compression via liblzo2 +GCRYPT_CONFIGURE_OFF= --disable-libgcrypt-linking +GPGME_IMPLIES= GCRYPT +GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme +GPGME_CONFIGURE_OFF= --disable-gpgme-linking +LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LZ4_CONFIGURE_OFF= --disable-liblz4-linking +LZMA_CONFIGURE_OFF= --disable-libxz-linking LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 LZO_CONFIGURE_OFF= --disable-liblzo2-linking +MULTITHR_LIB_DEPENDS= libthreadar.so:devel/libthreadar +MULTITHR_CONFIGURE_OFF= --disable-threadar NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +ZLIB_CONFIGURE_OFF= --disable-libz-linking +ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd +ZSTD_CONFIGURE_OFF= --disable-libzstd-linking post-patch: @${REINPLACE_CMD} -e \ diff --git a/sysutils/dar/distinfo b/sysutils/dar/distinfo index 83aa43d22655..555dc2a9a16b 100644 --- a/sysutils/dar/distinfo +++ b/sysutils/dar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524413452 -SHA256 (dar-2.5.14-bis.tar.gz) = a5e744f04dde0b3af28f36deccaf274906e1cb29688b9f8bef7c62578b3d6de9 -SIZE (dar-2.5.14-bis.tar.gz) = 1904537 +TIMESTAMP = 1664306456 +SHA256 (dar-2.7.7.tar.gz) = c03e2f52efd65a2f047b60bbeda2460cb525165e1be32f110b60e0cece3f2cc9 +SIZE (dar-2.7.7.tar.gz) = 2410835 diff --git a/sysutils/dar/files/patch-src_libdar_parallel__tronconneuse.cpp b/sysutils/dar/files/patch-src_libdar_parallel__tronconneuse.cpp new file mode 100644 index 000000000000..05a93a51e023 --- /dev/null +++ b/sysutils/dar/files/patch-src_libdar_parallel__tronconneuse.cpp @@ -0,0 +1,28 @@ +--- src/libdar/parallel_tronconneuse.cpp.orig 2022-04-13 16:16:59 UTC ++++ src/libdar/parallel_tronconneuse.cpp +@@ -91,21 +91,21 @@ namespace libdar + { + U_I tmp_bs1, tmp_bs2; + +- scatter = make_shared >(get_ratelier_size(num_workers)); ++ scatter.reset(new (nothrow) ratelier_scatter(get_ratelier_size(num_workers))); + if(!scatter) + throw Ememory("parallel_tronconneuse::parallel_tronconneuse"); + +- gather = make_shared >(get_ratelier_size(num_workers)); ++ gather.reset(new (nothrow) ratelier_gather(get_ratelier_size(num_workers))); + if(!gather) + throw Ememory("parallel_tronconneuse::parallel_tronconneuse"); + +- waiter = make_shared(num_workers + 2); // +1 for crypto_reade thread, +1 this thread ++ waiter.reset(new (nothrow) barrier(num_workers + 2)); + if(!waiter) + throw Ememory("parallel_tronconneuse::parallel_tronconneuse"); + + // tas is created empty + +- tas = make_shared >(); ++ tas.reset(new (nothrow) heap()); + if(!tas) + throw Ememory("parallel_tronconneuse::parallel_tronconneuse"); + diff --git a/sysutils/dar/pkg-plist b/sysutils/dar/pkg-plist index e862b193d96e..57dce1588fe3 100644 --- a/sysutils/dar/pkg-plist +++ b/sysutils/dar/pkg-plist @@ -4,110 +4,114 @@ bin/dar_manager bin/dar_slave bin/dar_split bin/dar_xform -etc/darrc +%%ETCDIR%%rc include/dar/archive.hpp +include/dar/archive5.hpp +include/dar/archive_aux.hpp +include/dar/archive_listing_callback.hpp +include/dar/archive_num.hpp include/dar/archive_options.hpp -include/dar/archive_version.hpp +include/dar/archive_options5.hpp +include/dar/archive_options_listing_shell.hpp +include/dar/archive_summary.hpp +include/dar/block_compressor.hpp include/dar/capabilities.hpp -include/dar/cat_directory.hpp -include/dar/cat_entree.hpp -include/dar/cat_inode.hpp -include/dar/cat_nomme.hpp -include/dar/cat_tools.hpp -include/dar/catalogue.hpp +include/dar/cat_status.hpp include/dar/compile_time_features.hpp +include/dar/compression.hpp include/dar/compressor.hpp +include/dar/compressor_zstd.hpp include/dar/crc.hpp +include/dar/crit_action.hpp include/dar/criterium.hpp include/dar/crypto.hpp -include/dar/crypto_asym.hpp -include/dar/crypto_sym.hpp -include/dar/cygwin_adapt.h -include/dar/cygwin_adapt.hpp include/dar/data_tree.hpp include/dar/database.hpp +include/dar/database5.hpp +include/dar/database_archives.hpp +include/dar/database_aux.hpp +include/dar/database_listing_callback.hpp include/dar/database_options.hpp include/dar/datetime.hpp include/dar/deci.hpp +include/dar/delta_sig_block_size.hpp include/dar/ea.hpp +include/dar/entree_stats.hpp include/dar/entrepot.hpp +include/dar/entrepot_libcurl.hpp +include/dar/entrepot_libcurl5.hpp include/dar/entrepot_local.hpp include/dar/erreurs.hpp -include/dar/erreurs_ext.hpp -include/dar/escape.hpp -include/dar/escape_catalogue.hpp include/dar/etage.hpp include/dar/fichier_global.hpp include/dar/fichier_local.hpp -include/dar/filesystem_specific_attribute.hpp +include/dar/filesystem_ids.hpp include/dar/fsa_family.hpp include/dar/generic_file.hpp -include/dar/generic_file_overlay_for_gpgme.hpp +include/dar/get_version.hpp include/dar/gettext.h -include/dar/hash_fichier.hpp -include/dar/header_version.hpp +include/dar/gf_mode.hpp include/dar/infinint.hpp include/dar/int_tools.hpp include/dar/integers.hpp -include/dar/label.hpp include/dar/libdar.hpp +include/dar/libdar5.hpp include/dar/libdar_config.h include/dar/libdar_my_config.h +include/dar/libdar_slave.hpp +include/dar/libdar_xform.hpp include/dar/limitint.hpp include/dar/list_entry.hpp include/dar/mask.hpp include/dar/mask_list.hpp -include/dar/mem_allocator.hpp -include/dar/mem_cluster.hpp -include/dar/mem_sized.hpp include/dar/mem_ui.hpp include/dar/memory_file.hpp -include/dar/memory_pool.hpp -include/dar/nls_swap.hpp -include/dar/on_pool.hpp +include/dar/mycurl_protocol.hpp +include/dar/parallel_block_compressor.hpp include/dar/path.hpp -include/dar/pile.hpp -include/dar/pile_descriptor.hpp +include/dar/proto_compressor.hpp +include/dar/proto_generic_file.hpp include/dar/range.hpp include/dar/real_infinint.hpp -include/dar/scrambler.hpp -include/dar/secu_memory_file.hpp include/dar/secu_string.hpp -include/dar/slice_layout.hpp -include/dar/smart_pointer.hpp +include/dar/shell_interaction.hpp +include/dar/shell_interaction_emulator.hpp include/dar/statistics.hpp include/dar/storage.hpp include/dar/thread_cancellation.hpp include/dar/tlv.hpp include/dar/tlv_list.hpp include/dar/tools.hpp -include/dar/tronconneuse.hpp -include/dar/trontextual.hpp include/dar/tuyau.hpp -include/dar/user_group_bases.hpp include/dar/user_interaction.hpp +include/dar/user_interaction5.hpp +include/dar/user_interaction_blind.hpp +include/dar/user_interaction_callback.hpp +include/dar/user_interaction_callback5.hpp include/dar/wrapperlib.hpp -lib/libdar.a -lib/libdar.so -lib/libdar.so.5000 -lib/libdar.so.5000.12.1 -libdata/pkgconfig/libdar.pc +lib/libdar64.a +lib/libdar64.so +lib/libdar64.so.6000 +lib/libdar64.so.6000.4.6 +libdata/pkgconfig/libdar64.pc man/man1/dar.1.gz man/man1/dar_cp.1.gz man/man1/dar_manager.1.gz man/man1/dar_slave.1.gz man/man1/dar_split.1.gz man/man1/dar_xform.1.gz +%%DATADIR%%/dar/pybind11_libdar.cpp %%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/Features.html %%PORTDOCS%%%%DOCSDIR%%/Good_Backup_Practice.html -%%PORTDOCS%%%%DOCSDIR%%/Known_Bugs.html %%PORTDOCS%%%%DOCSDIR%%/Limitations.html %%PORTDOCS%%%%DOCSDIR%%/Notes.html %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/Tutorial.html %%PORTDOCS%%%%DOCSDIR%%/api_tutorial.html %%PORTDOCS%%%%DOCSDIR%%/authentification.html +%%PORTDOCS%%%%DOCSDIR%%/benchmark.html +%%PORTDOCS%%%%DOCSDIR%%/benchmark_logs.html %%PORTDOCS%%%%DOCSDIR%%/dar-catalog.dtd %%PORTDOCS%%%%DOCSDIR%%/dar-differential-backup-mini-howto.en.html %%PORTDOCS%%%%DOCSDIR%%/dar-differential-backup-mini-howto.es.html @@ -115,16 +119,20 @@ man/man1/dar_xform.1.gz %%PORTDOCS%%%%DOCSDIR%%/dar_doc.jpg %%PORTDOCS%%%%DOCSDIR%%/dar_key.txt %%PORTDOCS%%%%DOCSDIR%%/dar_s_doc.jpg -%%PORTDOCS%%%%DOCSDIR%%/downloading.html %%PORTDOCS%%%%DOCSDIR%%/from_sources.html %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/man/index.html +%%PORTDOCS%%%%DOCSDIR%%/index_dar.html +%%PORTDOCS%%%%DOCSDIR%%/index_internal.html +%%PORTDOCS%%%%DOCSDIR%%/index_libdar.html +%%PORTDOCS%%%%DOCSDIR%%/libdar_test.py %%PORTDOCS%%%%DOCSDIR%%/mini-howto/dar-differential-backup-mini-howto.en.html %%PORTDOCS%%%%DOCSDIR%%/mini-howto/dar-differential-backup-mini-howto.es.html %%PORTDOCS%%%%DOCSDIR%%/mini-howto/dar-differential-backup-mini-howto.it.html %%PORTDOCS%%%%DOCSDIR%%/mini-howto/index.html -%%PORTDOCS%%%%DOCSDIR%%/old_dar_key.txt +%%PORTDOCS%%%%DOCSDIR%%/old_dar_key1.txt +%%PORTDOCS%%%%DOCSDIR%%/old_dar_key2.txt %%PORTDOCS%%%%DOCSDIR%%/presentation.html +%%PORTDOCS%%%%DOCSDIR%%/restoration-with-dar.html %%PORTDOCS%%%%DOCSDIR%%/samples/JH-dar-make_user_backup.sh %%PORTDOCS%%%%DOCSDIR%%/samples/JH-readme.txt %%PORTDOCS%%%%DOCSDIR%%/samples/JH_dar_archiver.options @@ -150,9 +158,11 @@ man/man1/dar_xform.1.gz %%PORTDOCS%%%%DOCSDIR%%/samples/dar_par_test.duc %%PORTDOCS%%%%DOCSDIR%%/samples/dar_rqck.bash %%PORTDOCS%%%%DOCSDIR%%/samples/darrc_sample +%%PORTDOCS%%%%DOCSDIR%%/samples/date_past_N_days %%PORTDOCS%%%%DOCSDIR%%/samples/index.html %%PORTDOCS%%%%DOCSDIR%%/samples/pause_every_n_slice.duc %%PORTDOCS%%%%DOCSDIR%%/samples/sample1.txt +%%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%%%DOCSDIR%%/usage_notes.html %%NLS%%share/locale/fr/LC_MESSAGES/dar.mo %%NLS%%share/locale/sv/LC_MESSAGES/dar.mo