pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils/bup



Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov 21 12:30:30 UTC 2026

Modified Files:
        pkgsrc/sysutils/bup: Makefile PLIST distinfo

Log Message:
sysutils/bup: Update to 0.34.1

Notable changes in 0.34.1 since 0.34
====================================

May require attention
---------------------

* Previously, `bup get` incorrectly handled invocations that requested
  a transfer that depended on a git reference (branch or tag) that was
  modified by an earlier transfer.  For example, it could omit
  intermediate items from the result when asked to do this:

      bup get -s SRC ... --pick x/SAVE-1 --pick x/SAVE-2 --pick x/SAVE-3

  It would omit SAVE-2 from the updated x branch, though the content
  would still be in the repository (barring a subsequent `gc`).

  This should now be fixed, and so the command above will produce an x
  branch with SAVE-2 preceding SAVE-3, and SAVE-1 preceding SAVE-2,
  as intended.

  This was the result of an undocumented attempt to defer all
  reference updates until after all of the transfers.  The updates now
  happen immediately after each individual transfer.

  bup should be upgraded on both the client and server (when
  relevant).

* `bup prune-older` did not correctly consider the year when pruning
  dailies or monthlies and adjacent saves had the same day or month
  but different years.  It would incorrectly prune all but the most
  recent save in a contiguous group.  For example if you had only
  these saves:

      2021-01-01-...
      2022-01-01-...
      2023-01-01-...
      2024-01-02-...
      2025-01-01-...

  then pruning with `--keep-dailies-for forever` would drop 2022 and
  2023, leaving you with:

      2021-01-01-...
      2024-01-02-...
      2025-01-01-...

  when it should have kept them all.

General
-------

* `bup get` can now `--repair` symlinks that have only lost their
  metadata in more cases.  Previously the repair would just fail.

* `bup get --repair --pick ...` and `--append` can now repair saves
  with a missing root tree or root metadata (e.g. missing git level
  `some/SAVE/.bupm` file).  For now, when the entire root tree is
  missing it is replaced with an empty directory, and a missing .bupm
  is treated the same as an "abridged" .bupm (see `bup-get(1)` for
  more information).  Previously the repair would just fail.

* `bup validate-refs --bupm` now detects any entries that aren't empty
  and are missing the "common" fields (mode, uid, gid, ...).

Bugs
----

* `bup tag` now reports invalid tag names as a usage error rather than
  throwing an exception.

* `bup ls` now exits with status 2 for access failures, rather than 1;
  this was overlooked in the general shift from 1 to 2 for errors in
  0.34 (see the 0.34 release notes).

Thanks to (at least)
====================

Greg Troxel, Johannes Berg, and Rob Browning

Notable changes in 0.34 since 0.33.10
=====================================

May require attention
---------------------

* The minimum Python version has been raised from 3.7 to 3.8, and the
  sqlite3 module is now required (to support `--rewrite/--repair`).

* The new `bup get --repair` acts like a `--rewrite` (see below) while
  also attempting to detect and fix known issues during the transfer,
  for example, replacing paths with missing contents with synthesized
  "repair files". See `bup-get`(1) for additional information.  This
  can be used to repair repositories affected by the problem described
  in the [0.33.5 release notes](note/0.33.5-from-0.33.4.md).

* Versions of `bup` at or after 0.25 and before 0.30.1 might (rarely)
  drop metadata entries for non-directories. That makes the metadata
  for all of the other non-directory paths in the same directory
  unusable (ambiguous). `bup` now detects this and treats it as an
  error, given the potential risks with respect to incorrect
  ownership, permissions, etc. The new `bup validate-refs` command can
  detect the problem and `bup get --repair` can repair affected saves.

* `bup init -r` (`--remote`) now only initializes the remote
  repository, not the local and remote repositories, so `bup init -r
  host:remote` and `bup -d local init -r host:remote` will only
  initialze the `remote` repository, not `~/.bup` and `./local`
  respectively.

* Following POSIX `ls`, `bup ls -l` no longer dereferences symlinks,
  for example for `bup ls -l save/latest` (`bup ls -l save/latest/`
  still does).

* `bup` now prefers the XDG cache location (typically
  `~/.cache/bup/remote/`) for the client index cache, but existing
  `$BUP_DIR/index-cache` directories (defaulting to
  `~/.bup/index-cache`) will take precedence.  See `bup-config`(5) for
  additional information.

* `bup` will now correctly disambiguate save names on a given branch
  that have the same timestamp (committer time), even when the saves
  are not adjacent. `bup` disambiguates duplicates by adding a unique
  trailing integer, e.g. `archive/2025-03-29-124014-1`,
  `archive/2025-03-29-124014-2`, and previously, it wouldn't notice
  the duplication unless one save was the parent of the other. That's
  typically the case unless the system clock has been changed, or
  commands like `bup get --pick` have been used.

* `bup-prune-older`(1) now clarifies that the current implementation
  expects every save in a branch to have a date that's newer than its
  parent.

* The build system (e.g. `./configure`) no longer tries to find a
  suitable make, and we no longer try to redirect a non-GNU make to
  GNU make.  Whatever make you invoke must be GNU make >= 4.2.  On
  many systems that will be `make` or `gmake`.

* `bup fsck --repair` promises to exit with a status of 1 whenever
  repairs are needed and successful, and no other errors occur.

* `bup fsck --quick` now checks the packfile indexes too.  Previously
  it only checked the packfiles.

* `bup fsck --generate` and `--repair` now exit immediately with an
  error when a suitable par2 isn't available.  Previously `--generate`
  would just print "skipped".

* `bup fsck` now only accepts `*.pack` arguments, and it no longer
  generates recovery information for the `*.idx` files so that all of
  the recovery blocks will protect the packfile.  This is safer given
  that the `.idx` files can be (and now are) trivially regenerated
  from the packfiles during `--repair` when needed.

* `bup gc` now removes all pack file related files
  (e.g. `pack-HASH.*`) when removing a packfile.  Previously it did
  not, leaving behind, for example `bup-fsck` generated recovery
  files.  In addition, `bup fsck` will report lingering files when
  asked to scan the entire repository,

* `bup ls` and `bup xstat` now print device values (e.g. stat st_rdev)
  as their dev\_t integers, not as a "major,minor" pair, since the
  behavior of `major()/minor()` is not defined by posix, and the sign
  and size of dev\_t and the major/minor result varies across
  platforms.

* Some prior exit statuses of 1 have been changed to a different
  non-zero value.  `bup` is migrating away from exiting with status 1
  for anything other than "false".  This is used by commands like
  `verify-ref-links` that need to report a true or false result like
  `grep` does.

* `bup -?` and `bup --help` now exit with zero status (previously
  non-zero), and `bup -h` is also supported, mirroring the support for
  `-h` in subcommands.

* `bup` now only considers the repository's `config` settings.
  Previously configuration values would be determined by the default
  `git-config`(1) worktree/local/global/system hierarchy, meaning, for
  example, that the host's (local or remote) `~/.gitconfig` or
  `/etc/gitconfig` would also be consulted.  The only existing
  affected value is `pack.packSizeLimit`.

* `bup` now only considers a `pack.packSizeLimit` set in the
  destination repository.

* Support for Linux file attrs (`lsattr`(1)/`chattr`(1)) has been
  restored on big-endian systems where the size of a long is greater
  than the size of an int.  The underlying kernel issue has been fixed
  [here](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=31070f6ccec09f3bd4f1e28cd1e592fa4f3ba0b6):

      31070f6ccec09f3bd4f1e28cd1e592fa4f3ba0b6
      fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS

  and backported to at least 5.7.10, 5.4.53, and 4.9.231.  If you
  still have an affected kernel, please upgrade or you may encounter
  incorrect values.

* `bup prune-older --pretend` now puts just one space, not two,
  between the plus or minus and the save name in its output, matching
  what `bup-prune-older(1)` specifies.

General
-------

* Repositories should now have a unique `bup.repo.id` set in the
  config. `bup init` automatically adds one both during initial
  creation, or when run again on an existing repository. See
  `bup-config`(5) for more information.

* The `--remote` (`-r`) argument interpretation has changed.  The
  value is treated as a URL if it begins with a syntactically valid
  URL scheme prefix that contains an "authority" (meaning that it
  begins with `SCHEME://` as `ssh://...`  does) and anything else is
  interpreted as a `[user@]host:[path]` where the `host` is no longer
  optional).  `file:` URLs are no longer allowed; the semantics were
  potentially surprising (e.g. `file://p` would ssh to host `p`).  Use
  `ssh:` URLs instead.  The URL support, though long standing, was
  previously undocumented.  See REMOTE OPTIONS in `bup`(1) for further
  information.

* The REMOTE directory name in the client index cache (typically
  `~/.bup/index-cache/REMOTE`) is now the `bup.repo.id` when the
  remote repository provides, one and existing directories will be
  renamed when appropriate and possible.

* `bup init DIRECTORY` is now supported, and places the repository in
  the given `DIRECTORY` which takes precedence over `-d` and
  `BUP_DIR`.

* `bup init` now configures `init.defaultBranch` to avoid newer git
  versions describing ways to change the default branch.

* The deduplication granularity can now be changed by a new
  `bup.split.files` configuration option which defaults to `legacy:13`
  (the current behavior), but should probably be set to a higher value
  like `legacy:15` or `legacy:16` in new repositories (say via
  `git-config --file REPO/config bup.split.files legacy:16`).  The
  default for new repositories will eventually be raised. See
  `bup-config`(5) for additional information.

* `bup` will split directories when `bup.split.trees` is `true`. This
  can notably decrease the size of new data added to the repository
  when large directories change (e.g. large active Maildirs). See
  `bup-config`(5) for additional information.

* `bup get` picks and appends can `--rewrite` the data being
  transferred to respect the destination repository's configuration,
  e.g. its `bup.split.files` and `bup.split.trees` settings. See
  `bup-get`(1) for additional information.

* `bup get` has added a `-S, --source-url URL` option which can
   specify a local or remote source repository (as compared to
   `-s/--source` which only allows a path).  This should usually be
   preferred to `bup on HOST get` since it requires less trust in the
   remote, and avoids the need for a remote index-cache.  See
   `bup-get(1)` for additional information.

* `bup` now verifies the hash of the incoming remote data when
  requesting a specific hash (rather than an arbitrary "ref").
  Combined with `--source-url`, this further decreases the trust
  required in a remote.

* `bup on` is substantially stricter.  Now it only allows a subset of
  bup's subcommands, but all of those that were documented in
  `bup-on`(1) still work.  Previously all comands we allowed, even
  those that wouldn't work correctly.  The remaining commands, except
  `get`, require less trust in the remote because the local server now
  rejects write operations for commands that shouldn't be writing,
  (e.g. `bup on HOST restore`), and it also disallows updates to any
  ref other than the `--name` for save and split.  Please let us know
  if these changes cause difficulties.

* The default pack compression level can now be configured via either
  `pack.compression` or `core.compression`.  See `bup-config`(5) for
  additional information.

* `bup web` has been improved.  It should better preserve page
  settings while navigating, and has added settings to toggle the
  display of various types of information, including path sizes,
  hashes, and metadata.  Symlinks targets are now shown, and the
  layout, in general, has been changed (including trivial support for
  dark mode).

* `bup` no longer tries to "filter" output when running
  interactively. Previously it would try to prevent or at least
  mitigate any intermingling of output (lines) from itself and
  children (e.g. par2, git, etc.), for example with respect to
  progress-style output relying on '\r' (carriage returns). The
  previous attempts have been complex and fragile and it's not clear
  they've been worth the cost. Our hope is to handle any issues that
  still arise in some simpler way.

* The server "mode" can now be set by a new
  `bup.server.deduplicate-writes` configuration option. See
  `bup-config(5)` for additional information.

* A local repository should no longer be required to run `bup index
  -f` or a remote `save`.

* `bup gc` should now avoid reading data that it doesn't actually
  need. Previously it would retrieve (and discard) a lot of unneeded
  blobs during a collection.

* When verbose (via `-v...`), `bup gc` and `bup validate-ref-links` no
  longer print paths while scanning the repository because earlier git
  (and then our use of git) didn't allow otherwise.

* The commit message format has changed to place the command in a
  POSIX quoted `Bup-Argv` trailer (`git-interpret-trailers`(1)) and
  the version in a `Bup-Version` trailer, but note that the format is
  not settled, i.e. may continue to change. The command quoting avoids
  quoting arguments when possible, single quotes when there's no
  single quote or newline, and falls back to `$'...'` quoting
  otherwise.

* Many of the paths printed in error and status messages are now POSIX
  quoted instead of Python "backslashreplace"d, but note that the
  format is not settled, i.e. may continue to change.

* We assume that Cygwin has long fixed the issue where it might return
  a negative uid or gid, and the workaround has been removed, but bup
  should still halt if one is encountered.  This has allowed us to
  improve performance when handling a lot of stat results (e.g. index
  traversals), but please let us know if the assumption is incorrect,
  and we can reintroduce a more narrowly tailored fix.

Bugs
----

* A bug has been fixed that could cause any internal subcommand
  (e.g. not `import-rsnapshot`) to hang when running interactively
  (i.e. with a controlling terminal).

* `bup init -r host:` (without a path) now initializes the default
  remote repository (remote `BUP_DIR` or `~/.bup`).  Previously it
  would crash.  This matches the behavior of `-r` for other commands
  like `bup save -r`.

* When run on an existing repository, `bup init` will no longer change
  existing `core.logAllRefUpdates` settings.

* `bup rm some/SAVE` should now succeed even if the root metadata (the
  `some/SAVE/.bupm` file) is missing. Previously it failed with
  "EOFError('encountered EOF while reading vuint')".

* Remote operations (i.e. those involving `--remote` or `bup on`) that
  don't need the index-cache no longer populate it.  Previously all of
  them did.

Build system
------------

* `./configure` now depends on a bash with support for associative
  arrays.  Accordingly, `prep-for-macos-build` has been adjusted to
  install bash via `brew`.

Thanks to (at least)
====================

Aaron M. Ucko, Alain Cochard, Anton Khirnov, Austin Blatt, Austin
Schuh, Christian Wolf, Daniel Distler, Ed Maste, Greg Troxel, Jochen
Sprickerhof, Johannes Berg, Julian Smith, Lucas Nussbaum, Mark Hewitt,
Michael Tokarev, Michal Karol, Moritz Lell, Nathaniel Hourt, Nix, Phil
Sutter, Rob Browning, Rob Leslie, Robert Edmonds, Stefan Monnier,
Thomas Haller, Tomáš Hnyk, and Zachary Dremann


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/sysutils/bup/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/bup/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/bup/distinfo

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

Modified files:

Index: pkgsrc/sysutils/bup/Makefile
diff -u pkgsrc/sysutils/bup/Makefile:1.76 pkgsrc/sysutils/bup/Makefile:1.77
--- pkgsrc/sysutils/bup/Makefile:1.76   Sat Nov 21 01:18:57 2026
+++ pkgsrc/sysutils/bup/Makefile        Sat Nov 21 12:30:29 2026
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.76 2026/11/21 01:18:57 gdt Exp $
+# $NetBSD: Makefile,v 1.77 2026/11/21 12:30:29 gdt Exp $
 
-DISTNAME=      bup-0.33.10
+VERSION=       0.34.1
+DISTNAME=      bup-${VERSION}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bup/}
+GITHUB_TAG=    ${VERSION}
 # bup has two problems that make packaging difficult.  One is that
 # building man pages requires non-portable tools (pandoc).  The other
 # is that it is hosted on github, which makes hosting tarballs
@@ -14,14 +16,12 @@ MASTER_SITES=       ${MASTER_SITE_GITHUB:=bup/
 # reliably, so just use sha1.
 # EXTRACT_SUFX default value is set too late, so using it in SITES.* fails.
 EXTRACT_SUFX=          .tar.gz
-MAN_TAG=               26d961455dc071f166a3f6f54e6ceb0b71cf2524
-MAN_UNPACK=            bup-${MAN_TAG}
-MAN_DISTFILE=          bup-man-${MAN_TAG}${EXTRACT_SUFX}
-SITES.${MAN_DISTFILE}= -${MASTER_SITE_GITHUB:=bup/bup/archive/}${MAN_TAG}${EXTRACT_SUFX}
-# Upstream provides html, but we choose not to include it in the package.
-#HTML_TAG=             66eccb7eb49575d006d193276018d9551ac5b4d4
-DISTFILES=             ${DEFAULT_DISTFILES} ${MAN_DISTFILE}
-DIST_MANPAGES=         ${WRKDIR}/${MAN_UNPACK}
+DOC_TAG=               8379be01a941a3c4ff1efe73342e99d9f570fb68
+DOC_UNPACK=            bup-${DOC_TAG}
+DOC_DISTFILE=          bup-doc-${DOC_TAG}${EXTRACT_SUFX}
+SITES.${DOC_DISTFILE}= -${MASTER_SITE_GITHUB:=bup/bup/archive/}${DOC_TAG}${EXTRACT_SUFX}
+DISTFILES=             ${DEFAULT_DISTFILES} ${DOC_DISTFILE}
+DIST_DOC=              ${WRKDIR}/${DOC_UNPACK}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/bup/bup
@@ -31,6 +31,7 @@ LICENSE=      gnu-gpl-v2
 USE_LANGUAGES= c
 USE_TOOLS+=    bash gmake perl:run
 HAS_CONFIGURE= yes
+CONFIG_SHELL=  bash
 
 # On macOS 10.13, building bup fails with defaults but builds with
 # USE_CWRAPPERS=no.   The error is
@@ -39,25 +40,10 @@ HAS_CONFIGURE=      yes
 DEPENDS+=      par2-[0-9]*:../../archivers/par2
 DEPENDS+=      ${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
-TEST_DEPENDS+= rsync-[0-9]*:../../net/rsync
-TEST_DEPENDS+= rdiff-backup-[0-9]*:../../sysutils/rdiff-backup
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-tornado
 
 ALL_ENV+=      BUP_PYTHON_CONFIG=${PREFIX}/bin/python${PYVERSSUFFIX}-config
 
-# bup's configure is buggy and ends up with a make->make symlink.
-# Whack it to something sensible.  Reported upstream 20221204.
-#
-# bup's Makefile is buggy in that there is no install target.  Whack
-# Makefile from GNUmakefile so that the install target will be run.
-# Reported upstream 20221204.
-post-configure:
-       cd ${WRKSRC}/config/bin && rm -f make && ln -s ${TOOLS_PATH.gmake} make
-       cd ${WRKSRC} && cp -pf GNUmakefile Makefile
-
+MAKE_FILE=     GNUmakefile
 MAKE_FLAGS+=   PREFIX=${PREFIX}
 MAKE_FLAGS+=   PYTHON=${PYTHONBIN}
 MAKE_FLAGS+=   MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
@@ -67,11 +53,13 @@ MAKE_FLAGS+=        PANDOC=
 
 # find work/ -type f |xargs egrep 'env.*bash'|awk -F: '{print $1}' | sed -e s,work/bup-5f9cf697b3daa3d4d6899f9366ebc1fd64161a32/,,
 # and merge to the list
+REPLACE_BASH+=         configure
 REPLACE_BASH+=         dev/checksum
 REPLACE_BASH+=         dev/compare-trees
 REPLACE_BASH+=         dev/configure-sampledata
 REPLACE_BASH+=         dev/force-delete
 REPLACE_BASH+=         dev/git-cat-tree
+REPLACE_BASH+=         dev/path-fs
 REPLACE_BASH+=         dev/perf-glance
 REPLACE_BASH+=         dev/prep-for-debianish-build
 REPLACE_BASH+=         dev/prep-for-macos-build
@@ -81,16 +69,24 @@ REPLACE_BASH+=              dev/system-info
 REPLACE_BASH+=         dev/update-checkout-info
 REPLACE_BASH+=         dev/update-doc-branches
 REPLACE_BASH+=         dev/validate-python
+REPLACE_BASH+=         dev/with-tty
 REPLACE_BASH+=         lib/cmd/bup-import-rdiff-backup
 REPLACE_BASH+=         pylint
+REPLACE_BASH+=         test/ext/test-btl
 REPLACE_BASH+=         test/ext/test-cat-file
-REPLACE_BASH+=         test/ext/test-command-without-init-fails
 REPLACE_BASH+=         test/ext/test-comparative-split-join
 REPLACE_BASH+=         test/ext/test-compression
 REPLACE_BASH+=         test/ext/test-drecurse
+REPLACE_BASH+=         test/ext/test-empty-metadata
 REPLACE_BASH+=         test/ext/test-fsck
 REPLACE_BASH+=         test/ext/test-fuse
 REPLACE_BASH+=         test/ext/test-gc
+REPLACE_BASH+=         test/ext/test-gc-removes-incomplete-trees
+REPLACE_BASH+=         test/ext/test-get-excludes
+REPLACE_BASH+=         test/ext/test-get-missing
+REPLACE_BASH+=         test/ext/test-get-repair-bupm
+REPLACE_BASH+=         test/ext/test-get-repair-symlinks
+REPLACE_BASH+=         test/ext/test-get-rewrite-missing
 REPLACE_BASH+=         test/ext/test-help
 REPLACE_BASH+=         test/ext/test-import-duplicity
 REPLACE_BASH+=         test/ext/test-import-rdiff-backup
@@ -98,18 +94,21 @@ REPLACE_BASH+=              test/ext/test-index
 REPLACE_BASH+=         test/ext/test-index-check-device
 REPLACE_BASH+=         test/ext/test-index-clear
 REPLACE_BASH+=         test/ext/test-index-save-type-change
+REPLACE_BASH+=         test/ext/test-init
+REPLACE_BASH+=         test/ext/test-install
 REPLACE_BASH+=         test/ext/test-list-idx
 REPLACE_BASH+=         test/ext/test-ls
 REPLACE_BASH+=         test/ext/test-ls-remote
 REPLACE_BASH+=         test/ext/test-main
 REPLACE_BASH+=         test/ext/test-meta
+REPLACE_BASH+=         test/ext/test-meta-acls
 REPLACE_BASH+=         test/ext/test-misc
 REPLACE_BASH+=         test/ext/test-on
 REPLACE_BASH+=         test/ext/test-packsizelimit
 REPLACE_BASH+=         test/ext/test-redundant-saves
-REPLACE_BASH+=         test/ext/test-release-archive
 REPLACE_BASH+=         test/ext/test-restore-map-owner
 REPLACE_BASH+=         test/ext/test-restore-single-file
+REPLACE_BASH+=         test/ext/test-rewrite
 REPLACE_BASH+=         test/ext/test-rm
 REPLACE_BASH+=         test/ext/test-rm-between-index-and-save
 REPLACE_BASH+=         test/ext/test-save-creates-no-unrefs
@@ -122,26 +121,40 @@ REPLACE_BASH+=            test/ext/test-save-strip
 REPLACE_BASH+=         test/ext/test-save-symlink-race
 REPLACE_BASH+=         test/ext/test-save-with-valid-parent
 REPLACE_BASH+=         test/ext/test-sparse-files
+REPLACE_BASH+=         test/ext/test-split-files-config
 REPLACE_BASH+=         test/ext/test-split-join
+REPLACE_BASH+=         test/ext/test-tag
+REPLACE_BASH+=         test/ext/test-treesplit
 REPLACE_BASH+=         test/ext/test-tz
+REPLACE_BASH+=         test/ext/test-validate-object-links
+REPLACE_BASH+=         test/ext/test-validate-ref-links
+REPLACE_BASH+=         test/ext/test-validate-refs
+REPLACE_BASH+=         test/ext/test-versioning-and-archive
+REPLACE_BASH+=         test/ext/test-walk-object-order
 REPLACE_BASH+=         test/ext/test-web
 REPLACE_BASH+=         test/ext/test-xdev
 
 DOCDIR=                        share/doc/${PKGBASE}
 
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${DOCDIR}
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${DOCDIR} ${DOCDIR}/html
 
 post-install:
-       ${INSTALL_DATA} ${DIST_MANPAGES}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA} ${WRKSRC}/DESIGN ${DESTDIR}${PREFIX}/${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
+       ${INSTALL_DATA} ${DIST_DOC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA} ${DIST_DOC}/html/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/html
+       ${INSTALL_DATA} ${WRKSRC}/DESIGN.md ${DESTDIR}${PREFIX}/${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "options.mk"
 
-# Note that tests 1) will fail on a fs mounted noatime and 2) need a
-# lot of space, perhaps 1 GB.
-# Tests fail on netbsd-9 because of non-portable use of script(1)
-# introduced in 0.33.9.  Reported upstream by email 20250830.
+# Note that tests 1) will fail on a fs mounted noatime, 2) need a lot
+# of space, perhaps 1 GB, and 3) can fail with test data at the DST
+# boundary because of what I believe is a bug in NetBSD libc.
+
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
+TEST_DEPENDS+= rsync-[0-9]*:../../net/rsync
+TEST_DEPENDS+= rdiff-backup-[0-9]*:../../sysutils/rdiff-backup
+
 TEST_TARGET=   test
 # \todo Pass MAKE_JOBS into "gmake test" via -j.
 TEST_ENV+=     TZ=UTC

Index: pkgsrc/sysutils/bup/PLIST
diff -u pkgsrc/sysutils/bup/PLIST:1.14 pkgsrc/sysutils/bup/PLIST:1.15
--- pkgsrc/sysutils/bup/PLIST:1.14      Fri Jan  3 00:38:38 2025
+++ pkgsrc/sysutils/bup/PLIST   Sat Nov 21 12:30:29 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2025/01/03 00:38:38 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2026/11/21 12:30:29 gdt Exp $
 bin/bup
 lib/bup/bup/__init__.py
 lib/bup/bup/_helpers.so
@@ -9,6 +9,7 @@ lib/bup/bup/cmd/bloom.py
 lib/bup/bup/cmd/cat_file.py
 lib/bup/bup/cmd/daemon.py
 lib/bup/bup/cmd/damage.py
+lib/bup/bup/cmd/demux.py
 lib/bup/bup/cmd/drecurse.py
 lib/bup/bup/cmd/features.py
 lib/bup/bup/cmd/fsck.py
@@ -41,11 +42,15 @@ lib/bup/bup/cmd/tag.py
 lib/bup/bup/cmd/tick.py
 lib/bup/bup/cmd/validate_object_links.py
 lib/bup/bup/cmd/validate_ref_links.py
+lib/bup/bup/cmd/validate_refs.py
 lib/bup/bup/cmd/version.py
 lib/bup/bup/cmd/web.py
 lib/bup/bup/cmd/xstat.py
+lib/bup/bup/commit.py
 lib/bup/bup/compat.py
+lib/bup/bup/config.py
 lib/bup/bup/drecurse.py
+lib/bup/bup/features.py
 lib/bup/bup/gc.py
 lib/bup/bup/git.py
 lib/bup/bup/hashsplit.py
@@ -59,13 +64,20 @@ lib/bup/bup/metadata.py
 lib/bup/bup/midx.py
 lib/bup/bup/options.py
 lib/bup/bup/path.py
+lib/bup/bup/protocol.py
 lib/bup/bup/pwdgrp.py
-lib/bup/bup/repo.py
+lib/bup/bup/repair.py
+lib/bup/bup/repo/__init__.py
+lib/bup/bup/repo/base.py
+lib/bup/bup/repo/local.py
+lib/bup/bup/repo/remote.py
+lib/bup/bup/rewrite.py
 lib/bup/bup/rm.py
 lib/bup/bup/shquote.py
 lib/bup/bup/source_info.py
 lib/bup/bup/ssh.py
 lib/bup/bup/tree.py
+lib/bup/bup/url.py
 lib/bup/bup/version.py
 lib/bup/bup/vfs.py
 lib/bup/bup/vint.py
@@ -79,6 +91,7 @@ man/man1/bup-bloom.1
 man/man1/bup-cat-file.1
 man/man1/bup-daemon.1
 man/man1/bup-damage.1
+man/man1/bup-demux.1
 man/man1/bup-drecurse.1
 man/man1/bup-features.1
 man/man1/bup-fsck.1
@@ -111,7 +124,49 @@ man/man1/bup-tag.1
 man/man1/bup-tick.1
 man/man1/bup-validate-object-links.1
 man/man1/bup-validate-ref-links.1
+man/man1/bup-validate-refs.1
 man/man1/bup-web.1
 man/man1/bup.1
-share/doc/bup/DESIGN
-share/doc/bup/README
+share/doc/bup/DESIGN.md
+share/doc/bup/README.md
+share/doc/bup/html/bup-bloom.1.html
+share/doc/bup/html/bup-cat-file.1.html
+share/doc/bup/html/bup-config.5.html
+share/doc/bup/html/bup-daemon.1.html
+share/doc/bup/html/bup-damage.1.html
+share/doc/bup/html/bup-demux.1.html
+share/doc/bup/html/bup-drecurse.1.html
+share/doc/bup/html/bup-features.1.html
+share/doc/bup/html/bup-fsck.1.html
+share/doc/bup/html/bup-ftp.1.html
+share/doc/bup/html/bup-fuse.1.html
+share/doc/bup/html/bup-gc.1.html
+share/doc/bup/html/bup-get.1.html
+share/doc/bup/html/bup-help.1.html
+share/doc/bup/html/bup-import-duplicity.1.html
+share/doc/bup/html/bup-import-rdiff-backup.1.html
+share/doc/bup/html/bup-import-rsnapshot.1.html
+share/doc/bup/html/bup-index.1.html
+share/doc/bup/html/bup-init.1.html
+share/doc/bup/html/bup-join.1.html
+share/doc/bup/html/bup-ls.1.html
+share/doc/bup/html/bup-margin.1.html
+share/doc/bup/html/bup-memtest.1.html
+share/doc/bup/html/bup-meta.1.html
+share/doc/bup/html/bup-midx.1.html
+share/doc/bup/html/bup-mux.1.html
+share/doc/bup/html/bup-on.1.html
+share/doc/bup/html/bup-prune-older.1.html
+share/doc/bup/html/bup-random.1.html
+share/doc/bup/html/bup-restore.1.html
+share/doc/bup/html/bup-rm.1.html
+share/doc/bup/html/bup-save.1.html
+share/doc/bup/html/bup-server.1.html
+share/doc/bup/html/bup-split.1.html
+share/doc/bup/html/bup-tag.1.html
+share/doc/bup/html/bup-tick.1.html
+share/doc/bup/html/bup-validate-object-links.1.html
+share/doc/bup/html/bup-validate-ref-links.1.html
+share/doc/bup/html/bup-validate-refs.1.html
+share/doc/bup/html/bup-web.1.html
+share/doc/bup/html/bup.1.html

Index: pkgsrc/sysutils/bup/distinfo
diff -u pkgsrc/sysutils/bup/distinfo:1.33 pkgsrc/sysutils/bup/distinfo:1.34
--- pkgsrc/sysutils/bup/distinfo:1.33   Thu Jan 29 00:35:05 2026
+++ pkgsrc/sysutils/bup/distinfo        Sat Nov 21 12:30:29 2026
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.33 2026/01/29 00:35:05 gdt Exp $
+$NetBSD: distinfo,v 1.34 2026/11/21 12:30:29 gdt Exp $
 
-BLAKE2s (bup-0.33.10.tar.gz) = e2bfbb32c911fe42d927032220fd192b000ba3b84ff464fe103714e928265fa8
-SHA512 (bup-0.33.10.tar.gz) = d533d0444f9c87fa72cfc333e9cad155f037b25292f1cbe0f89a1520499900837abeb1df278e1dbc356c5f5bad9ccf1a24faaabbb02ef07f462ee0e70aea5c03
-Size (bup-0.33.10.tar.gz) = 502484 bytes
-BLAKE2s (bup-man-26d961455dc071f166a3f6f54e6ceb0b71cf2524.tar.gz) = 8c4037e8e8e226fa0f23e4f7deb8c06ca43c6514416bb32fd66ec3a3a1b1fca5
-SHA512 (bup-man-26d961455dc071f166a3f6f54e6ceb0b71cf2524.tar.gz) = c0a9ba7d3a3a752bc4a993b9da5745959e17a523bf59d42d47dc7e2df30eb8804a3feaf9ae9f768d417d2fc0d6918c4991cfc89353b08cac56c75f5c254f03c3
-Size (bup-man-26d961455dc071f166a3f6f54e6ceb0b71cf2524.tar.gz) = 34265 bytes
-SHA1 (patch-config_configure) = 20560128514d0efd48d843d4ff2e8b5e15c90e9f
+BLAKE2s (bup-0.34.1.tar.gz) = dcf9b67872be2c610f172ee277b5f1d9265e7897ad32486071c86316cab48344
+SHA512 (bup-0.34.1.tar.gz) = 2917e1d0789cfdc4e009f33830e9db705f4aa589409455b014d2dd33792bd2826408cd7eb1d3d94d8269a185b53b2ace71d79751132a71333ecb960dda293495
+Size (bup-0.34.1.tar.gz) = 666145 bytes
+BLAKE2s (bup-doc-8379be01a941a3c4ff1efe73342e99d9f570fb68.tar.gz) = 549288b124ed0b83c1d618ebcf2add7d70b15767eed82fb925986c8dc0923c30
+SHA512 (bup-doc-8379be01a941a3c4ff1efe73342e99d9f570fb68.tar.gz) = 4475593326047a6f895b919df9c36b3afde95db0039e205a85ddf3a9ee66e6909c0b4bdbe1cbbfdd73729c0038c3957c8d3b08f66b9ccedd9f53a54e4ae9b11c
+Size (bup-doc-8379be01a941a3c4ff1efe73342e99d9f570fb68.tar.gz) = 91721 bytes
 SHA1 (patch-lib_bup___helpers.c) = 2d0d70118858e9765fb5663a54f899c9084bf51a



Home | Main Index | Thread Index | Old Index