1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-09 13:53:09 +00:00
Commit graph

7092 commits

Author SHA1 Message Date
TW
4e349cf3fa
Merge pull request #7915 from ThomasWaldmann/fix-subcommand-env-1.2
create --*-from-command: run subcommands with a clean environment
2023-11-07 03:42:25 +01:00
Thomas Waldmann
e006a6f368
create --*-from-command: run subcommands with a clean environment, fixes #7916
When borg invokes a system command, it needs to prepare the environment
for that. This is especially important when using a pyinstaller-made
borg fat binary that works with a modified env var LD_LIBRARY_PATH -
system commands may crash with that.

borg already had calls to prepare_subprocess_env at some places (e.g.
when invoking ssh for the remote repo connection), but they were
missing for:

borg create --content-from-command ...
borg create --paths-from-command ...
2023-11-06 17:41:52 +01:00
TW
11af475308
Merge pull request #7913 from ThomasWaldmann/docs-upgrade-chkpt-tam-1.2
CVE-2023-36811 upgrade docs: consider checkpoint archives, fixes #7802
2023-11-06 14:30:36 +01:00
Thomas Waldmann
9c886330d3
CVE-2023-36811 upgrade docs: consider checkpoint archives, fixes #7802
The traceback seen there came from borg not showing a .checkpoint archive
that didn't have a valid TAM and thus the user not see it / fix it:

https://github.com/borgbackup/borg/issues/7802#issuecomment-1793860606
2023-11-06 13:31:02 +01:00
TW
21d67b8295
Merge pull request #7904 from ThomasWaldmann/fix-shadow-index2-1.2
shadow index: add more comments
2023-11-05 01:24:47 +01:00
Thomas Waldmann
2a2b750b9d
shadow index: add more comments 2023-11-05 01:22:07 +01:00
TW
a13504c6d5
Merge pull request #7903 from ThomasWaldmann/update-changes-1.2
update CHANGES (1.2-maint)
2023-11-04 18:05:03 +01:00
Thomas Waldmann
d9a0deb227
update CHANGES 2023-11-03 18:43:22 +01:00
TW
686714c366
Merge pull request #7896 from ThomasWaldmann/fix-shadow-index-1.2
fix shadow index update for double-put (1.2-maint)
2023-11-03 14:42:57 +01:00
TW
55ee4e2d28
Merge pull request #7897 from ThomasWaldmann/check-fixes-shadow-index-1.2
check --repair fixes shadow_index (1.2-maint)
2023-11-03 14:42:39 +01:00
TW
cf5c61644b
Merge pull request #7901 from ThomasWaldmann/update-docs-1.2
Update docs (1.2-maint)
2023-11-03 14:35:02 +01:00
Thomas Waldmann
6b928dac93
docs: not only attack/unsafe, can also be a fs issue, fixes #7853 2023-11-01 18:04:24 +01:00
Thomas Waldmann
da4fcc5a66
docs: point to CVE-2023-36811 upgrade steps from borg 1.1 to 1.2 upgrade steps, fixes #7899
also: use 1.2.6 to refer to the fixed version

1.2.5 had issues and was superseded by 1.2.6 just 1 day later,
so we do not need to talk about that.

Also, the docs point out that:
"""
Below, if we speak of borg 1.2.6, we mean a borg version >= 1.2.6 **or** a
borg version that has the relevant security patches for this vulnerability applied
(could be also an older version in that case).
"""

So, it now just talks about "1.2.6" at the relevant places.
2023-11-01 18:04:22 +01:00
Thomas Waldmann
136e3ed1d6
docs: upgrade steps needed for all kinds of repos, fixes #7813
Repos with encryption=none of course can not do real authentication (because there is no secret key material to work with).

But the code always works the same way and such repos also use (and expect) TAMs, so the instructions should be followed in any case.
2023-11-01 18:04:20 +01:00
Thomas Waldmann
a19ebe5ecc
docs: consequences of borg check, fixes #7816 2023-11-01 17:18:32 +01:00
Thomas Waldmann
a7809429b3
check --repair: recreate shadow index, see #6687
before this fix, borg check --repair just created an
empty shadow index, which can lead to incomplete
entries if entries are added later.

and such incomplete (but present) entries can lead to
compact_segments() resurrecting old PUTs by accidentally
dropping related DELs.
2023-10-29 01:12:15 +02:00
Thomas Waldmann
48feb28e11
check --repair: test if shadow index is recreated
still failing here, because it is not.
2023-10-29 01:01:17 +02:00
Thomas Waldmann
8a8837e255
shadow index updates: simplify and more comments
no functional change here.
2023-10-28 17:36:10 +02:00
Thomas Waldmann
b21ed3c658
update shadow index when doing a double-put, fixes #5661
this fixes the test added in previous commit (avoids
that the PUT reappears after index rebuild).
2023-10-28 17:17:47 +02:00
Thomas Waldmann
8e6449f28e
test the shadowing-by-double-put behaviour, see #5661
the new test is currently failing due to a bug in the
repository code.
2023-10-28 17:13:13 +02:00
TW
c35cddeb7e
Merge pull request #7892 from ThomasWaldmann/ci-timeout-1.2
CI: increase timeout to 90min
2023-10-28 01:25:33 +02:00
Thomas Waldmann
dff29627dc
CI: increase timeout to 90min
esp. the macOS CI jobs are sometimes rather slow,
so 40min were not enough.
2023-10-27 22:30:52 +02:00
TW
b83525cd4c
Merge pull request #7891 from ThomasWaldmann/sort-by-aliases-1.2
--sort-by: support "archive" as alias of "name", fixes #7873 (1.2-maint)
2023-10-27 22:27:59 +02:00
TW
fa7a6d7095
Merge pull request #7890 from ThomasWaldmann/doc-updates-1.2
doc updates (1.2-maint)
2023-10-27 22:25:59 +02:00
Thomas Waldmann
0e3773d8c7
--sort-by: support "archive" as alias of "name", fixes #7873 2023-10-27 20:46:03 +02:00
TW
75bc62e2ae
Merge pull request #7889 from ThomasWaldmann/udev-uuid-1.2
automated-local.rst: use GPT UUID for consistent udev rule (1.2-maint)
2023-10-27 20:33:57 +02:00
Thomas Waldmann
05cec8b3b0
docs: OS X -> macOS 2023-10-27 20:31:26 +02:00
Thomas Waldmann
7a4d53c2f5
docs: update macOS hint about full disk access 2023-10-27 20:28:57 +02:00
Thomas Waldmann
661e5cccd3
docs: minor fixes/update to notes 2023-10-27 20:27:51 +02:00
Thomas Waldmann
d13b5d5557
docs: remove info about borg 1.0 files per dir 2023-10-27 20:26:27 +02:00
Thomas Waldmann
e0f80812a5
docs: no signature upload on pypi any more
but we upload it on github releases,
so people can check it.
2023-10-27 20:25:29 +02:00
Thomas Waldmann
7640973d6b
docs: CI only on github actions now 2023-10-27 20:23:00 +02:00
azrdev
69d71d99bf
automated-local.rst: Partition table UUID match works for MBR too
not only GPT
2023-10-27 20:15:05 +02:00
azrdev
b61a565fbc
automated-local.rst: use GPT UUID for consistent udev rule 2023-10-27 20:14:50 +02:00
TW
4a8f8bf789
Merge pull request #7886 from ThomasWaldmann/fix-inv-pattern-errorhandling-1.2
Fix arg parsing error handling (1.2-maint)
2023-10-27 20:09:36 +02:00
Thomas Waldmann
5bfa417546
fix rc and msg if arg parsing throws an exception, fixes #7885
get_args() exception handling before this fix only dealt with
subclasses of "Error", but we have to expect other exceptions
there, too.

In any case, if we have some fatal exception here, we must
terminate with rc 2.

ArgumentTypeError: emit a short error message - usually this is
a user error, invoking borg in a wrong way.

Other exceptions: full info and traceback.
2023-10-25 12:06:27 +02:00
Thomas Waldmann
1bd015cdb5
fix invalid pattern argument error msg 2023-10-25 11:06:37 +02:00
Johannes Lade
d482251a3e
Clarify borg prune -a option description (#7871)
Clarify borg prune -a option description.

The -a option for borg prune accepts only glob pattern (i.e. sh:)
but not the actual prefix sh: which can be confusing especially for
people who don't actually know what glob pattern is.
2023-10-14 22:00:19 +02:00
TW
e2ea9b6547
Merge pull request #7864 from ThomasWaldmann/remove-bountysource-badge-1.2
remove bountysource badge (1.2-maint)
2023-10-10 21:01:56 +02:00
Thomas Waldmann
b8d950d097
remove bountysource badge 2023-10-10 20:32:11 +02:00
TW
bc553b1258
Merge pull request #7857 from ThomasWaldmann/misc-updates-1.2
misc. updates (1.2-maint)
2023-10-09 20:57:11 +02:00
Felix Schwarz
90de901ff4
replace "datetime.utcfromtimestamp" with custom helper to avoid deprecation warnings when using Python 3.12 2023-10-09 20:23:10 +02:00
Thomas Waldmann
f72adc9e61
vagrant: use generic/debian9 box, fixes #7579
the debian/stretch64 was broken and never fixed.
2023-10-08 21:53:32 +02:00
Thomas Waldmann
37c3177e90
update development.lock.txt
there was some breakage with py312, so better
use current tooling.
2023-10-08 21:42:04 +02:00
Thomas Waldmann
d6ad508a29
github CI: test on py312 (w/o -dev) 2023-10-08 00:20:31 +02:00
Thomas Waldmann
3c4b1090a6
vagrant: install py312 via pyenv 2023-10-08 00:15:39 +02:00
Thomas Waldmann
9df5e6c139
allow setuptools_scm >= 8 again
8.0.4 got a fix, so we can allow it again.
2023-10-08 00:10:36 +02:00
TW
8c267e5c3c
Merge pull request #7850 from ThomasWaldmann/allow-msgpack107-1.2
allow msgpack 1.0.7 (1.2-maint)
2023-09-28 15:36:54 +02:00
Thomas Waldmann
39761ebadc
allow msgpack 1.0.7 2023-09-28 14:26:48 +02:00
TW
e936d53a66
Merge pull request #7845 from ThomasWaldmann/update-changes-1.2
update CHANGES
2023-09-26 00:03:10 +02:00