cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/dar: Update version 2.5.14=>2.7.7

Browse Source 
- 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/
This commit is contained in:
Muhammad Moinur Rahman 2022-09-27 14:56:51 -05:00
parent 682fe3d944
commit 4f64852f78
4 changed files with 128 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
sysutils/dar/Makefile
View File

@ -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
OPTIONS_DEFINE= GCRYPT GPGME LZO ZLIB BZIP2 LZMA DOCS NLS
OPTIONS_DEFAULT= BZIP2 LZMA LZO ZLIB
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= 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 \

6
sysutils/dar/distinfo
View File

@ -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

28
sysutils/dar/files/patch-src_libdar_parallel__tronconneuse.cpp Normal file
View File

@ -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<ratelier_scatter<crypto_segment> >(get_ratelier_size(num_workers));
+ scatter.reset(new (nothrow) ratelier_scatter<crypto_segment>(get_ratelier_size(num_workers)));
if(!scatter)
throw Ememory("parallel_tronconneuse::parallel_tronconneuse");
- gather = make_shared<ratelier_gather<crypto_segment> >(get_ratelier_size(num_workers));
+ gather.reset(new (nothrow) ratelier_gather<crypto_segment>(get_ratelier_size(num_workers)));
if(!gather)
throw Ememory("parallel_tronconneuse::parallel_tronconneuse");
- waiter = make_shared<barrier>(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<heap<crypto_segment> >();
+ tas.reset(new (nothrow) heap<crypto_segment>());
if(!tas)
throw Ememory("parallel_tronconneuse::parallel_tronconneuse");

98
sysutils/dar/pkg-plist
View File

@ -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