The NetBSD Project

CVS log for pkgsrc/sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / sysutils / py-borgbackup / patches

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.9: download - view: text, markup, annotated - select for diffs
Tue Nov 3 20:22:01 2026 UTC (12 days, 13 hours ago) by bsiegert
Branches: MAIN
CVS tags: HEAD
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +6 -6 lines
py-msgpack: update to 1.2.4 (security)

Also allow this version in py-borgbackup, following upstream.

1.2.3

- Fix memory leaks in the C extension when map key validation or
  container hooks fail. See GHSA-j586-36cw-2gc2.
- wheels: also build for pyodide using emscripten
- Support packing Python 3.15 frozentdict (PEP 814)
- Reject negative array and map header sizes

1.2.4

- fallback: pass object_pairs_hook a list of pairs
- fallback: leave the object unread when a header type does not match
- fallback: return bytes from Unpacker.read_bytes
- dependency updates

Revision 1.8
Mon Oct 5 13:18:30 2026 UTC (5 weeks, 6 days ago) by adam
Branches: MAIN
FILE REMOVED
Changes since revision 1.7: +1 -1 lines
py-borgbackup: updated to 1.4.5

1.4.5 (2026-07-19)

For upgrade and compatibility hints, please also read the "Upgrade Notes" section
above.

New features:

- create/import-tar/delete/prune --quick-stats: faster than --stats by omitting "All archives"
  and repository chunk statistics
- prune: show total vs matching archives in output
- create --exclude-dataless: macOS: skip cloud files not materialized locally
- support BORG_HOSTNAME and BORG_USERNAME env vars to override the hostname/username stored
  in archives and used by the {hostname}/{user} placeholders
- Minimal implementation of "related repositories"

  This feature allows multiple repositories to share deduplication-relevant secrets
  (id_key and chunk_seed) while maintaining secure, independent encryption keys.

  - borg key export-related-secrets <REPO> <SPATH>
  - borg init --import-related-secrets <SPATH> <REPO>
- BORG_JSON_INDENT env var for JSON output formatting
- BORG_HOSTNAME and BORG_USERNAME env vars

Fixes:

- extract: security fixes for CVE-2026-62268 (low severity: attacker would need
  repository write access and, if the repo is encrypted, also borg key and passphrase).
- create: do not wrap repository writes in backup_io("read")
- Archive.delete: don't reuse msgpack Unpacker after an unpacking failure
- slashdot hack: fix exclusion of source directory metadata
- hashindex: fix new checks for big endian archs

- Note:

    Many of the fixed issues listed below relate to rather rare or theoretical
    issues and were found by automated code checking.

- LRUCache: resolve KeyError and memory leaks
- crypto.low_level: fix freeing of memory
- extract: resolve memory leak on abandoned async requests in RemoteRepository
  This can happen if borg fails to extract a file due to permission or other errors
  or if the archived file had all-zero replacement chunks or inconsistent size.
- Chunker fixes

  - Strictly check the return value of fd.read(n) and reject if it returns more
    bytes than requested.
  - Avoid giving len <= 0 to posix_fadvise(), which could drop the rest of the
    file from the cache.
  - buzhash: check for len == 0 edge case
  - Correctly Py_DECREF in cases of errors.
  - Check for malloc/calloc failures.
- Hashindex fixes

  - Make it possible to look up in compacted hashtables.
  - Avoid buckets_length integer overflow on 32-bit systems via huge num_buckets.
  - Deal safely with empty index: we must use num_buckets = 1 to avoid division
    by zero and sanity check in hashindex_read.
  - Always initialize min_empty and num_empty.
  - Reinitialize upper/lower limit and min_empty after compact.
  - Fix size_idx / fit_size / grow_size / shrink_size (mind array bounds).
  - Deal with growing when already at max capacity.
  - hashindex_resize: replace num_entries assertion, return an error instead.
  - Correctly free memory when header validation fails.
  - BaseIndex.clear: always stay in valid state.
    Do not free the old index before we successfully have allocated a new one.

Other changes:

- msgpack: also allow up to 1.2.1
- use F_FULLFSYNC on macOS for SyncFile data durability
- mount: drop runtime warning about symlinks and improve corresponding docs
- mount: improve error msg when uid/gid cannot be resolved
- properly handle invalid and dev versions in version parser
- tests: reset borg.output.progress logger between tests to fix flakiness
- docs

Revision 1.7.2.2: download - view: text, markup, annotated - select for diffs
Tue Jul 21 18:35:28 2026 UTC (3 months, 3 weeks ago) by maya
Branches: pkgsrc-2026Q2
Diff to: previous 1.7.2.1: preferred, colored; branchpoint 1.7: preferred, colored; next MAIN 1.8: preferred, colored
Changes since revision 1.7.2.1: +15 -0 lines
Pullup ticket #7189 - requested by he
sysutils/py-borgbackup: Build fix

Revisions pulled up:
- sysutils/py-borgbackup/Makefile                               1.64
- sysutils/py-borgbackup/distinfo                               1.43
- sysutils/py-borgbackup/patches/patch-pyproject.toml           1.3
- sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py 1.7

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Tue Jul 21 14:10:28 UTC 2026

   Modified Files:
   	pkgsrc/sysutils/py-borgbackup: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/py-borgbackup/patches: patch-pyproject.toml
   	    patch-src_borg_helpers_msgpack.py

   Log Message:
   sysutils/py-borgbackup: make this accept a newer py-msgpack.

   This is in contravention to the upstream policy which insists that
   because the maintainers of py-msgpack in the distant past made a
   non-compatible change (apparently in a version before 0.5.6 of
   py-msgpack, many, many years ago), they now insist that you *cannot*
   use a newer version of py-msgpack than what the code insists on,
   ref.

      https://github.com/borgbackup/borg/issues/3753

   This collides (hard) with the pkgsrc default stance which is to
   "upgrade everything to the newest available version", and makes
   this package break each time a new version of py-msgpack is integrated
   in pkgsrc.

   For now just patch this to accept py-msgpack versions between
   0.5.6 and 1.2.1 and not just between 0.5.6 and 1.1.2.

   At least testing by doing a backup run makes that backup run
   complete successfully with py-mgspack 1.2.1 installed, instead
   of a sour error message that a non-supported version of msgpack
   is installed.

   This time I'll leave a comment over on the py-msgpack package,
   in an attempt at preventing this problem from once again creep
   into a pkgsrc maintenance branch.

   Bump PKGREVISION.

Revision 1.7.2.1
Tue Jul 21 14:10:28 2026 UTC (3 months, 3 weeks ago) by maya
Branches: pkgsrc-2026Q2
FILE REMOVED
Changes since revision 1.7: +0 -15 lines
file patch-src_borg_helpers_msgpack.py was added on branch pkgsrc-2026Q2 on 2026-07-21 18:35:28 +0000

Revision 1.7: download - view: text, markup, annotated - select for diffs
Tue Jul 21 14:10:28 2026 UTC (3 months, 3 weeks ago) by he
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3
Branch point for: pkgsrc-2026Q2
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +10 -11 lines
sysutils/py-borgbackup: make this accept a newer py-msgpack.

This is in contravention to the upstream policy which insists that
because the maintainers of py-msgpack in the distant past made a
non-compatible change (apparently in a version before 0.5.6 of
py-msgpack, many, many years ago), they now insist that you *cannot*
use a newer version of py-msgpack than what the code insists on,
ref.

   https://github.com/borgbackup/borg/issues/3753

This collides (hard) with the pkgsrc default stance which is to
"upgrade everything to the newest available version", and makes
this package break each time a new version of py-msgpack is integrated
in pkgsrc.

For now just patch this to accept py-msgpack versions between
0.5.6 and 1.2.1 and not just between 0.5.6 and 1.1.2.

At least testing by doing a backup run makes that backup run
complete successfully with py-mgspack 1.2.1 installed, instead
of a sour error message that a non-supported version of msgpack
is installed.

This time I'll leave a comment over on the py-msgpack package,
in an attempt at preventing this problem from once again creep
into a pkgsrc maintenance branch.

Bump PKGREVISION.

Revision 1.6
Mon Nov 10 19:44:33 2025 UTC (12 months ago) by bsiegert
Branches: MAIN
FILE REMOVED
Changes since revision 1.5: +1 -1 lines
py-borgbackup: update to 1.4.2.

Now officially supports msgpack 1.1.2, so these patches are no longer
needed.

New features:

- BORG_MSGPACK_VERSION_CHECK=no to optionally disable the msgpack
  version check; default is “yes”; use at your own risk.
- diff --sort-by: enhanced sorting
- create: add --files-changed=MODE option (controls how borg detects
  whether a file has changed while it is being backed up)
- improve tty-less progress reporting (--progress)

Fixes:

- extract: fs flags: use get/set to influence only specific flags,
  Linux/macOS/FreeBSD only.
- extract: fs flags: remove support for the compression flag; this
  wasn’t working correctly anyway.
- create/info: fix discrepancies in archive stats
- import-tar: fix the dot-slash issue; add a test
- import-tar: when printing the path, use the already-normalized
  item.path
- preprocess_args: fix option name matching
- fix ChunkerParams validation
- mount --show-rc: display main process rc
- json: include archive keys in JSON lines when requested via --format

Other changes:

- support Python 3.14
- msgpack: allow 1.1.2
- Brewfile: use openssl@3 rather than openssl@3.0, to have a more recent OpenSSL.
- msgpack version check: ignore “rc” and other version elements

Revision 1.5.2.2: download - view: text, markup, annotated - select for diffs
Tue Oct 21 01:43:30 2025 UTC (12 months, 3 weeks ago) by maya
Branches: pkgsrc-2025Q3
Diff to: previous 1.5.2.1: preferred, colored; next MAIN 1.6: preferred, colored
Changes since revision 1.5.2.1: +16 -0 lines
Pullup ticket #7013 - requested by bsiegert
sysutils/py-borgbackup: Functionality fix

Revisions pulled up:
- sysutils/py-borgbackup/Makefile                               1.59
- sysutils/py-borgbackup/distinfo                               1.39
- sysutils/py-borgbackup/patches/patch-pyproject.toml           1.1
- sysutils/py-borgbackup/patches/patch-src_borg_helpers_msgpack.py 1.5

---
   Module Name:    pkgsrc
   Committed By:   he
   Date:           Thu Oct 16 21:30:21 UTC 2025

   Modified Files:
            pkgsrc/sysutils/py-borgbackup: Makefile distinfo
   Added Files:
            pkgsrc/sysutils/py-borgbackup/patches: patch-pyproject.toml
                patch-src_borg_helpers_msgpack.py

   Log Message:
   sysutils/py-borgbackup: add patches to accept py-msgpack up to 1.1.2.

   This evidently got lost in the previous update...
   This replicates what upstream has already done in 1.4.2rc*.

Revision 1.5.2.1
Thu Oct 16 21:30:21 2025 UTC (13 months ago) by maya
Branches: pkgsrc-2025Q3
FILE REMOVED
Changes since revision 1.5: +0 -16 lines
file patch-src_borg_helpers_msgpack.py was added on branch pkgsrc-2025Q3 on 2025-10-21 01:43:30 +0000

Revision 1.5: download - view: text, markup, annotated - select for diffs
Thu Oct 16 21:30:21 2025 UTC (13 months ago) by he
Branches: MAIN
Branch point for: pkgsrc-2025Q3
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +7 -6 lines
sysutils/py-borgbackup: add patches to accept py-msgpack up to 1.1.2.

This evidently got lost in the previous update...
This replicates what upstream has already done in 1.4.2rc*.

Revision 1.4
Fri Feb 7 15:17:24 2025 UTC (21 months, 1 week ago) by adam
Branches: MAIN
FILE REMOVED
Changes since revision 1.3: +1 -1 lines
py-borgbackup: updated to 1.4.0

borg 1.2.x to 1.4.x
-------------------

If you currently use borg 1.2.5+: no upgrade steps needed (if you already did
them when upgrading to that version, otherwise see below).

If you currently use borg 1.2.0 .. 1.2.4, read and follow "Pre-1.2.5 archives
spoofing vulnerability (CVE-2023-36811)" section, see the top of this changelog.

Compatibility notes:

By default, borg 1.4 will behave quite similar to borg 1.2 (it was forked off
from 1.2-maint branch at 1.2.7).

- the slashdot hack: be careful not to accidentally give paths containing /./
  to "borg create" if you do not want to trigger this feature (which strips the
  left part of the path from archived items).
- BORG_EXIT_CODES=modern is a feature that borg script, wrapper and GUI authors
  may want to use to get more specific error and warning return codes from borg.
  In that case, of course they will need to make sure to correctly deal with these
  new codes, see the internals/frontends docs.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Mon Oct 28 09:59:34 2024 UTC (2 years ago) by he
Branches: MAIN
CVS tags: pkgsrc-2024Q4-base, pkgsrc-2024Q4
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +5 -7 lines
sysutils/py-borgbackup: make this accept a newer py-msgpack.

This is in contravention to the upstream policy which insists that
because the maintainers of py-msgpack in the distant past made a
non-compatible change (apparently in a version before 0.5.6 of
py-msgpack, many, many years ago), they now insist that you *cannot*
use a newer version of py-msgpack than what the code insists on,
ref.

   https://github.com/borgbackup/borg/issues/3753

This collides (hard) with the pkgsrc default stance which is to
"upgrade everything to the newest available version", and makes
this package break each time a new version of py-msgpack is integrated
in pkgsrc.

For now just patch this to accept py-msgpack versions between
0.5.6 and 1.1.0 and not just between 0.5.6 and 1.0.8.

At least testing by doing a backup run makes that backup run
complete successfully with py-mgspack 1.1.0 installed, instead
of a sour error message that a non-supported version of msgpack
is installed.

Revision 1.2
Fri Feb 16 20:37:04 2024 UTC (2 years, 8 months ago) by adam
Branches: MAIN
FILE REMOVED
Changes since revision 1.1: +1 -1 lines
py-borgbackup: updated to 1.2.7

Version 1.2.7 (2023-12-02)
--------------------------

For upgrade and compatibility hints, please also read the section "Upgrade Notes"
above.

Fixes:

- docs: CVE-2023-36811 upgrade steps: consider checkpoint archives,
- check/compact: fix spurious reappearance of orphan chunks since borg 1.2,
  this consists of 2 fixes:

  - for existing chunks: check --repair: recreate shadow index,
  - for newly created chunks: update shadow index when doing a double-put,
- LockRoster.modify: no KeyError if element was already gone,
- create --X-from-command: run subcommands with a clean environment,
- list --sort-by: support "archive" as alias of "name",
- fix rc and msg if arg parsing throws an exception,

Other changes:

- support and test on Python 3.12
- include unistd.h in _chunker.c (fix for Python 3.13)
- allow msgpack 1.0.6 and 1.0.7
- TAM issues: show tracebacks, improve borg check logging,
- replace "datetime.utcfromtimestamp" with custom helper to avoid
  deprecation warnings when using Python 3.12
- vagrant:

  - use generic/debian9 box, fixes
  - add VM with debian bookworm / test on OpenSSL 3.0.x.
- docs:

  - not only attack/unsafe, can also be a fs issue,
  - point to CVE-2023-36811 upgrade steps from borg 1.1 to 1.2 upgrade steps,
  - upgrade steps needed for all kinds of repos (including "none" encryption mode),
  - upgrade steps: talk about consequences of borg check,
  - upgrade steps: remove period that could be interpreted as part of the command
  - automated-local.rst: use GPT UUID for consistent udev rule
  - create disk/partition sector backup by disk serial number,
  - update macOS hint about full disk access
  - clarify borg prune -a option description,
  - readthedocs: also build offline docs (HTMLzip),
  - frontends: add "check.rebuild_refcounts" message

Revision 1.1: download - view: text, markup, annotated - select for diffs
Fri Sep 29 08:10:33 2023 UTC (3 years, 1 month ago) by wiz
Branches: MAIN
CVS tags: pkgsrc-2023Q4-base, pkgsrc-2023Q4
py-borgbackup: accept newer py-msgpack versions

Bump PKGREVISION.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>