upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-04 00:25:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
5239 commits 10 branches 151 tags 72 MiB
Commit graph

5239 commits

This branch
This branch
All branches
Author SHA1 Message Date
TW
c78c3ff8a4
Merge pull request #4561 from ThomasWaldmann/filter-msgpack-warning 
pure-py msgpack warning shall not make a lot of tests fail, fixes #4558
 2019-05-13 18:21:36 +02:00
Thomas Waldmann
690195a9a3 pure-py msgpack warning shall not make a lot of tests fail, fixes #4558 
if the tests use a pure-python msgpack, 1 test which is specifically
made for that, will fail. esp. for linux distribution packages, this
will still point to the problem (that the msgpack package is not built
or installed correctly).
 2019-05-13 17:10:14 +02:00
TW
3e90eb1d05
Merge pull request #4487 from ThomasWaldmann/nofollow-check 
do not check python/libc for borg serve, fixes #4483
 2019-05-12 19:08:39 +02:00
TW
d34b6a53e2
Merge pull request #4555 from ThomasWaldmann/update-changes-1.1 
Update changes (1.1)
 2019-05-12 19:05:26 +02:00
Thomas Waldmann
aca9855f80 update CHANGES (1.1-maint) 
for 1.1.10 mostly, also adding 1 item that was forgotton for 1.1.9.
 2019-05-12 03:08:50 +02:00
Thomas Waldmann
e0735e5d4f changelog: add 1.1.10 section 2019-05-12 03:03:29 +02:00
TW
d07d51e35e
Merge pull request #4554 from ThomasWaldmann/whitelist-client-options-1.1 
use whitelist approach for borg serve, fixes #4097 (1.1-maint backport)
 2019-05-12 02:53:50 +02:00
TW
7010cda6f6
Merge pull request #4553 from ThomasWaldmann/coverage-warning-1.1 
get rid of confusing coverage warning, fixes #2069 (1.1-maint backport)
 2019-05-11 23:37:30 +02:00
Thomas Waldmann
185282776e use whitelist approach for borg serve, fixes #4097 2019-05-11 23:13:11 +02:00
TW
b033693c9a
Merge pull request #4542 from ThomasWaldmann/fix-extract-hardlinks-1.1 
slave hardlinks extraction issue, see #4350 (1.1-maint)
 2019-05-11 22:15:16 +02:00
Thomas Waldmann
f2d8e3a93a get rid of confusing coverage warning, fixes #2069 2019-05-11 21:35:37 +02:00
TW
8a42028613
Merge pull request #4552 from ThomasWaldmann/upgrade-openbsd-box 
vagrant: upgrade openbsd box to 6.4
 2019-05-11 21:28:16 +02:00
Thomas Waldmann
847cc52209 vagrant: upgrade openbsd box to 6.4 
6.0 went out of support, the ftp server URL we used 404ed and we
already had the 6.4 box for master branch, so just use it for
1.1-maint also.
 2019-05-11 21:27:13 +02:00
Thomas Waldmann
18242ab9e2 preload chunks for hardlink slaves w/o preloaded master, fixes #4350 
also split the hardlink extraction test into 2 tests.

(cherry picked from commit f33f318d81)
 2019-05-06 20:11:18 +02:00
TW
b30eb36333
Merge pull request #4530 from shawnl/forward-port 
2 back ports
 2019-05-01 23:47:05 +02:00
Thomas Waldmann
e886df4cde create: only run stat_simple_attrs() once 
This is a backport of cd4f6b41ca

the second call was done in stat_attrs().

this increases backup with lots of unchanged files performance by ~ 5%.
 2019-04-30 15:28:29 -05:00
user062
133da4dd49 FIX #4373 (Incorrect borg prune --stats output with --dry-run) 
This is a backport of 68aff8b8c4
 2019-04-27 09:05:08 -05:00
TW
3bb9efc784
Merge pull request #4503 from mikenye/1.1-maint 
Add "SSH Configuration" section to "borg serve" (backport from master)
 2019-04-09 11:04:04 +02:00
Mike Nye
016942a222 modified: serve.rst 
Add "SSH Configuration" section to "borg serve" documentation, to outline ssh/sshd configuration to prevent borg serve keeping a lock on a repo in the event the ssh connection is abnormally disconnected.

In response to issues #3988, #636 and #4485 (and probably others).

Backported from master.
 2019-04-09 08:57:38 +08:00
Thomas Waldmann
24118459c6 do not check python/libc for borg serve, fixes #4483 
the check checks whether follow_symlinks=False is supported, which
requires that the glibc is recent enough / python was compiled
for a recent enough glibc. follow_symlinks=False is only used for borg
create and extract, but not needed for borg serve.

thus, this makes it possible to run "borg serve" even on a bit older
servers. be careful, due to the presence of this check on the server
side until now, older server systems are not really much tested.
 2019-04-02 23:34:05 +02:00
TW
e281c8329c
Merge pull request #4475 from ThomasWaldmann/funding-link 
README: new URL for funding options
 2019-03-25 23:32:56 +01:00
Thomas Waldmann
d9c5dfb55b README: new URL for funding options 2019-03-25 23:15:39 +01:00
TW
c5132f2a2e
Merge pull request #4472 from ThomasWaldmann/freeze-test-env 
lock travis-ci test env to py 3.4 compatible versions, fixes #4343
 2019-03-25 00:00:51 +01:00
Thomas Waldmann
ff5bc4552f lock travis-ci test env to py 3.4 compatible versions, fixes #4343 
maybe slightly newer will also work, e.g. pip < 19.2, pytest < 5.0.
 2019-03-24 22:51:50 +01:00
Thomas Waldmann
867bf7d34f display msgpack version as part of sysinfo (e.g. in tracebacks) 
1.1-maint backport
 2019-03-22 14:24:35 +01:00
Thomas Waldmann
88b4a00d1b freebsd xattr namespace: str vs. bytes fixup 2019-03-21 03:20:12 +01:00
TW
3e2393a058
Merge pull request #4463 from ThomasWaldmann/fix-exception-rc-1.1 
borg command shall terminate with rc 2 for ImportErrors, fixes #4424
 2019-03-21 02:04:15 +01:00
TW
1cd8ca297a
Merge pull request #4458 from ThomasWaldmann/fix-4348-1.1 
Fix 4348 (1.1-maint backport)
 2019-03-21 01:49:16 +01:00
TW
8e78580c83
Merge pull request #4457 from ThomasWaldmann/freebsd-xattr-ns-1.1 
make freebsd xattr platform code api compatible with linux, fixes #3952 (1.1-maint bp)
 2019-03-21 01:48:49 +01:00
Thomas Waldmann
1cabd77029 borg command shall terminate with rc 2 for ImportErrors, fixes #4424 
(cherry picked from commit 97ca421fef)
 2019-03-21 01:27:13 +01:00
Milkey Mouse
96bd36d37a Add test for error upon exporting a key to a directory 
(cherry picked from commit d26264bb70)
 2019-03-20 14:22:39 +01:00
Milkey Mouse
891538ca7e Emit user-friendly error if repo key is exported to a directory (fixes #4348) 
(cherry picked from commit 72ebd13e6f)
 2019-03-20 14:22:27 +01:00
Thomas Waldmann
98198b34d9 make freebsd xattr platform code api compatible with linux, fixes #3952 
i.e. prefix the keys with the namespace, so it is ns.key like on
linux.

still only dealing with the "user" namespace, like before.
in the "system" namespaces there are ACLs (we deal with them via the acl
api, so no problem) and stuff from pnfsd (not sure what exactly).

this change is needed because FreeBSD's FUSE code expects the xattr
keys to be in that format.

it is also needed for cross-platform data exchange, so e.g. if one wants to:
- create archive on linux, extract on freebsd - with "user.xxx" xattrs.
- or vice versa.

archives made with older borg versions on freebsd will still extract correctly
on freebsd (not on linux though) even though they do not have the
namespace prefixes in the archived metadata (it will be interpreted in
same way as if they were prefixed by "user." as we do not support any
other namespace anyway).

(cherry picked from commit 0686237484)
 2019-03-20 14:13:59 +01:00
TW
0a20a03b7f
Merge pull request #4455 from ThomasWaldmann/backports-17 
Backports to 1.1-maint (17)
 2019-03-19 20:17:42 +01:00
Thomas Waldmann
0f72a8a0cf lrucache: regularly remove old FDs, fixes #4427 2019-03-19 18:52:19 +01:00
Thomas Waldmann
6ee42216bf avoid stale filehandle issues, fixes #3265 2019-03-19 18:51:23 +01:00
Thomas Waldmann
1efec3ced1 add comment about unused recreate_* members in ArchiveItem 2019-03-19 18:45:19 +01:00
Thomas Waldmann
8ad90c1242 remove ARCHIVE_KEYS duplication 
also: get key set in sync, obviously we have "recreate_partial_chunks"
in ArchiveItem still.
 2019-03-19 18:36:18 +01:00
Sitaram Chamarty
bbc3f8d6fd add a sample logging.conf in docs/misc (#4380) 
add a sample logging.conf in docs/misc

(and point to it in the man page)
 2019-03-19 18:22:32 +01:00
TW
db271f768f
Merge pull request #4443 from SanskritFritz/1.1-maint 
Shell completions: borg diff second archive
 2019-03-15 19:02:40 +01:00
SanskritFritz
0d80a9a159 Shell completions for borg diff second archive 2019-03-15 17:53:18 +01:00
TW
71c3ad773e
Merge pull request #4423 from joey4/fix4359-backport 
timestamp for borg delete --info added
 2019-03-11 10:45:38 +01:00
TW
2fdd7ed93d
Merge pull request #4431 from milkey-mouse/3504-bp1.1 
Elaborate on append-only mode docs (1.1 backport)
 2019-03-11 02:39:54 +01:00
Milkey Mouse
897b593ec4
Elaborate on append-only mode docs 2019-03-10 18:09:46 -07:00
Joey
f904f473ff timestamp for borg delete --info added, fixes #4359 2019-03-05 11:28:16 +01:00
jminer74
622866f592 docs/installation: added Alpine Linux to distribution list (#4414) (#4415) 
docs/installation: added Alpine Linux to distribution list
 2019-03-01 22:35:52 +01:00
TW
7a7e04a43a
Merge pull request #4386 from milkey-mouse/fix-4133-bp1.1 
Only modify window.location when redirecting (1.1 backport)
 2019-02-22 06:52:06 +01:00
Milkey Mouse
4da4738fdc
Only modify window.location when redirecting (fixes #4133) 
window.location.pathname = window.location.pathname can trigger a redirect,
which created a refresh loop in usage.html.
 2019-02-21 19:20:17 -08:00
TW
2d523c7b86
Merge pull request #4344 from ThomasWaldmann/update-scripts-1.1 
signing binaries with Qubes OS support, docs
 2019-02-11 02:42:32 +01:00
Thomas Waldmann
818c926b9d signing binaries with Qubes OS support, docs 2019-02-11 02:41:35 +01:00