CVS commit: pkgsrc/archivers/dar

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jul 19 08:23:59 UTC 2026

Modified Files:
        pkgsrc/archivers/dar: Makefile PLIST distinfo options.mk
        pkgsrc/archivers/dar/patches: patch-configure

Log Message:
dar: updated to 2.8.5

from 2.8.4 to 2.8.5
- fixing bug of one-hour-shift in non-daylight saving months for
  time-zones that have one.
  dar_manager and dar can be given a date (-w option for dar_manager,
  -af option for dar) which is expected to be provided in local time.
  But libdar wrongly assumed it to always be given as summer time (or
  daylight saving time) even when the given date took place in a
  non-daylight saving period (winter time), which led most of the
  time to a shift of one hour in the past in the selected files.
  Dar_manager using the -w option was restoring files older than the
  provided date but forgot the ones having a modification date less
  than one hour before the provided date/time when this date/time
  was not in non-daylight saving period (winter time). Those were
  restored in a earlier state or not restored at all if they did not
  exist before that one hour shifted date.
  With dar using -af option, this led dar to save files after the
  given date as expected but also saving the files older than the
  provided date for less an one hour, when this date was in non-daylight
  saving period (winter time). Other files being saved as expected
  as "un-modified" (only metadata saved).
- fixed one field lack of initialization in archive_options_isolate
  classes (copy and move constructors).
- fixing bug that could occur while more bytes are read than available


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/archivers/dar/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/dar/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/archivers/dar/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/dar/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/dar/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/dar/Makefile
diff -u pkgsrc/archivers/dar/Makefile:1.78 pkgsrc/archivers/dar/Makefile:1.79
--- pkgsrc/archivers/dar/Makefile:1.78  Thu May 14 16:40:22 2026
+++ pkgsrc/archivers/dar/Makefile       Sun Jul 19 08:23:59 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2026/05/14 16:40:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.79 2026/07/19 08:23:59 adam Exp $
 
-DISTNAME=      dar-2.7.7
-PKGREVISION=   15
+DISTNAME=      dar-2.8.5
 CATEGORIES=    archivers sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dar/}
 
@@ -14,7 +13,6 @@ USE_LANGUAGES=                c c++
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake groff gsed pkg-config bash:run
-
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-dar-static
 CONFIGURE_ARGS+=       --enable-static=no
@@ -62,16 +60,17 @@ BUILDLINK_TRANSFORM+=       l:execinfo:execinf
 .include "options.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/lzo/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../net/librsync/buildlink3.mk"
 .include "../../security/argon2/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/dar/PLIST
diff -u pkgsrc/archivers/dar/PLIST:1.16 pkgsrc/archivers/dar/PLIST:1.17
--- pkgsrc/archivers/dar/PLIST:1.16     Wed May  1 19:00:19 2024
+++ pkgsrc/archivers/dar/PLIST  Sun Jul 19 08:23:59 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2024/05/01 19:00:19 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.17 2026/07/19 08:23:59 adam Exp $
 bin/dar
 bin/dar_cp
 bin/dar_manager
@@ -6,12 +6,10 @@ bin/dar_slave
 bin/dar_split
 bin/dar_xform
 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_options5.hpp
 include/dar/archive_options_listing_shell.hpp
 include/dar/archive_summary.hpp
 include/dar/block_compressor.hpp
@@ -25,9 +23,7 @@ include/dar/crc.hpp
 include/dar/crit_action.hpp
 include/dar/criterium.hpp
 include/dar/crypto.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
@@ -38,9 +34,10 @@ include/dar/delta_sig_block_size.hpp
 include/dar/ea.hpp
 include/dar/entree_stats.hpp
 include/dar/entrepot.hpp
+include/dar/entrepot_aux.hpp
 include/dar/entrepot_libcurl.hpp
-include/dar/entrepot_libcurl5.hpp
 include/dar/entrepot_local.hpp
+include/dar/eols.hpp
 include/dar/erreurs.hpp
 include/dar/etage.hpp
 include/dar/fichier_global.hpp
@@ -55,7 +52,6 @@ include/dar/infinint.hpp
 include/dar/int_tools.hpp
 include/dar/integers.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
@@ -66,13 +62,13 @@ include/dar/mask.hpp
 include/dar/mask_list.hpp
 include/dar/mem_ui.hpp
 include/dar/memory_file.hpp
-include/dar/mycurl_protocol.hpp
 include/dar/parallel_block_compressor.hpp
 include/dar/path.hpp
 include/dar/proto_compressor.hpp
 include/dar/proto_generic_file.hpp
 include/dar/range.hpp
 include/dar/real_infinint.hpp
+include/dar/remote_entrepot_api.hpp
 include/dar/secu_string.hpp
 include/dar/shell_interaction.hpp
 include/dar/shell_interaction_emulator.hpp
@@ -84,10 +80,8 @@ include/dar/tlv_list.hpp
 include/dar/tools.hpp
 include/dar/tuyau.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${DARBITS}.la
 lib/pkgconfig/libdar${DARBITS}.pc
@@ -133,6 +127,7 @@ share/doc/dar/Good_Backup_Practice.html
 share/doc/dar/Limitations.html
 share/doc/dar/Notes.html
 share/doc/dar/README
+share/doc/dar/References.html
 share/doc/dar/Tutorial.html
 share/doc/dar/api_tutorial.html
 share/doc/dar/authentification.html
@@ -165,6 +160,10 @@ share/doc/dar/mini-howto/index.html
 share/doc/dar/old_dar_key1.txt
 share/doc/dar/old_dar_key2.txt
 share/doc/dar/presentation.html
+share/doc/dar/ref_irisa.html
+share/doc/dar/ref_john-goerzen.html
+share/doc/dar/ref_max_planck.html
+share/doc/dar/ref_per-jensen.html
 share/doc/dar/restoration-with-dar.html
 share/doc/dar/style.css
 share/doc/dar/usage_notes.html

Index: pkgsrc/archivers/dar/distinfo
diff -u pkgsrc/archivers/dar/distinfo:1.35 pkgsrc/archivers/dar/distinfo:1.36
--- pkgsrc/archivers/dar/distinfo:1.35  Sat Jun 22 18:28:02 2024
+++ pkgsrc/archivers/dar/distinfo       Sun Jul 19 08:23:59 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2024/06/22 18:28:02 adam Exp $
+$NetBSD: distinfo,v 1.36 2026/07/19 08:23:59 adam Exp $
 
-BLAKE2s (dar-2.7.7.tar.gz) = 5516960811fd5c2b021cf48d9bb493d6c8cb8224a497f3ee36304058925997e3
-SHA512 (dar-2.7.7.tar.gz) = 984328cff1ed3338707858aced83a6a18e950581f02dd686a2a01668f6c374d0af2d98ba49068a61624641fcfbb139ae893d02e5b5f303b8b26d8e05fcb6a229
-Size (dar-2.7.7.tar.gz) = 2410835 bytes
-SHA1 (patch-configure) = 9c386829435ccec547032ae07055993bc720c02b
+BLAKE2s (dar-2.8.5.tar.gz) = 113dab81910ac37b2e68830e46f80b44c4a45ccebbd84034ab0c9be0a332964d
+SHA512 (dar-2.8.5.tar.gz) = 642f6f4a1c9bd05521a4c28d4e8c389d0da9ddbc73cfb7062779476a5b7696e4fba1361ab7ff65f61ffa1e198f58eb526eb52e04f148e445b604dce4fc0d49ff
+Size (dar-2.8.5.tar.gz) = 2392024 bytes
+SHA1 (patch-configure) = 3a7eae879c2d15011455c98a9d02933a80ee178e
 SHA1 (patch-doc_Makefile.in) = bc34aaaaa3415eaf012664718eeec0a081acbd43
 SHA1 (patch-doc_man_Makefile.in) = b3d0474581b480876e2e16d08f20c99559dd6e68
 SHA1 (patch-doc_mini-howto_Makefile.in) = ce9f9b4cd867d818ab7b8aa8bdf658038aea08b9

Index: pkgsrc/archivers/dar/options.mk
diff -u pkgsrc/archivers/dar/options.mk:1.4 pkgsrc/archivers/dar/options.mk:1.5
--- pkgsrc/archivers/dar/options.mk:1.4 Wed May  1 19:31:21 2024
+++ pkgsrc/archivers/dar/options.mk     Sun Jul 19 08:23:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/05/01 19:31:21 cheusov Exp $
+# $NetBSD: options.mk,v 1.5 2026/07/19 08:23:59 adam Exp $
 
 ## Our threading check here is the same as the one used in devel/perl5.
 #
@@ -10,7 +10,7 @@ PLIST_VARS+=          nls
 
 ## XXX I'm following the USE_FEATURES semantics used in security/openssl.
 #
-.if !empty(USE_BUILTIN.pthread:tl:Myes)
+.if ${USE_BUILTIN.pthread:tl} == yes
 USE_FEATURES.dar=      threads
 .else
 USE_FEATURES.dar=      # empty

Index: pkgsrc/archivers/dar/patches/patch-configure
diff -u pkgsrc/archivers/dar/patches/patch-configure:1.1 pkgsrc/archivers/dar/patches/patch-configure:1.2
--- pkgsrc/archivers/dar/patches/patch-configure:1.1    Mon Oct  3 13:59:05 2022
+++ pkgsrc/archivers/dar/patches/patch-configure        Sun Jul 19 08:23:59 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2022/10/03 13:59:05 nros Exp $
+$NetBSD: patch-configure,v 1.2 2026/07/19 08:23:59 adam Exp $
 
-* compatability fix
+Portability fix
 
---- configure.orig     2022-08-07 10:42:43.000000000 +0000
+--- configure.orig     2026-04-27 14:22:54.000000000 +0000
 +++ configure
-@@ -27616,7 +27616,7 @@ $as_echo "$as_me: WARNING: python bindin
+@@ -30067,7 +30067,7 @@ printf "%s\n" "$as_me: WARNING: python b
  
- else
+ else $as_nop
  
 -                 if test "x$enable_shared" != "xyes" -o "$debug_static" == "yes" ; then
 +                 if test "x$enable_shared" != "xyes" -o "$debug_static" = "yes" ; then
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot build python binding without shared library support" >&5
- $as_echo "$as_me: WARNING: Cannot build python binding without shared library support" >&2;}
+                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot build python binding without shared library support" >&5
+ printf "%s\n" "$as_me: WARNING: Cannot build python binding without shared library support" >&2;}
                     local_python="no"