mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Code Issues Releases Wiki Activity
4818 commits 9 branches 139 tags 60 MiB
Commit graph

4818 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Waldmann
182c0fa636 update requirements and install docs about bundled lz4 and zstd 
(cherry picked from commit 061321b668)
 2017-12-20 03:24:48 +01:00
TW
5acf9eefa9
Merge pull request #3462 from ThomasWaldmann/update-changes-1.1 
update CHANGES (1.1-maint)
 2017-12-20 03:22:05 +01:00
Thomas Waldmann
6043d8b257 update CHANGES (1.1-maint) 2017-12-19 02:19:15 +01:00
TW
ba1708d30e
Merge pull request #3458 from ThomasWaldmann/blake2-ext-building-1.1 
crypto.low_level ext building (blake2 part, 1.1)
 2017-12-18 07:28:48 +01:00
Thomas Waldmann
1bdaffc62c crypto.low_level extension: build blake2 like zstd, see #3415 
(cherry picked from commit 4a2fec32b6)
 2017-12-18 04:29:33 +01:00
Thomas Waldmann
0118b939d9 update blake2 reference impl file (cosmetic) 
only whitespace changes.

(cherry picked from commit b56f6cdbc0)
 2017-12-18 04:26:15 +01:00
Thomas Waldmann
ba38d5199b move blake2 files to subdir ref/ (as seen in orig. repo) 
(cherry picked from commit 8924d78d44)
 2017-12-18 04:25:57 +01:00
TW
b8a7238622
Merge pull request #3456 from ThomasWaldmann/lz4-ext-building-1.1 
compress ext building (lz4 part, 1.1)
 2017-12-18 04:14:25 +01:00
TW
ed31ea2516
Merge pull request #3455 from ThomasWaldmann/borg-delete-removing-security-dir-1.1 
also delete security dir when deleting a repo, fixes #3427 (1.1)
 2017-12-18 04:12:48 +01:00
Thomas Waldmann
21ba3ff63c fix lz4 deprecation warning, require lz4 >= 1.7.0 (r129) 
as we bundle lz4 1.8.0 now, platforms not having a recent liblz4 can
now just use the bundled code.

(cherry picked from commit fe48caf853)
 2017-12-18 02:47:44 +01:00
Thomas Waldmann
83603acd48 rename BORG_LZ4_PREFIX env var to BORG_LIBLZ4_PREFIX 
consistency:
we also have BORG_LIBB2_PREFIX and BORG_LIBZSTD_PREFIX.

(cherry picked from commit 9b6924d27f)
 2017-12-18 02:42:03 +01:00
Thomas Waldmann
7d8ec62b50 compress extension: build lz4 like zstd, see #3415 
(cherry picked from commit 73a70082c2)
 2017-12-18 02:41:30 +01:00
Thomas Waldmann
49f76a1e32 bundle lz4 1.8.0 src code, license 
(cherry picked from commit c8b2820225)
 2017-12-18 02:38:52 +01:00
Thomas Waldmann
1d64e5c227 also delete security dir when deleting a repo, fixes #3427 
(cherry picked from commit 8f772437f2)
 2017-12-18 01:55:11 +01:00
TW
696f2a2d25
Merge pull request #3445 from ThomasWaldmann/check-hangs-fix 
fix for borg check --repair malfunction, #3444 (1.1-maint)
 2017-12-16 21:59:44 +01:00
TW
6ab02e7ff2
Merge pull request #3442 from ThomasWaldmann/zstd-1.1 
zstd compression (1.1 backport)
 2017-12-16 21:40:14 +01:00
Thomas Waldmann
e09892caec check --repair: fix malfunctioning validator, fixes #3444 
the major problem was the ('path' in item) expression.
the dict has bytes-typed keys there, so it never succeeded as it
looked for a str key. this is a 1.1 regression, 1.0 was fine.

the dict -> StableDict change is just for being more specific,
the check triggered correctly as StableDict subclasses dict,
it was just a bit too general.
 2017-12-16 19:44:25 +01:00
Thomas Waldmann
a68d28bfa4 modify borg check unit test so it "hangs", see #3444 
it doesn't infinitely hang, but slows down considerably.
 2017-12-16 19:44:24 +01:00
Thomas Waldmann
c7383589cc bundle zstd 1.3.2 source code 
only .c and .h files + license

(cherry picked from commit dc883f62ae)
 2017-12-15 03:14:33 +01:00
Thomas Waldmann
0271ae6f95 support code to build bundled zstd code into the compress extension 
setup_zstd.py modified so it is just amending the Extension() kwargs,
but the Extension is initialized by the caller.

this way, amending can happend multiple times (e.g. for multiple
compression algorithms).

also:
- move include/library dirs processing for system-library case
- move system zstd prefix detection to setup_zstd module
- cosmetic: setup.py whitespace fixes
- prefer system zstd option, document zstd min. requirement

(cherry picked from commit 34b92ffdaa)
 2017-12-15 03:13:54 +01:00
Thomas Waldmann
15ec4c4259 add setup_zstd.py from python-zstandard project, as is 
(cherry picked from commit 50c0831824)
 2017-12-15 03:09:09 +01:00
Thomas Waldmann
01078328e2 zstd: use own Cython-based binding, remove python-zstandard dep 
currently requires an externally available libzstd >= 1.3.0,
no bundled zstd yet.

(cherry picked from commit aec36f64a2)
 2017-12-15 03:08:28 +01:00
Thomas Waldmann
6bad2395dd add zstd compression 
based on willyvmm's work in PR #3116, but some changes:

- removed any mulithreading changes
- add zstandard in setup.py install_requires
- tests
- fix: minimum compression level is 1 (not 0)
- use 3 for the default compression level
- use ID 03 00 for zstd
- only convert to bytes if we don't have bytes yet
- move zstd code so that code blocks are ordered by ID
- other cosmetic fixes

(cherry picked from commit 11b2311e6e)
 2017-12-15 02:13:15 +01:00
TW
4ac6ee221a
Merge pull request #3441 from ThomasWaldmann/backports 
Backports to 1.1
 2017-12-15 01:59:10 +01:00
Nils Steinger
00865ae89e List help topics when invalid topic is requested 
(cherry picked from commit 9e81a76172)
 2017-12-15 00:58:29 +01:00
Gregor Kleen
96675e06c8 Refactor: call getfqdn() once per call of replace_placeholders() 
(cherry picked from commit 294f06b565)
 2017-12-15 00:56:43 +01:00
Gregor Kleen
dbf8d582f9 Add placeholder for fqdn in reverse notation 
(cherry picked from commit 85fb38e2f3)
 2017-12-15 00:56:31 +01:00
Thomas Waldmann
981a936f47 add parens for C preprocessor macro argument usages 
this is needed for correctness because the preprocessor is just
doing text replacement.

This is the correct way:

#define MUL(x, y) ((x) * (y))

MUL(1+2, 3-4) -> ((1+2) * (3-4))    # not: (1+2 * 3-4)

I didn't put parens around all arg usages for readability.

Some stuff (like index) is not expected to be an expression.

Also, when a arg is only used in another macro or function call,
no parens are needed either.

I reviewed the code: no harm was done (yet) due to this fault.

Thanks to @rciorba who found this.

(cherry picked from commit a3cecf599f)
 2017-12-15 00:50:06 +01:00
Thomas Waldmann
747ada77e6 fix building the "borg prune" man page, fixes #3398 
will fix all ".. highlight:: none" issues (just killing it).

also a slight punctuation fix, so there is a dot at the end of
the prune man page.

(cherry picked from commit 1f5b8c9219)
 2017-12-15 00:49:21 +01:00
TW
b62d349740
Merge pull request #3420 from ThomasWaldmann/add-config-docs 
add auto-generated docs for borg config (1.1)
 2017-12-09 22:24:20 +01:00
Thomas Waldmann
278ed640e9 add auto-generated docs for borg config 
also: move a bit upwards in the use docs
 2017-12-09 13:41:03 +01:00
TW
11eeacf024
Merge pull request #3413 from milkey-mouse/no-borgfs-html-docs-bp1.1 
Don't generate HTML docs page for borgfs (1.1 backport)
 2017-12-03 12:46:00 +01:00
Milkey Mouse
25bfb5b00d
Don't generate HTML docs page for borgfs (fixes #3404) 2017-12-03 00:03:33 -08:00
TW
dff29cc5a5
Merge pull request #3409 from ThomasWaldmann/exclude-broken-pytest330-1.1 
exclude broken pytest 3.3.0 release
 2017-12-02 19:55:47 +01:00
Thomas Waldmann
953f3a4a2f exclude broken pytest 3.3.0 release 
https://github.com/pytest-dev/pytest/issues/2957
(cherry picked from commit 43184f2dd1)
 2017-12-02 17:46:00 +01:00
TW
bb6e86628f
Merge pull request #3391 from borgbackup/rel113 
Release 1.1.3
 2017-11-27 06:12:42 +01:00
Thomas Waldmann
dc8de36109 borg mount: fix hardlink processing, fixes #3388 
when the result list after stripping was empty,
os.path.join(*emptylist) fails as it want 1+ args.
 2017-11-27 04:10:17 +01:00
Thomas Waldmann
23a1d62b25 crc32-slice-by-8.c: fix for C90 compilers 
crc32_slice_by_8.c:344:3: error: ISO C90 forbids mixed declarations
and code [-Werror=declaration-after-statement]
 2017-11-27 01:01:34 +01:00
Thomas Waldmann
831a06a07d move 3rd party docs/license file from package dir to docs/3rd_party 
setup.py excludes all .c .h .pyx files from installation, but such
docs / license files would still be copied to the target directory
if they are inside the python "borg" package dir.
 2017-11-27 00:02:37 +01:00
Thomas Waldmann
6becbb259b manually fix build_man issue with highlight directive 2017-11-27 00:02:36 +01:00
Thomas Waldmann
51504bad18 build_man 2017-11-27 00:02:36 +01:00
Thomas Waldmann
d373772517 build_usage 2017-11-27 00:02:36 +01:00
Thomas Waldmann
54883434b9 update CHANGES (1.1-maint) for 1.1.3 release 2017-11-27 00:02:36 +01:00
Thomas Waldmann
ea0203bb0d security: fix enforcement of --restrict-to-path in args processing 
Fixes CVE-2017-15914 (affects releases 1.1.0, 1.1.1, 1.1.2,
but not 1.0.x).

Thanks to Florian Apolloner for discovering/reporting this!

Also: added tests for this.
 2017-11-27 00:02:36 +01:00
TW
da040fcf5f
Merge pull request #3385 from ThomasWaldmann/docs-fix-broken-links-1.1 
docs: fix broken links (1.1-maint)
 2017-11-26 23:57:32 +01:00
Thomas Waldmann
c7994b598b docs: fix broken links (1.1-maint) 2017-11-26 23:56:32 +01:00
TW
fba42889d2
Merge pull request #3383 from ThomasWaldmann/link-to-hp-support-1.1 
link to the homepage for support/service (1.1-maint)
 2017-11-26 23:38:42 +01:00
Thomas Waldmann
7438cb2ef4 link to the homepage for support/service (1.1-maint) 
otherwise people ONLY reading the docs (and not coming from the
homepage) will miss these options.
 2017-11-26 23:34:10 +01:00
TW
feaa246095
Merge pull request #3382 from ThomasWaldmann/issue-2812-1.1 
do remaining part of #3360 backport to 1.1-maint
 2017-11-26 23:26:41 +01:00
Michael Rupert
2e365f46de do remaining part of #3360 backport to 1.1-maint 2017-11-26 23:23:57 +01:00