upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-07-16 13:33:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2976 commits 9 branches 151 tags 71 MiB
Commit graph

2976 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Larrosa
f0cbf3f257 Fix openSUSE command and add openSUSE section 
Fix the name of the borgbackup package in openSUSE and
add an openSUSE section on how to install development dependencies
to build borgbackup from sources.

(cherry picked from commit 6c7b9a338c)
 2017-07-16 12:36:04 -07:00
Marian Beermann
a93f636151 archiver: add test for paperkey import, fix bug 
(cherry picked from commit 78f0e5d473)
 2017-07-16 12:36:04 -07:00
TW
d0203a237d use limited unpacker for outer key, fixes #2174 (#2790) 
* use limited unpacker for outer key, fixes #2174

* fixup: higher inner key data size limit

(cherry picked from commit 9ca666907b)
 2017-07-16 12:36:03 -07:00
Marian Beermann
6990beb69e xattr: test split_lstring 
(cherry picked from commit 6c67b64ab6)
 2017-07-16 12:36:03 -07:00
TW
15dfb4b032 Merge pull request #2752 from ThomasWaldmann/vagrant-fixes 
Vagrant fixes and updates
 2017-06-27 02:27:18 +02:00
Thomas Waldmann
7e1169dd4b vagrant: add stretch64 VM 2017-06-27 02:09:00 +02:00
Thomas Waldmann
1f7a8ec6b7 vagrant: backport cpu/ram setup from master 
this should fix the MemoryErrors seen in some vagrant test VMs.
also, cpu count is now configurable via VMCPUS env var.
 2017-06-27 01:59:39 +02:00
Thomas Waldmann
781fc638ed vagrant: fix openbsd shell 2017-06-27 01:35:23 +02:00
TW
9975773d3d Merge pull request #2750 from borgbackup/rel1011rc1 
release 1.0.11rc1
 2017-06-27 00:48:29 +02:00
Thomas Waldmann
b36b636a9e build_usage 2017-06-26 22:39:02 +02:00
Thomas Waldmann
f66f6caecd update CHANGES (1.0-maint) 2017-06-26 22:32:49 +02:00
TW
130a8cdee5 update CHANGES (1.0-maint) (#2725) 
update CHANGES (1.0-maint)
 2017-06-26 22:20:53 +02:00
TW
cc7c7521f6 Merge pull request #2745 from ThomasWaldmann/backports6 
Backports (6)
 2017-06-26 21:52:42 +02:00
TW
9c68f3468e Merge pull request #2746 from ThomasWaldmann/issue-2718 
fix borg import issue, add comment, fixes #2718
 2017-06-26 21:41:39 +02:00
Thomas Waldmann
91b0b3a442 include attic.tar.gz when installing the package 
also: add include_package_data=True to get it in sync with master branch
 2017-06-26 20:24:43 +02:00
Thomas Waldmann
2c3cdf8c6c fix borg import issue, add comment, fixes #2718 2017-06-26 19:43:21 +02:00
Marian Beermann
cf0d28a24f BORG_PASSCOMMAND: use same cmd-string splitting as BORG_RSH 
(cherry picked from commit 4e6a771ee7)
 2017-06-26 04:11:15 +02:00
TuXicc
8c1da1adda Added BORG_PASSCOMMAND environment variable (#2573) 
(cherry picked from commit 578b76af3a)
 2017-06-26 04:08:42 +02:00
Marian Beermann
9aa3fe19d7 docs: faq: specify "using inline shell scripts" 
(cherry picked from commit 3faafb1dee)
 2017-06-26 03:21:24 +02:00
Marian Beermann
93efd2dca4 docs: quickstart: delete problematic BORG_PASSPRHASE use 
(cherry picked from commit aa7fbff55f)
 2017-06-26 03:21:02 +02:00
Thomas Waldmann
f7b16112dc move get_limited_unpacker to helpers 
also: move some constants to borg.constants
(cherry picked from commit 89f3cab6cd)
 2017-06-26 03:12:12 +02:00
Thomas Waldmann
35b0f1f4f9 Manifest: use limited unpacker 
(cherry picked from commit 6c2c51939d)
 2017-06-26 02:25:20 +02:00
Marian Beermann
10b196d532 document pattern denial of service 
(cherry picked from commit 1f5ddb6572)
 2017-06-26 01:56:14 +02:00
edgewood
932fb9ec7a Split up parsing and filtering for --keep-within (#2726) 
Split up parsing and filtering for --keep-within

Fixes #2610

Parse --keep-within argument early, via new method within_range passed
to argparse type=, so that better error messages can be given.

Also swallows ValueError stacktrace per the comment in the old code that
including it wasn't desirable.
 2017-06-25 23:31:04 +02:00
TW
04aa426334 Merge pull request #2722 from ThomasWaldmann/backports5 
even more backports
 2017-06-23 16:24:33 +02:00
Thomas Waldmann
e64d177b3a travis: install fakeroot for Linux 
they removed it from the preinstalled sw stack.

(cherry picked from commit b625a4c8c5)
 2017-06-22 20:47:25 +02:00
TW
60242d7f0f Merge pull request #2724 from ThomasWaldmann/backport-remove-hurd-skip 
remove skipping the noatime tests on GNU/Hurd, fixes #2710
 2017-06-22 01:51:41 +02:00
Thomas Waldmann
8deb4dfdda remove skipping the noatime tests on GNU/Hurd, fixes #2710 
I recently installed GNU/Hurd 2017 and found the atime test works now.

(cherry picked from commit 49411d1c6c)
 2017-06-22 01:03:32 +02:00
Marian Beermann
12b2e1fdd0 chunker: fix invalid use of types 
With the argument specified as unsigned char *, Cython emits
code in the Python wrapper to convert string-like objects to
unsigned char* (essentially PyBytes_AS_STRING).

Because the len(data) call is performed on a cdef'd string-ish type,
Cython emits a strlen() call, on the result of PyBytes_AS_STRING.

This is not correct, since embedded null bytes are entirely possible.

Incidentally, the code generated by Cython was also not correct,
since the Clang Static Analyzer found a path of execution where
passing arguments in a weird way from Python resulted in strlen(NULL).

Formulated like this, Cython emits essentially:

c_buzhash(
 PyBytes_AS_STRING(data),
 PyObject_Length(data),
 ...
)

which is correct.

(cherry picked from commit faf2d0b537)
 2017-06-21 15:31:33 +02:00
Marian Beermann
3bd71c63f9 chunker: don't do uint32_t >> 32 
(cherry picked from commit 944a4abd58)
 2017-06-21 15:31:01 +02:00
Thomas Waldmann
10b8cd9218 use stat with follow_symlinks=False 
should be equivalent to using os.lstat() before.

(cherry picked from commit efec00b39c)
 2017-06-21 15:16:43 +02:00
Thomas Waldmann
2b3932cac6 require and use chown with follow_symlinks=False 
should be equivalent to using os.lchown() before.

(cherry picked from commit 094376a8ad)
 2017-06-21 14:58:17 +02:00
Thomas Waldmann
8857422035 document follow_symlinks requirements, check libc, fixes #2507 
(cherry picked from commit b484c79bc2)
 2017-06-21 14:57:22 +02:00
TW
4689c041a8 Merge pull request #2719 from ThomasWaldmann/backports4 
More backports
 2017-06-21 14:02:32 +02:00
TW
4068006de8 Merge pull request #2717 from ThomasWaldmann/backports3 
backports
 2017-06-21 14:02:09 +02:00
Thomas Waldmann
961a2587dc FUSE: fix negative uid/gid crash, fixes #2674 
they could come into archives e.g. when backing up
external drives under cygwin.

(cherry picked from commit ccd066f0af)
 2017-06-21 03:15:22 +02:00
Thomas Waldmann
34a821178f don't write to disk with --stdout, fixes #2645 
if we always give stdout to extract_item(), it gets into the stdout-
processing branch which only emits data from items that have chunks
and does nothing for items which don't.

(cherry picked from commit 0b00c14c27)
 2017-06-21 03:05:03 +02:00
Thomas Waldmann
7846ef2e69 remove attic dependency of the tests, fixes #2505 
attic.tar.gz contains a repo + corresponding keyfile - all the
upgrader module tests need.

.tar.gz because the .tar was 20x bigger.

(cherry picked from commit fed5873e29)
 2017-06-21 03:00:52 +02:00
Marian Beermann
aafbaaea20 cache sync: check Operation.READ compatibility with manifest 
(cherry picked from commit c9c227f2ca)
 2017-06-21 00:53:49 +02:00
philippje
f864f6bc47 changed the date of day without backup 
Changed from 20. December to 19. December for easier comprehension (viewing the calendar.)
The missing 'd' at 20. December is hardly noticeable compared to e.g. the 19. December.
(cherry picked from commit 88e937d0f9)
 2017-06-21 00:51:59 +02:00
Thomas Waldmann
0b46c0d192 enable remote tests on cygwin 
the cygwin issue that caused these tests to break was fixed in cygwin
at least since cygwin 2.8.0 (maybe even since 2.7.0).

also added a comment to our workaround (os_write wrapper, that is needed
still for people running older cygwin versions) that it can be removed
when cygwin 2.8.0 is considered ancient (and everybody has upgraded to
some fixed version).

(cherry picked from commit 4766d66875)
 2017-06-21 00:49:29 +02:00
Steve Groesz
b40e819363 Add bountysource badge (at right), fixes #2558 
(cherry picked from commit a9aab705cc)
(cherry picked from commit 6571cb1726)
 2017-06-21 00:46:21 +02:00
edgimar
de2dd9f23c Update changes.rst 
fix denglish
(cherry picked from commit b57fb1a5e5)
 2017-06-21 00:43:15 +02:00
Marian Beermann
1de042f9e5 key file names: limit to 100 characters (not bytes) 
(cherry picked from commit 38ed9a20af)
 2017-06-21 00:39:24 +02:00
Marian Beermann
649afe0c17 key file names: remove colons from host name 
(cherry picked from commit 4b8a04b5e7)
 2017-06-21 00:37:46 +02:00
enkore
d67597a11e Create empty docs.txt reequirements (see #2694) 2017-06-18 01:46:59 +02:00
textshell
41193eac51 Merge pull request #2134 from textshell/feature/mandatory-features 
Add minimal version of in repository mandatory feature flags.
 2017-06-09 22:11:06 +02:00
Martin Hostettler
6ce476a42b Add tests for cache compatibility code. 2017-06-08 21:38:59 +02:00
Martin Hostettler
fb128fbf84 Cache: Wipe cache if compatibility is not sure 
Add detection of possibly incompatible combinations
of the borg versions maintaining the cache and the featues used.
 2017-06-08 20:36:56 +02:00
Martin Hostettler
7f57086223 permit manifest version 2 as well 1 one. 2017-06-08 20:36:55 +02:00